diff --git a/dev/translation/txpull.sh b/dev/translation/txpull.sh
index 4156daf7674..0f8906353bd 100755
--- a/dev/translation/txpull.sh
+++ b/dev/translation/txpull.sh
@@ -26,15 +26,21 @@ fi
 
 if [ "x$1" = "xall" ]
 then
-	for dir in `find htdocs/langs/* -type d`
-	do
-	    fic=`basename $dir`
-	    if [ $fic != "en_US" ]
-	    then
-		    echo "tx pull -l $fic $2 $3"
-		    tx pull -l $fic $2 $3
-		fi
-	done
+	if [ "x$2" = "x" ]
+	then
+	    echo "tx pull"
+	    tx pull
+	else
+		for dir in `find htdocs/langs/* -type d`
+		do
+		    fic=`basename $dir`
+		    if [ $fic != "en_US" ]
+		    then
+			    echo "tx pull -l $fic $2 $3"
+			    tx pull -l $fic $2 $3
+			fi
+		done
+	fi
 	cd -
 else
 	echo "tx pull -l $1 $2 $3 $4 $5"
diff --git a/htdocs/accountancy/admin/categories.php b/htdocs/accountancy/admin/categories.php
index d052b4312a7..4f24ab95f3f 100644
--- a/htdocs/accountancy/admin/categories.php
+++ b/htdocs/accountancy/admin/categories.php
@@ -21,6 +21,7 @@
  * \ingroup Advanced accountancy
  * \brief	Page to assign mass categories to accounts
  */
+
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountancycategory.class.php';
@@ -45,7 +46,10 @@ if ($cat_id == 0) {
 }
 
 // Security check
-if (! $user->admin) accessforbidden();
+if (! empty($user->rights->accountancy->chartofaccount))
+{
+	accessforbidden();
+}
 
 $accountingcategory = new AccountancyCategory($db);
 
@@ -84,7 +88,7 @@ $formaccounting = new FormAccounting($db);
 
 llxheader('', $langs->trans('AccountAccounting'));
 
-print load_fiche_titre($langs->trans('Categories'));
+print load_fiche_titre($langs->trans('AccountingCategory'));
 
 print '<form name="add" action="' . $_SERVER["PHP_SELF"] . '" method="POST">' . "\n";
 print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
@@ -96,8 +100,8 @@ print '<table class="border" width="100%">';
 // Category
 print '<tr><td>' . $langs->trans("AccountingCategory") . '</td>';
 print '<td>';
-$formaccounting->select_accounting_category($cat_id, 'account_category', 1);
-print '<input class="button" type="submit" value="' . $langs->trans("Show") . '">';
+$formaccounting->select_accounting_category($cat_id, 'account_category', 1, 0, 0, 1);
+print '<input class="button" type="submit" value="' . $langs->trans("Select") . '">';
 print '</td></tr>';
 
 if (! empty($cat_id)) {
@@ -108,11 +112,11 @@ if (! empty($cat_id)) {
 	print '<tr><td>' . $langs->trans("AddAccountFromBookKeepingWithNoCategories") . '</td>';
 	print '<td>';
 	if (is_array($accountingcategory->lines_cptbk) && count($accountingcategory->lines_cptbk) > 0) {
-		print '<select size="' . count($obj) . '" name="cpt_bk[]" multiple>';
+		print '<select class="flat minwidth200" size="' . count($obj) . '" name="cpt_bk[]" multiple>';
 		foreach ( $accountingcategory->lines_cptbk as $cpt ) {
 			print '<option value="' . length_accountg($cpt->numero_compte) . '">' . length_accountg($cpt->numero_compte) . ' (' . $cpt->label_compte . ' ' . $cpt->doc_ref . ')</option>';
 		}
-		print '</select>';
+		print '</select><br>';
 		print '<input class="button" type="submit" id="" class="action-delete" value="' . $langs->trans("Add") . '"> ';
 	}
 	print '</td></tr>';
@@ -129,8 +133,8 @@ if ($action == 'display' || $action == 'delete') {
 
     print "<table class='noborder' width='100%'>\n";
     print '<tr class="liste_titre">';
-	print '<td>'.$langs->trans("AccountAccounting")."</td>";
-	print '<td colspan="2">'.$langs->trans("Label")."</td>";
+	print '<td class="liste_titre">'.$langs->trans("AccountAccounting")."</td>";
+	print '<td class="liste_titre" colspan="2">'.$langs->trans("Label")."</td>";
 	print "</tr>\n";
 
 	if (! empty($cat_id)) {
@@ -142,7 +146,7 @@ if ($action == 'display' || $action == 'delete') {
 		if (is_array($accountingcategory->lines_display) && count($accountingcategory->lines_display) > 0) {
 			foreach ( $accountingcategory->lines_display as $cpt ) {
 				$var = ! $var;
-				print '<tr' . $bc[$var] . '>';
+				print '<tr ' . $bc[$var] . '>';
 				print '<td>' . length_accountg($cpt->account_number) . '</td>';
 				print '<td>' . $cpt->label . '</td>';
 				print '<td align="right">';
diff --git a/htdocs/accountancy/admin/categories_list.php b/htdocs/accountancy/admin/categories_list.php
new file mode 100644
index 00000000000..696475720ec
--- /dev/null
+++ b/htdocs/accountancy/admin/categories_list.php
@@ -0,0 +1,1351 @@
+<?php
+/* Copyright (C) 2004       Rodolphe Quiedeville    <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2015  Laurent Destailleur     <eldy@users.sourceforge.net>
+ * Copyright (C) 2004       Benoit Mortier          <benoit.mortier@opensides.be>
+ * Copyright (C) 2005-2012  Regis Houssin           <regis.houssin@capnetworks.com>
+ * Copyright (C) 2010-2016  Juanjo Menent           <jmenent@2byte.es>
+ * Copyright (C) 2011-2015  Philippe Grand          <philippe.grand@atoo-net.com>
+ * Copyright (C) 2011       Remy Younes             <ryounes@gmail.com>
+ * Copyright (C) 2012-2015  Marcos García           <marcosgdf@gmail.com>
+ * Copyright (C) 2012       Christophe Battarel     <christophe.battarel@ltairis.fr>
+ * 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>
+ *
+ * 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/>.
+ */
+
+/**
+ *	    \file       htdocs/accountancy/admin/categories_list.php
+ *		\ingroup    setup
+ *		\brief      Page to administer data tables
+ */
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/accountancy/class/html.formventilation.class.php';
+
+$langs->load("errors");
+$langs->load("admin");
+$langs->load("main");
+$langs->load("companies");
+$langs->load("resource");
+$langs->load("holiday");
+$langs->load("accountancy");
+$langs->load("hrm");
+
+$action=GETPOST('action','alpha')?GETPOST('action','alpha'):'view';
+$confirm=GETPOST('confirm','alpha');
+$id=GETPOST('id','int');
+$rowid=GETPOST('rowid','alpha');
+
+// Security access
+if (! empty($user->rights->accountancy->chartofaccount))
+{
+	accessforbidden();
+}
+
+$acts[0] = "activate";
+$acts[1] = "disable";
+$actl[0] = img_picto($langs->trans("Disabled"),'switch_off');
+$actl[1] = img_picto($langs->trans("Activated"),'switch_on');
+
+$listoffset=GETPOST('listoffset');
+$listlimit=GETPOST('listlimit')>0?GETPOST('listlimit'):1000;
+$active = 1;
+
+$sortfield = GETPOST("sortfield",'alpha');
+$sortorder = GETPOST("sortorder",'alpha');
+$page = GETPOST("page",'int');
+if ($page == -1) { $page = 0 ; }
+$offset = $listlimit * $page ;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+
+$search_country_id = GETPOST('search_country_id','int');
+
+// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+$hookmanager->initHooks(array('admin'));
+
+// This page is a generic page to edit dictionaries
+// Put here declaration of dictionaries properties
+
+// Sort order to show dictionary (0 is space). All other dictionaries (added by modules) will be at end of this.
+$taborder=array(32);
+
+// Name of SQL tables of dictionaries
+$tabname=array();
+$tabname[32]= MAIN_DB_PREFIX."c_accounting_category";
+
+// Dictionary labels
+$tablib=array();
+$tablib[32]= "DictionaryAccountancyCategory";
+
+// Requests to extract data
+$tabsql=array();
+$tabsql[32]= "SELECT a.rowid as rowid, a.code as code, a.label, a.range_account, a.sens, a.category_type, a.formula, a.position as position, a.fk_country as country_id, c.code as country_code, c.label as country, a.active FROM ".MAIN_DB_PREFIX."c_accounting_category as a, ".MAIN_DB_PREFIX."c_country as c WHERE a.fk_country=c.rowid and c.active=1";
+
+// Criteria to sort dictionaries
+$tabsqlsort=array();
+$tabsqlsort[32]="position ASC";
+
+// Nom des champs en resultat de select pour affichage du dictionnaire
+$tabfield=array();
+$tabfield[32]= "code,label,range_account,sens,category_type,formula,position,country_id,country";
+
+// Nom des champs d'edition pour modification d'un enregistrement
+$tabfieldvalue=array();
+$tabfieldvalue[32]= "code,label,range_account,sens,category_type,formula,position,country";
+
+// Nom des champs dans la table pour insertion d'un enregistrement
+$tabfieldinsert=array();
+$tabfieldinsert[32]= "code,label,range_account,sens,category_type,formula,position,fk_country";
+
+// Nom du rowid si le champ n'est pas de type autoincrement
+// Example: "" if id field is "rowid" and has autoincrement on
+//          "nameoffield" if id field is not "rowid" or has not autoincrement on
+$tabrowid=array();
+$tabrowid[32]= "";
+
+// Condition to show dictionary in setup page
+$tabcond=array();
+$tabcond[32]= ! empty($conf->accounting->enabled);
+
+// List of help for fields
+$tabhelp=array();
+$tabhelp[32] = array('code'=>$langs->trans("EnterAnyCode"));
+
+// List of check for fields (NOT USED YET)
+$tabfieldcheck=array();
+$tabfieldcheck[32] = array();
+
+// Complete all arrays with entries found into modules
+complete_dictionary_with_modules($taborder,$tabname,$tablib,$tabsql,$tabsqlsort,$tabfield,$tabfieldvalue,$tabfieldinsert,$tabrowid,$tabcond,$tabhelp,$tabfieldcheck);
+
+
+// Define elementList and sourceList (used for dictionary type of contacts "llx_c_type_contact")
+$elementList = array();
+$sourceList=array();
+
+
+
+/*
+ * Actions
+ */
+
+if (GETPOST('button_removefilter') || GETPOST('button_removefilter.x') || GETPOST('button_removefilter_x'))
+{
+    $search_country_id = '';    
+}
+
+// Actions add or modify an entry into a dictionary
+if (GETPOST('actionadd') || GETPOST('actionmodify'))
+{
+    $listfield=explode(',', str_replace(' ', '',$tabfield[$id]));
+    $listfieldinsert=explode(',',$tabfieldinsert[$id]);
+    $listfieldmodify=explode(',',$tabfieldinsert[$id]);
+    $listfieldvalue=explode(',',$tabfieldvalue[$id]);
+
+    // Check that all fields are filled
+    $ok=1;
+    foreach ($listfield as $f => $value)
+    {
+        if ($value == 'country_id' && in_array($tablib[$id],array('DictionaryVAT','DictionaryRegion','DictionaryCompanyType','DictionaryHolidayTypes','DictionaryRevenueStamp','DictionaryAccountancysystem','DictionaryAccountancyCategory'))) continue;		// For some pages, country is not mandatory
+    	if ($value == 'country' && in_array($tablib[$id],array('DictionaryCanton','DictionaryCompanyType','DictionaryRevenueStamp'))) continue;		// For some pages, country is not mandatory
+        if ($value == 'localtax1' && empty($_POST['localtax1_type'])) continue;
+        if ($value == 'localtax2' && empty($_POST['localtax2_type'])) continue;
+        if ($value == 'color' && empty($_POST['color'])) continue;
+		if ($value == 'formula' && empty($_POST['formula'])) continue;
+        if ((! isset($_POST[$value]) || $_POST[$value]=='')
+        	&& (! in_array($listfield[$f], array('decalage','module','accountancy_code','accountancy_code_sell','accountancy_code_buy'))  // Fields that are not mandatory
+        	&& (! ($id == 10 && $listfield[$f] == 'code')) // Code is mandatory fir table 10
+        	)
+		)
+        {
+            $ok=0;
+            $fieldnamekey=$listfield[$f];
+            // We take translate key of field
+            if ($fieldnamekey == 'libelle' || ($fieldnamekey == 'label'))  $fieldnamekey='Label';
+            if ($fieldnamekey == 'libelle_facture') $fieldnamekey = 'LabelOnDocuments';
+            if ($fieldnamekey == 'nbjour')   $fieldnamekey='NbOfDays';
+            if ($fieldnamekey == 'decalage') $fieldnamekey='Offset';
+            if ($fieldnamekey == 'module')   $fieldnamekey='Module';
+            if ($fieldnamekey == 'code') $fieldnamekey = 'Code';
+            if ($fieldnamekey == 'note') $fieldnamekey = 'Note';
+            if ($fieldnamekey == 'taux') $fieldnamekey = 'Rate';
+            if ($fieldnamekey == 'type') $fieldnamekey = 'Type';
+            if ($fieldnamekey == 'position') $fieldnamekey = 'Position';
+            if ($fieldnamekey == 'unicode') $fieldnamekey = 'Unicode';
+            if ($fieldnamekey == 'deductible') $fieldnamekey = 'Deductible';
+            if ($fieldnamekey == 'sortorder') $fieldnamekey = 'SortOrder';
+			if ($fieldnamekey == 'category_type') $fieldnamekey = 'Calculated';
+
+            setEventMessages($langs->transnoentities("ErrorFieldRequired", $langs->transnoentities($fieldnamekey)), null, 'errors');
+        }
+    }
+    // Other checks
+    if ($tabname[$id] == MAIN_DB_PREFIX."c_actioncomm" && isset($_POST["type"]) && in_array($_POST["type"],array('system','systemauto'))) {
+        $ok=0;
+        setEventMessages($langs->transnoentities('ErrorReservedTypeSystemSystemAuto'), null, 'errors');
+    }
+    if (isset($_POST["code"]))
+    {
+    	if ($_POST["code"]=='0')
+    	{
+        	$ok=0;
+    		setEventMessages($langs->transnoentities('ErrorCodeCantContainZero'), null, 'errors');
+        }
+        /*if (!is_numeric($_POST['code']))	// disabled, code may not be in numeric base
+    	{
+	    	$ok = 0;
+	    	$msg .= $langs->transnoentities('ErrorFieldFormat', $langs->transnoentities('Code')).'<br />';
+	    }*/
+    }
+    if (isset($_POST["country"]) && ($_POST["country"]=='0') && ($id != 2))
+    {
+    	if (in_array($tablib[$id],array('DictionaryCompanyType','DictionaryHolidayTypes')))	// Field country is no mandatory for such dictionaries
+    	{
+    		$_POST["country"]='';
+    	}
+    	else
+    	{
+        	$ok=0;
+        	setEventMessages($langs->transnoentities("ErrorFieldRequired",$langs->transnoentities("Country")), null, 'errors');
+    	}
+    }
+    if ($id == 3 && ! is_numeric($_POST["code"]))
+    {
+       	$ok=0;
+       	setEventMessages($langs->transnoentities("ErrorFieldMustBeANumeric",$langs->transnoentities("Code")), null, 'errors');
+    }
+
+	// Clean some parameters
+    if ((! empty($_POST["localtax1_type"]) || ($_POST['localtax1_type'] == '0')) && empty($_POST["localtax1"])) $_POST["localtax1"]='0';	// If empty, we force to 0
+    if ((! empty($_POST["localtax2_type"]) || ($_POST['localtax2_type'] == '0')) && empty($_POST["localtax2"])) $_POST["localtax2"]='0';	// If empty, we force to 0
+	if ($_POST["accountancy_code"] <= 0) $_POST["accountancy_code"]='';	// If empty, we force to null
+	if ($_POST["accountancy_code_sell"] <= 0) $_POST["accountancy_code_sell"]='';	// If empty, we force to null
+	if ($_POST["accountancy_code_buy"] <= 0) $_POST["accountancy_code_buy"]='';	// If empty, we force to null
+
+    // Si verif ok et action add, on ajoute la ligne
+    if ($ok && GETPOST('actionadd'))
+    {
+        if ($tabrowid[$id])
+        {
+            // Recupere id libre pour insertion
+            $newid=0;
+            $sql = "SELECT max(".$tabrowid[$id].") newid from ".$tabname[$id];
+            $result = $db->query($sql);
+            if ($result)
+            {
+                $obj = $db->fetch_object($result);
+                $newid=($obj->newid + 1);
+
+            } else {
+                dol_print_error($db);
+            }
+        }
+
+        // Add new entry
+        $sql = "INSERT INTO ".$tabname[$id]." (";
+        // List of fields
+        if ($tabrowid[$id] && ! in_array($tabrowid[$id],$listfieldinsert))
+        	$sql.= $tabrowid[$id].",";
+        $sql.= $tabfieldinsert[$id];
+        $sql.=",active)";
+        $sql.= " VALUES(";
+
+        // List of values
+        if ($tabrowid[$id] && ! in_array($tabrowid[$id],$listfieldinsert))
+        	$sql.= $newid.",";
+        $i=0;
+        foreach ($listfieldinsert as $f => $value)
+        {
+            if ($value == 'price' || preg_match('/^amount/i',$value) || $value == 'taux') {
+            	$_POST[$listfieldvalue[$i]] = price2num($_POST[$listfieldvalue[$i]],'MU');
+            }
+            else if ($value == 'entity') {
+            	$_POST[$listfieldvalue[$i]] = $conf->entity;
+            }
+            if ($i) $sql.=",";
+            if ($_POST[$listfieldvalue[$i]] == '' && ! ($listfieldvalue[$i] == 'code' && $id == 10)) $sql.="null";  // For vat, we want/accept code = ''
+            else $sql.="'".$db->escape($_POST[$listfieldvalue[$i]])."'";
+            $i++;
+        }
+        $sql.=",1)";
+
+        dol_syslog("actionadd", LOG_DEBUG);
+        $result = $db->query($sql);
+        if ($result)	// Add is ok
+        {
+            setEventMessages($langs->transnoentities("RecordSaved"), null, 'mesgs');
+        	$_POST=array('id'=>$id);	// Clean $_POST array, we keep only
+        }
+        else
+        {
+            if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
+                setEventMessages($langs->transnoentities("ErrorRecordAlreadyExists"), null, 'errors');
+            }
+            else {
+                dol_print_error($db);
+            }
+        }
+    }
+
+    // Si verif ok et action modify, on modifie la ligne
+    if ($ok && GETPOST('actionmodify'))
+    {
+        if ($tabrowid[$id]) { $rowidcol=$tabrowid[$id]; }
+        else { $rowidcol="rowid"; }
+
+        // Modify entry
+        $sql = "UPDATE ".$tabname[$id]." SET ";
+        // Modifie valeur des champs
+        if ($tabrowid[$id] && ! in_array($tabrowid[$id],$listfieldmodify))
+        {
+            $sql.= $tabrowid[$id]."=";
+            $sql.= "'".$db->escape($rowid)."', ";
+        }
+        $i = 0;
+        foreach ($listfieldmodify as $field)
+        {
+            if ($field == 'price' || preg_match('/^amount/i',$field) || $field == 'taux') {
+            	$_POST[$listfieldvalue[$i]] = price2num($_POST[$listfieldvalue[$i]],'MU');
+            }
+            else if ($field == 'entity') {
+            	$_POST[$listfieldvalue[$i]] = $conf->entity;
+            }
+            if ($i) $sql.=",";
+            $sql.= $field."=";
+            if ($_POST[$listfieldvalue[$i]] == '' && ! ($listfieldvalue[$i] == 'code' && $id == 10)) $sql.="null";  // For vat, we want/accept code = ''
+            else $sql.="'".$db->escape($_POST[$listfieldvalue[$i]])."'";
+            $i++;
+        }
+        $sql.= " WHERE ".$rowidcol." = '".$rowid."'";
+
+        dol_syslog("actionmodify", LOG_DEBUG);
+        //print $sql;
+        $resql = $db->query($sql);
+        if (! $resql)
+        {
+            setEventMessages($db->error(), null, 'errors');
+        }
+    }
+    //$_GET["id"]=GETPOST('id', 'int');       // Force affichage dictionnaire en cours d'edition
+}
+
+if (GETPOST('actioncancel'))
+{
+    //$_GET["id"]=GETPOST('id', 'int');       // Force affichage dictionnaire en cours d'edition
+}
+
+if ($action == 'confirm_delete' && $confirm == 'yes')       // delete
+{
+    if ($tabrowid[$id]) { $rowidcol=$tabrowid[$id]; }
+    else { $rowidcol="rowid"; }
+
+    $sql = "DELETE from ".$tabname[$id]." WHERE ".$rowidcol."='".$rowid."'";
+
+    dol_syslog("delete", LOG_DEBUG);
+    $result = $db->query($sql);
+    if (! $result)
+    {
+        if ($db->errno() == 'DB_ERROR_CHILD_EXISTS')
+        {
+            setEventMessages($langs->transnoentities("ErrorRecordIsUsedByChild"), null, 'errors');
+        }
+        else
+        {
+            dol_print_error($db);
+        }
+    }
+}
+
+// activate
+if ($action == $acts[0])
+{
+    if ($tabrowid[$id]) { $rowidcol=$tabrowid[$id]; }
+    else { $rowidcol="rowid"; }
+
+    if ($rowid) {
+        $sql = "UPDATE ".$tabname[$id]." SET active = 1 WHERE ".$rowidcol."='".$rowid."'";
+    }
+    elseif ($_GET["code"]) {
+        $sql = "UPDATE ".$tabname[$id]." SET active = 1 WHERE code='".$_GET["code"]."'";
+    }
+
+    $result = $db->query($sql);
+    if (!$result)
+    {
+        dol_print_error($db);
+    }
+}
+
+// disable
+if ($action == $acts[1])
+{
+    if ($tabrowid[$id]) { $rowidcol=$tabrowid[$id]; }
+    else { $rowidcol="rowid"; }
+
+    if ($rowid) {
+        $sql = "UPDATE ".$tabname[$id]." SET active = 0 WHERE ".$rowidcol."='".$rowid."'";
+    }
+    elseif ($_GET["code"]) {
+        $sql = "UPDATE ".$tabname[$id]." SET active = 0 WHERE code='".$_GET["code"]."'";
+    }
+
+    $result = $db->query($sql);
+    if (!$result)
+    {
+        dol_print_error($db);
+    }
+}
+
+// favorite
+if ($action == 'activate_favorite')
+{
+    if ($tabrowid[$id]) { $rowidcol=$tabrowid[$id]; }
+    else { $rowidcol="rowid"; }
+
+    if ($rowid) {
+        $sql = "UPDATE ".$tabname[$id]." SET favorite = 1 WHERE ".$rowidcol."='".$rowid."'";
+    }
+    elseif ($_GET["code"]) {
+        $sql = "UPDATE ".$tabname[$id]." SET favorite = 1 WHERE code='".$_GET["code"]."'";
+    }
+
+    $result = $db->query($sql);
+    if (!$result)
+    {
+        dol_print_error($db);
+    }
+}
+
+// disable favorite
+if ($action == 'disable_favorite')
+{
+    if ($tabrowid[$id]) { $rowidcol=$tabrowid[$id]; }
+    else { $rowidcol="rowid"; }
+
+    if ($rowid) {
+        $sql = "UPDATE ".$tabname[$id]." SET favorite = 0 WHERE ".$rowidcol."='".$rowid."'";
+    }
+    elseif ($_GET["code"]) {
+        $sql = "UPDATE ".$tabname[$id]." SET favorite = 0 WHERE code='".$_GET["code"]."'";
+    }
+
+    $result = $db->query($sql);
+    if (!$result)
+    {
+        dol_print_error($db);
+    }
+}
+
+
+/*
+ * View
+ */
+
+$form = new Form($db);
+$formadmin=new FormAdmin($db);
+
+llxHeader();
+
+$titre=$langs->trans("DictionarySetup");
+$linkback='';
+if ($id)
+{
+    $titre.=' - '.$langs->trans($tablib[$id]);
+    $linkback='<a href="'.$_SERVER['PHP_SELF'].'">'.$langs->trans("BackToDictionaryList").'</a>';
+}
+$titlepicto='title_setup';
+if ($id == 10 && GETPOST('from') == 'accountancy')
+{
+    $titre=$langs->trans("MenuVatAccounts");
+    $titlepicto='title_accountancy';
+}
+if ($id == 7 && GETPOST('from') == 'accountancy')
+{
+    $titre=$langs->trans("MenuTaxAccounts");
+    $titlepicto='title_accountancy';
+}
+
+print load_fiche_titre($titre,$linkback,$titlepicto);
+
+if (empty($id))
+{
+    print $langs->trans("DictionaryDesc");
+    print " ".$langs->trans("OnlyActiveElementsAreShown")."<br>\n";
+}
+print "<br>\n";
+
+
+// Confirmation de la suppression de la ligne
+if ($action == 'delete')
+{
+    print $form->formconfirm($_SERVER["PHP_SELF"].'?'.($page?'page='.$page.'&':'').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.$rowid.'&code='.$_GET["code"].'&id='.$id, $langs->trans('DeleteLine'), $langs->trans('ConfirmDeleteLine'), 'confirm_delete','',0,1);
+}
+//var_dump($elementList);
+
+/*
+ * Show a dictionary
+ */
+if ($id)
+{
+    // Complete requete recherche valeurs avec critere de tri
+    $sql=$tabsql[$id];
+
+    if ($search_country_id > 0)
+    {
+        if (preg_match('/ WHERE /',$sql)) $sql.= " AND ";
+        else $sql.=" WHERE ";
+        $sql.= " c.rowid = ".$search_country_id;
+    }
+    
+    if ($sortfield)
+    {
+        // If sort order is "country", we use country_code instead
+    	if ($sortfield == 'country') $sortfield='country_code';
+        $sql.= " ORDER BY ".$sortfield;
+        if ($sortorder)
+        {
+            $sql.=" ".strtoupper($sortorder);
+        }
+        $sql.=", ";
+        // Clear the required sort criteria for the tabsqlsort to be able to force it with selected value
+        $tabsqlsort[$id]=preg_replace('/([a-z]+\.)?'.$sortfield.' '.$sortorder.',/i','',$tabsqlsort[$id]);
+        $tabsqlsort[$id]=preg_replace('/([a-z]+\.)?'.$sortfield.',/i','',$tabsqlsort[$id]);
+    }
+    else {
+        $sql.=" ORDER BY ";
+    }
+    $sql.=$tabsqlsort[$id];
+    $sql.=$db->plimit($listlimit+1,$offset);
+    //print $sql;
+
+    $fieldlist=explode(',',$tabfield[$id]);
+
+    print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$id.'" method="POST">';
+    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+    print '<input type="hidden" name="from" value="'.dol_escape_htmltag(GETPOST('from','alpha')).'">';
+    
+    print '<table class="noborder" width="100%">';
+
+    // Form to add a new line
+    if ($tabname[$id])
+    {
+        $alabelisused=0;
+        $var=false;
+
+        $fieldlist=explode(',',$tabfield[$id]);
+
+        // Line for title
+        print '<tr class="liste_titre">';
+        foreach ($fieldlist as $field => $value)
+        {
+            // Determine le nom du champ par rapport aux noms possibles
+            // dans les dictionnaires de donnees
+            $valuetoshow=ucfirst($fieldlist[$field]);   // Par defaut
+            $valuetoshow=$langs->trans($valuetoshow);   // try to translate
+            $align="left";
+            if ($fieldlist[$field]=='source')          { $valuetoshow=$langs->trans("Contact"); }
+            if ($fieldlist[$field]=='price')           { $valuetoshow=$langs->trans("PriceUHT"); }
+            if ($fieldlist[$field]=='taux')            {
+				if ($tabname[$id] != MAIN_DB_PREFIX."c_revenuestamp") $valuetoshow=$langs->trans("Rate");
+				else $valuetoshow=$langs->trans("Amount");
+				$align='center';
+            }
+            if ($fieldlist[$field]=='localtax1_type')  { $valuetoshow=$langs->trans("UseLocalTax")." 2"; $align="center"; $sortable=0; }
+            if ($fieldlist[$field]=='localtax1')       { $valuetoshow=$langs->trans("Rate")." 2"; $align="center"; }
+            if ($fieldlist[$field]=='localtax2_type')  { $valuetoshow=$langs->trans("UseLocalTax")." 3"; $align="center"; $sortable=0; }
+            if ($fieldlist[$field]=='localtax2')       { $valuetoshow=$langs->trans("Rate")." 3"; $align="center"; }
+            if ($fieldlist[$field]=='organization')    { $valuetoshow=$langs->trans("Organization"); }
+            if ($fieldlist[$field]=='lang')            { $valuetoshow=$langs->trans("Language"); }
+            if ($fieldlist[$field]=='type')            {
+				if ($tabname[$id] == MAIN_DB_PREFIX."c_paiement") $valuetoshow=$form->textwithtooltip($langs->trans("Type"),$langs->trans("TypePaymentDesc"),2,1,img_help(1,''));
+				else $valuetoshow=$langs->trans("Type");
+            }
+            if ($fieldlist[$field]=='code')            { $valuetoshow=$langs->trans("Code"); }
+            if ($fieldlist[$field]=='libelle' || $fieldlist[$field]=='label')
+            {
+            	$valuetoshow=$langs->trans("Label");
+            	if ($id != 25) $valuetoshow.="*";
+            }
+            if ($fieldlist[$field]=='libelle_facture') { $valuetoshow=$langs->trans("LabelOnDocuments")."*"; }
+            if ($fieldlist[$field]=='country')         {
+                if (in_array('region_id',$fieldlist)) { print '<td>&nbsp;</td>'; continue; }		// For region page, we do not show the country input
+                $valuetoshow=$langs->trans("Country");
+            }
+            if ($fieldlist[$field]=='recuperableonly') { $valuetoshow=$langs->trans("NPR"); $align="center"; }
+            if ($fieldlist[$field]=='nbjour')          { $valuetoshow=$langs->trans("NbOfDays"); }
+            if ($fieldlist[$field]=='type_cdr')        { $valuetoshow=$langs->trans("AtEndOfMonth"); $align="center"; }
+            if ($fieldlist[$field]=='decalage')        { $valuetoshow=$langs->trans("Offset"); }
+            if ($fieldlist[$field]=='width' || $fieldlist[$field]=='nx') { $valuetoshow=$langs->trans("Width"); }
+            if ($fieldlist[$field]=='height' || $fieldlist[$field]=='ny') { $valuetoshow=$langs->trans("Height"); }
+            if ($fieldlist[$field]=='unit' || $fieldlist[$field]=='metric') { $valuetoshow=$langs->trans("MeasuringUnit"); }
+            if ($fieldlist[$field]=='region_id' || $fieldlist[$field]=='country_id') { $valuetoshow=''; }
+            if ($fieldlist[$field]=='accountancy_code'){ $valuetoshow=$langs->trans("AccountancyCode"); }
+            if ($fieldlist[$field]=='accountancy_code_sell'){ $valuetoshow=$langs->trans("AccountancyCodeSell"); }
+            if ($fieldlist[$field]=='accountancy_code_buy'){ $valuetoshow=$langs->trans("AccountancyCodeBuy"); }
+            if ($fieldlist[$field]=='pcg_version' || $fieldlist[$field]=='fk_pcg_version') { $valuetoshow=$langs->trans("Pcg_version"); }
+            if ($fieldlist[$field]=='account_parent')  { $valuetoshow=$langs->trans("Accountparent"); }
+            if ($fieldlist[$field]=='pcg_type')        { $valuetoshow=$langs->trans("Pcg_type"); }
+            if ($fieldlist[$field]=='pcg_subtype')     { $valuetoshow=$langs->trans("Pcg_subtype"); }
+            if ($fieldlist[$field]=='sortorder')       { $valuetoshow=$langs->trans("SortOrder"); }
+	        if ($fieldlist[$field]=='short_label')     { $valuetoshow=$langs->trans("ShortLabel"); }
+            if ($fieldlist[$field]=='type_template')   { $valuetoshow=$langs->trans("TypeOfTemplate"); }
+			if ($fieldlist[$field]=='range_account')   { $valuetoshow=$langs->trans("Range"); }
+			if ($fieldlist[$field]=='sens')            { $valuetoshow=$langs->trans("Sens"); }
+			if ($fieldlist[$field]=='category_type')   { $valuetoshow=$langs->trans("Calculated"); }
+			if ($fieldlist[$field]=='formula')         { $valuetoshow=$langs->trans("Formula"); }
+			if ($fieldlist[$field]=='paper_size')      { $valuetoshow=$langs->trans("PaperSize"); }
+			if ($fieldlist[$field]=='orientation')     { $valuetoshow=$langs->trans("Orientation"); }
+			if ($fieldlist[$field]=='leftmargin')      { $valuetoshow=$langs->trans("LeftMargin"); }
+			if ($fieldlist[$field]=='topmargin')       { $valuetoshow=$langs->trans("TopMargin"); }
+			if ($fieldlist[$field]=='spacex')          { $valuetoshow=$langs->trans("SpaceX"); }
+			if ($fieldlist[$field]=='spacey')          { $valuetoshow=$langs->trans("SpaceY"); }
+			if ($fieldlist[$field]=='font_size')       { $valuetoshow=$langs->trans("FontSize"); }
+			if ($fieldlist[$field]=='custom_x')        { $valuetoshow=$langs->trans("CustomX"); }
+			if ($fieldlist[$field]=='custom_y')        { $valuetoshow=$langs->trans("CustomY"); }
+			if ($fieldlist[$field]=='content')         { $valuetoshow=$langs->trans("Content"); }
+			if ($fieldlist[$field]=='percent')         { $valuetoshow=$langs->trans("Percentage"); }
+			if ($fieldlist[$field]=='affect')          { $valuetoshow=$langs->trans("Info"); }
+			if ($fieldlist[$field]=='delay')           { $valuetoshow=$langs->trans("NoticePeriod"); }
+			if ($fieldlist[$field]=='newbymonth')      { $valuetoshow=$langs->trans("NewByMonth"); }
+				
+            if ($id == 2)	// Special cas for state page
+            {
+            	if ($fieldlist[$field]=='region_id') { $valuetoshow='&nbsp;'; $showfield=1; }
+	            if ($fieldlist[$field]=='region') { $valuetoshow=$langs->trans("Country").'/'.$langs->trans("Region"); $showfield=1; }
+            }
+
+            if ($valuetoshow != '')
+            {
+                print '<td align="'.$align.'">';
+            	if (! empty($tabhelp[$id][$value]) && preg_match('/^http(s*):/i',$tabhelp[$id][$value])) print '<a href="'.$tabhelp[$id][$value].'" target="_blank">'.$valuetoshow.' '.img_help(1,$valuetoshow).'</a>';
+            	else if (! empty($tabhelp[$id][$value])) print $form->textwithpicto($valuetoshow,$tabhelp[$id][$value]);
+            	else print $valuetoshow;
+                print '</td>';
+             }
+             if ($fieldlist[$field]=='libelle' || $fieldlist[$field]=='label') $alabelisused=1;
+        }
+
+        if ($id == 4) print '<td></td>';
+        print '<td>';
+        print '<input type="hidden" name="id" value="'.$id.'">';
+        print '</td>';
+        print '<td style="min-width: 26px;"></td>';
+        print '<td style="min-width: 26px;"></td>';
+        print '<td style="min-width: 26px;"></td>';
+        print '</tr>';
+
+        // Line to enter new values
+        print "<tr ".$bcnd[$var].">";
+
+        $obj = new stdClass();
+        // If data was already input, we define them in obj to populate input fields.
+        if (GETPOST('actionadd'))
+        {
+            foreach ($fieldlist as $key=>$val)
+            {
+                if (GETPOST($val) != '')
+                	$obj->$val=GETPOST($val);
+            }
+        }
+
+        $tmpaction = 'create';
+        $parameters=array('fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
+        $reshook=$hookmanager->executeHooks('createDictionaryFieldlist',$parameters, $obj, $tmpaction);    // Note that $action and $object may have been modified by some hooks
+        $error=$hookmanager->error; $errors=$hookmanager->errors;
+
+        if (empty($reshook))
+        {
+        	if ($tabname[$id] == MAIN_DB_PREFIX.'c_email_templates' && $action == 'edit')
+        	{
+				fieldList($fieldlist,$obj,$tabname[$id],'hide');
+        	}
+        	else
+        	{
+        		fieldList($fieldlist,$obj,$tabname[$id],'add');
+        	}
+        }
+
+        print '<td colspan="4" align="right">';
+        if ($tabname[$id] != MAIN_DB_PREFIX.'c_email_templates' || $action != 'edit')
+        {
+        	print '<input type="submit" class="button" name="actionadd" value="'.$langs->trans("Add").'">';
+        }
+        print '</td>';
+        print "</tr>";
+
+        if ($tabname[$id] == MAIN_DB_PREFIX.'c_email_templates')
+        {
+        	print '<tr><td colspan="8">* '.$langs->trans("AvailableVariables").": ";
+        	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
+        	$formmail=new FormMail($db);
+        	$tmp=$formmail->getAvailableSubstitKey('form');
+        	print implode(', ', $tmp);
+        	print '</td></tr>';
+        }
+
+        $colspan=count($fieldlist)+3;
+        if ($id == 4) $colspan++;
+
+        if (! empty($alabelisused))  // If there is one label among fields, we show legend of *
+        {
+        	print '<tr><td colspan="'.$colspan.'">* '.$langs->trans("LabelUsedByDefault").'.</td></tr>';
+        }
+        print '<tr><td colspan="'.$colspan.'">&nbsp;</td></tr>';	// Keep &nbsp; to have a line with enough height
+    }
+
+
+
+    // List of available record in database
+    dol_syslog("htdocs/admin/dict", LOG_DEBUG);
+    $resql=$db->query($sql);
+    if ($resql)
+    {
+        $num = $db->num_rows($resql);
+        $i = 0;
+        $var=true;
+
+        $param = '&id='.$id;
+        if ($search_country_id > 0) $param.= '&search_country_id='.$search_country_id;
+        $paramwithsearch = $param;
+        if ($sortorder) $paramwithsearch.= '&sortorder='.$sortorder;
+        if ($sortfield) $paramwithsearch.= '&sortfield='.$sortfield;
+        if (GETPOST('from')) $paramwithsearch.= '&from='.GETPOST('from','alpha');
+        
+        // There is several pages
+        if ($num > $listlimit)
+        {
+            print '<tr class="none"><td align="right" colspan="'.(3+count($fieldlist)).'">';
+            print_fleche_navigation($page, $_SERVER["PHP_SELF"], $paramwithsearch, ($num > $listlimit), '<li class="pagination"><span>'.$langs->trans("Page").' '.($page+1).'</span></li>');
+            print '</td></tr>';
+        }
+
+        // Title of lines
+        print '<tr class="liste_titre liste_titre_add">';
+        foreach ($fieldlist as $field => $value)
+        {
+            // Determine le nom du champ par rapport aux noms possibles
+            // dans les dictionnaires de donnees
+            $showfield=1;							  	// By defaut
+            $align="left";
+            $sortable=1;
+            $valuetoshow='';
+            /*
+            $tmparray=getLabelOfField($fieldlist[$field]);
+            $showfield=$tmp['showfield'];
+            $valuetoshow=$tmp['valuetoshow'];
+            $align=$tmp['align'];
+            $sortable=$tmp['sortable'];
+			*/
+            $valuetoshow=ucfirst($fieldlist[$field]);   // By defaut
+            $valuetoshow=$langs->trans($valuetoshow);   // try to translate
+            if ($fieldlist[$field]=='source')          { $valuetoshow=$langs->trans("Contact"); }
+            if ($fieldlist[$field]=='price')           { $valuetoshow=$langs->trans("PriceUHT"); }
+            if ($fieldlist[$field]=='taux')            {
+				if ($tabname[$id] != MAIN_DB_PREFIX."c_revenuestamp") $valuetoshow=$langs->trans("Rate");
+				else $valuetoshow=$langs->trans("Amount");
+				$align='center';
+            }
+            if ($fieldlist[$field]=='localtax1_type')  { $valuetoshow=$langs->trans("UseLocalTax")." 2"; $align="center"; $sortable=0; }
+            if ($fieldlist[$field]=='localtax1')       { $valuetoshow=$langs->trans("Rate")." 2"; $align="center"; $sortable=0; }
+            if ($fieldlist[$field]=='localtax2_type')  { $valuetoshow=$langs->trans("UseLocalTax")." 3"; $align="center"; $sortable=0; }
+            if ($fieldlist[$field]=='localtax2')       { $valuetoshow=$langs->trans("Rate")." 3"; $align="center"; $sortable=0; }
+            if ($fieldlist[$field]=='organization')    { $valuetoshow=$langs->trans("Organization"); }
+            if ($fieldlist[$field]=='lang')            { $valuetoshow=$langs->trans("Language"); }
+            if ($fieldlist[$field]=='type')            { $valuetoshow=$langs->trans("Type"); }
+            if ($fieldlist[$field]=='code')            { $valuetoshow=$langs->trans("Code"); }
+            if ($fieldlist[$field]=='libelle' || $fieldlist[$field]=='label')
+            {
+            	$valuetoshow=$langs->trans("Label");
+               	if ($id != 25) $valuetoshow.="*";
+            }
+            if ($fieldlist[$field]=='libelle_facture') { $valuetoshow=$langs->trans("LabelOnDocuments")."*"; }
+            if ($fieldlist[$field]=='country')         { $valuetoshow=$langs->trans("Country"); }
+            if ($fieldlist[$field]=='recuperableonly') { $valuetoshow=$langs->trans("NPR"); $align="center"; }
+            if ($fieldlist[$field]=='nbjour')          { $valuetoshow=$langs->trans("NbOfDays"); }
+            if ($fieldlist[$field]=='type_cdr')        { $valuetoshow=$langs->trans("AtEndOfMonth"); $align="center"; }
+            if ($fieldlist[$field]=='decalage')        { $valuetoshow=$langs->trans("Offset"); }
+            if ($fieldlist[$field]=='width' || $fieldlist[$field]=='nx') { $valuetoshow=$langs->trans("Width"); }
+            if ($fieldlist[$field]=='height' || $fieldlist[$field]=='ny') { $valuetoshow=$langs->trans("Height"); }
+            if ($fieldlist[$field]=='unit' || $fieldlist[$field]=='metric') { $valuetoshow=$langs->trans("MeasuringUnit"); }
+            if ($fieldlist[$field]=='region_id' || $fieldlist[$field]=='country_id') { $showfield=0; }
+            if ($fieldlist[$field]=='accountancy_code'){ $valuetoshow=$langs->trans("AccountancyCode"); }
+            if ($fieldlist[$field]=='accountancy_code_sell'){ $valuetoshow=$langs->trans("AccountancyCodeSell"); $sortable=0; }
+            if ($fieldlist[$field]=='accountancy_code_buy'){ $valuetoshow=$langs->trans("AccountancyCodeBuy"); $sortable=0; }
+			if ($fieldlist[$field]=='fk_pcg_version')  { $valuetoshow=$langs->trans("Pcg_version"); }
+            if ($fieldlist[$field]=='account_parent')  { $valuetoshow=$langs->trans("Accountsparent"); }
+            if ($fieldlist[$field]=='pcg_type')        { $valuetoshow=$langs->trans("Pcg_type"); }
+            if ($fieldlist[$field]=='pcg_subtype')     { $valuetoshow=$langs->trans("Pcg_subtype"); }
+            if ($fieldlist[$field]=='sortorder')       { $valuetoshow=$langs->trans("SortOrder"); }
+            if ($fieldlist[$field]=='short_label')     { $valuetoshow=$langs->trans("ShortLabel"); }
+        	if ($fieldlist[$field]=='type_template')   { $valuetoshow=$langs->trans("TypeOfTemplate"); }
+			if ($fieldlist[$field]=='range_account')   { $valuetoshow=$langs->trans("Range"); }
+			if ($fieldlist[$field]=='sens')            { $valuetoshow=$langs->trans("Sens"); }
+			if ($fieldlist[$field]=='category_type')   { $valuetoshow=$langs->trans("Calculated"); }
+			if ($fieldlist[$field]=='formula')         { $valuetoshow=$langs->trans("Formula"); }
+			if ($fieldlist[$field]=='paper_size')      { $valuetoshow=$langs->trans("PaperSize"); }
+			if ($fieldlist[$field]=='orientation')     { $valuetoshow=$langs->trans("Orientation"); }
+			if ($fieldlist[$field]=='leftmargin')      { $valuetoshow=$langs->trans("LeftMargin"); }
+			if ($fieldlist[$field]=='topmargin')       { $valuetoshow=$langs->trans("TopMargin"); }
+			if ($fieldlist[$field]=='spacex')          { $valuetoshow=$langs->trans("SpaceX"); }
+			if ($fieldlist[$field]=='spacey')          { $valuetoshow=$langs->trans("SpaceY"); }
+			if ($fieldlist[$field]=='font_size')       { $valuetoshow=$langs->trans("FontSize"); }
+			if ($fieldlist[$field]=='custom_x')        { $valuetoshow=$langs->trans("CustomX"); }
+			if ($fieldlist[$field]=='custom_y')        { $valuetoshow=$langs->trans("CustomY"); }
+			if ($fieldlist[$field]=='content')         { $valuetoshow=$langs->trans("Content"); }
+			if ($fieldlist[$field]=='percent')         { $valuetoshow=$langs->trans("Percentage"); }
+			if ($fieldlist[$field]=='affect')          { $valuetoshow=$langs->trans("Info"); }
+			if ($fieldlist[$field]=='delay')           { $valuetoshow=$langs->trans("NoticePeriod"); }
+			if ($fieldlist[$field]=='newbymonth')      { $valuetoshow=$langs->trans("NewByMonth"); }
+
+            // Affiche nom du champ
+            if ($showfield)
+            {
+                print getTitleFieldOfList($valuetoshow, 0, $_SERVER["PHP_SELF"], ($sortable?$fieldlist[$field]:''), ($page?'page='.$page.'&':''), $param, "align=".$align, $sortfield, $sortorder);
+            }
+        }
+		// Favorite - Only activated on country dictionary
+        if ($id == 4) print getTitleFieldOfList($langs->trans("Favorite"), 0, $_SERVER["PHP_SELF"], "favorite", ($page?'page='.$page.'&':''), $param, 'align="center"', $sortfield, $sortorder);
+
+		print getTitleFieldOfList($langs->trans("Status"), 0, $_SERVER["PHP_SELF"], "active", ($page?'page='.$page.'&':''), $param, 'align="center"', $sortfield, $sortorder);
+        print getTitleFieldOfList('');
+        print getTitleFieldOfList('');
+        print getTitleFieldOfList('');
+        print '</tr>';
+
+        // Title line with search boxes
+        print '<tr class="liste_titre">';
+        $filterfound=0;
+        foreach ($fieldlist as $field => $value)
+        {
+            $showfield=1;							  	// By defaut
+            
+            if ($fieldlist[$field]=='region_id' || $fieldlist[$field]=='country_id') { $showfield=0; }
+            
+            if ($showfield)
+            {
+                if ($value == 'country')
+                {
+                    print '<td class="liste_titre">';
+                    print $form->select_country($search_country_id, 'search_country_id', '', 28, 'maxwidth200 maxwidthonsmartphone');
+                    print '</td>';
+                    $filterfound++;
+                }
+                else
+                {
+                    print '<td class="liste_titre"></td>';
+                }
+            }
+        }
+        if ($id == 4) print '<td></td>';
+        print '<td class="liste_titre"></td>';
+    	print '<td class="liste_titre" colspan="3" align="center">';
+    	if ($filterfound)
+    	{
+        	$searchpitco=$form->showFilterAndCheckAddButtons(0);
+        	print $searchpitco;
+    	}
+    	print '</td>';
+        print '</tr>';
+            
+        if ($num)
+        {
+            // Lines with values
+            while ($i < $num)
+            {
+                $var = ! $var;
+
+                $obj = $db->fetch_object($resql);
+                //print_r($obj);
+                print '<tr '.$bc[$var].' id="rowid-'.$obj->rowid.'">';
+                if ($action == 'edit' && ($rowid == (! empty($obj->rowid)?$obj->rowid:$obj->code)))
+                {
+                    $tmpaction='edit';
+                    $parameters=array('fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
+                    $reshook=$hookmanager->executeHooks('editDictionaryFieldlist',$parameters,$obj, $tmpaction);    // Note that $action and $object may have been modified by some hooks
+                    $error=$hookmanager->error; $errors=$hookmanager->errors;
+
+                    // Show fields
+                    if (empty($reshook)) fieldList($fieldlist,$obj,$tabname[$id],'edit');
+
+                    print '<td colspan="3" align="center">';
+                    print '<input type="hidden" name="page" value="'.$page.'">';
+                    print '<input type="hidden" name="rowid" value="'.$rowid.'">';
+                    print '<input type="submit" class="button" name="actionmodify" value="'.$langs->trans("Modify").'">';
+                    print '<div name="'.(! empty($obj->rowid)?$obj->rowid:$obj->code).'"></div>';
+                    print '<input type="submit" class="button" name="actioncancel" value="'.$langs->trans("Cancel").'">';
+                    print '</td>';
+                }
+                else
+                {
+	              	$tmpaction = 'view';
+                    $parameters=array('var'=>$var, 'fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
+                    $reshook=$hookmanager->executeHooks('viewDictionaryFieldlist',$parameters,$obj, $tmpaction);    // Note that $action and $object may have been modified by some hooks
+
+                    $error=$hookmanager->error; $errors=$hookmanager->errors;
+
+                    if (empty($reshook))
+                    {
+                        foreach ($fieldlist as $field => $value)
+                        {
+                            
+                            $showfield=1;
+                        	$align="left";
+                            $valuetoshow=$obj->{$fieldlist[$field]};
+                            if ($value == 'type_template')
+                            {
+                                $valuetoshow = isset($elementList[$valuetoshow])?$elementList[$valuetoshow]:$valuetoshow;
+                            }
+                            if ($value == 'element')
+                            {
+                                $valuetoshow = isset($elementList[$valuetoshow])?$elementList[$valuetoshow]:$valuetoshow;
+                            }
+                            else if ($value == 'source')
+                            {
+                                $valuetoshow = isset($sourceList[$valuetoshow])?$sourceList[$valuetoshow]:$valuetoshow;
+                            }
+                            else if ($valuetoshow=='all') {
+                                $valuetoshow=$langs->trans('All');
+                            }
+                            else if ($fieldlist[$field]=='country') {
+                                if (empty($obj->country_code))
+                                {
+                                    $valuetoshow='-';
+                                }
+                                else
+                                {
+                                    $key=$langs->trans("Country".strtoupper($obj->country_code));
+                                    $valuetoshow=($key != "Country".strtoupper($obj->country_code)?$obj->country_code." - ".$key:$obj->country);
+                                }
+                            }
+                            else if ($fieldlist[$field]=='recuperableonly' || $fieldlist[$field] == 'deductible' || $fieldlist[$field] == 'category_type') {
+                                $valuetoshow=yn($valuetoshow);
+                                $align="center";
+                            }
+                            else if ($fieldlist[$field]=='type_cdr') {
+                				if(empty($valuetoshow)) $valuetoshow = $langs->trans('None');
+                				elseif($valuetoshow == 1) $valuetoshow = $langs->trans('AtEndOfMonth');
+                				elseif($valuetoshow == 2) $valuetoshow = $langs->trans('CurrentNext');
+                                $align="center";
+                            }
+                            else if ($fieldlist[$field]=='price' || preg_match('/^amount/i',$fieldlist[$field])) {
+                                $valuetoshow=price($valuetoshow);
+                            }
+                            else if ($fieldlist[$field]=='libelle_facture') {
+                                $langs->load("bills");
+                                $key=$langs->trans("PaymentCondition".strtoupper($obj->code));
+                                $valuetoshow=($obj->code && $key != "PaymentCondition".strtoupper($obj->code)?$key:$obj->{$fieldlist[$field]});
+                                $valuetoshow=nl2br($valuetoshow);
+                            }
+                            else if ($fieldlist[$field]=='label' && $tabname[$id]==MAIN_DB_PREFIX.'c_country') {
+                                $key=$langs->trans("Country".strtoupper($obj->code));
+                                $valuetoshow=($obj->code && $key != "Country".strtoupper($obj->code)?$key:$obj->{$fieldlist[$field]});
+                            }
+                            else if ($fieldlist[$field]=='label' && $tabname[$id]==MAIN_DB_PREFIX.'c_availability') {
+                                $langs->load("propal");
+                                $key=$langs->trans("AvailabilityType".strtoupper($obj->code));
+                                $valuetoshow=($obj->code && $key != "AvailabilityType".strtoupper($obj->code)?$key:$obj->{$fieldlist[$field]});
+                            }
+                            else if ($fieldlist[$field]=='libelle' && $tabname[$id]==MAIN_DB_PREFIX.'c_actioncomm') {
+                                $key=$langs->trans("Action".strtoupper($obj->code));
+                                $valuetoshow=($obj->code && $key != "Action".strtoupper($obj->code)?$key:$obj->{$fieldlist[$field]});
+                            }
+                            else if (! empty($obj->code_iso) && $fieldlist[$field]=='label' && $tabname[$id]==MAIN_DB_PREFIX.'c_currencies') {
+                                $key=$langs->trans("Currency".strtoupper($obj->code_iso));
+                                $valuetoshow=($obj->code_iso && $key != "Currency".strtoupper($obj->code_iso)?$key:$obj->{$fieldlist[$field]});
+                            }
+                            else if ($fieldlist[$field]=='libelle' && $tabname[$id]==MAIN_DB_PREFIX.'c_typent') {
+                                $key=$langs->trans(strtoupper($obj->code));
+                                $valuetoshow=($key != strtoupper($obj->code)?$key:$obj->{$fieldlist[$field]});
+                            }
+                            else if ($fieldlist[$field]=='libelle' && $tabname[$id]==MAIN_DB_PREFIX.'c_prospectlevel') {
+                                $key=$langs->trans(strtoupper($obj->code));
+                                $valuetoshow=($key != strtoupper($obj->code)?$key:$obj->{$fieldlist[$field]});
+                            }
+                            else if ($fieldlist[$field]=='label' && $tabname[$id]==MAIN_DB_PREFIX.'c_civility') {
+                                $key=$langs->trans("Civility".strtoupper($obj->code));
+                                $valuetoshow=($obj->code && $key != "Civility".strtoupper($obj->code)?$key:$obj->{$fieldlist[$field]});
+                            }
+                            else if ($fieldlist[$field]=='libelle' && $tabname[$id]==MAIN_DB_PREFIX.'c_type_contact') {
+                            	$langs->load('agenda');
+                                $key=$langs->trans("TypeContact_".$obj->element."_".$obj->source."_".strtoupper($obj->code));
+                                $valuetoshow=($obj->code && $key != "TypeContact_".$obj->element."_".$obj->source."_".strtoupper($obj->code)?$key:$obj->{$fieldlist[$field]});
+                            }
+                            else if ($fieldlist[$field]=='libelle' && $tabname[$id]==MAIN_DB_PREFIX.'c_payment_term') {
+                                $langs->load("bills");
+                                $key=$langs->trans("PaymentConditionShort".strtoupper($obj->code));
+                                $valuetoshow=($obj->code && $key != "PaymentConditionShort".strtoupper($obj->code)?$key:$obj->{$fieldlist[$field]});
+                            }
+                            else if ($fieldlist[$field]=='libelle' && $tabname[$id]==MAIN_DB_PREFIX.'c_paiement') {
+                                $langs->load("bills");
+                                $key=$langs->trans("PaymentType".strtoupper($obj->code));
+                                $valuetoshow=($obj->code && $key != "PaymentType".strtoupper($obj->code)?$key:$obj->{$fieldlist[$field]});
+                            }
+                            else if ($fieldlist[$field]=='label' && $tabname[$id]==MAIN_DB_PREFIX.'c_input_reason') {
+                                $key=$langs->trans("DemandReasonType".strtoupper($obj->code));
+                                $valuetoshow=($obj->code && $key != "DemandReasonType".strtoupper($obj->code)?$key:$obj->{$fieldlist[$field]});
+                            }
+                            else if ($fieldlist[$field]=='libelle' && $tabname[$id]==MAIN_DB_PREFIX.'c_input_method') {
+                                $langs->load("orders");
+                                $key=$langs->trans($obj->code);
+                                $valuetoshow=($obj->code && $key != $obj->code)?$key:$obj->{$fieldlist[$field]};
+                            }
+                            else if ($fieldlist[$field]=='libelle' && $tabname[$id]==MAIN_DB_PREFIX.'c_shipment_mode') {
+                                $langs->load("sendings");
+                                $key=$langs->trans("SendingMethod".strtoupper($obj->code));
+                                $valuetoshow=($obj->code && $key != "SendingMethod".strtoupper($obj->code)?$key:$obj->{$fieldlist[$field]});
+                            }
+                            else if ($fieldlist[$field] == 'libelle' && $tabname[$id]==MAIN_DB_PREFIX.'c_paper_format')
+                            {
+                                $key = $langs->trans('PaperFormat'.strtoupper($obj->code));
+                                $valuetoshow = ($obj->code && $key != 'PaperFormat'.strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
+                            }
+                            else if ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_type_fees')
+                            {
+                                $langs->load('trips');
+                                $key = $langs->trans(strtoupper($obj->code));
+                                $valuetoshow = ($obj->code && $key != strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
+                            }
+                            else if ($fieldlist[$field]=='region_id' || $fieldlist[$field]=='country_id') {
+                                $showfield=0;
+                            }
+                            else if ($fieldlist[$field]=='unicode') {
+                            	$valuetoshow = $langs->getCurrencySymbol($obj->code,1);
+                            }
+                            else if ($fieldlist[$field]=='label' && $tabname[$_GET["id"]]==MAIN_DB_PREFIX.'c_units') {
+	                            $langs->load("products");
+	                            $valuetoshow=$langs->trans($obj->{$fieldlist[$field]});
+                            }
+                            else if ($fieldlist[$field]=='short_label' && $tabname[$_GET["id"]]==MAIN_DB_PREFIX.'c_units') {
+	                            $langs->load("products");
+	                            $valuetoshow = $langs->trans($obj->{$fieldlist[$field]});
+                            }
+                            else if (($fieldlist[$field] == 'unit') && ($tabname[$id] == MAIN_DB_PREFIX.'c_paper_format'))
+                            {
+                            	$key = $langs->trans('SizeUnit'.strtolower($obj->unit));
+                                $valuetoshow = ($obj->code && $key != 'SizeUnit'.strtolower($obj->unit) ? $key : $obj->{$fieldlist[$field]});
+                            }
+							else if ($fieldlist[$field]=='localtax1' || $fieldlist[$field]=='localtax2') {
+							    $align="center";
+							}
+							else if ($fieldlist[$field]=='localtax1_type') {
+                              if ($obj->localtax1 != 0)
+							    $valuetoshow=$localtax_typeList[$valuetoshow];
+							  else
+							    $valuetoshow = '';
+							  $align="center";
+							}
+							else if ($fieldlist[$field]=='localtax2_type') {
+							 if ($obj->localtax2 != 0)
+							    $valuetoshow=$localtax_typeList[$valuetoshow];
+							  else
+							    $valuetoshow = '';
+							  $align="center";
+							}
+							else if ($fieldlist[$field]=='taux') {
+                                $valuetoshow = price($valuetoshow, 0, $langs, 0, 0);
+							    $align="center";
+							}
+							else if (in_array($fieldlist[$field],array('recuperableonly')))
+							{
+								$align="center";
+							}
+							else if ($fieldlist[$field]=='accountancy_code' || $fieldlist[$field]=='accountancy_code_sell' || $fieldlist[$field]=='accountancy_code_buy') {
+                                $valuetoshow = length_accountg($valuetoshow);
+                            }
+
+                            $class='tddict';
+                            if ($fieldlist[$field] == 'tracking') $class.=' tdoverflowauto';
+							// Show value for field
+							if ($showfield) print '<!-- '.$fieldlist[$field].' --><td align="'.$align.'" class="'.$class.'">'.$valuetoshow.'</td>';
+                        }
+                    }
+
+                    // Can an entry be erased or disabled ?
+                    $iserasable=1;$canbedisabled=1;$canbemodified=1;	// true by default
+                    if (isset($obj->code) && $id != 10)
+                    {
+                    	if (($obj->code == '0' || $obj->code == '' || preg_match('/unknown/i',$obj->code))) { $iserasable = 0; $canbedisabled = 0; }
+                    	else if ($obj->code == 'RECEP') { $iserasable = 0; $canbedisabled = 0; }
+                    	else if ($obj->code == 'EF0')   { $iserasable = 0; $canbedisabled = 0; }
+                    }
+
+                    if (isset($obj->type) && in_array($obj->type, array('system', 'systemauto'))) { $iserasable=0; }
+                    if (in_array($obj->code, array('AC_OTH','AC_OTH_AUTO')) || in_array($obj->type, array('systemauto'))) { $canbedisabled=0; $canbedisabled = 0; }
+                    $canbemodified=$iserasable;
+                    if ($obj->code == 'RECEP') $canbemodified=1;
+
+                    $url = $_SERVER["PHP_SELF"].'?'.($page?'page='.$page.'&':'').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.(! empty($obj->rowid)?$obj->rowid:(! empty($obj->code)?$obj->code:'')).'&code='.(! empty($obj->code)?urlencode($obj->code):'');
+                    if ($param) $url .= '&'.$param;
+                    $url.='&';
+
+					// Favorite
+					// Only activated on country dictionary
+                    if ($id == 4)
+					{
+						print '<td align="center" class="nowrap">';
+						if ($iserasable) print '<a href="'.$url.'action='.$acts[$obj->favorite].'_favorite">'.$actl[$obj->favorite].'</a>';
+						else print $langs->trans("AlwaysActive");
+						print '</td>';
+					}
+
+                    // Active
+                    print '<td align="center" class="nowrap">';
+                    if ($canbedisabled) print '<a href="'.$url.'action='.$acts[$obj->active].'">'.$actl[$obj->active].'</a>';
+                    else
+                 	{
+                 		if (in_array($obj->code, array('AC_OTH','AC_OTH_AUTO'))) print $langs->trans("AlwaysActive");
+                 		else if (isset($obj->type) && in_array($obj->type, array('systemauto')) && empty($obj->active)) print $langs->trans("Deprecated");
+                  		else if (isset($obj->type) && in_array($obj->type, array('system')) && ! empty($obj->active) && $obj->code != 'AC_OTH') print $langs->trans("UsedOnlyWithTypeOption");
+                    	else print $langs->trans("AlwaysActive");
+                    }
+                    print "</td>";
+
+                    // Modify link
+                    if ($canbemodified) print '<td align="center"><a class="reposition" href="'.$url.'action=edit">'.img_edit().'</a></td>';
+                    else print '<td>&nbsp;</td>';
+
+                    // Delete link
+                    if ($iserasable)
+                    {
+                        print '<td align="center">';
+                        if ($user->admin) print '<a href="'.$url.'action=delete">'.img_delete().'</a>';
+                        //else print '<a href="#">'.img_delete().'</a>';    // Some dictionnary can be edited by other profile than admin
+                        print '</td>';
+                    }
+                    else print '<td>&nbsp;</td>';
+
+                    // Link to setup the group
+                    print '<td>';
+                    if (empty($obj->formula))
+                    {
+                        print '<a href="'.DOL_URL_ROOT.'/accountancy/admin/categories.php?action=display&account_category='.$obj->rowid.'">'.$langs->trans("Setup").'</a>';
+                    }
+                    print '</td>';
+                    print "</tr>\n";
+                }
+                $i++;
+            }
+        }
+    }
+    else {
+        dol_print_error($db);
+    }
+
+    print '</table>';
+
+    print '</form>';
+}
+
+print '<br>';
+
+
+llxFooter();
+$db->close();
+
+
+/**
+ *	Show fields in insert/edit mode
+ *
+ * 	@param		array	$fieldlist		Array of fields
+ * 	@param		Object	$obj			If we show a particular record, obj is filled with record fields
+ *  @param		string	$tabname		Name of SQL table
+ *  @param		string	$context		'add'=Output field for the "add form", 'edit'=Output field for the "edit form", 'hide'=Output field for the "add form" but we dont want it to be rendered
+ *	@return		void
+ */
+function fieldList($fieldlist, $obj='', $tabname='', $context='')
+{
+	global $conf,$langs,$db;
+	global $form;
+	global $region_id;
+	global $elementList,$sourceList,$localtax_typeList;
+	global $bc;
+
+	$formadmin = new FormAdmin($db);
+	$formcompany = new FormCompany($db);
+	if (! empty($conf->accounting->enabled)) $formaccountancy = new FormVentilation($db);
+
+	foreach ($fieldlist as $field => $value)
+	{
+		if ($fieldlist[$field] == 'country')
+		{
+			if (in_array('region_id',$fieldlist))
+			{
+				print '<td>';
+				//print join(',',$fieldlist);
+				print '</td>';
+				continue;
+			}	// For state page, we do not show the country input (we link to region, not country)
+			print '<td>';
+			$fieldname='country';
+			print $form->select_country((! empty($obj->country_code)?$obj->country_code:(! empty($obj->country)?$obj->country:'')), $fieldname, '', 28, 'maxwidth200 maxwidthonsmartphone');
+			print '</td>';
+		}
+		elseif ($fieldlist[$field] == 'country_id')
+		{
+			if (! in_array('country',$fieldlist))	// If there is already a field country, we don't show country_id (avoid duplicate)
+			{
+				$country_id = (! empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]} : 0);
+				print '<td>';
+				print '<input type="hidden" name="'.$fieldlist[$field].'" value="'.$country_id.'">';
+				print '</td>';
+			}
+		}
+		elseif ($fieldlist[$field] == 'region')
+		{
+			print '<td>';
+			$formcompany->select_region($region_id,'region');
+			print '</td>';
+		}
+		elseif ($fieldlist[$field] == 'region_id')
+		{
+			$region_id = (! empty($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:0);
+			print '<td>';
+			print '<input type="hidden" name="'.$fieldlist[$field].'" value="'.$region_id.'">';
+			print '</td>';
+		}
+		elseif ($fieldlist[$field] == 'lang')
+		{
+			print '<td>';
+			print $formadmin->select_language($conf->global->MAIN_LANG_DEFAULT,'lang');
+			print '</td>';
+		}
+		// Le type de template
+		elseif ($fieldlist[$field] == 'type_template')
+		{
+			print '<td>';
+			print $form->selectarray('type_template', $elementList,(! empty($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:''));
+			print '</td>';
+		}
+		// Le type de l'element (pour les type de contact)
+		elseif ($fieldlist[$field] == 'element')
+		{
+			print '<td>';
+			print $form->selectarray('element', $elementList,(! empty($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:''));
+			print '</td>';
+		}
+		// La source de l'element (pour les type de contact)
+		elseif ($fieldlist[$field] == 'source')
+		{
+			print '<td>';
+			print $form->selectarray('source', $sourceList,(! empty($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:''));
+			print '</td>';
+		}
+		elseif ($fieldlist[$field] == 'type' && $tabname == MAIN_DB_PREFIX."c_actioncomm")
+		{
+			print '<td>';
+			print 'user<input type="hidden" name="type" value="user">';
+			print '</td>';
+		}
+		elseif ($fieldlist[$field] == 'recuperableonly' || $fieldlist[$field] == 'type_cdr' || $fieldlist[$field] == 'deductible' || $fieldlist[$field] == 'category_type') {
+		    if ($fieldlist[$field] == 'type_cdr') print '<td align="center">';
+		    else print '<td>';
+			if ($fieldlist[$field] == 'type_cdr') {
+				print $form->selectarray($fieldlist[$field], array(0=>$langs->trans('None'), 1=>$langs->trans('AtEndOfMonth'), 2=>$langs->trans('CurrentNext')), (! empty($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:''));
+			} else {
+				print $form->selectyesno($fieldlist[$field],(! empty($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:''),1);
+			}
+			print '</td>';
+		}
+		elseif (in_array($fieldlist[$field],array('nbjour','decalage','taux','localtax1','localtax2'))) {
+			$align="left";
+			if (in_array($fieldlist[$field],array('taux','localtax1','localtax2'))) $align="center";	// Fields aligned on right
+			print '<td align="'.$align.'">';
+			print '<input type="text" class="flat" value="'.(isset($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]} : '').'" size="3" name="'.$fieldlist[$field].'">';
+			print '</td>';
+		}
+		elseif (in_array($fieldlist[$field], array('libelle_facture'))) {
+			print '<td><textarea cols="30" rows="'.ROWS_2.'" class="flat" name="'.$fieldlist[$field].'">'.(! empty($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:'').'</textarea></td>';
+		}
+		elseif (in_array($fieldlist[$field], array('content')))
+		{
+			if ($tabname == MAIN_DB_PREFIX.'c_email_templates')
+			{
+				print '<td colspan="4"></td></tr><tr class="pair nohover"><td colspan="5">';		// To create an artificial CR for the current tr we are on
+			}
+			else print '<td>';
+			if ($context != 'hide')
+			{
+				//print '<textarea cols="3" rows="'.ROWS_2.'" class="flat" name="'.$fieldlist[$field].'">'.(! empty($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:'').'</textarea>';
+				$okforextended=true;
+				if ($tabname == MAIN_DB_PREFIX.'c_email_templates' && empty($conf->global->FCKEDITOR_ENABLE_MAIL)) $okforextended=false;
+				$doleditor = new DolEditor($fieldlist[$field], (! empty($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:''), '', 140, 'dolibarr_mailings', 'In', 0, false, $okforextended, ROWS_5, '90%');
+				print $doleditor->Create(1);
+			}
+			else print '&nbsp;';
+			print '</td>';
+		}
+		elseif ($fieldlist[$field] == 'price' || preg_match('/^amount/i',$fieldlist[$field])) {
+			print '<td><input type="text" class="flat minwidth75" value="'.price((! empty($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:'')).'" name="'.$fieldlist[$field].'"></td>';
+		}
+		elseif ($fieldlist[$field] == 'code' && isset($obj->{$fieldlist[$field]})) {
+			print '<td><input type="text" class="flat minwidth100" value="'.(! empty($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:'').'" name="'.$fieldlist[$field].'"></td>';
+		}
+		elseif ($fieldlist[$field]=='unit') {
+			print '<td>';
+			$units = array(
+					'mm' => $langs->trans('SizeUnitmm'),
+					'cm' => $langs->trans('SizeUnitcm'),
+					'point' => $langs->trans('SizeUnitpoint'),
+					'inch' => $langs->trans('SizeUnitinch')
+			);
+			print $form->selectarray('unit', $units, (! empty($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:''), 0, 0, 0);
+			print '</td>';
+		}
+		// Le type de taxe locale
+		elseif ($fieldlist[$field] == 'localtax1_type' || $fieldlist[$field] == 'localtax2_type')
+		{
+			print '<td align="center">';
+			print $form->selectarray($fieldlist[$field], $localtax_typeList, (! empty($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:''));
+			print '</td>';
+		}
+		elseif ($fieldlist[$field] == 'accountancy_code' || $fieldlist[$field] == 'accountancy_code_sell' || $fieldlist[$field] == 'accountancy_code_buy')
+		{
+			print '<td>';
+			if (! empty($conf->accounting->enabled))
+			{
+			    $fieldname = $fieldlist[$field];
+				$accountancy_account = (! empty($obj->$fieldname) ? $obj->$fieldname : 0);
+				print $formaccountancy->select_account($accountancy_account, $fieldlist[$field], 1, '', 1, 1, 'maxwidth200 maxwidthonsmartphone');
+			}
+			else
+			{
+			    $fieldname = $fieldlist[$field];
+			    print '<input type="text" size="10" class="flat" value="'.(isset($obj->$fieldname)?$obj->$fieldname:'').'" name="'.$fieldlist[$field].'">';
+			}
+			print '</td>';
+		}
+		else
+		{
+			print '<td>';
+			$size=''; $class='';
+			if ($fieldlist[$field]=='code') $class='maxwidth100';
+			if ($fieldlist[$field]=='position') $class='maxwidth50';
+			if ($fieldlist[$field]=='libelle') $class='quatrevingtpercent';
+			if ($fieldlist[$field]=='tracking') $class='quatrevingtpercent';
+			if ($fieldlist[$field]=='sortorder' || $fieldlist[$field]=='sens' || $fieldlist[$field]=='category_type') $size='size="2" ';
+			print '<input type="text" '.$size.'class="flat'.($class?' '.$class:'').'" value="'.(isset($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:'').'" name="'.$fieldlist[$field].'">';
+			print '</td>';
+		}
+	}
+}
+
diff --git a/htdocs/accountancy/bookkeeping/balance.php b/htdocs/accountancy/bookkeeping/balance.php
index 53eaaba7c9c..8f6fab3ec3f 100644
--- a/htdocs/accountancy/bookkeeping/balance.php
+++ b/htdocs/accountancy/bookkeeping/balance.php
@@ -184,7 +184,7 @@ else {
     print '<table class="liste ' . ($moreforfilter ? "listwithfilterbefore" : "") . '">';
     print '<tr class="liste_titre">';
     print_liste_field_titre($langs->trans("AccountAccounting"), $_SERVER['PHP_SELF'], "t.numero_compte", "", $options, "", $sortfield, $sortorder);
-    print_liste_field_titre($langs->trans("Labelcompte"), $_SERVER['PHP_SELF'], "t.label_compte", "", $options, "", $sortfield, $sortorder);
+    print_liste_field_titre($langs->trans("Label"), $_SERVER['PHP_SELF'], "t.label_compte", "", $options, "", $sortfield, $sortorder);
     print_liste_field_titre($langs->trans("Debit"), $_SERVER['PHP_SELF'], "t.debit", "", $options, 'align="right"', $sortfield, $sortorder);
     print_liste_field_titre($langs->trans("Credit"), $_SERVER['PHP_SELF'], "t.credit", "", $options, 'align="right"', $sortfield, $sortorder);
     print_liste_field_titre($langs->trans("Solde"), $_SERVER["PHP_SELF"], "", $options, "", 'align="right"', $sortfield, $sortorder);
@@ -192,7 +192,7 @@ else {
     print "</tr>\n";
     
     print '<tr class="liste_titre">';
-    print '<td class="liste_titre center" colspan="2">';
+    print '<td class="liste_titre" colspan="2">';
     print $langs->trans('From');
     print $formventilation->select_account($search_accountancy_code_start, 'search_accountancy_code_start', 1, array(), 1, 1, '');
     print '<br>';
@@ -229,7 +229,7 @@ else {
         if (empty($description)) {
             $link = '<a href="../admin/card.php?action=create&compte=' . length_accountg($line->numero_compte) . '">' . img_edit_add() . '</a>';
         }
-        print '<tr' . $bc[$var] . '>';
+        print '<tr ' . $bc[$var] . '>';
         
         // Permet d'afficher le compte comptable
         if ($root_account_description != $displayed_account) {
diff --git a/htdocs/accountancy/bookkeeping/card.php b/htdocs/accountancy/bookkeeping/card.php
index 9d054dc3c2c..0ec4fb07a12 100644
--- a/htdocs/accountancy/bookkeeping/card.php
+++ b/htdocs/accountancy/bookkeeping/card.php
@@ -202,9 +202,11 @@ else if ($action == "confirm_create") {
 	}
 }
 
+
 /*
  * View
  */
+
 llxHeader();
 
 $html = new Form($db);
@@ -274,12 +276,12 @@ if ($action == 'create') {
 
 	print '<tr>';
 	print '<td>' . $langs->trans("Docref") . '</td>';
-	print '<td><input type="text" size="20" name="doc_ref" value=""/></td>';
+	print '<td><input type="text" class="minwidth200" name="doc_ref" value=""/></td>';
 	print '</tr>';
 
 	print '<tr>';
 	print '<td>' . $langs->trans("Doctype") . '</td>';
-	print '<td><input type="text" size="20" name="doc_type" value=""/></td>';
+	print '<td><input type="text" class="minwidth200" name="doc_type" value=""/></td>';
 	print '</tr>';
 
 	print '</table>';
@@ -345,6 +347,8 @@ if ($action == 'create') {
 			print '<input type="hidden" name="fk_doc" value="' . $book->fk_doc . '">' . "\n";
 			print '<input type="hidden" name="fk_docdet" value="' . $book->fk_docdet . '">' . "\n";
 
+			$var=False;
+			
 			print "<table class=\"noborder\" width=\"100%\">";
 			if (count($book->linesmvt) > 0) {
 
@@ -356,17 +360,17 @@ if ($action == 'create') {
 				print_liste_field_titre($langs->trans("AccountAccountingShort"));
 				print_liste_field_titre($langs->trans("Code_tiers"));
 				print_liste_field_titre($langs->trans("Labelcompte"));
-				print_liste_field_titre($langs->trans("Debit"), "", "", "", "", 'align="center"');
-				print_liste_field_titre($langs->trans("Credit"), "", "", "", "", 'align="center"');
-				print_liste_field_titre($langs->trans("Amount"), "", "", "", "", 'align="center"');
+				print_liste_field_titre($langs->trans("Debit"), "", "", "", "", 'align="right"');
+				print_liste_field_titre($langs->trans("Credit"), "", "", "", "", 'align="right"');
+				print_liste_field_titre($langs->trans("Amount"), "", "", "", "", 'align="right"');
 				print_liste_field_titre($langs->trans("Sens"), "", "", "", "", 'align="center"');
 				print_liste_field_titre($langs->trans("Action"), "", "", "", "", 'width="60" align="center"');
 
 				print "</tr>\n";
 
-				foreach ( $book->linesmvt as $line ) {
+				foreach ($book->linesmvt as $line) {
 					$var = ! $var;
-					print '<tr' . $bc[$var] . '>';
+					print '<tr ' . $bc[$var] . '>';
 
 					$total_debit += $line->debit;
 					$total_credit += $line->credit;
@@ -417,7 +421,7 @@ if ($action == 'create') {
 
 				if ($action == "" || $action == 'add') {
 					$var = ! $var;
-					print '<tr' . $bc[$var] . '>';
+					print '<tr ' . $bc[$var] . '>';
 					print '<td>';
 					print $formventilation->select_account($account_number, 'account_number', 0, array (), 1, 1, '');
 					print '</td>';
diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php
index 56cae24cf76..ae38233afac 100644
--- a/htdocs/accountancy/bookkeeping/list.php
+++ b/htdocs/accountancy/bookkeeping/list.php
@@ -105,7 +105,6 @@ if ($action != 'export_csv' && ! isset($_POST['begin']) && ! isset($_GET['begin'
 
 
 
-
 /*
  * Action
  */
@@ -132,74 +131,7 @@ if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETP
 	$search_date_end = '';
 }
 
-if ($action == 'delbookkeeping') {
-
-	$import_key = GETPOST('importkey', 'alpha');
-
-	if (! empty($import_key)) {
-		$result = $object->deleteByImportkey($import_key);
-		if ($result < 0) {
-			setEventMessages($object->error, $object->errors, 'errors');
-		}
-		Header("Location: list.php");
-		exit();
-	}
-}
-if ($action == 'delbookkeepingyearconfirm') {
-
-	$delyear = GETPOST('delyear', 'int');
-	if ($delyear==-1) {
-		$delyear=0;
-	}
-	$deljournal = GETPOST('deljournal','alpha');
-	if ($deljournal==-1) {
-		$deljournal=0;
-	}
-
-	if (! empty($delyear) || ! empty($deljournal)) 
-	{
-		$result = $object->deleteByYearAndJournal($delyear,$deljournal);
-		if ($result < 0) {
-			setEventMessages($object->error, $object->errors, 'errors');
-		}
-		else
-		{
-		    setEventMessages("RecordDeleted", null, 'mesgs');
-		}
-		Header("Location: list.php");
-		exit;
-	}
-	else
-	{
-	    setEventMessages("NoRecordDeleted", null, 'warnings');
-	    Header("Location: list.php");
-	    exit;
-	}
-}
-if ($action == 'delmouvconfirm') {
-
-	$mvt_num = GETPOST('mvt_num', 'int');
-
-	if (! empty($mvt_num)) {
-		$result = $object->deleteMvtNum($mvt_num);
-		if ($result < 0) {
-		    setEventMessages($object->error, $object->errors, 'errors');
-		}
-		else
-		{
-		    setEventMessages($langs->trans("RecordDeleted"), null, 'mesgs');
-		}
-		Header("Location: list.php");
-		exit;
-	}
-}
-
-
-
-/*
- * View
- */
-
+// Must be after the remove filter action, before the export.
 $param = '';
 $filter = array ();
 if (! empty($search_date_start)) {
@@ -266,6 +198,68 @@ if (! empty($search_mvt_num)) {
     $param .= '&search_mvt_num=' . $search_mvt_num;
 }
 
+if ($action == 'delbookkeeping') {
+
+	$import_key = GETPOST('importkey', 'alpha');
+
+	if (! empty($import_key)) {
+		$result = $object->deleteByImportkey($import_key);
+		if ($result < 0) {
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
+		Header("Location: list.php");
+		exit();
+	}
+}
+if ($action == 'delbookkeepingyearconfirm') {
+
+	$delyear = GETPOST('delyear', 'int');
+	if ($delyear==-1) {
+		$delyear=0;
+	}
+	$deljournal = GETPOST('deljournal','alpha');
+	if ($deljournal==-1) {
+		$deljournal=0;
+	}
+
+	if (! empty($delyear) || ! empty($deljournal)) 
+	{
+		$result = $object->deleteByYearAndJournal($delyear,$deljournal);
+		if ($result < 0) {
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
+		else
+		{
+		    setEventMessages("RecordDeleted", null, 'mesgs');
+		}
+		Header("Location: list.php");
+		exit;
+	}
+	else
+	{
+	    setEventMessages("NoRecordDeleted", null, 'warnings');
+	    Header("Location: list.php");
+	    exit;
+	}
+}
+if ($action == 'delmouvconfirm') {
+
+	$mvt_num = GETPOST('mvt_num', 'int');
+
+	if (! empty($mvt_num)) {
+		$result = $object->deleteMvtNum($mvt_num);
+		if ($result < 0) {
+		    setEventMessages($object->error, $object->errors, 'errors');
+		}
+		else
+		{
+		    setEventMessages($langs->trans("RecordDeleted"), null, 'mesgs');
+		}
+		Header("Location: list.php");
+		exit;
+	}
+}
+
 if ($action == 'export_csv') {
 
     include DOL_DOCUMENT_ROOT . '/accountancy/class/accountancyexport.class.php';
@@ -287,6 +281,11 @@ if ($action == 'export_csv') {
     }
 }
 
+
+/*
+ * View
+ */
+
 $title_page = $langs->trans("Bookkeeping");
 
 llxHeader('', $title_page);
@@ -378,15 +377,15 @@ print_liste_field_titre($langs->trans("Docdate"), $_SERVER['PHP_SELF'], "t.doc_d
 print_liste_field_titre($langs->trans("Docref"), $_SERVER['PHP_SELF'], "t.doc_ref", "", $param, "", $sortfield, $sortorder);
 print_liste_field_titre($langs->trans("AccountAccountingShort"), $_SERVER['PHP_SELF'], "t.numero_compte", "", $param, "", $sortfield, $sortorder);
 print_liste_field_titre($langs->trans("Code_tiers"), $_SERVER['PHP_SELF'], "t.code_tiers", "", $param, "", $sortfield, $sortorder);
-print_liste_field_titre($langs->trans("Labelcompte"), $_SERVER['PHP_SELF'], "t.label_compte", "", $param, "", $sortfield, $sortorder);
+print_liste_field_titre($langs->trans("Label"), $_SERVER['PHP_SELF'], "t.label_compte", "", $param, "", $sortfield, $sortorder);
 print_liste_field_titre($langs->trans("Debit"), $_SERVER['PHP_SELF'], "t.debit", "", $param, 'align="right"', $sortfield, $sortorder);
 print_liste_field_titre($langs->trans("Credit"), $_SERVER['PHP_SELF'], "t.credit", "", $param, 'align="right"', $sortfield, $sortorder);
-print_liste_field_titre($langs->trans("Codejournal"), $_SERVER['PHP_SELF'], "t.code_journal", "", $param, 'align="right"', $sortfield, $sortorder);
+print_liste_field_titre($langs->trans("Codejournal"), $_SERVER['PHP_SELF'], "t.code_journal", "", $param, 'align="center"', $sortfield, $sortorder);
 print_liste_field_titre('', $_SERVER["PHP_SELF"], "", $param, "", 'width="60" align="center"', $sortfield, $sortorder);
 print "</tr>\n";
 
 print '<tr class="liste_titre">';
-print '<td class="liste_titre center"><input type="text" name="search_mvt_num" size="6" value="' . $search_mvt_num . '"></td>';
+print '<td class="liste_titre"><input type="text" name="search_mvt_num" size="6" value="' . dol_escape_htmltag($search_mvt_num) . '"></td>';
 print '<td class="liste_titre center">';
 print $langs->trans('From') . ': ';
 print $form->select_date($search_date_start, 'date_start', 0, 0, 1);
@@ -394,15 +393,15 @@ print '<br>';
 print $langs->trans('to') . ': ';
 print $form->select_date($search_date_end, 'date_end', 0, 0, 1);
 print '</td>';
-print '<td class="liste_titre center"><input type="text" name="search_doc_ref" size="8" value="' . $search_doc_ref . '"></td>';
-print '<td class="liste_titre center">';
+print '<td class="liste_titre"><input type="text" name="search_doc_ref" size="8" value="' . dol_escape_htmltag($search_doc_ref) . '"></td>';
+print '<td class="liste_titre">';
 print $langs->trans('From');
 print $formventilation->select_account($search_accountancy_code_start, 'search_accountancy_code_start', 1, array (), 1, 1, '');
 print '<br>';
 print $langs->trans('to');
 print $formventilation->select_account($search_accountancy_code_end, 'search_accountancy_code_end', 1, array (), 1, 1, '');
 print '</td>';
-print '<td class="liste_titre center">';
+print '<td class="liste_titre">';
 print $langs->trans('From');
 print $formventilation->select_auxaccount($search_accountancy_aux_code_start, 'search_accountancy_aux_code_start', 1);
 print '<br>';
@@ -414,8 +413,8 @@ print '<input type="text" size="7" class="flat" name="search_mvt_label" value="'
 print '</td>';
 print '<td class="liste_titre center">&nbsp;</td>';
 print '<td class="liste_titre center">&nbsp;</td>';
-print '<td class="liste_titre center" align="right"><input type="text" name="search_ledger_code" size="3" value="' . $search_ledger_code . '"></td>';
-print '<td class="liste_titre center" align="right">';
+print '<td class="liste_titre center"><input type="text" name="search_ledger_code" size="3" value="' . $search_ledger_code . '"></td>';
+print '<td class="liste_titre center">';
 $searchpitco=$form->showFilterAndCheckAddButtons(0);
 print $searchpitco;
 print '</td>';
diff --git a/htdocs/accountancy/class/accountancycategory.class.php b/htdocs/accountancy/class/accountancycategory.class.php
index b2564c342e5..074a7f86c82 100644
--- a/htdocs/accountancy/class/accountancycategory.class.php
+++ b/htdocs/accountancy/class/accountancycategory.class.php
@@ -149,23 +149,27 @@ class AccountancyCategory
 		$sql .= " AND asy.rowid = " . $conf->global->CHARTOFACCOUNTS;
 		$sql .= " AND aa.active = 1";
 
+		$this->db->begin();
+		
 		dol_syslog(__METHOD__, LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if (! $resql) {
 			$error ++;
 			$this->errors[] = "Error " . $this->db->lasterror();
+			$this->db->rollback();
 			return -1;
 		}
 
-		$this->db->begin();
-		while ( $obj = $this->db->fetch_object($resql)) {
-			if (array_key_exists(length_accountg($obj->account_number), $cpts)) {
+		while ( $obj = $this->db->fetch_object($resql)) 
+		{
+			if (array_key_exists(length_accountg($obj->account_number), $cpts)) 
+			{
 				$sql = "UPDATE " . MAIN_DB_PREFIX . "accounting_account";
 				$sql .= " SET fk_accounting_category=" . $id_cat;
 				$sql .= " WHERE rowid=".$obj->rowid;
 				dol_syslog(__METHOD__, LOG_DEBUG);
-				$resql = $this->db->query($sql);
-				if (! $resql) {
+				$resqlupdate = $this->db->query($sql);
+				if (! $resqlupdate) {
 					$error ++;
 					$this->errors[] = "Error " . $this->db->lasterror();
 				}
diff --git a/htdocs/accountancy/customer/lines.php b/htdocs/accountancy/customer/lines.php
index 0e3f96a7457..d6f78df21e7 100644
--- a/htdocs/accountancy/customer/lines.php
+++ b/htdocs/accountancy/customer/lines.php
@@ -170,31 +170,31 @@ if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
 	$sql .= " AND f.type IN (" . Facture::TYPE_STANDARD . "," . Facture::TYPE_STANDARD . "," . Facture::TYPE_CREDIT_NOTE . "," . Facture::TYPE_DEPOSIT . "," . Facture::TYPE_SITUATION . ")";
 }
 if (strlen(trim($search_invoice))) {
-	$sql .= " AND f.facnumber like '%" . $search_invoice . "%'";
+	$sql .= natural_search("f.facnumber", $search_invoice);
 }
 if (strlen(trim($search_ref))) {
-	$sql .= " AND p.ref like '%" . $search_ref . "%'";
+	$sql .= natural_search("p.ref", $search_ref);
 }
 if (strlen(trim($search_label))) {
-	$sql .= " AND p.label like '%" . $search_label . "%'";
+	$sql .= natural_search("p.label", $search_label);
 }
 if (strlen(trim($search_desc))) {
-	$sql .= " AND fd.description like '%" . $search_desc . "%'";
+	$sql .= natural_search("fd.description", $search_desc);
 }
 if (strlen(trim($search_amount))) {
-	$sql .= " AND fd.total_ht like '%" . $search_amount . "%'";
+	$sql .= natural_search("fd.total_ht", $search_amount, 1);
 }
 if (strlen(trim($search_account))) {
-	$sql .= " AND aa.account_number like '%" . $search_account . "%'";
+	$sql .= natural_search("aa.account_number", $search_account);
 }
 if (strlen(trim($search_vat))) {
-	$sql .= " AND (fd.tva_tx like '" . $search_vat . "%')";
+	$sql .= natural_search("fd.tva_tx", $search_vat);
 }
 if (strlen(trim($search_country))) {
-	$sql .= " AND (co.label like'" . $search_country . "%')";
+	$sql .= natural_search("co.label", $search_country);
 }
 if (strlen(trim($search_tvaintra))) {
-	$sql .= " AND (s.tva_intra like'" . $search_tvaintra . "%')";
+	$sql .= natural_search("s.tva_intra", $search_tva_intra);
 }
 $sql .= " AND f.entity IN (" . getEntity("facture", 0) . ")";    // We don't share object for accountancy
 $sql .= $db->order($sortfield, $sortorder);
@@ -283,7 +283,7 @@ if ($result) {
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_account" value="' . dol_escape_htmltag($search_account) . '"></td>';
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_country" value="' . dol_escape_htmltag($search_country) . '"></td>';
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_tavintra" value="' . dol_escape_htmltag($search_tavintra) . '"></td>';
-	print '<td class="liste_titre" align="right">';
+	print '<td class="liste_titre" align="center">';
 	$searchpitco=$form->showFilterAndCheckAddButtons(1);
 	print $searchpitco;
 	print "</td></tr>\n";
diff --git a/htdocs/accountancy/journal/expensereportsjournal.php b/htdocs/accountancy/journal/expensereportsjournal.php
index 8bc62c27ef6..8d657ee6d11 100644
--- a/htdocs/accountancy/journal/expensereportsjournal.php
+++ b/htdocs/accountancy/journal/expensereportsjournal.php
@@ -43,6 +43,7 @@ $langs->load("bills");
 $langs->load("other");
 $langs->load("main");
 $langs->load("accountancy");
+$langs->load("trips");
 
 $date_startmonth = GETPOST('date_startmonth');
 $date_startday = GETPOST('date_startday');
diff --git a/htdocs/accountancy/supplier/lines.php b/htdocs/accountancy/supplier/lines.php
index f289e0f71f9..df5b37357b5 100644
--- a/htdocs/accountancy/supplier/lines.php
+++ b/htdocs/accountancy/supplier/lines.php
@@ -157,25 +157,25 @@ $sql.= " LEFT JOIN " . MAIN_DB_PREFIX . "product as p ON p.rowid = l.fk_product"
 $sql.= " WHERE f.rowid = l.fk_facture_fourn and f.fk_statut >= 1 AND l.fk_code_ventilation <> 0 ";
 $sql.= " AND aa.rowid = l.fk_code_ventilation";
 if (strlen(trim($search_invoice))) {
-	$sql .= " AND f.ref like '%" . $search_invoice . "%'";
+	$sql .= natural_search("f.ref", $search_invoice);
 }
 if (strlen(trim($search_ref))) {
-	$sql .= " AND p.ref like '%" . $search_ref . "%'";
+	$sql .= natural_search("p.ref", $search_ref);
 }
 if (strlen(trim($search_label))) {
-	$sql .= " AND p.label like '%" . $search_label . "%'";
+	$sql .= natural_search("p.label", $search_label);
 }
 if (strlen(trim($search_desc))) {
-	$sql .= " AND l.description like '%" . $search_desc . "%'";
+	$sql .= natural_search("l.description", $search_desc);
 }
 if (strlen(trim($search_amount))) {
-	$sql .= " AND l.total_ht like '%" . $search_amount . "%'";
+	$sql .= natural_search("l.total_ht", $search_amount, 1);
 }
 if (strlen(trim($search_account))) {
-	$sql .= " AND aa.account_number like '%" . $search_account . "%'";
+	$sql .= natural_search("aa.account_number", $search_account, 1);
 }
 if (strlen(trim($search_vat))) {
-	$sql .= " AND (l.tva_tx like '" . $search_vat . "%')";
+	$sql .= natural_search("l.tva_tx", $search_vat, 1);
 }
 $sql .= " AND f.entity IN (" . getEntity("facture_fourn", 0) . ")";  // We don't share object for accountancy
 
@@ -255,7 +255,7 @@ if ($result) {
 	
 	print '<tr class="liste_titre">';
     print '<td class="liste_titre"></td>';
-	print '<td><input type="text" class="flat maxwidth50" name="search_invoice" value="' . dol_escape_htmltag($search_invoice) . '"></td>';
+	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_invoice" value="' . dol_escape_htmltag($search_invoice) . '"></td>';
 	print '<td class="liste_titre"></td>';
 	print '<td class="liste_titre"></td>';
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_ref" value="' . dol_escape_htmltag($search_ref) . '"></td>';
@@ -264,7 +264,7 @@ if ($result) {
 	print '<td class="liste_titre" align="right"><input type="text" class="flat maxwidth50" name="search_amount" value="' . dol_escape_htmltag($search_amount) . '"></td>';
 	print '<td class="liste_titre" align="center"><input type="text" class="flat maxwidth50" name="search_vat" size="1" value="' . dol_escape_htmltag($search_vat) . '"></td>';
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_account" value="' . dol_escape_htmltag($search_account) . '"></td>';
-    print '<td class="liste_titre" align="right">';
+    print '<td class="liste_titre" align="center">';
     $searchpitco=$form->showFilterAndCheckAddButtons(1);
     print $searchpitco;
     print '</td>';
diff --git a/htdocs/adherents/index.php b/htdocs/adherents/index.php
index af259296c37..ef20c2e96c0 100644
--- a/htdocs/adherents/index.php
+++ b/htdocs/adherents/index.php
@@ -125,34 +125,37 @@ if ($result)
 //print '<tr><td width="30%" class="notopnoleft" valign="top">';
 print '<div class="fichecenter"><div class="fichethirdleft">';
 
-// Search contact/address
-if (! empty($conf->adherent->enabled) && $user->rights->adherent->lire)
-{
-	$listofsearchfields['search_member']=array('text'=>'Member');
-}
 
-if (count($listofsearchfields))
+if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is useless due to the global search combo
 {
-	print '<form method="post" action="'.DOL_URL_ROOT.'/core/search.php">';
-	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-	print '<table class="noborder nohover centpercent">';
-	$i=0;
-	foreach($listofsearchfields as $key => $value)
-	{
-		if ($i == 0) print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
-		print '<tr '.$bc[false].'>';
-		print '<td class="nowrap"><label for="'.$key.'">'.$langs->trans($value["text"]).'</label>:</td><td><input type="text" class="flat inputsearch" name="'.$key.'" id="'.$key.'" size="18"></td>';
-		if ($i == 0) print '<td rowspan="'.count($listofsearchfields).'"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td>';
-		print '</tr>';
-		$i++;
-	}
-	print '</table>';	
-	print '</form>';
-	print '<br>';
+    // Search contact/address
+    if (! empty($conf->adherent->enabled) && $user->rights->adherent->lire)
+    {
+    	$listofsearchfields['search_member']=array('text'=>'Member');
+    }
+    
+    if (count($listofsearchfields))
+    {
+    	print '<form method="post" action="'.DOL_URL_ROOT.'/core/search.php">';
+    	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+    	print '<table class="noborder nohover centpercent">';
+    	$i=0;
+    	foreach($listofsearchfields as $key => $value)
+    	{
+    		if ($i == 0) print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
+    		print '<tr '.$bc[false].'>';
+    		print '<td class="nowrap"><label for="'.$key.'">'.$langs->trans($value["text"]).'</label>:</td><td><input type="text" class="flat inputsearch" name="'.$key.'" id="'.$key.'" size="18"></td>';
+    		if ($i == 0) print '<td rowspan="'.count($listofsearchfields).'"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td>';
+    		print '</tr>';
+    		$i++;
+    	}
+    	print '</table>';	
+    	print '</form>';
+    	print '<br>';
+    }
 }
 
 
-
 /*
  * Statistics
  */
diff --git a/htdocs/adherents/stats/byproperties.php b/htdocs/adherents/stats/byproperties.php
index 6b7c1c003a9..c717d20be84 100644
--- a/htdocs/adherents/stats/byproperties.php
+++ b/htdocs/adherents/stats/byproperties.php
@@ -120,7 +120,7 @@ print '<table class="liste" width="100%">';
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("Nature").'</td>';
 print '<td align="right">'.$langs->trans("NbOfMembers").'</td>';
-print '<td align="center">'.$langs->trans("LastMemberDate").'</td>';
+print '<td align="center">'.$langs->trans("LatestSubscriptionDate").'</td>';
 print '</tr>';
 
 if (! $foundphy) $data[]=array('label'=>'phy','nb'=>'0','lastdate'=>'');
diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index b5d15e07833..827f6e0b747 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -86,7 +86,7 @@ $hookmanager->initHooks(array('admin'));
 // Put here declaration of dictionaries properties
 
 // Sort order to show dictionary (0 is space). All other dictionaries (added by modules) will be at end of this.
-$taborder=array(9,0,4,3,2,0,1,8,19,16,27,0,5,11,0,33,34,0,6,0,29,0,7,17,24,28,0,10,23,12,13,0,14,0,22,20,18,21,0,15,30,0,26,0,32,0);
+$taborder=array(9,0,4,3,2,0,1,8,19,16,27,0,5,11,0,33,34,0,6,0,29,0,7,17,24,28,0,10,23,12,13,0,14,0,22,20,18,21,0,15,30,0,26,0);
 
 // Name of SQL tables of dictionaries
 $tabname=array();
@@ -121,7 +121,7 @@ $tabname[28]= MAIN_DB_PREFIX."c_holiday_types";
 $tabname[29]= MAIN_DB_PREFIX."c_lead_status";
 $tabname[30]= MAIN_DB_PREFIX."c_format_cards";
 //$tabname[31]= MAIN_DB_PREFIX."accounting_system";
-$tabname[32]= MAIN_DB_PREFIX."c_accounting_category";
+//$tabname[32]= MAIN_DB_PREFIX."c_accounting_category";
 $tabname[33]= MAIN_DB_PREFIX."c_hrm_department";
 $tabname[34]= MAIN_DB_PREFIX."c_hrm_function";
 
@@ -158,7 +158,7 @@ $tablib[28]= "DictionaryHolidayTypes";
 $tablib[29]= "DictionaryOpportunityStatus";
 $tablib[30]= "DictionaryFormatCards";
 //$tablib[31]= "DictionaryAccountancysystem";
-$tablib[32]= "DictionaryAccountancyCategory";
+//$tablib[32]= "DictionaryAccountancyCategory";
 $tablib[33]= "DictionaryDepartment";
 $tablib[34]= "DictionaryFunction";
 
@@ -195,7 +195,7 @@ $tabsql[28]= "SELECT h.rowid as rowid, h.code, h.label, h.affect, h.delay, h.new
 $tabsql[29]= "SELECT rowid   as rowid, code, label, percent, position, active FROM ".MAIN_DB_PREFIX."c_lead_status";
 $tabsql[30]= "SELECT rowid, code, name, paper_size, orientation, metric, leftmargin, topmargin, nx, ny, spacex, spacey, width, height, font_size, custom_x, custom_y, active FROM ".MAIN_DB_PREFIX."c_format_cards";
 //$tabsql[31]= "SELECT s.rowid as rowid, pcg_version, s.label, s.active FROM ".MAIN_DB_PREFIX."accounting_system as s";
-$tabsql[32]= "SELECT a.rowid as rowid, a.code as code, a.label, a.range_account, a.sens, a.category_type, a.formula, a.position as position, a.fk_country as country_id, c.code as country_code, c.label as country, a.active FROM ".MAIN_DB_PREFIX."c_accounting_category as a, ".MAIN_DB_PREFIX."c_country as c WHERE a.fk_country=c.rowid and c.active=1";
+//$tabsql[32]= "SELECT a.rowid as rowid, a.code as code, a.label, a.range_account, a.sens, a.category_type, a.formula, a.position as position, a.fk_country as country_id, c.code as country_code, c.label as country, a.active FROM ".MAIN_DB_PREFIX."c_accounting_category as a, ".MAIN_DB_PREFIX."c_country as c WHERE a.fk_country=c.rowid and c.active=1";
 $tabsql[33]= "SELECT rowid, pos, code, label, active FROM ".MAIN_DB_PREFIX."c_hrm_department";
 $tabsql[34]= "SELECT rowid, pos, code, label, c_level, active FROM ".MAIN_DB_PREFIX."c_hrm_function";
 
@@ -232,7 +232,7 @@ $tabsqlsort[28]="country ASC, code ASC";
 $tabsqlsort[29]="position ASC";
 $tabsqlsort[30]="code ASC";
 //$tabsqlsort[31]="pcg_version ASC";
-$tabsqlsort[32]="position ASC";
+//$tabsqlsort[32]="position ASC";
 $tabsqlsort[33]="code ASC";
 $tabsqlsort[34]="code ASC";
 
@@ -269,7 +269,7 @@ $tabfield[28]= "code,label,affect,delay,newbymonth,country_id,country";
 $tabfield[29]= "code,label,percent,position";
 $tabfield[30]= "code,name,paper_size,orientation,metric,leftmargin,topmargin,nx,ny,spacex,spacey,width,height,font_size,custom_x,custom_y";
 //$tabfield[31]= "pcg_version,label";
-$tabfield[32]= "code,label,range_account,sens,category_type,formula,position,country_id,country";
+//$tabfield[32]= "code,label,range_account,sens,category_type,formula,position,country_id,country";
 $tabfield[33]= "code,label";
 $tabfield[34]= "code,label";
 
@@ -306,7 +306,7 @@ $tabfieldvalue[28]= "code,label,affect,delay,newbymonth,country";
 $tabfieldvalue[29]= "code,label,percent,position";
 $tabfieldvalue[30]= "code,name,paper_size,orientation,metric,leftmargin,topmargin,nx,ny,spacex,spacey,width,height,font_size,custom_x,custom_y";
 //$tabfieldvalue[31]= "pcg_version,label";
-$tabfieldvalue[32]= "code,label,range_account,sens,category_type,formula,position,country";
+//$tabfieldvalue[32]= "code,label,range_account,sens,category_type,formula,position,country";
 $tabfieldvalue[33]= "code,label";
 $tabfieldvalue[34]= "code,label";
 
@@ -343,7 +343,7 @@ $tabfieldinsert[28]= "code,label,affect,delay,newbymonth,fk_country";
 $tabfieldinsert[29]= "code,label,percent,position";
 $tabfieldinsert[30]= "code,name,paper_size,orientation,metric,leftmargin,topmargin,nx,ny,spacex,spacey,width,height,font_size,custom_x,custom_y";
 //$tabfieldinsert[31]= "pcg_version,label";
-$tabfieldinsert[32]= "code,label,range_account,sens,category_type,formula,position,fk_country";
+//$tabfieldinsert[32]= "code,label,range_account,sens,category_type,formula,position,fk_country";
 $tabfieldinsert[33]= "code,label";
 $tabfieldinsert[34]= "code,label";
 
@@ -382,7 +382,7 @@ $tabrowid[28]= "";
 $tabrowid[29]= "";
 $tabrowid[30]= "";
 //$tabrowid[31]= "";
-$tabrowid[32]= "";
+//$tabrowid[32]= "";
 $tabrowid[33]= "rowid";
 $tabrowid[34]= "rowid";
 
@@ -419,7 +419,7 @@ $tabcond[28]= ! empty($conf->holiday->enabled);
 $tabcond[29]= ! empty($conf->projet->enabled);
 $tabcond[30]= ! empty($conf->label->enabled);
 //$tabcond[31]= ! empty($conf->accounting->enabled);
-$tabcond[32]= ! empty($conf->accounting->enabled);
+//$tabcond[32]= ! empty($conf->accounting->enabled);
 $tabcond[33]= ! empty($conf->hrm->enabled);
 $tabcond[34]= ! empty($conf->hrm->enabled);
 
@@ -456,7 +456,7 @@ $tabhelp[28] = array('affect'=>$langs->trans("FollowedByACounter"),'delay'=>$lan
 $tabhelp[29] = array('code'=>$langs->trans("EnterAnyCode"), 'percent'=>$langs->trans("OpportunityPercent"), 'position'=>$langs->trans("PositionIntoComboList"));
 $tabhelp[30] = array('code'=>$langs->trans("EnterAnyCode"), 'name'=>$langs->trans("LabelName"), 'paper_size'=>$langs->trans("LabelPaperSize"));
 //$tabhelp[31] = array('pcg_version'=>$langs->trans("EnterAnyCode"));
-$tabhelp[32] = array('code'=>$langs->trans("EnterAnyCode"));
+//$tabhelp[32] = array('code'=>$langs->trans("EnterAnyCode"));
 $tabhelp[33] = array('code'=>$langs->trans("EnterAnyCode"));
 $tabhelp[34] = array('code'=>$langs->trans("EnterAnyCode"));
 
@@ -493,7 +493,7 @@ $tabfieldcheck[28] = array();
 $tabfieldcheck[29] = array();
 $tabfieldcheck[30] = array();
 //$tabfieldcheck[31] = array();
-$tabfieldcheck[32] = array();
+//$tabfieldcheck[32] = array();
 $tabfieldcheck[33] = array();
 $tabfieldcheck[34] = array();
 
diff --git a/htdocs/admin/system/about.php b/htdocs/admin/system/about.php
index e9e2e0f1749..61780d51386 100644
--- a/htdocs/admin/system/about.php
+++ b/htdocs/admin/system/about.php
@@ -26,16 +26,13 @@
 
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
 $langs->load("admin");
 $langs->load("help");
 $langs->load("members");
 $langs->load("other");
 
-$youuselaststable = 0;
-
 $action=GETPOST('action','alpha');
 
 if (! $user->admin) accessforbidden();
@@ -48,12 +45,7 @@ $version='0.0';
  *	Actions
  */
 
-if ($action == 'getlastversion')
-{
-    $result = getURLContent('http://sourceforge.net/projects/dolibarr/rss');
-    //var_dump($result['content']);
-    $sfurl = simplexml_load_string($result['content']);
-}
+// None
 
 
 /*
@@ -63,7 +55,7 @@ if ($action == 'getlastversion')
 llxHeader();
 
 
-print load_fiche_titre("Dolibarr",'','title_setup');
+print load_fiche_titre($langs->trans("ExternalResources"),'','title_setup');
 
 print '<div style="padding-left: 30px;">'.img_picto_common('', 'dolibarr_box.png','height="120"').'</div>';
 
@@ -71,45 +63,6 @@ print '<div style="padding-left: 30px;">'.img_picto_common('', 'dolibarr_box.png
 
 print '<div class="fichecenter"><div class="fichehalfleft">';
 
-print $langs->trans("CurrentVersion").' : <strong>'.DOL_VERSION.'</strong><br>';
-
-if (function_exists('curl_init'))
-{
-    $conf->global->MAIN_USE_RESPONSE_TIMEOUT = 10;
-    
-    if ($action == 'getlastversion')
-    {
-        if ($sfurl)
-        {
-                    while (! empty($sfurl->channel[0]->item[$i]->title) && $i < 10000)
-            {
-                $title=$sfurl->channel[0]->item[$i]->title;
-                if (preg_match('/([0-9]+\.([0-9\.]+))/', $title, $reg))
-                {
-                    $newversion=$reg[1];
-                    $newversionarray=explode('.',$newversion);
-                    $versionarray=explode('.',$version);
-                    //var_dump($newversionarray);var_dump($versionarray);
-                    if (versioncompare($newversionarray, $versionarray) > 0) $version=$newversion;
-                }
-                $i++;
-            }
-            
-            // Show version
-        	print $langs->trans("LastStableVersion").' : <b>'. (($version != '0.0')?$version:$langs->trans("Unknown")) .'</b><br>';
-        }
-        else
-        {
-            print $langs->trans("LastStableVersion").' : <b>' .$langs->trans("UpdateServerOffline").'</b><br>';
-        }
-    }
-    else
-    {
-        print $langs->trans("LastStableVersion").' : <a href="'.$_SERVER["PHP_SELF"].'?action=getlastversion" class="button">' .$langs->trans("Check").'</a><br>';
-    }
-}
-print '<br>';
-
 print $langs->trans("DolibarrLicense").' : ';
 print '<ul><li>';
 print '<a href="http://www.gnu.org/copyleft/gpl.html">GNU-GPL v3+</a></li>';
@@ -201,6 +154,11 @@ $url='https://wiki.dolibarr.org/index.php/Subscribe';
 if (preg_match('/^fr_/i',$langs->getDefaultLang())) $url='https://wiki.dolibarr.org/index.php/Adh%C3%A9rer';
 if (preg_match('/^es_/i',$langs->getDefaultLang())) $url='https://wiki.dolibarr.org/index.php/Subscribirse';
 print '<li><a href="'.$url.'" target="_blank" rel="external">'.$langs->trans("SubscribeToFoundation").'</a></li>';
+print '</ul>';
+
+print $langs->trans("SocialNetworks").':';
+
+print '<ul>';
 
 print '<li><a href="https://facebook.com/dolibarr" target="_blank" rel="external">FaceBook</a></li>';
 print '<li><a href="https://twitter.com/dolibarr" target="_blank" rel="external">Twitter</a></li>';
@@ -230,25 +188,29 @@ print '</div>';
 print '<div class="clearboth"></div>';
 
 
-if ($youuselaststable)
+$showpromotemessage=1;
+if ($showpromotemessage)
 {
-    print '<br>';
-    print '<br>';
-    
     $tmp=versiondolibarrarray();
-    if ((empty($tmp[2]) && (strpos($tmp[1], '0') === 0)) || (strpos($tmp[2], '0') === 0))
+    if (is_numeric($tmp[2]))    // Not alpha, beta or rc
     {
-        print $langs->trans("TitleExampleForMajorRelease").':<br>';
-        print '<textarea style="width:80%; min-height: 60px">';
-        print $langs->trans("ExampleOfNewsMessageForMajorRelease", DOL_VERSION, DOL_VERSION);
-        print '</textarea>';
-    }
-    else
-    {
-        print $langs->trans("TitleExampleForMaintenanceRelease").':<br>';
-        print '<textarea style="width:80%; min-height: 60px">';
-        print $langs->trans("ExampleOfNewsMessageForMaintenanceRelease", DOL_VERSION, DOL_VERSION);
-        print '</textarea>';
+        print '<br>';
+        print '<br>';
+        
+        if ((empty($tmp[2]) && (strpos($tmp[1], '0') === 0)) || (strpos($tmp[2], '0') === 0))
+        {
+            print $langs->trans("TitleExampleForMajorRelease").':<br>';
+            print '<textarea style="width:80%; min-height: 60px">';
+            print $langs->trans("ExampleOfNewsMessageForMajorRelease", DOL_VERSION, DOL_VERSION);
+            print '</textarea>';
+        }
+        else
+        {
+            print $langs->trans("TitleExampleForMaintenanceRelease").':<br>';
+            print '<textarea style="width:80%; min-height: 60px">';
+            print $langs->trans("ExampleOfNewsMessageForMaintenanceRelease", DOL_VERSION, DOL_VERSION);
+            print '</textarea>';
+        }
     }
 }
 
diff --git a/htdocs/admin/system/dolibarr.php b/htdocs/admin/system/dolibarr.php
index d7bd421770c..6a5384da69a 100644
--- a/htdocs/admin/system/dolibarr.php
+++ b/htdocs/admin/system/dolibarr.php
@@ -25,15 +25,36 @@
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
 $langs->load("admin");
 $langs->load("install");
 $langs->load("other");
 
+$action=GETPOST('action','alpha');
+
 if (! $user->admin)
 	accessforbidden();
 
+$sfurl = '';
+$version='0.0';
 
+
+
+/*
+ *	Actions
+ */
+
+if ($action == 'getlastversion')
+{
+    $result = getURLContent('http://sourceforge.net/projects/dolibarr/rss');
+    //var_dump($result['content']);
+    $sfurl = simplexml_load_string($result['content']);
+}
+
+	
 /*
  * View
  */
@@ -52,23 +73,60 @@ print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("Version").'</td><td>'.$langs->trans("Value").'</td></tr>'."\n";
 $var=!$var;
-print '<tr '.$bc[$var].'><td>'.$langs->trans("VersionLastInstall").'</td><td>'.$conf->global->MAIN_VERSION_LAST_INSTALL.'</td></tr>'."\n";
-$var=!$var;
-print '<tr '.$bc[$var].'><td>'.$langs->trans("VersionLastUpgrade").'</td><td>'.$conf->global->MAIN_VERSION_LAST_UPGRADE.'</td></tr>'."\n";
-$var=!$var;
-print '<tr '.$bc[$var].'><td>'.$langs->trans("VersionProgram").'</td><td>'.DOL_VERSION;
+print '<tr '.$bc[$var].'><td>'.$langs->trans("CurrentVersion").' ('.$langs->trans("Programs").')</td><td>'.DOL_VERSION;
 // If current version differs from last upgrade
 if (empty($conf->global->MAIN_VERSION_LAST_UPGRADE))
 {
-	// Compare version with last install database version (upgrades never occured)
-	if (DOL_VERSION != $conf->global->MAIN_VERSION_LAST_INSTALL) print ' '.img_warning($langs->trans("RunningUpdateProcessMayBeRequired",DOL_VERSION,$conf->global->MAIN_VERSION_LAST_INSTALL));
+    // Compare version with last install database version (upgrades never occured)
+    if (DOL_VERSION != $conf->global->MAIN_VERSION_LAST_INSTALL) print ' '.img_warning($langs->trans("RunningUpdateProcessMayBeRequired",DOL_VERSION,$conf->global->MAIN_VERSION_LAST_INSTALL));
 }
 else
 {
-	// Compare version with last upgrade database version
-	if (DOL_VERSION != $conf->global->MAIN_VERSION_LAST_UPGRADE) print ' '.img_warning($langs->trans("RunningUpdateProcessMayBeRequired",DOL_VERSION,$conf->global->MAIN_VERSION_LAST_UPGRADE));
+    // Compare version with last upgrade database version
+    if (DOL_VERSION != $conf->global->MAIN_VERSION_LAST_UPGRADE) print ' '.img_warning($langs->trans("RunningUpdateProcessMayBeRequired",DOL_VERSION,$conf->global->MAIN_VERSION_LAST_UPGRADE));
 }
+
+if (function_exists('curl_init'))
+{
+    $conf->global->MAIN_USE_RESPONSE_TIMEOUT = 10;
+    print ' &nbsp; &nbsp; - &nbsp; &nbsp; ';
+    if ($action == 'getlastversion')
+    {
+        if ($sfurl)
+        {
+            while (! empty($sfurl->channel[0]->item[$i]->title) && $i < 10000)
+            {
+                $title=$sfurl->channel[0]->item[$i]->title;
+                if (preg_match('/([0-9]+\.([0-9\.]+))/', $title, $reg))
+                {
+                    $newversion=$reg[1];
+                    $newversionarray=explode('.',$newversion);
+                    $versionarray=explode('.',$version);
+                    //var_dump($newversionarray);var_dump($versionarray);
+                    if (versioncompare($newversionarray, $versionarray) > 0) $version=$newversion;
+                }
+                $i++;
+            }
+
+            // Show version
+            print $langs->trans("LastStableVersion").' : <b>'. (($version != '0.0')?$version:$langs->trans("Unknown")) .'</b><br>';
+        }
+        else
+        {
+            print $langs->trans("LastStableVersion").' : <b>' .$langs->trans("UpdateServerOffline").'</b><br>';
+        }
+    }
+    else
+    {
+        print $langs->trans("LastStableVersion").' : <a href="'.$_SERVER["PHP_SELF"].'?action=getlastversion" class="button">' .$langs->trans("Check").'</a><br>';
+    }
+}
+
 print '</td></tr>'."\n";
+$var=!$var;
+print '<tr '.$bc[$var].'><td>'.$langs->trans("VersionLastUpgrade").' ('.$langs->trans("Database").')</td><td>'.$conf->global->MAIN_VERSION_LAST_UPGRADE.'</td></tr>'."\n";
+$var=!$var;
+print '<tr '.$bc[$var].'><td>'.$langs->trans("VersionLastInstall").'</td><td>'.$conf->global->MAIN_VERSION_LAST_INSTALL.'</td></tr>'."\n";
 print '</table>';
 print '</div>';
 print '<br>';
diff --git a/htdocs/admin/tools/index.php b/htdocs/admin/tools/index.php
index 8da041d05da..6f773c5b35e 100644
--- a/htdocs/admin/tools/index.php
+++ b/htdocs/admin/tools/index.php
@@ -37,8 +37,8 @@ if (! $user->admin)
 
 $form = new Form($db);
 
-$title=$langs->trans("SystemToolsArea");
-if (GETPOST('leftmenu') == 'admintools') $title=$langs->trans("ModulesSystemTools");
+$title=$langs->trans("AdminTools");
+//if (GETPOST('leftmenu') == 'admintools') $title=$langs->trans("ModulesSystemTools");
 
 llxHeader('', $title);
 
diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php
index 4e99b7072fc..c967f303648 100644
--- a/htdocs/comm/index.php
+++ b/htdocs/comm/index.php
@@ -77,57 +77,59 @@ print load_fiche_titre($langs->trans("CommercialArea"),'','title_commercial.png'
 
 print '<div class="fichecenter"><div class="fichethirdleft">';
 
-// Search proposal
-if (! empty($conf->propal->enabled) && $user->rights->propal->lire)
+if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is useless due to the global search combo
 {
-	$listofsearchfields['search_proposal']=array('text'=>'Proposal');
+    // Search proposal
+    if (! empty($conf->propal->enabled) && $user->rights->propal->lire)
+    {
+    	$listofsearchfields['search_proposal']=array('text'=>'Proposal');
+    }
+    // Search customer order
+    if (! empty($conf->commande->enabled) && $user->rights->commande->lire)
+    {
+    	$listofsearchfields['search_customer_order']=array('text'=>'CustomerOrder');
+    }
+    // Search supplier proposal
+    if (! empty($conf->supplier_proposal->enabled) && $user->rights->supplier_proposal->lire)
+    {
+        $listofsearchfields['search_supplier_proposal']=array('text'=>'SupplierProposalShort');
+    }
+    // Search supplier order
+    if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->commande->lire)
+    {
+    	$listofsearchfields['search_supplier_order']=array('text'=>'SupplierOrder');
+    }
+    // Search intervention
+    if (! empty($conf->ficheinter->enabled) && $user->rights->ficheinter->lire)
+    {
+    	$listofsearchfields['search_intervention']=array('text'=>'Intervention');
+    }
+    // Search contract
+    if (! empty($conf->contrat->enabled) && $user->rights->contrat->lire)
+    {
+        $listofsearchfields['search_contract']=array('text'=>'Contract');
+    }
+    
+    if (count($listofsearchfields))
+    {
+    	print '<form method="post" action="'.DOL_URL_ROOT.'/core/search.php">';
+    	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+    	print '<table class="noborder nohover centpercent">';
+    	$i=0;
+    	foreach($listofsearchfields as $key => $value)
+    	{
+    		if ($i == 0) print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
+    		print '<tr '.$bc[false].'>';
+    		print '<td class="nowrap"><label for="'.$key.'">'.$langs->trans($value["text"]).'</label></td><td><input type="text" class="flat inputsearch" name="'.$key.'" id="'.$key.'" size="18"></td>';
+    		if ($i == 0) print '<td class="noborderbottom" rowspan="'.count($listofsearchfields).'"><input type="submit" value="'.$langs->trans("Search").'" class="button "></td>';
+    		print '</tr>';
+    		$i++;
+    	}
+    	print '</table>';	
+    	print '</form>';
+    	print '<br>';
+    }
 }
-// Search customer order
-if (! empty($conf->commande->enabled) && $user->rights->commande->lire)
-{
-	$listofsearchfields['search_customer_order']=array('text'=>'CustomerOrder');
-}
-// Search supplier proposal
-if (! empty($conf->supplier_proposal->enabled) && $user->rights->supplier_proposal->lire)
-{
-    $listofsearchfields['search_supplier_proposal']=array('text'=>'SupplierProposalShort');
-}
-// Search supplier order
-if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->commande->lire)
-{
-	$listofsearchfields['search_supplier_order']=array('text'=>'SupplierOrder');
-}
-// Search intervention
-if (! empty($conf->ficheinter->enabled) && $user->rights->ficheinter->lire)
-{
-	$listofsearchfields['search_intervention']=array('text'=>'Intervention');
-}
-// Search contract
-if (! empty($conf->contrat->enabled) && $user->rights->contrat->lire)
-{
-    $listofsearchfields['search_contract']=array('text'=>'Contract');
-}
-
-if (count($listofsearchfields))
-{
-	print '<form method="post" action="'.DOL_URL_ROOT.'/core/search.php">';
-	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-	print '<table class="noborder nohover centpercent">';
-	$i=0;
-	foreach($listofsearchfields as $key => $value)
-	{
-		if ($i == 0) print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
-		print '<tr '.$bc[false].'>';
-		print '<td class="nowrap"><label for="'.$key.'">'.$langs->trans($value["text"]).'</label></td><td><input type="text" class="flat inputsearch" name="'.$key.'" id="'.$key.'" size="18"></td>';
-		if ($i == 0) print '<td class="noborderbottom" rowspan="'.count($listofsearchfields).'"><input type="submit" value="'.$langs->trans("Search").'" class="button "></td>';
-		print '</tr>';
-		$i++;
-	}
-	print '</table>';	
-	print '</form>';
-	print '<br>';
-}
-
 
 
 /*
diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index b7f2a002105..ea4b21d78be 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -697,14 +697,19 @@ if ($action == 'create')
 		$htmltext.=$key.' = '.$langs->trans($val).'<br>';
 	}
 	$htmltext.='</i>';
-			
+
+	
+	$availablelink=$form->textwithpicto($langs->trans("AvailableVariables"), $htmltext, 1, 'help', '', 0, 2, 'availvar');
+	//print '<a href="javascript:document_preview(\''.DOL_URL_ROOT.'/admin/modulehelp.php?id='.$objMod->numero.'\',\'text/html\',\''.dol_escape_js($langs->trans("Module")).'\')">'.img_picto($langs->trans("ClickToShowDescription"), $imginfo).'</a>';
+	
+	
 	// Print mail form
-	print load_fiche_titre($langs->trans("NewMailing"), $form->textwithpicto($langs->trans("AvailableVariables"), $htmltext), 'title_generic');
+	print load_fiche_titre($langs->trans("NewMailing"), $availablelink, 'title_generic');
 
 	dol_fiche_head();
 
 	print '<table class="border" width="100%">';
-	print '<tr><td class="fieldrequired titlefieldcreate">'.$langs->trans("MailTitle").'</td><td><input class="flat minwidth200" name="titre" value="'.dol_escape_htmltag(GETPOST('titre')).'"></td></tr>';
+	print '<tr><td class="fieldrequired titlefieldcreate">'.$langs->trans("MailTitle").'</td><td><input class="flat minwidth300" name="titre" value="'.dol_escape_htmltag(GETPOST('titre')).'"></td></tr>';
 	print '<tr><td class="fieldrequired">'.$langs->trans("MailFrom").'</td><td><input class="flat minwidth200" name="from" value="'.$conf->global->MAILING_EMAIL_FROM.'"></td></tr>';
 	print '<tr><td>'.$langs->trans("MailErrorsTo").'</td><td><input class="flat minwidth200" name="errorsto" value="'.(!empty($conf->global->MAILING_EMAIL_ERRORSTO)?$conf->global->MAILING_EMAIL_ERRORSTO:$conf->global->MAIN_MAIL_ERRORS_TO).'"></td></tr>';
 
@@ -720,7 +725,7 @@ if ($action == 'create')
 	print '</br><br>';
 
 	print '<table class="border" width="100%">';
-	print '<tr><td class="fieldrequired titlefieldcreate">'.$langs->trans("MailTopic").'</td><td><input class="flat minwidth200" name="sujet" value="'.dol_escape_htmltag(GETPOST('sujet')).'"></td></tr>';
+	print '<tr><td class="fieldrequired titlefieldcreate">'.$langs->trans("MailTopic").'</td><td><input class="flat minwidth200 quatrevingtpercent" name="sujet" value="'.dol_escape_htmltag(GETPOST('sujet')).'"></td></tr>';
 	print '<tr><td>'.$langs->trans("BackgroundColorByDefault").'</td><td colspan="3">';
 	print $htmlother->selectColor($_POST['bgcolor'],'bgcolor','new_mailing',0);
 	print '</td></tr>';
diff --git a/htdocs/comm/mailing/index.php b/htdocs/comm/mailing/index.php
index ba8c2481411..0ea109960e7 100644
--- a/htdocs/comm/mailing/index.php
+++ b/htdocs/comm/mailing/index.php
@@ -49,19 +49,22 @@ print load_fiche_titre($langs->trans("MailingArea"));
 print '<div class="fichecenter"><div class="fichethirdleft">';
 
 
-// Recherche emails
-$var=false;
-print '<form method="post" action="'.DOL_URL_ROOT.'/comm/mailing/list.php">';
-print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-print '<table class="noborder nohover" width="100%">';
-print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("SearchAMailing").'</td></tr>';
-print '<tr '.$bc[$var].'><td class="nowrap">';
-print $langs->trans("Ref").':</td><td><input type="text" class="flat inputsearch" name="sref"></td>';
-print '<td rowspan="2"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
-print '<tr '.$bc[$var].'><td class="nowrap">';
-print $langs->trans("Other").':</td><td><input type="text" class="flat inputsearch" name="sall"></td>';
-
-print "</table></form><br>\n";
+//if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is useless due to the global search combo
+//{
+    // Recherche emails
+    $var=false;
+    print '<form method="post" action="'.DOL_URL_ROOT.'/comm/mailing/list.php">';
+    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+    print '<table class="noborder nohover" width="100%">';
+    print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("SearchAMailing").'</td></tr>';
+    print '<tr '.$bc[$var].'><td class="nowrap">';
+    print $langs->trans("Ref").':</td><td><input type="text" class="flat inputsearch" name="sref"></td>';
+    print '<td rowspan="2"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
+    print '<tr '.$bc[$var].'><td class="nowrap">';
+    print $langs->trans("Other").':</td><td><input type="text" class="flat inputsearch" name="sall"></td>';
+    
+    print "</table></form><br>\n";
+//}
 
 
 // Affiche stats de tous les modules de destinataires mailings
diff --git a/htdocs/comm/propal/index.php b/htdocs/comm/propal/index.php
index 4b03cb48429..82d57f721da 100644
--- a/htdocs/comm/propal/index.php
+++ b/htdocs/comm/propal/index.php
@@ -59,17 +59,17 @@ print load_fiche_titre($langs->trans("ProspectionArea"));
 print '<div class="fichecenter"><div class="fichethirdleft">';
 
 
-/*
- * Search form
- */
-$var=false;
-print '<form method="post" action="'.DOL_URL_ROOT.'/comm/propal/list.php">';
-print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-print '<table class="noborder nohover" width="100%">';
-print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
-print '<tr '.$bc[$var].'><td>';
-print $langs->trans("Proposal").':</td><td><input type="text" class="flat" name="sall" size=18></td><td><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
-print "</table></form><br>\n";
+if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is useless due to the global search combo
+{
+    $var=false;
+    print '<form method="post" action="'.DOL_URL_ROOT.'/comm/propal/list.php">';
+    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+    print '<table class="noborder nohover" width="100%">';
+    print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
+    print '<tr '.$bc[$var].'><td>';
+    print $langs->trans("Proposal").':</td><td><input type="text" class="flat" name="sall" size=18></td><td><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
+    print "</table></form><br>\n";
+}
 
 
 /*
diff --git a/htdocs/commande/index.php b/htdocs/commande/index.php
index 5731535697e..24e07b5ab07 100644
--- a/htdocs/commande/index.php
+++ b/htdocs/commande/index.php
@@ -62,16 +62,18 @@ print load_fiche_titre($langs->trans("OrdersArea"));
 //print '<tr><td valign="top" width="30%" class="notopnoleft">';
 print '<div class="fichecenter"><div class="fichethirdleft">';
 
-
-// Search customer orders
-$var=false;
-print '<form method="post" action="'.DOL_URL_ROOT.'/commande/list.php">';
-print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-print '<table class="noborder nohover" width="100%">';
-print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
-print '<tr '.$bc[$var].'><td>';
-print $langs->trans("CustomerOrder").':</td><td><input type="text" class="flat" name="sall" size=18></td><td><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
-print "</table></form><br>\n";
+if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is useless due to the global search combo
+{
+    // Search customer orders
+    $var=false;
+    print '<form method="post" action="'.DOL_URL_ROOT.'/commande/list.php">';
+    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+    print '<table class="noborder nohover" width="100%">';
+    print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
+    print '<tr '.$bc[$var].'><td>';
+    print $langs->trans("CustomerOrder").':</td><td><input type="text" class="flat" name="sall" size=18></td><td><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
+    print "</table></form><br>\n";
+}
 
 
 /*
diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php
index add2a4cfcb1..44d9aa4d3c1 100644
--- a/htdocs/compta/index.php
+++ b/htdocs/compta/index.php
@@ -61,6 +61,8 @@ if ($user->societe_id > 0)
 	$socid = $user->societe_id;
 }
 
+$max=3;
+
 
 /*
  * Actions
@@ -88,44 +90,45 @@ print load_fiche_titre($langs->trans("AccountancyTreasuryArea"),'','title_accoun
 print '<div class="fichecenter"><div class="fichethirdleft">';
 
 
-$max=3;
-
-
-// Search customer invoices
-if (! empty($conf->facture->enabled) && $user->rights->facture->lire)
+if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is useless due to the global search combo
 {
-	$listofsearchfields['search_invoice']=array('text'=>'CustomerInvoice');
-}
-// Search supplier invoices
-if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->lire)
-{
-	$listofsearchfields['search_supplier_invoice']=array('text'=>'SupplierInvoice');
-}
-if (! empty($conf->don->enabled) && $user->rights->don->lire)
-{
-	$langs->load("donations");
-	$listofsearchfields['search_donation']=array('text'=>'Donation');
+    // Search customer invoices
+    if (! empty($conf->facture->enabled) && $user->rights->facture->lire)
+    {
+    	$listofsearchfields['search_invoice']=array('text'=>'CustomerInvoice');
+    }
+    // Search supplier invoices
+    if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->lire)
+    {
+    	$listofsearchfields['search_supplier_invoice']=array('text'=>'SupplierInvoice');
+    }
+    if (! empty($conf->don->enabled) && $user->rights->don->lire)
+    {
+    	$langs->load("donations");
+    	$listofsearchfields['search_donation']=array('text'=>'Donation');
+    }
+    
+    if (count($listofsearchfields))
+    {
+    	print '<form method="post" action="'.DOL_URL_ROOT.'/core/search.php">';
+    	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+    	print '<table class="noborder nohover centpercent">';
+    	$i=0;
+    	foreach($listofsearchfields as $key => $value)
+    	{
+    		if ($i == 0) print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
+    		print '<tr '.$bc[false].'>';
+    		print '<td class="nowrap"><label for="'.$key.'">'.$langs->trans($value["text"]).'</label></td><td><input type="text" class="flat inputsearch" name="'.$key.'" id="'.$key.'"></td>';
+    		if ($i == 0) print '<td rowspan="'.count($listofsearchfields).'"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td>';
+    		print '</tr>';
+    		$i++;
+    	}
+    	print '</table>';	
+    	print '</form>';
+    	print '<br>';
+    }
 }
 
-if (count($listofsearchfields))
-{
-	print '<form method="post" action="'.DOL_URL_ROOT.'/core/search.php">';
-	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-	print '<table class="noborder nohover centpercent">';
-	$i=0;
-	foreach($listofsearchfields as $key => $value)
-	{
-		if ($i == 0) print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
-		print '<tr '.$bc[false].'>';
-		print '<td class="nowrap"><label for="'.$key.'">'.$langs->trans($value["text"]).'</label></td><td><input type="text" class="flat inputsearch" name="'.$key.'" id="'.$key.'"></td>';
-		if ($i == 0) print '<td rowspan="'.count($listofsearchfields).'"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td>';
-		print '</tr>';
-		$i++;
-	}
-	print '</table>';	
-	print '</form>';
-	print '<br>';
-}
 
 /**
  * Draft customers invoices
diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php
index 4c2ed3b1aaa..e81d0e38345 100644
--- a/htdocs/compta/paiement.php
+++ b/htdocs/compta/paiement.php
@@ -369,7 +369,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 			                    }
             					if ($(\'#fieldchqemetteur\').val() == \'\')
             					{
-            						var emetteur = ('.$facture->type.' == 2) ? \''.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_NOM).'\' : jQuery(\'#thirdpartylabel\').val();
+            						var emetteur = ('.$facture->type.' == 2) ? \''.dol_escape_js(dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_NOM)).'\' : jQuery(\'#thirdpartylabel\').val();
             						$(\'#fieldchqemetteur\').val(emetteur);
             					}
             				}
diff --git a/htdocs/contrat/index.php b/htdocs/contrat/index.php
index 2a2d2d35891..b1d99c60d20 100644
--- a/htdocs/contrat/index.php
+++ b/htdocs/contrat/index.php
@@ -72,21 +72,25 @@ print load_fiche_titre($langs->trans("ContractsArea"),'','title_commercial.png')
 print '<div class="fichecenter"><div class="fichethirdleft">';
 
 
-// Search contract
-if (! empty($conf->contrat->enabled))
+if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is useless due to the global search combo
 {
-	$var=false;
-	print '<form method="post" action="'.DOL_URL_ROOT.'/contrat/list.php">';
-	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-	print '<table class="noborder nohover" width="100%">';
-	print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
-	print '<tr '.$bc[$var].'>';
-	print '<td class="nowrap">'.$langs->trans("Contract").':</td><td><input type="text" class="flat" name="sall" size="18"></td>';
-	print '<td><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
-	print "</table></form>\n";
-	print "<br>";
+    // Search contract
+    if (! empty($conf->contrat->enabled))
+    {
+    	$var=false;
+    	print '<form method="post" action="'.DOL_URL_ROOT.'/contrat/list.php">';
+    	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+    	print '<table class="noborder nohover" width="100%">';
+    	print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
+    	print '<tr '.$bc[$var].'>';
+    	print '<td class="nowrap">'.$langs->trans("Contract").':</td><td><input type="text" class="flat" name="sall" size="18"></td>';
+    	print '<td><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
+    	print "</table></form>\n";
+    	print "<br>";
+    }
 }
 
+
 /*
  * Statistics
  */
@@ -251,7 +255,7 @@ if (! empty($conf->contrat->enabled) && $user->rights->contrat->lire)
 
 			$i = 0;
 			//$tot_ttc = 0;
-			while ($i < $num && $i < 20)
+			while ($i < $num)
 			{
 				$obj = $db->fetch_object($resql);
 				print '<tr '.$bc[$var].'><td class="nowrap">';
diff --git a/htdocs/core/boxes/box_lastlogin.php b/htdocs/core/boxes/box_lastlogin.php
new file mode 100644
index 00000000000..7211877a593
--- /dev/null
+++ b/htdocs/core/boxes/box_lastlogin.php
@@ -0,0 +1,113 @@
+<?php
+/* Copyright (C) 2012      Charles-François BENKE <charles.fr@benke.fr>
+ * Copyright (C) 2005-2017 Laurent Destailleur    <eldy@users.sourceforge.net>
+ * Copyright (C) 2014-2015 Frederic France        <frederic.france@free.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
+ * 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/>.
+ */
+
+/**
+ *  \file       htdocs/core/boxes/box_lastlogin.php
+ *  \ingroup    core
+ *  \brief      Module to show box of bills, orders & propal of the current year
+ */
+
+include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php';
+
+/**
+ * Class to manage the box of last login
+ */
+class box_lastlogin extends ModeleBoxes
+{
+    var $boxcode="lastlogin";
+    var $boximg="object_user";
+    var $boxlabel='BoxLoginInformation';
+    var $depends = array("user");
+
+    var $db;
+    var $param;
+    var $enabled = 1;
+
+    var $info_box_head = array();
+    var $info_box_contents = array();
+
+
+    /**
+     *  Constructor
+     *
+     *  @param  DoliDB  $db         Database handler
+     *  @param  string  $param      More parameters
+     */
+    function __construct($db,$param)
+    {
+        global $conf;
+
+        $this->db=$db;
+    }
+
+    /**
+     *  Charge les donnees en memoire pour affichage ulterieur
+     *
+     *  @param  int     $max        Maximum number of records to load
+     *  @return void
+     */
+    function loadBox($max=5)
+    {
+        global $conf, $user, $langs, $db;
+
+        $textHead = $langs->trans("BoxLoginInformation");
+        $this->info_box_head = array(
+            'text' => $textHead,
+            'limit'=> dol_strlen($textHead),
+        );
+        
+        $line=0;
+        $this->info_box_contents[$line][0] = array(
+            'td' => '',
+            'text' => $langs->trans("User"),
+        );
+        $this->info_box_contents[$line][1] = array(
+            'td' => '',
+            'text' => $user->getNomUrl(1),
+            'asis' => 1
+        );
+        
+        $line=1;
+        $this->info_box_contents[$line][0] = array(
+            'td' => '',
+            'text' => $langs->trans("PreviousConnexion"),
+        );
+        if ($user->datepreviouslogin) $tmp= dol_print_date($user->datepreviouslogin,"dayhour",'tzuser');
+        else $tmp= $langs->trans("Unknown");
+        $this->info_box_contents[$line][1] = array(
+            'td' => '',
+            'text' => $tmp,
+        );
+        
+    }
+
+
+	/**
+	 *	Method to show box
+	 *
+	 *	@param	array	$head       Array with properties of box title
+	 *	@param  array	$contents   Array with properties of box lines
+	 *  @param	int		$nooutput	No print, only return string
+	 *	@return	void
+	 */
+    function showBox($head = null, $contents = null, $nooutput=0)
+    {
+		parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
+	}
+}
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 5637d52ace7..764c1feb875 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -404,11 +404,12 @@ class Form
      *	@param	int			$notabs				0=Include table and tr tags, 1=Do not include table and tr tags, 2=use div, 3=use span
      *	@param	string		$incbefore			Include code before the text
      *	@param	int			$noencodehtmltext	Do not encode into html entity the htmltext
+     *  @param  int         $tooltiptrigger     ''=Tooltip on hover, 'abc'=Tooltip on click (abc is a unique key)
      *	@return	string							Code html du tooltip (texte+picto)
      *	@see	Use function textwithpicto if you can.
      *  TODO Move this as static as soon as everybody use textwithpicto or @Form::textwithtooltip
      */
-    function textwithtooltip($text, $htmltext, $tooltipon = 1, $direction = 0, $img = '', $extracss = '', $notabs = 2, $incbefore = '', $noencodehtmltext = 0)
+    function textwithtooltip($text, $htmltext, $tooltipon = 1, $direction = 0, $img = '', $extracss = '', $notabs = 2, $incbefore = '', $noencodehtmltext = 0, $tooltiptrigger='')
     {
         global $conf;
 
@@ -427,12 +428,30 @@ class Form
         if ($direction < 0) { $extracss=($extracss?$extracss.' ':'').'inline-block'; $extrastyle='padding: 0px; padding-left: 3px !important;'; }
         if ($direction > 0) { $extracss=($extracss?$extracss.' ':'').'inline-block'; $extrastyle='padding: 0px; padding-right: 3px !important;'; }
 
+        $classfortooltip='classfortooltip';
+        
+        $s='';$textfordialog='';
+        
         $htmltext=str_replace('"',"&quot;",$htmltext);
-        if ($tooltipon == 2 || $tooltipon == 3) $paramfortooltipimg=' class="classfortooltip inline-block'.($extracss?' '.$extracss:'').'" style="padding: 0px;'.($extrastyle?' '.$extrastyle:'').'" title="'.($noencodehtmltext?$htmltext:dol_escape_htmltag($htmltext,1)).'"'; // Attribut to put on img tag to store tooltip
+        if ($tooltiptrigger != '') 
+        {
+            $classfortooltip='classfortooltiponclick';
+            $textfordialog.='<div style="display: none;" id="idfortooltiponclick_'.$tooltiptrigger.'" class="classfortooltiponclicktext">'.$htmltext.'</div>';
+        }
+        if ($tooltipon == 2 || $tooltipon == 3) 
+        {
+            $paramfortooltipimg=' class="'.$classfortooltip.' inline-block'.($extracss?' '.$extracss:'').'" style="padding: 0px;'.($extrastyle?' '.$extrastyle:'').'"';
+            if ($tooltiptrigger == '') $paramfortooltipimg.=' title="'.($noencodehtmltext?$htmltext:dol_escape_htmltag($htmltext,1)).'"'; // Attribut to put on img tag to store tooltip
+            else $paramfortooltipimg.=' dolid="'.$tooltiptrigger.'"';
+        }
         else $paramfortooltipimg =($extracss?' class="'.$extracss.'"':'').($extrastyle?' style="'.$extrastyle.'"':''); // Attribut to put on td text tag
-        if ($tooltipon == 1 || $tooltipon == 3) $paramfortooltiptd=' class="classfortooltip inline-block'.($extracss?' '.$extracss:'').'" style="padding: 0px;'.($extrastyle?' '.$extrastyle:'').'" title="'.($noencodehtmltext?$htmltext:dol_escape_htmltag($htmltext,1)).'"'; // Attribut to put on td tag to store tooltip
+        if ($tooltipon == 1 || $tooltipon == 3) 
+        {
+            $paramfortooltiptd=' class="'.$classfortooltip.' inline-block'.($extracss?' '.$extracss:'').'" style="padding: 0px;'.($extrastyle?' '.$extrastyle:'').'" ';
+            if ($tooltiptrigger == '') $paramfortooltiptd.=' title="'.($noencodehtmltext?$htmltext:dol_escape_htmltag($htmltext,1)).'"'; // Attribut to put on td tag to store tooltip
+            else $paramfortooltiptd.=' dolid="'.$tooltiptrigger.'"';
+        }
         else $paramfortooltiptd =($extracss?' class="'.$extracss.'"':'').($extrastyle?' style="'.$extrastyle.'"':''); // Attribut to put on td text tag
-        $s="";
         if (empty($notabs)) $s.='<table class="nobordernopadding" summary=""><tr style="height: auto;">';
         elseif ($notabs == 2) $s.='<div class="inline-block">';
         // Define value if value is before
@@ -441,7 +460,7 @@ class Form
             if ($tag == 'td') {
                 $s .= ' valign="top" width="14"';
             }
-            $s.= '>'.$img.'</'.$tag.'>';
+            $s.= '>'.$textfordialog.$img.'</'.$tag.'>';
         }
         // Use another method to help avoid having a space in value in order to use this value with jquery
         // Define label
@@ -450,7 +469,7 @@ class Form
         if ($direction > 0) {
             $s.='<'.$tag.$paramfortooltipimg;
             if ($tag == 'td') $s .= ' valign="middle" width="14"';
-            $s.= '>'.$img.'</'.$tag.'>';
+            $s.= '>'.$textfordialog.$img.'</'.$tag.'>';
         }
         if (empty($notabs)) $s.='</tr></table>';
 		elseif ($notabs == 2) $s.='</div>';
@@ -468,9 +487,10 @@ class Form
      *  @param  string	$extracss           Add a CSS style to td, div or span tag
      *  @param  int		$noencodehtmltext   Do not encode into html entity the htmltext
      *  @param	int		$notabs				0=Include table and tr tags, 1=Do not include table and tr tags, 2=use div, 3=use span
+     *  @param  int     $tooltiptrigger     ''=Tooltip on hover, 'abc'=Tooltip on click (abc is a unique key)
      * 	@return	string						HTML code of text, picto, tooltip
      */
-    function textwithpicto($text, $htmltext, $direction = 1, $type = 'help', $extracss = '', $noencodehtmltext = 0, $notabs = 2)
+    function textwithpicto($text, $htmltext, $direction = 1, $type = 'help', $extracss = '', $noencodehtmltext = 0, $notabs = 2, $tooltiptrigger='')
     {
         global $conf;
 
@@ -498,13 +518,13 @@ class Form
         }
 
         if ($type == 'info') $img = img_help(0, $alt);
-        elseif ($type == 'help') $img = img_help(1, $alt);
+        elseif ($type == 'help') $img = img_help(($tooltiptrigger != '' ? 2 : 1), $alt);
         elseif ($type == 'superadmin') $img = img_picto($alt, 'redstar');
         elseif ($type == 'admin') $img = img_picto($alt, 'star');
         elseif ($type == 'warning') $img = img_warning($alt);
 		else $img = img_picto($alt, $type);
 
-        return $this->textwithtooltip($text, $htmltext, 2, $direction, $img, $extracss, $notabs, '', $noencodehtmltext);
+        return $this->textwithtooltip($text, $htmltext, 2, $direction, $img, $extracss, $notabs, '', $noencodehtmltext, $tooltiptrigger);
     }
 
     /**
@@ -3246,11 +3266,11 @@ class Form
             {
                 if ($selected == $res->rowid)
                 {
-                    $return.='<option value="'.$res->rowid.'" selected>'.$langs->trans($res->label).'</option>';
+                    $return.='<option value="'.$res->rowid.'" selected>'.($langs->trans('unit'.$res->code)!=$res->label?$langs->trans('unit'.$res->code):$res->label).'</option>';
                 }
                 else
                 {
-                    $return.='<option value="'.$res->rowid.'">'.$langs->trans($res->label).'</option>';
+                    $return.='<option value="'.$res->rowid.'">'.($langs->trans('unit'.$res->code)!=$res->label?$langs->trans('unit'.$res->code):$res->label).'</option>';
                 }
             }
             $return.='</select>';
@@ -6005,7 +6025,7 @@ class Form
                 if ($object->photo) $ret.="<br>\n";
                 $ret.='<table class="nobordernopadding centpercent">';
                 if ($object->photo) $ret.='<tr><td><input type="checkbox" class="flat photodelete" name="deletephoto" id="photodelete"> '.$langs->trans("Delete").'<br><br></td></tr>';
-                $ret.='<tr><td>'.$langs->trans("PhotoFile").'</td></tr>';
+                //$ret.='<tr><td>'.$langs->trans("PhotoFile").'</td></tr>';
                 $ret.='<tr><td class="tdoverflow"><input type="file" class="flat maxwidth200onsmartphone" name="photo" id="photoinput"></td></tr>';
                 $ret.='</table>';
             }
diff --git a/htdocs/core/class/html.formaccounting.class.php b/htdocs/core/class/html.formaccounting.class.php
index 9abf943d948..8c7f6903bb3 100644
--- a/htdocs/core/class/html.formaccounting.class.php
+++ b/htdocs/core/class/html.formaccounting.class.php
@@ -50,13 +50,14 @@ class FormAccounting
      * 	@param	int		$useempty		Set to 1 if we want an empty value
      * 	@param	int		$maxlen			Max length of text in combo box
      * 	@param	int		$help			Add or not the admin help picto
+     *  @param  int     $allcountries   All countries
      * 	@return	void
      */
-    function select_accounting_category($selected='',$htmlname='account_category', $useempty=0, $maxlen=64, $help=1)
+    function select_accounting_category($selected='',$htmlname='account_category', $useempty=0, $maxlen=0, $help=1, $allcountries=0)
     {
         global $db,$langs,$user,$mysoc;
 
-        if (empty($mysoc->country_id) && empty($mysoc->country_code))
+        if (empty($mysoc->country_id) && empty($mysoc->country_code) && empty($allcountries))
         {
             dol_print_error('','Call to select_accounting_account with mysoc country not yet defined');
             exit;
@@ -68,7 +69,7 @@ class FormAccounting
             $sql.= " FROM ".MAIN_DB_PREFIX."c_accounting_category as c";
             $sql.= " WHERE c.active = 1";
 			$sql.= " AND c.category_type = 0";
-            $sql.= " AND c.fk_country = ".$mysoc->country_id;
+            if (empty($allcountries)) $sql.= " AND c.fk_country = ".$mysoc->country_id;
             $sql.= " ORDER BY c.label ASC";
         }
         else
@@ -78,7 +79,7 @@ class FormAccounting
             $sql.= " WHERE c.active = 1";
 			$sql.= " AND c.category_type = 0";
 			$sql.= " AND c.fk_country = co.rowid";
-            $sql.= " AND co.code = '".$mysoc->country_code."'";
+            if (empty($allcountries)) $sql.= " AND co.code = '".$mysoc->country_code."'";
             $sql.= " ORDER BY c.label ASC";
         }
 
@@ -89,7 +90,7 @@ class FormAccounting
             $num = $db->num_rows($resql);
             if ($num)
             {
-                print '<select class="flat" name="'.$htmlname.'">';
+                print '<select class="flat minwidth200" name="'.$htmlname.'">';
                 $i = 0;
 
                 if ($useempty) print '<option value="0">&nbsp;</option>';
@@ -98,7 +99,7 @@ class FormAccounting
                     $obj = $db->fetch_object($resql);
                     print '<option value="'.$obj->rowid.'"';
                     if ($obj->rowid == $selected) print ' selected';
-                    print '>'.dol_trunc($obj->type,$maxlen);
+                    print '>'.($maxlen ? dol_trunc($obj->type,$maxlen) : $obj->type);
 					print ' ('.$obj->range_account.')';
                     $i++;
                 }
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 14bda5cdc3c..88ad26ac9da 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -2566,7 +2566,7 @@ function img_printer($titlealt = "default", $other='')
 /**
  *	Show help logo with cursor "?"
  *
- * 	@param	int              	$usehelpcursor		Use help cursor
+ * 	@param	int              	$usehelpcursor		1=Use help cursor, 2=Use click pointer cursor, 0=No specific cursor
  * 	@param	int|string	        $usealttitle		Text to use as alt title
  * 	@return string            	           			Return tag img
  */
@@ -2580,7 +2580,7 @@ function img_help($usehelpcursor = 1, $usealttitle = 1)
 		else $usealttitle = $langs->trans('Info');
 	}
 
-	return img_picto($usealttitle, 'info.png', ($usehelpcursor ? 'style="vertical-align: middle; cursor: help"' : 'style="vertical-align: middle;"'));
+	return img_picto($usealttitle, 'info.png', 'style="vertical-align: middle;'.($usehelpcursor == 1 ? ' cursor: help': ($usehelpcursor == 2 ? ' cursor: pointer':'')).'"');
 }
 
 /**
diff --git a/htdocs/core/menus/init_menu_auguria.sql b/htdocs/core/menus/init_menu_auguria.sql
index 4d535851df2..e52583c48f0 100644
--- a/htdocs/core/menus/init_menu_auguria.sql
+++ b/htdocs/core/menus/init_menu_auguria.sql
@@ -57,8 +57,7 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$leftmenu=="admintools"', __HANDLER__, 'left', 307__+MAX_llx_menu__, 'home', '', 300__+MAX_llx_menu__, '/admin/tools/listevents.php?leftmenu=admintools', 'Audit', 1, 'admin', '', '', 2, 10, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$leftmenu=="admintools"', __HANDLER__, 'left', 308__+MAX_llx_menu__, 'home', '', 300__+MAX_llx_menu__, '/admin/tools/listsessions.php?leftmenu=admintools', 'Sessions', 1, 'admin', '', '', 2, 11, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$leftmenu=="admintools"', __HANDLER__, 'left', 309__+MAX_llx_menu__, 'home', '', 300__+MAX_llx_menu__, '/admin/tools/purge.php?leftmenu=admintools', 'Purge', 1, 'admin', '', '', 2, 12, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$leftmenu=="admintools"', __HANDLER__, 'left', 310__+MAX_llx_menu__, 'home', '', 300__+MAX_llx_menu__, '/support/index.php?leftmenu=admintools', 'HelpCenter', 1, 'help', '', '_blank', 2, 13, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$leftmenu=="admintools"', __HANDLER__, 'left', 311__+MAX_llx_menu__, 'home', '', 300__+MAX_llx_menu__, '/admin/system/about.php?leftmenu=admintools', 'About', 1, 'admin', '', '', 2, 14, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$leftmenu=="admintools"', __HANDLER__, 'left', 311__+MAX_llx_menu__, 'home', '', 300__+MAX_llx_menu__, '/admin/system/about.php?leftmenu=admintools', 'ExternalResources', 1, 'admin', '', '', 2, 14, __ENTITY__);
 
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$leftmenu=="admintools"', __HANDLER__, 'left', 320__+MAX_llx_menu__, 'home', '', 300__+MAX_llx_menu__, '/product/admin/product_tools.php?mainmenu=home&amp;leftmenu=admintools', 'ProductVatMassChange', 1, 'products', '', '', 2, 0, __ENTITY__);
 -- Home - Menu users and groups
@@ -214,11 +213,12 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left
 	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 2451__+MAX_llx_menu__, 'accountancy', 'accountancy_admin',            2400__+MAX_llx_menu__, '/accountancy/index.php?mainmenu=accountancy&leftmenu=accountancy_admin', 'Setup', 1, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 1, __ENTITY__);
 	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2455__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_chartmodel',    2451__+MAX_llx_menu__, '/accountancy/admin/account.php?mainmenu=accountancy&leftmenu=accountancy_admin', 'Pcg_version', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 10, __ENTITY__);
 	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2456__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_chart',         2451__+MAX_llx_menu__, '/accountancy/admin/account.php?mainmenu=accountancy&leftmenu=accountancy_admin', 'Chartofaccounts', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 20, __ENTITY__);
-	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2457__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_default',       2451__+MAX_llx_menu__, '/accountancy/admin/index.php?mainmenu=accountancy&leftmenu=accountancy_admin', 'MenuDefaultAccounts', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 30, __ENTITY__);
-	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2458__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_vat',           2451__+MAX_llx_menu__, '/admin/dict.php?id=10&from=accountancy&search_country_id='.$mysoc->country_id.'&mainmenu=accountancy&leftmenu=accountancy_admin', 'MenuVatAccounts', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 40, __ENTITY__);
-	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2459__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_tax',           2451__+MAX_llx_menu__, '/admin/dict.php?id=7&from=accountancy&search_country_id='.$mysoc->country_id.'&mainmenu=accountancy&leftmenu=accountancy_admin', 'MenuTaxAccounts', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 50, __ENTITY__);
-	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2460__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_expensereport', 2451__+MAX_llx_menu__, '/admin/dict.php?id=17&from=accountancy&mainmenu=accountancy&leftmenu=accountancy_admin', 'MenuExpenseReportAccounts', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 60, __ENTITY__);
-	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2461__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_product',       2451__+MAX_llx_menu__, '/accountancy/admin/productaccount.php?mainmenu=accountancy&leftmenu=accountancy_admin', 'MenuProductsAccounts', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 70, __ENTITY__);
+	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2457__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_chart_group',   2451__+MAX_llx_menu__, '/accountancy/admin/categories_list.php?id=32&mainmenu=accountancy&leftmenu=accountancy_admin', 'AccountingCategory', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 22, __ENTITY__);
+	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2458__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_default',       2451__+MAX_llx_menu__, '/accountancy/admin/defaultaccounts.php?mainmenu=accountancy&leftmenu=accountancy_admin', 'MenuDefaultAccounts', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 30, __ENTITY__);
+	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2459__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_vat',           2451__+MAX_llx_menu__, '/admin/dict.php?id=10&from=accountancy&search_country_id='.$mysoc->country_id.'&mainmenu=accountancy&leftmenu=accountancy_admin', 'MenuVatAccounts', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 40, __ENTITY__);
+	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2460__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_tax',           2451__+MAX_llx_menu__, '/admin/dict.php?id=7&from=accountancy&search_country_id='.$mysoc->country_id.'&mainmenu=accountancy&leftmenu=accountancy_admin', 'MenuTaxAccounts', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 50, __ENTITY__);
+	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2461__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_expensereport', 2451__+MAX_llx_menu__, '/admin/dict.php?id=17&from=accountancy&mainmenu=accountancy&leftmenu=accountancy_admin', 'MenuExpenseReportAccounts', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 60, __ENTITY__);
+	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2462__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_product',       2451__+MAX_llx_menu__, '/accountancy/admin/productaccount.php?mainmenu=accountancy&leftmenu=accountancy_admin', 'MenuProductsAccounts', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 70, __ENTITY__);
 	-- Binding
 	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 2401__+MAX_llx_menu__, 'accountancy', 'dispatch_customer', 2400__+MAX_llx_menu__, '/accountancy/customer/index.php?leftmenu=dispatch_customer', 'CustomersVentilation', 1, 'accountancy', '$user->rights->accounting->bind->write', '', 0, 2, __ENTITY__);
 	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="dispatch_customer"', __HANDLER__, 'left', 2402__+MAX_llx_menu__, 'accountancy', '', 2401__+MAX_llx_menu__, '/accountancy/customer/list.php', 'ToDispatch', 2, 'accountancy', '$user->rights->accounting->bind->write', '', 0, 3, __ENTITY__);
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index f07ca770180..228c6447a22 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -565,21 +565,19 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 				$newmenu->add('/admin/system/database.php?mainmenu=home&amp;leftmenu=admintools', $langs->trans('InfoDatabase'), 1);
 				if (function_exists('eaccelerator_info')) $newmenu->add("/admin/tools/eaccelerator.php?mainmenu=home&amp;leftmenu=admintools", $langs->trans("EAccelerator"),1);
 				//$newmenu->add("/admin/system/perf.php?mainmenu=home&amp;leftmenu=admintools", $langs->trans("InfoPerf"),1);
-				$newmenu->add("/admin/tools/purge.php?mainmenu=home&amp;leftmenu=admintools", $langs->trans("Purge"),1);
 				$newmenu->add("/admin/tools/dolibarr_export.php?mainmenu=home&amp;leftmenu=admintools", $langs->trans("Backup"),1);
 				$newmenu->add("/admin/tools/dolibarr_import.php?mainmenu=home&amp;leftmenu=admintools", $langs->trans("Restore"),1);
 				$newmenu->add("/admin/tools/update.php?mainmenu=home&amp;leftmenu=admintools", $langs->trans("MenuUpgrade"),1);
+				$newmenu->add("/admin/tools/purge.php?mainmenu=home&amp;leftmenu=admintools", $langs->trans("Purge"),1);
 				$newmenu->add("/admin/tools/listevents.php?mainmenu=home&amp;leftmenu=admintools", $langs->trans("Audit"),1);
 				$newmenu->add("/admin/tools/listsessions.php?mainmenu=home&amp;leftmenu=admintools", $langs->trans("Sessions"),1);
-				$newmenu->add('/admin/system/about.php?mainmenu=home&amp;leftmenu=admintools', $langs->trans('About'), 1);
+				$newmenu->add('/admin/system/about.php?mainmenu=home&amp;leftmenu=admintools', $langs->trans('ExternalResources'), 1);
 
 				if (! empty($conf->product->enabled) || ! empty($conf->service->enabled))
 				{
 					$langs->load("products");
 				    $newmenu->add("/product/admin/product_tools.php?mainmenu=home&amp;leftmenu=admintools", $langs->trans("ProductVatMassChange"), 1, $user->admin);
 				}
-
-				$newmenu->add("/support/index.php?mainmenu=home&amp;leftmenu=admintools", $langs->trans("HelpCenter"),1,1,'targethelp');
 			}
 
 			$newmenu->add("/user/home.php?leftmenu=users", $langs->trans("MenuUsersAndGroups"), 0, $user->rights->user->user->lire, '', $mainmenu, 'users');
@@ -945,6 +943,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 				if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy/',$leftmenu)) $newmenu->add("/accountancy/index.php?leftmenu=accountancy_admin", $langs->trans("Setup"),1,$user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin', 1);
 				if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/accountancy/admin/accountmodel.php?id=31&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("Pcg_version"),2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_chartmodel', 10);
 				if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/accountancy/admin/account.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("Chartofaccounts"),2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_chart', 20);
+				if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/accountancy/admin/categories_list.php?id=32&search_country_id=".$mysoc->country_id."&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("AccountingCategory"),2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_chart', 22);
 				if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_admin/',$leftmenu)) $newmenu->add("/accountancy/admin/defaultaccounts.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuDefaultAccounts"),2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_default', 40);
 				if (! empty($conf->facture->enabled) || ! empty($conf->fournisseur->enabled)) 
 				{
diff --git a/htdocs/core/modules/modUser.class.php b/htdocs/core/modules/modUser.class.php
index f481cdffb8e..f4e9b0d7356 100644
--- a/htdocs/core/modules/modUser.class.php
+++ b/htdocs/core/modules/modUser.class.php
@@ -74,7 +74,9 @@ class modUser extends DolibarrModules
 		$this->const = array();
 
 		// Boxes
-		$this->boxes = array();
+		$this->boxes = array(
+		    0=>array('file'=>'box_lastlogin.php','enabledbydefaulton'=>'Home'),
+		);
 
 		// Permissions
 		$this->rights = array();
diff --git a/htdocs/don/index.php b/htdocs/don/index.php
index 5e4b2966051..daf82d85bbc 100644
--- a/htdocs/don/index.php
+++ b/htdocs/don/index.php
@@ -81,30 +81,34 @@ print load_fiche_titre($langs->trans("DonationsArea"));
 
 print '<div class="fichecenter"><div class="fichethirdleft">';
 
-if (! empty($conf->don->enabled) && $user->rights->don->lire)
+if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is useless due to the global search combo
 {
-	$listofsearchfields['search_donation']=array('text'=>'Donation');
+    if (! empty($conf->don->enabled) && $user->rights->don->lire)
+    {
+    	$listofsearchfields['search_donation']=array('text'=>'Donation');
+    }
+    
+    if (count($listofsearchfields))
+    {
+    	print '<form method="post" action="'.DOL_URL_ROOT.'/core/search.php">';
+    	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+    	print '<table class="noborder nohover centpercent">';
+    	$i=0;
+    	foreach($listofsearchfields as $key => $value)
+    	{
+    		if ($i == 0) print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
+    		print '<tr '.$bc[false].'>';
+    		print '<td class="nowrap"><label for="'.$key.'">'.$langs->trans($value["text"]).'</label></td><td><input type="text" class="flat inputsearch" name="'.$key.'" id="'.$key.'"></td>';
+    		if ($i == 0) print '<td rowspan="'.count($listofsearchfields).'"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td>';
+    		print '</tr>';
+    		$i++;
+    	}
+    	print '</table>';	
+    	print '</form>';
+    	print '<br>';
+    }
 }
 
-if (count($listofsearchfields))
-{
-	print '<form method="post" action="'.DOL_URL_ROOT.'/core/search.php">';
-	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-	print '<table class="noborder nohover centpercent">';
-	$i=0;
-	foreach($listofsearchfields as $key => $value)
-	{
-		if ($i == 0) print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
-		print '<tr '.$bc[false].'>';
-		print '<td class="nowrap"><label for="'.$key.'">'.$langs->trans($value["text"]).'</label></td><td><input type="text" class="flat inputsearch" name="'.$key.'" id="'.$key.'"></td>';
-		if ($i == 0) print '<td rowspan="'.count($listofsearchfields).'"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td>';
-		print '</tr>';
-		$i++;
-	}
-	print '</table>';	
-	print '</form>';
-	print '<br>';
-}
 
 print '<table class="noborder nohover" width="100%">';
 print '<tr class="liste_titre">';
diff --git a/htdocs/expedition/index.php b/htdocs/expedition/index.php
index 33aae04c5ab..e9bfa8a484c 100644
--- a/htdocs/expedition/index.php
+++ b/htdocs/expedition/index.php
@@ -47,14 +47,16 @@ print load_fiche_titre($langs->trans("SendingsArea"));
 print '<div class="fichecenter"><div class="fichethirdleft">';
 
 
-$var=false;
-print '<form method="post" action="list.php">';
-print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-print '<table class="noborder nohover" width="100%">';
-print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
-print '<tr '.$bc[$var].'><td>';
-print $langs->trans("Shipment").':</td><td><input type="text" class="flat" name="sall" size="18"></td><td><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
-print "</table></form><br>\n";
+if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is useless due to the global search combo
+{
+    print '<form method="post" action="list.php">';
+    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+    print '<table class="noborder nohover" width="100%">';
+    print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
+    print '<tr '.$bc[$var].'><td>';
+    print $langs->trans("Shipment").':</td><td><input type="text" class="flat" name="sall" size="18"></td><td><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
+    print "</table></form><br>\n";
+}
 
 /*
  * Shipments to validate
diff --git a/htdocs/fichinter/index.php b/htdocs/fichinter/index.php
index 54392795f13..f1592b1e13b 100644
--- a/htdocs/fichinter/index.php
+++ b/htdocs/fichinter/index.php
@@ -59,16 +59,18 @@ print load_fiche_titre($langs->trans("InterventionsArea"));
 
 print '<div class="fichecenter"><div class="fichethirdleft">';
 
-
-// Search ficheinter
-$var=false;
-print '<table class="noborder nohover" width="100%">';
-print '<form method="post" action="'.DOL_URL_ROOT.'/fichinter/list.php">';
-print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
-print '<tr '.$bc[$var].'><td>';
-print $langs->trans("Intervention").':</td><td><input type="text" class="flat" name="sall" size="18"></td><td><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
-print "</form></table><br>\n";
+if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is useless due to the global search combo
+{
+    // Search ficheinter
+    $var=false;
+    print '<table class="noborder nohover" width="100%">';
+    print '<form method="post" action="'.DOL_URL_ROOT.'/fichinter/list.php">';
+    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+    print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
+    print '<tr '.$bc[$var].'><td>';
+    print $langs->trans("Intervention").':</td><td><input type="text" class="flat" name="sall" size="18"></td><td><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
+    print "</form></table><br>\n";
+}
 
 
 /*
diff --git a/htdocs/fourn/commande/index.php b/htdocs/fourn/commande/index.php
index fe702b5838b..8ad4b9f4857 100644
--- a/htdocs/fourn/commande/index.php
+++ b/htdocs/fourn/commande/index.php
@@ -53,17 +53,17 @@ print load_fiche_titre($langs->trans("SuppliersOrdersArea"));
 print '<div class="fichecenter"><div class="fichethirdleft">';
 
 
-/*
- * Search form
- */
-$var=false;
-print '<form method="post" action="list.php">';
-print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-print '<table class="noborder nohover" width="100%">';
-print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
-print '<tr '.$bc[$var].'><td>';
-print $langs->trans("SupplierOrder").':</td><td><input type="text" class="flat" name="search_all" size="18"></td><td><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
-print "</table></form><br>\n";
+if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is useless due to the global search combo
+{
+    $var=false;
+    print '<form method="post" action="list.php">';
+    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+    print '<table class="noborder nohover" width="100%">';
+    print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
+    print '<tr '.$bc[$var].'><td>';
+    print $langs->trans("SupplierOrder").':</td><td><input type="text" class="flat" name="search_all" size="18"></td><td><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
+    print "</table></form><br>\n";
+}
 
 
 /*
diff --git a/htdocs/hrm/index.php b/htdocs/hrm/index.php
index 30d0c911ba1..e8038497e2c 100644
--- a/htdocs/hrm/index.php
+++ b/htdocs/hrm/index.php
@@ -77,40 +77,42 @@ print load_fiche_titre($langs->trans("HRMArea"),'', 'title_hrm.png');
 
 print '<div class="fichecenter"><div class="fichethirdleft">';
 
-
-if (! empty($conf->holiday->enabled) && $user->rights->holiday->read)
+if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is useless due to the global search combo
 {
-	$langs->load("holiday");
-    $listofsearchfields['search_holiday']=array('text'=>'TitreRequestCP');
-}
-if (! empty($conf->deplacement->enabled) && $user->rights->deplacement->lire)
-{
-	$langs->load("trips");
-    $listofsearchfields['search_deplacement']=array('text'=>'ExpenseReport');
-}
-if (! empty($conf->expensereport->enabled) && $user->rights->expensereport->lire)
-{
-	$langs->load("trips");
-    $listofsearchfields['search_expensereport']=array('text'=>'ExpenseReport');
-}
-if (count($listofsearchfields))
-{
-	print '<form method="post" action="'.DOL_URL_ROOT.'/core/search.php">';
-	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-	print '<table class="noborder nohover centpercent">';
-	$i=0;
-	foreach($listofsearchfields as $key => $value)
-	{
-		if ($i == 0) print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
-		print '<tr '.$bc[false].'>';
-		print '<td class="nowrap"><label for="'.$key.'">'.$langs->trans($value["text"]).'</label></td><td><input type="text" class="flat inputsearch" name="'.$key.'" id="'.$key.'" size="18"></td>';
-		if ($i == 0) print '<td rowspan="'.count($listofsearchfields).'"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td>';
-		print '</tr>';
-		$i++;
-	}
-	print '</table>';	
-	print '</form>';
-	print '<br>';
+    if (! empty($conf->holiday->enabled) && $user->rights->holiday->read)
+    {
+    	$langs->load("holiday");
+        $listofsearchfields['search_holiday']=array('text'=>'TitreRequestCP');
+    }
+    if (! empty($conf->deplacement->enabled) && $user->rights->deplacement->lire)
+    {
+    	$langs->load("trips");
+        $listofsearchfields['search_deplacement']=array('text'=>'ExpenseReport');
+    }
+    if (! empty($conf->expensereport->enabled) && $user->rights->expensereport->lire)
+    {
+    	$langs->load("trips");
+        $listofsearchfields['search_expensereport']=array('text'=>'ExpenseReport');
+    }
+    if (count($listofsearchfields))
+    {
+    	print '<form method="post" action="'.DOL_URL_ROOT.'/core/search.php">';
+    	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+    	print '<table class="noborder nohover centpercent">';
+    	$i=0;
+    	foreach($listofsearchfields as $key => $value)
+    	{
+    		if ($i == 0) print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
+    		print '<tr '.$bc[false].'>';
+    		print '<td class="nowrap"><label for="'.$key.'">'.$langs->trans($value["text"]).'</label></td><td><input type="text" class="flat inputsearch" name="'.$key.'" id="'.$key.'" size="18"></td>';
+    		if ($i == 0) print '<td rowspan="'.count($listofsearchfields).'"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td>';
+    		print '</tr>';
+    		$i++;
+    	}
+    	print '</table>';	
+    	print '</form>';
+    	print '<br>';
+    }
 }
 
 
diff --git a/htdocs/index.php b/htdocs/index.php
index 233f94ea22c..4e2fac98fa5 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -113,6 +113,7 @@ print '<div class="fichecenter"><div class="fichethirdleft">';
 /*
  * Informations area
  */
+/* Was moved into a widget
 $boxinfo='';
 $boxinfo.= '<div class="box">';
 $boxinfo.= '<table summary="'.dol_escape_htmltag($langs->trans("LoginInformation")).'" class="noborder boxtable" width="100%">';
@@ -127,8 +128,7 @@ $boxinfo.= '</td>';
 $boxinfo.= "</tr>\n";
 $boxinfo.= "</table>\n";
 $boxinfo.= '</div>';
-//print $boxinfo;
-
+*/
 
 /*
  * Dashboard Dolibarr states (statistics)
@@ -593,7 +593,7 @@ $boxlist.='<tr><td class="notopnoleftnoright">'."\n";
 
 $boxlist.='<div class="fichehalfleft">';
 
-$boxlist.=$boxinfo;
+//$boxlist.=$boxinfo;
 $boxlist.=$boxstat;
 $boxlist.=$resultboxes['boxlista'];
 
diff --git a/htdocs/install/mysql/migration/repair.sql b/htdocs/install/mysql/migration/repair.sql
index 8d6c12b407f..06372f42aba 100755
--- a/htdocs/install/mysql/migration/repair.sql
+++ b/htdocs/install/mysql/migration/repair.sql
@@ -305,7 +305,6 @@ DELETE FROM llx_c_shipment_mode where code IN (select code from tmp_c_shipment_m
 drop table tmp_c_shipment_mode;
 
 
-
 -- VMYSQL4.1 SET sql_mode = 'ALLOW_INVALID_DATES';
 -- VMYSQL4.1 update llx_expensereport set date_debut = date_create where DATE(STR_TO_DATE(date_debut, '%Y-%m-%d')) IS NULL;
 -- VMYSQL4.1 SET sql_mode = 'NO_ZERO_DATE';
@@ -321,3 +320,6 @@ drop table tmp_c_shipment_mode;
 -- VMYSQL4.1 SET sql_mode = 'NO_ZERO_DATE';
 -- VMYSQL4.1 update llx_expensereport set date_valid = date_fin where DATE(STR_TO_DATE(date_valid, '%Y-%m-%d')) IS NULL;
 
+-- VMYSQL4.1 SET sql_mode = 'ALLOW_INVALID_DATES';
+-- VMYSQL4.1 update llx_expensereport_det as ed set date = (select date_debut from llx_expensereport as e where ed.fk_expensereport = e.rowid) where DATE(STR_TO_DATE(date, '%Y-%m-%d')) < '1000-00-00';
+-- VMYSQL4.1 SET sql_mode = 'NO_ZERO_DATE';
diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php
index 09aa85d48c3..c9391256f66 100644
--- a/htdocs/install/upgrade2.php
+++ b/htdocs/install/upgrade2.php
@@ -431,6 +431,21 @@ if (! GETPOST("action") || preg_match('/upgrade/i',GETPOST('action')))
             migrate_reload_menu($db,$langs,$conf,$versionto);
         }
         
+        // Scripts for last version
+        $afterversionarray=explode('.','5.0.9');
+        $beforeversionarray=explode('.','6.0.9');
+        if (versioncompare($versiontoarray,$afterversionarray) >= 0 && versioncompare($versiontoarray,$beforeversionarray) <= 0)
+        {
+            // Reload modules (this must be always and only into last targeted version)
+            $listofmodule=array(
+                'MAIN_MODULE_USER'=>'newboxdefonly',
+            );
+            migrate_reload_modules($db,$langs,$conf,$listofmodule);
+        
+            // Reload menus (this must be always and only into last targeted version)
+            migrate_reload_menu($db,$langs,$conf,$versionto);
+        }
+        
         // Can force activation of some module during migration with third paramater = MAIN_MODULE_XXX,MAIN_MODULE_YYY,...
         if ($enablemodules)
         {
diff --git a/htdocs/langs/ar_SA/accountancy.lang b/htdocs/langs/ar_SA/accountancy.lang
index 30fb31722ee..039b124e30b 100644
--- a/htdocs/langs/ar_SA/accountancy.lang
+++ b/htdocs/langs/ar_SA/accountancy.lang
@@ -194,6 +194,8 @@ ChangeBinding=Change the binding
 
 ## Admin
 ApplyMassCategories=Apply mass categories
+AddAccountFromBookKeepingWithNoCategories=Add acccount already used with no categories
+CategoryDeleted=Category for the accounting account has been removed
 
 ## Export
 Exports=صادرات
@@ -209,6 +211,7 @@ Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution
 Modelcsv_quadratus=Export towards Quadratus QuadraCompta
 Modelcsv_ebp=Export towards EBP
 Modelcsv_cogilog=Export towards Cogilog
+ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
 InitAccountancy=Init accountancy
diff --git a/htdocs/langs/ar_SA/admin.lang b/htdocs/langs/ar_SA/admin.lang
index f741b0691ef..396e193a577 100644
--- a/htdocs/langs/ar_SA/admin.lang
+++ b/htdocs/langs/ar_SA/admin.lang
@@ -9,17 +9,20 @@ VersionDevelopment=تطويرية
 VersionUnknown=غير معروف
 VersionRecommanded=موصى بها
 FileCheck=Files integrity checker
-FileCheckDesc=This tool allows you to check the integrity of files of your application, comparing each files with the official ones. You can use this tool to detect if some files were modified by a hacker for example.
+FileCheckDesc=This tool allows you to check the integrity of files and setup of your application, comparing each files with the official ones. 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.
 FileIntegrityIsStrictlyConformedWithReference=Files integrity is strictly conformed with the reference.
-FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified of removed.
+FileIntegrityIsOkButFilesWereAdded=Files integrity check has passed, however some new files were added.
+FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified, removed or added.
 GlobalChecksum=Global checksum
 MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
 LocalSignature=Embedded local signature (less reliable)
 RemoteSignature=Remote distant signature (more reliable)
 FilesMissing=الملفات المفقودة
 FilesUpdated=الملفات التي تم تحديثها
+FilesModified=Modified Files
+FilesAdded=Added Files
 FileCheckDolibarr=Check integrity of application files
-AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from a certified package
+AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from an official package
 XmlNotFound=Xml Integrity File of application not found
 SessionId=Session ID
 SessionSaveHandler=معالج لحفظ الجلسات
@@ -188,7 +191,9 @@ BoxesDesc=Widgets are components showing some information that you can add to pe
 OnlyActiveElementsAreShown=فقط العناصر من <a href="%s">النماذج المفعلة </a> سوف تظهر.
 ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
-ModulesMarketPlaces=مزيد من وحدات...
+ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
+ModulesMarketPlaces=Find external modules...
+GoModuleSetupArea=To deploy/install a new module, go onto the Module setup area at <a href="%s">%s</a>.
 DoliStoreDesc=DoliStore ، في السوق الرسمي لتخطيط موارد المؤسسات وحدات Dolibarr / خارجي إدارة علاقات العملاء
 DoliPartnersDesc=List of companies providing custom developed modules or features (Note: anyone experienced in PHP programming can provide custom development for an open source project)
 WebSiteDesc=Reference websites to find more modules...
@@ -280,20 +285,21 @@ MenuHandlers=قائمة مناولي
 MenuAdmin=قائمة تحرير
 DoNotUseInProduction=لا تستخدمها مع المنتج
 ThisIsProcessToFollow=This is steps to process:
-ThisIsAlternativeProcessToFollow=هذا هو الإعداد بديل للعملية:
+ThisIsAlternativeProcessToFollow=This is an alternative setup to process manually:
 StepNb=الخطوة %s
 FindPackageFromWebSite=العثور على الحزمة التي توفر ميزة تريد (على سبيل المثال على موقع الويب %s).
 DownloadPackageFromWebSite=تحميل الحزمة (على سبيل المثال من الموقع الرسمي على الإنترنت%s).
-UnpackPackageInDolibarrRoot=ملف حزمة فك إلى Dolibarr دليل خادم مخصص لوحدات <b>الخارجية:%s</b>
-SetupIsReadyForUse=الانتهاء من تركيب وDolibarr على استعداد لاستخدام هذا العنصر الجديد.
-NotExistsDirect=لم يتم تعريف الدليل الجذر بديل. <br>
-InfDirAlt=منذ الإصدار 3 من الممكن تعريف directory.This الجذر بديلة يسمح لك لتخزين ونفس المكان، والمكونات الإضافية والقوالب المخصصة. <br> مجرد إنشاء دليل على جذر Dolibarr (على سبيل المثال: مخصص). <br>
-InfDirExample=<br> ثم نعلن ذلك في conf.php ملف <br> $ dolibarr_main_url_root_alt = 'HTTP: // MYSERVER / مخصص " <br> $ dolibarr_main_document_root_alt = '/ مسار / لعام / dolibarr / htdocs / مخصص " <br> * وعلق هذه الخطوط مع "#"، إلى غير تعليق فقط إزالة الطابع.
+UnpackPackageInDolibarrRoot=Unpack the packaged files into server directory dedicated to Dolibarr: <b>%s</b>
+UnpackPackageInModulesRoot=To deploy/install an external module, unpack the packaged files into the server directory dedicated to modules: <b>%s</b>
+SetupIsReadyForUse=Module deployment is finished. You must however enable and setup the module in your application by going on the page to setup modules: <a href="%s">%s</a>.
+NotExistsDirect=The alternative root directory is not defined to an existing directory.<br>
+InfDirAlt=Since version 3, it is possible to define an alternative root directory. This allows you to store, into a dedicated directory, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
+InfDirExample=<br>Then declare it in the file <strong>conf.php</strong><br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>If these lines are commented with "#", to enable them, just uncomment by removing the "#" character.
 YouCanSubmitFile=لهذه الخطوة، يمكنك إرسال حزمة باستخدام هذه الأداة: اختر ملف الوحدة النمطية
 CurrentVersion=Dolibarr النسخة الحالية
 CallUpdatePage=Go to the page that updates the database structure and data: %s.
 LastStableVersion=Latest stable version
-LastActivationDate=Last activation date
+LastActivationDate=Latest activation date
 UpdateServerOffline=خادم التحديث متواجد حاليا
 GenericMaskCodes=يمكنك إدخال أي قناع الترقيم. في هذا القناع ، وبعد ويمكن استخدام العلامات : <br> <b>(000000)</b> يطابق عدد الذي سيكون على كل يزداد ٪ s. كما تدخل العديد من أصفار على النحو المنشود طول المضادة. المضاد وسيتم الانتهاء من اصفار من اليسار من أجل الحصول على أكبر عدد اصفار كما القناع. <br> <b>000000 +000) (نفس</b> السابقة ولكن يقابل المقابلة لعدد للحق من علامة + يطبق اعتبارا من أول ٪ s. <br> <b>000000 @ (س)</b> نفس السابقة ولكن المضاد هو إعادة الصفر عندما يتم التوصل إلى الشهر خ خ ما بين 1 و 12). إذا كان هذا الخيار هو المستخدمة وس 2 أو أعلى ، ثم تسلسل (ذ ذ م م)) ((سنة أو ملم)) (مطلوب أيضا. <br> <b>(ب)</b> اليوم (01 الى 31). <br> <b>() ملم</b> في الشهر (01 الى 12). <br> <b>(كذا)</b> ، <b>(سنة))</b> أو <b>(ذ</b> السنة أكثر من 2 أو 4 أو 1 الأرقام. <br>
 GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
@@ -376,11 +382,11 @@ ExtrafieldCheckBox=Checkbox
 ExtrafieldRadio=Radio button
 ExtrafieldCheckBoxFromList= مربع من الجدول
 ExtrafieldLink=رابط إلى كائن
-ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>In order to have the list depending on another :<br>1,value1|parent_list_code:parent_key<br>2,value2|parent_list_code:parent_key
+ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list :<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list :<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
-ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
+ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=يجب أن يكون المعلمات ObjectName: CLASSPATH <br> بناء الجملة: ObjectName: CLASSPATH <br> مثال: سوسيتيه: سوسيتيه / فئة / societe.class.php
 LibraryToBuildPDF=Library used for PDF generation
 WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
@@ -415,10 +421,10 @@ ModuleCompanyCodeDigitaria=قانون المحاسبة طرف ثالث يعتم
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
 WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<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).
-
+ClickToShowDescription=Click to show description
 # Modules
 Module0Name=& مجموعات المستخدمين
-Module0Desc=إدارة المستخدمين والمجموعات
+Module0Desc=Users / Employees and Groups management
 Module1Name=أطراف ثالثة
 Module1Desc=شركات الاتصالات وإدارة
 Module2Name=التجارية
@@ -689,7 +695,7 @@ PermissionAdvanced253=إنشاء / تعديل المستخدمين خارجي /
 Permission254=حذف أو تعطيل المستخدمين الآخرين
 Permission255=إنشاء / تعديل بلده معلومات المستخدم
 Permission256=تعديل بنفسه كلمة المرور
-Permission262=Extend access to all third parties (not only third parties that user is a sale representative). Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc). Not effective for projects (only rules on project permissions, visibility and assignement matters).
+Permission262=Extend access to all third parties (not only third parties that user is a sale representative).<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 assignement matters).
 Permission271=قراءة في كاليفورنيا
 Permission272=قراءة الفواتير
 Permission273=قضية الفواتير
@@ -891,7 +897,7 @@ Offset=ويقابل
 AlwaysActive=حركة دائمة
 Upgrade=ترقية
 MenuUpgrade=ترقية / توسيع
-AddExtensionThemeModuleOrOther=إضافة التمديد) الموضوع ، وحدة ،...)
+AddExtensionThemeModuleOrOther=Deploy/install external module
 WebServer=خادم الويب
 DocumentRootServer=خادم الويب 'sالدليل الرئيسي
 DataRootServer=دليل ملفات البيانات
@@ -1165,10 +1171,6 @@ FreeLegalTextOnOrders=بناء على أوامر النص الحر
 WatermarkOnDraftOrders=العلامة المائية على مشاريع المراسيم (أي إذا فارغ)
 ShippableOrderIconInList=إضافة رمز في قائمة الطلبيات التي تشير إلى أمر غير قابل للشحن إذا
 BANK_ASK_PAYMENT_BANK_DURING_ORDER=اسأل عن وجهة حساب مصرفي من أجل
-##### Clicktodial #####
-ClickToDialSetup=انقر لإعداد وحدة الاتصال الهاتفي
-ClickToDialUrlDesc=ودعا الموقع عندما تنقر على الهاتف picto ذلك. Dans l' رابط ، vous pouvez utiliser ليه balises <br> <b>٪ ٪ 1 $ ق</b> qui الأمصال remplacé قدم المساواة جنيه téléphone دي l' appelé <br> <b>٪ ٪</b> 2 $ <b>ق</b> qui الأمصال remplacé لو قدم المساواة téléphone دي l' appelant جنيه مصري vôtre) <br> <b>٪ ٪ ل 3</b> دولار qui الأمصال remplacé vôtre ادخل clicktodial الفقرة (défini سور vôtre فيشه utilisateur) <br> <b>٪ ٪</b> 4 <b>$</b> ق qui الأمصال remplacé الفقرة vôtre يذكره دي clicktodial عتيق (défini سور vôtre فيشه utilisateur).
-##### Bookmark4u #####
 ##### Interventions #####
 InterventionsSetup=وحدة التدخل الإعداد
 FreeLegalTextOnInterventions=حرر النص على وثائق التدخل
@@ -1395,7 +1397,7 @@ SendingsSetup=ارسال وحدة الإعداد
 SendingsReceiptModel=ارسال استلام نموذج
 SendingsNumberingModules=Sendings ترقيم الوحدات
 SendingsAbility=أوراق دعم الشحن للشحنات العملاء
-NoNeedForDeliveryReceipts=في معظم الحالات ، تستخدم الإرسال إيصالات سواء صحائف لتسليم العميل (قائمة المنتجات ارسال) ، وصحائف التي وقعت عليها recevied الزبون. حتى المنتج تسليم الإيصالات هي سمة مزدوجة ونادرا ما تفعيلها.
+NoNeedForDeliveryReceipts=In most cases, shipping sheets are used both as sheets for customer deliveries (list of products to send) and sheets that is received and signed by customer. So product deliveries receipts is a duplicated feature and is rarely activated.
 FreeLegalTextOnShippings=النص الحر على الشحنات
 ##### Deliveries #####
 DeliveryOrderNumberingModules=تلقي شحنات المنتجات الترقيم وحدة
@@ -1477,7 +1479,9 @@ AGENDA_DEFAULT_FILTER_STATUS=تلقائيا تعيين هذه الحالة مع
 AGENDA_DEFAULT_VIEW=علامة التبويب التي تريد فتح افتراضيا عند اختيار القائمة جدول الأعمال
 AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
 AGENDA_NOTIFICATION_SOUND=Enable sound notification
-##### ClickToDial #####
+##### Clicktodial #####
+ClickToDialSetup=انقر لإعداد وحدة الاتصال الهاتفي
+ClickToDialUrlDesc=ودعا الموقع عندما تنقر على الهاتف picto ذلك. Dans l' رابط ، vous pouvez utiliser ليه balises <br> <b>٪ ٪ 1 $ ق</b> qui الأمصال remplacé قدم المساواة جنيه téléphone دي l' appelé <br> <b>٪ ٪</b> 2 $ <b>ق</b> qui الأمصال remplacé لو قدم المساواة téléphone دي l' appelant جنيه مصري vôtre) <br> <b>٪ ٪ ل 3</b> دولار qui الأمصال remplacé vôtre ادخل clicktodial الفقرة (défini سور vôtre فيشه utilisateur) <br> <b>٪ ٪</b> 4 <b>$</b> ق qui الأمصال remplacé الفقرة vôtre يذكره دي clicktodial عتيق (défini سور vôtre فيشه utilisateur).
 ClickToDialDesc=هذه الوحدة تسمح لجعل أرقام هواتف يمكن النقر عليها. وهناك انقر على هذه الأيقونة دعوة تجعل هاتفك إلى الاتصال برقم الهاتف. وهذا يمكن أن تستخدم لاستدعاء نظام مركز الاتصال من Dolibarr يمكن أن نسميه ورقم الهاتف على نظام SIP على سبيل المثال.
 ClickToDialUseTelLink=مجرد استخدام الرابط "الهاتف:" على أرقام الهواتف
 ClickToDialUseTelLinkDesc=استخدام هذا الأسلوب إذا كان المستخدمون يكون الهاتف الرقمي أو واجهة البرامج المثبتة على الكمبيوتر نفسه من المتصفح، ويسمى عند النقر على رابط في المتصفح التي تبدأ ب "الهاتف". إذا كنت في حاجة الى حل خادم الكامل (لا حاجة لتثبيت البرامج المحلية)، يجب عليك تعيين هذا إلى "لا" وملء الحقل التالي.
@@ -1505,10 +1509,11 @@ EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint availa
 ##### API ####
 ApiSetup=API وحدة الإعداد
 ApiDesc=من خلال تمكين هذه الوحدة، Dolibarr يصبح الخادم REST لتوفير خدمات الإنترنت المتنوعة.
-ApiProductionMode=تمكين وضع الإنتاج (وهذا سوف تفعيل استخدام مخابئ لإدارة الخدمات)
+ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
 ApiExporerIs=You can explore the APIs at url
 OnlyActiveElementsAreExposed=ويتعرض عناصر فقط من وحدات تمكين
 ApiKey=مفتاح API
+WarningAPIExplorerDisabled=The API explorer has been disabled. API explorer is not required to provide API services. It is a tool for developer to find/test REST APIs. If you need this tool, go into setup of module API REST to activate it.
 ##### Bank #####
 BankSetupModule=إعداد وحدة مصرفية
 FreeLegalTextOnChequeReceipts=نص حر على الشيكات والإيصالات
@@ -1577,7 +1582,7 @@ BackupDumpWizard=المعالج لبناء قاعدة بيانات النسخ ا
 SomethingMakeInstallFromWebNotPossible=تركيب وحدة خارجية غير ممكن من واجهة ويب للسبب التالي:
 SomethingMakeInstallFromWebNotPossible2=لهذا السبب، عملية لترقية وصفت هنا هو دليل على بعد خطوات قليلة يمكن للمستخدم متميز القيام به.
 InstallModuleFromWebHasBeenDisabledByFile=تثبيت وحدة خارجية من التطبيق قد تم تعطيلها من قبل المسؤول. يجب أن يطلب منه إزالة <strong>الملف٪ s</strong> للسماح هذه الميزة.
-ConfFileMuseContainCustom=Installing an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to have option<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
+ConfFileMuseContainCustom=Installing an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=تسليط الضوء على خطوط الجدول عندما يمر تحرك الماوس فوق
 HighlightLinesColor=تسليط الضوء على لون الخط عند تمرير الماوس فوق (الحفاظ فارغة دون تمييز)
 TextTitleColor=Color of page title
@@ -1607,6 +1612,7 @@ FixTZ=الإصلاح والوقت
 FillFixTZOnlyIfRequired=مثال: +2 (ملء فقط إذا كانت المشكلة من ذوي الخبرة)
 ExpectedChecksum=اختباري المتوقع
 CurrentChecksum=اختباري الحالي
+ForcedConstants=Required constant values
 MailToSendProposal=لإرسال اقتراح العملاء
 MailToSendOrder=لإرسال طلب العميل
 MailToSendInvoice=لإرسال فاتورة العملاء
@@ -1615,9 +1621,10 @@ MailToSendIntervention=لإرسال التدخل
 MailToSendSupplierRequestForQuotation=لإرسال طلب الاقتباس إلى المورد
 MailToSendSupplierOrder=لإرسال المورد أجل
 MailToSendSupplierInvoice=لإرسال فاتورة المورد
+MailToSendContract=To send a contract
 MailToThirdparty=To send email from third party page
 ByDefaultInList=تظهر بشكل افتراضي على عرض القائمة
-YouUseLastStableVersion=كنت تستخدم إصدار مستقر الماضي
+YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=مثال على رسالة يمكنك استخدامها ليعلن هذا الإصدار الرئيسي (لا تتردد في استخدامها على مواقع الويب الخاص بك)
 TitleExampleForMaintenanceRelease=مثال على الرسالة التي يمكن استخدامها ليعلن هذا البيان الصيانة (لا تتردد في استخدامها على مواقع الويب الخاص بك)
 ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. 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.
diff --git a/htdocs/langs/ar_SA/banks.lang b/htdocs/langs/ar_SA/banks.lang
index 3d0aede502e..99a7b732e8b 100644
--- a/htdocs/langs/ar_SA/banks.lang
+++ b/htdocs/langs/ar_SA/banks.lang
@@ -74,13 +74,13 @@ Conciliate=التوفيق
 Conciliation=توفيق
 ReconciliationLate=Reconciliation late
 IncludeClosedAccount=وتشمل حسابات مغلقة
-OnlyOpenedAccount=حسابات مفتوحة فقط
+OnlyOpenedAccount=إلا فتح حسابات
 AccountToCredit=الحساب على الائتمان
 AccountToDebit=لحساب الخصم
 DisableConciliation=تعطيل ميزة التوفيق لهذا الحساب
 ConciliationDisabled=توفيق سمة المعوقين
 LinkedToAConciliatedTransaction=Linked to a conciliated entry
-StatusAccountOpened=فتح
+StatusAccountOpened=Opened
 StatusAccountClosed=مغلقة
 AccountIdShort=عدد
 LineRecord=المعاملات
diff --git a/htdocs/langs/ar_SA/bills.lang b/htdocs/langs/ar_SA/bills.lang
index 8f877a70daa..ea2eed2e298 100644
--- a/htdocs/langs/ar_SA/bills.lang
+++ b/htdocs/langs/ar_SA/bills.lang
@@ -2,12 +2,12 @@
 Bill=فاتورة
 Bills=فواتير
 BillsCustomers=فواتير العملاء
-BillsCustomer=فاتورة العملاء
+BillsCustomer=الزبون فاتورة
 BillsSuppliers=فواتير الموردين
-BillsCustomersUnpaid=فواتير العملاء الغير مدفوعة
-BillsCustomersUnpaidForCompany=فواتير العميل الغير مدفوعة لـ%s
-BillsSuppliersUnpaid=غير المدفوعة الموردين
-BillsSuppliersUnpaidForCompany=مورد غير المسددة لفواتير %s
+BillsCustomersUnpaid=فواتير العملاء غير المسددة
+BillsCustomersUnpaidForCompany=Unpaid customer invoices for %s
+BillsSuppliersUnpaid=فواتير الموردين غير المدفوعة
+BillsSuppliersUnpaidForCompany=Unpaid supplier invoices for %s
 BillsLate=في وقت متأخر المدفوعات
 BillsStatistics=عملاء الفواتير إحصاءات
 BillsStatisticsSuppliers=فواتير الموردين إحصاءات
@@ -62,8 +62,8 @@ PaymentsBack=عودة المدفوعات
 paymentInInvoiceCurrency=in invoices currency
 PaidBack=تسديدها
 DeletePayment=حذف الدفع
-ConfirmDeletePayment=Are you sure you want to delete this payment?
-ConfirmConvertToReduc=Do you want to convert this credit note or deposit 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.
+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.
 SupplierPayments=الموردين والمدفوعات
 ReceivedPayments=تلقت مدفوعات
 ReceivedCustomersPayments=المدفوعات المقبوضة من الزبائن
@@ -78,6 +78,7 @@ PaymentMode=نوع الدفع
 PaymentTypeDC=Debit/Credit Card
 PaymentTypePP=PayPal
 IdPaymentMode=Payment type (id)
+CodePaymentMode=Payment type (code)
 LabelPaymentMode=Payment type (label)
 PaymentModeShort=نوع الدفع
 PaymentTerm=مصطلح الدفع
@@ -102,9 +103,10 @@ SearchACustomerInvoice=البحث عن زبون فاتورة
 SearchASupplierInvoice=البحث عن مورد فاتورة
 CancelBill=شطب فاتورة
 SendRemindByMail=إرسال تذكرة عن طريق البريد الإلكتروني
-DoPayment=هل لدفع
-DoPaymentBack=هل لدفع الظهر
+DoPayment=Enter payment
+DoPaymentBack=Enter refund
 ConvertToReduc=تحويل الخصم في المستقبل
+ConvertExcessReceivedToReduc=Convert excess received into future discount
 EnterPaymentReceivedFromCustomer=دخول الدفع الواردة من العملاء
 EnterPaymentDueToCustomer=من المقرر أن يسدد العميل
 DisabledBecauseRemainderToPayIsZero=تعطيل بسبب المتبقية غير المدفوعة صفر
@@ -151,14 +153,14 @@ NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified
 FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
 NotARecurringInvoiceTemplate=Not a recurring template invoice
 NewBill=فاتورة جديدة
-LastBills=آخر الفواتير %s
-LastCustomersBills=%s الماضي فواتير العملاء
-LastSuppliersBills=%s الماضي فواتير الموردين
+LastBills=Latest %s invoices
+LastCustomersBills=Latest %s customer invoices
+LastSuppliersBills=Latest %s supplier invoices
 AllBills=جميع الفواتير
 OtherBills=غيرها من الفواتير
 DraftBills=مشروع الفواتير
-CustomersDraftInvoices=مشروع فواتير العملاء
-SuppliersDraftInvoices=مشروع فواتير الموردين
+CustomersDraftInvoices=Customer draft invoices
+SuppliersDraftInvoices=Supplier draft invoices
 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>?
@@ -272,6 +274,7 @@ Deposit=إيداع
 Deposits=الودائع
 DiscountFromCreditNote=خصم من دائن  %s
 DiscountFromDeposit=المدفوعات من فاتورة  %s
+DiscountFromExcessReceived=Payments from excess received of invoice %s
 AbsoluteDiscountUse=هذا النوع من الائتمان يمكن استخدامها على الفاتورة قبل المصادقة
 CreditNoteDepositUse=Invoice must be validated to use this kind of credits
 NewGlobalDiscount=تحديد خصم جديد
@@ -279,8 +282,8 @@ NewRelativeDiscount=خصم جديد النسبية
 NoteReason=ملاحظة / السبب
 ReasonDiscount=السبب
 DiscountOfferedBy=التي تمنحها
-DiscountStillRemaining=خصم لا يزالون
-DiscountAlreadyCounted=بالفعل خصم أحصى
+DiscountStillRemaining=Discounts available
+DiscountAlreadyCounted=Discounts already consumed
 BillAddress=مشروع قانون معالجة
 HelpEscompte=هذا الخصم هو الخصم الممنوح للعميل لأن الدفع قبل البعيد.
 HelpAbandonBadCustomer=هذا المبلغ قد تم التخلي عنها (وذكر أن العملاء سيئة العملاء) ، ويعتبر أحد exceptionnal فضفاضة.
@@ -333,6 +336,8 @@ 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
 # PaymentConditions
 Statut=الحالة
 PaymentConditionShortRECEP=Due Upon Receipt
@@ -351,6 +356,14 @@ 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
 FixAmount=كمية الإصلاح
 VarAmount=مقدار متغير (٪٪ TOT).
 # PaymentType
@@ -420,7 +433,7 @@ ChequeDeposits=الشيكات الودائع
 Cheques=الشيكات
 DepositId=إيداع معرف
 NbCheque=عدد الشيكات
-CreditNoteConvertedIntoDiscount=هذه المذكرة الائتمان أو إيداع فاتورة تم تحويلها إلى %s
+CreditNoteConvertedIntoDiscount=This %s has been converted into %s
 UsBillingContactAsIncoiveRecipientIfExist=فواتير العملاء استخدام عنوان الاتصال بدلا من التصدي لطرف ثالث كما المتلقية للفواتير
 ShowUnpaidAll=وتظهر جميع الفواتير غير المسددة
 ShowUnpaidLateOnly=وتبين في وقت متأخر من الفواتير غير المدفوعة فقط
diff --git a/htdocs/langs/ar_SA/boxes.lang b/htdocs/langs/ar_SA/boxes.lang
index 01ee9c87524..9bac5c3be97 100644
--- a/htdocs/langs/ar_SA/boxes.lang
+++ b/htdocs/langs/ar_SA/boxes.lang
@@ -25,8 +25,8 @@ BoxTitleLastSuppliers=Latest %s recorded suppliers
 BoxTitleLastModifiedSuppliers=Latest %s modified suppliers
 BoxTitleLastModifiedCustomers=Latest %s modified customers
 BoxTitleLastCustomersOrProspects=Latest %s customers or prospects
-BoxTitleLastCustomerBills=Latest %s customer's invoices
-BoxTitleLastSupplierBills=Latest %s supplier's invoices
+BoxTitleLastCustomerBills=Latest %s customer invoices
+BoxTitleLastSupplierBills=Latest %s supplier invoices
 BoxTitleLastModifiedProspects=Latest %s modified prospects
 BoxTitleLastModifiedMembers=Latest %s members
 BoxTitleLastFicheInter=Latest %s modified interventions
@@ -51,12 +51,12 @@ ClickToAdd=انقر هنا لإضافة.
 NoRecordedCustomers=لا العملاء تسجيل
 NoRecordedContacts=أي اتصالات تسجيل
 NoActionsToDo=توجد إجراءات لتفعل
-NoRecordedOrders=أوامر العملاء لا يسجل في
+NoRecordedOrders=No recorded customer orders
 NoRecordedProposals=أي مقترحات تسجيل
-NoRecordedInvoices=فواتير لم تسجل العملاء ل
-NoUnpaidCustomerBills=فواتير غير مدفوعة الأجر في أي العملاء
-NoUnpaidSupplierBills=فواتير غير مدفوعة الأجر في أي المورد
-NoModifiedSupplierBills=فواتير لم المورد المسجلة في
+NoRecordedInvoices=No recorded customer invoices
+NoUnpaidCustomerBills=No unpaid customer invoices
+NoUnpaidSupplierBills=No unpaid supplier invoices
+NoModifiedSupplierBills=No recorded supplier invoices
 NoRecordedProducts=لم تسجل المنتجات / الخدمات
 NoRecordedProspects=لا آفاق المسجلة
 NoContractedProducts=لا توجد منتجات / خدمات التعاقد
diff --git a/htdocs/langs/ar_SA/companies.lang b/htdocs/langs/ar_SA/companies.lang
index b21f0c6468b..36e0622e971 100644
--- a/htdocs/langs/ar_SA/companies.lang
+++ b/htdocs/langs/ar_SA/companies.lang
@@ -81,6 +81,7 @@ PaymentBankAccount=Payment bank account
 OverAllProposals=Total proposals
 OverAllOrders=Total orders
 OverAllInvoices=Total invoices
+OverAllSupplierProposals=Total price requests
 ##### Local Taxes #####
 LocalTax1IsUsed=استخدام الضرائب الثانية
 LocalTax1IsUsedES= يتم استخدام الطاقة المتجددة
@@ -389,7 +390,7 @@ ListCustomersShort=قائمة العملاء
 ThirdPartiesArea=أطراف ثالثة، ومنطقة الاتصال
 LastModifiedThirdParties=Latest %s modified third parties
 UniqueThirdParties=مجموع الأطراف الثالثة فريدة من نوعها
-InActivity=فتح
+InActivity=Opened
 ActivityCeased=مغلق
 ThirdPartyIsClosed=Third party is closed
 ProductsIntoElements=قائمة المنتجات / الخدمات إلى %s
@@ -404,7 +405,7 @@ MergeThirdparties=دمج أطراف ثالثة
 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 so you will be able to delete the duplicate one.
 ThirdpartiesMergeSuccess=تم دمج Thirdparties
 SaleRepresentativeLogin=Login of sales representative
-SaleRepresentativeFirstname=Firstname of sales representative
-SaleRepresentativeLastname=Lastname of sales representative
+SaleRepresentativeFirstname=First name of sales representative
+SaleRepresentativeLastname=Last name of sales representative
 ErrorThirdpartiesMerge=كان هناك خطأ عند حذف thirdparties. يرجى التحقق من السجل. وقد عادت التغييرات.
 NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/ar_SA/compta.lang b/htdocs/langs/ar_SA/compta.lang
index c7a7dbe4fb9..173c282060a 100644
--- a/htdocs/langs/ar_SA/compta.lang
+++ b/htdocs/langs/ar_SA/compta.lang
@@ -65,6 +65,7 @@ PaymentSocialContribution=اجتماعي / دفع الضرائب المالية
 PaymentVat=دفع ضريبة القيمة المضافة
 ListPayment=قائمة المدفوعات
 ListOfCustomerPayments=قائمة مدفوعات العملاء
+ListOfSupplierPayments=قائمة الموردين المدفوعات
 DateStartPeriod=تاريخ بداية الفترة
 DateEndPeriod=تاريخ انتهاء الفترة
 newLT1Payment=جديد الضريبية 2 الدفع
@@ -81,7 +82,7 @@ LT2PaymentES=IRPF الدفع
 LT2PaymentsES=الدفعات IRPF
 VATPayment=Sales tax payment
 VATPayments=Sales tax payments
-VATRefund=Sales tax refund Refund
+VATRefund=Sales tax refund
 Refund=رد
 SocialContributionsPayments=الاجتماعية المدفوعات / الضرائب المالية
 ShowVatPayment=وتظهر دفع ضريبة القيمة المضافة
diff --git a/htdocs/langs/ar_SA/cron.lang b/htdocs/langs/ar_SA/cron.lang
index 7357976d5ea..2b96553e327 100644
--- a/htdocs/langs/ar_SA/cron.lang
+++ b/htdocs/langs/ar_SA/cron.lang
@@ -17,14 +17,14 @@ CronMethodDoesNotExists=Class %s does not contains any method %s
 # Menu
 EnabledAndDisabled=Enabled and disabled
 # Page list
-CronLastOutput=نشاط انتاج المدى
-CronLastResult=آخر رمز النتيجة
+CronLastOutput=Latest run output
+CronLastResult=Latest result code
 CronCommand=أمر
 CronList=المهام المجدولة
 CronDelete=حذف المهام المجدولة
-CronConfirmDelete=هل أنت متأكد أنك تريد حذف هذه المهام المجدولة؟
+CronConfirmDelete=Are you sure you want to delete these scheduled jobs?
 CronExecute=Launch scheduled job
-CronConfirmExecute=هل أنت متأكد أنك تريد تنفيذ هذه المهام المجدولة الآن؟
+CronConfirmExecute=Are you sure you want to execute these scheduled jobs now?
 CronInfo=وحدة مهمة مجدولة تسمح لتنفيذ المهمة التي تم التخطيط لها
 CronTask=وظيفة
 CronNone=بلا
@@ -39,7 +39,7 @@ CronMethod=الطريقة
 CronModule=وحدة
 CronNoJobs=أي وظيفة سجلت
 CronPriority=الأولوية
-CronLabel=Label
+CronLabel=ملصق
 CronNbRun=ملحوظة. إطلاق
 CronMaxRun=Max nb. launch
 CronEach=كل
@@ -73,7 +73,7 @@ CronType_method=استدعاء الأسلوب من فئة Dolibarr
 CronType_command=الأمر Shell
 CronCannotLoadClass=لا يمكن تحميل الطبقة %s أو الكائن %s
 UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled jobs" to see and edit scheduled jobs.
-JobDisabled=Job disabled
+JobDisabled=تعطيل وظيفة
 MakeLocalDatabaseDumpShort=Local database backup
 MakeLocalDatabaseDump=Create a local database dump
 WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of active jobs, your jobs may be delayed to a maximum of %s hours before being run.
diff --git a/htdocs/langs/ar_SA/errors.lang b/htdocs/langs/ar_SA/errors.lang
index 22768ddeee1..dd0d710929c 100644
--- a/htdocs/langs/ar_SA/errors.lang
+++ b/htdocs/langs/ar_SA/errors.lang
@@ -11,6 +11,7 @@ ErrorLoginAlreadyExists=ادخل ٪ ق موجود بالفعل.
 ErrorGroupAlreadyExists=المجموعة ٪ ق موجود بالفعل.
 ErrorRecordNotFound=لم يتم العثور على السجل.
 ErrorFailToCopyFile=فشل في نسخ الملف <b>'%s'</b> إلى <b>'%s</b> &quot;.
+ErrorFailToCopyDir=Failed to copy directory '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToRenameFile=فشل لإعادة تسمية الملف <b>'%s'</b> إلى <b>'%s</b> &quot;.
 ErrorFailToDeleteFile=فشل إزالة الملف <b>'٪ ق.</b>
 ErrorFailToCreateFile=فشل إنشاء الملف <b>'٪ ق.</b>
@@ -115,7 +116,7 @@ ErrorNoActivatedBarcode=لا يوجد نوع الباركود تفعيلها
 ErrUnzipFails=فشل بفك٪ الصورة مع ZipArchive
 ErrNoZipEngine=لا المحرك لبفك الصورة ملف٪ في هذا PHP
 ErrorFileMustBeADolibarrPackage=يجب أن يكون الملف٪ s حزمة البريدي Dolibarr
-ErrorFileRequired=فإنه يأخذ ملف حزمة Dolibarr
+ErrorModuleFileRequired=You must select a Dolibarr module package file
 ErrorPhpCurlNotInstalled=وPHP الضفيرة لم يتم تثبيت، وهذا أمر ضروري لاجراء محادثات مع باي بال
 ErrorFailedToAddToMailmanList=فشل لاضافة التسجيلة٪ s إلى قائمة ميلمان٪ الصورة أو قاعدة SPIP
 ErrorFailedToRemoveToMailmanList=فشل لإزالة سجل٪ s إلى قائمة ميلمان٪ الصورة أو قاعدة SPIP
@@ -181,6 +182,8 @@ ErrorBankStatementNameMustFollowRegex=Error, bank statement name must follow the
 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>
 
 # Warnings
 WarningPasswordSetWithNoAccount=تم تعيين كلمة مرور لهذا العضو. ومع ذلك، تم إنشاء أي حساب المستخدم. لذلك يتم تخزين كلمة المرور هذه ولكن لا يمكن استخدامها للدخول إلى Dolibarr. ويمكن استخدامه من قبل وحدة / واجهة خارجية ولكن إذا كنت لا تحتاج إلى تعريف أي تسجيل دخول أو كلمة المرور لأحد أفراد، يمكنك تعطيل خيار "إدارة تسجيل دخول لكل عضو" من إعداد وحدة الأعضاء. إذا كنت بحاجة إلى إدارة تسجيل الدخول ولكن لا تحتاج إلى أي كلمة المرور، يمكنك الحفاظ على هذا الحقل فارغا لتجنب هذا التحذير. ملاحظة: يمكن أيضا أن تستخدم البريد الإلكتروني لتسجيل الدخول إذا تم ربط عضو إلى المستخدم.
diff --git a/htdocs/langs/ar_SA/holiday.lang b/htdocs/langs/ar_SA/holiday.lang
index 9a060a7bd4f..a1c028e3b7d 100644
--- a/htdocs/langs/ar_SA/holiday.lang
+++ b/htdocs/langs/ar_SA/holiday.lang
@@ -76,8 +76,8 @@ BoxTitleLastLeaveRequests=Latest %s modified leave requests
 HolidaysMonthlyUpdate=تحديث شهري
 ManualUpdate=التحديث اليدوي
 HolidaysCancelation=ترك طلب الإلغاء
-EmployeeLastname=Employee lastname
-EmployeeFirstname=Employee firstname
+EmployeeLastname=Employee last name
+EmployeeFirstname=Employee first name
 TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
 
 ## Configuration du Module ##
diff --git a/htdocs/langs/ar_SA/ldap.lang b/htdocs/langs/ar_SA/ldap.lang
index 5640b60302a..cb2ed7e293a 100644
--- a/htdocs/langs/ar_SA/ldap.lang
+++ b/htdocs/langs/ar_SA/ldap.lang
@@ -13,8 +13,8 @@ LDAPUsers=المستخدمين في قاعدة البيانات LDAP
 LDAPFieldStatus=حالة
 LDAPFieldFirstSubscriptionDate=أول موعد الاكتتاب
 LDAPFieldFirstSubscriptionAmount=قبضة مبلغ الاشتراك
-LDAPFieldLastSubscriptionDate=آخر موعد الاكتتاب
-LDAPFieldLastSubscriptionAmount=الاكتتاب المبلغ الأخير
+LDAPFieldLastSubscriptionDate=Latest subscription date
+LDAPFieldLastSubscriptionAmount=Latest subscription amount
 LDAPFieldSkype=Skype id
 LDAPFieldSkypeExample=Example : skypeName
 UserSynchronized=وتزامن المستخدم
diff --git a/htdocs/langs/ar_SA/mails.lang b/htdocs/langs/ar_SA/mails.lang
index bad286285f2..a95c8282d72 100644
--- a/htdocs/langs/ar_SA/mails.lang
+++ b/htdocs/langs/ar_SA/mails.lang
@@ -74,14 +74,18 @@ ResultOfMailSending=نتيجة لإرسال البريد الإلكتروني ا
 NbSelected=ملحوظة مختارة
 NbIgnored=ملحوظة تجاهلها
 NbSent=أرسلت ملحوظة
-ContactsWithThirdpartyFilter=Contact with customer filters
+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
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=خط المستندات في ملف ٪
 RecipientSelectionModules=حددت لطلبات المستفيدين الاختيار
 MailSelectedRecipients=اختيار المستفيدين
 MailingArea=EMailings المنطقة
-LastMailings=ق emailings الماضي ٪
+LastMailings=Latest %s emailings
 TargetsStatistics=أهداف الإحصاءات
 NbOfCompaniesContacts=فريدة من شركات الاتصالات
 MailNoChangePossible=صادق المتلقين للمراسلة لا يمكن تغيير
@@ -146,3 +150,6 @@ AdvTgtCreateFilter=Create filter
 AdvTgtOrCreateNewFilter=Name of new filter
 NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
+OutGoingEmailSetup=Outgoing email setup
+InGoingEmailSetup=Incoming email setup
+
diff --git a/htdocs/langs/ar_SA/main.lang b/htdocs/langs/ar_SA/main.lang
index 0e9a114f525..5d4a330f5cf 100644
--- a/htdocs/langs/ar_SA/main.lang
+++ b/htdocs/langs/ar_SA/main.lang
@@ -69,6 +69,7 @@ SetDate=التاريخ المحدد
 SelectDate=تحديد تاريخ
 SeeAlso=انظر أيضا الصورة٪
 SeeHere=انظر هنا
+Apply=تطبيق
 BackgroundColorByDefault=لون الخلفية الافتراضية
 FileRenamed=The file was successfully renamed
 FileUploaded=تم تحميل الملف بنجاح
@@ -87,7 +88,7 @@ Undefined=غير محدد
 PasswordForgotten=Password forgotten?
 SeeAbove=أنظر فوق
 HomeArea=المنطقة الرئيسية
-LastConnexion=آخر إتصال
+LastConnexion=Latest connection
 PreviousConnexion=الاتصال السابق
 PreviousValue=Previous value
 ConnectedOnMultiCompany=إتصال على البيئة
@@ -237,7 +238,7 @@ DateCreation=تاريخ الإنشاء
 DateCreationShort=يخلق. التاريخ
 DateModification=تاريخ التعديل
 DateModificationShort=Modif. التاريخ
-DateLastModification=تاريخ آخر تعديل
+DateLastModification=Latest modification date
 DateValidation=تاريخ التحقق من الصحة
 DateClosing=الموعد النهائي
 DateDue=تاريخ الاستحقاق
@@ -433,7 +434,7 @@ Reportings=التقارير
 Draft=مسودة
 Drafts=الداما
 Validated=التحقق من صحة
-Opened=فتح
+Opened=Opened
 New=جديد
 Discount=تخفيض السعر
 Unknown=غير معروف
@@ -599,6 +600,8 @@ SessionName=اسم الدورة
 Method=الطريقة
 Receive=استقبال
 CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
+ExpectedValue=Expected Value
+CurrentValue=القيمة الحالية
 PartialWoman=جزئي
 TotalWoman=المجموع
 NeverReceived=لم يتلق
@@ -756,6 +759,7 @@ SomeTranslationAreUncomplete=Some languages may be partially translated or may c
 DirectDownloadLink=Direct download link
 Download=Download
 ActualizeCurrency=Update currency rate
+Fiscalyear=السنة المالية
 # Week day
 Monday=يوم الاثنين
 Tuesday=الثلاثاء
@@ -812,3 +816,5 @@ SearchIntoContracts=عقود
 SearchIntoCustomerShipments=Customer shipments
 SearchIntoExpenseReports=تقارير المصاريف
 SearchIntoLeaves=أوراق
+
+BulkActions=Bulk actions
diff --git a/htdocs/langs/ar_SA/members.lang b/htdocs/langs/ar_SA/members.lang
index b21a29860f2..27163003777 100644
--- a/htdocs/langs/ar_SA/members.lang
+++ b/htdocs/langs/ar_SA/members.lang
@@ -136,8 +136,8 @@ DocForAllMembersCards=إنشاء بطاقات العمل لجميع أعضاء (
 DocForOneMemberCards=إنشاء بطاقات العمل لعضو معين (تنسيق الإعداد للإخراج في الواقع : <b>%s)</b>
 DocForLabels=أوراق عنوان انتج (تنسيق الإعداد للإخراج فعلا : <b>%s)</b>
 SubscriptionPayment=دفع الاشتراك
-LastSubscriptionDate=آخر موعد الاكتتاب
-LastSubscriptionAmount=آخر مبلغ الاشتراك
+LastSubscriptionDate=Latest subscription date
+LastSubscriptionAmount=Latest subscription amount
 MembersStatisticsByCountries=أعضاء إحصاءات حسب البلد
 MembersStatisticsByState=أعضاء إحصاءات الولاية / المقاطعة
 MembersStatisticsByTown=أعضاء إحصاءات بلدة
@@ -149,7 +149,7 @@ MembersByStateDesc=هذه الشاشة تظهر لك إحصاءات عن أفر
 MembersByTownDesc=هذه الشاشة تظهر لك إحصاءات عن أفراد من البلدة.
 MembersStatisticsDesc=اختيار الإحصاءات التي ترغب في قراءتها ...
 MenuMembersStats=إحصائيات
-LastMemberDate=آخر عضو تاريخ
+LastMemberDate=Latest member date
 Nature=طبيعة
 Public=معلومات علنية
 NewMemberbyWeb=وأضاف عضو جديد. تنتظر الموافقة
diff --git a/htdocs/langs/ar_SA/orders.lang b/htdocs/langs/ar_SA/orders.lang
index 0a3bec443f4..8e9615a7b16 100644
--- a/htdocs/langs/ar_SA/orders.lang
+++ b/htdocs/langs/ar_SA/orders.lang
@@ -39,7 +39,7 @@ StatusOrderRefusedShort=رفض
 StatusOrderBilledShort=المنقار
 StatusOrderToProcessShort=لعملية
 StatusOrderReceivedPartiallyShort=تلقى جزئيا
-StatusOrderReceivedAllShort=وتلقى كل شيء
+StatusOrderReceivedAllShort=Products received
 StatusOrderCanceled=ألغى
 StatusOrderDraft=مشروع (لا بد من التحقق من صحة)
 StatusOrderValidated=صادق
@@ -51,7 +51,7 @@ StatusOrderApproved=وافق
 StatusOrderRefused=رفض
 StatusOrderBilled=المنقار
 StatusOrderReceivedPartially=تلقى جزئيا
-StatusOrderReceivedAll=وتلقى كل شيء
+StatusOrderReceivedAll=All products received
 ShippingExist=شحنة موجود
 QtyOrdered=الكمية أمرت
 ProductQtyInDraft=كمية المنتج في مشاريع المراسيم
diff --git a/htdocs/langs/ar_SA/other.lang b/htdocs/langs/ar_SA/other.lang
index b54c5443dd3..184c1f4b849 100644
--- a/htdocs/langs/ar_SA/other.lang
+++ b/htdocs/langs/ar_SA/other.lang
@@ -68,14 +68,15 @@ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__ سوف تجد هنا
 PredefinedMailContentSendShipping=__CONTACTCIVNAME__ سوف تجد هنا الشحن __SHIPPINGREF__ __PERSONALIZED__Sincerely __SIGNATURE__
 PredefinedMailContentSendFichInter=__CONTACTCIVNAME__ سوف تجد هنا تدخل __FICHINTERREF__ __PERSONALIZED__Sincerely __SIGNATURE__
 PredefinedMailContentThirdparty=__CONTACTCIVNAME__ __PERSONALIZED__ __SIGNATURE__
-DemoDesc=Dolibarr is a compact ERP/CRM supporting several functional modules. A demo showcasing all modules makes no sense as this scenario never occurs. So, several demo profiles are available.
+DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
+ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
 DemoFundation=أعضاء في إدارة مؤسسة
 DemoFundation2=إدارة وأعضاء في الحساب المصرفي للمؤسسة
-DemoCompanyServiceOnly=إدارة نشاط بيع الخدمة لحسابهم الخاص فقط
+DemoCompanyServiceOnly=Company or freelance selling service only
 DemoCompanyShopWithCashDesk=تدير متجر مع مكتب النقدية
-DemoCompanyProductAndStocks=إدارة شركة صغيرة أو متوسطة بيع المنتجات
-DemoCompanyAll=إدارة شركة صغيرة أو متوسطة متعددة الأنشطة الرئيسية لجميع وحدات)
+DemoCompanyProductAndStocks=Company selling products with a shop
+DemoCompanyAll=Company with multiple activities (all main modules)
 CreatedBy=أوجدتها ٪ ق
 ModifiedBy=المعدلة ق ٪
 ValidatedBy=يصادق عليها ق ٪
diff --git a/htdocs/langs/ar_SA/products.lang b/htdocs/langs/ar_SA/products.lang
index 7ce89212858..022eb3ff929 100644
--- a/htdocs/langs/ar_SA/products.lang
+++ b/htdocs/langs/ar_SA/products.lang
@@ -60,7 +60,7 @@ SellingPrice=سعر البيع
 SellingPriceHT=سعر البيع (صافي الضرائب)
 SellingPriceTTC=سعر البيع (شركة الضريبية)
 CostPriceDescription=هذا السعر (صافية من الضرائب) يمكن استخدامها لتخزين متوسط ​​كمية هذا تكلفة المنتج لشركتك. قد يكون بأي ثمن على حساب نفسك، على سبيل المثال من متوسط ​​سعر الشراء بالإضافة إلى متوسط ​​إنتاج وتوزيع التكاليف.
-CostPriceUsage=في النسخة المقبلة، ويمكن استخدام هذه القيمة لحساب الهامش.
+CostPriceUsage=This value could be used for margin calculation.
 SoldAmount=Sold amount
 PurchasedAmount=Purchased amount
 NewPrice=السعر الجديد
@@ -142,6 +142,7 @@ ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b>?
 CloneContentProduct=استنساخ جميع المعلومات الرئيسية من المنتجات / الخدمات
 ClonePricesProduct=استنساخ الرئيسية معلومات والأسعار
 CloneCompositionProduct=استنساخ حزم المنتج / الخدمة
+CloneCombinationsProduct=Clone product variants
 ProductIsUsed=ويستخدم هذا المنتج
 NewRefForClone=المرجع. من المنتجات الجديدة / خدمة
 SellingPrices=أسعار بيع
@@ -238,7 +239,7 @@ GlobalVariables=المتغيرات العالمية
 VariableToUpdate=Variable to update
 GlobalVariableUpdaters=updaters متغير العالمية
 UpdateInterval=تحديث الفاصل الزمني (دقائق)
-LastUpdated=آخر تحديث
+LastUpdated=Latest update
 CorrectlyUpdated=تحديثها بشكل صحيح
 PropalMergePdfProductActualFile=استخدام الملفات لإضافة إلى PDF دازور هي / هو
 PropalMergePdfProductChooseFile=اختر ملفات PDF
@@ -258,4 +259,41 @@ VolumeUnits=Volume unit
 SizeUnits=Size unit
 DeleteProductBuyPrice=Delete buying price
 ConfirmDeleteProductBuyPrice=Are you sure you want to delete this buying price?
+SubProduct=Sub product
 
+#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
+ProductCombinations=Variants
+HideProductCombinations=Hide products variant in the products selector
+ProductCombination=Variant
+NewProductCombination=New variant
+EditProductCombination=Editing variant
+ProductCombinationGenerator=Variants generator
+Features=Features
+PriceImpact=Price impact
+WeightImpact=Weight impact
+NewProductAttribute=جديد السمة
+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
+PercentageVariation=Percentage variation
+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 child products
+ConfirmCloneProductCombinations=Would you like to copy all the product variant to the 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
diff --git a/htdocs/langs/ar_SA/projects.lang b/htdocs/langs/ar_SA/projects.lang
index be4e9a763c5..dedfa88ea39 100644
--- a/htdocs/langs/ar_SA/projects.lang
+++ b/htdocs/langs/ar_SA/projects.lang
@@ -29,9 +29,9 @@ DeleteAProject=حذف مشروع
 DeleteATask=حذف مهمة
 ConfirmDeleteAProject=Are you sure you want to delete this project?
 ConfirmDeleteATask=Are you sure you want to delete this task?
-OpenedProjects=Open projects
-OpenedTasks=Open tasks
-OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
+OpenedProjects=مشاريع فتح
+OpenedTasks=Opened tasks
+OpportunitiesStatusForOpenedProjects=فرص كمية من المشاريع فتحت حسب الحالة
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=وتبين للمشروع
 SetProject=وضع المشروع
@@ -47,7 +47,7 @@ TaskTimeSpent=الوقت المستغرق في المهام
 TaskTimeUser=المستعمل
 TaskTimeNote=ملاحظة
 TaskTimeDate=Date
-TasksOnOpenedProject=المهام على المشاريع المفتوحة
+TasksOnOpenedProject=Tasks on opened projects
 WorkloadNotDefined=عبء العمل غير محددة
 NewTimeSpent=جديد الوقت الذي يقضيه
 MyTimeSpent=وقتي قضى
@@ -96,6 +96,7 @@ ValidateProject=تحقق من مشروع غابة
 ConfirmValidateProject=Are you sure you want to validate this project?
 CloseAProject=وثيقة المشروع
 ConfirmCloseAProject=Are you sure you want to close this project?
+AlsoCloseAProject=Also close project (keep it open if you still need to follow production tasks on it)
 ReOpenAProject=فتح مشروع
 ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=مشروع اتصالات
@@ -121,7 +122,7 @@ CloneProjectFiles=انضم مشروع استنساخ ملفات
 CloneTaskFiles=مهمة استنساخ (ق) انضم الملفات (إن مهمة (ق) المستنسخة)
 CloneMoveDate=Update project/tasks dates from now?
 ConfirmCloneProject=Are you sure to clone this project?
-ProjectReportDate=تغيير موعد المهمة وفقا المشروع تاريخ بداية
+ProjectReportDate=Change task dates according to new project start date
 ErrorShiftTaskDate=من المستحيل تحويل التاريخ المهمة وفقا لتاريخ بدء المشروع الجديد
 ProjectsAndTasksLines=المشاريع والمهام
 ProjectCreatedInDolibarr=مشروع٪ الصورة التي تم إنشاؤها
@@ -178,9 +179,9 @@ ProjectsStatistics=إحصاءات عن المشاريع / يؤدي
 TaskAssignedToEnterTime=المهمة الموكلة. يجب دخول الوقت على هذه المهمة يكون ممكنا.
 IdTaskTime=الوقت مهمة معرف
 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.
-OpenedProjectsByThirdparties=Open projects by thirdparties
+OpenedProjectsByThirdparties=مشاريع افتتحه thirdparties
 OnlyOpportunitiesShort=Only opportunities
-OpenedOpportunitiesShort=Open opportunities
+OpenedOpportunitiesShort=Opened opportunities
 NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=فرص المبلغ الإجمالي
 OpportunityPonderatedAmount=كمية الفرص المرجحة
diff --git a/htdocs/langs/ar_SA/propal.lang b/htdocs/langs/ar_SA/propal.lang
index 7c81cd0c516..6cf677af780 100644
--- a/htdocs/langs/ar_SA/propal.lang
+++ b/htdocs/langs/ar_SA/propal.lang
@@ -3,7 +3,7 @@ Proposals=مقترحات تجارية
 Proposal=اقتراح التجارية
 ProposalShort=اقتراح
 ProposalsDraft=مقترحات مشاريع تجارية
-ProposalsOpened=مقترحات التجارية المفتوحة
+ProposalsOpened=افتتح مقترحات تجارية
 Prop=مقترحات تجارية
 CommercialProposal=اقتراح التجارية
 ProposalCard=اقتراح بطاقة
@@ -26,9 +26,9 @@ AmountOfProposalsByMonthHT=المبلغ في الشهر (بعد خصم الضر
 NbOfProposals=عدد من المقترحات والتجاري
 ShowPropal=وتظهر اقتراح
 PropalsDraft=المسودات
-PropalsOpened=فتح
+PropalsOpened=Opened
 PropalStatusDraft=مشروع (لا بد من التحقق من صحة)
-PropalStatusValidated=صادق (اقتراح فتح)
+PropalStatusValidated=Validated (proposal is opened)
 PropalStatusSigned=وقعت (لمشروع القانون)
 PropalStatusNotSigned=لم يتم التوقيع (مغلقة)
 PropalStatusBilled=فواتير
diff --git a/htdocs/langs/ar_SA/stocks.lang b/htdocs/langs/ar_SA/stocks.lang
index 9e692ab39d2..f2abd926ebc 100644
--- a/htdocs/langs/ar_SA/stocks.lang
+++ b/htdocs/langs/ar_SA/stocks.lang
@@ -22,13 +22,15 @@ Movements=حركات
 ErrorWarehouseRefRequired=مستودع الاشارة اسم مطلوب
 ListOfWarehouses=لائحة المخازن
 ListOfStockMovements=قائمة الحركات الأسهم
+StockMovementForId=Movement ID %d
+ListMouvementStockProject=List of stock movements associated to project
 StocksArea=منطقة المستودعات
 Location=عوضا عن
 LocationSummary=باختصار اسم الموقع
 NumberOfDifferentProducts=عدد من المنتجات المختلفة
 NumberOfProducts=العدد الإجمالي للمنتجات
-LastMovement=الماضي حركة
-LastMovements=التحركات الأخيرة
+LastMovement=Latest movement
+LastMovements=Latest movements
 Units=الوحدات
 Unit=وحدة
 StockCorrection=تصحيح الأوراق المالية
diff --git a/htdocs/langs/ar_SA/supplier_proposal.lang b/htdocs/langs/ar_SA/supplier_proposal.lang
index d1057e8bb38..1f6b4fd2432 100644
--- a/htdocs/langs/ar_SA/supplier_proposal.lang
+++ b/htdocs/langs/ar_SA/supplier_proposal.lang
@@ -8,7 +8,7 @@ SearchRequest=العثور على الطلب
 DraftRequests=مشروع طلبات
 SupplierProposalsDraft=Draft supplier proposals
 LastModifiedRequests=Latest %s modified price requests
-RequestsOpened=طلبات السعر المفتوحة
+RequestsOpened=Opened price requests
 SupplierProposalArea=منطقة مقترحات المورد
 SupplierProposalShort=اقتراح المورد
 SupplierProposals=مقترحات المورد
@@ -23,7 +23,7 @@ ConfirmValidateAsk=Are you sure you want to validate this price request under na
 DeleteAsk=حذف الطلب
 ValidateAsk=التحقق من صحة الطلب
 SupplierProposalStatusDraft=مشروع (يجب التحقق من صحة)
-SupplierProposalStatusValidated=التحقق من صحة (طلب مفتوح)
+SupplierProposalStatusValidated=Validated (request is opened)
 SupplierProposalStatusClosed=مغلق
 SupplierProposalStatusSigned=قبلت
 SupplierProposalStatusNotSigned=رفض
diff --git a/htdocs/langs/ar_SA/suppliers.lang b/htdocs/langs/ar_SA/suppliers.lang
index 1df16c8d0e3..2aa7623ee43 100644
--- a/htdocs/langs/ar_SA/suppliers.lang
+++ b/htdocs/langs/ar_SA/suppliers.lang
@@ -9,7 +9,7 @@ ShowSupplier=وتظهر المورد
 OrderDate=من أجل التاريخ
 BuyingPriceMin=Best buying price
 BuyingPriceMinShort=Best buying price
-TotalBuyingPriceMinShort=Total of subproducts buying prices
+TotalBuyingPriceMinShort=مجموعه subproducts شراء أسعار
 TotalSellingPriceMinShort=Total of subproducts selling prices
 SomeSubProductHaveNoPrices=بعض المنتجات الفرعية التي لا تعرف السعر
 AddSupplierPrice=Add buying price
@@ -24,10 +24,10 @@ ExportDataset_fournisseur_1=قائمة فواتير الموردين والفو
 ExportDataset_fournisseur_2=فواتير الموردين والمدفوعات
 ExportDataset_fournisseur_3=أوامر المورد وخطوط أجل
 ApproveThisOrder=الموافقة على هذا النظام
-ConfirmApproveThisOrder=هل أنت متأكد من أن يوافق على هذا الأمر؟
+ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b>?
 DenyingThisOrder=إنكار هذا النظام
-ConfirmDenyingThisOrder=هل أنت متأكد من إنكار هذا الأمر؟
-ConfirmCancelThisOrder=هل أنت متأكد من أنك تريد إلغاء هذا النظام؟
+ConfirmDenyingThisOrder=Are you sure you want to deny this order <b>%s</b>?
+ConfirmCancelThisOrder=Are you sure you want to cancel this order <b>%s</b>?
 AddSupplierOrder=من أجل إنشاء مورد
 AddSupplierInvoice=إنشاء مورد فاتورة
 ListOfSupplierProductForSupplier=قائمة المنتجات والأسعار لمورد <b>ق ٪</b>
@@ -41,3 +41,4 @@ DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Wrong quality
 ReputationForThisProduct=Reputation
 BuyerName=Buyer name
+AllProductServicePrices=All product / service prices
diff --git a/htdocs/langs/ar_SA/users.lang b/htdocs/langs/ar_SA/users.lang
index 34d8347f621..06ba944c695 100644
--- a/htdocs/langs/ar_SA/users.lang
+++ b/htdocs/langs/ar_SA/users.lang
@@ -36,7 +36,7 @@ AdministratorDesc=مدير
 DefaultRights=الافتراضي أذونات
 DefaultRightsDesc=التقصير هنا تحديد الاذونات التي تمنح تلقائيا للمستخدم إنشاء جديد.
 DolibarrUsers=Dolibarr المستخدمين
-LastName=Last Name
+LastName=اللقب
 FirstName=الاسم الأول
 ListOfGroups=قائمة المجموعات
 NewGroup=مجموعة جديدة
diff --git a/htdocs/langs/ar_SA/withdrawals.lang b/htdocs/langs/ar_SA/withdrawals.lang
index 1ca13c95ad9..7f8abe748d5 100644
--- a/htdocs/langs/ar_SA/withdrawals.lang
+++ b/htdocs/langs/ar_SA/withdrawals.lang
@@ -24,6 +24,7 @@ WithdrawStatistics=Direct debit payment statistics
 WithdrawRejectStatistics=Direct debit payment reject statistics
 LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
+WithdrawRequestsDone=%s direct debit payment requests recorded
 ThirdPartyBankCode=طرف ثالث بنك مدونة
 NoInvoiceCouldBeWithdrawed=أي فاتورة withdrawed بالنجاح. تأكد من أن الفاتورة على الشركات الحظر ساري المفعول.
 ClassCredited=تصنيف حساب
@@ -76,8 +77,8 @@ RUM=UMR
 RUMLong=Unique Mandate Reference
 RUMWillBeGenerated=UMR number will be generated once bank account information are saved
 WithdrawMode=Direct debit mode (FRST or RECUR)
-WithdrawRequestAmount=سحب طلب كمية:
-WithdrawRequestErrorNilAmount=غير قادر على إنشاء سحب طلب مبلغ لا شيء.
+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
diff --git a/htdocs/langs/bg_BG/accountancy.lang b/htdocs/langs/bg_BG/accountancy.lang
index 95d6a92198f..862fb0a64e8 100644
--- a/htdocs/langs/bg_BG/accountancy.lang
+++ b/htdocs/langs/bg_BG/accountancy.lang
@@ -194,6 +194,8 @@ ChangeBinding=Change the binding
 
 ## Admin
 ApplyMassCategories=Apply mass categories
+AddAccountFromBookKeepingWithNoCategories=Add acccount already used with no categories
+CategoryDeleted=Category for the accounting account has been removed
 
 ## Export
 Exports=Exports
@@ -209,6 +211,7 @@ Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution
 Modelcsv_quadratus=Export towards Quadratus QuadraCompta
 Modelcsv_ebp=Export towards EBP
 Modelcsv_cogilog=Export towards Cogilog
+ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
 InitAccountancy=Init accountancy
diff --git a/htdocs/langs/bg_BG/admin.lang b/htdocs/langs/bg_BG/admin.lang
index d41258f7804..4bb7b7dc5d7 100644
--- a/htdocs/langs/bg_BG/admin.lang
+++ b/htdocs/langs/bg_BG/admin.lang
@@ -9,17 +9,20 @@ VersionDevelopment=Разработка
 VersionUnknown=Неизвестен
 VersionRecommanded=Препоръчва се
 FileCheck=Files integrity checker
-FileCheckDesc=This tool allows you to check the integrity of files of your application, comparing each files with the official ones. You can use this tool to detect if some files were modified by a hacker for example.
+FileCheckDesc=This tool allows you to check the integrity of files and setup of your application, comparing each files with the official ones. 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.
 FileIntegrityIsStrictlyConformedWithReference=Files integrity is strictly conformed with the reference.
-FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified of removed.
+FileIntegrityIsOkButFilesWereAdded=Files integrity check has passed, however some new files were added.
+FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified, removed or added.
 GlobalChecksum=Global checksum
 MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
 LocalSignature=Embedded local signature (less reliable)
 RemoteSignature=Remote distant signature (more reliable)
 FilesMissing=Missing Files
 FilesUpdated=Updated Files
+FilesModified=Modified Files
+FilesAdded=Added Files
 FileCheckDolibarr=Check integrity of application files
-AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from a certified package
+AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from an official package
 XmlNotFound=Xml Integrity File of application not found
 SessionId=ID на сесията
 SessionSaveHandler=Handler за да запазите сесията
@@ -188,7 +191,9 @@ BoxesDesc=Widgets are components showing some information that you can add to pe
 OnlyActiveElementsAreShown=Показани са само елементи от <a href="%s">активирани модули</a>.
 ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
-ModulesMarketPlaces=Повече модули ...
+ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
+ModulesMarketPlaces=Find external modules...
+GoModuleSetupArea=To deploy/install a new module, go onto the Module setup area at <a href="%s">%s</a>.
 DoliStoreDesc=DoliStore, официалният пазар за външни модули за Dolibarr ERP/CRM
 DoliPartnersDesc=List of companies providing custom developed modules or features (Note: anyone experienced in PHP programming can provide custom development for an open source project)
 WebSiteDesc=Reference websites to find more modules...
@@ -280,20 +285,21 @@ MenuHandlers=Меню работещи
 MenuAdmin=Menu Editor
 DoNotUseInProduction=Не използвайте на продукшън платформа
 ThisIsProcessToFollow=This is steps to process:
-ThisIsAlternativeProcessToFollow=This is an alternative setup to process:
+ThisIsAlternativeProcessToFollow=This is an alternative setup to process manually:
 StepNb=Стъпка %s
 FindPackageFromWebSite=Намери пакет, който осигурява функция искате (например относно официалния уеб сайт %s).
 DownloadPackageFromWebSite=Download package (for example from official web site %s).
-UnpackPackageInDolibarrRoot=Unpack package file into Dolibarr server directory dedicated to external modules: <b>%s</b>
-SetupIsReadyForUse=Install е завършен и Dolibarr е готов за използване с този нов компонент.
-NotExistsDirect=Алтернатива главната директория не е дефинирано. <br>
-InfDirAlt=От версия 3 е възможно да се определи алтернативен directory.This корен ви позволява да съхранявате, едно и също място, плъгини и собствени шаблони. <br> Просто създайте директория, в основата на Dolibarr (напр. по поръчка). <br>
-InfDirExample=<br> След това заяви в файла conf.php <br> $ Dolibarr_main_url_root_alt = 'http://myserver/custom &quot; <br> $ Dolibarr_main_document_root_alt = &quot;/ път / / dolibarr / htdocs / по избор&quot; <br> * Тези линии са коментирани с &quot;#&quot;, да разкоментирате само да премахнете характер.
+UnpackPackageInDolibarrRoot=Unpack the packaged files into server directory dedicated to Dolibarr: <b>%s</b>
+UnpackPackageInModulesRoot=To deploy/install an external module, unpack the packaged files into the server directory dedicated to modules: <b>%s</b>
+SetupIsReadyForUse=Module deployment is finished. You must however enable and setup the module in your application by going on the page to setup modules: <a href="%s">%s</a>.
+NotExistsDirect=The alternative root directory is not defined to an existing directory.<br>
+InfDirAlt=Since version 3, it is possible to define an alternative root directory. This allows you to store, into a dedicated directory, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
+InfDirExample=<br>Then declare it in the file <strong>conf.php</strong><br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>If these lines are commented with "#", to enable them, just uncomment by removing the "#" character.
 YouCanSubmitFile=For this step, you can send package using this tool: Select module file
 CurrentVersion=Текуща версия на Dolibarr
 CallUpdatePage=Go to the page that updates the database structure and data: %s.
 LastStableVersion=Latest stable version
-LastActivationDate=Last activation date
+LastActivationDate=Latest activation date
 UpdateServerOffline=Update server offline
 GenericMaskCodes=Можете да въведете всяка маска за номериране. В тази маска, могат да се използват следните тагове: <br> <b>{000000}</b> съответства на номер, който се увеличава на всеки %s. Влез като много нули като желаната дължина на брояча. Броячът ще бъде завършен с нули от ляво, за да има колкото се може повече нули като маска. <br> <b>{000000 000}</b> същата като предишната, но компенсира, съответстваща на броя на правото на знака + се прилага започва на първи %s. <br> <b>{000000 @}</b> същата като предишната, но броячът се нулира, когато месеца Х е достигнал (Х между 1 и 12, или 0, за да използвате началото на месеца на фискалната година, определени в вашата конфигурация). Ако тази опция се използва и х е 2 или по-висока, тогава последователност {гг} {mm} или {гггг} {mm} също е задължително. <br> <b>{DD}</b> ден (01 до 31). <br> <b>{Mm}</b> месец (01 до 12). <br> <b>{Гг} {гггг}</b> или <b>{Y}</b> година над 2, 4 или 1 брой. <br>
 GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
@@ -376,11 +382,11 @@ ExtrafieldCheckBox=Отметка
 ExtrafieldRadio=Радио бутон
 ExtrafieldCheckBoxFromList= Checkbox from table
 ExtrafieldLink=Link to an object
-ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>In order to have the list depending on another :<br>1,value1|parent_list_code:parent_key<br>2,value2|parent_list_code:parent_key
+ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list :<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list :<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
-ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
+ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Example : Societe:societe/class/societe.class.php
 LibraryToBuildPDF=Library used for PDF generation
 WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
@@ -415,10 +421,10 @@ ModuleCompanyCodeDigitaria=Счетоводството код зависи от
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
 WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<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).
-
+ClickToShowDescription=Click to show description
 # Modules
 Module0Name=Потребители и групи
-Module0Desc=Управление на потребители и групи
+Module0Desc=Users / Employees and Groups management
 Module1Name=Контрагенти
 Module1Desc=Фирми и управление на контакти
 Module2Name=Търговски
@@ -689,7 +695,7 @@ PermissionAdvanced253=Създаване / промяна на вътрешни
 Permission254=Създаване / промяна на външни потребители
 Permission255=Промяна на други потребители парола
 Permission256=Изтрий или забраняване на други потребители
-Permission262=Extend access to all third parties (not only third parties that user is a sale representative). Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc). Not effective for projects (only rules on project permissions, visibility and assignement matters).
+Permission262=Extend access to all third parties (not only third parties that user is a sale representative).<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 assignement matters).
 Permission271=Прочети CA
 Permission272=Прочети фактури
 Permission273=Издаване на фактури
@@ -891,7 +897,7 @@ Offset=Офсет
 AlwaysActive=Винаги активна
 Upgrade=Обновяване
 MenuUpgrade=Обновяване/Удължаване
-AddExtensionThemeModuleOrOther=Добавяне на разширение (тема, модул, ...)
+AddExtensionThemeModuleOrOther=Deploy/install external module
 WebServer=Уеб сървър
 DocumentRootServer=Главната директория на уеб сървъра
 DataRootServer=Файлове с данни
@@ -1165,10 +1171,6 @@ FreeLegalTextOnOrders=Свободен текст на поръчки
 WatermarkOnDraftOrders=Watermark on draft orders (none if empty)
 ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable
 BANK_ASK_PAYMENT_BANK_DURING_ORDER=Ask for bank account destination of order
-##### Clicktodial #####
-ClickToDialSetup=Кликнете, за да наберете настройка модул
-ClickToDialUrlDesc=Адреса нарича, когато се извършва едно кликване на телефона пиктограма. URL, можете да използвате маркери <br> <b>__PHONETO__,</b> Които ще бъдат заменени с телефонния номер на лицето, да се обадите <br> <b>__PHONEFROM__,</b> Че ще бъде заменен с телефонния номер на повикващата лице (твое) <br> <b>__LOGIN__,</b> Които ще бъдат заменени с clicktodial вход (определено на вашето потребителско карта) <br> <b>__PASS__,</b> Които ще бъдат заменени с clicktodial вашата парола (определено на вашето потребителско карта).
-##### Bookmark4u #####
 ##### Interventions #####
 InterventionsSetup=Интервенциите модул за настройка
 FreeLegalTextOnInterventions=Свободен текст на интервенционни документи
@@ -1395,7 +1397,7 @@ SendingsSetup=Изпращане модул за настройка
 SendingsReceiptModel=Изпращане получаване модел
 SendingsNumberingModules=Sendings номериране модули
 SendingsAbility=Support shipping sheets for customer deliveries
-NoNeedForDeliveryReceipts=В повечето случаи, sendings постъпления се използват както за листа за клиентите доставки (списък на продукти за изпращане) и листове, че е recevied и подписан от клиента. Така че продукти доставки постъпления е дублирана функция и рядко се активира.
+NoNeedForDeliveryReceipts=In most cases, shipping sheets are used both as sheets for customer deliveries (list of products to send) and sheets that is received and signed by customer. So product deliveries receipts is a duplicated feature and is rarely activated.
 FreeLegalTextOnShippings=Free text on shipments
 ##### Deliveries #####
 DeliveryOrderNumberingModules=Продукти доставки получаване номерацията модул
@@ -1477,7 +1479,9 @@ AGENDA_DEFAULT_FILTER_STATUS=Set automatically this status for events into searc
 AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
 AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
 AGENDA_NOTIFICATION_SOUND=Enable sound notification
-##### ClickToDial #####
+##### Clicktodial #####
+ClickToDialSetup=Кликнете, за да наберете настройка модул
+ClickToDialUrlDesc=Адреса нарича, когато се извършва едно кликване на телефона пиктограма. URL, можете да използвате маркери <br> <b>__PHONETO__,</b> Които ще бъдат заменени с телефонния номер на лицето, да се обадите <br> <b>__PHONEFROM__,</b> Че ще бъде заменен с телефонния номер на повикващата лице (твое) <br> <b>__LOGIN__,</b> Които ще бъдат заменени с clicktodial вход (определено на вашето потребителско карта) <br> <b>__PASS__,</b> Които ще бъдат заменени с clicktodial вашата парола (определено на вашето потребителско карта).
 ClickToDialDesc=Този модул позволява телефонните номера да могат да се кликват. Кликване върху тази икона ще предизвика вашият телефон да набере телефонния номер. Това може да бъде използвано за обаждане към кол център система, която може да набере телефония номер на SIP система например.
 ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
 ClickToDialUseTelLinkDesc=Използвайте този метод ако вашите потребители имат софт-телефон или софтуерен интерфейс на същия компютър, на който е браузера, и повиквани с клик на линк във вашия браузер, който започва с "tel:". Ако се нуждаете от пълно сървърно решение (без нужда за локална софтуерна инсталация), трябва да зададете на това "Не" или да попълните следващото поле.
@@ -1505,10 +1509,11 @@ EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint availa
 ##### API ####
 ApiSetup=API module setup
 ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
-ApiProductionMode=Enable production mode (this will activate use of a caches for services management)
+ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
 ApiExporerIs=You can explore the APIs at url
 OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
 ApiKey=Key for API
+WarningAPIExplorerDisabled=The API explorer has been disabled. API explorer is not required to provide API services. It is a tool for developer to find/test REST APIs. If you need this tool, go into setup of module API REST to activate it.
 ##### Bank #####
 BankSetupModule=Модул за настройка на банката
 FreeLegalTextOnChequeReceipts=Свободен текст чековите разписки
@@ -1577,7 +1582,7 @@ BackupDumpWizard=Wizard to build database backup dump file
 SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
 SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is only manual steps a privileged user can do.
 InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
-ConfFileMuseContainCustom=Installing an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to have option<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
+ConfFileMuseContainCustom=Installing an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
 HighlightLinesColor=Цвят за подчертаване на линията, когато мишката мине отгоре (оставете празно за без подчертаване)
 TextTitleColor=Цвят на заглавието на страницата
@@ -1607,6 +1612,7 @@ FixTZ=TimeZone fix
 FillFixTZOnlyIfRequired=Example: +2 (fill only if problem experienced)
 ExpectedChecksum=Expected Checksum
 CurrentChecksum=Current Checksum
+ForcedConstants=Required constant values
 MailToSendProposal=To send customer proposal
 MailToSendOrder=To send customer order
 MailToSendInvoice=To send customer invoice
@@ -1615,9 +1621,10 @@ MailToSendIntervention=To send intervention
 MailToSendSupplierRequestForQuotation=To send quotation request to supplier
 MailToSendSupplierOrder=To send supplier order
 MailToSendSupplierInvoice=To send supplier invoice
+MailToSendContract=To send a contract
 MailToThirdparty=To send email from third party page
 ByDefaultInList=Показване по подразбиране при показа на списък
-YouUseLastStableVersion=Използвате последната стабилна версия
+YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
 TitleExampleForMaintenanceRelease=Example of message you can use to announce this maintenance release (feel free to use it on your web sites)
 ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. 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.
diff --git a/htdocs/langs/bg_BG/bills.lang b/htdocs/langs/bg_BG/bills.lang
index eee45fa3008..0de800722f3 100644
--- a/htdocs/langs/bg_BG/bills.lang
+++ b/htdocs/langs/bg_BG/bills.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - bills
 Bill=Фактура
 Bills=Фактури
-BillsCustomers=Продажни фактури
+BillsCustomers=Клиентски фактури
 BillsCustomer=Продажна фактура
-BillsSuppliers=Доставни фактури
-BillsCustomersUnpaid=Неплатени продажни фактури
-BillsCustomersUnpaidForCompany=Неплатени продажни фактури за %s
-BillsSuppliersUnpaid=Неплатени доставни фактури
-BillsSuppliersUnpaidForCompany=Неплатени доставни фактури за %s
+BillsSuppliers=Фактури доставчици
+BillsCustomersUnpaid=Неплатени клиентски фактури
+BillsCustomersUnpaidForCompany=Unpaid customer invoices for %s
+BillsSuppliersUnpaid=Неплатени фактури от доставчици
+BillsSuppliersUnpaidForCompany=Unpaid supplier invoices for %s
 BillsLate=Забавени плащания
 BillsStatistics=Статистика за продажни фактури
 BillsStatisticsSuppliers=Статистика за доставни фактури
@@ -62,8 +62,8 @@ PaymentsBack=Обратни плащания
 paymentInInvoiceCurrency=in invoices currency
 PaidBack=Платено обратно
 DeletePayment=Изтрий плащане
-ConfirmDeletePayment=Are you sure you want to delete this payment?
-ConfirmConvertToReduc=Do you want to convert this credit note or deposit 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.
+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.
 SupplierPayments=Плащания към доставчици
 ReceivedPayments=Получени плащания
 ReceivedCustomersPayments=Плащания получени от клиенти
@@ -78,6 +78,7 @@ PaymentMode=Тип на плащане
 PaymentTypeDC=Debit/Credit Card
 PaymentTypePP=PayPal
 IdPaymentMode=Payment type (id)
+CodePaymentMode=Payment type (code)
 LabelPaymentMode=Payment type (label)
 PaymentModeShort=Начин на плащане
 PaymentTerm=Условие за плащане
@@ -102,9 +103,10 @@ SearchACustomerInvoice=Търсене за продажна фактура
 SearchASupplierInvoice=Търсене за доставна фактура
 CancelBill=Отказване на фактура
 SendRemindByMail=Изпращане на напомняне по имейл
-DoPayment=Направете плащане
-DoPaymentBack=Направете плащане със задна дата
+DoPayment=Enter payment
+DoPaymentBack=Enter refund
 ConvertToReduc=Конвертиране в бъдеще отстъпка
+ConvertExcessReceivedToReduc=Convert excess received into future discount
 EnterPaymentReceivedFromCustomer=Въведете плащане получено от клиент
 EnterPaymentDueToCustomer=Дължимото плащане на клиента
 DisabledBecauseRemainderToPayIsZero=Деактивирано понеже остатъка за плащане е нула
@@ -151,14 +153,14 @@ NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified
 FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
 NotARecurringInvoiceTemplate=Not a recurring template invoice
 NewBill=Нова фактура
-LastBills=Последните %s фактури
-LastCustomersBills=Последните %s продажни фактури
-LastSuppliersBills=Последните %s доставни фактури
+LastBills=Latest %s invoices
+LastCustomersBills=Latest %s customer invoices
+LastSuppliersBills=Latest %s supplier invoices
 AllBills=Всички фактури
 OtherBills=Други фактури
 DraftBills=Чернови фактури
-CustomersDraftInvoices=Чернови за продажни фактури
-SuppliersDraftInvoices=Чернови за доставни фактури
+CustomersDraftInvoices=Customer draft invoices
+SuppliersDraftInvoices=Supplier draft invoices
 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>?
@@ -272,6 +274,7 @@ Deposit=Депозит
 Deposits=Депозити
 DiscountFromCreditNote=Отстъпка от кредитно известие %s
 DiscountFromDeposit=Плащания от депозитна фактура %s
+DiscountFromExcessReceived=Payments from excess received of invoice %s
 AbsoluteDiscountUse=Този вид кредит може да се използва по фактура преди нейното валидиране
 CreditNoteDepositUse=Invoice must be validated to use this kind of credits
 NewGlobalDiscount=Нова абсолютна отстъпка
@@ -279,8 +282,8 @@ NewRelativeDiscount=Нова относителна отстъпка
 NoteReason=Бележка/Причина
 ReasonDiscount=Причина
 DiscountOfferedBy=Предоставено от
-DiscountStillRemaining=Отстъпки все още останали
-DiscountAlreadyCounted=Отстъпки вече приложени
+DiscountStillRemaining=Discounts available
+DiscountAlreadyCounted=Discounts already consumed
 BillAddress=Фактурен адрес
 HelpEscompte=Тази отстъпка е предоставена на клиента, тъй като плащането е извършено преди срока.
 HelpAbandonBadCustomer=Тази сума е изоставена (клиентът се оказва лош клиент) и се счита като извънредна загуба.
@@ -333,6 +336,8 @@ 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
 # PaymentConditions
 Statut=Състояние
 PaymentConditionShortRECEP=Due Upon Receipt
@@ -351,6 +356,14 @@ 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
 FixAmount=Фиксирана сума
 VarAmount=Променлива сума (%% общ.)
 # PaymentType
@@ -420,7 +433,7 @@ ChequeDeposits=Чекови депозити
 Cheques=Чекове
 DepositId=Id депозит
 NbCheque=Брой чекове
-CreditNoteConvertedIntoDiscount=Това кредитно известие или депозитна фактура е превърната в %s
+CreditNoteConvertedIntoDiscount=This %s has been converted into %s
 UsBillingContactAsIncoiveRecipientIfExist=Използвай адрес за фактуриране на клиента, вместо адреса на контрагента като получател за фактури
 ShowUnpaidAll=Покажи всички неплатени фактури
 ShowUnpaidLateOnly=Покажи само неплатените фактури с просрочено плащане
diff --git a/htdocs/langs/bg_BG/boxes.lang b/htdocs/langs/bg_BG/boxes.lang
index 58530b680ae..cfce064ae57 100644
--- a/htdocs/langs/bg_BG/boxes.lang
+++ b/htdocs/langs/bg_BG/boxes.lang
@@ -25,8 +25,8 @@ BoxTitleLastSuppliers=Latest %s recorded suppliers
 BoxTitleLastModifiedSuppliers=Latest %s modified suppliers
 BoxTitleLastModifiedCustomers=Latest %s modified customers
 BoxTitleLastCustomersOrProspects=Latest %s customers or prospects
-BoxTitleLastCustomerBills=Latest %s customer's invoices
-BoxTitleLastSupplierBills=Latest %s supplier's invoices
+BoxTitleLastCustomerBills=Latest %s customer invoices
+BoxTitleLastSupplierBills=Latest %s supplier invoices
 BoxTitleLastModifiedProspects=Latest %s modified prospects
 BoxTitleLastModifiedMembers=Latest %s members
 BoxTitleLastFicheInter=Latest %s modified interventions
@@ -51,12 +51,12 @@ ClickToAdd=Щракнете тук, за да добавите.
 NoRecordedCustomers=Няма записани клиенти
 NoRecordedContacts=Няма записани контакти
 NoActionsToDo=Няма дейности за вършене
-NoRecordedOrders=Няма записани клиентски поръчки
+NoRecordedOrders=No recorded customer orders
 NoRecordedProposals=Няма записани предложения
-NoRecordedInvoices=Няма регистрирани клиенти фактури
-NoUnpaidCustomerBills=Няма непогасени клиента фактури
-NoUnpaidSupplierBills=Няма непогасени доставчика фактури
-NoModifiedSupplierBills=Няма регистрирани доставчика фактури
+NoRecordedInvoices=No recorded customer invoices
+NoUnpaidCustomerBills=No unpaid customer invoices
+NoUnpaidSupplierBills=No unpaid supplier invoices
+NoModifiedSupplierBills=No recorded supplier invoices
 NoRecordedProducts=Няма регистрирани продукти / услуги
 NoRecordedProspects=Няма регистрирани перспективи
 NoContractedProducts=Няма договорени продукти / услуги
diff --git a/htdocs/langs/bg_BG/companies.lang b/htdocs/langs/bg_BG/companies.lang
index ea6abbf95fc..99b4ff95f32 100644
--- a/htdocs/langs/bg_BG/companies.lang
+++ b/htdocs/langs/bg_BG/companies.lang
@@ -81,6 +81,7 @@ PaymentBankAccount=Payment bank account
 OverAllProposals=Total proposals
 OverAllOrders=Total orders
 OverAllInvoices=Total invoices
+OverAllSupplierProposals=Total price requests
 ##### Local Taxes #####
 LocalTax1IsUsed=Използване на втора такса
 LocalTax1IsUsedES= RE се използва
@@ -404,7 +405,7 @@ MergeThirdparties=Сливане на контрагенти
 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 so you will be able to delete the duplicate one.
 ThirdpartiesMergeSuccess=Контрагентите бяха обединени
 SaleRepresentativeLogin=Login of sales representative
-SaleRepresentativeFirstname=Firstname of sales representative
-SaleRepresentativeLastname=Lastname of sales representative
+SaleRepresentativeFirstname=First name of sales representative
+SaleRepresentativeLastname=Last name of sales representative
 ErrorThirdpartiesMerge=Има грешка при изтриването на контрагентите. Моля проверете системните записи. Промените са възвърнати.
 NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/bg_BG/compta.lang b/htdocs/langs/bg_BG/compta.lang
index 88763a7b800..2546627fd1d 100644
--- a/htdocs/langs/bg_BG/compta.lang
+++ b/htdocs/langs/bg_BG/compta.lang
@@ -65,6 +65,7 @@ PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=Плащането на ДДС
 ListPayment=Списък на плащанията
 ListOfCustomerPayments=Списък на клиентски плащания
+ListOfSupplierPayments=Списък на доставчика плащания
 DateStartPeriod=Date start period
 DateEndPeriod=Date end period
 newLT1Payment=New tax 2 payment
@@ -81,7 +82,7 @@ LT2PaymentES=IRPF плащане
 LT2PaymentsES=IRPF Плащания
 VATPayment=Sales tax payment
 VATPayments=Sales tax payments
-VATRefund=Sales tax refund Refund
+VATRefund=Sales tax refund
 Refund=Refund
 SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Покажи плащане на ДДС
diff --git a/htdocs/langs/bg_BG/cron.lang b/htdocs/langs/bg_BG/cron.lang
index b47ad375d7d..2728b1877af 100644
--- a/htdocs/langs/bg_BG/cron.lang
+++ b/htdocs/langs/bg_BG/cron.lang
@@ -17,14 +17,14 @@ CronMethodDoesNotExists=Class %s does not contains any method %s
 # Menu
 EnabledAndDisabled=Enabled and disabled
 # Page list
-CronLastOutput=Изходен резултат от последно изпълнени 
-CronLastResult=Послед резултатен код
+CronLastOutput=Latest run output
+CronLastResult=Latest result code
 CronCommand=Команда
 CronList=Планирани задачи
 CronDelete=Изтриване на планирани задачи
-CronConfirmDelete=Сигурни ли сте, че искате да изтриете тези планирани задачи ?
+CronConfirmDelete=Are you sure you want to delete these scheduled jobs?
 CronExecute=Launch scheduled job
-CronConfirmExecute=Сигурни ли сте, че искате да се изпълнят тези планирани задачи сега ?
+CronConfirmExecute=Are you sure you want to execute these scheduled jobs now?
 CronInfo=Модул Планирана задача позволява да се изпълни задача, която е била планирана
 CronTask=Задача
 CronNone=Няма
@@ -39,7 +39,7 @@ CronMethod=Метод
 CronModule=Модул
 CronNoJobs=Няма регистрирани задачи
 CronPriority=Приоритет
-CronLabel=Label
+CronLabel=Етикет
 CronNbRun=Nb. зареждане
 CronMaxRun=Max nb. launch
 CronEach=Всеки
@@ -73,7 +73,7 @@ CronType_method=Изпълни метод на Dolibarr клас
 CronType_command=Терминална команда
 CronCannotLoadClass=Неможе да се зареди класа %s или обекта %s
 UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled jobs" to see and edit scheduled jobs.
-JobDisabled=Job disabled
+JobDisabled=Неактивирани задачи
 MakeLocalDatabaseDumpShort=Local database backup
 MakeLocalDatabaseDump=Create a local database dump
 WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of active jobs, your jobs may be delayed to a maximum of %s hours before being run.
diff --git a/htdocs/langs/bg_BG/errors.lang b/htdocs/langs/bg_BG/errors.lang
index 440b7e4bea0..d8c83462084 100644
--- a/htdocs/langs/bg_BG/errors.lang
+++ b/htdocs/langs/bg_BG/errors.lang
@@ -11,6 +11,7 @@ ErrorLoginAlreadyExists=Вход %s вече съществува.
 ErrorGroupAlreadyExists=Група %s вече съществува.
 ErrorRecordNotFound=Запишете не е намерен.
 ErrorFailToCopyFile=Не успя да копира файла <b>&quot;%s&quot;</b> в <b>&quot;%s&quot;.</b>
+ErrorFailToCopyDir=Failed to copy directory '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToRenameFile=Неуспешно преименуване на файлове <b>&quot;%s&quot;</b> в <b>&quot;%s&quot;.</b>
 ErrorFailToDeleteFile=Неуспех при премахването на файл <b>&quot;%s&quot;.</b>
 ErrorFailToCreateFile=Грешка при създаване на файл <b>&quot;%s&quot;.</b>
@@ -115,7 +116,7 @@ ErrorNoActivatedBarcode=Не е тип баркод активира
 ErrUnzipFails=Неуспех да разархивирате %s с ZipArchive
 ErrNoZipEngine=No engine to unzip %s file in this PHP
 ErrorFileMustBeADolibarrPackage=Файла %s трябва да бъде Dolibarr zip архив
-ErrorFileRequired=Отнема файла пакет Dolibarr
+ErrorModuleFileRequired=You must select a Dolibarr module package file
 ErrorPhpCurlNotInstalled=PHP навийте не е инсталиран, това е от съществено значение, за да разговаря с Paypal
 ErrorFailedToAddToMailmanList=Неуспешно добавяне на запис на пощальона списък или база СПИП
 ErrorFailedToRemoveToMailmanList=Failed to remove record %s to Mailman list %s or SPIP base
@@ -181,6 +182,8 @@ ErrorBankStatementNameMustFollowRegex=Error, bank statement name must follow the
 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>
 
 # Warnings
 WarningPasswordSetWithNoAccount=Парола е зададено за този член. Обаче, няма създаден потребителски акаунт. Следователно тази парола е записана, но не може да бъде използвана за влизане в Dolibarr. Може да бъде използвана от външен модул/интерфейс, но ако нямате нужда да определите нито потребителско име нито парола за член, можете да деактивирате тази опция. Ако имате нужда да управлявате потребителско име, но нямата нужда от парола, можете да оставите това поле празно, за да избегнете това предупреждение. Забележка: Имейл също може да бъде използван като потребителско име ако члена с свързан към потребител.
diff --git a/htdocs/langs/bg_BG/holiday.lang b/htdocs/langs/bg_BG/holiday.lang
index dd4a2671926..bd4f6bb0e21 100644
--- a/htdocs/langs/bg_BG/holiday.lang
+++ b/htdocs/langs/bg_BG/holiday.lang
@@ -76,8 +76,8 @@ BoxTitleLastLeaveRequests=Latest %s modified leave requests
 HolidaysMonthlyUpdate=Месечна актуализация
 ManualUpdate=Ръчна акуализация
 HolidaysCancelation=Отказване на молба за отпуск
-EmployeeLastname=Employee lastname
-EmployeeFirstname=Employee firstname
+EmployeeLastname=Employee last name
+EmployeeFirstname=Employee first name
 TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
 
 ## Configuration du Module ##
diff --git a/htdocs/langs/bg_BG/ldap.lang b/htdocs/langs/bg_BG/ldap.lang
index 6ed3e9c1786..0d5663e0015 100644
--- a/htdocs/langs/bg_BG/ldap.lang
+++ b/htdocs/langs/bg_BG/ldap.lang
@@ -13,8 +13,8 @@ LDAPUsers=Потребителите в LDAP база данни
 LDAPFieldStatus=Статус
 LDAPFieldFirstSubscriptionDate=Първа абонамент дата
 LDAPFieldFirstSubscriptionAmount=Първа размера
-LDAPFieldLastSubscriptionDate=Последно абонамент дата
-LDAPFieldLastSubscriptionAmount=Последно размера
+LDAPFieldLastSubscriptionDate=Latest subscription date
+LDAPFieldLastSubscriptionAmount=Latest subscription amount
 LDAPFieldSkype=Skype id
 LDAPFieldSkypeExample=Example : skypeName
 UserSynchronized=Потребителят синхронизирани
diff --git a/htdocs/langs/bg_BG/mails.lang b/htdocs/langs/bg_BG/mails.lang
index 223656bd6f0..fb9e9a37f31 100644
--- a/htdocs/langs/bg_BG/mails.lang
+++ b/htdocs/langs/bg_BG/mails.lang
@@ -74,14 +74,18 @@ ResultOfMailSending=Резултат от масово изпращане на 
 NbSelected=Nb selected
 NbIgnored=Nb ignored
 NbSent=Nb sent
-ContactsWithThirdpartyFilter=Contact with customer filters
+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
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Line %s във файла
 RecipientSelectionModules=Определени искания за подбор на получателя
 MailSelectedRecipients=Избрани получателите
 MailingArea=Имейли
-LastMailings=Последните %s имейла
+LastMailings=Latest %s emailings
 TargetsStatistics=Насочена е към статистиката
 NbOfCompaniesContacts=Уникални контакти на фирми
 MailNoChangePossible=Получатели на за валидирани електронната поща не може да бъде променена
@@ -146,3 +150,6 @@ AdvTgtCreateFilter=Create filter
 AdvTgtOrCreateNewFilter=Name of new filter
 NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
+OutGoingEmailSetup=Outgoing email setup
+InGoingEmailSetup=Incoming email setup
+
diff --git a/htdocs/langs/bg_BG/main.lang b/htdocs/langs/bg_BG/main.lang
index 4e24d3ebc50..702f2f42929 100644
--- a/htdocs/langs/bg_BG/main.lang
+++ b/htdocs/langs/bg_BG/main.lang
@@ -69,6 +69,7 @@ SetDate=Настройка на дата
 SelectDate=Изберете дата
 SeeAlso=Вижте също %s
 SeeHere=Вижте тук
+Apply=Приложи
 BackgroundColorByDefault=Стандартен цвят на фона
 FileRenamed=The file was successfully renamed
 FileUploaded=Файлът е качен успешно
@@ -87,7 +88,7 @@ Undefined=Неопределен
 PasswordForgotten=Password forgotten?
 SeeAbove=Виж по-горе
 HomeArea=Начало
-LastConnexion=Последно свързване
+LastConnexion=Latest connection
 PreviousConnexion=Предишно свързване
 PreviousValue=Previous value
 ConnectedOnMultiCompany=Свързан към обекта
@@ -237,7 +238,7 @@ DateCreation=Дата на създаване
 DateCreationShort=Дата създ.
 DateModification=Дата на промяна
 DateModificationShort=Дата промяна
-DateLastModification=Дата на последна промяна
+DateLastModification=Latest modification date
 DateValidation=Дата на валидиране
 DateClosing=Дата на приключване
 DateDue=Дата на падеж
@@ -599,6 +600,8 @@ SessionName=Име на сесията
 Method=Метод
 Receive=Получавам
 CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
+ExpectedValue=Expected Value
+CurrentValue=Текуща стойност
 PartialWoman=Частична
 TotalWoman=Обща
 NeverReceived=Никога не получено
@@ -756,6 +759,7 @@ SomeTranslationAreUncomplete=Some languages may be partially translated or may c
 DirectDownloadLink=Direct download link
 Download=Download
 ActualizeCurrency=Update currency rate
+Fiscalyear=Fiscal year
 # Week day
 Monday=Понеделник
 Tuesday=Вторник
@@ -812,3 +816,5 @@ SearchIntoContracts=Договори
 SearchIntoCustomerShipments=Customer shipments
 SearchIntoExpenseReports=Опис разходи
 SearchIntoLeaves=Отпуски
+
+BulkActions=Bulk actions
diff --git a/htdocs/langs/bg_BG/members.lang b/htdocs/langs/bg_BG/members.lang
index 203db254d97..a9f375b0ea7 100644
--- a/htdocs/langs/bg_BG/members.lang
+++ b/htdocs/langs/bg_BG/members.lang
@@ -136,8 +136,8 @@ DocForAllMembersCards=Генериране на визитни картички
 DocForOneMemberCards=Генериране на бизнес карти за конкретен член
 DocForLabels=Генериране на листи с адреси
 SubscriptionPayment=Плащане на членски внос
-LastSubscriptionDate=Последна дата на чл. внос
-LastSubscriptionAmount=Последна сума на чл. внос
+LastSubscriptionDate=Latest subscription date
+LastSubscriptionAmount=Latest subscription amount
 MembersStatisticsByCountries=Статистика за членовете по държава
 MembersStatisticsByState=Статистика за членовете по област
 MembersStatisticsByTown=Статистика за членовете по град
@@ -149,7 +149,7 @@ MembersByStateDesc=Този екран показва статистически
 MembersByTownDesc=Този екран показва статистическите данни за членовете по град.
 MembersStatisticsDesc=Изберете статистически данни, които искате да прочетете ...
 MenuMembersStats=Статистика
-LastMemberDate=Последна дата на член
+LastMemberDate=Latest member date
 Nature=Естество
 Public=Информацията е публичнна
 NewMemberbyWeb=Новия член е добавен. Очаква се одобрение
diff --git a/htdocs/langs/bg_BG/orders.lang b/htdocs/langs/bg_BG/orders.lang
index a85d218e783..6e3913540de 100644
--- a/htdocs/langs/bg_BG/orders.lang
+++ b/htdocs/langs/bg_BG/orders.lang
@@ -39,7 +39,7 @@ StatusOrderRefusedShort=Отказан
 StatusOrderBilledShort=Осчетоводено
 StatusOrderToProcessShort=За изпълнение
 StatusOrderReceivedPartiallyShort=Частично получено
-StatusOrderReceivedAllShort=Всичко получено
+StatusOrderReceivedAllShort=Products received
 StatusOrderCanceled=Отменен
 StatusOrderDraft=Проект (трябва да бъдат валидирани)
 StatusOrderValidated=Валидиран
@@ -51,7 +51,7 @@ StatusOrderApproved=Одобрен
 StatusOrderRefused=Отказан
 StatusOrderBilled=Осчетоводено
 StatusOrderReceivedPartially=Частично получено
-StatusOrderReceivedAll=Всичко получено
+StatusOrderReceivedAll=All products received
 ShippingExist=Доставка съществува
 QtyOrdered=Поръчано к-во
 ProductQtyInDraft=Количество продукти в поръчки чернови
diff --git a/htdocs/langs/bg_BG/other.lang b/htdocs/langs/bg_BG/other.lang
index 508f6dfecb6..7f406309764 100644
--- a/htdocs/langs/bg_BG/other.lang
+++ b/htdocs/langs/bg_BG/other.lang
@@ -68,14 +68,15 @@ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nТук ще на
 PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nYou will find here the shipping __SHIPPINGREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nYou will find here the intervention __FICHINTERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n__PERSONALIZED__\n\n__SIGNATURE__
-DemoDesc=Dolibarr is a compact ERP/CRM supporting several functional modules. A demo showcasing all modules makes no sense as this scenario never occurs. So, several demo profiles are available.
+DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
+ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
 DemoFundation=Управление на членовете на организация
 DemoFundation2=Управление на членовете и банковата сметка на организация
-DemoCompanyServiceOnly=Управление на услуги от лице на свободна практика
+DemoCompanyServiceOnly=Company or freelance selling service only
 DemoCompanyShopWithCashDesk=Управление на магазин с каса
-DemoCompanyProductAndStocks=Управление на малка или средна фирма, продаваща продукти
-DemoCompanyAll=Управление на малка или средна фирма с множество дейности (всички основни модули)
+DemoCompanyProductAndStocks=Company selling products with a shop
+DemoCompanyAll=Company with multiple activities (all main modules)
 CreatedBy=Създадено от %s
 ModifiedBy=Променено от %s
 ValidatedBy=Валидирано от %s
diff --git a/htdocs/langs/bg_BG/products.lang b/htdocs/langs/bg_BG/products.lang
index fc95fb5b417..c9f3863330b 100644
--- a/htdocs/langs/bg_BG/products.lang
+++ b/htdocs/langs/bg_BG/products.lang
@@ -60,7 +60,7 @@ SellingPrice=Продажна цена
 SellingPriceHT=Продажна цена (без ДДС)
 SellingPriceTTC=Продажна цена (с ДДС)
 CostPriceDescription=This price (net of tax) can be used to store the average amount this product cost to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
-CostPriceUsage=In a future version, this value could be used for margin calculation.
+CostPriceUsage=This value could be used for margin calculation.
 SoldAmount=Sold amount
 PurchasedAmount=Purchased amount
 NewPrice=Нова цена
@@ -142,6 +142,7 @@ ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b>?
 CloneContentProduct=Клониране на всички основни данни за продукта/услугата
 ClonePricesProduct=Клониране на основните данни и цени
 CloneCompositionProduct=Клониране на пакетиран продукт/услуга
+CloneCombinationsProduct=Clone product variants
 ProductIsUsed=Този продукт е използван
 NewRefForClone=Реф. на нов продукт/услуга
 SellingPrices=Selling prices
@@ -238,7 +239,7 @@ GlobalVariables=Глобални променливи
 VariableToUpdate=Variable to update
 GlobalVariableUpdaters=Обновители на глобални променливи
 UpdateInterval=Обновяване на интервал (минути)
-LastUpdated=Последно обновени
+LastUpdated=Latest update
 CorrectlyUpdated=Правилно обновени
 PropalMergePdfProductActualFile=Файловете използвани за добавяне в PDF Azur са/е
 PropalMergePdfProductChooseFile=Избиране на PDF файлове
@@ -258,4 +259,41 @@ VolumeUnits=Volume unit
 SizeUnits=Size unit
 DeleteProductBuyPrice=Delete buying price
 ConfirmDeleteProductBuyPrice=Are you sure you want to delete this buying price?
+SubProduct=Sub product
 
+#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
+ProductCombinations=Variants
+HideProductCombinations=Hide products variant in the products selector
+ProductCombination=Variant
+NewProductCombination=New variant
+EditProductCombination=Editing variant
+ProductCombinationGenerator=Variants generator
+Features=Features
+PriceImpact=Price impact
+WeightImpact=Weight impact
+NewProductAttribute=Нов атрибут
+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
+PercentageVariation=Percentage variation
+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 child products
+ConfirmCloneProductCombinations=Would you like to copy all the product variant to the 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
diff --git a/htdocs/langs/bg_BG/projects.lang b/htdocs/langs/bg_BG/projects.lang
index 712e8ce04ce..34f5845b318 100644
--- a/htdocs/langs/bg_BG/projects.lang
+++ b/htdocs/langs/bg_BG/projects.lang
@@ -29,9 +29,9 @@ DeleteAProject=Изтриване на проект
 DeleteATask=Изтриване на задача
 ConfirmDeleteAProject=Are you sure you want to delete this project?
 ConfirmDeleteATask=Are you sure you want to delete this task?
-OpenedProjects=Open projects
-OpenedTasks=Open tasks
-OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
+OpenedProjects=Отворени проекти
+OpenedTasks=Opened tasks
+OpportunitiesStatusForOpenedProjects=Opportunities amount of opened projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=Покажи проект
 SetProject=Задайте проект
@@ -47,7 +47,7 @@ TaskTimeSpent=Време отдадено на задачи
 TaskTimeUser=Потребител
 TaskTimeNote=Бележка
 TaskTimeDate=Дата
-TasksOnOpenedProject=Задачи на отворени проекти
+TasksOnOpenedProject=Tasks on opened projects
 WorkloadNotDefined=Работна натовареност не е определена
 NewTimeSpent=Времето, прекарано на
 MyTimeSpent=Времето, прекарано
@@ -96,6 +96,7 @@ ValidateProject=Одобряване на проект в
 ConfirmValidateProject=Are you sure you want to validate this project?
 CloseAProject=Затвори проект
 ConfirmCloseAProject=Are you sure you want to close this project?
+AlsoCloseAProject=Also close project (keep it open if you still need to follow production tasks on it)
 ReOpenAProject=Проект с отворен
 ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=ПРОЕКТА Контакти
@@ -121,7 +122,7 @@ CloneProjectFiles=Клониран проект обединени файлов
 CloneTaskFiles=Клонирана задача(и) обединени файлове (ако задача(и)  клонирана)
 CloneMoveDate=Update project/tasks dates from now?
 ConfirmCloneProject=Are you sure to clone this project?
-ProjectReportDate=Промяна задача дата според началната дата на проекта
+ProjectReportDate=Change task dates according to new project start date
 ErrorShiftTaskDate=Невъзможно е да се смени датата на задача в съответствие с нова дата за началото на проекта
 ProjectsAndTasksLines=Проекти и задачи
 ProjectCreatedInDolibarr=Проект %s е създаден
@@ -178,9 +179,9 @@ ProjectsStatistics=Статистики за проекти/инициативи
 TaskAssignedToEnterTime=Задачата е възложена. Въвеждането на време на тази задача би трябвало да е възможно
 IdTaskTime=Ид. време на задача
 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.
-OpenedProjectsByThirdparties=Open projects by thirdparties
+OpenedProjectsByThirdparties=Отворени проекти от трети лица
 OnlyOpportunitiesShort=Only opportunities
-OpenedOpportunitiesShort=Open opportunities
+OpenedOpportunitiesShort=Opened opportunities
 NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount
diff --git a/htdocs/langs/bg_BG/propal.lang b/htdocs/langs/bg_BG/propal.lang
index 5774c229c18..c3bdab93fab 100644
--- a/htdocs/langs/bg_BG/propal.lang
+++ b/htdocs/langs/bg_BG/propal.lang
@@ -3,7 +3,7 @@ Proposals=Търговски предложения
 Proposal=Търговско предложение
 ProposalShort=Предложение
 ProposalsDraft=Проектът на търговски предложения
-ProposalsOpened=Отваряне на търговски предложения
+ProposalsOpened=Отворените търговски предложения
 Prop=Търговски предложения
 CommercialProposal=Търговско предложение
 ProposalCard=Предложение карта
@@ -28,7 +28,7 @@ ShowPropal=Покажи предложение
 PropalsDraft=Чернови
 PropalsOpened=Отворен
 PropalStatusDraft=Проект (трябва да бъдат валидирани)
-PropalStatusValidated=Утвърден (предложението е отворен)
+PropalStatusValidated=Validated (proposal is opened)
 PropalStatusSigned=Подписано (нужди фактуриране)
 PropalStatusNotSigned=Не сте (затворен)
 PropalStatusBilled=Таксува
diff --git a/htdocs/langs/bg_BG/stocks.lang b/htdocs/langs/bg_BG/stocks.lang
index 4d56a664911..82c0e9ac974 100644
--- a/htdocs/langs/bg_BG/stocks.lang
+++ b/htdocs/langs/bg_BG/stocks.lang
@@ -22,13 +22,15 @@ Movements=Движения
 ErrorWarehouseRefRequired=Изисква се референтно име на склад
 ListOfWarehouses=Списък на складовете
 ListOfStockMovements=Списък на движението на стоковите наличности
+StockMovementForId=Movement ID %d
+ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Warehouses area
 Location=Място
 LocationSummary=Кратко наименование на място
 NumberOfDifferentProducts=Брой различни продукти
 NumberOfProducts=Общ брой продукти
-LastMovement=Последно движение
-LastMovements=Последни движения
+LastMovement=Latest movement
+LastMovements=Latest movements
 Units=Единици
 Unit=Единица
 StockCorrection=Промяна на наличност
diff --git a/htdocs/langs/bg_BG/supplier_proposal.lang b/htdocs/langs/bg_BG/supplier_proposal.lang
index b251acc7a30..2ab88745e37 100644
--- a/htdocs/langs/bg_BG/supplier_proposal.lang
+++ b/htdocs/langs/bg_BG/supplier_proposal.lang
@@ -8,7 +8,7 @@ SearchRequest=Намиране на запитване
 DraftRequests=Чернови на запитвания
 SupplierProposalsDraft=Draft supplier proposals
 LastModifiedRequests=Latest %s modified price requests
-RequestsOpened=Отваряне на запитване за цена
+RequestsOpened=Opened price requests
 SupplierProposalArea=Зона предложения от доставчици
 SupplierProposalShort=Предложение от доставчик
 SupplierProposals=Предложения доставчици
@@ -23,7 +23,7 @@ ConfirmValidateAsk=Are you sure you want to validate this price request under na
 DeleteAsk=Изтриване на запитване
 ValidateAsk=Валидиране на запитване
 SupplierProposalStatusDraft=Чернова (нуждае се да бъде валидирана)
-SupplierProposalStatusValidated=Валидирано (запитването е отворено)
+SupplierProposalStatusValidated=Validated (request is opened)
 SupplierProposalStatusClosed=Затворено
 SupplierProposalStatusSigned=Прието
 SupplierProposalStatusNotSigned=Отказано
diff --git a/htdocs/langs/bg_BG/suppliers.lang b/htdocs/langs/bg_BG/suppliers.lang
index a7443012348..a174831024d 100644
--- a/htdocs/langs/bg_BG/suppliers.lang
+++ b/htdocs/langs/bg_BG/suppliers.lang
@@ -9,7 +9,7 @@ ShowSupplier=Вижте доставчик
 OrderDate=Дата на поръчката
 BuyingPriceMin=Best buying price
 BuyingPriceMinShort=Best buying price
-TotalBuyingPriceMinShort=Total of subproducts buying prices
+TotalBuyingPriceMinShort=Обща сума на цени за закупуване на под-продукти
 TotalSellingPriceMinShort=Total of subproducts selling prices
 SomeSubProductHaveNoPrices=Някои под-продукти нямата определена цена
 AddSupplierPrice=Add buying price
@@ -24,10 +24,10 @@ ExportDataset_fournisseur_1=Фактури и фактура линии
 ExportDataset_fournisseur_2=Фактури и наредби
 ExportDataset_fournisseur_3=Поръчки към доставчици и линии на поръчки
 ApproveThisOrder=Одобряване на поръчката
-ConfirmApproveThisOrder=Сигурен ли сте, че искате да одобри <b>%s Поръчката?</b>
+ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b>?
 DenyingThisOrder=Отхвърляне на тази поръчка
-ConfirmDenyingThisOrder=Сигурен ли сте, че искате да откаже доставчик <b>%s</b> за?
-ConfirmCancelThisOrder=Сигурен ли сте, че искате да отмените доставчика на <b>%s</b> за?
+ConfirmDenyingThisOrder=Are you sure you want to deny this order <b>%s</b>?
+ConfirmCancelThisOrder=Are you sure you want to cancel this order <b>%s</b>?
 AddSupplierOrder=Създаване на поръчка за покупка
 AddSupplierInvoice=Създаване на фактура
 ListOfSupplierProductForSupplier=Списък на доставчици на стоки и цени <b>%s</b>
@@ -41,3 +41,4 @@ DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Wrong quality
 ReputationForThisProduct=Reputation
 BuyerName=Buyer name
+AllProductServicePrices=All product / service prices
diff --git a/htdocs/langs/bg_BG/users.lang b/htdocs/langs/bg_BG/users.lang
index b7783c45813..e6bbdcf4f7b 100644
--- a/htdocs/langs/bg_BG/users.lang
+++ b/htdocs/langs/bg_BG/users.lang
@@ -36,7 +36,7 @@ AdministratorDesc=Администратор
 DefaultRights=Права по подразбиране
 DefaultRightsDesc=Тук определете правата <u>по подразбиране</u>, които автоматично се предоставят на <u>новосъздаден</u> потребител (отидете на потребителската карта, за да промените правата на съществуващ потребител).
 DolibarrUsers=Потребители на системата
-LastName=Last Name
+LastName=Фамилия
 FirstName=Собствено име
 ListOfGroups=Списък на групите
 NewGroup=Нова група
diff --git a/htdocs/langs/bg_BG/withdrawals.lang b/htdocs/langs/bg_BG/withdrawals.lang
index 3506251624d..d20edf9ac13 100644
--- a/htdocs/langs/bg_BG/withdrawals.lang
+++ b/htdocs/langs/bg_BG/withdrawals.lang
@@ -24,6 +24,7 @@ WithdrawStatistics=Direct debit payment statistics
 WithdrawRejectStatistics=Direct debit payment reject statistics
 LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
+WithdrawRequestsDone=%s direct debit payment requests recorded
 ThirdPartyBankCode=Банков код на контрагента
 NoInvoiceCouldBeWithdrawed=Не теглене фактура с успех. Уверете се, че фактура са дружества с валиден БАН.
 ClassCredited=Класифицирайте кредитирани
@@ -76,8 +77,8 @@ RUM=UMR
 RUMLong=Unique Mandate Reference
 RUMWillBeGenerated=UMR number will be generated once bank account information are saved
 WithdrawMode=Direct debit mode (FRST or RECUR)
-WithdrawRequestAmount=Withdraw request amount:
-WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil amount.
+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
diff --git a/htdocs/langs/bn_BD/accountancy.lang b/htdocs/langs/bn_BD/accountancy.lang
index 5de95948fbf..4c2336b97b0 100644
--- a/htdocs/langs/bn_BD/accountancy.lang
+++ b/htdocs/langs/bn_BD/accountancy.lang
@@ -194,6 +194,8 @@ ChangeBinding=Change the binding
 
 ## Admin
 ApplyMassCategories=Apply mass categories
+AddAccountFromBookKeepingWithNoCategories=Add acccount already used with no categories
+CategoryDeleted=Category for the accounting account has been removed
 
 ## Export
 Exports=Exports
@@ -209,6 +211,7 @@ Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution
 Modelcsv_quadratus=Export towards Quadratus QuadraCompta
 Modelcsv_ebp=Export towards EBP
 Modelcsv_cogilog=Export towards Cogilog
+ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
 InitAccountancy=Init accountancy
diff --git a/htdocs/langs/bn_BD/admin.lang b/htdocs/langs/bn_BD/admin.lang
index 3491a528ceb..7282d9a21db 100644
--- a/htdocs/langs/bn_BD/admin.lang
+++ b/htdocs/langs/bn_BD/admin.lang
@@ -9,17 +9,20 @@ VersionDevelopment=Development
 VersionUnknown=Unknown
 VersionRecommanded=Recommended
 FileCheck=Files integrity checker
-FileCheckDesc=This tool allows you to check the integrity of files of your application, comparing each files with the official ones. You can use this tool to detect if some files were modified by a hacker for example.
+FileCheckDesc=This tool allows you to check the integrity of files and setup of your application, comparing each files with the official ones. 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.
 FileIntegrityIsStrictlyConformedWithReference=Files integrity is strictly conformed with the reference.
-FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified of removed.
+FileIntegrityIsOkButFilesWereAdded=Files integrity check has passed, however some new files were added.
+FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified, removed or added.
 GlobalChecksum=Global checksum
 MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
 LocalSignature=Embedded local signature (less reliable)
 RemoteSignature=Remote distant signature (more reliable)
 FilesMissing=Missing Files
 FilesUpdated=Updated Files
+FilesModified=Modified Files
+FilesAdded=Added Files
 FileCheckDolibarr=Check integrity of application files
-AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from a certified package
+AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from an official package
 XmlNotFound=Xml Integrity File of application not found
 SessionId=Session ID
 SessionSaveHandler=Handler to save sessions
@@ -188,7 +191,9 @@ BoxesDesc=Widgets are components showing some information that you can add to pe
 OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
 ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
-ModulesMarketPlaces=More modules...
+ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
+ModulesMarketPlaces=Find external modules...
+GoModuleSetupArea=To deploy/install a new module, go onto the Module setup area at <a href="%s">%s</a>.
 DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules
 DoliPartnersDesc=List of companies providing custom developed modules or features (Note: anyone experienced in PHP programming can provide custom development for an open source project)
 WebSiteDesc=Reference websites to find more modules...
@@ -280,20 +285,21 @@ MenuHandlers=Menu handlers
 MenuAdmin=Menu editor
 DoNotUseInProduction=Do not use in production
 ThisIsProcessToFollow=This is steps to process:
-ThisIsAlternativeProcessToFollow=This is an alternative setup to process:
+ThisIsAlternativeProcessToFollow=This is an alternative setup to process manually:
 StepNb=Step %s
 FindPackageFromWebSite=Find a package that provides feature you want (for example on official web site %s).
 DownloadPackageFromWebSite=Download package (for example from official web site %s).
-UnpackPackageInDolibarrRoot=Unpack package file into Dolibarr server directory dedicated to external modules: <b>%s</b>
-SetupIsReadyForUse=Install is finished and Dolibarr is ready to use with this new component.
-NotExistsDirect=The alternative root directory is not defined.<br>
-InfDirAlt=Since version 3 it is possible to define an alternative root directory.This allows you to store, same place, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
-InfDirExample=<br>Then declare it in the file conf.php<br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>*These lines are commented with "#", to uncomment only remove the character.
+UnpackPackageInDolibarrRoot=Unpack the packaged files into server directory dedicated to Dolibarr: <b>%s</b>
+UnpackPackageInModulesRoot=To deploy/install an external module, unpack the packaged files into the server directory dedicated to modules: <b>%s</b>
+SetupIsReadyForUse=Module deployment is finished. You must however enable and setup the module in your application by going on the page to setup modules: <a href="%s">%s</a>.
+NotExistsDirect=The alternative root directory is not defined to an existing directory.<br>
+InfDirAlt=Since version 3, it is possible to define an alternative root directory. This allows you to store, into a dedicated directory, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
+InfDirExample=<br>Then declare it in the file <strong>conf.php</strong><br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>If these lines are commented with "#", to enable them, just uncomment by removing the "#" character.
 YouCanSubmitFile=For this step, you can send package using this tool: Select module file
 CurrentVersion=Dolibarr current version
 CallUpdatePage=Go to the page that updates the database structure and data: %s.
 LastStableVersion=Latest stable version
-LastActivationDate=Last activation date
+LastActivationDate=Latest activation date
 UpdateServerOffline=Update server offline
 GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s. <br><b>{000000@x}</b> same as previous but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
 GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
@@ -376,11 +382,11 @@ ExtrafieldCheckBox=Checkbox
 ExtrafieldRadio=Radio button
 ExtrafieldCheckBoxFromList= Checkbox from table
 ExtrafieldLink=Link to an object
-ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>In order to have the list depending on another :<br>1,value1|parent_list_code:parent_key<br>2,value2|parent_list_code:parent_key
+ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list :<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list :<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
-ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
+ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Example : Societe:societe/class/societe.class.php
 LibraryToBuildPDF=Library used for PDF generation
 WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
@@ -415,10 +421,10 @@ ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The cod
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
 WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<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).
-
+ClickToShowDescription=Click to show description
 # Modules
 Module0Name=Users & groups
-Module0Desc=Users and groups management
+Module0Desc=Users / Employees and Groups management
 Module1Name=Third parties
 Module1Desc=Companies and contact management (customers, prospects...)
 Module2Name=Commercial
@@ -689,7 +695,7 @@ PermissionAdvanced253=Create/modify internal/external users and permissions
 Permission254=Create/modify external users only
 Permission255=Modify other users password
 Permission256=Delete or disable other users
-Permission262=Extend access to all third parties (not only third parties that user is a sale representative). Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc). Not effective for projects (only rules on project permissions, visibility and assignement matters).
+Permission262=Extend access to all third parties (not only third parties that user is a sale representative).<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 assignement matters).
 Permission271=Read CA
 Permission272=Read invoices
 Permission273=Issue invoices
@@ -891,7 +897,7 @@ Offset=Offset
 AlwaysActive=Always active
 Upgrade=Upgrade
 MenuUpgrade=Upgrade / Extend
-AddExtensionThemeModuleOrOther=Add extension (theme, module, ...)
+AddExtensionThemeModuleOrOther=Deploy/install external module
 WebServer=Web server
 DocumentRootServer=Web server's root directory
 DataRootServer=Data files directory
@@ -1165,10 +1171,6 @@ FreeLegalTextOnOrders=Free text on orders
 WatermarkOnDraftOrders=Watermark on draft orders (none if empty)
 ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable
 BANK_ASK_PAYMENT_BANK_DURING_ORDER=Ask for bank account destination of order
-##### Clicktodial #####
-ClickToDialSetup=Click To Dial module setup
-ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with your clicktodial login (defined on your user card)<br><b>__PASS__</b> that will be replaced with your clicktodial password (defined on your user card).
-##### Bookmark4u #####
 ##### Interventions #####
 InterventionsSetup=Interventions module setup
 FreeLegalTextOnInterventions=Free text on intervention documents
@@ -1395,7 +1397,7 @@ SendingsSetup=Sending module setup
 SendingsReceiptModel=Sending receipt model
 SendingsNumberingModules=Sendings numbering modules
 SendingsAbility=Support shipping sheets for customer deliveries
-NoNeedForDeliveryReceipts=In most cases, sendings receipts are used both as sheets for customer deliveries (list of products to send) and sheets that is recevied and signed by customer. So product deliveries receipts is a duplicated feature and is rarely activated.
+NoNeedForDeliveryReceipts=In most cases, shipping sheets are used both as sheets for customer deliveries (list of products to send) and sheets that is received and signed by customer. So product deliveries receipts is a duplicated feature and is rarely activated.
 FreeLegalTextOnShippings=Free text on shipments
 ##### Deliveries #####
 DeliveryOrderNumberingModules=Products deliveries receipt numbering module
@@ -1477,7 +1479,9 @@ AGENDA_DEFAULT_FILTER_STATUS=Set automatically this status for events into searc
 AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
 AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
 AGENDA_NOTIFICATION_SOUND=Enable sound notification
-##### ClickToDial #####
+##### Clicktodial #####
+ClickToDialSetup=Click To Dial module setup
+ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with your clicktodial login (defined on your user card)<br><b>__PASS__</b> that will be replaced with your clicktodial password (defined on your user card).
 ClickToDialDesc=This module allows to make phone numbers clickable. A click on this icon will call make your phone to 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.
 ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
 ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on same computer than the browser, and called when you click on a link in your browser that start 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.
@@ -1505,10 +1509,11 @@ EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint availa
 ##### API ####
 ApiSetup=API module setup
 ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
-ApiProductionMode=Enable production mode (this will activate use of a caches for services management)
+ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
 ApiExporerIs=You can explore the APIs at url
 OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
 ApiKey=Key for API
+WarningAPIExplorerDisabled=The API explorer has been disabled. API explorer is not required to provide API services. It is a tool for developer to find/test REST APIs. If you need this tool, go into setup of module API REST to activate it.
 ##### Bank #####
 BankSetupModule=Bank module setup
 FreeLegalTextOnChequeReceipts=Free text on cheque receipts
@@ -1577,7 +1582,7 @@ BackupDumpWizard=Wizard to build database backup dump file
 SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
 SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is only manual steps a privileged user can do.
 InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
-ConfFileMuseContainCustom=Installing an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to have option<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
+ConfFileMuseContainCustom=Installing an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
 HighlightLinesColor=Highlight color of the line when the mouse passes over (keep empty for no highlight)
 TextTitleColor=Color of page title
@@ -1607,6 +1612,7 @@ FixTZ=TimeZone fix
 FillFixTZOnlyIfRequired=Example: +2 (fill only if problem experienced)
 ExpectedChecksum=Expected Checksum
 CurrentChecksum=Current Checksum
+ForcedConstants=Required constant values
 MailToSendProposal=To send customer proposal
 MailToSendOrder=To send customer order
 MailToSendInvoice=To send customer invoice
@@ -1615,9 +1621,10 @@ MailToSendIntervention=To send intervention
 MailToSendSupplierRequestForQuotation=To send quotation request to supplier
 MailToSendSupplierOrder=To send supplier order
 MailToSendSupplierInvoice=To send supplier invoice
+MailToSendContract=To send a contract
 MailToThirdparty=To send email from third party page
 ByDefaultInList=Show by default on list view
-YouUseLastStableVersion=You use the last stable version
+YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
 TitleExampleForMaintenanceRelease=Example of message you can use to announce this maintenance release (feel free to use it on your web sites)
 ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. 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.
diff --git a/htdocs/langs/bn_BD/banks.lang b/htdocs/langs/bn_BD/banks.lang
index 7ae841cf0f3..f0c41d5d5bf 100644
--- a/htdocs/langs/bn_BD/banks.lang
+++ b/htdocs/langs/bn_BD/banks.lang
@@ -74,13 +74,13 @@ Conciliate=Reconcile
 Conciliation=Reconciliation
 ReconciliationLate=Reconciliation late
 IncludeClosedAccount=Include closed accounts
-OnlyOpenedAccount=Only open accounts
+OnlyOpenedAccount=Only opened accounts
 AccountToCredit=Account to credit
 AccountToDebit=Account to debit
 DisableConciliation=Disable reconciliation feature for this account
 ConciliationDisabled=Reconciliation feature disabled
 LinkedToAConciliatedTransaction=Linked to a conciliated entry
-StatusAccountOpened=Open
+StatusAccountOpened=Opened
 StatusAccountClosed=Closed
 AccountIdShort=Number
 LineRecord=Transaction
diff --git a/htdocs/langs/bn_BD/bills.lang b/htdocs/langs/bn_BD/bills.lang
index bf9ae4d5886..5fb3b6169da 100644
--- a/htdocs/langs/bn_BD/bills.lang
+++ b/htdocs/langs/bn_BD/bills.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - bills
 Bill=Invoice
 Bills=Invoices
-BillsCustomers=Customers invoices
-BillsCustomer=Customers invoice
-BillsSuppliers=Suppliers invoices
-BillsCustomersUnpaid=Unpaid customers invoices
-BillsCustomersUnpaidForCompany=Unpaid customer's invoices for %s
-BillsSuppliersUnpaid=Unpaid supplier's invoices
-BillsSuppliersUnpaidForCompany=Unpaid supplier's invoices for %s
+BillsCustomers=Customer invoices
+BillsCustomer=Customer invoice
+BillsSuppliers=Supplier invoices
+BillsCustomersUnpaid=Unpaid customer invoices
+BillsCustomersUnpaidForCompany=Unpaid customer invoices for %s
+BillsSuppliersUnpaid=Unpaid supplier invoices
+BillsSuppliersUnpaidForCompany=Unpaid supplier invoices for %s
 BillsLate=Late payments
 BillsStatistics=Customers invoices statistics
 BillsStatisticsSuppliers=Suppliers invoices statistics
@@ -62,8 +62,8 @@ PaymentsBack=Payments back
 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 credit note or deposit 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.
+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.
 SupplierPayments=Suppliers payments
 ReceivedPayments=Received payments
 ReceivedCustomersPayments=Payments received from customers
@@ -78,6 +78,7 @@ PaymentMode=Payment type
 PaymentTypeDC=Debit/Credit Card
 PaymentTypePP=PayPal
 IdPaymentMode=Payment type (id)
+CodePaymentMode=Payment type (code)
 LabelPaymentMode=Payment type (label)
 PaymentModeShort=Payment type
 PaymentTerm=Payment term
@@ -102,9 +103,10 @@ SearchACustomerInvoice=Search for a customer invoice
 SearchASupplierInvoice=Search for a supplier invoice
 CancelBill=Cancel an invoice
 SendRemindByMail=Send reminder by EMail
-DoPayment=Do payment
-DoPaymentBack=Do payment back
+DoPayment=Enter payment
+DoPaymentBack=Enter refund
 ConvertToReduc=Convert into future discount
+ConvertExcessReceivedToReduc=Convert excess received into future discount
 EnterPaymentReceivedFromCustomer=Enter payment received from customer
 EnterPaymentDueToCustomer=Make payment due to customer
 DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
@@ -151,14 +153,14 @@ NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified
 FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
 NotARecurringInvoiceTemplate=Not a recurring template invoice
 NewBill=New invoice
-LastBills=Last %s invoices
-LastCustomersBills=Last %s customers invoices
-LastSuppliersBills=Last %s suppliers invoices
+LastBills=Latest %s invoices
+LastCustomersBills=Latest %s customer invoices
+LastSuppliersBills=Latest %s supplier invoices
 AllBills=All invoices
 OtherBills=Other invoices
 DraftBills=Draft invoices
-CustomersDraftInvoices=Customers draft invoices
-SuppliersDraftInvoices=Suppliers draft invoices
+CustomersDraftInvoices=Customer draft invoices
+SuppliersDraftInvoices=Supplier draft invoices
 Unpaid=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>?
@@ -272,6 +274,7 @@ Deposit=Deposit
 Deposits=Deposits
 DiscountFromCreditNote=Discount from credit note %s
 DiscountFromDeposit=Payments from deposit invoice %s
+DiscountFromExcessReceived=Payments from excess received of invoice %s
 AbsoluteDiscountUse=This kind of credit can be used on invoice before its validation
 CreditNoteDepositUse=Invoice must be validated to use this kind of credits
 NewGlobalDiscount=New absolute discount
@@ -279,8 +282,8 @@ NewRelativeDiscount=New relative discount
 NoteReason=Note/Reason
 ReasonDiscount=Reason
 DiscountOfferedBy=Granted by
-DiscountStillRemaining=Discounts still remaining
-DiscountAlreadyCounted=Discounts already counted
+DiscountStillRemaining=Discounts available
+DiscountAlreadyCounted=Discounts already consumed
 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.
@@ -333,6 +336,8 @@ 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
 # PaymentConditions
 Statut=Status
 PaymentConditionShortRECEP=Due Upon Receipt
@@ -351,6 +356,14 @@ PaymentConditionShortPT_ORDER=Order
 PaymentConditionPT_ORDER=On order
 PaymentConditionShortPT_5050=50-50
 PaymentConditionPT_5050=50%% in advance, 50%% on delivery
+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
 FixAmount=Fix amount
 VarAmount=Variable amount (%% tot.)
 # PaymentType
@@ -420,7 +433,7 @@ ChequeDeposits=Checks deposits
 Cheques=Checks
 DepositId=Id deposit
 NbCheque=Number of checks
-CreditNoteConvertedIntoDiscount=This credit note or deposit invoice has been converted into %s
+CreditNoteConvertedIntoDiscount=This %s has been converted into %s
 UsBillingContactAsIncoiveRecipientIfExist=Use customer billing contact address instead of third party address as recipient for invoices
 ShowUnpaidAll=Show all unpaid invoices
 ShowUnpaidLateOnly=Show late unpaid invoices only
diff --git a/htdocs/langs/bn_BD/boxes.lang b/htdocs/langs/bn_BD/boxes.lang
index 98970318e85..38b03b4268d 100644
--- a/htdocs/langs/bn_BD/boxes.lang
+++ b/htdocs/langs/bn_BD/boxes.lang
@@ -25,8 +25,8 @@ BoxTitleLastSuppliers=Latest %s recorded suppliers
 BoxTitleLastModifiedSuppliers=Latest %s modified suppliers
 BoxTitleLastModifiedCustomers=Latest %s modified customers
 BoxTitleLastCustomersOrProspects=Latest %s customers or prospects
-BoxTitleLastCustomerBills=Latest %s customer's invoices
-BoxTitleLastSupplierBills=Latest %s supplier's invoices
+BoxTitleLastCustomerBills=Latest %s customer invoices
+BoxTitleLastSupplierBills=Latest %s supplier invoices
 BoxTitleLastModifiedProspects=Latest %s modified prospects
 BoxTitleLastModifiedMembers=Latest %s members
 BoxTitleLastFicheInter=Latest %s modified interventions
@@ -51,12 +51,12 @@ ClickToAdd=Click here to add.
 NoRecordedCustomers=No recorded customers
 NoRecordedContacts=No recorded contacts
 NoActionsToDo=No actions to do
-NoRecordedOrders=No recorded customer's orders
+NoRecordedOrders=No recorded customer orders
 NoRecordedProposals=No recorded proposals
-NoRecordedInvoices=No recorded customer's invoices
-NoUnpaidCustomerBills=No unpaid customer's invoices
-NoUnpaidSupplierBills=No unpaid supplier's invoices
-NoModifiedSupplierBills=No recorded supplier's invoices
+NoRecordedInvoices=No recorded customer invoices
+NoUnpaidCustomerBills=No unpaid customer invoices
+NoUnpaidSupplierBills=No unpaid supplier invoices
+NoModifiedSupplierBills=No recorded supplier invoices
 NoRecordedProducts=No recorded products/services
 NoRecordedProspects=No recorded prospects
 NoContractedProducts=No products/services contracted
diff --git a/htdocs/langs/bn_BD/companies.lang b/htdocs/langs/bn_BD/companies.lang
index 838f538a273..1b7efa3c14e 100644
--- a/htdocs/langs/bn_BD/companies.lang
+++ b/htdocs/langs/bn_BD/companies.lang
@@ -81,6 +81,7 @@ PaymentBankAccount=Payment bank account
 OverAllProposals=Total proposals
 OverAllOrders=Total orders
 OverAllInvoices=Total invoices
+OverAllSupplierProposals=Total price requests
 ##### Local Taxes #####
 LocalTax1IsUsed=Use second tax
 LocalTax1IsUsedES= RE is used
@@ -389,7 +390,7 @@ ListCustomersShort=List of customers
 ThirdPartiesArea=Third parties and contact area
 LastModifiedThirdParties=Latest %s modified third parties
 UniqueThirdParties=Total of unique third parties
-InActivity=Open
+InActivity=Opened
 ActivityCeased=Closed
 ThirdPartyIsClosed=Third party is closed
 ProductsIntoElements=List of products/services into %s
@@ -404,7 +405,7 @@ MergeThirdparties=Merge third parties
 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 so you will be able to delete the duplicate one.
 ThirdpartiesMergeSuccess=Thirdparties have been merged
 SaleRepresentativeLogin=Login of sales representative
-SaleRepresentativeFirstname=Firstname of sales representative
-SaleRepresentativeLastname=Lastname of sales representative
+SaleRepresentativeFirstname=First name of sales representative
+SaleRepresentativeLastname=Last name of sales representative
 ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
 NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/bn_BD/compta.lang b/htdocs/langs/bn_BD/compta.lang
index 1ab0538bcd5..5e9814369ec 100644
--- a/htdocs/langs/bn_BD/compta.lang
+++ b/htdocs/langs/bn_BD/compta.lang
@@ -65,6 +65,7 @@ PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=VAT payment
 ListPayment=List of payments
 ListOfCustomerPayments=List of customer payments
+ListOfSupplierPayments=List of supplier payments
 DateStartPeriod=Date start period
 DateEndPeriod=Date end period
 newLT1Payment=New tax 2 payment
@@ -81,7 +82,7 @@ LT2PaymentES=IRPF Payment
 LT2PaymentsES=IRPF Payments
 VATPayment=Sales tax payment
 VATPayments=Sales tax payments
-VATRefund=Sales tax refund Refund
+VATRefund=Sales tax refund
 Refund=Refund
 SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Show VAT payment
diff --git a/htdocs/langs/bn_BD/cron.lang b/htdocs/langs/bn_BD/cron.lang
index cb68b31c80f..b1e8bcb36d2 100644
--- a/htdocs/langs/bn_BD/cron.lang
+++ b/htdocs/langs/bn_BD/cron.lang
@@ -17,14 +17,14 @@ CronMethodDoesNotExists=Class %s does not contains any method %s
 # Menu
 EnabledAndDisabled=Enabled and disabled
 # Page list
-CronLastOutput=Last run output
-CronLastResult=Last result code
+CronLastOutput=Latest run output
+CronLastResult=Latest result code
 CronCommand=Command
 CronList=Scheduled jobs
 CronDelete=Delete scheduled jobs
-CronConfirmDelete=Are you sure you want to delete these scheduled jobs ?
+CronConfirmDelete=Are you sure you want to delete these scheduled jobs?
 CronExecute=Launch scheduled job
-CronConfirmExecute=Are you sure you want to execute these scheduled jobs now ?
+CronConfirmExecute=Are you sure you want to execute these scheduled jobs now?
 CronInfo=Scheduled job module allow to execute job that have been planned
 CronTask=Job
 CronNone=None
diff --git a/htdocs/langs/bn_BD/errors.lang b/htdocs/langs/bn_BD/errors.lang
index 629f063be37..9e2eb6817ef 100644
--- a/htdocs/langs/bn_BD/errors.lang
+++ b/htdocs/langs/bn_BD/errors.lang
@@ -11,6 +11,7 @@ ErrorLoginAlreadyExists=Login %s already exists.
 ErrorGroupAlreadyExists=Group %s already exists.
 ErrorRecordNotFound=Record not found.
 ErrorFailToCopyFile=Failed to copy file '<b>%s</b>' into '<b>%s</b>'.
+ErrorFailToCopyDir=Failed to copy directory '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToRenameFile=Failed to rename file '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToDeleteFile=Failed to remove file '<b>%s</b>'.
 ErrorFailToCreateFile=Failed to create file '<b>%s</b>'.
@@ -115,7 +116,7 @@ ErrorNoActivatedBarcode=No barcode type activated
 ErrUnzipFails=Failed to unzip %s with ZipArchive
 ErrNoZipEngine=No engine to unzip %s file in this PHP
 ErrorFileMustBeADolibarrPackage=The file %s must be a Dolibarr zip package
-ErrorFileRequired=It takes a package Dolibarr file
+ErrorModuleFileRequired=You must select a Dolibarr module package file
 ErrorPhpCurlNotInstalled=The PHP CURL is not installed, this is essential to talk with 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
@@ -181,6 +182,8 @@ ErrorBankStatementNameMustFollowRegex=Error, bank statement name must follow the
 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>
 
 # 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.
diff --git a/htdocs/langs/bn_BD/holiday.lang b/htdocs/langs/bn_BD/holiday.lang
index b5270297587..50d97c0d8cc 100644
--- a/htdocs/langs/bn_BD/holiday.lang
+++ b/htdocs/langs/bn_BD/holiday.lang
@@ -76,8 +76,8 @@ BoxTitleLastLeaveRequests=Latest %s modified leave requests
 HolidaysMonthlyUpdate=Monthly update
 ManualUpdate=Manual update
 HolidaysCancelation=Leave request cancelation
-EmployeeLastname=Employee lastname
-EmployeeFirstname=Employee firstname
+EmployeeLastname=Employee last name
+EmployeeFirstname=Employee first name
 TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
 
 ## Configuration du Module ##
diff --git a/htdocs/langs/bn_BD/ldap.lang b/htdocs/langs/bn_BD/ldap.lang
index a17019d00fb..42e699de311 100644
--- a/htdocs/langs/bn_BD/ldap.lang
+++ b/htdocs/langs/bn_BD/ldap.lang
@@ -13,8 +13,8 @@ LDAPUsers=Users in LDAP database
 LDAPFieldStatus=Status
 LDAPFieldFirstSubscriptionDate=First subscription date
 LDAPFieldFirstSubscriptionAmount=First subscription amount
-LDAPFieldLastSubscriptionDate=Last subscription date
-LDAPFieldLastSubscriptionAmount=Last subscription amount
+LDAPFieldLastSubscriptionDate=Latest subscription date
+LDAPFieldLastSubscriptionAmount=Latest subscription amount
 LDAPFieldSkype=Skype id
 LDAPFieldSkypeExample=Example : skypeName
 UserSynchronized=User synchronized
diff --git a/htdocs/langs/bn_BD/mails.lang b/htdocs/langs/bn_BD/mails.lang
index 137dc722981..c830b551a67 100644
--- a/htdocs/langs/bn_BD/mails.lang
+++ b/htdocs/langs/bn_BD/mails.lang
@@ -74,14 +74,18 @@ ResultOfMailSending=Result of mass EMail sending
 NbSelected=Nb selected
 NbIgnored=Nb ignored
 NbSent=Nb sent
-ContactsWithThirdpartyFilter=Contact with customer filters
+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
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Line %s in file
 RecipientSelectionModules=Defined requests for recipient's selection
 MailSelectedRecipients=Selected recipients
 MailingArea=EMailings area
-LastMailings=Last %s emailings
+LastMailings=Latest %s emailings
 TargetsStatistics=Targets statistics
 NbOfCompaniesContacts=Unique contacts/addresses
 MailNoChangePossible=Recipients for validated emailing can't be changed
@@ -146,3 +150,6 @@ AdvTgtCreateFilter=Create filter
 AdvTgtOrCreateNewFilter=Name of new filter
 NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
+OutGoingEmailSetup=Outgoing email setup
+InGoingEmailSetup=Incoming email setup
+
diff --git a/htdocs/langs/bn_BD/main.lang b/htdocs/langs/bn_BD/main.lang
index ba3bbffdd6b..1d4c9c416be 100644
--- a/htdocs/langs/bn_BD/main.lang
+++ b/htdocs/langs/bn_BD/main.lang
@@ -69,6 +69,7 @@ SetDate=Set date
 SelectDate=Select a date
 SeeAlso=See also %s
 SeeHere=See here
+Apply=Apply
 BackgroundColorByDefault=Default background color
 FileRenamed=The file was successfully renamed
 FileUploaded=The file was successfully uploaded
@@ -87,7 +88,7 @@ Undefined=Undefined
 PasswordForgotten=Password forgotten?
 SeeAbove=See above
 HomeArea=Home area
-LastConnexion=Last connection
+LastConnexion=Latest connection
 PreviousConnexion=Previous connection
 PreviousValue=Previous value
 ConnectedOnMultiCompany=Connected on environment
@@ -237,7 +238,7 @@ DateCreation=Creation date
 DateCreationShort=Creat. date
 DateModification=Modification date
 DateModificationShort=Modif. date
-DateLastModification=Last modification date
+DateLastModification=Latest modification date
 DateValidation=Validation date
 DateClosing=Closing date
 DateDue=Due date
@@ -433,7 +434,7 @@ Reportings=Reporting
 Draft=Draft
 Drafts=Drafts
 Validated=Validated
-Opened=Open
+Opened=Opened
 New=New
 Discount=Discount
 Unknown=Unknown
@@ -599,6 +600,8 @@ SessionName=Session name
 Method=Method
 Receive=Receive
 CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
+ExpectedValue=Expected Value
+CurrentValue=Current value
 PartialWoman=Partial
 TotalWoman=Total
 NeverReceived=Never received
@@ -756,6 +759,7 @@ SomeTranslationAreUncomplete=Some languages may be partially translated or may c
 DirectDownloadLink=Direct download link
 Download=Download
 ActualizeCurrency=Update currency rate
+Fiscalyear=Fiscal year
 # Week day
 Monday=Monday
 Tuesday=Tuesday
@@ -812,3 +816,5 @@ SearchIntoContracts=Contracts
 SearchIntoCustomerShipments=Customer shipments
 SearchIntoExpenseReports=Expense reports
 SearchIntoLeaves=Leaves
+
+BulkActions=Bulk actions
diff --git a/htdocs/langs/bn_BD/members.lang b/htdocs/langs/bn_BD/members.lang
index 1f6a6e9fd21..8f6f76ba48f 100644
--- a/htdocs/langs/bn_BD/members.lang
+++ b/htdocs/langs/bn_BD/members.lang
@@ -136,8 +136,8 @@ DocForAllMembersCards=Generate business cards for all members
 DocForOneMemberCards=Generate business cards for a particular member
 DocForLabels=Generate address sheets
 SubscriptionPayment=Subscription payment
-LastSubscriptionDate=Last subscription date
-LastSubscriptionAmount=Last subscription amount
+LastSubscriptionDate=Latest subscription date
+LastSubscriptionAmount=Latest subscription amount
 MembersStatisticsByCountries=Members statistics by country
 MembersStatisticsByState=Members statistics by state/province
 MembersStatisticsByTown=Members statistics by town
@@ -149,7 +149,7 @@ MembersByStateDesc=This screen show you statistics on members by state/provinces
 MembersByTownDesc=This screen show you statistics on members by town.
 MembersStatisticsDesc=Choose statistics you want to read...
 MenuMembersStats=Statistics
-LastMemberDate=Last member date
+LastMemberDate=Latest member date
 Nature=Nature
 Public=Information are public
 NewMemberbyWeb=New member added. Awaiting approval
diff --git a/htdocs/langs/bn_BD/orders.lang b/htdocs/langs/bn_BD/orders.lang
index 9d2e53e4fe2..331e3b49d3e 100644
--- a/htdocs/langs/bn_BD/orders.lang
+++ b/htdocs/langs/bn_BD/orders.lang
@@ -39,7 +39,7 @@ StatusOrderRefusedShort=Refused
 StatusOrderBilledShort=Billed
 StatusOrderToProcessShort=To process
 StatusOrderReceivedPartiallyShort=Partially received
-StatusOrderReceivedAllShort=Everything received
+StatusOrderReceivedAllShort=Products received
 StatusOrderCanceled=Canceled
 StatusOrderDraft=Draft (needs to be validated)
 StatusOrderValidated=Validated
@@ -51,7 +51,7 @@ StatusOrderApproved=Approved
 StatusOrderRefused=Refused
 StatusOrderBilled=Billed
 StatusOrderReceivedPartially=Partially received
-StatusOrderReceivedAll=Everything received
+StatusOrderReceivedAll=All products received
 ShippingExist=A shipment exists
 QtyOrdered=Qty ordered
 ProductQtyInDraft=Product quantity into draft orders
diff --git a/htdocs/langs/bn_BD/other.lang b/htdocs/langs/bn_BD/other.lang
index 253560454ec..ab937ff3bab 100644
--- a/htdocs/langs/bn_BD/other.lang
+++ b/htdocs/langs/bn_BD/other.lang
@@ -68,14 +68,15 @@ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find her
 PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nYou will find here the shipping __SHIPPINGREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nYou will find here the intervention __FICHINTERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n__PERSONALIZED__\n\n__SIGNATURE__
-DemoDesc=Dolibarr is a compact ERP/CRM supporting several functional modules. A demo showcasing all modules makes no sense as this scenario never occurs. So, several demo profiles are available.
+DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
+ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
 DemoFundation=Manage members of a foundation
 DemoFundation2=Manage members and bank account of a foundation
-DemoCompanyServiceOnly=Manage a freelance activity selling service only
+DemoCompanyServiceOnly=Company or freelance selling service only
 DemoCompanyShopWithCashDesk=Manage a shop with a cash desk
-DemoCompanyProductAndStocks=Manage a small or medium company selling products
-DemoCompanyAll=Manage a small or medium company with multiple activities (all main modules)
+DemoCompanyProductAndStocks=Company selling products with a shop
+DemoCompanyAll=Company with multiple activities (all main modules)
 CreatedBy=Created by %s
 ModifiedBy=Modified by %s
 ValidatedBy=Validated by %s
diff --git a/htdocs/langs/bn_BD/products.lang b/htdocs/langs/bn_BD/products.lang
index cfc53dc7337..3a412a5789c 100644
--- a/htdocs/langs/bn_BD/products.lang
+++ b/htdocs/langs/bn_BD/products.lang
@@ -60,7 +60,7 @@ SellingPrice=Selling price
 SellingPriceHT=Selling price (net of tax)
 SellingPriceTTC=Selling price (inc. tax)
 CostPriceDescription=This price (net of tax) can be used to store the average amount this product cost to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
-CostPriceUsage=In a future version, this value could be used for margin calculation.
+CostPriceUsage=This value could be used for margin calculation.
 SoldAmount=Sold amount
 PurchasedAmount=Purchased amount
 NewPrice=New price
@@ -142,6 +142,7 @@ ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b>?
 CloneContentProduct=Clone all main informations of product/service
 ClonePricesProduct=Clone main informations and prices
 CloneCompositionProduct=Clone packaged product/service
+CloneCombinationsProduct=Clone product variants
 ProductIsUsed=This product is used
 NewRefForClone=Ref. of new product/service
 SellingPrices=Selling prices
@@ -238,7 +239,7 @@ GlobalVariables=Global variables
 VariableToUpdate=Variable to update
 GlobalVariableUpdaters=Global variable updaters
 UpdateInterval=Update interval (minutes)
-LastUpdated=Last updated
+LastUpdated=Latest update
 CorrectlyUpdated=Correctly updated
 PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
 PropalMergePdfProductChooseFile=Select PDF files
@@ -258,4 +259,41 @@ VolumeUnits=Volume unit
 SizeUnits=Size unit
 DeleteProductBuyPrice=Delete buying price
 ConfirmDeleteProductBuyPrice=Are you sure you want to delete this buying price?
+SubProduct=Sub product
 
+#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
+ProductCombinations=Variants
+HideProductCombinations=Hide products variant in the products selector
+ProductCombination=Variant
+NewProductCombination=New variant
+EditProductCombination=Editing variant
+ProductCombinationGenerator=Variants generator
+Features=Features
+PriceImpact=Price impact
+WeightImpact=Weight impact
+NewProductAttribute=New attribute
+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
+PercentageVariation=Percentage variation
+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 child products
+ConfirmCloneProductCombinations=Would you like to copy all the product variant to the 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
diff --git a/htdocs/langs/bn_BD/projects.lang b/htdocs/langs/bn_BD/projects.lang
index 392e20697aa..f9c603ce113 100644
--- a/htdocs/langs/bn_BD/projects.lang
+++ b/htdocs/langs/bn_BD/projects.lang
@@ -29,9 +29,9 @@ DeleteAProject=Delete a project
 DeleteATask=Delete a task
 ConfirmDeleteAProject=Are you sure you want to delete this project?
 ConfirmDeleteATask=Are you sure you want to delete this task?
-OpenedProjects=Open projects
-OpenedTasks=Open tasks
-OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
+OpenedProjects=Opened projects
+OpenedTasks=Opened tasks
+OpportunitiesStatusForOpenedProjects=Opportunities amount of opened projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=Show project
 SetProject=Set project
@@ -47,7 +47,7 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
 TaskTimeDate=Date
-TasksOnOpenedProject=Tasks on open projects
+TasksOnOpenedProject=Tasks on opened projects
 WorkloadNotDefined=Workload not defined
 NewTimeSpent=New time spent
 MyTimeSpent=My time spent
@@ -96,6 +96,7 @@ ValidateProject=Validate projet
 ConfirmValidateProject=Are you sure you want to validate this project?
 CloseAProject=Close project
 ConfirmCloseAProject=Are you sure you want to close this project?
+AlsoCloseAProject=Also close project (keep it open if you still need to follow production tasks on it)
 ReOpenAProject=Open project
 ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=Project contacts
@@ -121,7 +122,7 @@ CloneProjectFiles=Clone project joined files
 CloneTaskFiles=Clone task(s) joined files (if task(s) cloned)
 CloneMoveDate=Update project/tasks dates from now?
 ConfirmCloneProject=Are you sure to clone this project?
-ProjectReportDate=Change task date according project start date
+ProjectReportDate=Change task dates according to new project start date
 ErrorShiftTaskDate=Impossible to shift task date according to new project start date
 ProjectsAndTasksLines=Projects and tasks
 ProjectCreatedInDolibarr=Project %s created
@@ -178,9 +179,9 @@ ProjectsStatistics=Statistics on projects/leads
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 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.
-OpenedProjectsByThirdparties=Open projects by thirdparties
+OpenedProjectsByThirdparties=Opened projects by thirdparties
 OnlyOpportunitiesShort=Only opportunities
-OpenedOpportunitiesShort=Open opportunities
+OpenedOpportunitiesShort=Opened opportunities
 NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount
diff --git a/htdocs/langs/bn_BD/propal.lang b/htdocs/langs/bn_BD/propal.lang
index 52260fe2b4e..a14d25ce779 100644
--- a/htdocs/langs/bn_BD/propal.lang
+++ b/htdocs/langs/bn_BD/propal.lang
@@ -3,7 +3,7 @@ Proposals=Commercial proposals
 Proposal=Commercial proposal
 ProposalShort=Proposal
 ProposalsDraft=Draft commercial proposals
-ProposalsOpened=Open commercial proposals
+ProposalsOpened=Opened commercial proposals
 Prop=Commercial proposals
 CommercialProposal=Commercial proposal
 ProposalCard=Proposal card
@@ -26,9 +26,9 @@ AmountOfProposalsByMonthHT=Amount by month (net of tax)
 NbOfProposals=Number of commercial proposals
 ShowPropal=Show proposal
 PropalsDraft=Drafts
-PropalsOpened=Open
+PropalsOpened=Opened
 PropalStatusDraft=Draft (needs to be validated)
-PropalStatusValidated=Validated (proposal is open)
+PropalStatusValidated=Validated (proposal is opened)
 PropalStatusSigned=Signed (needs billing)
 PropalStatusNotSigned=Not signed (closed)
 PropalStatusBilled=Billed
diff --git a/htdocs/langs/bn_BD/stocks.lang b/htdocs/langs/bn_BD/stocks.lang
index 18227fcdace..1db49b8d8dd 100644
--- a/htdocs/langs/bn_BD/stocks.lang
+++ b/htdocs/langs/bn_BD/stocks.lang
@@ -22,13 +22,15 @@ Movements=Movements
 ErrorWarehouseRefRequired=Warehouse reference name is required
 ListOfWarehouses=List of warehouses
 ListOfStockMovements=List of stock movements
+StockMovementForId=Movement ID %d
+ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Warehouses area
 Location=Location
 LocationSummary=Short name location
 NumberOfDifferentProducts=Number of different products
 NumberOfProducts=Total number of products
-LastMovement=Last movement
-LastMovements=Last movements
+LastMovement=Latest movement
+LastMovements=Latest movements
 Units=Units
 Unit=Unit
 StockCorrection=Correct stock
diff --git a/htdocs/langs/bn_BD/supplier_proposal.lang b/htdocs/langs/bn_BD/supplier_proposal.lang
index 621d7784e35..61b031459b0 100644
--- a/htdocs/langs/bn_BD/supplier_proposal.lang
+++ b/htdocs/langs/bn_BD/supplier_proposal.lang
@@ -8,7 +8,7 @@ SearchRequest=Find a request
 DraftRequests=Draft requests
 SupplierProposalsDraft=Draft supplier proposals
 LastModifiedRequests=Latest %s modified price requests
-RequestsOpened=Open price requests
+RequestsOpened=Opened price requests
 SupplierProposalArea=Supplier proposals area
 SupplierProposalShort=Supplier proposal
 SupplierProposals=Supplier proposals
@@ -23,7 +23,7 @@ ConfirmValidateAsk=Are you sure you want to validate this price request under na
 DeleteAsk=Delete request
 ValidateAsk=Validate request
 SupplierProposalStatusDraft=Draft (needs to be validated)
-SupplierProposalStatusValidated=Validated (request is open)
+SupplierProposalStatusValidated=Validated (request is opened)
 SupplierProposalStatusClosed=Closed
 SupplierProposalStatusSigned=Accepted
 SupplierProposalStatusNotSigned=Refused
diff --git a/htdocs/langs/bn_BD/suppliers.lang b/htdocs/langs/bn_BD/suppliers.lang
index 766e4a9bfe9..b890919ace5 100644
--- a/htdocs/langs/bn_BD/suppliers.lang
+++ b/htdocs/langs/bn_BD/suppliers.lang
@@ -24,10 +24,10 @@ ExportDataset_fournisseur_1=Supplier invoices list and invoice lines
 ExportDataset_fournisseur_2=Supplier invoices and payments
 ExportDataset_fournisseur_3=Supplier orders and order lines
 ApproveThisOrder=Approve this order
-ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b> ?
+ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b>?
 DenyingThisOrder=Deny this order
-ConfirmDenyingThisOrder=Are you sure you want to deny this order <b>%s</b> ?
-ConfirmCancelThisOrder=Are you sure you want to cancel this order <b>%s</b> ?
+ConfirmDenyingThisOrder=Are you sure you want to deny this order <b>%s</b>?
+ConfirmCancelThisOrder=Are you sure you want to cancel this order <b>%s</b>?
 AddSupplierOrder=Create supplier order
 AddSupplierInvoice=Create supplier invoice
 ListOfSupplierProductForSupplier=List of products and prices for supplier <b>%s</b>
@@ -41,3 +41,4 @@ DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Wrong quality
 ReputationForThisProduct=Reputation
 BuyerName=Buyer name
+AllProductServicePrices=All product / service prices
diff --git a/htdocs/langs/bn_BD/users.lang b/htdocs/langs/bn_BD/users.lang
index b836db8eb42..a0a1eae8697 100644
--- a/htdocs/langs/bn_BD/users.lang
+++ b/htdocs/langs/bn_BD/users.lang
@@ -36,7 +36,7 @@ AdministratorDesc=Administrator
 DefaultRights=Default permissions
 DefaultRightsDesc=Define here <u>default</u> permissions that are automatically granted to a <u>new created</u> user (Go on user card to change permission of an existing user).
 DolibarrUsers=Dolibarr users
-LastName=Last Name
+LastName=Last name
 FirstName=First name
 ListOfGroups=List of groups
 NewGroup=New group
diff --git a/htdocs/langs/bn_BD/withdrawals.lang b/htdocs/langs/bn_BD/withdrawals.lang
index 6e560a1abb1..a99d890e5f9 100644
--- a/htdocs/langs/bn_BD/withdrawals.lang
+++ b/htdocs/langs/bn_BD/withdrawals.lang
@@ -24,6 +24,7 @@ WithdrawStatistics=Direct debit payment statistics
 WithdrawRejectStatistics=Direct debit payment reject statistics
 LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
+WithdrawRequestsDone=%s direct debit payment requests recorded
 ThirdPartyBankCode=Third party bank code
 NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoice are on companies with a valid BAN.
 ClassCredited=Classify credited
@@ -76,8 +77,8 @@ RUM=UMR
 RUMLong=Unique Mandate Reference
 RUMWillBeGenerated=UMR number will be generated once bank account information are saved
 WithdrawMode=Direct debit mode (FRST or RECUR)
-WithdrawRequestAmount=Withdraw request amount:
-WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil amount.
+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
diff --git a/htdocs/langs/bs_BA/accountancy.lang b/htdocs/langs/bs_BA/accountancy.lang
index e6ea27ecfc9..2f7dbbeefa0 100644
--- a/htdocs/langs/bs_BA/accountancy.lang
+++ b/htdocs/langs/bs_BA/accountancy.lang
@@ -194,6 +194,8 @@ ChangeBinding=Change the binding
 
 ## Admin
 ApplyMassCategories=Apply mass categories
+AddAccountFromBookKeepingWithNoCategories=Add acccount already used with no categories
+CategoryDeleted=Category for the accounting account has been removed
 
 ## Export
 Exports=Exports
@@ -209,6 +211,7 @@ Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution
 Modelcsv_quadratus=Export towards Quadratus QuadraCompta
 Modelcsv_ebp=Export towards EBP
 Modelcsv_cogilog=Export towards Cogilog
+ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
 InitAccountancy=Init accountancy
diff --git a/htdocs/langs/bs_BA/admin.lang b/htdocs/langs/bs_BA/admin.lang
index 0fb0e4f286b..01e48fff206 100644
--- a/htdocs/langs/bs_BA/admin.lang
+++ b/htdocs/langs/bs_BA/admin.lang
@@ -9,17 +9,20 @@ VersionDevelopment=Razvoj
 VersionUnknown=Nepoznato
 VersionRecommanded=Preporučeno
 FileCheck=Files integrity checker
-FileCheckDesc=This tool allows you to check the integrity of files of your application, comparing each files with the official ones. You can use this tool to detect if some files were modified by a hacker for example.
+FileCheckDesc=This tool allows you to check the integrity of files and setup of your application, comparing each files with the official ones. 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.
 FileIntegrityIsStrictlyConformedWithReference=Files integrity is strictly conformed with the reference.
-FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified of removed.
+FileIntegrityIsOkButFilesWereAdded=Files integrity check has passed, however some new files were added.
+FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified, removed or added.
 GlobalChecksum=Global checksum
 MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
 LocalSignature=Embedded local signature (less reliable)
 RemoteSignature=Remote distant signature (more reliable)
 FilesMissing=Missing Files
 FilesUpdated=Updated Files
+FilesModified=Modified Files
+FilesAdded=Added Files
 FileCheckDolibarr=Check integrity of application files
-AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from a certified package
+AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from an official package
 XmlNotFound=Xml Integrity File of application not found
 SessionId=ID sesije
 SessionSaveHandler=Rukovatelj snimanje sesija
@@ -188,7 +191,9 @@ BoxesDesc=Widgets are components showing some information that you can add to pe
 OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
 ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
-ModulesMarketPlaces=More modules...
+ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
+ModulesMarketPlaces=Find external modules...
+GoModuleSetupArea=To deploy/install a new module, go onto the Module setup area at <a href="%s">%s</a>.
 DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules
 DoliPartnersDesc=List of companies providing custom developed modules or features (Note: anyone experienced in PHP programming can provide custom development for an open source project)
 WebSiteDesc=Reference websites to find more modules...
@@ -280,20 +285,21 @@ MenuHandlers=Menu handlers
 MenuAdmin=Menu editor
 DoNotUseInProduction=Do not use in production
 ThisIsProcessToFollow=This is steps to process:
-ThisIsAlternativeProcessToFollow=This is an alternative setup to process:
+ThisIsAlternativeProcessToFollow=This is an alternative setup to process manually:
 StepNb=Step %s
 FindPackageFromWebSite=Find a package that provides feature you want (for example on official web site %s).
 DownloadPackageFromWebSite=Download package (for example from official web site %s).
-UnpackPackageInDolibarrRoot=Unpack package file into Dolibarr server directory dedicated to external modules: <b>%s</b>
-SetupIsReadyForUse=Install is finished and Dolibarr is ready to use with this new component.
-NotExistsDirect=The alternative root directory is not defined.<br>
-InfDirAlt=Since version 3 it is possible to define an alternative root directory.This allows you to store, same place, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
-InfDirExample=<br>Then declare it in the file conf.php<br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>*These lines are commented with "#", to uncomment only remove the character.
+UnpackPackageInDolibarrRoot=Unpack the packaged files into server directory dedicated to Dolibarr: <b>%s</b>
+UnpackPackageInModulesRoot=To deploy/install an external module, unpack the packaged files into the server directory dedicated to modules: <b>%s</b>
+SetupIsReadyForUse=Module deployment is finished. You must however enable and setup the module in your application by going on the page to setup modules: <a href="%s">%s</a>.
+NotExistsDirect=The alternative root directory is not defined to an existing directory.<br>
+InfDirAlt=Since version 3, it is possible to define an alternative root directory. This allows you to store, into a dedicated directory, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
+InfDirExample=<br>Then declare it in the file <strong>conf.php</strong><br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>If these lines are commented with "#", to enable them, just uncomment by removing the "#" character.
 YouCanSubmitFile=For this step, you can send package using this tool: Select module file
 CurrentVersion=Dolibarr current version
 CallUpdatePage=Go to the page that updates the database structure and data: %s.
 LastStableVersion=Latest stable version
-LastActivationDate=Last activation date
+LastActivationDate=Latest activation date
 UpdateServerOffline=Update server offline
 GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s. <br><b>{000000@x}</b> same as previous but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
 GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
@@ -376,11 +382,11 @@ ExtrafieldCheckBox=Checkbox
 ExtrafieldRadio=Radio button
 ExtrafieldCheckBoxFromList= Checkbox from table
 ExtrafieldLink=Link to an object
-ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>In order to have the list depending on another :<br>1,value1|parent_list_code:parent_key<br>2,value2|parent_list_code:parent_key
+ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list :<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list :<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
-ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
+ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Example : Societe:societe/class/societe.class.php
 LibraryToBuildPDF=Library used for PDF generation
 WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
@@ -415,10 +421,10 @@ ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The cod
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
 WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<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).
-
+ClickToShowDescription=Click to show description
 # Modules
 Module0Name=Users & groups
-Module0Desc=Users and groups management
+Module0Desc=Users / Employees and Groups management
 Module1Name=Treće stranke
 Module1Desc=Companies and contact management (customers, prospects...)
 Module2Name=Poslovno
@@ -689,7 +695,7 @@ PermissionAdvanced253=Create/modify internal/external users and permissions
 Permission254=Create/modify external users only
 Permission255=Modify other users password
 Permission256=Delete or disable other users
-Permission262=Extend access to all third parties (not only third parties that user is a sale representative). Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc). Not effective for projects (only rules on project permissions, visibility and assignement matters).
+Permission262=Extend access to all third parties (not only third parties that user is a sale representative).<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 assignement matters).
 Permission271=Read CA
 Permission272=Read invoices
 Permission273=Issue invoices
@@ -891,7 +897,7 @@ Offset=Offset
 AlwaysActive=Always active
 Upgrade=Upgrade
 MenuUpgrade=Upgrade / Extend
-AddExtensionThemeModuleOrOther=Add extension (theme, module, ...)
+AddExtensionThemeModuleOrOther=Deploy/install external module
 WebServer=Web server
 DocumentRootServer=Web server's root directory
 DataRootServer=Data files directory
@@ -1165,10 +1171,6 @@ FreeLegalTextOnOrders=Free text on orders
 WatermarkOnDraftOrders=Vodeni žig na nacrte naloga (ništa, ako je prazno) 
 ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable
 BANK_ASK_PAYMENT_BANK_DURING_ORDER=Ask for bank account destination of order
-##### Clicktodial #####
-ClickToDialSetup=Click To Dial module setup
-ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with your clicktodial login (defined on your user card)<br><b>__PASS__</b> that will be replaced with your clicktodial password (defined on your user card).
-##### Bookmark4u #####
 ##### Interventions #####
 InterventionsSetup=Interventions module setup
 FreeLegalTextOnInterventions=Free text on intervention documents
@@ -1395,7 +1397,7 @@ SendingsSetup=Sending module setup
 SendingsReceiptModel=Sending receipt model
 SendingsNumberingModules=Sendings numbering modules
 SendingsAbility=Support shipping sheets for customer deliveries
-NoNeedForDeliveryReceipts=In most cases, sendings receipts are used both as sheets for customer deliveries (list of products to send) and sheets that is recevied and signed by customer. So product deliveries receipts is a duplicated feature and is rarely activated.
+NoNeedForDeliveryReceipts=In most cases, shipping sheets are used both as sheets for customer deliveries (list of products to send) and sheets that is received and signed by customer. So product deliveries receipts is a duplicated feature and is rarely activated.
 FreeLegalTextOnShippings=Free text on shipments
 ##### Deliveries #####
 DeliveryOrderNumberingModules=Products deliveries receipt numbering module
@@ -1477,7 +1479,9 @@ AGENDA_DEFAULT_FILTER_STATUS=Set automatically this status for events into searc
 AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
 AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
 AGENDA_NOTIFICATION_SOUND=Enable sound notification
-##### ClickToDial #####
+##### Clicktodial #####
+ClickToDialSetup=Click To Dial module setup
+ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with your clicktodial login (defined on your user card)<br><b>__PASS__</b> that will be replaced with your clicktodial password (defined on your user card).
 ClickToDialDesc=This module allows to make phone numbers clickable. A click on this icon will call make your phone to 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.
 ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
 ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on same computer than the browser, and called when you click on a link in your browser that start 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.
@@ -1505,10 +1509,11 @@ EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint availa
 ##### API ####
 ApiSetup=API module setup
 ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
-ApiProductionMode=Enable production mode (this will activate use of a caches for services management)
+ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
 ApiExporerIs=You can explore the APIs at url
 OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
 ApiKey=Key for API
+WarningAPIExplorerDisabled=The API explorer has been disabled. API explorer is not required to provide API services. It is a tool for developer to find/test REST APIs. If you need this tool, go into setup of module API REST to activate it.
 ##### Bank #####
 BankSetupModule=Bank module setup
 FreeLegalTextOnChequeReceipts=Free text on cheque receipts
@@ -1577,7 +1582,7 @@ BackupDumpWizard=Wizard to build database backup dump file
 SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
 SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is only manual steps a privileged user can do.
 InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
-ConfFileMuseContainCustom=Installing an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to have option<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
+ConfFileMuseContainCustom=Installing an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
 HighlightLinesColor=Highlight color of the line when the mouse passes over (keep empty for no highlight)
 TextTitleColor=Color of page title
@@ -1607,6 +1612,7 @@ FixTZ=TimeZone fix
 FillFixTZOnlyIfRequired=Example: +2 (fill only if problem experienced)
 ExpectedChecksum=Expected Checksum
 CurrentChecksum=Current Checksum
+ForcedConstants=Required constant values
 MailToSendProposal=To send customer proposal
 MailToSendOrder=To send customer order
 MailToSendInvoice=To send customer invoice
@@ -1615,9 +1621,10 @@ MailToSendIntervention=To send intervention
 MailToSendSupplierRequestForQuotation=To send quotation request to supplier
 MailToSendSupplierOrder=To send supplier order
 MailToSendSupplierInvoice=To send supplier invoice
+MailToSendContract=To send a contract
 MailToThirdparty=To send email from third party page
 ByDefaultInList=Show by default on list view
-YouUseLastStableVersion=You use the last stable version
+YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
 TitleExampleForMaintenanceRelease=Example of message you can use to announce this maintenance release (feel free to use it on your web sites)
 ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. 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.
diff --git a/htdocs/langs/bs_BA/banks.lang b/htdocs/langs/bs_BA/banks.lang
index 1877f2e26f8..dcfd1f41866 100644
--- a/htdocs/langs/bs_BA/banks.lang
+++ b/htdocs/langs/bs_BA/banks.lang
@@ -74,13 +74,13 @@ Conciliate=Izmiriti
 Conciliation=Podmirivanje
 ReconciliationLate=Reconciliation late
 IncludeClosedAccount=Uključiti zatvorene račune
-OnlyOpenedAccount=Only open accounts
+OnlyOpenedAccount=Samo otvoreni računi
 AccountToCredit=Račun za potraživanja
 AccountToDebit=Račun za zaduživanje
 DisableConciliation=Isključi opciju podmirenja za ovaj račun
 ConciliationDisabled=Opcija podmirivanja isključena
 LinkedToAConciliatedTransaction=Linked to a conciliated entry
-StatusAccountOpened=Otvori
+StatusAccountOpened=Otvoreno
 StatusAccountClosed=Zatvoreno
 AccountIdShort=Broj
 LineRecord=Transakcija
diff --git a/htdocs/langs/bs_BA/bills.lang b/htdocs/langs/bs_BA/bills.lang
index 4d07b9590d6..5e1ce554937 100644
--- a/htdocs/langs/bs_BA/bills.lang
+++ b/htdocs/langs/bs_BA/bills.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - bills
 Bill=Faktura
 Bills=Fakture
-BillsCustomers=Fakture kupaca
-BillsCustomer=Customers invoice
-BillsSuppliers=Fakture dobavljača
-BillsCustomersUnpaid=NEplaćene fakture kupaca
-BillsCustomersUnpaidForCompany=Neplačene fakture kupca za %s
-BillsSuppliersUnpaid=Neplaćene fakture dobavljača
-BillsSuppliersUnpaidForCompany=Neplaćene fakture dobavljača za %s
+BillsCustomers=Customer invoices
+BillsCustomer=Faktura kupca
+BillsSuppliers=Supplier invoices
+BillsCustomersUnpaid=Unpaid customer invoices
+BillsCustomersUnpaidForCompany=Unpaid customer invoices for %s
+BillsSuppliersUnpaid=Unpaid supplier invoices
+BillsSuppliersUnpaidForCompany=Unpaid supplier invoices for %s
 BillsLate=Zakašnjela plaćanja
 BillsStatistics=Customers invoices statistics
 BillsStatisticsSuppliers=Suppliers invoices statistics
@@ -62,8 +62,8 @@ PaymentsBack=Povrat uplata
 paymentInInvoiceCurrency=in invoices currency
 PaidBack=Uplaćeno nazad
 DeletePayment=Obriši uplatu
-ConfirmDeletePayment=Are you sure you want to delete this payment?
-ConfirmConvertToReduc=Do you want to convert this credit note or deposit 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.
+ConfirmDeletePayment=Jeste li sigurni da želite obrisati 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.
 SupplierPayments=Uplate dobavljača
 ReceivedPayments=Primljene uplate
 ReceivedCustomersPayments=Primljene uplate od kupaca
@@ -78,6 +78,7 @@ PaymentMode=Način plaćanja
 PaymentTypeDC=Debit/Credit Card
 PaymentTypePP=PayPal
 IdPaymentMode=Payment type (id)
+CodePaymentMode=Payment type (code)
 LabelPaymentMode=Payment type (label)
 PaymentModeShort=Način plaćanja
 PaymentTerm=Rok plaćanja
@@ -102,9 +103,10 @@ SearchACustomerInvoice=Traži fakturu kupca
 SearchASupplierInvoice=Traži fakturu dobavljača
 CancelBill=Otkaži fakturu
 SendRemindByMail=Pošalji opomenu na E-Mail
-DoPayment=Izvrši plaćanje
-DoPaymentBack=Izvrši povrat uplate
+DoPayment=Enter payment
+DoPaymentBack=Enter refund
 ConvertToReduc=Pretvori u budući popust
+ConvertExcessReceivedToReduc=Convert excess received into future discount
 EnterPaymentReceivedFromCustomer=Unesi uplate primljene od kupca
 EnterPaymentDueToCustomer=Vnesi Rok plaćanja za kupca
 DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
@@ -151,14 +153,14 @@ NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified
 FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
 NotARecurringInvoiceTemplate=Not a recurring template invoice
 NewBill=Nova faktura
-LastBills=Zadnjih %s faktura
-LastCustomersBills=Zadnjih %s faktura kupca
-LastSuppliersBills=Zadnjih %s faktura dobavljača
+LastBills=Latest %s invoices
+LastCustomersBills=Latest %s customer invoices
+LastSuppliersBills=Latest %s supplier invoices
 AllBills=Sve fakture
 OtherBills=Ostale fakture
 DraftBills=Uzorak faktura
-CustomersDraftInvoices=Uzorci faktura kupca
-SuppliersDraftInvoices=Uzorci faktura dobavljača
+CustomersDraftInvoices=Customer draft invoices
+SuppliersDraftInvoices=Supplier draft invoices
 Unpaid=Neplaćeno
 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>?
@@ -272,6 +274,7 @@ Deposit=Avans
 Deposits=Avansi
 DiscountFromCreditNote=Popust z dobropisa %s
 DiscountFromDeposit=Uplata sa fakture za avans %s
+DiscountFromExcessReceived=Payments from excess received of invoice %s
 AbsoluteDiscountUse=Ova vrsta kredita može se koristiti na fakturi prije potvrde
 CreditNoteDepositUse=Invoice must be validated to use this kind of credits
 NewGlobalDiscount=Nov fiksni popust
@@ -279,8 +282,8 @@ NewRelativeDiscount=Nov relativni popust
 NoteReason=Bilješka/Razlog
 ReasonDiscount=Razlog
 DiscountOfferedBy=Odobreno od strane
-DiscountStillRemaining=Preostali popusti
-DiscountAlreadyCounted=Već uračunati popusti
+DiscountStillRemaining=Discounts available
+DiscountAlreadyCounted=Discounts already consumed
 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.
@@ -333,6 +336,8 @@ 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
 # PaymentConditions
 Statut=Status
 PaymentConditionShortRECEP=Due Upon Receipt
@@ -351,6 +356,14 @@ PaymentConditionShortPT_ORDER=Order
 PaymentConditionPT_ORDER=Na narudžbi
 PaymentConditionShortPT_5050=50-50
 PaymentConditionPT_5050=50%% unaprijed, 50%% na isporuci
+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
 FixAmount=Fiksni iznos
 VarAmount=Varijabilni iznos (%% tot.)
 # PaymentType
@@ -420,7 +433,7 @@ ChequeDeposits=Depoziti čekova
 Cheques=Čekovi
 DepositId=Id deposit
 NbCheque=Number of checks
-CreditNoteConvertedIntoDiscount=Ta dobropis ali avansni račun je bil spremenjen v %s
+CreditNoteConvertedIntoDiscount=This %s has been converted into %s
 UsBillingContactAsIncoiveRecipientIfExist=Za pošiljanje računa uporabi naslov kontakta za račune pri kupcu namesto naslova partnerja
 ShowUnpaidAll=Prikaži sve neplaćene fakture
 ShowUnpaidLateOnly=Prikaži samo zakašnjele neplaćene fakture
diff --git a/htdocs/langs/bs_BA/boxes.lang b/htdocs/langs/bs_BA/boxes.lang
index 223f383bb2e..bc83ee5c55c 100644
--- a/htdocs/langs/bs_BA/boxes.lang
+++ b/htdocs/langs/bs_BA/boxes.lang
@@ -25,8 +25,8 @@ BoxTitleLastSuppliers=Latest %s recorded suppliers
 BoxTitleLastModifiedSuppliers=Latest %s modified suppliers
 BoxTitleLastModifiedCustomers=Latest %s modified customers
 BoxTitleLastCustomersOrProspects=Latest %s customers or prospects
-BoxTitleLastCustomerBills=Latest %s customer's invoices
-BoxTitleLastSupplierBills=Latest %s supplier's invoices
+BoxTitleLastCustomerBills=Latest %s customer invoices
+BoxTitleLastSupplierBills=Latest %s supplier invoices
 BoxTitleLastModifiedProspects=Latest %s modified prospects
 BoxTitleLastModifiedMembers=Latest %s members
 BoxTitleLastFicheInter=Latest %s modified interventions
@@ -51,12 +51,12 @@ ClickToAdd=Klikni ovdje za dodavanje.
 NoRecordedCustomers=Nema zapisanih kupaca
 NoRecordedContacts=Nema zapisanih kontakata
 NoActionsToDo=Nema akcija za uraditi
-NoRecordedOrders=Nema zapisanih narudži kupca
+NoRecordedOrders=No recorded customer orders
 NoRecordedProposals=Nema zapisanih prijedloga
-NoRecordedInvoices=Nema zapisanih faktura kupca
-NoUnpaidCustomerBills=Nema neplaćenih faktura kupca
-NoUnpaidSupplierBills= Nema neplaćenih faktura dobavljača
-NoModifiedSupplierBills=Nema zapisanih faktura dobavljača
+NoRecordedInvoices=No recorded customer invoices
+NoUnpaidCustomerBills=No unpaid customer invoices
+NoUnpaidSupplierBills=No unpaid supplier invoices
+NoModifiedSupplierBills=No recorded supplier invoices
 NoRecordedProducts=Nema zapisanih proizvoda/usluga
 NoRecordedProspects=No recorded prospects
 NoContractedProducts=Nema ugovorenih proizvoda/usluga
diff --git a/htdocs/langs/bs_BA/companies.lang b/htdocs/langs/bs_BA/companies.lang
index 74fcd43d792..51d727d5f08 100644
--- a/htdocs/langs/bs_BA/companies.lang
+++ b/htdocs/langs/bs_BA/companies.lang
@@ -81,6 +81,7 @@ PaymentBankAccount=Payment bank account
 OverAllProposals=Total proposals
 OverAllOrders=Total orders
 OverAllInvoices=Total invoices
+OverAllSupplierProposals=Total price requests
 ##### Local Taxes #####
 LocalTax1IsUsed=Use second tax
 LocalTax1IsUsedES= RE is used
@@ -389,7 +390,7 @@ ListCustomersShort=Lista kupaca
 ThirdPartiesArea=Third parties and contact area
 LastModifiedThirdParties=Latest %s modified third parties
 UniqueThirdParties=Ukupno unikatnih subjekata
-InActivity=Otvori
+InActivity=Otvoreno
 ActivityCeased=Zatvoreno
 ThirdPartyIsClosed=Third party is closed
 ProductsIntoElements=List of products/services into %s
@@ -404,7 +405,7 @@ MergeThirdparties=Merge third parties
 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 so you will be able to delete the duplicate one.
 ThirdpartiesMergeSuccess=Thirdparties have been merged
 SaleRepresentativeLogin=Login of sales representative
-SaleRepresentativeFirstname=Firstname of sales representative
-SaleRepresentativeLastname=Lastname of sales representative
+SaleRepresentativeFirstname=First name of sales representative
+SaleRepresentativeLastname=Last name of sales representative
 ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
 NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/bs_BA/compta.lang b/htdocs/langs/bs_BA/compta.lang
index 07c62d22712..19498b768dc 100644
--- a/htdocs/langs/bs_BA/compta.lang
+++ b/htdocs/langs/bs_BA/compta.lang
@@ -65,6 +65,7 @@ PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=VAT payment
 ListPayment=List of payments
 ListOfCustomerPayments=List of customer payments
+ListOfSupplierPayments=List of supplier payments
 DateStartPeriod=Date start period
 DateEndPeriod=Date end period
 newLT1Payment=New tax 2 payment
@@ -81,7 +82,7 @@ LT2PaymentES=IRPF Payment
 LT2PaymentsES=IRPF Payments
 VATPayment=Sales tax payment
 VATPayments=Sales tax payments
-VATRefund=Sales tax refund Refund
+VATRefund=Sales tax refund
 Refund=Refund
 SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Show VAT payment
diff --git a/htdocs/langs/bs_BA/cron.lang b/htdocs/langs/bs_BA/cron.lang
index b075c2cb8bd..1ca2bee6c19 100644
--- a/htdocs/langs/bs_BA/cron.lang
+++ b/htdocs/langs/bs_BA/cron.lang
@@ -17,14 +17,14 @@ CronMethodDoesNotExists=Class %s does not contains any method %s
 # Menu
 EnabledAndDisabled=Enabled and disabled
 # Page list
-CronLastOutput=Izvještaj o zadnjem pokretanju
-CronLastResult=Šifra rezultat zadnjeg pokretanja
+CronLastOutput=Latest run output
+CronLastResult=Latest result code
 CronCommand=Komanda
 CronList=Scheduled jobs
 CronDelete=Delete scheduled jobs
-CronConfirmDelete=Are you sure you want to delete these scheduled jobs ?
+CronConfirmDelete=Are you sure you want to delete these scheduled jobs?
 CronExecute=Launch scheduled job
-CronConfirmExecute=Are you sure you want to execute these scheduled jobs now ?
+CronConfirmExecute=Are you sure you want to execute these scheduled jobs now?
 CronInfo=Scheduled job module allow to execute job that have been planned
 CronTask=Job
 CronNone=Ništa
@@ -54,7 +54,7 @@ CronNote=Komentar
 CronFieldMandatory=Polja %s su obavezna
 CronErrEndDateStartDt=Datum završetka ne može biti prije datuma početka
 CronStatusActiveBtn=Enable
-CronStatusInactiveBtn=Disable
+CronStatusInactiveBtn=Iskljući
 CronTaskInactive=This job is disabled
 CronId=ID
 CronClassFile=Classes (filename.class.php)
@@ -65,7 +65,7 @@ CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of
 CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
 CronCommandHelp=Sistemska komanda za izvršenje
 CronCreateJob=Create new Scheduled Job
-CronFrom=From
+CronFrom=Od
 # Info
 # Common
 CronType=Job type
diff --git a/htdocs/langs/bs_BA/errors.lang b/htdocs/langs/bs_BA/errors.lang
index 09f0fe8f67f..0a339accbc8 100644
--- a/htdocs/langs/bs_BA/errors.lang
+++ b/htdocs/langs/bs_BA/errors.lang
@@ -11,6 +11,7 @@ ErrorLoginAlreadyExists=Login %s already exists.
 ErrorGroupAlreadyExists=Group %s already exists.
 ErrorRecordNotFound=Record not found.
 ErrorFailToCopyFile=Failed to copy file '<b>%s</b>' into '<b>%s</b>'.
+ErrorFailToCopyDir=Failed to copy directory '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToRenameFile=Failed to rename file '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToDeleteFile=Failed to remove file '<b>%s</b>'.
 ErrorFailToCreateFile=Failed to create file '<b>%s</b>'.
@@ -115,7 +116,7 @@ ErrorNoActivatedBarcode=No barcode type activated
 ErrUnzipFails=Failed to unzip %s with ZipArchive
 ErrNoZipEngine=No engine to unzip %s file in this PHP
 ErrorFileMustBeADolibarrPackage=The file %s must be a Dolibarr zip package
-ErrorFileRequired=It takes a package Dolibarr file
+ErrorModuleFileRequired=You must select a Dolibarr module package file
 ErrorPhpCurlNotInstalled=The PHP CURL is not installed, this is essential to talk with 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
@@ -181,6 +182,8 @@ ErrorBankStatementNameMustFollowRegex=Error, bank statement name must follow the
 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>
 
 # 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.
diff --git a/htdocs/langs/bs_BA/holiday.lang b/htdocs/langs/bs_BA/holiday.lang
index edaf47d9f0c..a3a406d8cb1 100644
--- a/htdocs/langs/bs_BA/holiday.lang
+++ b/htdocs/langs/bs_BA/holiday.lang
@@ -76,8 +76,8 @@ BoxTitleLastLeaveRequests=Latest %s modified leave requests
 HolidaysMonthlyUpdate=Mjesečno ažuriranje
 ManualUpdate=Ručno ažuriranje
 HolidaysCancelation=Leave request cancelation
-EmployeeLastname=Employee lastname
-EmployeeFirstname=Employee firstname
+EmployeeLastname=Employee last name
+EmployeeFirstname=Employee first name
 TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
 
 ## Configuration du Module ##
diff --git a/htdocs/langs/bs_BA/ldap.lang b/htdocs/langs/bs_BA/ldap.lang
index 63edec03342..4dc208d56a8 100644
--- a/htdocs/langs/bs_BA/ldap.lang
+++ b/htdocs/langs/bs_BA/ldap.lang
@@ -13,8 +13,8 @@ LDAPUsers=Users in LDAP database
 LDAPFieldStatus=Status
 LDAPFieldFirstSubscriptionDate=First subscription date
 LDAPFieldFirstSubscriptionAmount=First subscription amount
-LDAPFieldLastSubscriptionDate=Last subscription date
-LDAPFieldLastSubscriptionAmount=Last subscription amount
+LDAPFieldLastSubscriptionDate=Latest subscription date
+LDAPFieldLastSubscriptionAmount=Latest subscription amount
 LDAPFieldSkype=Skype id
 LDAPFieldSkypeExample=Example : skypeName
 UserSynchronized=User synchronized
diff --git a/htdocs/langs/bs_BA/mails.lang b/htdocs/langs/bs_BA/mails.lang
index 8dfbbf82714..b66f78f86dc 100644
--- a/htdocs/langs/bs_BA/mails.lang
+++ b/htdocs/langs/bs_BA/mails.lang
@@ -74,14 +74,18 @@ ResultOfMailSending=Result of mass EMail sending
 NbSelected=Nb selected
 NbIgnored=Nb ignored
 NbSent=Nb sent
-ContactsWithThirdpartyFilter=Contact with customer filters
+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
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Linija %s u fajlu
 RecipientSelectionModules=Definisani zahtjevi za odabir primaoca
 MailSelectedRecipients=Odabrani primaoci
 MailingArea=Područje za e-poštu
-LastMailings=Zadnjih %s e-pošta
+LastMailings=Latest %s emailings
 TargetsStatistics=Mete statistike
 NbOfCompaniesContacts=Jedinstveni kontakti/adrese
 MailNoChangePossible=Primaoci za potvrđenu e-poštu ne mogu biti promijenjeni
@@ -146,3 +150,6 @@ AdvTgtCreateFilter=Create filter
 AdvTgtOrCreateNewFilter=Name of new filter
 NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
+OutGoingEmailSetup=Outgoing email setup
+InGoingEmailSetup=Incoming email setup
+
diff --git a/htdocs/langs/bs_BA/main.lang b/htdocs/langs/bs_BA/main.lang
index 2965f1d72a6..a1bd9e2489c 100644
--- a/htdocs/langs/bs_BA/main.lang
+++ b/htdocs/langs/bs_BA/main.lang
@@ -69,6 +69,7 @@ SetDate=Postavi datum
 SelectDate=Odaberi datum
 SeeAlso=See also %s
 SeeHere=See here
+Apply=Primijeniti
 BackgroundColorByDefault=Default background color
 FileRenamed=The file was successfully renamed
 FileUploaded=The file was successfully uploaded
@@ -87,7 +88,7 @@ Undefined=Undefined
 PasswordForgotten=Password forgotten?
 SeeAbove=See above
 HomeArea=Home area
-LastConnexion=Last connection
+LastConnexion=Latest connection
 PreviousConnexion=Previous connection
 PreviousValue=Previous value
 ConnectedOnMultiCompany=Connected on environment
@@ -237,7 +238,7 @@ DateCreation=Datum kreiranja
 DateCreationShort=Creat. date
 DateModification=Modification date
 DateModificationShort=Modif. date
-DateLastModification=Last modification date
+DateLastModification=Latest modification date
 DateValidation=Validation date
 DateClosing=Closing date
 DateDue=Due date
@@ -433,7 +434,7 @@ Reportings=Reporting
 Draft=Nacrt
 Drafts=Drafts
 Validated=Potvrđeno
-Opened=Otvori
+Opened=Otvoreno
 New=New
 Discount=Popust
 Unknown=Nepoznat potencijal
@@ -599,6 +600,8 @@ SessionName=Session name
 Method=Metoda
 Receive=Receive
 CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
+ExpectedValue=Expected Value
+CurrentValue=Current value
 PartialWoman=Partial
 TotalWoman=Total
 NeverReceived=Never received
@@ -756,6 +759,7 @@ SomeTranslationAreUncomplete=Some languages may be partially translated or may c
 DirectDownloadLink=Direct download link
 Download=Download
 ActualizeCurrency=Update currency rate
+Fiscalyear=Fiscal year
 # Week day
 Monday=Monday
 Tuesday=Tuesday
@@ -812,3 +816,5 @@ SearchIntoContracts=Ugovori
 SearchIntoCustomerShipments=Customer shipments
 SearchIntoExpenseReports=Expense reports
 SearchIntoLeaves=Leaves
+
+BulkActions=Bulk actions
diff --git a/htdocs/langs/bs_BA/members.lang b/htdocs/langs/bs_BA/members.lang
index 3fc9c8ff958..09062a7534f 100644
--- a/htdocs/langs/bs_BA/members.lang
+++ b/htdocs/langs/bs_BA/members.lang
@@ -136,8 +136,8 @@ DocForAllMembersCards=Generate business cards for all members
 DocForOneMemberCards=Generate business cards for a particular member
 DocForLabels=Generate address sheets
 SubscriptionPayment=Subscription payment
-LastSubscriptionDate=Last subscription date
-LastSubscriptionAmount=Last subscription amount
+LastSubscriptionDate=Latest subscription date
+LastSubscriptionAmount=Latest subscription amount
 MembersStatisticsByCountries=Members statistics by country
 MembersStatisticsByState=Members statistics by state/province
 MembersStatisticsByTown=Members statistics by town
@@ -149,7 +149,7 @@ MembersByStateDesc=This screen show you statistics on members by state/provinces
 MembersByTownDesc=This screen show you statistics on members by town.
 MembersStatisticsDesc=Choose statistics you want to read...
 MenuMembersStats=Statistika
-LastMemberDate=Last member date
+LastMemberDate=Latest member date
 Nature=Nature
 Public=Information are public
 NewMemberbyWeb=New member added. Awaiting approval
diff --git a/htdocs/langs/bs_BA/orders.lang b/htdocs/langs/bs_BA/orders.lang
index 0b30eeaf9c7..8b7b56f7a31 100644
--- a/htdocs/langs/bs_BA/orders.lang
+++ b/htdocs/langs/bs_BA/orders.lang
@@ -39,7 +39,7 @@ StatusOrderRefusedShort=Odbijen
 StatusOrderBilledShort=Fakturisano
 StatusOrderToProcessShort=Za obradu
 StatusOrderReceivedPartiallyShort=Partially received
-StatusOrderReceivedAllShort=Everything received
+StatusOrderReceivedAllShort=Products received
 StatusOrderCanceled=Otkazan
 StatusOrderDraft=Uzorak (Potrebna je potvrda)
 StatusOrderValidated=Potvrđeno
@@ -51,7 +51,7 @@ StatusOrderApproved=Odobreno
 StatusOrderRefused=Odbijen
 StatusOrderBilled=Fakturisano
 StatusOrderReceivedPartially=Partially received
-StatusOrderReceivedAll=Everything received
+StatusOrderReceivedAll=All products received
 ShippingExist=A shipment exists
 QtyOrdered=Naručena količina
 ProductQtyInDraft=Product quantity into draft orders
diff --git a/htdocs/langs/bs_BA/other.lang b/htdocs/langs/bs_BA/other.lang
index 8d66435b876..9f09e215d8f 100644
--- a/htdocs/langs/bs_BA/other.lang
+++ b/htdocs/langs/bs_BA/other.lang
@@ -68,14 +68,15 @@ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find her
 PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nYou will find here the shipping __SHIPPINGREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nYou will find here the intervention __FICHINTERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n__PERSONALIZED__\n\n__SIGNATURE__
-DemoDesc=Dolibarr is a compact ERP/CRM supporting several functional modules. A demo showcasing all modules makes no sense as this scenario never occurs. So, several demo profiles are available.
+DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
+ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
 DemoFundation=Manage members of a foundation
 DemoFundation2=Manage members and bank account of a foundation
-DemoCompanyServiceOnly=Manage a freelance activity selling service only
+DemoCompanyServiceOnly=Company or freelance selling service only
 DemoCompanyShopWithCashDesk=Manage a shop with a cash desk
-DemoCompanyProductAndStocks=Manage a small or medium company selling products
-DemoCompanyAll=Manage a small or medium company with multiple activities (all main modules)
+DemoCompanyProductAndStocks=Company selling products with a shop
+DemoCompanyAll=Company with multiple activities (all main modules)
 CreatedBy=Created by %s
 ModifiedBy=Modified by %s
 ValidatedBy=Validated by %s
diff --git a/htdocs/langs/bs_BA/products.lang b/htdocs/langs/bs_BA/products.lang
index 3a5fda45cb7..3b908572021 100644
--- a/htdocs/langs/bs_BA/products.lang
+++ b/htdocs/langs/bs_BA/products.lang
@@ -60,7 +60,7 @@ SellingPrice=Selling price
 SellingPriceHT=Selling price (net of tax)
 SellingPriceTTC=Selling price (inc. tax)
 CostPriceDescription=This price (net of tax) can be used to store the average amount this product cost to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
-CostPriceUsage=In a future version, this value could be used for margin calculation.
+CostPriceUsage=This value could be used for margin calculation.
 SoldAmount=Sold amount
 PurchasedAmount=Purchased amount
 NewPrice=New price
@@ -142,6 +142,7 @@ ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b>?
 CloneContentProduct=Clone all main informations of product/service
 ClonePricesProduct=Clone main informations and prices
 CloneCompositionProduct=Clone packaged product/service
+CloneCombinationsProduct=Clone product variants
 ProductIsUsed=This product is used
 NewRefForClone=Ref. of new product/service
 SellingPrices=Selling prices
@@ -238,7 +239,7 @@ GlobalVariables=Global variables
 VariableToUpdate=Variable to update
 GlobalVariableUpdaters=Global variable updaters
 UpdateInterval=Update interval (minutes)
-LastUpdated=Last updated
+LastUpdated=Latest update
 CorrectlyUpdated=Correctly updated
 PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
 PropalMergePdfProductChooseFile=Select PDF files
@@ -258,4 +259,41 @@ VolumeUnits=Volume unit
 SizeUnits=Size unit
 DeleteProductBuyPrice=Delete buying price
 ConfirmDeleteProductBuyPrice=Are you sure you want to delete this buying price?
+SubProduct=Sub product
 
+#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
+ProductCombinations=Variants
+HideProductCombinations=Hide products variant in the products selector
+ProductCombination=Variant
+NewProductCombination=New variant
+EditProductCombination=Editing variant
+ProductCombinationGenerator=Variants generator
+Features=Features
+PriceImpact=Price impact
+WeightImpact=Weight impact
+NewProductAttribute=New attribute
+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
+PercentageVariation=Percentage variation
+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 child products
+ConfirmCloneProductCombinations=Would you like to copy all the product variant to the 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
diff --git a/htdocs/langs/bs_BA/projects.lang b/htdocs/langs/bs_BA/projects.lang
index 83d263a261f..446d268919a 100644
--- a/htdocs/langs/bs_BA/projects.lang
+++ b/htdocs/langs/bs_BA/projects.lang
@@ -29,9 +29,9 @@ DeleteAProject=Obisati projekat
 DeleteATask=Obrisati zadatak
 ConfirmDeleteAProject=Are you sure you want to delete this project?
 ConfirmDeleteATask=Are you sure you want to delete this task?
-OpenedProjects=Open projects
-OpenedTasks=Open tasks
-OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
+OpenedProjects=Opened projects
+OpenedTasks=Opened tasks
+OpportunitiesStatusForOpenedProjects=Opportunities amount of opened projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=Prikaži projekt
 SetProject=Postavi projekat
@@ -47,7 +47,7 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=Korisnik
 TaskTimeNote=Note
 TaskTimeDate=Date
-TasksOnOpenedProject=Tasks on open projects
+TasksOnOpenedProject=Tasks on opened projects
 WorkloadNotDefined=Workload not defined
 NewTimeSpent=Nova provedeno vrijeme
 MyTimeSpent=Moje provedeno vrijeme
@@ -96,6 +96,7 @@ ValidateProject=Potvrdi projekat
 ConfirmValidateProject=Are you sure you want to validate this project?
 CloseAProject=Zatvori projekta
 ConfirmCloseAProject=Are you sure you want to close this project?
+AlsoCloseAProject=Also close project (keep it open if you still need to follow production tasks on it)
 ReOpenAProject=Otvori projekat
 ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=Kontakti projekta
@@ -121,7 +122,7 @@ CloneProjectFiles=Clone project joined files
 CloneTaskFiles=Clone task(s) joined files (if task(s) cloned)
 CloneMoveDate=Update project/tasks dates from now?
 ConfirmCloneProject=Are you sure to clone this project?
-ProjectReportDate=Change task date according project start date
+ProjectReportDate=Change task dates according to new project start date
 ErrorShiftTaskDate=Impossible to shift task date according to new project start date
 ProjectsAndTasksLines=Projects and tasks
 ProjectCreatedInDolibarr=Project %s created
@@ -178,9 +179,9 @@ ProjectsStatistics=Statistics on projects/leads
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 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.
-OpenedProjectsByThirdparties=Open projects by thirdparties
+OpenedProjectsByThirdparties=Opened projects by thirdparties
 OnlyOpportunitiesShort=Only opportunities
-OpenedOpportunitiesShort=Open opportunities
+OpenedOpportunitiesShort=Opened opportunities
 NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount
diff --git a/htdocs/langs/bs_BA/propal.lang b/htdocs/langs/bs_BA/propal.lang
index 2f9e8ad2355..a46228a3fb6 100644
--- a/htdocs/langs/bs_BA/propal.lang
+++ b/htdocs/langs/bs_BA/propal.lang
@@ -3,7 +3,7 @@ Proposals=Poslovni prijedlozi
 Proposal=Poslovni prijedlog
 ProposalShort=Prijedlog
 ProposalsDraft=Nacrti poslovnih prijedloga
-ProposalsOpened=Open commercial proposals
+ProposalsOpened=Otvoreni poslovni prijedlozi
 Prop=Poslovni prijedlozi
 CommercialProposal=Poslovni prijedlog
 ProposalCard=Kartica prijedloga
@@ -26,9 +26,9 @@ AmountOfProposalsByMonthHT=Amount by month (net of tax)
 NbOfProposals=Broj poslovnih prijedloga
 ShowPropal=Show proposal
 PropalsDraft=Drafts
-PropalsOpened=Otvori
+PropalsOpened=Otvoreno
 PropalStatusDraft=Uzorak (Potrebna je potvrda)
-PropalStatusValidated=Validated (proposal is open)
+PropalStatusValidated=Validated (proposal is opened)
 PropalStatusSigned=Signed (needs billing)
 PropalStatusNotSigned=Not signed (closed)
 PropalStatusBilled=Fakturisano
diff --git a/htdocs/langs/bs_BA/stocks.lang b/htdocs/langs/bs_BA/stocks.lang
index c17f32ff86d..3418e86532e 100644
--- a/htdocs/langs/bs_BA/stocks.lang
+++ b/htdocs/langs/bs_BA/stocks.lang
@@ -22,13 +22,15 @@ Movements=Kretanja
 ErrorWarehouseRefRequired=Referentno ime skladište je potrebno
 ListOfWarehouses=Lista skladišta
 ListOfStockMovements=Lista kretanja zaliha
+StockMovementForId=Movement ID %d
+ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Warehouses area
 Location=Lokacija
 LocationSummary=Skraćeni naziv lokacije
 NumberOfDifferentProducts=Broj različitih proizvoda
 NumberOfProducts=Ukupan broj proizvoda
-LastMovement=Zadnje kretanje
-LastMovements=Zadnja kretanja
+LastMovement=Latest movement
+LastMovements=Latest movements
 Units=Jedinice
 Unit=Jedinica
 StockCorrection=Ispravi zalihu
diff --git a/htdocs/langs/bs_BA/supplier_proposal.lang b/htdocs/langs/bs_BA/supplier_proposal.lang
index 69cd8bbcdbf..fac46908d08 100644
--- a/htdocs/langs/bs_BA/supplier_proposal.lang
+++ b/htdocs/langs/bs_BA/supplier_proposal.lang
@@ -8,7 +8,7 @@ SearchRequest=Find a request
 DraftRequests=Draft requests
 SupplierProposalsDraft=Draft supplier proposals
 LastModifiedRequests=Latest %s modified price requests
-RequestsOpened=Open price requests
+RequestsOpened=Opened price requests
 SupplierProposalArea=Supplier proposals area
 SupplierProposalShort=Supplier proposal
 SupplierProposals=Supplier proposals
@@ -23,7 +23,7 @@ ConfirmValidateAsk=Are you sure you want to validate this price request under na
 DeleteAsk=Delete request
 ValidateAsk=Validate request
 SupplierProposalStatusDraft=Uzorak (Potrebna je potvrda)
-SupplierProposalStatusValidated=Validated (request is open)
+SupplierProposalStatusValidated=Validated (request is opened)
 SupplierProposalStatusClosed=Zatvoreno
 SupplierProposalStatusSigned=Accepted
 SupplierProposalStatusNotSigned=Odbijen
diff --git a/htdocs/langs/bs_BA/suppliers.lang b/htdocs/langs/bs_BA/suppliers.lang
index 12ca6c6af1b..42c63efe327 100644
--- a/htdocs/langs/bs_BA/suppliers.lang
+++ b/htdocs/langs/bs_BA/suppliers.lang
@@ -9,7 +9,7 @@ ShowSupplier=Prikaži dobavljača
 OrderDate=Datum narudžbe
 BuyingPriceMin=Best buying price
 BuyingPriceMinShort=Best buying price
-TotalBuyingPriceMinShort=Total of subproducts buying prices
+TotalBuyingPriceMinShort=Ukupan iznos za kupovne cijene podproizvoda
 TotalSellingPriceMinShort=Total of subproducts selling prices
 SomeSubProductHaveNoPrices=Neki podproizvodi nemaju definisanu cijenu
 AddSupplierPrice=Add buying price
@@ -24,10 +24,10 @@ ExportDataset_fournisseur_1=Lista faktura dobavljača i tekstovi faktura
 ExportDataset_fournisseur_2=Fakture i plačanja dobavljača
 ExportDataset_fournisseur_3=Narudžbe za dobavljača i tekst narudžbe
 ApproveThisOrder=Odobri ovu narudžbu
-ConfirmApproveThisOrder=Jeste li sigurni da želite da odobriti narudžbu <b>%s</b> ?
+ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b>?
 DenyingThisOrder=Deny this order
-ConfirmDenyingThisOrder=Jeste li sigurni da želite odbiti narudžbu <b>%s</b> ?
-ConfirmCancelThisOrder=Jeste li sigurni da želite poništiti narudžbu <b>%s</b> ?
+ConfirmDenyingThisOrder=Are you sure you want to deny this order <b>%s</b>?
+ConfirmCancelThisOrder=Are you sure you want to cancel this order <b>%s</b>?
 AddSupplierOrder=Kreiraj narudžbu za dobavljača
 AddSupplierInvoice=Kreiraj fakturu za dobavljača
 ListOfSupplierProductForSupplier=Lista proizvoda i cijena za dobavljača <b>%s</b>
@@ -41,3 +41,4 @@ DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Wrong quality
 ReputationForThisProduct=Reputation
 BuyerName=Buyer name
+AllProductServicePrices=All product / service prices
diff --git a/htdocs/langs/bs_BA/users.lang b/htdocs/langs/bs_BA/users.lang
index c2a3d324d71..be3fdad87ae 100644
--- a/htdocs/langs/bs_BA/users.lang
+++ b/htdocs/langs/bs_BA/users.lang
@@ -36,7 +36,7 @@ AdministratorDesc=Administrator
 DefaultRights=Defaultne dozvole
 DefaultRightsDesc=Definišite ovdje <u>defaultne</u> dozvole koje se automatski odobravaju <u>novokreiranom</u> korisniku (Otiđite na karticdu korisnika za mijenjanje dozvola postojećeg korisnika).
 DolibarrUsers=Dolibarr korisnici
-LastName=Last Name
+LastName=Prezime
 FirstName=Ime
 ListOfGroups=Lista grupa
 NewGroup=Nova grupa
diff --git a/htdocs/langs/bs_BA/withdrawals.lang b/htdocs/langs/bs_BA/withdrawals.lang
index cc5dd70251b..c5e535030f7 100644
--- a/htdocs/langs/bs_BA/withdrawals.lang
+++ b/htdocs/langs/bs_BA/withdrawals.lang
@@ -24,6 +24,7 @@ WithdrawStatistics=Direct debit payment statistics
 WithdrawRejectStatistics=Direct debit payment reject statistics
 LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
+WithdrawRequestsDone=%s direct debit payment requests recorded
 ThirdPartyBankCode=Third party bank code
 NoInvoiceCouldBeWithdrawed=Nihje faktura nije podignuta sa uspjehom. Provjerite da li su fakture na kompanijama sa važećim BAN.
 ClassCredited=Označi na potraživanja
@@ -76,8 +77,8 @@ RUM=UMR
 RUMLong=Unique Mandate Reference
 RUMWillBeGenerated=UMR number will be generated once bank account information are saved
 WithdrawMode=Direct debit mode (FRST or RECUR)
-WithdrawRequestAmount=Withdraw request amount:
-WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil amount.
+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
diff --git a/htdocs/langs/ca_ES/accountancy.lang b/htdocs/langs/ca_ES/accountancy.lang
index 2f01cce9a84..dd7d83bd840 100644
--- a/htdocs/langs/ca_ES/accountancy.lang
+++ b/htdocs/langs/ca_ES/accountancy.lang
@@ -194,6 +194,8 @@ ChangeBinding=Canvia la comptabilització
 
 ## Admin
 ApplyMassCategories=Aplica categories massives
+AddAccountFromBookKeepingWithNoCategories=Add acccount already used with no categories
+CategoryDeleted=Category for the accounting account has been removed
 
 ## Export
 Exports=Exportacions
@@ -209,6 +211,7 @@ Modelcsv_ciel=Exporta cap a Sage Ciel Compta o Compta Evolution
 Modelcsv_quadratus=Exporta cap a Quadratus QuadraCompta
 Modelcsv_ebp=Exporta cap a EBP
 Modelcsv_cogilog=Exporta cap a Cogilog
+ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
 InitAccountancy=Inicialitza la comptabilitat
diff --git a/htdocs/langs/ca_ES/admin.lang b/htdocs/langs/ca_ES/admin.lang
index 29fd267c189..0e425f1840d 100644
--- a/htdocs/langs/ca_ES/admin.lang
+++ b/htdocs/langs/ca_ES/admin.lang
@@ -9,17 +9,20 @@ VersionDevelopment=Desenvolupament
 VersionUnknown=Desconeguda
 VersionRecommanded=Recomanada
 FileCheck=Comprovador de integritat de arxius
-FileCheckDesc=Aquesta eina li permet comprovar la integritat dels fitxers de l'aplicació, comparant cada arxiu amb els oficials. Es pot utilitzar aquesta eina per detectar si alguns arxius van ser modificats per un hacker per exemple.
-FileIntegrityIsStrictlyConformedWithReference=Files integrity is strictly conformed with the reference.
-FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified of removed.
+FileCheckDesc=This tool allows you to check the integrity of files and setup of your application, comparing each files with the official ones. 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.
+FileIntegrityIsStrictlyConformedWithReference=La integritat dels arxius està estrictament conforme amb la referència.
+FileIntegrityIsOkButFilesWereAdded=Files integrity check has passed, however some new files were added.
+FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified, removed or added.
 GlobalChecksum=Checksum global
 MakeIntegrityAnalysisFrom=Fer anàlisi de la integritat dels arxius de l'aplicació de
 LocalSignature=Firma local incrustada (menys fiables)
 RemoteSignature=Firma remota (més segura)
 FilesMissing=Arxius que falten
 FilesUpdated=Arxius actualitzats
+FilesModified=Fitxers modificats
+FilesAdded=Fitxers afegits
 FileCheckDolibarr=Comprovar l'integritat dels arxius de l'aplicació
-AvailableOnlyOnPackagedVersions=L'arxiu local per a la comprovació d'integritat només està disponible quan l'aplicació s'instal·la des d'un paquet certificat
+AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from an official package
 XmlNotFound=No es troba l'arxiu xml
 SessionId=ID de sessió
 SessionSaveHandler=Modalitat de desar sessions
@@ -188,7 +191,9 @@ BoxesDesc=Els panells són components que mostren alguna informació que pots af
 OnlyActiveElementsAreShown=Només els elements de <a href="%s"> mòduls activats</a> són mostrats
 ModulesDesc=Els mòduls Dolibarr defineixen les funcionalitats disponibles en l'aplicació. Alguns mòduls requereixen permisos que hauràs d'indicar, i després habilitar el mòdul. Fes clic en el botó On/off per habilitar un mòdul/funcionalitat.
 ModulesMarketPlaceDesc=Pots trobar més mòduls per descarregar en pàgines web externes per internet...
-ModulesMarketPlaces=Més mòduls...
+ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
+ModulesMarketPlaces=Busca mòduls externs...
+GoModuleSetupArea=To deploy/install a new module, go onto the Module setup area at <a href="%s">%s</a>.
 DoliStoreDesc=DoliStore, el lloc oficial de mòduls complementaris per Dolibarr ERP / CRM
 DoliPartnersDesc=Llista d'empreses que proporcionen desenvolupament a mida de mòduls o funcionalitats (Nota: qualsevol empresa amb experiència amb programació PHP pot proporcionar desenvolupament a mida per un projecte de codi obert)
 WebSiteDesc=Llocs web de referència per trobar més mòduls...
@@ -280,20 +285,21 @@ MenuHandlers=Gestors de menú
 MenuAdmin=Editor de menú
 DoNotUseInProduction=No utilitzar en producció
 ThisIsProcessToFollow=Aquests són els passos per al procés:
-ThisIsAlternativeProcessToFollow=Aquesta es una configuració alternativa per processar:
+ThisIsAlternativeProcessToFollow=This is an alternative setup to process manually:
 StepNb=Pas %s
 FindPackageFromWebSite=Cercar el paquet que respon a la seva necessitat (per exemple en el lloc web %s)
 DownloadPackageFromWebSite=Descarrega el paquet (per exemple del lloc web oficial %s).
-UnpackPackageInDolibarrRoot=Descomprimir el paquet en el directori Dolibarr dedicat als móduls externs: <b>%s</b>
-SetupIsReadyForUse=La instal·lació ha finalitzat i Dolibarr està disponible amb el nou component.
-NotExistsDirect=No existeix el directori alternatiu.<br>
-InfDirAlt=Des de la versió 3 és possible definir un directori root alternatiu, això li permet emmagatzemar en el mateix lloc mòduls i temes personalitzades.<br>Només cal crear un directori en l'arrel de Dolibarr (per exemple: custom).<br>
-InfDirExample=<br>Seguidament es declara a l'arxiu conf.php:<br> $dolibarr_main_url_root_alt='http://miservidor/custom'<br>$dolibarr_main_document_root_alt='/directorio/de/dolibarr/htdocs/custom'<br>*Aquestes línies venen comentades amb un "#", per descomentar-les només cal retirar el caràcter.
+UnpackPackageInDolibarrRoot=Descomprimeix els fitxers empaquetats en en el directori del servidor dedicat a Dolibarr: <b>%s</b>
+UnpackPackageInModulesRoot=To deploy/install an external module, unpack the packaged files into the server directory dedicated to modules: <b>%s</b>
+SetupIsReadyForUse=Module deployment is finished. You must however enable and setup the module in your application by going on the page to setup modules: <a href="%s">%s</a>.
+NotExistsDirect=The alternative root directory is not defined to an existing directory.<br>
+InfDirAlt=Since version 3, it is possible to define an alternative root directory. This allows you to store, into a dedicated directory, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
+InfDirExample=<br>Then declare it in the file <strong>conf.php</strong><br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>If these lines are commented with "#", to enable them, just uncomment by removing the "#" character.
 YouCanSubmitFile=Per aquest pas, pots enviar el paquet utilitzant aquesta utilitat: Selecciona el fitxer del mòdul
 CurrentVersion=Versió actual de Dolibarr
 CallUpdatePage=Ves a la pàgina que actualitza l'estructura de base de dades i les dades: %s
 LastStableVersion=Última versió estable
-LastActivationDate=Última data d'activació
+LastActivationDate=Data de l'última activació
 UpdateServerOffline=Actualitzacións del servidor fora de línia
 GenericMaskCodes=Podeu introduir qualsevol màscara numèrica. En aquesta màscara, pot utilitzar les següents etiquetes:<br><b>{000000}</b> correspon a un número que s'incrementa en cadascun %s. Introduïu tants zeros com longuitud desitgi mostrar. El comptador es completarà a partir de zeros per l'esquerra per tal de tenir tants zeros com la màscara. <br><b>{000000+000}</b>Igual que l'anterior, amb una compensació corresponent al número a la dreta del signe + s'aplica a partir del primer %s.<br><b>{000000@x}</b>igual que l'anterior, però el comptador es restableix a zero quan s'arriba a x mesos (x entre 1 i 12). Si aquesta opció s'utilitza i x és de 2 o superior, llavors la seqüència {yy}{mm} ó {yyyy}{mm} també és necessària.<br><b>  {dd}  </b> dies (01 a 31).<br><b> {mm}</b> mes (01 a 12).<br><b> {yy} </ b>, <b> {yyyy</ b> ó <b>{y} </b> any en 2, 4 ó 1 xifra.<br>
 GenericMaskCodes2=<b>{cccc}</b> el codi de client de n caràcters<br><b>{cccc000}</b> el codi de client en n caràcters és seguit per un comptador dedicat per al client. Aquest comptador dedicat del client es reinicia al mateix temps que el comptador global.<br><b>{tttt}</b> El codi de tipus de tercer en n caràcters (veure el diccionari de tipus de tercers).<br>
@@ -307,7 +313,7 @@ ServerAvailableOnIPOrPort=Servidor disponible a l'adreça <b>%s</b> al port <b>%
 ServerNotAvailableOnIPOrPort=Servidor no disponible en l'adreça <b>%s</b> al port <b>%s</b>
 DoTestServerAvailability=Provar la connexió amb el servidor
 DoTestSend=Provar enviament
-DoTestSendHTML=Probar enviament HTML
+DoTestSendHTML=Prova l'enviament HTML
 ErrorCantUseRazIfNoYearInMask=Error: no pot utilitzar l'opció @ per reiniciar el comptador cada any si la seqüencia {yy} o {yyyy} no es troba a la mascara
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Error, no es pot usar opció @ si la seqüència (yy) (mm) o (yyyy) (mm) no es troba a la màscara.
 UMask=Paràmetre UMask de nous fitxers en Unix/Linux/BSD.
@@ -345,7 +351,7 @@ PDFAddressForging=Regles de visualització d'adreces
 HideAnyVATInformationOnPDF=Amaga tota la informació relacionada amb l'IVA en els PDF generats
 HideDescOnPDF=Amagar descripció dels productes en la generació dels PDF
 HideRefOnPDF=Amagar referència dels productes en la generació dels PDF
-HideDetailsOnPDF=Oculta 
+HideDetailsOnPDF=Oculta els detalls de les línies de producte en els PDFs generats
 PlaceCustomerAddressToIsoLocation=Utilitza la posició estandard francesa (La Poste) per la posició de l'adreça dels clients
 Library=Llibreria
 UrlGenerationParameters=Seguretat de les URL
@@ -376,11 +382,11 @@ ExtrafieldCheckBox=Casella de verificació
 ExtrafieldRadio=Botó de selecció excloent
 ExtrafieldCheckBoxFromList= Casella de verificació des de taula
 ExtrafieldLink=Enllaç a un objecte
-ExtrafieldParamHelpselect=La llista ha de ser en forma clau, valor<br><br> per exemple : <br>1,text1<br>2,text2<br>3,text3<br>...
+ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list :<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list :<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=La llista ha de ser en forma clau, valor<br><br> per exemple : <br>1,text1<br>2,text2<br>3,text3<br>...
 ExtrafieldParamHelpradio=La llista ha de ser en forma clau, valor<br><br> per exemple : <br>1,text1<br>2,text2<br>3,text3<br>...
-ExtrafieldParamHelpsellist=La llista de paràmetres ve d'una taula<br>Sintaxi : nom_taula:camp_etiqueta:id_camp::filtre<br>Exemple : c_typent:libelle:id::filtre<br><br>filtre pot ser una prova simple (p.ex, active=1) per mostrar només el valor actiu<br>També pots utilitzar $ID$ en filtres que son el ID actual de l'objecte seleccionat<br>Per fer un SELECT en un filtre utilitza $SEL$<br>si vols filtrar camps extra utilitza la sintaxi extra.fieldcode=... (on el codi del camp és el codi del camp extra)<br><br>Per tenir la llista en funció d'un altre:<br>c_typent:libelle:id:parent_list_code|parent_column:filter
-ExtrafieldParamHelpchkbxlst=La llista de paràmetres ve d'una taula<br>Sintaxi : nom_taula:camp_etiqueta:id_camp::filtre<br>Exemple : c_typent:libelle:id::filtre<br><br>filtre pot ser una prova simple (p.ex, active=1) per mostrar només el valor actiu<br>També pots utilitzar $ID$ en filtres que son el ID actual de l'objecte seleccionat<br>Per fer un SELECT en un filtre utilitza $SEL$<br>si vols filtrar camps extra utilitza la sintaxi extra.fieldcode=... (on el codi del camp és el codi del camp extra)<br><br>Per tenir la llista en funció d'un altre:<br>c_typent:libelle:id:parent_list_code|parent_column:filter
+ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Els paràmetres han de ser Nom del Objecte:Url de la Clase<br>Sintàxi: Nom Object:Url Clase<br>Exemple: Societe:societe/class/societe.class.php
 LibraryToBuildPDF=Llibreria utilitzada per generar PDF
 WarningUsingFPDF=Atenció: El seu arxiu <b>conf.php</b> conté la directiva <b>dolibarr_pdf_force_fpdf=1</b>. Això fa que s'usi la llibreria FPDF per generar els seus arxius PDF. Aquesta llibreria és antiga i no cobreix algunes funcionalitats (Unicode, transparència d'imatges, idiomes ciríl · lics, àrabs o asiàtics, etc.), Pel que pot tenir problemes en la generació dels PDF.<br> Per resoldre-ho, i disposar d'un suport complet de PDF, pot descarregar la <a href="http://www.tcpdf.org/" target="_blank"> llibreria TCPDF </a>, i a continuació comentar o eliminar la línia <b>$dolibarr_pdf_force_fpdf=1</b>, i afegir al seu lloc <b>$dolibarr_lib_TCPDF_PATH='ruta_a_TCPDF'</b>
@@ -389,7 +395,7 @@ SMS=SMS
 LinkToTestClickToDial=Introduïu un número de telèfon que voleu marcar per provar l'enllaç de crida ClickToDial per a l'usuari <strong>%s</strong>
 RefreshPhoneLink=Refrescar enllaç
 LinkToTest=Enllaç seleccionable per l'usuari <strong>%s</strong> (feu clic al número per provar)
-KeepEmptyToUseDefault=Deixeu aquest camp buit per usar el valor per defecte
+KeepEmptyToUseDefault=Deixa-ho buit per usar el valor per defecte
 DefaultLink=Enllaç per defecte
 SetAsDefault=Indica'l com Defecte
 ValueOverwrittenByUserSetup=Atenció: Aquest valor pot ser sobreescrit per un valor específic de la configuració de l'usuari (cada usuari pot tenir la seva pròpia url clicktodial)
@@ -414,11 +420,11 @@ ModuleCompanyCodePanicum=Retorna un codi comptable buit.
 ModuleCompanyCodeDigitaria=El codi comptable depèn del codi del tercer. El codi està format pel caràcter 'C' en primera posició seguit dels 5 primers caràcters del codi del tercer.
 Use3StepsApproval=Per defecte, les comandes de compra necessiten ser creades i aprovades per 2 usuaris diferents (el primer pas/usuari és per a crear i un altre pas/usuari per aprovar. Noteu que si un usuari te permisos tant per crear com per aprovar, un sol pas/usuari serà suficient). Amb aquesta opció, tens la possibilitat d'introduir un tercer pas/usuari per a l'aprovació, si l'import es superior a un determinat valor (d'aquesta manera són necessaris 3 passos: 1=validació, 2=primera aprovació i 3=segona aprovació si l'import és suficient).<br>Deixa-ho en blanc si només vols un nivell d'aprovació (2 passos); posa un valor encara que sigui molt baix (0,1) si vols una segona aprovació (3 passos).
 UseDoubleApproval=Utilitza una aprovació en 3 passos quan l'import (sense impostos) sigui més gran que...
-WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<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=ADVERTÈNCIA: Alguns proveïdors de correu electrònic (com Yahoo) no li permeten enviar un correu electrònic des d'un altre servidor que no sigui el servidor de Yahoo si l'adreça de correu electrònic utilitzada com a remitent és el seu correu correu electrònic de Yahoo (com myemail@yahoo.com, myemail@yahoo.fr, ...). La seva configuració actual utilitza el servidor de l'aplicació per enviar correu electrònic, de manera que alguns destinataris (compatibles amb el protocol restrictiu DMARC) li preguntaran a Yahoo si poden acceptar el seu e-mail i Yahoo respondrà "no" perquè el servidor no és un servidor Propietat de Yahoo, pel que alguns dels seus e-mails enviats poden no ser acceptats.<br>Si el proveïdor de correu electrònic (com Yahoo) té aquesta restricció, ha de canviar la configuració de correu electrònic per a triar el mètode "servidor SMTP" i introdudir el servidor SMTP i credencials proporcionades pel seu proveïdor de correu electrònic (pregunti al seu proveïdor de correu electrònic les credencials SMTP per al seu compte).
+ClickToShowDescription=Click to show description
 # Modules
 Module0Name=Usuaris i grups
-Module0Desc=Gestió d'usuaris i grups
+Module0Desc=Gestió d'usuaris / empleats i grups
 Module1Name=Tercers
 Module1Desc=Gestió d'empreses i contactes (clients, clients potencials...)
 Module2Name=Comercial
@@ -493,7 +499,7 @@ Module410Name=Webcalendar
 Module410Desc=Interface amb el calendari webcalendar
 Module500Name=Pagaments especials
 Module500Desc=Gestió de despeses especials (impostos varis, dividends)
-Module510Name=Contrats d'empleats i salaris
+Module510Name=Contractes d'empleats i salaris
 Module510Desc=Gestió dels contractes d'empleats, salaris i pagaments
 Module520Name=Préstec
 Module520Desc=Gestió de préstecs
@@ -689,7 +695,7 @@ PermissionAdvanced253=Crear/modificar usuaris interns/externs i els seus permiso
 Permission254=Crea/modifica només usuaris externs
 Permission255=Eliminar o desactivar altres usuaris
 Permission256=Consultar els seus permisos
-Permission262=Amplia l'accés a tots els tercers (no només a aquells tercers enllaçats a l'usuari com a agent comercial). No aplica als usuaris externs (sempre estan limitats a ells mateixos per pressupostos, comandes, factures, contractes, etc). No aplica als projectes (només normes en permisos de projectes, visibilitat i qüestions d'assignació).
+Permission262=Extend access to all third parties (not only third parties that user is a sale representative).<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 assignement matters).
 Permission271=Consultar el CA
 Permission272=Consultar les factures
 Permission273=Emetre les factures
@@ -891,7 +897,7 @@ Offset=Decàleg
 AlwaysActive=Sempre actiu
 Upgrade=Actualització
 MenuUpgrade=Actualització / Extensió
-AddExtensionThemeModuleOrOther=Afegir extensió (tema, mòdul, etc.)
+AddExtensionThemeModuleOrOther=Instal·la un mòdul extern
 WebServer=Servidor web
 DocumentRootServer=Carpeta arrel de les pàgines web
 DataRootServer=Carpeta arrel dels arxius de dades
@@ -973,7 +979,7 @@ InfoDolibarr=Sobre Dolibarr
 InfoBrowser=Sobre el Navegador
 InfoOS=Sobre S.O.
 InfoWebServer=Sobre Servidor web
-InfoDatabase=Sobre Bases de dades
+InfoDatabase=Sobre Base de dades
 InfoPHP=Sobre PHP
 InfoPerf=Sobre prestacions
 BrowserName=Nom del navegador
@@ -1165,10 +1171,6 @@ FreeLegalTextOnOrders=Text lliure en comandes
 WatermarkOnDraftOrders=Marca d'aigua en comandes esborrany (en cas d'estar buit)
 ShippableOrderIconInList=Afegir una icona en el llistat de comandes que indica si la comanda és enviable
 BANK_ASK_PAYMENT_BANK_DURING_ORDER=Preguntar pel compte bancari a l'utilitzar la comanda
-##### Clicktodial #####
-ClickToDialSetup=Configuració del mòdul Click To Dial
-ClickToDialUrlDesc=Url executada quan es fa clic en un picto de telèfon. En la URL pots utilitzar etiquetes<br><b>__PHONETO__</b> que seran substituides amb el número de telèfon de la persona a trucar<br><b>__PHONEFROM__</b> que serà substituit pel número de telèfon de la persona que truca (el teu)<br><b>__LOGIN__</b> que serà substituit amb el teu usuari de clicktodial (definit en la teva fitxa d'usuari)<br><b>__PASS__</b> que serà substituit amb el teu password de clicktodial (definit en la teva fitxa d'usuari).
-##### Bookmark4u #####
 ##### Interventions #####
 InterventionsSetup=Configuració del mòdul intervencions
 FreeLegalTextOnInterventions=Text addicional en les fitxes d'intervenció
@@ -1395,7 +1397,7 @@ SendingsSetup=Configuració del mòdul Expedicions
 SendingsReceiptModel=Model de rebut de lliurament
 SendingsNumberingModules=Mòduls de numeració de notes de lliurament
 SendingsAbility=Suport en fulles d'expedició per entregues de clients
-NoNeedForDeliveryReceipts=En la majoria dels casos, els rebuts de lliurament (llista de productes a enviar) també actuen com a notes de recepció i són signades pel client. La gestió dels rebuts d'entrega és per tant redundant i poques vegades s'activarà.
+NoNeedForDeliveryReceipts=In most cases, shipping sheets are used both as sheets for customer deliveries (list of products to send) and sheets that is received and signed by customer. So product deliveries receipts is a duplicated feature and is rarely activated.
 FreeLegalTextOnShippings=Text lliure en els enviaments
 ##### Deliveries #####
 DeliveryOrderNumberingModules=Mòdul de numeració de rebut de lliuraments de productes
@@ -1475,9 +1477,11 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Defineix automàticament aquest valor per defecte
 AGENDA_DEFAULT_FILTER_TYPE=Establir per defecte aquest tipus d'esdeveniment en el filtre de cerca en la vista de la agenda
 AGENDA_DEFAULT_FILTER_STATUS=Establir per defecte aquest estat de esdeveniments en el filtre de cerca en la vista de la agenda
 AGENDA_DEFAULT_VIEW=Establir la pestanya per defecte al seleccionar el menú Agenda
-AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
+AGENDA_NOTIFICATION=Activa la notificació de events en els navegadors dels usuaris quan s'arriba a la data de l'esdeveniment (cada usuari és capaç de rebutjar-ho des de la pregunta de confirmació del navegador)
 AGENDA_NOTIFICATION_SOUND=Habilita les notificacions sonores
-##### ClickToDial #####
+##### Clicktodial #####
+ClickToDialSetup=Configuració del mòdul Click To Dial
+ClickToDialUrlDesc=Url executada quan es fa clic en un picto de telèfon. En la URL pots utilitzar etiquetes<br><b>__PHONETO__</b> que seran substituides amb el número de telèfon de la persona a trucar<br><b>__PHONEFROM__</b> que serà substituit pel número de telèfon de la persona que truca (el teu)<br><b>__LOGIN__</b> que serà substituit amb el teu usuari de clicktodial (definit en la teva fitxa d'usuari)<br><b>__PASS__</b> que serà substituit amb el teu password de clicktodial (definit en la teva fitxa d'usuari).
 ClickToDialDesc=Aquest mòdul permet afegir una icona després del número de telèfon de contactes Dolibarr. Un clic en aquesta icona, truca a un servidor amb un URL que s'indica a continuació. Això pot ser usat per anomenar al sistema centre de Dolibarr que pot trucar al número de telèfon en un sistema SIP, per exemple.
 ClickToDialUseTelLink=Utilitzar sols l'enllaç "tel:" als números de telèfon
 ClickToDialUseTelLinkDesc=Utilitza aquest mètode si els teus usuaris tenen un softphone o una interfície de software instal·lat en el mateix ordinador del navegador, i et truca quan fas clic en un enllaç del navegador que comença amb "tel:". Si necessites una solució amb un servidor complet (sense necessitat de instal·lació de programari en local), hauries de posar "No" i omplir el següent camp.
@@ -1505,10 +1509,11 @@ EndPointIs=Els clients SOAP hauran d'enviar les seves solicituds al punt final e
 ##### API ####
 ApiSetup=Configuració del mòdul API
 ApiDesc=Habilitant aquest mòdul, Dolibarr serà un servidor REST per oferir varis serveis web.
-ApiProductionMode=Habilita el mode "producció" (això activarà la utilització de catxés per a la gestió de serveis)
+ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
 ApiExporerIs=Pots explorar les API en la url
 OnlyActiveElementsAreExposed=Només s'exposen els elements de mòduls habilitats
 ApiKey=Clau per l'API
+WarningAPIExplorerDisabled=The API explorer has been disabled. API explorer is not required to provide API services. It is a tool for developer to find/test REST APIs. If you need this tool, go into setup of module API REST to activate it.
 ##### Bank #####
 BankSetupModule=Configuració del mòdul Banc
 FreeLegalTextOnChequeReceipts=Text complementari en remeses de xecs
@@ -1577,7 +1582,7 @@ 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ó:
 SomethingMakeInstallFromWebNotPossible2=Per aquesta raó, explicarem aquí els passos del procés d'actualització manual que pot realitzar un usuari amb privilegis
 InstallModuleFromWebHasBeenDisabledByFile=La instal·lació de mòduls externs des de l'aplicació es troba desactivada per l'administrador. Ha de requerir que elimini l'arxiu <strong>%s</strong> per habilitar aquesta funció
-ConfFileMuseContainCustom=Installing an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to have option<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
+ConfFileMuseContainCustom=Installing an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Remarca línies de la taula quan el ratolí passi per sobre
 HighlightLinesColor=Remarca el color de la línia quan el ratolí hi passa per sobre (deixa-ho buit per a no remarcar)
 TextTitleColor=Color de títol de pàgina
@@ -1607,6 +1612,7 @@ FixTZ=Fixar zona horaria
 FillFixTZOnlyIfRequired=Exemple: +2 (omple'l només si tens problemes)
 ExpectedChecksum=Checksum esperat
 CurrentChecksum=Checksum actual
+ForcedConstants=Required constant values
 MailToSendProposal=Enviar pressupost de client
 MailToSendOrder=Enviar comanda de client
 MailToSendInvoice=Enviar factura de client
@@ -1615,13 +1621,14 @@ MailToSendIntervention=Enviar intervenció
 MailToSendSupplierRequestForQuotation=Enviar pressupost de proveïdor
 MailToSendSupplierOrder=Enviar comanda de proveïdor
 MailToSendSupplierInvoice=Enviar factura de proveïdor
+MailToSendContract=To send a contract
 MailToThirdparty=Per enviar correu electrònic des de la pàgina del tercer
 ByDefaultInList=Mostra per defecte en la vista del llistat
 YouUseLastStableVersion=Estàs utilitzant l'última versió estable
 TitleExampleForMajorRelease=Exemple de missatge que es pot utilitzar per anunciar aquesta actualització de versió (ets lliure d'utilitzar-ho a les teves webs)
 TitleExampleForMaintenanceRelease=Exemple de missatge que es pot utilitzar per anunciar aquesta actualització de manteniment (ets lliure d'utilitzar-ho a les teves webs)
-ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. 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.
-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, nor data structure change is present into 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.
+ExampleOfNewsMessageForMajorRelease=Disponible ERP/CRM Dolibarr %s. La versió %s és una versió major amb un munt de noves característiques, tant per a usuaris com per a desenvolupadors. Es pot descarregar des de la secció de descàrregues del portal https://www.dolibarr.org (subdirectori versions estables). Podeu llegir <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> per veure la llista completa dels canvis.
+ExampleOfNewsMessageForMaintenanceRelease=Disponible ERP/CRM Dolibarr %s. La versió %s és una versió de manteniment, de manera que només conté correccions d'errors. Recomanem a tothom que usi una versió anterior que actualitzi a aquesta. Com qualsevol versió de manteniment, no hi ha novetats. Es pot descarregar des de la secció de descàrregues del portal https://www.dolibarr.org (subdirectori versions estables subdirectori). Podeu llegir <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> per veure la llista completa dels canvis.
 MultiPriceRuleDesc=Quan l'opció "Varis nivells de preus per producte/servei" està activada, pots definir diferents preus (un preu per nivell) per cada producte. Per estalviar temps, pots entrar una regla per tenir preu per cada nivell autocalculat d'acord al preu del primer nivell, així només hauràs d'introduir el preu del primer nivell de cada producte. Aquesta pàgina està aqui per estalviar temps i pot ser útil només si els teus preus per cada nivell son relatius al primer nivell. Pots ignorar aquesta pàgina en la majoria dels casos.
 ModelModulesProduct=Plantilles per documents de productes
 ToGenerateCodeDefineAutomaticRuleFirst=Per poder generar codis automàticament, primer has de definir un responsable de autodefinir els números del codi de barres.
@@ -1648,7 +1655,7 @@ activateModuleDependNotSatisfied=El mòdul "%s" depèn del mòdul "%s" que no s'
 CommandIsNotInsideAllowedCommands=La comanda que intentes executar no es troba en la llista de comandes permeses definides en paràmetres <strong>$dolibarr_main_restrict_os_commands</strong> en el fitxer <strong>conf.php</strong>.
 LandingPage=Pàgina de destinació principal
 SamePriceAlsoForSharedCompanies=Si utilitzes el mòdul Multiempresa, amb l'elecció de "preu únic", el preu serà el mateix per totes les empreses si els productes estan compartits entre elles
-ModuleEnabledAdminMustCheckRights=El mòdul ha quedat activat. Els permisos per als mòdul(s) activats van ser donats al administrador. Pot ser necessari concedir permisos a altres usuaris o grups de manera manual si cal.
+ModuleEnabledAdminMustCheckRights=S'ha activat el mòdul. Els permisos per als mòdul(s) activats es donen només als usuaris administradors. Podria ser necessari concedir permisos a altres usuaris o grups de forma manual si és necessari.
 UserHasNoPermissions=Aquest usuari no té permisos definits
 TypeCdr=Utilitze "Cap" si la data de termini de pagament és la data de la factura més un delta en dies (delta és el camp "Nº de dies")<br>Utilitze "A final de mes", si, després del delta, la data ha d'aumentar-se per arribar a final de mes (+ "Offset" opcional en dies)<br>Utilitze "Actual/Següent" per tindre la data de termini de pagament sent el primer N de cada mes (N es guarda en el camp "Nº de dies")
 ##### Resource ####
diff --git a/htdocs/langs/ca_ES/banks.lang b/htdocs/langs/ca_ES/banks.lang
index 83e19735b47..5acc86cf634 100644
--- a/htdocs/langs/ca_ES/banks.lang
+++ b/htdocs/langs/ca_ES/banks.lang
@@ -6,13 +6,13 @@ FinancialAccount=Compte
 BankAccount=Compte bancari
 BankAccounts=Comptes bancaris
 ShowAccount=Mostrar el compte
-AccountRef=Ref. compte financier
-AccountLabel=Etiqueta compte financier
+AccountRef=Ref. compte financer
+AccountLabel=Etiqueta compte financer
 CashAccount=Compte caixa/efectiu
 CashAccounts=Comptes caixa/efectiu
 CurrentAccounts=Comptes corrents
 SavingAccounts=Comptes d'estalvis
-ErrorBankLabelAlreadyExists=Etiqueta de compte financier existent
+ErrorBankLabelAlreadyExists=Ja existeix l'etiqueta de compte financer
 BankBalance=Saldo
 BankBalanceBefore=Saldo anterior
 BankBalanceAfter=Saldo posterior
@@ -46,7 +46,7 @@ BankAccountOwnerAddress=Direcció del titular del compte
 RIBControlError=El dígit de control indica que la informació d'aquest compte bancari és incompleta o incorrecta.
 CreateAccount=Crear compte
 NewBankAccount=Nou compte
-NewFinancialAccount=Nou compte financier
+NewFinancialAccount=Nou compte financer
 MenuNewFinancialAccount=Nou compte
 EditFinancialAccount=Edició compte
 LabelBankCashAccount=Etiqueta compte o caixa
@@ -80,7 +80,7 @@ AccountToDebit=Compte de dèbit
 DisableConciliation=Desactivar la funció de conciliació per a aquest compte
 ConciliationDisabled=Funció de conciliació desactivada
 LinkedToAConciliatedTransaction=S'enllacarà a una entrada conciliada
-StatusAccountOpened=Actiu
+StatusAccountOpened=Obert
 StatusAccountClosed=Tancada
 AccountIdShort=Número
 LineRecord=Registre
diff --git a/htdocs/langs/ca_ES/bills.lang b/htdocs/langs/ca_ES/bills.lang
index 39cfce32379..aaef5a4a978 100644
--- a/htdocs/langs/ca_ES/bills.lang
+++ b/htdocs/langs/ca_ES/bills.lang
@@ -2,12 +2,12 @@
 Bill=Factura
 Bills=Factures
 BillsCustomers=Factures a clients
-BillsCustomer=Factures al client
+BillsCustomer=Factura a client
 BillsSuppliers=Factures de proveïdors
-BillsCustomersUnpaid=Factures a clients pendents de cobrament
-BillsCustomersUnpaidForCompany=Factures a clients pendents de cobrament de %s
+BillsCustomersUnpaid=Factures de clients pendents de cobrament
+BillsCustomersUnpaidForCompany=Unpaid customer invoices for %s
 BillsSuppliersUnpaid=Factures de proveïdors pendents de pagament
-BillsSuppliersUnpaidForCompany=Factures de proveïdors pendents de pagament de %s
+BillsSuppliersUnpaidForCompany=Unpaid supplier invoices for %s
 BillsLate=Retard en el pagament
 BillsStatistics=Estadístiques factures a clients
 BillsStatisticsSuppliers=Estadístiques factures de proveïdors
@@ -62,8 +62,8 @@ PaymentsBack=Reembossaments
 paymentInInvoiceCurrency=en divisa de factures
 PaidBack=Reemborsat
 DeletePayment=Elimina el pagament
-ConfirmDeletePayment=Està segur de voler eliminar aquest pagament?
-ConfirmConvertToReduc=Vol convertir aquest abonament en una reducció futura?<br>L'import d'aquest abonament s'emmagatzema per a aquest client. Podrà utilitzar-se per reduir l'import d'una propera factura del client.
+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.
 SupplierPayments=Pagaments a proveïdors
 ReceivedPayments=Pagaments rebuts
 ReceivedCustomersPayments=Cobraments rebuts de clients
@@ -78,6 +78,7 @@ PaymentMode=Forma de pagament
 PaymentTypeDC=Dèbit/Crèdit Tarja
 PaymentTypePP=PayPal
 IdPaymentMode=Forma de pagament (Id)
+CodePaymentMode=Payment type (code)
 LabelPaymentMode=Forma de pagament (etiqueta)
 PaymentModeShort=Forma de pagament
 PaymentTerm=Termini de pagament
@@ -102,9 +103,10 @@ 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=Emetre pagament
-DoPaymentBack=Emetre reembossament
+DoPayment=Enter payment
+DoPaymentBack=Enter refund
 ConvertToReduc=Convertir en reducció futura
+ConvertExcessReceivedToReduc=Convert excess received into future discount
 EnterPaymentReceivedFromCustomer=Afegir cobrament rebut del client
 EnterPaymentDueToCustomer=Fer pagament del client
 DisabledBecauseRemainderToPayIsZero=Desactivar ja que la resta a pagar és 0
@@ -151,14 +153,14 @@ NoQualifiedRecurringInvoiceTemplateFound=No s'ha qualificat cap plantilla de fac
 FoundXQualifiedRecurringInvoiceTemplate=S'ha trobat la plantilla de factura/es recurrent %s qualificada per generar-se.
 NotARecurringInvoiceTemplate=No és una plantilla de factura recurrent
 NewBill=Nova factura
-LastBills=Les %s últimes factures
-LastCustomersBills=Les %s últimes factures a clients
-LastSuppliersBills=Les %s últimes factures de proveïdors
+LastBills=Últimes %s factures
+LastCustomersBills=Últimes %s factures de client
+LastSuppliersBills=Últimes %s factures de proveïdor
 AllBills=Totes les factures
 OtherBills=Altres factures
-DraftBills=Factures esborrany
-CustomersDraftInvoices=Factures a clients esborrany
-SuppliersDraftInvoices=Factures de proveïdors esborrany
+DraftBills=Esborranys de factures
+CustomersDraftInvoices=Esborranys de factures de client
+SuppliersDraftInvoices=Esborranys de factures de proveïdor
 Unpaid=Pendents
 ConfirmDeleteBill=Vols eliminar aquesta factura?
 ConfirmValidateBill=Està segur de voler validar aquesta factura amb la referència <b>%s</b>?
@@ -213,7 +215,7 @@ EscompteOffered=Descompte (pagament aviat)
 EscompteOfferedShort=Descompte
 SendBillRef=Enviament de la factura %s
 SendReminderBillRef=Recordatori de la factura %s
-StandingOrders=Ordres directes de dèbit 
+StandingOrders=Domiciliacions
 StandingOrder=Domiciliació
 NoDraftBills=Cap factura esborrany
 NoOtherDraftBills=Cap altra factura esborrany
@@ -272,6 +274,7 @@ Deposit=Bestreta
 Deposits=Bestretes
 DiscountFromCreditNote=Descompte resultant del abonament %s
 DiscountFromDeposit=Pagaments de la factura de bestreta %s
+DiscountFromExcessReceived=Payments from excess received of invoice %s
 AbsoluteDiscountUse=Aquest tipus de crèdit no es pot utilitzar en una factura abans de la seva validació
 CreditNoteDepositUse=La factura deu estar validada per a utilitzar aquest tipus de crèdits
 NewGlobalDiscount=Nou descompte fixe
@@ -279,8 +282,8 @@ NewRelativeDiscount=Nou descompte
 NoteReason=Nota/Motiu
 ReasonDiscount=Motiu
 DiscountOfferedBy=Acordat per
-DiscountStillRemaining=Descomptes fixes pendents
-DiscountAlreadyCounted=Descomptes fixes ja aplicats
+DiscountStillRemaining=Descomptes disponibles
+DiscountAlreadyCounted=Descomptes ja consumits
 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.
@@ -333,17 +336,19 @@ InvoiceAutoValidate=Valida les factures automàticament
 GeneratedFromRecurringInvoice=Generat des de la plantilla de factura recurrent %s
 DateIsNotEnough=Encara no s'ha arribat a la data
 InvoiceGeneratedFromTemplate=La factura %s s'ha generat des de la plantilla de factura recurrent %s
+WarningInvoiceDateInFuture=Warning, the invoice date is higher than current date
+WarningInvoiceDateTooFarInFuture=Warning, the invoice date is too far from current date
 # PaymentConditions
 Statut=Estat
-PaymentConditionShortRECEP=Due Upon Receipt
-PaymentConditionRECEP=Due Upon Receipt
+PaymentConditionShortRECEP=A la recepció
+PaymentConditionRECEP=A la recepció
 PaymentConditionShort30D=30 dies
 PaymentCondition30D=30 dies
-PaymentConditionShort30DENDMONTH=30 díes final de mes
+PaymentConditionShort30DENDMONTH=30 dies final de mes
 PaymentCondition30DENDMONTH=En els 30 dies següents a final de mes
 PaymentConditionShort60D=60 dies
 PaymentCondition60D=60 dies
-PaymentConditionShort60DENDMONTH=60 díes final de mes
+PaymentConditionShort60DENDMONTH=60 dies final de mes
 PaymentCondition60DENDMONTH=En els 60 dies següents a final de mes
 PaymentConditionShortPT_DELIVERY=Al lliurament
 PaymentConditionPT_DELIVERY=Al lliurament
@@ -351,12 +356,20 @@ PaymentConditionShortPT_ORDER=Comanda
 PaymentConditionPT_ORDER=A la recepció de la comanda
 PaymentConditionShortPT_5050=50/50
 PaymentConditionPT_5050=50%% per avançat, 50%% al lliurament
+PaymentConditionShort10D=10 dies
+PaymentCondition10D=10 dies
+PaymentConditionShort10DENDMONTH=10 dies final de mes
+PaymentCondition10DENDMONTH=En els 10 dies següents a final de mes
+PaymentConditionShort14D=14 dies
+PaymentCondition14D=14 dies
+PaymentConditionShort14DENDMONTH=14 dies final de mes
+PaymentCondition14DENDMONTH=En els 14 dies següents a final de mes
 FixAmount=Import fixe
 VarAmount=Import variable (%% total)
 # PaymentType
 PaymentTypeVIR=Transferència bancària
 PaymentTypeShortVIR=Transferència bancària
-PaymentTypePRE=Ordre de pagament de dèbit directe
+PaymentTypePRE=Ordre de pagament de domiciliació
 PaymentTypeShortPRE=Ordre de pagament de dèbit
 PaymentTypeLIQ=Efectiu
 PaymentTypeShortLIQ=Efectiu
@@ -420,7 +433,7 @@ ChequeDeposits=Ingrés de xecs
 Cheques=Xecs
 DepositId=Id. dipòsit
 NbCheque=Número de xecs
-CreditNoteConvertedIntoDiscount=Aquest abonament s'ha convertit en %s
+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
 ShowUnpaidAll=Mostrar tots els pendents
 ShowUnpaidLateOnly=Mostrar els pendents en retard només
diff --git a/htdocs/langs/ca_ES/boxes.lang b/htdocs/langs/ca_ES/boxes.lang
index 39c9ae88486..940fb497f20 100644
--- a/htdocs/langs/ca_ES/boxes.lang
+++ b/htdocs/langs/ca_ES/boxes.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - boxes
-BoxLastRssInfos=Fils d'informació RSS
+BoxLastRssInfos=Informació RSS
 BoxLastProducts=Últims %s productes/serveis
 BoxProductsAlertStock=Alertes d'estoc per a productes
 BoxLastProductsInContract=Últims %s productes/serveis contractats
@@ -19,16 +19,16 @@ BoxLastMembers=Últims socis
 BoxFicheInter=Últimes intervencions
 BoxCurrentAccounts=Balanç de comptes oberts
 BoxTitleLastRssInfos=Últimes %s notícies de %s
-BoxTitleLastProducts=Els últims %s productes/serveis modificats
+BoxTitleLastProducts=Últims %s productes/serveis modificats
 BoxTitleProductsAlertStock=Productes en alerta d'estoc
 BoxTitleLastSuppliers=Últims %s proveïdors registrats
 BoxTitleLastModifiedSuppliers=Últims %s proveïdors modificats
 BoxTitleLastModifiedCustomers=Últims %s clients modificats
 BoxTitleLastCustomersOrProspects=Últims %s clients o clients potencials
 BoxTitleLastCustomerBills=Últimes %s factures de client
-BoxTitleLastSupplierBills=Últimes %s factures de proveïdors
+BoxTitleLastSupplierBills=Últimes %s factures de proveïdor
 BoxTitleLastModifiedProspects=Últims %s clients potencials modificats
-BoxTitleLastModifiedMembers=Els últims %s socis
+BoxTitleLastModifiedMembers=Últims %s socis
 BoxTitleLastFicheInter=Últimes %s intervencions modificades
 BoxTitleOldestUnpaidCustomerBills=Les %s factures més antigues a clients pendents de cobrament
 BoxTitleOldestUnpaidSupplierBills=Les %s factures més antigues de proveïdors pendents de pagament
@@ -38,7 +38,7 @@ BoxMyLastBookmarks=Els meus últims %s marcadors
 BoxOldestExpiredServices=Serveis antics expirats
 BoxLastExpiredServices=Últims %s contactes amb serveis actius expirats
 BoxTitleLastActionsToDo=Últims %s events a realitzar
-BoxTitleLastContracts=Latest %s modified contracts
+BoxTitleLastContracts=Últims %s contractes modificats
 BoxTitleLastModifiedDonations=Últimes %s donacions modificades
 BoxTitleLastModifiedExpenses=Últimes %s despeses modificades
 BoxGlobalActivity=Activitat global
@@ -51,12 +51,12 @@ ClickToAdd=Faci clic aquí per afegir.
 NoRecordedCustomers=Cap client registrat
 NoRecordedContacts=Cap contacte registrat
 NoActionsToDo=Sense esdeveniments a realitzar
-NoRecordedOrders=Sense comandes de clients registrats
+NoRecordedOrders=No recorded customer orders
 NoRecordedProposals=Sense pressupostos registrats
-NoRecordedInvoices=Sense factures a clients registrades
-NoUnpaidCustomerBills=Sense factures a clients pendents de cobrament
-NoUnpaidSupplierBills=Sense factures de proveïdors pendents de pagament
-NoModifiedSupplierBills=Sense factures de proveïdors modificades
+NoRecordedInvoices=No recorded customer invoices
+NoUnpaidCustomerBills=No unpaid customer invoices
+NoUnpaidSupplierBills=No unpaid supplier invoices
+NoModifiedSupplierBills=No recorded supplier invoices
 NoRecordedProducts=Sense productes/serveis registrats
 NoRecordedProspects=Sense clients potencials registrats
 NoContractedProducts=Sense productes/serveis contractats
diff --git a/htdocs/langs/ca_ES/companies.lang b/htdocs/langs/ca_ES/companies.lang
index d8285ec5910..6401f1b4a7a 100644
--- a/htdocs/langs/ca_ES/companies.lang
+++ b/htdocs/langs/ca_ES/companies.lang
@@ -44,7 +44,7 @@ ToCreateContactWithSameName=Es crearà un contacte/adreça automàticament amb l
 ParentCompany=Seu Central
 Subsidiaries=Filials
 ReportByCustomers=Informe per client
-ReportByQuarter=Informe per tasa
+ReportByQuarter=Informe per taxa
 CivilityCode=Codi cortesia
 RegisteredOffice=Domicili social
 Lastname=Cognoms
@@ -81,6 +81,7 @@ PaymentBankAccount=Compte bancari de pagament
 OverAllProposals=Pressupostos total
 OverAllOrders=Comandes total
 OverAllInvoices=Factures total
+OverAllSupplierProposals=Total price requests
 ##### Local Taxes #####
 LocalTax1IsUsed=Utilitza segon impost
 LocalTax1IsUsedES= Subjecte a RE
@@ -389,9 +390,9 @@ ListCustomersShort=Llistat de clients
 ThirdPartiesArea=Àrea de tercers i contactes
 LastModifiedThirdParties=Últims %s tercers modificats
 UniqueThirdParties=Total de tercers únics
-InActivity=Actiu
+InActivity=Obert
 ActivityCeased=Tancat
-ThirdPartyIsClosed=Third party is closed
+ThirdPartyIsClosed=Tercer està tancat
 ProductsIntoElements=Llistat de productes/serveis en %s
 CurrentOutstandingBill=Factura pendent actual
 OutstandingBill=Max. de factures pendents
diff --git a/htdocs/langs/ca_ES/compta.lang b/htdocs/langs/ca_ES/compta.lang
index 810eaec8c63..b3932e98e5e 100644
--- a/htdocs/langs/ca_ES/compta.lang
+++ b/htdocs/langs/ca_ES/compta.lang
@@ -65,6 +65,7 @@ PaymentSocialContribution=Pagament d'impost varis
 PaymentVat=Pagament IVA
 ListPayment=Llistat de pagaments
 ListOfCustomerPayments=Llistat de cobraments de clients
+ListOfSupplierPayments=Llistat de pagaments a proveïdors
 DateStartPeriod=Data d'inici del periode
 DateEndPeriod=Data final del periode
 newLT1Payment=Nou pagament de RE
@@ -81,7 +82,7 @@ LT2PaymentES=Pagament IRPF
 LT2PaymentsES=Pagaments IRPF
 VATPayment=Pagament d'impost de vendes
 VATPayments=Pagaments d'impost de vendes
-VATRefund=IVA en devolucions de vendes
+VATRefund=Sales tax refund
 Refund=Devolució
 SocialContributionsPayments=Pagaments d'impostos varis
 ShowVatPayment=Veure pagaments IVA
@@ -141,11 +142,11 @@ VATReport=Informe d'IVA
 VATReportByCustomersInInputOutputMode=Informe per clients d'IVA cobrat i pagat
 VATReportByCustomersInDueDebtMode=Informe per clients d'IVA cobrat i pagat
 VATReportByQuartersInInputOutputMode=Informe per tipus d'IVA cobrat i pagat
-LT1ReportByQuartersInInputOutputMode=informe de RE per tassa
-LT2ReportByQuartersInInputOutputMode=Informe de IRPF per tassa
+LT1ReportByQuartersInInputOutputMode=Informe per taxa de RE
+LT2ReportByQuartersInInputOutputMode=Informe per taxa de IRPF
 VATReportByQuartersInDueDebtMode=Informe per tipus d'IVA cobrat i pagat
-LT1ReportByQuartersInDueDebtMode=Informe de RE per tassa
-LT2ReportByQuartersInDueDebtMode=Informe de IRPF per tassa
+LT1ReportByQuartersInDueDebtMode=Informe per taxa de RE
+LT2ReportByQuartersInDueDebtMode=Informe per taxa de IRPF
 SeeVATReportInInputOutputMode=Veure l'informe <b>%sIVA pagat%s </b> per a un mode de càlcul estàndard
 SeeVATReportInDueDebtMode=Veure l'informe <b>%s IVA degut%s </b> per a un mode de càlcul amb l'opció sobre el degut
 RulesVATInServices=- Per als serveis, l'informe inclou la normativa de l'IVA rebuts o emesos en base a la data de pagament.
diff --git a/htdocs/langs/ca_ES/contracts.lang b/htdocs/langs/ca_ES/contracts.lang
index 62acc4a3ece..bc110b7a58a 100644
--- a/htdocs/langs/ca_ES/contracts.lang
+++ b/htdocs/langs/ca_ES/contracts.lang
@@ -50,7 +50,7 @@ ListOfClosedServices=Llistat de serveis tancats
 ListOfRunningServices=Llistat de serveis actius
 NotActivatedServices=Serveis no activats (amb els contractes validats)
 BoardNotActivatedServices=Serveis a activar amb els contractes validats
-LastContracts=Els últims %s contractes
+LastContracts=Últims %s contractes
 LastModifiedServices=Últims %s serveis modificats
 ContractStartDate=Data inici
 ContractEndDate=Data finalització
diff --git a/htdocs/langs/ca_ES/cron.lang b/htdocs/langs/ca_ES/cron.lang
index ea70b86a3d2..bf086981b51 100644
--- a/htdocs/langs/ca_ES/cron.lang
+++ b/htdocs/langs/ca_ES/cron.lang
@@ -7,7 +7,7 @@ Permission23103 = Elimina la tasca programada
 Permission23104 = Executa les tasques programades
 # Admin
 CronSetup= Pàgina de configuració del mòdul - Gestió de tasques planificades
-URLToLaunchCronJobs=URL to check and launch qualified cron jobs
+URLToLaunchCronJobs=URL per comprovar i posar en marxa les tasques automàtiques qualificades
 OrToLaunchASpecificJob=O per llançar una tasca específica
 KeyForCronAccess=Codi de seguretat per a la URL de llançament de tasques automàtiques
 FileToLaunchCronJobs=Ordre per llançar les tasques automàtiques
@@ -22,9 +22,9 @@ CronLastResult=Últim codi retornat
 CronCommand=Comando
 CronList=Tasques programades
 CronDelete=Elimina les tasques programades
-CronConfirmDelete=Esteu segur de voler eliminar aquesta tasca programada?
+CronConfirmDelete=Vols eliminar aquests treballs programats?
 CronExecute=Llança la tasca programada
-CronConfirmExecute=Esteu segur de voler executar ara aquesta tasca programada?
+CronConfirmExecute=Esteu segur que voleu executar aquestes tasques programades ara?
 CronInfo=Tasques programades li permet executar tasques que han sigut programades
 CronTask=Tasca
 CronNone=Ningún
@@ -76,4 +76,4 @@ UseMenuModuleToolsToAddCronJobs=Ves a menú "Inici - Utilitats de sistema - Tasq
 JobDisabled=Tasca desactivada
 MakeLocalDatabaseDumpShort=Còpia de seguretat de la base de dades local
 MakeLocalDatabaseDump=Crea un bolcat de base de dades local
-WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of active jobs, your jobs may be delayed to a maximum of %s hours before being run.
+WarningCronDelayed=Atenció, per motius de rendiment, qualsevol tasca activa prevista per la propera execució, es pot retardar fins a un màxim de %s hores abans de començar a executar-se.
diff --git a/htdocs/langs/ca_ES/donations.lang b/htdocs/langs/ca_ES/donations.lang
index b5b7f47a18c..55ee8884291 100644
--- a/htdocs/langs/ca_ES/donations.lang
+++ b/htdocs/langs/ca_ES/donations.lang
@@ -13,7 +13,7 @@ DonationsArea=Àrea de donacions
 DonationStatusPromiseNotValidated=Promesa no validada
 DonationStatusPromiseValidated=Promesa validada
 DonationStatusPaid=Donació pagada
-DonationStatusPromiseNotValidatedShort=No validada
+DonationStatusPromiseNotValidatedShort=Esborrany
 DonationStatusPromiseValidatedShort=Validada
 DonationStatusPaidShort=Pagada
 DonationTitle=Rebut de la donació
diff --git a/htdocs/langs/ca_ES/errors.lang b/htdocs/langs/ca_ES/errors.lang
index 62c4a003beb..e9bdf1d8183 100644
--- a/htdocs/langs/ca_ES/errors.lang
+++ b/htdocs/langs/ca_ES/errors.lang
@@ -11,6 +11,7 @@ ErrorLoginAlreadyExists=El login %s ja existeix.
 ErrorGroupAlreadyExists=El grup %s ja existeix.
 ErrorRecordNotFound=Registre no trobat
 ErrorFailToCopyFile=Error al copiar l'arxiu '<b>%s</b>' a '<b>%s</b>'.
+ErrorFailToCopyDir=Failed to copy directory '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToRenameFile=Error al renomenar l'arxiu '<b>%s</b>' a '<b>%s</b>'.
 ErrorFailToDeleteFile=Error al suprimir el fitxer '<b>%s</b>'.
 ErrorFailToCreateFile=Error al crear l'arxiu  '<b>%s</b>'
@@ -107,7 +108,7 @@ ErrorFailedToRunExternalCommand=Error d'execució de la comanda extern. Comprove
 ErrorFailedToChangePassword=Error en la modificació de la contrasenya
 ErrorLoginDoesNotExists=El compte d'usuari de <b>%s</b> no s'ha trobat.
 ErrorLoginHasNoEmail=Aquest usuari no té e-mail. Impossible continuar.
-ErrorBadValueForCode=Valor no vàlid per al codi. Torneu a intentar-ho amb un nou valor ...
+ErrorBadValueForCode=Valor incorrecte per codi de seguretat. Torna a intentar-ho amb un nou valor...
 ErrorBothFieldCantBeNegative=Els camps %s i %s no poden ser negatius
 ErrorQtyForCustomerInvoiceCantBeNegative=La quantitat a les línies de factures a clients no poden ser negatives
 ErrorWebServerUserHasNotPermission=El compte d'execució del servidor web <b>%s</b> no disposa dels permisos per això
@@ -115,7 +116,7 @@ ErrorNoActivatedBarcode=No hi ha activat cap tipus de codi de barres
 ErrUnzipFails=No s'ha pogut descomprimir el fitxer %s amb ZipArchive
 ErrNoZipEngine=En aquest PHP no hi ha motor per descomprimir l'arxiu %s
 ErrorFileMustBeADolibarrPackage=El fitxer %s ha de ser un paquet Dolibarr en format zip
-ErrorFileRequired=Es requereix un fitxer de paquet Dolibarr en format zip
+ErrorModuleFileRequired=You must select a Dolibarr module package file
 ErrorPhpCurlNotInstalled=L'extensió PHP CURL no es troba instal·lada, és indispensable per dialogar amb Paypal.
 ErrorFailedToAddToMailmanList=S'ha produït un error en intentar afegir un registre a la llista Mailman o base de dades SPIP
 ErrorFailedToRemoveToMailmanList=Error en l'eliminació de %s de la llista Mailmain %s o base SPIP
@@ -178,9 +179,11 @@ ErrorFailedToLoadLoginFileForMode=No s'ha pogut obtenir la clau d'inici de sessi
 ErrorModuleNotFound=No s'ha trobat el fitxer del mòdul.
 ErrorFieldAccountNotDefinedForBankLine=Valor pel compte comptable no definit per la línia del banc d'origen %s
 ErrorBankStatementNameMustFollowRegex=Error, el nom del comunicat del banc deu de seguir la regla de sintaxis %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.
+ErrorPhpMailDelivery=Comproveu que no faci servir un nombre massa alt de destinataris i que el seu contingut de correu electrònic no sigui similar a un Spam. Demani també al seu administrador que verifiqui el tallafocs i els arxius dels registres del servidor per obtenir una informació més completa.
+ErrorUserNotAssignedToTask=L'usuari ha d'estar assignat a la tasca per poder introduir el temps consumit.
 ErrorTaskAlreadyAssigned=La tasca també està assignada a l'usuari
+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>
 
 # 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í
diff --git a/htdocs/langs/ca_ES/exports.lang b/htdocs/langs/ca_ES/exports.lang
index b340e67e33d..7e68d514168 100644
--- a/htdocs/langs/ca_ES/exports.lang
+++ b/htdocs/langs/ca_ES/exports.lang
@@ -110,7 +110,7 @@ Enclosure=Delimitador de camps
 SpecialCode=Codi especial
 ExportStringFilter=%% Permet la substitució d'un o mes caràcters en el text
 ExportDateFilter=AAAA, AAAAMM, AAAAMMDD: filtres per any/mes/dia<br>AAAA+AAAA, AAAAMM+AAAAMM, AAAAMMDD+AAAAMMDD: filtres sobre una gamma d'anys/mes/dia<br> > AAAA, > AAAAMM, > AAAAMMDD: filtres en tots els següents anys/mesos/dia<br> < AAAA, < AAAAMM, < AAAAMMDD: filtres en tots els anys/mes/dia anteriors
-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
+ExportNumericFilter=NNNNN filtra per un valor<br>NNNNN+NNNNN filtra sobre un rang de valors<br>< NNNN filtra per valors menors<br>> NNNNN filtra per valors majors
 ImportFromLine=Importa començant des del número de línia
 EndAtLineNb=Final en el número de línia
 SetThisValueTo2ToExcludeFirstLine=Per exemple, defineix aquest valor a 3 per excloure les 2 primeres línies
@@ -121,7 +121,7 @@ FilteredFields=Camps filtrats
 FilteredFieldsValues=Valors de filtres
 FormatControlRule=Regla de control de format
 ## imports updates
-KeysToUseForUpdates=Key to use for updating data
+KeysToUseForUpdates=Clau a utilitzar per actualitzar dades
 NbInsert=Número de línies afegides: %s
 NbUpdate=Número de línies actualizades: %s
 MultipleRecordFoundWithTheseFilters=S'han trobat múltiples registres amb aquests filtres: %s
diff --git a/htdocs/langs/ca_ES/holiday.lang b/htdocs/langs/ca_ES/holiday.lang
index e5662f535e4..2da405f3cf3 100644
--- a/htdocs/langs/ca_ES/holiday.lang
+++ b/htdocs/langs/ca_ES/holiday.lang
@@ -78,7 +78,7 @@ ManualUpdate=Actualització manual
 HolidaysCancelation=Anulació de dies lliures
 EmployeeLastname=Cognoms de l'empleat
 EmployeeFirstname=Nom de l'empleat
-TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
+TypeWasDisabledOrRemoved=El tipus de dia lliure (id %s) ha sigut desactivat o eliminat
 
 ## Configuration du Module ##
 LastUpdateCP=Última actualització automàtica de reserva de dies lliures
diff --git a/htdocs/langs/ca_ES/install.lang b/htdocs/langs/ca_ES/install.lang
index eeb3c19955b..e58e367c467 100644
--- a/htdocs/langs/ca_ES/install.lang
+++ b/htdocs/langs/ca_ES/install.lang
@@ -4,7 +4,7 @@ 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!
 ConfFileCouldBeCreated=L'arxiu de configuració <b>%s</b> s'ha creat.
-ConfFileIsNotWritable=L'arxiu <b>%s</b> no és modificable. Per a una primera instal·lació, modifiqui els seus permisos. El servidor web ha de tenir el dret a escriure en aquest fitxer a la configuració ( "chmod 666" per exemple sobre un SO compatible UNIX).
+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).
 ConfFileIsWritable=L'arxiu <b>%s</b> és modificable.
 ConfFileReload=Recarregar tota la informació de l'arxiu de configuració.
 PHPSupportSessions=Aquest PHP suporta sessions
@@ -21,7 +21,7 @@ ErrorPHPDoesNotSupportGD=Aquest PHP no suporta les funcions gràfiques GD. Cap g
 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.
 ErrorDirDoesNotExists=La carpeta <b>%s</b> no existeix o no és accessible.
-ErrorGoBackAndCorrectParameters=Torneu enrere i corregeix els paràmetres invàlids...
+ErrorGoBackAndCorrectParameters=Torna enrera i corregeix els paràmetres incorrectes.
 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'.
@@ -29,8 +29,8 @@ ErrorDatabaseVersionTooLow=Versió de la base de dades (%s) demasiado antigua. m
 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'
 ErrorDatabaseAlreadyExists=La base de dades '%s' ja existeix.
-IfDatabaseNotExistsGoBackAndUncheckCreate=Si la base de dades no existeix, torneu enrera i activeu l'opció "Crear base de dades"
-IfDatabaseExistsGoBackAndCheckCreate=Si la base de dades ja existeix, torneu enrere i desactiveu l'opció "crear la base de dades".
+IfDatabaseNotExistsGoBackAndUncheckCreate=Si la base de dades no existeix, torna enrera i activa l'opció "Crear base de dades"
+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.
 PHPVersion=Versió PHP
 License=Llicència d'ús
@@ -45,20 +45,20 @@ 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
-ServerPortDescription=Port del servidor de la base de dades. Deixar en blanc si ho desconeix.
+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. Deixi buit si es connecta com a anonymous
+AdminLogin=Usuari de l'administrador de la base de dades Dolibarr.
 PasswordAgain=Verificació de la contrasenya
-AdminPassword=contrasenya de l'administrador de la base de dades Dolibarr. Deixi buit si es connecta com a anonymous
+AdminPassword=Contrasenya de l'administrador de la base de dades Dolibarr.
 CreateDatabase=Crear la base de dades
 CreateUser=Crear el propietari
 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=Seleccioneu aquesta opció si l'usuari no existeix i s'ha de crear.<br>En aquest cas, cal indicar usuari/contrasenya de superusuari, més endavant en aquesta pàgina.
 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=Deixi buit si l'usuari no té contrasenya
+KeepEmptyIfNoPassword=Deixa-ho en blanc si l'usuari no té contrasenya (evita-ho)
 SaveConfigurationFile=Gravació del fitxer de configuració
 ServerConnection=Connexió al servidor
 DatabaseCreation=Creació de la base de dades
@@ -86,7 +86,7 @@ WithNoSlashAtTheEnd=Sense el signe "/" al final
 DirectoryRecommendation=Es recomana posar aquesta carpeta fora de la carpeta de les pàgines web.
 LoginAlreadyExists=Ja existeix
 DolibarrAdminLogin=Login de l'usuari administrador de Dolibarr
-AdminLoginAlreadyExists=El compte d'administrador Dolibarr '<b>%s</b>' ja existeix. Torneu enrere si voleu crear una altra.
+AdminLoginAlreadyExists=El compte d'administrador Dolibarr '<b>%s</b>' ja existeix. Torna enrera si vols crear un altre.
 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
@@ -94,9 +94,9 @@ ChoosedMigrateScript=Elecció de l'script de migració
 DataMigration=Migració de les dades
 DatabaseMigration=Migració del format de la base de dades
 ProcessMigrateScript=Execució del script
-ChooseYourSetupMode=Triï el seu mètode d'instal·lació i feu clic en "Començar" ...
-FreshInstall=Primera instal·lació
-FreshInstallDesc=Utilitzar aquest mètode si és la seva primera instal·lació. Si no és el cas, aquest mètode pot reparar una instal·lació anterior incompleta, però si vol actualitzar una versió anterior, escolliu el mètode "Actualització"
+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ó"
 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
diff --git a/htdocs/langs/ca_ES/ldap.lang b/htdocs/langs/ca_ES/ldap.lang
index 0154b1d9e4e..12b80e93014 100644
--- a/htdocs/langs/ca_ES/ldap.lang
+++ b/htdocs/langs/ca_ES/ldap.lang
@@ -13,7 +13,7 @@ LDAPUsers=Usuaris a la base de dades LDAP
 LDAPFieldStatus=Estat
 LDAPFieldFirstSubscriptionDate=Data primera adhesió
 LDAPFieldFirstSubscriptionAmount=Import primera adhesió
-LDAPFieldLastSubscriptionDate=Última data de subscripció
+LDAPFieldLastSubscriptionDate=Data de l'última afiliació
 LDAPFieldLastSubscriptionAmount=Últim import de subscripció
 LDAPFieldSkype=Id Skype
 LDAPFieldSkypeExample=Exemple : NomSkype
diff --git a/htdocs/langs/ca_ES/loan.lang b/htdocs/langs/ca_ES/loan.lang
index 62cdae9f474..786cd6b095d 100644
--- a/htdocs/langs/ca_ES/loan.lang
+++ b/htdocs/langs/ca_ES/loan.lang
@@ -43,7 +43,7 @@ LoanCalcDesc=Aquesta <b>calculadora d'hipoteques</ b> es pot utilitzar per calcu
 GoToInterest=%s es destinaran a INTERÈS
 GoToPrincipal=%s es destinaran a PRINCIPAL
 YouWillSpend=Gastaràs %s en l'any %s
-ListLoanAssociatedProject=List of loan associated with the project
+ListLoanAssociatedProject=Llistat de prèstecs associats al projecte
 # Admin
 ConfigLoan=Configuració del mòdul de préstecs
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Compte comptable del capital per defecte
diff --git a/htdocs/langs/ca_ES/mails.lang b/htdocs/langs/ca_ES/mails.lang
index 05910cb1a26..1b748066062 100644
--- a/htdocs/langs/ca_ES/mails.lang
+++ b/htdocs/langs/ca_ES/mails.lang
@@ -35,7 +35,7 @@ MailingStatusSentPartialy=Enviat parcialment
 MailingStatusSentCompletely=Enviat completament
 MailingStatusError=Error
 MailingStatusNotSent=No enviat
-MailSuccessfulySent=Email successfully accepted for delivery (from %s to %s)
+MailSuccessfulySent=E-mail acceptat correctament per l'enviament (de %s a %s)
 MailingSuccessfullyValidated=E-mailing validat correctament
 MailUnsubcribe=Desubscriure
 MailingStatusNotContact=No contactar
@@ -74,14 +74,18 @@ ResultOfMailSending=Resultat de l'enviament massiu d'e-mails
 NbSelected=Nº seleccionats
 NbIgnored=Nº ignorats
 NbSent=Nº enviats
-ContactsWithThirdpartyFilter=Contacte amb filtres de client
+ConfirmUnvalidateEmailing=Are you sure you want to change email <b>%s</b> to draft status?
+MailingModuleDescContactsWithThirdpartyFilter=Contacte amb filtres de client
+MailingModuleDescContactsByCompanyCategory=Contacts by third party category
+MailingModuleDescContactsByCategory=Contacts by categories
+MailingModuleDescContactsByFunction=Contacts by position
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Línea %s en archiu
 RecipientSelectionModules=Mòduls de selecció dels destinataris
 MailSelectedRecipients=Destinataris seleccionats
 MailingArea=Àrea E-Mailings
-LastMailings=Els %s últims e-mailings
+LastMailings=Últims %s e-mailings
 TargetsStatistics=Estadístiques destinataris
 NbOfCompaniesContacts=Contactes/adreces únics
 MailNoChangePossible=Destinataris d'un E-Mailing validat no modificables
@@ -89,9 +93,9 @@ SearchAMailing=Cercar un E-Mailing
 SendMailing=Envia e-mailing
 SendMail=Envia e-mail
 SentBy=Enviat 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:
+MailingNeedCommand=L'enviament d'un emailing pot realitzar-se desde la línia de comandos. Solicita a l'administrador del servidor que executi el següent comando per enviar l'emailing a tots els destinataris:
 MailingNeedCommand2=Podeu enviar en línia afegint el paràmetre MAILING_LIMIT_SENDBYWEB amb un valor nombre que indica el màxim nombre d'e-mails enviats per sessió. Per això aneu a Inici - Configuració - Varis
-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 ?
+ConfirmSendingEmailing=Si desitja enviar emailing directament desde aquesta pantalla, confirme que està segur de voler enviar l'emailing ara desde el seu navegador
 LimitSendingEmailing=Nota: L'enviament de e-mailings des de l'interfície web es realitza en tandes per raons de seguretat i "timeouts", s'enviaran a <b>%s</b> destinataris per tanda
 TargetsReset=Buidar llista
 ToClearAllRecipientsClickHere=Per buidar la llista dels destinataris d'aquest E-Mailing, feu clic al botó
@@ -146,3 +150,6 @@ AdvTgtCreateFilter=Crea filtre
 AdvTgtOrCreateNewFilter=Nom de nou filtre
 NoContactWithCategoryFound=No s'han trobat contactes/adreces amb categoria
 NoContactLinkedToThirdpartieWithCategoryFound=No s'han trobat contactes/adreces amb categoria
+OutGoingEmailSetup=Outgoing email setup
+InGoingEmailSetup=Incoming email setup
+
diff --git a/htdocs/langs/ca_ES/main.lang b/htdocs/langs/ca_ES/main.lang
index 8ecb3e83292..fd7e773815e 100644
--- a/htdocs/langs/ca_ES/main.lang
+++ b/htdocs/langs/ca_ES/main.lang
@@ -69,6 +69,7 @@ SetDate=Indica la data
 SelectDate=Seleccioneu una data
 SeeAlso=Veure també %s
 SeeHere=Mira aquí
+Apply=Aplicar
 BackgroundColorByDefault=Color de fons
 FileRenamed=L'arxiu s'ha renombrat correctament
 FileUploaded=L'arxiu s'ha carregat correctament
@@ -251,7 +252,7 @@ DateProcess=Data procés
 DateBuild=Data generació de l'informe
 DatePayment=Data pagament
 DateApprove=Data d'aprovació
-DateApprove2=Data d'aprovació (segona aprobació)
+DateApprove2=Data d'aprovació (segona aprovació)
 UserCreation=Usuari de creació
 UserModification=Usuari de modificació
 UserCreationShort=Usuari crea.
@@ -433,7 +434,7 @@ Reportings=Informes
 Draft=Esborrany
 Drafts=Esborranys
 Validated=Validat
-Opened=Actiu
+Opened=Obert
 New=Nou
 Discount=Descompte
 Unknown=Desconegut
@@ -461,7 +462,7 @@ DeletePicture=Elimina la imatge
 ConfirmDeletePicture=Confirmes l'eliminació de la imatge?
 Login=Login
 CurrentLogin=Login actual
-EnterLoginDetail=Enter login details
+EnterLoginDetail=Introduir detalls del login
 January=gener
 February=febrer
 March=març
@@ -599,6 +600,8 @@ SessionName=Nom sesió
 Method=Mètode
 Receive=Recepció
 CompleteOrNoMoreReceptionExpected=Completat o no s'espera res més
+ExpectedValue=Valor esperat
+CurrentValue=Valor actual
 PartialWoman=Parcial
 TotalWoman=Total
 NeverReceived=Mai rebut
@@ -755,7 +758,8 @@ RemoveString=Eliminar cadena '%s'
 SomeTranslationAreUncomplete=Alguns idiomes poden estar traduïts parcialment o poden tenir errors. Si detectes alguns, pots arreglar els arxius d'idiomes registrant-te a <a href="http://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
 DirectDownloadLink=Enllaç de descàrrega directa
 Download=Descarrega
-ActualizeCurrency=Update currency rate
+ActualizeCurrency=Actualitza el canvi de divisa
+Fiscalyear=Any fiscal
 # Week day
 Monday=Dilluns
 Tuesday=Dimarts
@@ -790,8 +794,8 @@ SetRef=Indica ref
 Select2ResultFoundUseArrows=Alguns resultats trobats. Fes servir les fletxes per seleccionar.
 Select2NotFound=No s'han trobat resultats
 Select2Enter=Entrar
-Select2MoreCharacter=or more characters<br /><br /><strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
-Select2MoreCharacters=or more characters<br /><br /><strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
+Select2MoreCharacter=o més caracters<br /><br /><strong>Buscar sintaxi:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Qualsevol caracter</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Comença per</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> Acaba per</kbd> (ab$)<br />
+Select2MoreCharacters=o més caracters<br /><br /><strong>Buscar sintaxi:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Qualsevol caracter</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Comença per</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> Acaba per</kbd> (ab$)<br />
 Select2LoadingMoreResults=Carregant més resultats
 Select2SearchInProgress=Busqueda en progrés...
 SearchIntoThirdparties=Tercers
@@ -812,3 +816,5 @@ SearchIntoContracts=Contractes
 SearchIntoCustomerShipments=Enviaments de client
 SearchIntoExpenseReports=Informes de despeses
 SearchIntoLeaves=Dies lliures
+
+BulkActions=Bulk actions
diff --git a/htdocs/langs/ca_ES/members.lang b/htdocs/langs/ca_ES/members.lang
index 72d0c88aa7a..6755921f493 100644
--- a/htdocs/langs/ca_ES/members.lang
+++ b/htdocs/langs/ca_ES/members.lang
@@ -92,7 +92,7 @@ BlankSubscriptionFormDesc=Dolibarr pot proporcionar una URL de pàgina pública
 EnablePublicSubscriptionForm=Activar el formulari públic d'auto-inscripció
 ExportDataset_member_1=Socis i quotes
 ImportDataset_member_1=Socis
-LastMembersModified=Els últims %s socis modificats
+LastMembersModified=Últims %s socis modificats
 LastSubscriptionsModified=Últimes %s subscripcions modificades
 String=Cadena
 Text=Text llarg
@@ -137,7 +137,7 @@ DocForOneMemberCards=Generació de targetes per a un soci en particular
 DocForLabels=Generació d'etiquetes d'adreces (Format de plantilla configurat actualment: <b>%s</b>)
 SubscriptionPayment=Pagament quota
 LastSubscriptionDate=Data de l'última afiliació
-LastSubscriptionAmount=Import de l'última afiliació
+LastSubscriptionAmount=Últim import de subscripció
 MembersStatisticsByCountries=Estadístiques de socis per país
 MembersStatisticsByState=Estadístiques de socis per província
 MembersStatisticsByTown=Estadístiques de socis per població
diff --git a/htdocs/langs/ca_ES/oauth.lang b/htdocs/langs/ca_ES/oauth.lang
index eda1d6f6b68..d6ea5ea9a71 100644
--- a/htdocs/langs/ca_ES/oauth.lang
+++ b/htdocs/langs/ca_ES/oauth.lang
@@ -7,13 +7,13 @@ IsTokenGenerated=S'ha generat el token?
 NoAccessToken=No es pot accedir al token desat en la base de dades local
 HasAccessToken=S'ha generat un token i s'ha desat en la base de dades local
 NewTokenStored=Token rebut i desat
-ToCheckDeleteTokenOnProvider=Click here to check/delete authorization saved by %s OAuth provider
+ToCheckDeleteTokenOnProvider=Fes clic aqui per comprovar/eliminar l'autorització desada pel proveïdor OAuth %s
 TokenDeleted=Token eliminat
 RequestAccess=Clica aquí per demanar/renovar l'accés i rebre un nou token per desar
 DeleteAccess=Faci clic aquí per eliminar token
 UseTheFollowingUrlAsRedirectURI=Utilitza la següent URL com a URI de redirecció quan es crea la teva credencial en el teu proveïdor OAuth:
 ListOfSupportedOauthProviders=Entra les credencials donades pel teu proveïdor OAuth2. Només es poden veure proveïdors que suporten OAuth2. Aquesta configuració es pot utilitzar per altres mòduls que necessiten autenticació OAuth2.
-OAuthSetupForLogin=Page to generate an OAuth token
+OAuthSetupForLogin=Pàgina per generar un token OAuth
 SeePreviousTab=Veure la pestanya anterior
 OAuthIDSecret=OAuth ID i Secret
 TOKEN_REFRESH=Refresc present de token
diff --git a/htdocs/langs/ca_ES/orders.lang b/htdocs/langs/ca_ES/orders.lang
index 36c24e16dfd..b14e2857f40 100644
--- a/htdocs/langs/ca_ES/orders.lang
+++ b/htdocs/langs/ca_ES/orders.lang
@@ -39,7 +39,7 @@ StatusOrderRefusedShort=Rebutjada
 StatusOrderBilledShort=Facturat
 StatusOrderToProcessShort=A processar
 StatusOrderReceivedPartiallyShort=Rebuda parcialment
-StatusOrderReceivedAllShort=Rebuda
+StatusOrderReceivedAllShort=Productes rebuts
 StatusOrderCanceled=Anul·lada
 StatusOrderDraft=Esborrany (a validar)
 StatusOrderValidated=Validada
@@ -51,7 +51,7 @@ StatusOrderApproved=Aprovada
 StatusOrderRefused=Rebutjada
 StatusOrderBilled=Facturat
 StatusOrderReceivedPartially=Rebuda parcialment
-StatusOrderReceivedAll=Rebuda
+StatusOrderReceivedAll=All products received
 ShippingExist=Existeix una expedició
 QtyOrdered=Qt. demanda
 ProductQtyInDraft=Quantitat de producte en comandes esborrany
@@ -61,7 +61,7 @@ MenuOrdersToBill2=Comandes facturables
 ShipProduct=Enviar producte
 CreateOrder=Crear comanda
 RefuseOrder=Rebutja la comanda
-ApproveOrder=Aprobar comanda
+ApproveOrder=Aprova la comanda
 Approve2Order=Aprovar comanda (segon nivell)
 ValidateOrder=Validar la comanda
 UnvalidateOrder=Desvalidar la comanda
@@ -101,7 +101,7 @@ OnProcessOrders=Comandes en procés
 RefOrder=Ref. comanda
 RefCustomerOrder=Ref. comanda pel client
 RefOrderSupplier=Ref. comanda pel proveïdor
-RefOrderSupplierShort=Ref. order supplier
+RefOrderSupplierShort=Ref. comanda proveïdor
 SendOrderByMail=Envia comanda per e-mail
 ActionsOnOrder=Esdeveniments sobre la comanda
 NoArticleOfTypeProduct=No hi ha articles de tipus 'producte' i per tant enviables en aquesta comanda
diff --git a/htdocs/langs/ca_ES/other.lang b/htdocs/langs/ca_ES/other.lang
index a4ecdd188ea..fc4faec0c42 100644
--- a/htdocs/langs/ca_ES/other.lang
+++ b/htdocs/langs/ca_ES/other.lang
@@ -68,14 +68,15 @@ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nAquí tens la fac
 PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nLi adjuntem l'enviament __SHIPPINGREF__\n\n__PERSONALIZED__Cordialment\n\n__SIGNATURE__
 PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nLi adjuntem l'intervenció __FICHINTERREF__\n\n__PERSONALIZED__Cordialment\n\n__SIGNATURE__
 PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n__PERSONALIZED__\n\n__SIGNATURE__
-DemoDesc=Dolibarr és un ERP/CRM compacte que suporta múltiples mòduls funcionals. Una demostració amb tots els mòduls no té gaire sentit ja que és un escenari que no passa mai. Per tant, hi ha disponibles diferents perfils de demostració.
+DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Selecciona el perfil de demo que cobreixi millor les teves necessitats...
+ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
 DemoFundation=Gestió de socis d'una entitat
 DemoFundation2=Gestió de socis i tresoreria d'una entitat
-DemoCompanyServiceOnly=Gestió d'un treballador per compte propi realitzant serveis
+DemoCompanyServiceOnly=Company or freelance selling service only
 DemoCompanyShopWithCashDesk=Gestió d'una botiga amb caixa
-DemoCompanyProductAndStocks=Gestió d'una PIME amb venda de productes
-DemoCompanyAll=Gestió d'una PIME amb activitats múltiples (tots els mòduls principals)
+DemoCompanyProductAndStocks=Company selling products with a shop
+DemoCompanyAll=Company with multiple activities (all main modules)
 CreatedBy=Creat per %s
 ModifiedBy=Modificat per %s
 ValidatedBy=Validat per %s
diff --git a/htdocs/langs/ca_ES/printing.lang b/htdocs/langs/ca_ES/printing.lang
index b7968ff8fba..01f8e38b633 100644
--- a/htdocs/langs/ca_ES/printing.lang
+++ b/htdocs/langs/ca_ES/printing.lang
@@ -46,6 +46,6 @@ IPP_Media=Comunicació impressora
 IPP_Supported=Tipus de comunicació
 DirectPrintingJobsDesc=Aquesta pàgina llista els treballs de impressió torbats per a les impressores disponibles.
 GoogleAuthNotConfigured=No s'ha configurat Google OAuth. Habilita el mòdul OAuth i indica un Google ID/Secret.
-GoogleAuthConfigured=Google OAuth credentials were found into setup of module OAuth.
+GoogleAuthConfigured=Les credencials OAuth de Google es troben en la configuració del mòdul OAuth.
 PrintingDriverDescprintgcp=Variables de configuració del driver d'impressió Google Cloud Print.
 PrintTestDescprintgcp=Llista d'impressores per Google Cloud Print
diff --git a/htdocs/langs/ca_ES/products.lang b/htdocs/langs/ca_ES/products.lang
index 91b2d64b998..5ebd8a862e7 100644
--- a/htdocs/langs/ca_ES/products.lang
+++ b/htdocs/langs/ca_ES/products.lang
@@ -31,9 +31,9 @@ ProductsOnSellAndOnBuy=Productes de venda i de compra
 ServicesOnSell=Serveis de venda o de compra
 ServicesNotOnSell=Serveis fora de venda
 ServicesOnSellAndOnBuy=Serveis en venda o de compra
-LastModifiedProductsAndServices=Els últims %s productes/serveis modificats
-LastRecordedProducts=Els últims %s productes registrats
-LastRecordedServices=Els últims %s serveis registrats
+LastModifiedProductsAndServices=Últims %s productes/serveis modificats
+LastRecordedProducts=Últims %s productes registrats
+LastRecordedServices=Últims %s serveis registrats
 CardProduct0=Fitxa de producte
 CardProduct1=Fitxa de servei
 Stock=Stock
@@ -60,7 +60,7 @@ SellingPrice=Preu de venda
 SellingPriceHT=PVP sense IVA
 SellingPriceTTC=PVP amb IVA
 CostPriceDescription=Aquest preu (net d'impostos) es pot utilitzar per acumular l'import mitjà del cost del producte per l'empresa. Pot ser qualsevol preu calculat per tu mateix, per exemple amb el preu mitjà de compra més el cost mitjà de producció i distribució.
-CostPriceUsage=En una versió futura, aquest valor es podrà utilitzar pel càlcul de marges.
+CostPriceUsage=This value could be used for margin calculation.
 SoldAmount=Import venut
 PurchasedAmount=Import comprat
 NewPrice=Nou preu
@@ -142,6 +142,7 @@ ConfirmCloneProduct=Estàs segur que vols clonar el producte o servei <b>%s</b>?
 CloneContentProduct=Clonar només la informació general del producte/servei
 ClonePricesProduct=Clonar la informació general i els preus
 CloneCompositionProduct=Clonar productes/serveis compostos
+CloneCombinationsProduct=Clone product variants
 ProductIsUsed=Aquest producte és utilitzat
 NewRefForClone=Ref. del nou producte/servei
 SellingPrices=Preus de venda
@@ -258,4 +259,41 @@ VolumeUnits=Unitat de volum
 SizeUnits=Unitat de tamany
 DeleteProductBuyPrice=Elimina preu de compra
 ConfirmDeleteProductBuyPrice=Esteu segur de voler eliminar aquest preu de compra?
+SubProduct=Sub product
 
+#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
+ProductCombinations=Variants
+HideProductCombinations=Hide products variant in the products selector
+ProductCombination=Variant
+NewProductCombination=New variant
+EditProductCombination=Editing variant
+ProductCombinationGenerator=Variants generator
+Features=Features
+PriceImpact=Price impact
+WeightImpact=Weight impact
+NewProductAttribute=Nou atribut
+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
+PercentageVariation=Percentage variation
+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 child products
+ConfirmCloneProductCombinations=Would you like to copy all the product variant to the 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
diff --git a/htdocs/langs/ca_ES/projects.lang b/htdocs/langs/ca_ES/projects.lang
index b75bcbb9bde..d6a8790e353 100644
--- a/htdocs/langs/ca_ES/projects.lang
+++ b/htdocs/langs/ca_ES/projects.lang
@@ -31,7 +31,7 @@ ConfirmDeleteAProject=Vols eliminar aquest projecte?
 ConfirmDeleteATask=Vols eliminar aquesta tasca?
 OpenedProjects=Projectes oberts
 OpenedTasks=Tasques obertes
-OpportunitiesStatusForOpenedProjects=Import d'oportunitats de projectes oberts per estat
+OpportunitiesStatusForOpenedProjects=Quantitat d'oportunitats de projectes oberts per estat
 OpportunitiesStatusForProjects=Import d'oportunitats de projectes per estat
 ShowProject=Veure projecte
 SetProject=Indica el projecte
@@ -96,6 +96,7 @@ ValidateProject=Validar projecte
 ConfirmValidateProject=Vols validar aquest projecte?
 CloseAProject=Tancar projecte
 ConfirmCloseAProject=Vols tancar aquest projecte?
+AlsoCloseAProject=Also close project (keep it open if you still need to follow production tasks on it)
 ReOpenAProject=Reobrir projecte
 ConfirmReOpenAProject=Vols reobrir aquest projecte?
 ProjectContact=Contactes projecte
@@ -121,7 +122,7 @@ CloneProjectFiles=Clonar els arxius adjunts del projecte
 CloneTaskFiles=Clonar els arxius adjunts de la(es) tasca(ques) (si es clonen les tasques)
 CloneMoveDate=Actualitzar les dates del projecte i tasques a partir d'ara?
 ConfirmCloneProject=Vols clonar aquest projecte?
-ProjectReportDate=Canviar les dates de les tasques en funció de la data d'inici del projecte
+ProjectReportDate=Change task dates according to new project start date
 ErrorShiftTaskDate=S'ha produït un error en el canvi de les dates de les tasques
 ProjectsAndTasksLines=Projectes i tasques
 ProjectCreatedInDolibarr=Projecte %s creat
diff --git a/htdocs/langs/ca_ES/propal.lang b/htdocs/langs/ca_ES/propal.lang
index 57aefb00ccc..5391f847879 100644
--- a/htdocs/langs/ca_ES/propal.lang
+++ b/htdocs/langs/ca_ES/propal.lang
@@ -15,8 +15,8 @@ ValidateProp=Validar pressupost
 AddProp=Crear pressupost
 ConfirmDeleteProp=Estàs segur que vols eliminar aquesta proposta comercial?
 ConfirmValidateProp=Estàs segur que vols validar aquesta proposta comercial sota el nom <b>%s</b>?
-LastPropals=Els últims %s pressupostos
-LastModifiedProposals=Els últims %s pressupostos modificats
+LastPropals=Últims %s pressupostos
+LastModifiedProposals=Últims %s pressupostos modificats
 AllPropals=Tots els pressupostos
 SearchAProposal=Cercar un pressupost
 NoProposal=Sense pressupost
@@ -26,9 +26,9 @@ AmountOfProposalsByMonthHT=Import per mes (Sense IVA)
 NbOfProposals=Número pressupostos
 ShowPropal=Veure pressupost
 PropalsDraft=Esborranys
-PropalsOpened=Actiu
+PropalsOpened=Obert
 PropalStatusDraft=Esborrany (a validar)
-PropalStatusValidated=Validat (pressupost obert)
+PropalStatusValidated=Validated (proposal is opened)
 PropalStatusSigned=Signat (a facturar)
 PropalStatusNotSigned=No signat (tancat)
 PropalStatusBilled=Facturat
diff --git a/htdocs/langs/ca_ES/stocks.lang b/htdocs/langs/ca_ES/stocks.lang
index ff533cc429d..cfc57cfc1ae 100644
--- a/htdocs/langs/ca_ES/stocks.lang
+++ b/htdocs/langs/ca_ES/stocks.lang
@@ -22,13 +22,15 @@ Movements=Moviments
 ErrorWarehouseRefRequired=El nom de referència del magatzem és obligatori
 ListOfWarehouses=Llistat de magatzems
 ListOfStockMovements=Llistat de moviments de estoc
+StockMovementForId=Movement ID %d
+ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Àrea de magatzems
 Location=Lloc
 LocationSummary=Nom curt del lloc
 NumberOfDifferentProducts=Nombre de productes diferents
 NumberOfProducts=Nombre total de productes
 LastMovement=Últim moviment
-LastMovements=Ultims moviments
+LastMovements=Últims moviments
 Units=Unitats
 Unit=Unitat
 StockCorrection=Regularització d'estoc
@@ -140,4 +142,4 @@ ProductStockWarehouseCreated=Estoc límit per llançar una alerta i estoc òptim
 ProductStockWarehouseUpdated=Estoc límit per llançar una alerta i estoc òptim desitjat actualitzats correctament
 ProductStockWarehouseDeleted=S'ha eliminat correctament el límit d'estoc per alerta i l'estoc òptim desitjat.
 AddNewProductStockWarehouse=Posar nou estoc límit per alertar i nou estoc òptim desitjat
-AddStockLocationLine=Decrease quantity then click to add another warehouse for this product
+AddStockLocationLine=Decrementa quantitat i a continuació fes clic per afegir un altre magatzem per aquest producte
diff --git a/htdocs/langs/ca_ES/supplier_proposal.lang b/htdocs/langs/ca_ES/supplier_proposal.lang
index b39db911264..73d7b8f0f0d 100644
--- a/htdocs/langs/ca_ES/supplier_proposal.lang
+++ b/htdocs/langs/ca_ES/supplier_proposal.lang
@@ -8,7 +8,7 @@ SearchRequest=Busca una petició
 DraftRequests=Peticions esborrany
 SupplierProposalsDraft=Pressupost de proveïdor esborrany
 LastModifiedRequests=Últimes %s peticions de preu modificades
-RequestsOpened=Obre una petició de preu
+RequestsOpened=Opened price requests
 SupplierProposalArea=Àrea de pressupostos de proveïdor
 SupplierProposalShort=Pressupost de proveïdor
 SupplierProposals=Pressupost de proveïdor
@@ -23,7 +23,7 @@ ConfirmValidateAsk=Estàs segur que vols validar aquest preu de sol·licitud sot
 DeleteAsk=Elimina la petició
 ValidateAsk=Validar petició
 SupplierProposalStatusDraft=Esborrany (a validar)
-SupplierProposalStatusValidated=Validada (petició oberta)
+SupplierProposalStatusValidated=Validated (request is opened)
 SupplierProposalStatusClosed=Tancat
 SupplierProposalStatusSigned=Acceptat
 SupplierProposalStatusNotSigned=Rebutjat
diff --git a/htdocs/langs/ca_ES/suppliers.lang b/htdocs/langs/ca_ES/suppliers.lang
index fc42e8ab194..bb40e3b8f9e 100644
--- a/htdocs/langs/ca_ES/suppliers.lang
+++ b/htdocs/langs/ca_ES/suppliers.lang
@@ -7,13 +7,13 @@ History=Històric
 ListOfSuppliers=Llistat de proveïdors
 ShowSupplier=Mostrar proveïdor
 OrderDate=Data comanda
-BuyingPriceMin=Best buying price
-BuyingPriceMinShort=Best buying price
-TotalBuyingPriceMinShort=Total of subproducts buying prices
-TotalSellingPriceMinShort=Total of subproducts selling prices
+BuyingPriceMin=El millor preu de compra
+BuyingPriceMinShort=El millor preu de compra
+TotalBuyingPriceMinShort=Total dels preus de compra dels subproductes
+TotalSellingPriceMinShort=Total dels preus de venda de subproductes
 SomeSubProductHaveNoPrices=Alguns subproductes no tenen preus definits
-AddSupplierPrice=Add buying price
-ChangeSupplierPrice=Change buying price
+AddSupplierPrice=Afegeix preu de compra
+ChangeSupplierPrice=Canvia el preu de compra
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=Aquesta referència de proveïdor ja està associada a la referència: %s
 NoRecordedSuppliers=Sense proveïdors registrats
 SupplierPayment=Pagament a proveïdor
@@ -24,10 +24,10 @@ ExportDataset_fournisseur_1=Factures de proveïdors i línies de factura
 ExportDataset_fournisseur_2=Factures proveïdors i pagaments
 ExportDataset_fournisseur_3=Comandes de proveïdors i línies de comanda
 ApproveThisOrder=Aprovar aquesta comanda
-ConfirmApproveThisOrder=Esteu segur de voler aprovar la comanda a proveïdor <b>%s</b>?
+ConfirmApproveThisOrder=Vols aprovar la comanda <b>%s</b>?
 DenyingThisOrder=Denegar aquesta comanda
-ConfirmDenyingThisOrder=Esteu segur de voler denegar la comanda a proveïdor <b>%s</b>?
-ConfirmCancelThisOrder=Esteu segur de voler cancel·lar la comanda a proveïdor <b>%s</b>?
+ConfirmDenyingThisOrder=Vols denegar la comanda <b>%s</b>?
+ConfirmCancelThisOrder=Vols cancel·lar la comanda <b>%s</b>?
 AddSupplierOrder=Crear comanda a proveïdor
 AddSupplierInvoice=Crear factura de proveïdor
 ListOfSupplierProductForSupplier=Llistat de productes i preus del proveïdor <b>%s</b>
@@ -41,3 +41,4 @@ DoNotOrderThisProductToThisSupplier=No demanar
 NotTheGoodQualitySupplier=Qualitat incorrecte
 ReputationForThisProduct=Reputació
 BuyerName=Nom del comprador
+AllProductServicePrices=All product / service prices
diff --git a/htdocs/langs/ca_ES/trips.lang b/htdocs/langs/ca_ES/trips.lang
index 21807763c0c..edad7afd817 100644
--- a/htdocs/langs/ca_ES/trips.lang
+++ b/htdocs/langs/ca_ES/trips.lang
@@ -23,7 +23,7 @@ ClassifyRefunded=Classificar 'Retornat'
 ExpenseReportWaitingForApproval=S'ha generat un nou informe de vendes per aprovació
 ExpenseReportWaitingForApprovalMessage=S'ha generat un nou informe de despeses i està esperant l'aprovació.\n- Usuari: %s\n- Període: %s\nClica aquí per validar: %s
 ExpenseReportWaitingForReApproval=S'ha generat un informe de despeses per a re-aprovació
-ExpenseReportWaitingForReApprovalMessage=An expense report has been submitted and is waiting for re-approval.\nThe %s, you refused to approve the expense report for this reason: %s.\nA new version has been proposed and waiting for your approval.\n - User: %s\n - Period: %s\nClick here to validate: %s
+ExpenseReportWaitingForReApprovalMessage=S'ha generat un nou informe de despeses i està esperant la teva re-aprovació.\nEl %s no acceptada per aprovar el informe de despeses per aquesta raó: %s\nS'ha presentat una nova versió i està a l'espera de la teva aprovació.\n- Usuari: %s\n- Període: %s\nClica aquí per validar: %s
 ExpenseReportApproved=S'ha aprovat un informe de despeses
 ExpenseReportApprovedMessage=S'ha aprovat el informe de despeses %s.\n- Usuari: %s\n- Aprovat per: %s\nClica aquí per mostrar el informe de despeses: %s
 ExpenseReportRefused=S'ha rebutjat un informe de despeses
diff --git a/htdocs/langs/ca_ES/users.lang b/htdocs/langs/ca_ES/users.lang
index 1476a56605d..58cad7db8ff 100644
--- a/htdocs/langs/ca_ES/users.lang
+++ b/htdocs/langs/ca_ES/users.lang
@@ -45,8 +45,8 @@ RemoveFromGroup=Eliminar del grup
 PasswordChangedAndSentTo=Contrasenya canviada i enviada a <b>%s</b>.
 PasswordChangeRequestSent=Petició de canvi de contrasenya per a <b>%s</b> enviada a <b>%s</b>.
 MenuUsersAndGroups=Usuaris i grups
-LastGroupsCreated=Els últims %s grups creats
-LastUsersCreated=Els últims %s usuaris creats
+LastGroupsCreated=Últims %s grups creats
+LastUsersCreated=Últims %s usuaris creats
 ShowGroup=Veure grup
 ShowUser=Veure usuari
 NonAffectedUsers=Usuaris no destinats al grup
diff --git a/htdocs/langs/ca_ES/withdrawals.lang b/htdocs/langs/ca_ES/withdrawals.lang
index 81e37875aa2..83455a5ed7b 100644
--- a/htdocs/langs/ca_ES/withdrawals.lang
+++ b/htdocs/langs/ca_ES/withdrawals.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - withdrawals
-CustomersStandingOrdersArea=Àrea per a ordres de pagament mitjançant domiciliació bancària
+CustomersStandingOrdersArea=Àrea de pagament de domiciliacions bancaries
 SuppliersStandingOrdersArea=Àrea de pagament mitjançant domiciliació bancària
 StandingOrders=Ordres de pagament mitjançant domiciliació bancària
 StandingOrder=Ordre de pagament de dèbit directe
 NewStandingOrder=Nova ordre de domiciliació bancària
 StandingOrderToProcess=A processar
-WithdrawalsReceipts=Ordres directes de dèbit 
+WithdrawalsReceipts=Domiciliacions
 WithdrawalReceipt=Domiciliació
 LastWithdrawalReceipts=Últims %s fitxers per a la domiciliació bancària
 WithdrawalsLines=Línies de ordres de domiciliació bancària
@@ -24,6 +24,7 @@ WithdrawStatistics=Estadístiques del pagament mitjançant domiciliació bancàr
 WithdrawRejectStatistics=Configuració del rebutj de pagament per domiciliació bancària
 LastWithdrawalReceipt=Últims %s rebuts domiciliats
 MakeWithdrawRequest=Fer una petició de pagament per domiciliació bancària
+WithdrawRequestsDone=%s direct debit payment requests recorded
 ThirdPartyBankCode=Codi banc del tercer
 NoInvoiceCouldBeWithdrawed=No s'ha domiciliat cap factura. Assegureu-vos que les factures són d'empreses amb les dades de comptes bancaris correctes.
 ClassCredited=Classificar com "Abonada"
@@ -76,8 +77,8 @@ RUM=UMR
 RUMLong=Referència de mandat única (UMR)
 RUMWillBeGenerated=Número UMR serà generat un cop la informació del compte bancària està salvada
 WithdrawMode=Modo de domiciliació bancària (FRST o RECUR)
-WithdrawRequestAmount=Total de la petició de domiciliació:
-WithdrawRequestErrorNilAmount=No es pot crear la sol·licitud de domiciliació per un import nul.
+WithdrawRequestAmount=Amount of Direct debit request:
+WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty amount.
 SepaMandate=Mandat de domiciliació bancària SEPA 
 SepaMandateShort=Mandat SEPA
 PleaseReturnMandate=Si us plau retorna aquest formulari de mandat per correu a %s o per mail a
diff --git a/htdocs/langs/cs_CZ/accountancy.lang b/htdocs/langs/cs_CZ/accountancy.lang
index c3f0daf5e71..bbe888dfbf6 100644
--- a/htdocs/langs/cs_CZ/accountancy.lang
+++ b/htdocs/langs/cs_CZ/accountancy.lang
@@ -194,6 +194,8 @@ ChangeBinding=Change the binding
 
 ## Admin
 ApplyMassCategories=Apply mass categories
+AddAccountFromBookKeepingWithNoCategories=Add acccount already used with no categories
+CategoryDeleted=Category for the accounting account has been removed
 
 ## Export
 Exports=Exporty
@@ -209,6 +211,7 @@ Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution
 Modelcsv_quadratus=Export towards Quadratus QuadraCompta
 Modelcsv_ebp=Export towards EBP
 Modelcsv_cogilog=Export towards Cogilog
+ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
 InitAccountancy=Init accountancy
diff --git a/htdocs/langs/cs_CZ/admin.lang b/htdocs/langs/cs_CZ/admin.lang
index 59e5c177861..ac4f4a4e535 100644
--- a/htdocs/langs/cs_CZ/admin.lang
+++ b/htdocs/langs/cs_CZ/admin.lang
@@ -9,17 +9,20 @@ VersionDevelopment=Vývoj
 VersionUnknown=Neznámý
 VersionRecommanded=Doporučené
 FileCheck=Files integrity checker
-FileCheckDesc=This tool allows you to check the integrity of files of your application, comparing each files with the official ones. You can use this tool to detect if some files were modified by a hacker for example.
+FileCheckDesc=This tool allows you to check the integrity of files and setup of your application, comparing each files with the official ones. 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.
 FileIntegrityIsStrictlyConformedWithReference=Files integrity is strictly conformed with the reference.
-FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified of removed.
+FileIntegrityIsOkButFilesWereAdded=Files integrity check has passed, however some new files were added.
+FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified, removed or added.
 GlobalChecksum=Global checksum
 MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
 LocalSignature=Embedded local signature (less reliable)
 RemoteSignature=Remote distant signature (more reliable)
 FilesMissing=Chybějící soubory
 FilesUpdated=Aktualizované soubory
+FilesModified=Modified Files
+FilesAdded=Added Files
 FileCheckDolibarr=Check integrity of application files
-AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from a certified package
+AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from an official package
 XmlNotFound=Xml Integrity File of application not found
 SessionId=ID relace
 SessionSaveHandler=Manipulátor uložených relací
@@ -188,7 +191,9 @@ BoxesDesc=Widgets are components showing some information that you can add to pe
 OnlyActiveElementsAreShown=Pouze prvky z <a href="%s">povolených modulů</a> jsou uvedeny.
 ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
-ModulesMarketPlaces=Více modulů ...
+ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
+ModulesMarketPlaces=Find external modules...
+GoModuleSetupArea=To deploy/install a new module, go onto the Module setup area at <a href="%s">%s</a>.
 DoliStoreDesc=DoliStore, oficiální trh pro download externích modulů Dolibarr ERP / CRM
 DoliPartnersDesc=List of companies providing custom developed modules or features (Note: anyone experienced in PHP programming can provide custom development for an open source project)
 WebSiteDesc=Reference websites to find more modules...
@@ -280,20 +285,21 @@ MenuHandlers=Menu handlery
 MenuAdmin=Menu editor
 DoNotUseInProduction=Nepoužívejte ve výrobě
 ThisIsProcessToFollow=This is steps to process:
-ThisIsAlternativeProcessToFollow=To je alternativa k nastavení procesu:
+ThisIsAlternativeProcessToFollow=This is an alternative setup to process manually:
 StepNb=Krok %s
 FindPackageFromWebSite=Nalezni balíček, obsahující funkci jež chcete (např. na oficiálních stránkách %s).
 DownloadPackageFromWebSite=Download package (for example from official web site %s).
-UnpackPackageInDolibarrRoot=Unpack package file into Dolibarr server directory dedicated to external modules: <b>%s</b>
-SetupIsReadyForUse=Instalace je dokončena a Dolibarr je připraven k použití.
-NotExistsDirect=Alternativní kořenový adresář není definován. <br>
-InfDirAlt=Od verze 3 je možné definovat alternativní kořenovou složku. To umožňuje ukládat na stejné místo plug-iny a vlastní šablony. <br> Stačí vytvořit adresář v kořenovém adresáři Dolibarr (např.: custom). <br>
-InfDirExample=<br>Pak je deklarujte v souboru conf.php<br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>*Řádky jsou zakomentovány znakem "#", pro odkomentování tento znak odmažte.
+UnpackPackageInDolibarrRoot=Unpack the packaged files into server directory dedicated to Dolibarr: <b>%s</b>
+UnpackPackageInModulesRoot=To deploy/install an external module, unpack the packaged files into the server directory dedicated to modules: <b>%s</b>
+SetupIsReadyForUse=Module deployment is finished. You must however enable and setup the module in your application by going on the page to setup modules: <a href="%s">%s</a>.
+NotExistsDirect=The alternative root directory is not defined to an existing directory.<br>
+InfDirAlt=Since version 3, it is possible to define an alternative root directory. This allows you to store, into a dedicated directory, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
+InfDirExample=<br>Then declare it in the file <strong>conf.php</strong><br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>If these lines are commented with "#", to enable them, just uncomment by removing the "#" character.
 YouCanSubmitFile=For this step, you can send package using this tool: Select module file
 CurrentVersion=Dolibarr aktuální verze
 CallUpdatePage=Go to the page that updates the database structure and data: %s.
 LastStableVersion=Latest stable version
-LastActivationDate=Last activation date
+LastActivationDate=Latest activation date
 UpdateServerOffline=Aktualizace serveru v režimu offline
 GenericMaskCodes=Můžete zadat jakoukoliv masku číselné řady. V masce můžete použít následující značky: <br><b>{000000}</b> číslo, automaticky inkrementované o 1 při každým %s. Počet nul odpovídá požadovanému počtu číslic. Číslo se zleva doplní nulami pro dosažení požadovaného počtu číslic. <br><b>{000000+000}</b> stejné jako předchozí, ale ofset odpovídající číslu napravo od znaku + bude použit pro první %s. <br><b>{000000@x}</b> stejné jako předchozí, ale počítadlo se resetuje na nulu, když je dosaženo měsíce x (x je v rozmezí 1 ~ 12, nebo 0 pro použití prvního měsíce fiskálního roku definované ve vaší konfiguraci, nebo 99 pro vynulování každý měsíc ). Pokud se tato volba používá, a x je 2 nebo vyšší, pak je rovněž požadovaná posloupnost {yy}{mm} či {yyyy}{mm}. <br><b>{dd}</b> den (01 až 31).<br><b>{mm}</b> měsíc (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> nebo <b>{y}</b> rok, 2, 4 nebo 1 číslo. <br>
 GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
@@ -376,11 +382,11 @@ ExtrafieldCheckBox=Zaškrtávací políčko
 ExtrafieldRadio=Přepínač
 ExtrafieldCheckBoxFromList= Kontrolní pole z tabulky
 ExtrafieldLink=Odkaz na objekt
-ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>In order to have the list depending on another :<br>1,value1|parent_list_code:parent_key<br>2,value2|parent_list_code:parent_key
+ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list :<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list :<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
-ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
+ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Example : Societe:societe/class/societe.class.php
 LibraryToBuildPDF=Library used for PDF generation
 WarningUsingFPDF=Upozornění: Váš <b>conf.php</b> obsahuje direktivu <b>dolibarr_pdf_force_fpdf = 1.</b> To znamená, že můžete používat knihovnu FPDF pro generování PDF souborů. Tato knihovna je stará a nepodporuje mnoho funkcí (Unicode, obraz transparentnost, azbuka, arabské a asijské jazyky, ...), takže může dojít k chybám při generování PDF. <br> Chcete-li vyřešit tento a mají plnou podporu generování PDF, stáhněte si <a href="http://www.tcpdf.org/" target="_blank">TCPDF knihovny</a> , pak komentář nebo odebrat řádek <b>$ dolibarr_pdf_force_fpdf = 1,</b> a místo něj doplnit <b>$ dolibarr_lib_TCPDF_PATH = 'path_to_TCPDF_dir &quot;</b>
@@ -415,10 +421,10 @@ ModuleCompanyCodeDigitaria=Účetnictví kód závisí na kódu třetích stran.
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
 WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<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).
-
+ClickToShowDescription=Click to show description
 # Modules
 Module0Name=Uživatelé a skupiny
-Module0Desc=Uživatelé a skupiny řízení
+Module0Desc=Users / Employees and Groups management
 Module1Name=Třetí strany
 Module1Desc=Firmy a správu kontaktů (zákazníci, vyhlídky ...)
 Module2Name=Obchodní
@@ -689,7 +695,7 @@ PermissionAdvanced253=Vytvořit / upravit interní / externí uživatele a oprá
 Permission254=Vytvořit / upravit externí uživatelé pouze
 Permission255=Upravit ostatním uživatelům heslo
 Permission256=Odstranit nebo zakázat ostatním uživatelům
-Permission262=Extend access to all third parties (not only third parties that user is a sale representative). Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc). Not effective for projects (only rules on project permissions, visibility and assignement matters).
+Permission262=Extend access to all third parties (not only third parties that user is a sale representative).<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 assignement matters).
 Permission271=Přečtěte CA
 Permission272=Přečtěte si faktury
 Permission273=Vydání faktury
@@ -891,7 +897,7 @@ Offset=Ofset
 AlwaysActive=Vždy aktivní
 Upgrade=Vylepšit
 MenuUpgrade=Aktualizujte / prodloužit
-AddExtensionThemeModuleOrOther=Přidat příponu (téma, modul, ...)
+AddExtensionThemeModuleOrOther=Deploy/install external module
 WebServer=Webový server
 DocumentRootServer=Webového serveru kořenový adresář
 DataRootServer=Dat adresáře souborů
@@ -1165,10 +1171,6 @@ FreeLegalTextOnOrders=Volný text o objednávkách
 WatermarkOnDraftOrders=Vodoznak na konceptech objednávek (pokud žádný prázdný)
 ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable
 BANK_ASK_PAYMENT_BANK_DURING_ORDER=Zeptejte se na bankovní účet destinaci objednávky
-##### Clicktodial #####
-ClickToDialSetup=Klikněte pro Dial Nastavení modulu
-ClickToDialUrlDesc=Url volána, když se provádí kliknutím na tel. Piktogram. Do pole URL můžete použít značky <br> <b>__PHONETO__</b> Který bude nahrazen s telefonním číslem osoby volat <br> <b>__PHONEFROM__</b> Který bude nahrazen tel. číslo volajícího (vaše) <br> <b>__LOGIN__</b> Který bude nahrazen s clicktodial přihlášení (definované na kartě uživatele) <br> <b>__PASS__</b> Který bude nahrazen s clicktodial heslo (definované na kartě uživatele).
-##### Bookmark4u #####
 ##### Interventions #####
 InterventionsSetup=Intervence modul nastavení
 FreeLegalTextOnInterventions=Volný text na intervenční dokumentů
@@ -1395,7 +1397,7 @@ SendingsSetup=Odeslání Nastavení modulu
 SendingsReceiptModel=Odeslání stvrzenky modelu
 SendingsNumberingModules=Sendings číslování moduly
 SendingsAbility=Support shipping sheets for customer deliveries
-NoNeedForDeliveryReceipts=Ve většině případů jsou sendings příjmy použity jak listů pro dodávky zákazníkům (seznam výrobků k odeslání) a na arších, které je recevied a podepsán zákazníkem. Takže dodávek výrobků příjmy je duplicitní funkce a je zřídka aktivován.
+NoNeedForDeliveryReceipts=In most cases, shipping sheets are used both as sheets for customer deliveries (list of products to send) and sheets that is received and signed by customer. So product deliveries receipts is a duplicated feature and is rarely activated.
 FreeLegalTextOnShippings=Volný text o přepravě
 ##### Deliveries #####
 DeliveryOrderNumberingModules=Produkty dodávky příjem číslování modul
@@ -1477,7 +1479,9 @@ AGENDA_DEFAULT_FILTER_STATUS=Nastavit automaticky tento stav pro události do vy
 AGENDA_DEFAULT_VIEW=Karta, kterou chcete otevřít ve výchozím nastavení při výběru v menu Agenda
 AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
 AGENDA_NOTIFICATION_SOUND=Enable sound notification
-##### ClickToDial #####
+##### Clicktodial #####
+ClickToDialSetup=Klikněte pro Dial Nastavení modulu
+ClickToDialUrlDesc=Url volána, když se provádí kliknutím na tel. Piktogram. Do pole URL můžete použít značky <br> <b>__PHONETO__</b> Který bude nahrazen s telefonním číslem osoby volat <br> <b>__PHONEFROM__</b> Který bude nahrazen tel. číslo volajícího (vaše) <br> <b>__LOGIN__</b> Který bude nahrazen s clicktodial přihlášení (definované na kartě uživatele) <br> <b>__PASS__</b> Který bude nahrazen s clicktodial heslo (definované na kartě uživatele).
 ClickToDialDesc=This module allows to make phone numbers clickable. A click on this icon will call make your phone to 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.
 ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
 ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on same computer than the browser, and called when you click on a link in your browser that start 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.
@@ -1505,10 +1509,11 @@ EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint availa
 ##### API ####
 ApiSetup=API module setup
 ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
-ApiProductionMode=Enable production mode (this will activate use of a caches for services management)
+ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
 ApiExporerIs=You can explore the APIs at url
 OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
 ApiKey=Key for API
+WarningAPIExplorerDisabled=The API explorer has been disabled. API explorer is not required to provide API services. It is a tool for developer to find/test REST APIs. If you need this tool, go into setup of module API REST to activate it.
 ##### Bank #####
 BankSetupModule=Bankovní modul nastavení
 FreeLegalTextOnChequeReceipts=Volný text na kontroly příjmů
@@ -1577,7 +1582,7 @@ 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:
 SomethingMakeInstallFromWebNotPossible2=Z tohoto důvodu, proces upgradovat popsáno zde je pouze ruční kroky privilegovaný uživatel může dělat.
 InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
-ConfFileMuseContainCustom=Installing an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to have option<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
+ConfFileMuseContainCustom=Installing an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
 HighlightLinesColor=Highlight color of the line when the mouse passes over (keep empty for no highlight)
 TextTitleColor=Color of page title
@@ -1607,6 +1612,7 @@ FixTZ=TimeZone fix
 FillFixTZOnlyIfRequired=Example: +2 (fill only if problem experienced)
 ExpectedChecksum=Expected Checksum
 CurrentChecksum=Current Checksum
+ForcedConstants=Required constant values
 MailToSendProposal=To send customer proposal
 MailToSendOrder=To send customer order
 MailToSendInvoice=To send customer invoice
@@ -1615,9 +1621,10 @@ MailToSendIntervention=To send intervention
 MailToSendSupplierRequestForQuotation=To send quotation request to supplier
 MailToSendSupplierOrder=To send supplier order
 MailToSendSupplierInvoice=To send supplier invoice
+MailToSendContract=To send a contract
 MailToThirdparty=To send email from third party page
 ByDefaultInList=Show by default on list view
-YouUseLastStableVersion=You use the last stable version
+YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
 TitleExampleForMaintenanceRelease=Example of message you can use to announce this maintenance release (feel free to use it on your web sites)
 ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. 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.
diff --git a/htdocs/langs/cs_CZ/bills.lang b/htdocs/langs/cs_CZ/bills.lang
index f101de4c19e..a8a7c66f627 100644
--- a/htdocs/langs/cs_CZ/bills.lang
+++ b/htdocs/langs/cs_CZ/bills.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - bills
 Bill=Faktura
 Bills=Faktury
-BillsCustomers=Zákaznické faktury
-BillsCustomer=Zákaznická faktura
-BillsSuppliers=Dodavatelské faktury
+BillsCustomers=Customer invoices
+BillsCustomer=Faktura zákazníka
+BillsSuppliers=Supplier invoices
 BillsCustomersUnpaid=Nezaplacené faktury zákazníků
-BillsCustomersUnpaidForCompany=Nezaplacené faktury pro zákazníka %s
-BillsSuppliersUnpaid=Nezaplacené faktury dodavatele
-BillsSuppliersUnpaidForCompany=Nezaplacené faktury dodavatele pro %s
+BillsCustomersUnpaidForCompany=Unpaid customer invoices for %s
+BillsSuppliersUnpaid=Nezaplacené faktury dodavatelů
+BillsSuppliersUnpaidForCompany=Unpaid supplier invoices for %s
 BillsLate=Opožděné platby
 BillsStatistics=Statistiky zákaznických faktur
 BillsStatisticsSuppliers=Statistiky dodavatelských faktur
@@ -62,8 +62,8 @@ PaymentsBack=Vrácení plateb
 paymentInInvoiceCurrency=in invoices currency
 PaidBack=Navrácené
 DeletePayment=Odstranit platby
-ConfirmDeletePayment=Are you sure you want to delete this payment?
-ConfirmConvertToReduc=Do you want to convert this credit note or deposit 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.
+ConfirmDeletePayment=Jste si jisti, že chcete smazat tuto platbu?
+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.
 SupplierPayments=Platby dodavatelům
 ReceivedPayments=Přijaté platby
 ReceivedCustomersPayments=Platby přijaté od zákazníků
@@ -78,6 +78,7 @@ PaymentMode=Typ platby
 PaymentTypeDC=Debit/Credit Card
 PaymentTypePP=PayPal
 IdPaymentMode=Payment type (id)
+CodePaymentMode=Payment type (code)
 LabelPaymentMode=Payment type (label)
 PaymentModeShort=Typ platby
 PaymentTerm=Termín platby
@@ -102,9 +103,10 @@ SearchACustomerInvoice=Hledat zákaznickou fakturu
 SearchASupplierInvoice=Hledat dodavatelskou fakturu
 CancelBill=Storno faktury
 SendRemindByMail=Poslat upomínku e-mailem
-DoPayment=Proveďte platbu
-DoPaymentBack=Vraťte platbu
+DoPayment=Enter payment
+DoPaymentBack=Enter refund
 ConvertToReduc=Převod do budoucí slevy
+ConvertExcessReceivedToReduc=Convert excess received into future discount
 EnterPaymentReceivedFromCustomer=Zadejte platbu obdrženoou od zákazníka
 EnterPaymentDueToCustomer=Provést platbu pro zákazníka
 DisabledBecauseRemainderToPayIsZero=Zakázáno, protože zbývající nezaplacená částka je nula
@@ -151,14 +153,14 @@ NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified
 FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
 NotARecurringInvoiceTemplate=Not a recurring template invoice
 NewBill=Nová faktura
-LastBills=Poslední %s faktury
-LastCustomersBills=Poslední %s zákazníci faktury
-LastSuppliersBills=Poslední %s dodavatelé faktury
+LastBills=Latest %s invoices
+LastCustomersBills=Latest %s customer invoices
+LastSuppliersBills=Latest %s supplier invoices
 AllBills=Všechny faktury
 OtherBills=Ostatní faktury
 DraftBills=Návrhy faktury
-CustomersDraftInvoices=Návrh zákaznické faktury
-SuppliersDraftInvoices=Návrh dodavatelské faktury
+CustomersDraftInvoices=Customer draft invoices
+SuppliersDraftInvoices=Supplier draft invoices
 Unpaid=Nezaplaceno
 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>?
@@ -272,6 +274,7 @@ Deposit=Vklad
 Deposits=Vklady
 DiscountFromCreditNote=Sleva z %s dobropisu
 DiscountFromDeposit=Platby z %s zze zálohové faktury
+DiscountFromExcessReceived=Payments from excess received of invoice %s
 AbsoluteDiscountUse=Tento druh úvěru je možné použít na faktuře před jeho ověřením
 CreditNoteDepositUse=Invoice must be validated to use this kind of credits
 NewGlobalDiscount=Nová absolutní sleva
@@ -279,8 +282,8 @@ NewRelativeDiscount=Nová relativní sleva
 NoteReason=Poznámka/důvod
 ReasonDiscount=Důvod
 DiscountOfferedBy=Poskytnuté
-DiscountStillRemaining=Zbývající slevy
-DiscountAlreadyCounted=Započítané slevy
+DiscountStillRemaining=Discounts available
+DiscountAlreadyCounted=Discounts already consumed
 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.
@@ -333,6 +336,8 @@ 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
 # PaymentConditions
 Statut=Status
 PaymentConditionShortRECEP=Due Upon Receipt
@@ -351,6 +356,14 @@ PaymentConditionShortPT_ORDER=Pořadí
 PaymentConditionPT_ORDER=Na objednávku
 PaymentConditionShortPT_5050=50-50
 PaymentConditionPT_5050=50%% předem, 50%% při dodání
+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
 FixAmount=Pevné množství
 VarAmount=Variabilní částka (%% celk.)
 # PaymentType
@@ -420,7 +433,7 @@ ChequeDeposits=Kontroly vkladů
 Cheques=Kontroly
 DepositId=Id deposit
 NbCheque=Number of checks
-CreditNoteConvertedIntoDiscount=Tento dobropis nebo zálohová faktura byla přecvedena do %s
+CreditNoteConvertedIntoDiscount=This %s has been converted into %s
 UsBillingContactAsIncoiveRecipientIfExist=Použijte zákaznickou fakturační kontaktní adresu namísto adresy třetích stran jako příjemce pro faktury
 ShowUnpaidAll=Zobrazit všechny neuhrazené faktury
 ShowUnpaidLateOnly=Zobrazit jen pozdní neuhrazené faktury
diff --git a/htdocs/langs/cs_CZ/boxes.lang b/htdocs/langs/cs_CZ/boxes.lang
index 32b2cd25de4..add9e639f1b 100644
--- a/htdocs/langs/cs_CZ/boxes.lang
+++ b/htdocs/langs/cs_CZ/boxes.lang
@@ -25,8 +25,8 @@ BoxTitleLastSuppliers=Latest %s recorded suppliers
 BoxTitleLastModifiedSuppliers=Latest %s modified suppliers
 BoxTitleLastModifiedCustomers=Latest %s modified customers
 BoxTitleLastCustomersOrProspects=Latest %s customers or prospects
-BoxTitleLastCustomerBills=Latest %s customer's invoices
-BoxTitleLastSupplierBills=Latest %s supplier's invoices
+BoxTitleLastCustomerBills=Latest %s customer invoices
+BoxTitleLastSupplierBills=Latest %s supplier invoices
 BoxTitleLastModifiedProspects=Latest %s modified prospects
 BoxTitleLastModifiedMembers=Latest %s members
 BoxTitleLastFicheInter=Latest %s modified interventions
@@ -51,12 +51,12 @@ ClickToAdd=Klikni pro přidání.
 NoRecordedCustomers=Žádní zaznamenaní zákazníci
 NoRecordedContacts=Žádné zaznamenané kontakty
 NoActionsToDo=Žádné vykonané akce
-NoRecordedOrders=Žádné zaznamenané zákaznické objednávky
+NoRecordedOrders=No recorded customer orders
 NoRecordedProposals=Žádné zaznamenané návrhy
-NoRecordedInvoices=Žádné zaznamenané faktury zákazníků
-NoUnpaidCustomerBills=Žádné nezaplacené faktury zákazníků
-NoUnpaidSupplierBills=Žádné nezaplacené dodavatelské faktury
-NoModifiedSupplierBills=Žádné zaznamenané dodavatelské faktury
+NoRecordedInvoices=No recorded customer invoices
+NoUnpaidCustomerBills=No unpaid customer invoices
+NoUnpaidSupplierBills=No unpaid supplier invoices
+NoModifiedSupplierBills=No recorded supplier invoices
 NoRecordedProducts=Žádné zaznamenané produkty/služby
 NoRecordedProspects=Žádné zaznamenané cíle
 NoContractedProducts=Žádné nasmlouvané produkty/služby
diff --git a/htdocs/langs/cs_CZ/companies.lang b/htdocs/langs/cs_CZ/companies.lang
index 7d348bd4aa6..f730f325f24 100644
--- a/htdocs/langs/cs_CZ/companies.lang
+++ b/htdocs/langs/cs_CZ/companies.lang
@@ -81,6 +81,7 @@ PaymentBankAccount=Payment bank account
 OverAllProposals=Total proposals
 OverAllOrders=Total orders
 OverAllInvoices=Total invoices
+OverAllSupplierProposals=Total price requests
 ##### Local Taxes #####
 LocalTax1IsUsed=Použití druhé daně
 LocalTax1IsUsedES= RE se používá
@@ -404,7 +405,7 @@ MergeThirdparties=Merge third parties
 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 so you will be able to delete the duplicate one.
 ThirdpartiesMergeSuccess=Třetí strany  byly sloučeny
 SaleRepresentativeLogin=Login of sales representative
-SaleRepresentativeFirstname=Firstname of sales representative
-SaleRepresentativeLastname=Lastname of sales representative
+SaleRepresentativeFirstname=First name of sales representative
+SaleRepresentativeLastname=Last name of sales representative
 ErrorThirdpartiesMerge=Došlo k chybě při mazání třetích stran. Zkontrolujte log soubor. Změny byly vráceny.
 NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/cs_CZ/compta.lang b/htdocs/langs/cs_CZ/compta.lang
index c6bb0226507..2226078b362 100644
--- a/htdocs/langs/cs_CZ/compta.lang
+++ b/htdocs/langs/cs_CZ/compta.lang
@@ -65,6 +65,7 @@ PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=Platba DPH
 ListPayment=Seznam plateb
 ListOfCustomerPayments=Seznam zákaznických plateb
+ListOfSupplierPayments=Seznam plateb dodavatelům
 DateStartPeriod=Datum zahájení období
 DateEndPeriod=Datum konce období
 newLT1Payment=New tax 2 payment
@@ -81,7 +82,7 @@ LT2PaymentES=IRPF platba
 LT2PaymentsES=IRPF Platby
 VATPayment=Sales tax payment
 VATPayments=Sales tax payments
-VATRefund=Sales tax refund Refund
+VATRefund=Sales tax refund
 Refund=Refund
 SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Zobrazit platbu DPH
diff --git a/htdocs/langs/cs_CZ/cron.lang b/htdocs/langs/cs_CZ/cron.lang
index 9760355d74d..41ceea2bd3a 100644
--- a/htdocs/langs/cs_CZ/cron.lang
+++ b/htdocs/langs/cs_CZ/cron.lang
@@ -1,10 +1,10 @@
 # Dolibarr language file - Source file is en_US - cron
 # About page
 # Right
-Permission23101 = Read Scheduled job
-Permission23102 = Create/update Scheduled job
-Permission23103 = Delete Scheduled job
-Permission23104 = Execute Scheduled job
+Permission23101 = Čtení naplánovaných úloh
+Permission23102 = Vytvoření/aktualizace naplánované úlohy
+Permission23103 = Smazat naplánovanou úlohu
+Permission23104 = Provést naplánovanou úlohu
 # Admin
 CronSetup= Nastavení naplánovaných úloh
 URLToLaunchCronJobs=URL to check and launch qualified cron jobs
@@ -17,14 +17,14 @@ CronMethodDoesNotExists=Class %s does not contains any method %s
 # Menu
 EnabledAndDisabled=Enabled and disabled
 # Page list
-CronLastOutput=Výstup poslední úlohy
-CronLastResult=Výstup posledního kódu
+CronLastOutput=Latest run output
+CronLastResult=Latest result code
 CronCommand=Příkaz
 CronList=Naplánované úlohy
 CronDelete=Smazat naplánované úlohy
-CronConfirmDelete=Jste si jisti, že chcete odstranit tyto naplánované úlohy?
+CronConfirmDelete=Are you sure you want to delete these scheduled jobs?
 CronExecute=Launch scheduled job
-CronConfirmExecute=Jste si jisti, že chcete provést tyto naplánované úlohy nyní?
+CronConfirmExecute=Are you sure you want to execute these scheduled jobs now?
 CronInfo=Plánovací modul úloh umožňují provádět úlohy, které byly plánované
 CronTask=Práce
 CronNone=Nikdo
@@ -39,7 +39,7 @@ CronMethod=Metoda
 CronModule=Modul
 CronNoJobs=Žádné registrované úkoly
 CronPriority=Priorita
-CronLabel=Label
+CronLabel=Štítek
 CronNbRun=Nb. zahájit
 CronMaxRun=Max nb. launch
 CronEach=Každý
@@ -65,7 +65,7 @@ CronMethodHelp=Objekt způsob startu. <BR> Např načíst metody objektu .../htd
 CronArgsHelp=Metoda argumenty. <BR> Např načíst metody objektu výrobku .../htdocs/product/class/product.class.php, hodnota paramteru může být <i>0, ProductRef</i>
 CronCommandHelp=Spustit příkazový řádek. 
 CronCreateJob=Vytvořit novou naplánovanou úlohu
-CronFrom=From
+CronFrom=Z
 # Info
 # Common
 CronType=Typ úlohy
@@ -73,7 +73,7 @@ CronType_method=Volání metody třídy Dolibarr
 CronType_command=Shell příkaz
 CronCannotLoadClass=Nelze načíst třídu nebo objekt %s %s
 UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled jobs" to see and edit scheduled jobs.
-JobDisabled=Job disabled
+JobDisabled=Úloha vypnuta
 MakeLocalDatabaseDumpShort=Local database backup
 MakeLocalDatabaseDump=Create a local database dump
 WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of active jobs, your jobs may be delayed to a maximum of %s hours before being run.
diff --git a/htdocs/langs/cs_CZ/errors.lang b/htdocs/langs/cs_CZ/errors.lang
index 5072560d602..8f9647bcf78 100644
--- a/htdocs/langs/cs_CZ/errors.lang
+++ b/htdocs/langs/cs_CZ/errors.lang
@@ -11,6 +11,7 @@ ErrorLoginAlreadyExists=Přihlášení %s již existuje.
 ErrorGroupAlreadyExists=Skupina %s již existuje.
 ErrorRecordNotFound=Záznam není nalezen.
 ErrorFailToCopyFile=Nepodařilo se zkopírovat soubor <b>&quot;%s&quot;</b> na <b>&quot;%s&quot;.</b>
+ErrorFailToCopyDir=Failed to copy directory '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToRenameFile=Nepodařilo se přejmenovat soubor <b>&quot;%s&quot;</b> na <b>&quot;%s&quot;.</b>
 ErrorFailToDeleteFile=Nepodařilo se odstranit soubor <b>&quot;%s&quot;.</b>
 ErrorFailToCreateFile=Nepodařilo se vytvořit soubor <b>&quot;%s&quot;.</b>
@@ -115,7 +116,7 @@ ErrorNoActivatedBarcode=Žádný čárový kód aktivován typ
 ErrUnzipFails=Nepodařilo se rozbalit %s s ZipArchive
 ErrNoZipEngine=No motor rozbalit %s soubor v tomto PHP
 ErrorFileMustBeADolibarrPackage=Souborů %s musí být zip Dolibarr balíček
-ErrorFileRequired=Trvá balíček Dolibarr soubor
+ErrorModuleFileRequired=You must select a Dolibarr module package file
 ErrorPhpCurlNotInstalled=PHP CURL není nainstalován, je to nezbytné mluvit s Paypal
 ErrorFailedToAddToMailmanList=Nepodařilo se přidat záznam do %s %s pošťák seznamu nebo SPIP základny
 ErrorFailedToRemoveToMailmanList=Nepodařilo se odstranit záznam %s %s na seznam pošťák nebo SPIP základny
@@ -181,6 +182,8 @@ ErrorBankStatementNameMustFollowRegex=Error, bank statement name must follow the
 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>
 
 # 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.
diff --git a/htdocs/langs/cs_CZ/holiday.lang b/htdocs/langs/cs_CZ/holiday.lang
index de44078613f..11b5fbfbc0f 100644
--- a/htdocs/langs/cs_CZ/holiday.lang
+++ b/htdocs/langs/cs_CZ/holiday.lang
@@ -76,8 +76,8 @@ BoxTitleLastLeaveRequests=Latest %s modified leave requests
 HolidaysMonthlyUpdate=Měsíční aktualizace
 ManualUpdate=Ruční aktualizace
 HolidaysCancelation=Stornovat dovolenou
-EmployeeLastname=Employee lastname
-EmployeeFirstname=Employee firstname
+EmployeeLastname=Employee last name
+EmployeeFirstname=Employee first name
 TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
 
 ## Configuration du Module ##
diff --git a/htdocs/langs/cs_CZ/ldap.lang b/htdocs/langs/cs_CZ/ldap.lang
index a56f8104cd7..fc18e5bc809 100644
--- a/htdocs/langs/cs_CZ/ldap.lang
+++ b/htdocs/langs/cs_CZ/ldap.lang
@@ -13,8 +13,8 @@ LDAPUsers=Uživatelé v LDAP databázi
 LDAPFieldStatus=Stav
 LDAPFieldFirstSubscriptionDate=Datum prvního odběru
 LDAPFieldFirstSubscriptionAmount=Množství prvního odběru
-LDAPFieldLastSubscriptionDate=Poslední datum odběru
-LDAPFieldLastSubscriptionAmount=Množství posledního odběru
+LDAPFieldLastSubscriptionDate=Latest subscription date
+LDAPFieldLastSubscriptionAmount=Latest subscription amount
 LDAPFieldSkype=Skype id
 LDAPFieldSkypeExample=Example : skypeName
 UserSynchronized=Uživatel synchronizován
diff --git a/htdocs/langs/cs_CZ/mails.lang b/htdocs/langs/cs_CZ/mails.lang
index cbd02c59770..6a684a83272 100644
--- a/htdocs/langs/cs_CZ/mails.lang
+++ b/htdocs/langs/cs_CZ/mails.lang
@@ -74,14 +74,18 @@ ResultOfMailSending=Result of mass EMail sending
 NbSelected=Nb selected
 NbIgnored=Nb ignored
 NbSent=Nb sent
-ContactsWithThirdpartyFilter=Contact with customer filters
+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
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Řádek  %s v souboru
 RecipientSelectionModules=Definované požadavky na výběr příjemce
 MailSelectedRecipients=Vybraní příjemci
 MailingArea=EMailings oblast
-LastMailings=Poslední %s zprávy
+LastMailings=Latest %s emailings
 TargetsStatistics=Cílové statistiky
 NbOfCompaniesContacts=Unikátní kontakty/adresy
 MailNoChangePossible=Příjemce pro validované rozesílání nelze změnit
@@ -146,3 +150,6 @@ AdvTgtCreateFilter=Create filter
 AdvTgtOrCreateNewFilter=Name of new filter
 NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
+OutGoingEmailSetup=Outgoing email setup
+InGoingEmailSetup=Incoming email setup
+
diff --git a/htdocs/langs/cs_CZ/main.lang b/htdocs/langs/cs_CZ/main.lang
index 8211f7fbea9..1e46f1821a2 100644
--- a/htdocs/langs/cs_CZ/main.lang
+++ b/htdocs/langs/cs_CZ/main.lang
@@ -69,6 +69,7 @@ SetDate=Nastavení datumu
 SelectDate=Výběr datumu
 SeeAlso=Viz také %s
 SeeHere=Nahlédněte zde
+Apply=Aplikovat
 BackgroundColorByDefault=Výchozí barva pozadí
 FileRenamed=The file was successfully renamed
 FileUploaded=Soubor byl úspěšně nahrán
@@ -87,7 +88,7 @@ Undefined=Nedefinováno
 PasswordForgotten=Password forgotten?
 SeeAbove=Viz výše
 HomeArea=Hlavní oblast
-LastConnexion=Poslední připojení
+LastConnexion=Latest connection
 PreviousConnexion=Předchozí připojení
 PreviousValue=Previous value
 ConnectedOnMultiCompany=Připojeno na rozhraní
@@ -237,7 +238,7 @@ DateCreation=Datum vytvoření
 DateCreationShort=Creat. date
 DateModification=Datum změny
 DateModificationShort=Datum úpravy
-DateLastModification=Datum poslední modifikace
+DateLastModification=Latest modification date
 DateValidation=Datum ověření
 DateClosing=Uzávěrka
 DateDue=Datum splatnosti
@@ -599,6 +600,8 @@ SessionName=Název relace
 Method=Metoda
 Receive=Přijmout
 CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
+ExpectedValue=Expected Value
+CurrentValue=Současná hodnota
 PartialWoman=Částečný
 TotalWoman=Celkový
 NeverReceived=Nikdy nedostal
@@ -756,6 +759,7 @@ SomeTranslationAreUncomplete=Some languages may be partially translated or may c
 DirectDownloadLink=Direct download link
 Download=Download
 ActualizeCurrency=Update currency rate
+Fiscalyear=Fiskální rok
 # Week day
 Monday=Pondělí
 Tuesday=Úterý
@@ -812,3 +816,5 @@ SearchIntoContracts=Smlouvy
 SearchIntoCustomerShipments=Customer shipments
 SearchIntoExpenseReports=Zpráva výdajů
 SearchIntoLeaves=Dovolená
+
+BulkActions=Bulk actions
diff --git a/htdocs/langs/cs_CZ/members.lang b/htdocs/langs/cs_CZ/members.lang
index 13e267b5b8d..f0b107b24a7 100644
--- a/htdocs/langs/cs_CZ/members.lang
+++ b/htdocs/langs/cs_CZ/members.lang
@@ -136,8 +136,8 @@ DocForAllMembersCards=Vytvořit vizitky pro všechny členy
 DocForOneMemberCards=Vytvořit vizitky pro konkrétní člena
 DocForLabels=Vytvořit adresy listy
 SubscriptionPayment=Zasílání novinek platba
-LastSubscriptionDate=Poslední datum předplatné
-LastSubscriptionAmount=Poslední úpisu
+LastSubscriptionDate=Latest subscription date
+LastSubscriptionAmount=Latest subscription amount
 MembersStatisticsByCountries=Členové Statistiky podle země
 MembersStatisticsByState=Členové statistika stát / provincie
 MembersStatisticsByTown=Členové statistika podle města
@@ -149,7 +149,7 @@ MembersByStateDesc=Tato obrazovka vám ukáže statistiku členů podle státu /
 MembersByTownDesc=Tato obrazovka vám ukáže statistiku členům města.
 MembersStatisticsDesc=Zvolte statistik, které chcete číst ...
 MenuMembersStats=Statistika
-LastMemberDate=Poslední člen Datum
+LastMemberDate=Latest member date
 Nature=Příroda
 Public=Informace jsou veřejné
 NewMemberbyWeb=Nový uživatel přidán. Čeká na schválení
diff --git a/htdocs/langs/cs_CZ/orders.lang b/htdocs/langs/cs_CZ/orders.lang
index ae7c6802024..f6ae06fb6a7 100644
--- a/htdocs/langs/cs_CZ/orders.lang
+++ b/htdocs/langs/cs_CZ/orders.lang
@@ -39,7 +39,7 @@ StatusOrderRefusedShort=Odmítnuto
 StatusOrderBilledShort=Účtováno
 StatusOrderToProcessShort=Ve zpracování
 StatusOrderReceivedPartiallyShort=Částečně obdržené
-StatusOrderReceivedAllShort=Vše obdržené
+StatusOrderReceivedAllShort=Products received
 StatusOrderCanceled=Zrušený
 StatusOrderDraft=Návrh (musí být ověřena)
 StatusOrderValidated=Ověřené
@@ -51,7 +51,7 @@ StatusOrderApproved=Schválený
 StatusOrderRefused=Odmítnutý
 StatusOrderBilled=Účtováno
 StatusOrderReceivedPartially=Částečně uložen
-StatusOrderReceivedAll=Vše, co obdržel
+StatusOrderReceivedAll=All products received
 ShippingExist=Zásilka existuje
 QtyOrdered=Objednáno množství
 ProductQtyInDraft=Množství produktů do návrhů objednávek
diff --git a/htdocs/langs/cs_CZ/other.lang b/htdocs/langs/cs_CZ/other.lang
index ea44231945e..5a3875e23e0 100644
--- a/htdocs/langs/cs_CZ/other.lang
+++ b/htdocs/langs/cs_CZ/other.lang
@@ -68,14 +68,15 @@ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find her
 PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nNajdete zde dopravu __SHIPPINGREF__\n\n__PERSONALIZED__S pozdravem\n\n__SIGNATURE__
 PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nNajdete zde intervenci __FICHINTERREF__\n\n__PERSONALIZED__S pozdravem\n\n__SIGNATURE__
 PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n__PERSONALIZED__\n\n__SIGNATURE__
-DemoDesc=Dolibarr is a compact ERP/CRM supporting several functional modules. A demo showcasing all modules makes no sense as this scenario never occurs. So, several demo profiles are available.
+DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
+ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
 DemoFundation=Spravovat nadaci, nebo neziskovou organizaci a její členy
 DemoFundation2=Správa členů a bankovních účtů nadace nebo neziskové organizace
-DemoCompanyServiceOnly=Správa pouze prodejní činnosti malé firmy nebo nadace
+DemoCompanyServiceOnly=Company or freelance selling service only
 DemoCompanyShopWithCashDesk=Správa obchodu s pokladnou, e-shopu nebo obchodní činnost
-DemoCompanyProductAndStocks=Správa malého nebo středního podniku, který prodává své výrobky
-DemoCompanyAll=Správa malé nebo střední firmy s více činnostmi (všechny hlavní moduly)
+DemoCompanyProductAndStocks=Company selling products with a shop
+DemoCompanyAll=Company with multiple activities (all main modules)
 CreatedBy=Vytvořil %s
 ModifiedBy=Změnil %s
 ValidatedBy=Ověřil %s
diff --git a/htdocs/langs/cs_CZ/products.lang b/htdocs/langs/cs_CZ/products.lang
index bd36fd34264..54c7299336d 100644
--- a/htdocs/langs/cs_CZ/products.lang
+++ b/htdocs/langs/cs_CZ/products.lang
@@ -60,7 +60,7 @@ SellingPrice=Prodejní cena
 SellingPriceHT=Prodejní cena (bez DPH)
 SellingPriceTTC=Prodejní cena (vč. DPH)
 CostPriceDescription=This price (net of tax) can be used to store the average amount this product cost to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
-CostPriceUsage=In a future version, this value could be used for margin calculation.
+CostPriceUsage=This value could be used for margin calculation.
 SoldAmount=Sold amount
 PurchasedAmount=Purchased amount
 NewPrice=Nová cena
@@ -142,6 +142,7 @@ ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b>?
 CloneContentProduct=Kopírovat všechny hlavní informace o produktu/službě
 ClonePricesProduct=Kopírovat hlavní informace a ceny
 CloneCompositionProduct=Kopírování balení zboží/služby
+CloneCombinationsProduct=Clone product variants
 ProductIsUsed=Tento produkt se používá
 NewRefForClone=Ref. nového produktu/služby
 SellingPrices=Selling prices
@@ -238,7 +239,7 @@ GlobalVariables=Globální proměnné
 VariableToUpdate=Variable to update
 GlobalVariableUpdaters=Aktualizace globálních proměnných
 UpdateInterval=Interval aktualizace (minuty)
-LastUpdated=Naposledy aktualizováno
+LastUpdated=Latest update
 CorrectlyUpdated=Správně aktualizováno
 PropalMergePdfProductActualFile=Soubory používají k přidání do PDF Azur template are/is
 PropalMergePdfProductChooseFile=Vyberte soubory PDF
@@ -258,4 +259,41 @@ VolumeUnits=Volume unit
 SizeUnits=Size unit
 DeleteProductBuyPrice=Delete buying price
 ConfirmDeleteProductBuyPrice=Are you sure you want to delete this buying price?
+SubProduct=Sub product
 
+#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
+ProductCombinations=Variants
+HideProductCombinations=Hide products variant in the products selector
+ProductCombination=Variant
+NewProductCombination=New variant
+EditProductCombination=Editing variant
+ProductCombinationGenerator=Variants generator
+Features=Features
+PriceImpact=Price impact
+WeightImpact=Weight impact
+NewProductAttribute=Nový atribut
+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
+PercentageVariation=Percentage variation
+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 child products
+ConfirmCloneProductCombinations=Would you like to copy all the product variant to the 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
diff --git a/htdocs/langs/cs_CZ/projects.lang b/htdocs/langs/cs_CZ/projects.lang
index 6abf2f39428..d526372dbe8 100644
--- a/htdocs/langs/cs_CZ/projects.lang
+++ b/htdocs/langs/cs_CZ/projects.lang
@@ -29,9 +29,9 @@ DeleteAProject=Odstranit projekt
 DeleteATask=Odstranit úkol
 ConfirmDeleteAProject=Are you sure you want to delete this project?
 ConfirmDeleteATask=Are you sure you want to delete this task?
-OpenedProjects=Open projects
-OpenedTasks=Open tasks
-OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
+OpenedProjects=Opened projects
+OpenedTasks=Opened tasks
+OpportunitiesStatusForOpenedProjects=Opportunities amount of opened projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=Zobrazit projekt
 SetProject=Nastavit projekt
@@ -47,7 +47,7 @@ TaskTimeSpent=Čas strávený na úkolech
 TaskTimeUser=Uživatel
 TaskTimeNote=Poznámka
 TaskTimeDate=Datum
-TasksOnOpenedProject=Úkoly na otevřených projektech
+TasksOnOpenedProject=Úkoly otevřených projektů
 WorkloadNotDefined=Pracovní zátěž není definována
 NewTimeSpent=Nový strávený čas
 MyTimeSpent=Můj strávený čas
@@ -96,6 +96,7 @@ ValidateProject=Ověřit projekt
 ConfirmValidateProject=Are you sure you want to validate this project?
 CloseAProject=Zavřít projekt
 ConfirmCloseAProject=Are you sure you want to close this project?
+AlsoCloseAProject=Also close project (keep it open if you still need to follow production tasks on it)
 ReOpenAProject=Otevřít projekt
 ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=Kontakty projektu
@@ -121,7 +122,7 @@ CloneProjectFiles=Duplikovat připojené soubory projektu
 CloneTaskFiles=Duplikovat připojené soubory úkolu/ů (pokud úkol(y) klonován(y))
 CloneMoveDate=Update project/tasks dates from now?
 ConfirmCloneProject=Are you sure to clone this project?
-ProjectReportDate=Změnit datum úkolu dle data zahájení projektu
+ProjectReportDate=Change task dates according to new project start date
 ErrorShiftTaskDate=Nelze přesunout datum úkolu dle nového data zahájení projektu
 ProjectsAndTasksLines=Projekty a úkoly
 ProjectCreatedInDolibarr=Projekt %s vytvořen
@@ -178,9 +179,9 @@ ProjectsStatistics=Statistics on projects/leads
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 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.
-OpenedProjectsByThirdparties=Open projects by thirdparties
+OpenedProjectsByThirdparties=Opened projects by thirdparties
 OnlyOpportunitiesShort=Only opportunities
-OpenedOpportunitiesShort=Open opportunities
+OpenedOpportunitiesShort=Opened opportunities
 NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount
diff --git a/htdocs/langs/cs_CZ/propal.lang b/htdocs/langs/cs_CZ/propal.lang
index 5d692c9bcfc..0eb263bf88f 100644
--- a/htdocs/langs/cs_CZ/propal.lang
+++ b/htdocs/langs/cs_CZ/propal.lang
@@ -3,7 +3,7 @@ Proposals=Obchodní nabídky
 Proposal=Obchodní nabídka
 ProposalShort=Nabídka
 ProposalsDraft=Navrhnout obchodní nabídky
-ProposalsOpened=Otevřené obchodní návrhy
+ProposalsOpened=Otevřené obchodní nabídky
 Prop=Obchodní nabídky
 CommercialProposal=Obchodní nabídka
 ProposalCard=Karta obchodních nabídek
@@ -28,7 +28,7 @@ ShowPropal=Zobrazit nabídku
 PropalsDraft=Návrhy
 PropalsOpened=Otevřeno
 PropalStatusDraft=Návrh (musí být ověřen)
-PropalStatusValidated=Ověřeno (návrh je otevřen)
+PropalStatusValidated=Validated (proposal is opened)
 PropalStatusSigned=Podpis (potřeba fakturace)
 PropalStatusNotSigned=Nejste přihlášen (uzavřený)
 PropalStatusBilled=Účtováno
diff --git a/htdocs/langs/cs_CZ/stocks.lang b/htdocs/langs/cs_CZ/stocks.lang
index dfca8b9e59d..45f6c4a1252 100644
--- a/htdocs/langs/cs_CZ/stocks.lang
+++ b/htdocs/langs/cs_CZ/stocks.lang
@@ -22,13 +22,15 @@ Movements=Pohyby
 ErrorWarehouseRefRequired=Referenční jméno skladiště je povinné
 ListOfWarehouses=Seznam skladišť
 ListOfStockMovements=Seznam skladových pohybů
+StockMovementForId=Movement ID %d
+ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Oblast skladišť
 Location=Umístění
 LocationSummary=Krátký název umístění
 NumberOfDifferentProducts=Počet různých výrobků
 NumberOfProducts=Celkový počet produktů
-LastMovement=Poslední pohyb
-LastMovements=Poslední pohyby
+LastMovement=Latest movement
+LastMovements=Latest movements
 Units=Jednotky
 Unit=Jednotka
 StockCorrection=Správný sklad
diff --git a/htdocs/langs/cs_CZ/supplier_proposal.lang b/htdocs/langs/cs_CZ/supplier_proposal.lang
index d4ded2dd3c6..c3949dea731 100644
--- a/htdocs/langs/cs_CZ/supplier_proposal.lang
+++ b/htdocs/langs/cs_CZ/supplier_proposal.lang
@@ -8,7 +8,7 @@ SearchRequest=Find a request
 DraftRequests=Draft requests
 SupplierProposalsDraft=Draft supplier proposals
 LastModifiedRequests=Latest %s modified price requests
-RequestsOpened=Open price requests
+RequestsOpened=Opened price requests
 SupplierProposalArea=Supplier proposals area
 SupplierProposalShort=Supplier proposal
 SupplierProposals=Supplier proposals
@@ -23,7 +23,7 @@ ConfirmValidateAsk=Are you sure you want to validate this price request under na
 DeleteAsk=Delete request
 ValidateAsk=Validate request
 SupplierProposalStatusDraft=Návrh (musí být ověřen)
-SupplierProposalStatusValidated=Validated (request is open)
+SupplierProposalStatusValidated=Validated (request is opened)
 SupplierProposalStatusClosed=Zavřeno
 SupplierProposalStatusSigned=Accepted
 SupplierProposalStatusNotSigned=Odmítnuto
diff --git a/htdocs/langs/cs_CZ/suppliers.lang b/htdocs/langs/cs_CZ/suppliers.lang
index e1d9bee947f..81251edd8ac 100644
--- a/htdocs/langs/cs_CZ/suppliers.lang
+++ b/htdocs/langs/cs_CZ/suppliers.lang
@@ -9,7 +9,7 @@ ShowSupplier=Zobrazit dodavatele
 OrderDate=Datum objednávky
 BuyingPriceMin=Best buying price
 BuyingPriceMinShort=Best buying price
-TotalBuyingPriceMinShort=Total of subproducts buying prices
+TotalBuyingPriceMinShort=Nákupní ceny vedlejších produktů celkem
 TotalSellingPriceMinShort=Total of subproducts selling prices
 SomeSubProductHaveNoPrices=Některé vedlejší produkty nemají stanovené žádné ceny
 AddSupplierPrice=Add buying price
@@ -24,10 +24,10 @@ ExportDataset_fournisseur_1=Výpis dodavatelských faktur a seznam řádků
 ExportDataset_fournisseur_2=Dodavatel faktury a platby
 ExportDataset_fournisseur_3=Dodavatel objednávky a řádky objednávek
 ApproveThisOrder=Schválit tuto objednávku
-ConfirmApproveThisOrder=Jste si jisti, že chcete schválit tuto objednávku <b>%s?</b>
+ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b>?
 DenyingThisOrder=Zakázat tuto objednávku
-ConfirmDenyingThisOrder=Jste si jisti, že chcete zakázat tuto objednávku <b>%s</b> ?
-ConfirmCancelThisOrder=Jste si jisti, že chcete zrušit tuto objednávku  <b>%s</b> ?
+ConfirmDenyingThisOrder=Are you sure you want to deny this order <b>%s</b>?
+ConfirmCancelThisOrder=Are you sure you want to cancel this order <b>%s</b>?
 AddSupplierOrder=Vytvoření objednávky dodavatele
 AddSupplierInvoice=Vytvoření dodavatelské faktury
 ListOfSupplierProductForSupplier=Seznam výrobků a cen pro dodavatele <b>%s</b>
@@ -41,3 +41,4 @@ DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Wrong quality
 ReputationForThisProduct=Reputation
 BuyerName=Buyer name
+AllProductServicePrices=All product / service prices
diff --git a/htdocs/langs/cs_CZ/users.lang b/htdocs/langs/cs_CZ/users.lang
index f5c085206fe..49359f39815 100644
--- a/htdocs/langs/cs_CZ/users.lang
+++ b/htdocs/langs/cs_CZ/users.lang
@@ -36,7 +36,7 @@ AdministratorDesc=Správce
 DefaultRights=Výchozí oprávnění
 DefaultRightsDesc=Zde nastavte <u>výchozí</u> oprávnění, automaticky udělené <u>nově vytvořenému</u> uživateli (Změnu oprávnění každého uživatele zvlášť lze provést na jeho kartě).
 DolibarrUsers=Dolibarr uživatelé
-LastName=Last Name
+LastName=Příjmení
 FirstName=Křestní jméno
 ListOfGroups=Seznam skupin
 NewGroup=Nová skupina
diff --git a/htdocs/langs/cs_CZ/withdrawals.lang b/htdocs/langs/cs_CZ/withdrawals.lang
index 99fc64a3865..23de262bd58 100644
--- a/htdocs/langs/cs_CZ/withdrawals.lang
+++ b/htdocs/langs/cs_CZ/withdrawals.lang
@@ -24,6 +24,7 @@ WithdrawStatistics=Direct debit payment statistics
 WithdrawRejectStatistics=Direct debit payment reject statistics
 LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
+WithdrawRequestsDone=%s direct debit payment requests recorded
 ThirdPartyBankCode=Bankovní kód třetí strany
 NoInvoiceCouldBeWithdrawed=Neúspěšný výběr z faktur. Zkontrolujte, že faktury jsou na firmy s platným BAN.
 ClassCredited=Označit přidání kreditu
@@ -76,8 +77,8 @@ RUM=UMR
 RUMLong=Unique Mandate Reference
 RUMWillBeGenerated=UMR number will be generated once bank account information are saved
 WithdrawMode=Direct debit mode (FRST or RECUR)
-WithdrawRequestAmount=Withdraw request amount:
-WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil amount.
+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
diff --git a/htdocs/langs/da_DK/accountancy.lang b/htdocs/langs/da_DK/accountancy.lang
index 183739da810..7a216a76742 100644
--- a/htdocs/langs/da_DK/accountancy.lang
+++ b/htdocs/langs/da_DK/accountancy.lang
@@ -194,6 +194,8 @@ ChangeBinding=Change the binding
 
 ## Admin
 ApplyMassCategories=Apply mass categories
+AddAccountFromBookKeepingWithNoCategories=Add acccount already used with no categories
+CategoryDeleted=Category for the accounting account has been removed
 
 ## Export
 Exports=Eksporter
@@ -209,6 +211,7 @@ Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution
 Modelcsv_quadratus=Export towards Quadratus QuadraCompta
 Modelcsv_ebp=Export towards EBP
 Modelcsv_cogilog=Export towards Cogilog
+ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
 InitAccountancy=Init accountancy
diff --git a/htdocs/langs/da_DK/admin.lang b/htdocs/langs/da_DK/admin.lang
index 69f4651b32f..387e4e56a68 100644
--- a/htdocs/langs/da_DK/admin.lang
+++ b/htdocs/langs/da_DK/admin.lang
@@ -9,17 +9,20 @@ VersionDevelopment=Udvikling
 VersionUnknown=Ukendt
 VersionRecommanded=Anbefalet
 FileCheck=Files integrity checker
-FileCheckDesc=This tool allows you to check the integrity of files of your application, comparing each files with the official ones. You can use this tool to detect if some files were modified by a hacker for example.
+FileCheckDesc=This tool allows you to check the integrity of files and setup of your application, comparing each files with the official ones. 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.
 FileIntegrityIsStrictlyConformedWithReference=Files integrity is strictly conformed with the reference.
-FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified of removed.
+FileIntegrityIsOkButFilesWereAdded=Files integrity check has passed, however some new files were added.
+FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified, removed or added.
 GlobalChecksum=Global checksum
 MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
 LocalSignature=Embedded local signature (less reliable)
 RemoteSignature=Remote distant signature (more reliable)
 FilesMissing=Missing Files
 FilesUpdated=Updated Files
+FilesModified=Modified Files
+FilesAdded=Added Files
 FileCheckDolibarr=Check integrity of application files
-AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from a certified package
+AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from an official package
 XmlNotFound=Xml Integrity File of application not found
 SessionId=Session ID
 SessionSaveHandler=Handler for at gemme sessioner
@@ -188,7 +191,9 @@ BoxesDesc=Widgets are components showing some information that you can add to pe
 OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
 ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
-ModulesMarketPlaces=Flere moduler ...
+ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
+ModulesMarketPlaces=Find external modules...
+GoModuleSetupArea=To deploy/install a new module, go onto the Module setup area at <a href="%s">%s</a>.
 DoliStoreDesc=DoliStore den officielle markedsplads for Dolibarr ERP / CRM eksterne moduler
 DoliPartnersDesc=List of companies providing custom developed modules or features (Note: anyone experienced in PHP programming can provide custom development for an open source project)
 WebSiteDesc=Reference websites to find more modules...
@@ -280,20 +285,21 @@ MenuHandlers=Menu håndterer
 MenuAdmin=Menu editor
 DoNotUseInProduction=Do not use in production
 ThisIsProcessToFollow=This is steps to process:
-ThisIsAlternativeProcessToFollow=This is an alternative setup to process:
+ThisIsAlternativeProcessToFollow=This is an alternative setup to process manually:
 StepNb=Trin %s
 FindPackageFromWebSite=Find en pakke, der giver funktion, du ønsker (for eksempel på web site %s).
 DownloadPackageFromWebSite=Download package (for example from official web site %s).
-UnpackPackageInDolibarrRoot=Unpack package file into Dolibarr server directory dedicated to external modules: <b>%s</b>
-SetupIsReadyForUse=Installer er færdig og Dolibarr er klar til brug med denne nye komponent.
-NotExistsDirect=The alternative root directory is not defined.<br>
-InfDirAlt=Since version 3 it is possible to define an alternative root directory.This allows you to store, same place, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
-InfDirExample=<br>Then declare it in the file conf.php<br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>*These lines are commented with "#", to uncomment only remove the character.
+UnpackPackageInDolibarrRoot=Unpack the packaged files into server directory dedicated to Dolibarr: <b>%s</b>
+UnpackPackageInModulesRoot=To deploy/install an external module, unpack the packaged files into the server directory dedicated to modules: <b>%s</b>
+SetupIsReadyForUse=Module deployment is finished. You must however enable and setup the module in your application by going on the page to setup modules: <a href="%s">%s</a>.
+NotExistsDirect=The alternative root directory is not defined to an existing directory.<br>
+InfDirAlt=Since version 3, it is possible to define an alternative root directory. This allows you to store, into a dedicated directory, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
+InfDirExample=<br>Then declare it in the file <strong>conf.php</strong><br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>If these lines are commented with "#", to enable them, just uncomment by removing the "#" character.
 YouCanSubmitFile=For this step, you can send package using this tool: Select module file
 CurrentVersion=Dolibarr aktuelle version
 CallUpdatePage=Go to the page that updates the database structure and data: %s.
 LastStableVersion=Latest stable version
-LastActivationDate=Last activation date
+LastActivationDate=Latest activation date
 UpdateServerOffline=Update server offline
 GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s. <br><b>{000000@x}</b> same as previous but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
 GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
@@ -376,11 +382,11 @@ ExtrafieldCheckBox=Checkbox
 ExtrafieldRadio=Radio button
 ExtrafieldCheckBoxFromList= Checkbox from table
 ExtrafieldLink=Link to an object
-ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>In order to have the list depending on another :<br>1,value1|parent_list_code:parent_key<br>2,value2|parent_list_code:parent_key
+ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list :<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list :<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
-ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
+ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Example : Societe:societe/class/societe.class.php
 LibraryToBuildPDF=Library used for PDF generation
 WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
@@ -415,10 +421,10 @@ ModuleCompanyCodeDigitaria=Regnskabsmæssig kode afhænger tredjepart kode. Kode
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
 WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<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).
-
+ClickToShowDescription=Click to show description
 # Modules
 Module0Name=Brugere og grupper
-Module0Desc=Brugere og grupper forvaltning
+Module0Desc=Users / Employees and Groups management
 Module1Name=Tredjemand
 Module1Desc=Virksomheder og kontakter "forvaltning
 Module2Name=Kommerciel
@@ -689,7 +695,7 @@ PermissionAdvanced253=Opret / ændre interne / eksterne brugere og tilladelser
 Permission254=Slette eller deaktivere andre brugere
 Permission255=Opret / ændre sin egen brugeroplysninger
 Permission256=Ændre sin egen adgangskode
-Permission262=Extend access to all third parties (not only third parties that user is a sale representative). Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc). Not effective for projects (only rules on project permissions, visibility and assignement matters).
+Permission262=Extend access to all third parties (not only third parties that user is a sale representative).<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 assignement matters).
 Permission271=Læs CA
 Permission272=Læs fakturaer
 Permission273=Udsteder fakturaer
@@ -891,7 +897,7 @@ Offset=Offset
 AlwaysActive=Altid aktiv
 Upgrade=Upgrade
 MenuUpgrade=Upgrade / Forlæng
-AddExtensionThemeModuleOrOther=Tilføj udvidelse (tema, modul, ...)
+AddExtensionThemeModuleOrOther=Deploy/install external module
 WebServer=Web server
 DocumentRootServer=Webserverens rodmappe
 DataRootServer=Datafiler bibliotek
@@ -1165,10 +1171,6 @@ FreeLegalTextOnOrders=Fri tekst om ordrer
 WatermarkOnDraftOrders=Watermark on draft orders (none if empty)
 ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable
 BANK_ASK_PAYMENT_BANK_DURING_ORDER=Ask for bank account destination of order
-##### Clicktodial #####
-ClickToDialSetup=Klik for at ringe modul opsætning
-ClickToDialUrlDesc=Url called when a click on phone picto is done. Dans l'url, vous pouvez utiliser les balises<br><b>__PHONETO__</b> qui sera remplacé par le téléphone de l'appelé<br><b>__PHONEFROM__</b> qui sera remplacé par le téléphone de l'appelant (le votre)<br><b>__LOGIN__</b> qui sera remplacé par votre login clicktodial (défini sur votre fiche utilisateur)<br><b>__PASS__</b> qui sera remplacé par votre mot de passe clicktodial (défini sur votre fiche utilisateur).
-##### Bookmark4u #####
 ##### Interventions #####
 InterventionsSetup=Interventioner modul opsætning
 FreeLegalTextOnInterventions=Fri tekst om intervention dokumenter
@@ -1395,7 +1397,7 @@ SendingsSetup=Sender modul opsætning
 SendingsReceiptModel=Afsendelse modtagelsen model
 SendingsNumberingModules=Sendings nummerering moduler
 SendingsAbility=Support shipping sheets for customer deliveries
-NoNeedForDeliveryReceipts=I de fleste tilfælde sendings indtægter anvendes både som plader til kunden leverancer (listen over produkter til at sende) og plader, der er recevied og underskrevet af kunden. Så produkt leverancer kvitteringer er en overlappes træk og er sjældent aktiveret.
+NoNeedForDeliveryReceipts=In most cases, shipping sheets are used both as sheets for customer deliveries (list of products to send) and sheets that is received and signed by customer. So product deliveries receipts is a duplicated feature and is rarely activated.
 FreeLegalTextOnShippings=Free text on shipments
 ##### Deliveries #####
 DeliveryOrderNumberingModules=Produkter leverancer modtagelsen nummerressourcer modul
@@ -1477,7 +1479,9 @@ AGENDA_DEFAULT_FILTER_STATUS=Set automatically this status for events into searc
 AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
 AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
 AGENDA_NOTIFICATION_SOUND=Enable sound notification
-##### ClickToDial #####
+##### Clicktodial #####
+ClickToDialSetup=Klik for at ringe modul opsætning
+ClickToDialUrlDesc=Url called when a click on phone picto is done. Dans l'url, vous pouvez utiliser les balises<br><b>__PHONETO__</b> qui sera remplacé par le téléphone de l'appelé<br><b>__PHONEFROM__</b> qui sera remplacé par le téléphone de l'appelant (le votre)<br><b>__LOGIN__</b> qui sera remplacé par votre login clicktodial (défini sur votre fiche utilisateur)<br><b>__PASS__</b> qui sera remplacé par votre mot de passe clicktodial (défini sur votre fiche utilisateur).
 ClickToDialDesc=This module allows to make phone numbers clickable. A click on this icon will call make your phone to 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.
 ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
 ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on same computer than the browser, and called when you click on a link in your browser that start 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.
@@ -1505,10 +1509,11 @@ EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint availa
 ##### API ####
 ApiSetup=API module setup
 ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
-ApiProductionMode=Enable production mode (this will activate use of a caches for services management)
+ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
 ApiExporerIs=You can explore the APIs at url
 OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
 ApiKey=Key for API
+WarningAPIExplorerDisabled=The API explorer has been disabled. API explorer is not required to provide API services. It is a tool for developer to find/test REST APIs. If you need this tool, go into setup of module API REST to activate it.
 ##### Bank #####
 BankSetupModule=Bank modul opsætning
 FreeLegalTextOnChequeReceipts=Fri tekst på check kvitteringer
@@ -1577,7 +1582,7 @@ BackupDumpWizard=Wizard to build database backup dump file
 SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
 SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is only manual steps a privileged user can do.
 InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
-ConfFileMuseContainCustom=Installing an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to have option<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
+ConfFileMuseContainCustom=Installing an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
 HighlightLinesColor=Highlight color of the line when the mouse passes over (keep empty for no highlight)
 TextTitleColor=Color of page title
@@ -1607,6 +1612,7 @@ FixTZ=TimeZone fix
 FillFixTZOnlyIfRequired=Example: +2 (fill only if problem experienced)
 ExpectedChecksum=Expected Checksum
 CurrentChecksum=Current Checksum
+ForcedConstants=Required constant values
 MailToSendProposal=To send customer proposal
 MailToSendOrder=To send customer order
 MailToSendInvoice=To send customer invoice
@@ -1615,9 +1621,10 @@ MailToSendIntervention=To send intervention
 MailToSendSupplierRequestForQuotation=To send quotation request to supplier
 MailToSendSupplierOrder=To send supplier order
 MailToSendSupplierInvoice=To send supplier invoice
+MailToSendContract=To send a contract
 MailToThirdparty=To send email from third party page
 ByDefaultInList=Show by default on list view
-YouUseLastStableVersion=You use the last stable version
+YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
 TitleExampleForMaintenanceRelease=Example of message you can use to announce this maintenance release (feel free to use it on your web sites)
 ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. 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.
diff --git a/htdocs/langs/da_DK/banks.lang b/htdocs/langs/da_DK/banks.lang
index c70c3a7e7b6..0ccdf116b97 100644
--- a/htdocs/langs/da_DK/banks.lang
+++ b/htdocs/langs/da_DK/banks.lang
@@ -74,13 +74,13 @@ Conciliate=Forlige
 Conciliation=Forligsudvalget
 ReconciliationLate=Reconciliation late
 IncludeClosedAccount=Medtag lukkede konti
-OnlyOpenedAccount=Only open accounts
+OnlyOpenedAccount=Kun åbnet konti
 AccountToCredit=Hensyn til kredit
 AccountToDebit=Hensyn til at debitere
 DisableConciliation=Deaktiver forlig kendetegn for denne konto
 ConciliationDisabled=Forligsudvalget funktionen slået
 LinkedToAConciliatedTransaction=Linked to a conciliated entry
-StatusAccountOpened=Åbent
+StatusAccountOpened=Åbnet
 StatusAccountClosed=Lukket
 AccountIdShort=Antal
 LineRecord=Transaktion
diff --git a/htdocs/langs/da_DK/bills.lang b/htdocs/langs/da_DK/bills.lang
index 5b3fe644051..0646513f469 100644
--- a/htdocs/langs/da_DK/bills.lang
+++ b/htdocs/langs/da_DK/bills.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - bills
 Bill=Faktura
 Bills=Fakturaer
-BillsCustomers=Kundernes fakturaer
-BillsCustomer=Customers invoice
-BillsSuppliers=Leverandørernes fakturaer
-BillsCustomersUnpaid=Vederlagsfri kunder fakturaer
-BillsCustomersUnpaidForCompany=Ulønnet kundernes fakturaer for %s
-BillsSuppliersUnpaid=Ulønnet leverandørernes fakturaer
-BillsSuppliersUnpaidForCompany=Ulønnet leverandørens fakturaer for %s
+BillsCustomers=Customer invoices
+BillsCustomer=Kunden faktura
+BillsSuppliers=Supplier invoices
+BillsCustomersUnpaid=Unpaid customer invoices
+BillsCustomersUnpaidForCompany=Unpaid customer invoices for %s
+BillsSuppliersUnpaid=Unpaid supplier invoices
+BillsSuppliersUnpaidForCompany=Unpaid supplier invoices for %s
 BillsLate=Forsinkede betalinger
 BillsStatistics=Customers invoices statistics
 BillsStatisticsSuppliers=Suppliers invoices statistics
@@ -62,8 +62,8 @@ PaymentsBack=Betalinger tilbage
 paymentInInvoiceCurrency=in invoices currency
 PaidBack=Paid back
 DeletePayment=Slet betaling
-ConfirmDeletePayment=Are you sure you want to delete this payment?
-ConfirmConvertToReduc=Do you want to convert this credit note or deposit 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.
+ConfirmDeletePayment=Er du sikker på du vil slette denne betaling?
+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.
 SupplierPayments=Leverandører betalinger
 ReceivedPayments=Modtaget betalinger
 ReceivedCustomersPayments=Betalinger fra kunder
@@ -78,6 +78,7 @@ PaymentMode=Betalingstype
 PaymentTypeDC=Debit/Credit Card
 PaymentTypePP=PayPal
 IdPaymentMode=Payment type (id)
+CodePaymentMode=Payment type (code)
 LabelPaymentMode=Payment type (label)
 PaymentModeShort=Betalingstype
 PaymentTerm=Betaling sigt
@@ -102,9 +103,10 @@ SearchACustomerInvoice=Søg en kunde faktura
 SearchASupplierInvoice=Søg en leverandør faktura
 CancelBill=Annullere en faktura
 SendRemindByMail=E-mail-påmindelse
-DoPayment=Må betaling
-DoPaymentBack=Må betale tilbage
+DoPayment=Enter payment
+DoPaymentBack=Enter refund
 ConvertToReduc=Konverter til fremtidige rabat
+ConvertExcessReceivedToReduc=Convert excess received into future discount
 EnterPaymentReceivedFromCustomer=Indtast betaling er modtaget fra kunden
 EnterPaymentDueToCustomer=Foretag betaling til kunde
 DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
@@ -151,14 +153,14 @@ NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified
 FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
 NotARecurringInvoiceTemplate=Not a recurring template invoice
 NewBill=Ny faktura
-LastBills=Seneste %s fakturaer
-LastCustomersBills=Seneste %s kunder fakturaer
-LastSuppliersBills=Seneste %s leverandører fakturaer
+LastBills=Latest %s invoices
+LastCustomersBills=Latest %s customer invoices
+LastSuppliersBills=Latest %s supplier invoices
 AllBills=Alle fakturaer
 OtherBills=Andre fakturaer
 DraftBills=Udkast til fakturaer
-CustomersDraftInvoices=Kunder udkast til fakturaer
-SuppliersDraftInvoices=Leverandører udkast til fakturaer
+CustomersDraftInvoices=Customer draft invoices
+SuppliersDraftInvoices=Supplier draft invoices
 Unpaid=Ulønnet
 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>?
@@ -272,6 +274,7 @@ Deposit=Indbetaling
 Deposits=Indlån
 DiscountFromCreditNote=Discount fra kreditnota %s
 DiscountFromDeposit=Betalinger fra depositum faktura %s
+DiscountFromExcessReceived=Payments from excess received of invoice %s
 AbsoluteDiscountUse=Denne form for kredit kan bruges på faktura før dens validering
 CreditNoteDepositUse=Invoice must be validated to use this kind of credits
 NewGlobalDiscount=Ny discount
@@ -279,8 +282,8 @@ NewRelativeDiscount=Ny relativ discount
 NoteReason=Bemærk / Grund
 ReasonDiscount=Årsag
 DiscountOfferedBy=Ydet af
-DiscountStillRemaining=Discount stadig resterende
-DiscountAlreadyCounted=Discount allerede tælles
+DiscountStillRemaining=Discounts available
+DiscountAlreadyCounted=Discounts already consumed
 BillAddress=Bill 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.
@@ -333,6 +336,8 @@ 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
 # PaymentConditions
 Statut=Status
 PaymentConditionShortRECEP=Due Upon Receipt
@@ -351,6 +356,14 @@ PaymentConditionShortPT_ORDER=Rækkefølge
 PaymentConditionPT_ORDER=On order
 PaymentConditionShortPT_5050=50-50
 PaymentConditionPT_5050=50%% in advance, 50%% on delivery
+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
 FixAmount=Fix amount
 VarAmount=Variable amount (%% tot.)
 # PaymentType
@@ -420,7 +433,7 @@ ChequeDeposits=Checks indskud
 Cheques=Checks
 DepositId=Id deposit
 NbCheque=Number of checks
-CreditNoteConvertedIntoDiscount=Denne kreditnota er blevet konverteret til %s
+CreditNoteConvertedIntoDiscount=This %s has been converted into %s
 UsBillingContactAsIncoiveRecipientIfExist=Brug kunde faktureringsoplysninger kontakt-adresse i stedet for tredjepart adresse som modtager for fakturaer
 ShowUnpaidAll=Vis alle ubetalte fakturaer
 ShowUnpaidLateOnly=Vis sent unpaid faktura kun
diff --git a/htdocs/langs/da_DK/boxes.lang b/htdocs/langs/da_DK/boxes.lang
index fc99dc35305..76ad192c0a0 100644
--- a/htdocs/langs/da_DK/boxes.lang
+++ b/htdocs/langs/da_DK/boxes.lang
@@ -25,8 +25,8 @@ BoxTitleLastSuppliers=Latest %s recorded suppliers
 BoxTitleLastModifiedSuppliers=Latest %s modified suppliers
 BoxTitleLastModifiedCustomers=Latest %s modified customers
 BoxTitleLastCustomersOrProspects=Latest %s customers or prospects
-BoxTitleLastCustomerBills=Latest %s customer's invoices
-BoxTitleLastSupplierBills=Latest %s supplier's invoices
+BoxTitleLastCustomerBills=Latest %s customer invoices
+BoxTitleLastSupplierBills=Latest %s supplier invoices
 BoxTitleLastModifiedProspects=Latest %s modified prospects
 BoxTitleLastModifiedMembers=Latest %s members
 BoxTitleLastFicheInter=Latest %s modified interventions
@@ -51,12 +51,12 @@ ClickToAdd=Klik her for at tilføje.
 NoRecordedCustomers=Nr. registreres kunder
 NoRecordedContacts=Ingen registrerede kontakter
 NoActionsToDo=Ingen handlinger at gøre
-NoRecordedOrders=Nr. registreres kundens ordrer
+NoRecordedOrders=No recorded customer orders
 NoRecordedProposals=Nr. registreres forslag
-NoRecordedInvoices=Nr. registreres kundens fakturaer
-NoUnpaidCustomerBills=Nr. ubetalte kundens fakturaer
-NoUnpaidSupplierBills=Nr. ubetalte leverandørens fakturaer
-NoModifiedSupplierBills=Ingen registreres leverandørens fakturaer
+NoRecordedInvoices=No recorded customer invoices
+NoUnpaidCustomerBills=No unpaid customer invoices
+NoUnpaidSupplierBills=No unpaid supplier invoices
+NoModifiedSupplierBills=No recorded supplier invoices
 NoRecordedProducts=Nr. registreres produkter / tjenester
 NoRecordedProspects=Nr. registreres udsigter
 NoContractedProducts=Ingen produkter / tjenesteydelser kontrakt
diff --git a/htdocs/langs/da_DK/companies.lang b/htdocs/langs/da_DK/companies.lang
index 46afa292b54..e6f58e8a60f 100644
--- a/htdocs/langs/da_DK/companies.lang
+++ b/htdocs/langs/da_DK/companies.lang
@@ -81,6 +81,7 @@ PaymentBankAccount=Payment bank account
 OverAllProposals=Total proposals
 OverAllOrders=Total orders
 OverAllInvoices=Total invoices
+OverAllSupplierProposals=Total price requests
 ##### Local Taxes #####
 LocalTax1IsUsed=Use second tax
 LocalTax1IsUsedES= RE bruges
@@ -389,7 +390,7 @@ ListCustomersShort=Liste over kunder
 ThirdPartiesArea=Third parties and contact area
 LastModifiedThirdParties=Latest %s modified third parties
 UniqueThirdParties=Samlet unikke tredjeparter
-InActivity=Åbent
+InActivity=Åbnet
 ActivityCeased=Lukket
 ThirdPartyIsClosed=Third party is closed
 ProductsIntoElements=List of products/services into %s
@@ -404,7 +405,7 @@ MergeThirdparties=Merge third parties
 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 so you will be able to delete the duplicate one.
 ThirdpartiesMergeSuccess=Thirdparties have been merged
 SaleRepresentativeLogin=Login of sales representative
-SaleRepresentativeFirstname=Firstname of sales representative
-SaleRepresentativeLastname=Lastname of sales representative
+SaleRepresentativeFirstname=First name of sales representative
+SaleRepresentativeLastname=Last name of sales representative
 ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
 NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/da_DK/compta.lang b/htdocs/langs/da_DK/compta.lang
index 21390d5a308..bd999586e7a 100644
--- a/htdocs/langs/da_DK/compta.lang
+++ b/htdocs/langs/da_DK/compta.lang
@@ -65,6 +65,7 @@ PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=Moms betaling
 ListPayment=Liste over betalinger
 ListOfCustomerPayments=Liste over kundebetalinger
+ListOfSupplierPayments=Liste over leverandør betalinger
 DateStartPeriod=Date start period
 DateEndPeriod=Date end period
 newLT1Payment=New tax 2 payment
@@ -81,7 +82,7 @@ LT2PaymentES=IRPF Betaling
 LT2PaymentsES=IRPF Betalinger
 VATPayment=Sales tax payment
 VATPayments=Sales tax payments
-VATRefund=Sales tax refund Refund
+VATRefund=Sales tax refund
 Refund=Refund
 SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Vis momsbetaling
diff --git a/htdocs/langs/da_DK/cron.lang b/htdocs/langs/da_DK/cron.lang
index bac550f23e3..e45ee62e37d 100644
--- a/htdocs/langs/da_DK/cron.lang
+++ b/htdocs/langs/da_DK/cron.lang
@@ -17,14 +17,14 @@ CronMethodDoesNotExists=Class %s does not contains any method %s
 # Menu
 EnabledAndDisabled=Enabled and disabled
 # Page list
-CronLastOutput=Last run output
-CronLastResult=Last result code
+CronLastOutput=Latest run output
+CronLastResult=Latest result code
 CronCommand=Command
 CronList=Scheduled jobs
 CronDelete=Delete scheduled jobs
-CronConfirmDelete=Are you sure you want to delete these scheduled jobs ?
+CronConfirmDelete=Are you sure you want to delete these scheduled jobs?
 CronExecute=Launch scheduled job
-CronConfirmExecute=Are you sure you want to execute these scheduled jobs now ?
+CronConfirmExecute=Are you sure you want to execute these scheduled jobs now?
 CronInfo=Scheduled job module allow to execute job that have been planned
 CronTask=Job
 CronNone=Ingen
@@ -33,7 +33,7 @@ CronDtEnd=Not after
 CronDtNextLaunch=Next execution
 CronDtLastLaunch=Start date of latest execution
 CronDtLastResult=End date of latest execution
-CronFrequency=Frequency
+CronFrequency=Frekvens
 CronClass=Class
 CronMethod=Metode
 CronModule=Modul
@@ -65,7 +65,7 @@ CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of
 CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
 CronCommandHelp=The system command line to execute.
 CronCreateJob=Create new Scheduled Job
-CronFrom=From
+CronFrom=Fra
 # Info
 # Common
 CronType=Job type
diff --git a/htdocs/langs/da_DK/errors.lang b/htdocs/langs/da_DK/errors.lang
index 50ca8d0d906..d796b06c300 100644
--- a/htdocs/langs/da_DK/errors.lang
+++ b/htdocs/langs/da_DK/errors.lang
@@ -11,6 +11,7 @@ ErrorLoginAlreadyExists=Log ind %s eksisterer allerede.
 ErrorGroupAlreadyExists=Gruppe %s eksisterer allerede.
 ErrorRecordNotFound=Optag ikke fundet.
 ErrorFailToCopyFile=Kunne ikke kopiere filen <b>&quot;%s&quot;</b> til <b>&quot;%s&quot;.</b>
+ErrorFailToCopyDir=Failed to copy directory '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToRenameFile=Kunne ikke omdøbe filen <b>'%s'</b> til <b>'%s'.</b>
 ErrorFailToDeleteFile=Det lykkedes ikke at fjerne filen <b>' %s'.</b>
 ErrorFailToCreateFile=Kunne ikke oprette filen <b>' %s'.</b>
@@ -115,7 +116,7 @@ ErrorNoActivatedBarcode=Ingen stregkode aktiveret typen
 ErrUnzipFails=Failed to unzip %s with ZipArchive
 ErrNoZipEngine=No engine to unzip %s file in this PHP
 ErrorFileMustBeADolibarrPackage=The file %s must be a Dolibarr zip package
-ErrorFileRequired=It takes a package Dolibarr file
+ErrorModuleFileRequired=You must select a Dolibarr module package file
 ErrorPhpCurlNotInstalled=The PHP CURL is not installed, this is essential to talk with 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
@@ -181,6 +182,8 @@ ErrorBankStatementNameMustFollowRegex=Error, bank statement name must follow the
 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>
 
 # 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.
diff --git a/htdocs/langs/da_DK/holiday.lang b/htdocs/langs/da_DK/holiday.lang
index 4cebdf0368e..3963b481d96 100644
--- a/htdocs/langs/da_DK/holiday.lang
+++ b/htdocs/langs/da_DK/holiday.lang
@@ -76,8 +76,8 @@ BoxTitleLastLeaveRequests=Latest %s modified leave requests
 HolidaysMonthlyUpdate=Monthly update
 ManualUpdate=Manual update
 HolidaysCancelation=Leave request cancelation
-EmployeeLastname=Employee lastname
-EmployeeFirstname=Employee firstname
+EmployeeLastname=Employee last name
+EmployeeFirstname=Employee first name
 TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
 
 ## Configuration du Module ##
diff --git a/htdocs/langs/da_DK/ldap.lang b/htdocs/langs/da_DK/ldap.lang
index 2732616c854..378a7b0e555 100644
--- a/htdocs/langs/da_DK/ldap.lang
+++ b/htdocs/langs/da_DK/ldap.lang
@@ -13,8 +13,8 @@ LDAPUsers=Brugere i LDAP database
 LDAPFieldStatus=Status
 LDAPFieldFirstSubscriptionDate=Første abonnement dato
 LDAPFieldFirstSubscriptionAmount=Fist abonnement beløb
-LDAPFieldLastSubscriptionDate=Seneste abonnement dato
-LDAPFieldLastSubscriptionAmount=Seneste abonnement beløb
+LDAPFieldLastSubscriptionDate=Latest subscription date
+LDAPFieldLastSubscriptionAmount=Latest subscription amount
 LDAPFieldSkype=Skype id
 LDAPFieldSkypeExample=Example : skypeName
 UserSynchronized=Bruger synkroniseres
diff --git a/htdocs/langs/da_DK/mails.lang b/htdocs/langs/da_DK/mails.lang
index 5d6e82430df..25e799f54bc 100644
--- a/htdocs/langs/da_DK/mails.lang
+++ b/htdocs/langs/da_DK/mails.lang
@@ -74,14 +74,18 @@ ResultOfMailSending=Result of mass EMail sending
 NbSelected=Nb selected
 NbIgnored=Nb ignored
 NbSent=Nb sent
-ContactsWithThirdpartyFilter=Contact with customer filters
+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
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Line %s filtjenester
 RecipientSelectionModules=Defineret anmodninger om modtagernes udvælgelse
 MailSelectedRecipients=Udvalgte modtagere
 MailingArea=EMailings område
-LastMailings=Seneste %s emailings
+LastMailings=Latest %s emailings
 TargetsStatistics=Mål statistik
 NbOfCompaniesContacts=Unikke kontakter af virksomheder
 MailNoChangePossible=Modtagere til validerede emailing kan ikke ændres
@@ -146,3 +150,6 @@ AdvTgtCreateFilter=Create filter
 AdvTgtOrCreateNewFilter=Name of new filter
 NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
+OutGoingEmailSetup=Outgoing email setup
+InGoingEmailSetup=Incoming email setup
+
diff --git a/htdocs/langs/da_DK/main.lang b/htdocs/langs/da_DK/main.lang
index 0b94afac8e8..facde8016a3 100644
--- a/htdocs/langs/da_DK/main.lang
+++ b/htdocs/langs/da_DK/main.lang
@@ -69,6 +69,7 @@ SetDate=Indstil dato
 SelectDate=Select a date
 SeeAlso=Se også %s
 SeeHere=See here
+Apply=Apply
 BackgroundColorByDefault=Standard baggrundsfarve
 FileRenamed=The file was successfully renamed
 FileUploaded=Filen blev uploadet
@@ -87,7 +88,7 @@ Undefined=Undefined
 PasswordForgotten=Password forgotten?
 SeeAbove=Se ovenfor
 HomeArea=Hjem område
-LastConnexion=Seneste forbindelse
+LastConnexion=Latest connection
 PreviousConnexion=Forrige forbindelse
 PreviousValue=Previous value
 ConnectedOnMultiCompany=Connected på enhed
@@ -237,7 +238,7 @@ DateCreation=Lavet dato
 DateCreationShort=Creat. date
 DateModification=Ændringsdatoen
 DateModificationShort=Modif. dato
-DateLastModification=Seneste ændringsdato
+DateLastModification=Latest modification date
 DateValidation=Validering dato
 DateClosing=Udløbsdato
 DateDue=Forfaldsdag
@@ -433,7 +434,7 @@ Reportings=Rapportering
 Draft=Udkast
 Drafts=Drafts
 Validated=Valideret
-Opened=Åbent
+Opened=Åbnet
 New=Ny
 Discount=Discount
 Unknown=Ukendt
@@ -599,6 +600,8 @@ SessionName=Session navn
 Method=Metode
 Receive=Modtag
 CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
+ExpectedValue=Expected Value
+CurrentValue=Nuværende værdi
 PartialWoman=Delvis
 TotalWoman=Total
 NeverReceived=Aldrig modtaget
@@ -756,6 +759,7 @@ SomeTranslationAreUncomplete=Some languages may be partially translated or may c
 DirectDownloadLink=Direct download link
 Download=Download
 ActualizeCurrency=Update currency rate
+Fiscalyear=Fiscal year
 # Week day
 Monday=Mandag
 Tuesday=Tirsdag
@@ -812,3 +816,5 @@ SearchIntoContracts=Kontrakter
 SearchIntoCustomerShipments=Customer shipments
 SearchIntoExpenseReports=Expense reports
 SearchIntoLeaves=Leaves
+
+BulkActions=Bulk actions
diff --git a/htdocs/langs/da_DK/members.lang b/htdocs/langs/da_DK/members.lang
index 47fc7dc8a52..896afaf7841 100644
--- a/htdocs/langs/da_DK/members.lang
+++ b/htdocs/langs/da_DK/members.lang
@@ -136,8 +136,8 @@ DocForAllMembersCards=Generer visitkort for alle medlemmer (Format for output fa
 DocForOneMemberCards=Generer visitkort for et bestemt medlem (Format for output faktisk setup: <b>%s)</b>
 DocForLabels=Generer adresse ark (Format for output faktisk setup: <b>%s)</b>
 SubscriptionPayment=Abonnement betaling
-LastSubscriptionDate=Sidste abonnement dato
-LastSubscriptionAmount=Sidste tegningsbeløbet
+LastSubscriptionDate=Latest subscription date
+LastSubscriptionAmount=Latest subscription amount
 MembersStatisticsByCountries=Medlemmer statistik efter land
 MembersStatisticsByState=Medlemmer statistikker stat / provins
 MembersStatisticsByTown=Medlemmer statistikker byen
@@ -149,7 +149,7 @@ MembersByStateDesc=Denne skærm viser dig statistikker om medlemmer fra staten /
 MembersByTownDesc=Denne skærm viser dig statistikker over medlemmer af byen.
 MembersStatisticsDesc=Vælg statistikker, du ønsker at læse ...
 MenuMembersStats=Statistik
-LastMemberDate=Sidste medlem dato
+LastMemberDate=Latest member date
 Nature=Natur
 Public=Information er offentlige
 NewMemberbyWeb=Nyt medlem tilføjet. Afventer godkendelse
diff --git a/htdocs/langs/da_DK/orders.lang b/htdocs/langs/da_DK/orders.lang
index a16fe146318..96910da21a7 100644
--- a/htdocs/langs/da_DK/orders.lang
+++ b/htdocs/langs/da_DK/orders.lang
@@ -39,7 +39,7 @@ StatusOrderRefusedShort=Afviste
 StatusOrderBilledShort=Billed
 StatusOrderToProcessShort=Til at behandle
 StatusOrderReceivedPartiallyShort=Delvist modtaget
-StatusOrderReceivedAllShort=Alt modtaget
+StatusOrderReceivedAllShort=Products received
 StatusOrderCanceled=Annulleret
 StatusOrderDraft=Udkast (skal valideres)
 StatusOrderValidated=Valideret
@@ -51,7 +51,7 @@ StatusOrderApproved=Godkendt
 StatusOrderRefused=Afviste
 StatusOrderBilled=Billed
 StatusOrderReceivedPartially=Delvist modtaget
-StatusOrderReceivedAll=Alt modtaget
+StatusOrderReceivedAll=All products received
 ShippingExist=En forsendelse eksisterer
 QtyOrdered=Qty bestilt
 ProductQtyInDraft=Product quantity into draft orders
diff --git a/htdocs/langs/da_DK/other.lang b/htdocs/langs/da_DK/other.lang
index 80c1dae197c..3907188fdec 100644
--- a/htdocs/langs/da_DK/other.lang
+++ b/htdocs/langs/da_DK/other.lang
@@ -68,14 +68,15 @@ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find her
 PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nYou will find here the shipping __SHIPPINGREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nYou will find here the intervention __FICHINTERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n__PERSONALIZED__\n\n__SIGNATURE__
-DemoDesc=Dolibarr is a compact ERP/CRM supporting several functional modules. A demo showcasing all modules makes no sense as this scenario never occurs. So, several demo profiles are available.
+DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
+ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
 DemoFundation=Administrer medlemmer af en fond
 DemoFundation2=Administrer medlemmer og bankkonto i en fond
-DemoCompanyServiceOnly=Administrer en freelance virksomhed sælger service kun
+DemoCompanyServiceOnly=Company or freelance selling service only
 DemoCompanyShopWithCashDesk=Administrer en butik med et kontant desk
-DemoCompanyProductAndStocks=Administrer en lille eller mellemstor virksomhed, der sælger produkter
-DemoCompanyAll=Administrer en lille eller mellemstor virksomhed med flere aktiviteter (alle de vigtigste moduler)
+DemoCompanyProductAndStocks=Company selling products with a shop
+DemoCompanyAll=Company with multiple activities (all main modules)
 CreatedBy=Oprettet af %s
 ModifiedBy=Modificeret af %s
 ValidatedBy=Attesteret af %s
diff --git a/htdocs/langs/da_DK/products.lang b/htdocs/langs/da_DK/products.lang
index fdea0e29d93..43dfd0f4c1b 100644
--- a/htdocs/langs/da_DK/products.lang
+++ b/htdocs/langs/da_DK/products.lang
@@ -60,7 +60,7 @@ SellingPrice=Salgspris
 SellingPriceHT=Salgspris (efter skat)
 SellingPriceTTC=Salgspris (inkl. skat)
 CostPriceDescription=This price (net of tax) can be used to store the average amount this product cost to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
-CostPriceUsage=In a future version, this value could be used for margin calculation.
+CostPriceUsage=This value could be used for margin calculation.
 SoldAmount=Sold amount
 PurchasedAmount=Purchased amount
 NewPrice=Ny pris
@@ -142,6 +142,7 @@ ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b>?
 CloneContentProduct=Klon alle de vigtigste informationer af produkt / service
 ClonePricesProduct=Klon vigtigste informationer og priser
 CloneCompositionProduct=Clone packaged product/service
+CloneCombinationsProduct=Clone product variants
 ProductIsUsed=Dette produkt er brugt
 NewRefForClone=Ref. af nye produkter / ydelser
 SellingPrices=Selling prices
@@ -238,7 +239,7 @@ GlobalVariables=Global variables
 VariableToUpdate=Variable to update
 GlobalVariableUpdaters=Global variable updaters
 UpdateInterval=Update interval (minutes)
-LastUpdated=Last updated
+LastUpdated=Latest update
 CorrectlyUpdated=Correctly updated
 PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
 PropalMergePdfProductChooseFile=Select PDF files
@@ -258,4 +259,41 @@ VolumeUnits=Volume unit
 SizeUnits=Size unit
 DeleteProductBuyPrice=Delete buying price
 ConfirmDeleteProductBuyPrice=Are you sure you want to delete this buying price?
+SubProduct=Sub product
 
+#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
+ProductCombinations=Variants
+HideProductCombinations=Hide products variant in the products selector
+ProductCombination=Variant
+NewProductCombination=New variant
+EditProductCombination=Editing variant
+ProductCombinationGenerator=Variants generator
+Features=Features
+PriceImpact=Price impact
+WeightImpact=Weight impact
+NewProductAttribute=Ny attribut
+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
+PercentageVariation=Percentage variation
+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 child products
+ConfirmCloneProductCombinations=Would you like to copy all the product variant to the 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
diff --git a/htdocs/langs/da_DK/projects.lang b/htdocs/langs/da_DK/projects.lang
index 775eb73b1f1..02171a27ddd 100644
--- a/htdocs/langs/da_DK/projects.lang
+++ b/htdocs/langs/da_DK/projects.lang
@@ -29,9 +29,9 @@ DeleteAProject=Slet et projekt
 DeleteATask=Slet en opgave
 ConfirmDeleteAProject=Are you sure you want to delete this project?
 ConfirmDeleteATask=Are you sure you want to delete this task?
-OpenedProjects=Open projects
-OpenedTasks=Open tasks
-OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
+OpenedProjects=Opened projects
+OpenedTasks=Opened tasks
+OpportunitiesStatusForOpenedProjects=Opportunities amount of opened projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=Vis projekt
 SetProject=Indstil projekt
@@ -47,7 +47,7 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=Bruger
 TaskTimeNote=Note
 TaskTimeDate=Dato
-TasksOnOpenedProject=Tasks on open projects
+TasksOnOpenedProject=Tasks on opened projects
 WorkloadNotDefined=Workload not defined
 NewTimeSpent=Ny tid
 MyTimeSpent=Min tid
@@ -96,6 +96,7 @@ ValidateProject=Validér projet
 ConfirmValidateProject=Are you sure you want to validate this project?
 CloseAProject=Luk projekt
 ConfirmCloseAProject=Are you sure you want to close this project?
+AlsoCloseAProject=Also close project (keep it open if you still need to follow production tasks on it)
 ReOpenAProject=Åbn projekt
 ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=Projekt kontakter
@@ -121,7 +122,7 @@ CloneProjectFiles=Clone project joined files
 CloneTaskFiles=Clone task(s) joined files (if task(s) cloned)
 CloneMoveDate=Update project/tasks dates from now?
 ConfirmCloneProject=Are you sure to clone this project?
-ProjectReportDate=Change task date according project start date
+ProjectReportDate=Change task dates according to new project start date
 ErrorShiftTaskDate=Impossible to shift task date according to new project start date
 ProjectsAndTasksLines=Projects and tasks
 ProjectCreatedInDolibarr=Project %s created
@@ -178,9 +179,9 @@ ProjectsStatistics=Statistics on projects/leads
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 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.
-OpenedProjectsByThirdparties=Open projects by thirdparties
+OpenedProjectsByThirdparties=Opened projects by thirdparties
 OnlyOpportunitiesShort=Only opportunities
-OpenedOpportunitiesShort=Open opportunities
+OpenedOpportunitiesShort=Opened opportunities
 NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount
diff --git a/htdocs/langs/da_DK/propal.lang b/htdocs/langs/da_DK/propal.lang
index d87e428ca05..7923e1ff553 100644
--- a/htdocs/langs/da_DK/propal.lang
+++ b/htdocs/langs/da_DK/propal.lang
@@ -3,7 +3,7 @@ Proposals=Kommerciel forslag
 Proposal=Kommerciel forslag
 ProposalShort=Forslag
 ProposalsDraft=Udkast til kommercielle forslag
-ProposalsOpened=Open commercial proposals
+ProposalsOpened=Åbnet kommercielle forslag
 Prop=Kommerciel forslag
 CommercialProposal=Kommerciel forslag
 ProposalCard=Forslag kort
@@ -26,9 +26,9 @@ AmountOfProposalsByMonthHT=Beløb af måneden (efter skat)
 NbOfProposals=Antal kommercielle forslag
 ShowPropal=Vis forslag
 PropalsDraft=Drafts
-PropalsOpened=Åbent
+PropalsOpened=Åbnet
 PropalStatusDraft=Udkast (skal valideres)
-PropalStatusValidated=Valideret (forslag er åbnet)
+PropalStatusValidated=Validated (proposal is opened)
 PropalStatusSigned=Underskrevet (til bill)
 PropalStatusNotSigned=Ikke underskrevet (lukket)
 PropalStatusBilled=Billed
diff --git a/htdocs/langs/da_DK/stocks.lang b/htdocs/langs/da_DK/stocks.lang
index 2a62782ffb7..2224a922cdd 100644
--- a/htdocs/langs/da_DK/stocks.lang
+++ b/htdocs/langs/da_DK/stocks.lang
@@ -22,13 +22,15 @@ Movements=Bevægelser
 ErrorWarehouseRefRequired=Warehouse reference navn er påkrævet
 ListOfWarehouses=Liste over pakhuse
 ListOfStockMovements=Liste over lagerbevægelserne
+StockMovementForId=Movement ID %d
+ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Warehouses area
 Location=Lieu
 LocationSummary=Kortnavn placering
 NumberOfDifferentProducts=Number of different products
 NumberOfProducts=Samlet antal produkter
-LastMovement=Seneste bevægelighed
-LastMovements=Seneste bevægelser
+LastMovement=Latest movement
+LastMovements=Latest movements
 Units=Enheder
 Unit=Enhed
 StockCorrection=Korrekt lager
diff --git a/htdocs/langs/da_DK/supplier_proposal.lang b/htdocs/langs/da_DK/supplier_proposal.lang
index 8f1fe88f73c..4a0429d6039 100644
--- a/htdocs/langs/da_DK/supplier_proposal.lang
+++ b/htdocs/langs/da_DK/supplier_proposal.lang
@@ -8,7 +8,7 @@ SearchRequest=Find a request
 DraftRequests=Draft requests
 SupplierProposalsDraft=Draft supplier proposals
 LastModifiedRequests=Latest %s modified price requests
-RequestsOpened=Open price requests
+RequestsOpened=Opened price requests
 SupplierProposalArea=Supplier proposals area
 SupplierProposalShort=Supplier proposal
 SupplierProposals=Supplier proposals
@@ -23,7 +23,7 @@ ConfirmValidateAsk=Are you sure you want to validate this price request under na
 DeleteAsk=Delete request
 ValidateAsk=Validate request
 SupplierProposalStatusDraft=Udkast (skal valideres)
-SupplierProposalStatusValidated=Validated (request is open)
+SupplierProposalStatusValidated=Validated (request is opened)
 SupplierProposalStatusClosed=Lukket
 SupplierProposalStatusSigned=Accepted
 SupplierProposalStatusNotSigned=Afviste
diff --git a/htdocs/langs/da_DK/suppliers.lang b/htdocs/langs/da_DK/suppliers.lang
index 350ccb255d0..c6f8538422f 100644
--- a/htdocs/langs/da_DK/suppliers.lang
+++ b/htdocs/langs/da_DK/suppliers.lang
@@ -9,7 +9,7 @@ ShowSupplier=Vis leverandør
 OrderDate=Bestil dato
 BuyingPriceMin=Best buying price
 BuyingPriceMinShort=Best buying price
-TotalBuyingPriceMinShort=Total of subproducts buying prices
+TotalBuyingPriceMinShort=Total af underprodukters købspris
 TotalSellingPriceMinShort=Total of subproducts selling prices
 SomeSubProductHaveNoPrices=Nogle underprodukter har ingen pris defineret
 AddSupplierPrice=Add buying price
@@ -24,10 +24,10 @@ ExportDataset_fournisseur_1=Leverandør fakturaer listen og fakturaer 'linjer
 ExportDataset_fournisseur_2=Leverandør fakturaer og betalinger
 ExportDataset_fournisseur_3=Supplier orders and order lines
 ApproveThisOrder=Godkende denne ordre
-ConfirmApproveThisOrder=Er du sikker på at du vil godkende denne ordre?
+ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b>?
 DenyingThisOrder=Deny this order
-ConfirmDenyingThisOrder=Er du sikker på at du vil benægte denne ordre?
-ConfirmCancelThisOrder=Er du sikker på du vil annullere denne ordre?
+ConfirmDenyingThisOrder=Are you sure you want to deny this order <b>%s</b>?
+ConfirmCancelThisOrder=Are you sure you want to cancel this order <b>%s</b>?
 AddSupplierOrder=Opret leverandør for
 AddSupplierInvoice=Opret leverandørens faktura
 ListOfSupplierProductForSupplier=Liste over produkter og priser for <b>leverandørens %s</b>
@@ -41,3 +41,4 @@ DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Wrong quality
 ReputationForThisProduct=Reputation
 BuyerName=Buyer name
+AllProductServicePrices=All product / service prices
diff --git a/htdocs/langs/da_DK/users.lang b/htdocs/langs/da_DK/users.lang
index be9d73fab71..b75ce3c0726 100644
--- a/htdocs/langs/da_DK/users.lang
+++ b/htdocs/langs/da_DK/users.lang
@@ -36,7 +36,7 @@ AdministratorDesc=Administrator
 DefaultRights=Standardtilladelserne
 DefaultRightsDesc=Definer her standardtilladelserne, der indrømmes automatisk til en ny oprettet bruger.
 DolibarrUsers=Dolibarr brugere
-LastName=Last Name
+LastName=Efternavn
 FirstName=Fornavn
 ListOfGroups=Liste over grupper
 NewGroup=Ny gruppe
diff --git a/htdocs/langs/da_DK/withdrawals.lang b/htdocs/langs/da_DK/withdrawals.lang
index 9ebaad713c9..616f5ff1337 100644
--- a/htdocs/langs/da_DK/withdrawals.lang
+++ b/htdocs/langs/da_DK/withdrawals.lang
@@ -24,6 +24,7 @@ WithdrawStatistics=Direct debit payment statistics
 WithdrawRejectStatistics=Direct debit payment reject statistics
 LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
+WithdrawRequestsDone=%s direct debit payment requests recorded
 ThirdPartyBankCode=Tredjepart bankkode
 NoInvoiceCouldBeWithdrawed=Nr. faktura withdrawed med succes. Kontroller, at fakturaen er for selskaber med en gyldig forbud.
 ClassCredited=Klassificere krediteres
@@ -76,8 +77,8 @@ RUM=UMR
 RUMLong=Unique Mandate Reference
 RUMWillBeGenerated=UMR number will be generated once bank account information are saved
 WithdrawMode=Direct debit mode (FRST or RECUR)
-WithdrawRequestAmount=Withdraw request amount:
-WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil amount.
+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
diff --git a/htdocs/langs/de_AT/accountancy.lang b/htdocs/langs/de_AT/accountancy.lang
new file mode 100644
index 00000000000..473582c566a
--- /dev/null
+++ b/htdocs/langs/de_AT/accountancy.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - accountancy
+AccountingCategory=Accounting category
diff --git a/htdocs/langs/de_AT/admin.lang b/htdocs/langs/de_AT/admin.lang
index 173ba517d93..ace0a39c814 100644
--- a/htdocs/langs/de_AT/admin.lang
+++ b/htdocs/langs/de_AT/admin.lang
@@ -74,6 +74,7 @@ Permission2411=Maßnahmen (Termine oder Aufgaben) Anderer einsehen
 Permission2412=Maßnahmen (Termine oder Aufgaben) Anderer erstellen/bearbeiten
 Permission2413=Maßnahmen (Termine oder Aufgaben) Anderer löschen
 Permission2501=Dokumente hochladen oder löschen
+DictionaryAccountancyCategory=Accounting categories
 VATIsNotUsedDesc=Die vorgeschlagene MwSt. ist standardmäßig 0 für alle Fälle wie Stiftungen, Einzelpersonen oder Kleinunternehmen-
 VirtualServerName=Virtual Server Name
 PhpWebLink=Php Web-Link
@@ -97,9 +98,8 @@ DocumentModelOdt=Erstellen von Dokumentvorlagen im OpenDocuments-Format (.odt-Da
 WatermarkOnDraftInvoices=Wasserzeichen auf Rechnungsentwürfen (alle, falls leer)
 WatermarkOnDraftProposal=Wasserzeichen für Angebotsentwürfe (alle, falls leer)
 WatermarkOnDraftOrders=Wasserzeichen zu den Entwürfen von Aufträgen (alle, wenn leer)
-ClickToDialSetup=Click-to-Dial-Moduleinstellungen
 InterventionsSetup=Eingriffsmoduleinstellungen
 FreeLegalTextOnInterventions=Freier Rechtstext für Eingriffe
 WatermarkOnDraftInterventionCards=Wasserzeichen auf Intervention Karte Dokumente (alle, wenn leer)
-ApiProductionMode=Enable production mode (this will activate use of a caches for services management)
+ClickToDialSetup=Click-to-Dial-Moduleinstellungen
 PathToGeoIPMaxmindCountryDataFile=Pfad zur Datei mit Maxmind IP to Country Übersetzung. <br> Beispiel: / usr / local / share / GeoIP / GeoIP.dat
diff --git a/htdocs/langs/de_AT/bills.lang b/htdocs/langs/de_AT/bills.lang
index ac1e8cd2e66..b11695fed5b 100644
--- a/htdocs/langs/de_AT/bills.lang
+++ b/htdocs/langs/de_AT/bills.lang
@@ -1,8 +1,4 @@
 # Dolibarr language file - Source file is en_US - bills
-BillsCustomersUnpaid=Unbezahlte Kundenrechnungen
-BillsCustomersUnpaidForCompany=Unbezahlte Kundenrechnungen für %s
-BillsSuppliersUnpaid=Unbezahlte Lieferantenrechnungen
-BillsSuppliersUnpaidForCompany=Unbezahlte Liferantenrechnung für %s
 DisabledBecauseNotErasable=Deaktiviert, weil es nicht gelöscht werden kann
 InvoiceStandardDesc=Dies ist die übliche Rechnungsart.
 InvoiceDeposit=Anzahlung
@@ -14,6 +10,7 @@ InvoiceProFormaDesc=<b>Proformarechnung</b> entspricht dem Wert der echten Rechn
 InvoiceReplacementDesc=<b>Ersatzrechnung</b> wird verwendet um eine Rechnung, die niemals bezahlt wurde, zu stornieren.<br><br>Beachte: Nur Rechnungen ohne Bezahlung können storniert werden. Wenn die stornierte Rechnung noch nicht geschlossen is, wird sie automatisch geschlossen und als 'storniert' markiert.
 ConsumedBy=Consumed von
 CardBill=Rechnungskarte
+ConfirmDeletePayment=Are you sure you want to delete this payment ?
 ValidateBill=Validate Rechnung
 NewRelativeDiscount=Neue relative Rabatt
 RelatedBill=Verwandte Rechnung
diff --git a/htdocs/langs/de_AT/compta.lang b/htdocs/langs/de_AT/compta.lang
index 9664e53294d..9ec9d2f810c 100644
--- a/htdocs/langs/de_AT/compta.lang
+++ b/htdocs/langs/de_AT/compta.lang
@@ -8,7 +8,6 @@ VATToCollect=Einzuhebende MwSt.
 VATSummary=MwSt. Zahllast
 VATCollected=Eingehobene MwSt.
 MenuSpecialExpenses=Steuern, Sozialbeiträge und Dividenden
-VATRefund=Sales tax refund Refund
 AnnualSummaryDueDebtMode=Die Jahresbilanz der Einnahmen/Ausgaben im Modus<b>%sForderungen-Verbindlichkeiten%s</b> meldet <b>Kameralistik</b>.
 AnnualSummaryInputOutputMode=Die Jahresbilanz der Einnahmen/Ausgaben im Modus <b>%sEinkünfte-Ausgaben%s</b> meldet <b>Ist-Besteuerung</b>.
 VATReportByCustomersInInputOutputMode=Bericht zur vereinnahmten und bezahlten MwSt. nach Kunden (Steuerbeleg)
diff --git a/htdocs/langs/de_AT/mails.lang b/htdocs/langs/de_AT/mails.lang
index 8d599ed2d86..f933cd2c9b5 100644
--- a/htdocs/langs/de_AT/mails.lang
+++ b/htdocs/langs/de_AT/mails.lang
@@ -1,16 +1,11 @@
 # Dolibarr language file - Source file is en_US - mails
 ResetMailing=E-Mail-Kampagne erneut senden
-ConfirmResetMailing=Achtung: Die neuerliche Ausführung der E-Mail-Kampagne <b>%s</b> erlaubt Ihnen den Massenversand von E-Mails zu einem anderen Zeitpunkt. Möchten Sie wirklich fortfahren?
 CloneEMailing=E-Mail-Kampagne duplizieren
-ConfirmCloneEMailing=Möchten Sie diese Mailkampagne wirklich duplizieren?
 CloneContent=Nachricht duplizieren
 MailingArea=E-Mail-Kampagnenübersicht
-LastMailings=%s neueste E-Mail-Kampagnen
 MailNoChangePossible=Die Empfängerliste einer freigegebenen E-Mail-Kampagne kann nicht mehr geändert werden
 SearchAMailing=Suche E-Mail-Kampagne
 SendMailing=E-Mail-Kampagne versenden
-MailingNeedCommand=Aus Sicherheitsgründen sollten E-Mail-Kampagnen von der Kommandozeile aus versandt werden. Bitten Sie Ihren Administrator um die Ausführung des folgenden Befehls, um den Versand an alle Empfänger zu starten:
-ConfirmSendingEmailing=Möchten Sie diese E-Mail-Kampagne wirklich versenden?<br>Aus Sicherheitsgründen ist der gleichzeitige Versand auf <b>%s</b> Empfänger pro Sitzung beschränkt.
 LimitSendingEmailing=Aus Sicherheits- und Zeitüberschreitungsgründen ist der Online-Versadn von E-Mails auf <b>%s</b> Empfänger je Sitzung beschränkt.
 IdRecord=Eintrags ID
 ANotificationsWillBeSent=1 Benachrichtigung wird per E-Mail versandt
diff --git a/htdocs/langs/de_AT/members.lang b/htdocs/langs/de_AT/members.lang
index b9535f5bd00..c4883e154c9 100644
--- a/htdocs/langs/de_AT/members.lang
+++ b/htdocs/langs/de_AT/members.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - members
-ThisIsContentOfYourCard=Dies sind die Detail Ihrer Karte
 SetLinkToUser=Mit Benutzer verknüpfen
 SetLinkToThirdParty=Mit Partner verknüpfen
 MenuMembersNotUpToDate=Veraltete Mitglieder
diff --git a/htdocs/langs/de_AT/orders.lang b/htdocs/langs/de_AT/orders.lang
index 69006143803..953b812eaf2 100644
--- a/htdocs/langs/de_AT/orders.lang
+++ b/htdocs/langs/de_AT/orders.lang
@@ -2,14 +2,15 @@
 OrderLine=Bestellposition
 OrderToProcess=Zu bearbeitende Bestellung
 OrdersInProcess=Bestellunen in Bearbeitung
-StatusOrderReceivedAllShort=Zur Gänze erhalten
 StatusOrderOnProcess=In Arbeit
-StatusOrderReceivedAll=Zur Gänze erhalten
 RefOrder=Bestellung Nr.
 AuthorRequest=Authorenrechte beantragen
 PaymentOrderRef=Zahlung zu Bestellung %s
 CloneOrder=Duplizieren
 TypeContact_commande_internal_SALESREPFOLL=Kundenauftrags-Nachverfolgung durch Vertreter
+TypeContact_commande_external_BILLING=Debitorenrechnung Kontakt
+TypeContact_commande_external_SHIPPING=Customer Versand Kontakt
 TypeContact_commande_external_CUSTOMER=Bestellungs-Nachverfolgung durch Kundenkontakt
 TypeContact_order_supplier_internal_SALESREPFOLL=Lieferantenbestellungs-Nachverfolgung durch Vertreter
+TypeContact_order_supplier_external_SHIPPING=Supplier Versand Kontakt
 PDFEinsteinDescription=Eine vollständige Bestellvorlage (Logo, ...)
diff --git a/htdocs/langs/de_AT/projects.lang b/htdocs/langs/de_AT/projects.lang
index fe5ec99b8fa..3baefde4021 100644
--- a/htdocs/langs/de_AT/projects.lang
+++ b/htdocs/langs/de_AT/projects.lang
@@ -1,6 +1,7 @@
 # Dolibarr language file - Source file is en_US - projects
 MyProjectsDesc=Diese Ansicht ist auf Projekte beschränkt, zu denen Sie als Kontakt definiert sind (unabhängig vom Typ).
 ProjectsPublicDesc=Diese Ansicht zeigt alle für Sie sichtbaren Projekte.
+ProjectsPublicTaskDesc=Diese Ansicht zeigt alle für Sie sichtbaren Aufgaben.
 ProjectsDesc=Diese Ansicht zeigt alle Projekte (Ihre Benutzerberechtigung erlaubt Ihnen eine volle Einsicht aller Projekte).
 MyTasksDesc=Diese Ansicht ist auf Aufgaben beschränkt, zu denen Sie als Kontakt definiert sind (unabhängig vom Typ).
 TasksPublicDesc=Diese Ansicht zeigt alle für Sie sichtbaren Aufgaben.
diff --git a/htdocs/langs/de_AT/propal.lang b/htdocs/langs/de_AT/propal.lang
index 6dc74379776..b27b8037171 100644
--- a/htdocs/langs/de_AT/propal.lang
+++ b/htdocs/langs/de_AT/propal.lang
@@ -1,6 +1,4 @@
 # Dolibarr language file - Source file is en_US - propal
-LastPropals=%s zuletzt bearbeitete Angebote
-LastModifiedProposals=%s zuletzt bearbeitete Angebote
 PropalsDraft=Entwurf
 PropalStatusSigned=Unterzeichnet (auf Rechnung)
 RefProposal=Angebots Nr.
@@ -10,6 +8,8 @@ ValidityDuration=Bindefrist
 CopyPropalFrom=Erstelle neues Angebot durch Duplikation
 CreateEmptyPropal=Erstelle leeres Angebot oder aus der Produkt-/Dienstleistungsliste
 DefaultProposalDurationValidity=Standardmäßige Bindefrist (Tage)
+AvailabilityTypeAV_NOW=Prompt nach Rechnungserhalt
 TypeContact_propal_internal_SALESREPFOLL=Angebotsnachverfolgung durch Vertreter
+TypeContact_propal_external_BILLING=Debitorenrechnung Kontakt
 TypeContact_propal_external_CUSTOMER=Angebots-Nachverfolgung durch Partnerkontakt
 DocModelAzurDescription=Eine vollständige Angebotsvorlage (Logo, ...)
diff --git a/htdocs/langs/de_AT/suppliers.lang b/htdocs/langs/de_AT/suppliers.lang
index f4b1c208bf2..ecc72de0edf 100644
--- a/htdocs/langs/de_AT/suppliers.lang
+++ b/htdocs/langs/de_AT/suppliers.lang
@@ -1,5 +1,3 @@
 # Dolibarr language file - Source file is en_US - suppliers
-ConfirmApproveThisOrder=Möchten Sie diese Bestellung wirklich bestätigen?
-ConfirmDenyingThisOrder=Möchten Sie diese Bestellung wirklich ablehnen?
-ConfirmCancelThisOrder=Möchten Sie diese Bestellung wirklich verwerfen?
+RefSupplierShort=Lieferanten Nr.
 AddSupplierInvoice=Erzeuge Lieferantenrechnung
diff --git a/htdocs/langs/de_CH/accountancy.lang b/htdocs/langs/de_CH/accountancy.lang
index 95c98153fff..64ddac1527b 100644
--- a/htdocs/langs/de_CH/accountancy.lang
+++ b/htdocs/langs/de_CH/accountancy.lang
@@ -1,3 +1,4 @@
 # Dolibarr language file - Source file is en_US - accountancy
 MenuAccountancy=Rechnungswesen
+AccountingCategory=Accounting category
 Vide=Id. Prof. 6
diff --git a/htdocs/langs/de_CH/admin.lang b/htdocs/langs/de_CH/admin.lang
index 35dfe8df39a..251db367102 100644
--- a/htdocs/langs/de_CH/admin.lang
+++ b/htdocs/langs/de_CH/admin.lang
@@ -40,7 +40,6 @@ MAIN_MAIL_EMAIL_STARTTLS=TLS (STARTTLS) Verschlüsselung verwenden
 SubmitTranslation=Wenn die Übersetzung der Sprache unvollständig ist oder wenn Sie Fehler finden, können Sie können Sie die entsprechenden Sprachdateien im Verzeichnis <b>langs/%s</b> korrigieren und und anschliessend Ihre Änderungen unter  www.transifex.com/dolibarr-association/dolibarr/ teilen.
 SubmitTranslationENUS=Sollte die Übersetzung für eine Sprache nicht vollständig sein oder Fehler beinhalten, können Sie die entsprechenden Sprachdateien im Verzeichnis <b>langs/%s</b>  bearbeiten und anschliessend Ihre Änderungen an dolibarr.org/forum oder für Entwickler auf github.com/Dolibarr/dolibarr. übertragen.
 ModuleFamilySrm=Lieferantenverwaltung (SRM)
-InfDirAlt=Seit Version 3 ist es möglich, ein alternatives Stammverzeichnis anzugeben. Dies ermöglicht, Erweiterungen und eigene Templates am gleichen Ort zu speichern.<br>Legen Sie einfach ein Verzeichis im Hauptverzeichnis von Dolibarr an (z.B. "eigenes").<br>
 CallUpdatePage=Zur Aktualisierung der Daten und der Datenbankstruktur gehen Sie zur Seite %s.
 GenericMaskCodes=Sie können ein beliebiges Numerierungsschema wählen. Dieses Schema könnte z.B. so aussehen:<br><b>{000000}</b> steht für eine 6-stellige Nummer, die sich bei jedem neuen %s automatisch erhöht. Wählen Sie die Anzahl der Nullen je nach gewünschter Nummernlänge. Der Zähler füllt sich automatisch bis zum linken Ende mit Nullen um das gewünschte Format abzubilden. <br><b>{000000+000}</b> führt zu einem ähnlichen Ergebnis, allerdings mit einem Wertsprung in Höhe des Werts rechts des Pluszeichens, der beim ersten %s angewandt wird. <br><b>{000000@x}</b> wie zuvor, jedoch stellt sich der Zähler bei Erreichen des Monats x (zwischen 1 und 12) automatisch auf 0 zurück. Ist diese Option gewählt und x hat den Wert 2 oder höher, ist die Folge {mm}{yy} or {mm}{yyyy} ebenfalls erfoderlich. <br><b>{dd}</b> Tag (01 bis 31).<br><b>{mm}</b> Monat (01 bis 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> Jahreszahl 1-, 2- oder 4-stellig. <br>
 GenericMaskCodes4a=<u>Beispiel auf der 99. %s des Dritten thecompany Geschehen 2007-01-31:</u> <br>
@@ -180,7 +179,6 @@ UseSearchToSelectProductTooltip=Wenn Sie eine grosse Anzahl von Produkten (> 100
 SetDefaultBarcodeTypeThirdParties=Standard-Barcode-Typ für Geschäftspartner
 UseUnits=Definieren Sie eine Masseinheit für die Menge während der Auftrags-, Auftragsbestätigungs- oder Rechnungszeilen-Ausgabe
 ErrorUnknownSyslogConstant=Konstante %s ist nicht als Protkoll-Konstante definiert
-NoNeedForDeliveryReceipts=In den meisten Fällen werden Lieferschein sowohl als Versand- (für die Zusammenstellung der Auslieferung), als auch als Zustellsscheine (vom Kunden zu unterschreiben) verwendet. Entsprechend sind Empfangsbelege meist eine doppelte und daher nicht verwendete Option.
 FCKeditorForCompany=WYSIWIG Erstellung/Bearbeitung der Firmennformationen und Notizen (ausser Produkte/Services)
 FCKeditorForMail=WYSIWYG Erstellung/Bearbeitung für gesamte Mail (ausser Werkzeuge->Massenmaling)
 IfYouUsePointOfSaleCheckModule=Wenn Sie ein Point of Sale-Modul (POS-Modul Standard oder andere externe POS-Module) verwenden, kann diese Einstellung von Ihrem Point Of Sale-Modul übersteuert werden. \nDie meisten POS -Module wurden entwickelt, um sofort eine Rechnung zu erstellen und das Lager standardmässig zu verringern, egal welche Optionen hier ausgewählt wurde. \nAlso, wenn Sie während einem Verkauf einen Lagerabgang in Ihrem Point of Sale möchten oder nicht, so müssen sie auch die Konfiguration des POS-Modules überprüfen.
@@ -195,7 +193,6 @@ CashDeskThirdPartyForSell=Standardgeschäftspartner für Kassenverkäufe
 StockDecreaseForPointOfSaleDisabled=Lagerrückgang bei Verwendung von Point of Sale deaktivert
 BookmarkDesc=Dieses Modul ermöglicht die Verwaltung von Lesezeichen. Ausserdem können Sie hiermit Verknüpfungen zu internen und externen Seiten im linken Menü anlegen.
 ApiSetup=API-Modul-Setup
-ApiProductionMode=Aktiviere Produktivmodus (Das aktiviert den Cache für die Serviceverwaltung)
 ApiExporerIs=Sie können das API unter dieser URL verwenden
 ChequeReceiptsNumberingModule=Checknumerierungsmodul
 MultiCompanySetup=Multi-Company-Moduleinstellungen
diff --git a/htdocs/langs/de_CH/banks.lang b/htdocs/langs/de_CH/banks.lang
index 63922070e16..577b4090302 100644
--- a/htdocs/langs/de_CH/banks.lang
+++ b/htdocs/langs/de_CH/banks.lang
@@ -6,12 +6,10 @@ Conciliable=Ausgleichsfähig
 SupplierInvoicePayment=Lieferantenzahlung
 WithdrawalPayment=Entnahme Zahlung
 BankTransfers=Kontentransfer
-ConfirmValidateCheckReceipt=Scheck wirklich annehmen? Eine Änderung ist anschliessend nicht mehr möglich.
 BankChecksToReceipt=Checks die auf Einlösung warten
 PaymentDateUpdateSucceeded=Zahlungsdatum erfolgreich aktualisiert
 DefaultRIB=Standart Bankkonto-Nummer
 RejectCheck=Überprüfung zurückgewiesen
-ConfirmRejectCheck=Wollen sie diesen Check wirklich als zurückgewiesen Kennzeichnen?
 RejectCheckDate=Datum die Überprüfung wurde zurückgewiesen
 CheckRejected=Überprüfung zurückgewiesen
 CheckRejectedAndInvoicesReopened=Überprüfung zurückgewiesen und Rechnungen wieder geöffnet
diff --git a/htdocs/langs/de_CH/bills.lang b/htdocs/langs/de_CH/bills.lang
index aa73d4ba3c2..22d195b6695 100644
--- a/htdocs/langs/de_CH/bills.lang
+++ b/htdocs/langs/de_CH/bills.lang
@@ -1,7 +1,5 @@
 # Dolibarr language file - Source file is en_US - bills
-BillsCustomersUnpaidForCompany=Offene Rechnungen vom Kunden %s
 BillsSuppliersUnpaid=Offene Lieferantenrechnungen
-BillsSuppliersUnpaidForCompany=Offene Rechnungen für den Lieferanten %s
 BillsStatistics=Zahlungsstatistik - Kundenrechnungen
 BillsStatisticsSuppliers=Zahlungsstatistik - Lieferantenrechnungen
 DisabledBecauseNotErasable=Deaktiviert da nicht gelöscht werden kann
@@ -25,6 +23,7 @@ CustomerInvoicePaymentBack=Gutschrift
 paymentInInvoiceCurrency=In Rechnungswährung
 PaidBack=Zurückbezahlt
 DeletePayment=Zahlung löschen
+ConfirmDeletePayment=Nur zur Sicherheit: Willst du diese Zahlung wirklich löschen?
 ReceivedPayments=Zahlungseingang
 ReceivedCustomersPayments=Erhaltene Kundenzahlungen
 PaymentsReportsForYear=Zahlungsbericht laufendes Jahr für %s
diff --git a/htdocs/langs/de_CH/companies.lang b/htdocs/langs/de_CH/companies.lang
index 80dc7d838cd..faebfaa8761 100644
--- a/htdocs/langs/de_CH/companies.lang
+++ b/htdocs/langs/de_CH/companies.lang
@@ -105,6 +105,4 @@ MergeOriginThirdparty=Geschäftspartner duplizieren (Geschäftspartner, den Sie
 MergeThirdparties=Zusammenführen von Geschäftspartnern
 ThirdpartiesMergeSuccess=Geschäftspartner wurden zusammengelegt
 SaleRepresentativeLogin=Login des Verkaufsmitarbeiters
-SaleRepresentativeFirstname=Vorname des Verkaufsmitarbeiters
-SaleRepresentativeLastname=Nachname des Verkaufsmitarbeiters
 ErrorThirdpartiesMerge=Es gab einen Fehler beim Löschen des Geschäftspartners. Bitte überprüfen Sie das Protokoll. Änderungen wurden rückgängig gemacht.
diff --git a/htdocs/langs/de_CH/holiday.lang b/htdocs/langs/de_CH/holiday.lang
index b1819a946b7..175033cd500 100644
--- a/htdocs/langs/de_CH/holiday.lang
+++ b/htdocs/langs/de_CH/holiday.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - Source file is en_US - holiday
+MenuReportMonth=Monatsauszug
 NotActiveModCP=Sie müssen das Urlaubs-Modul aktivieren um diese Seite zu sehen.
 AddCP=Urlaubs-Antrag einreichen
 CancelCP=widerrufen
@@ -13,7 +14,6 @@ NoDateDebut=Sie müssen ein Urlaubsbeginn Datum wählen.
 NoDateFin=Sie müssen ein Urlaubsende Datum wählen.
 DateCancelCP=Datum der Absage
 HolidaysCancelation=Urlaubsanfragen Stornos
-EmployeeFirstname=Miarbeiter Vorname
 ErrorMailNotSend=Ein Fehler ist beim EMail-Senden aufgetreten:
 HolidaysToValidateAlertSolde=Der Einreicher dieses Urlaubsantrags besitzt nicht mehr genügend verfügbare Tage.
 HolidaysCanceled=Urlaubsantrag storniert
diff --git a/htdocs/langs/de_CH/mails.lang b/htdocs/langs/de_CH/mails.lang
index 8c76debd890..848911c67c8 100644
--- a/htdocs/langs/de_CH/mails.lang
+++ b/htdocs/langs/de_CH/mails.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - mails
-ConfirmResetMailing=Achtung, wenn Sie diese E-Mail Kampangne (<b>%s</b>), können Sie diese Aktion nochmals versenden. Sind Sie sicher, das ist tun möchten?
 DateLastSend=Datum des letzten Versand
 ActivateCheckReadKey=Schlüssel um die URL für "Lesebestätigung" und "Abmelden/Unsubscribe" zu verschlüsseln
 AllRecipientSelected=Alle Partner mit E-Mail ausgewählt
diff --git a/htdocs/langs/de_CH/members.lang b/htdocs/langs/de_CH/members.lang
index c6836594e5f..d96c757fdec 100644
--- a/htdocs/langs/de_CH/members.lang
+++ b/htdocs/langs/de_CH/members.lang
@@ -7,7 +7,6 @@ ThirdpartyNotLinkedToMember=Partner nicht mit einem Mitglied verknüpft
 FundationMembers=Gründungsmitglieder
 ListOfValidatedPublicMembers=Liste der verifizierten öffentlichen Mitglieder
 ErrorMemberIsAlreadyLinkedToThisThirdParty=Ein anderes Mitglied (Name: <b>%s</b>, login: <b>%s</b>) ist schon mit Partner <b>%s</b> verknüpft. Entfernen Sie zuerst die Verknüpfung, da immer nur ein Mitglied zugewiesen sein kann (und umgekehrt).
-ThisIsContentOfYourCard=Details Ihrer Karte
 CardContent=Inhalt Ihrer Mitgliederkarte
 SetLinkToUser=Verknüpfung zu Dolibarr Benutzer
 SetLinkToThirdParty=Verknüpfung zu Dolibarr Partner
@@ -17,8 +16,7 @@ MembersListValid=Liste der verifizierten Mitglieder
 MembersListUpToDate=Liste der verifizierten aktiven Mitglieder
 DateSubscription=Start des Abonnements
 DateEndSubscription=Ende des Abonnements
-EndSubscription=Abonnement beenden
-SubscriptionId=Abonnement ID
+SubscriptionId=Abo-ID
 MemberId=Mitgliedernummer
 MemberType=Mitgliederart
 MembersTypes=Mitgliederarten
@@ -35,8 +33,7 @@ ShowSubscription=Abonnement anzeigen
 SendAnEMailToMember=Informationsemail dem Mitglied senden
 HTPasswordExport=htpassword Datei generieren
 MembersAndSubscriptions=Mitglieder und Abonnemente
-LastSubscriptionDate=Datum der letzten Mitgliedschaft
-LastSubscriptionAmount=Höhe des letzten Mitgliedsbeitrags
+SubscriptionPayment=Zahlung des Mitgliedsbeitrags
 MembersStatisticsByCountries=Mitgliederstatistik nach Land
 MembersStatisticsByState=Mitgliederstatistik nach Kanton
 MembersStatisticsByTown=Mitgliederstatistik nach Ort
diff --git a/htdocs/langs/de_CH/orders.lang b/htdocs/langs/de_CH/orders.lang
index f39ab8ed17d..4c9c4e4a20b 100644
--- a/htdocs/langs/de_CH/orders.lang
+++ b/htdocs/langs/de_CH/orders.lang
@@ -4,6 +4,5 @@ OrderCard=Bestell-Karte
 CancelOrder=Bestellung verwerfen
 NoOrder=Keine Bestellung
 CloseOrder=Bestellung schliessen
-ConfirmCloseOrder=Möchten Sie diese Bestellung wirklich schliessen? Nach ihrer Schliessung kann eine Bestellung nur mehr in Rechnung gestellt werden.
 RefOrderSupplier=Bestellreferenz für Lieferant
 Error_OrderNotChecked=Keine zu verrechnenden Bestellungen ausgewählt
diff --git a/htdocs/langs/de_CH/products.lang b/htdocs/langs/de_CH/products.lang
index 6d911725e0a..079698f2ee9 100644
--- a/htdocs/langs/de_CH/products.lang
+++ b/htdocs/langs/de_CH/products.lang
@@ -4,7 +4,6 @@ LastRecordedProducts=%s zuletzt erfasste Produkte
 CardProduct0=Produkt-Karte
 CardProduct1=Leistungs-Karte
 SellingPriceTTC=Verkaufspreis (inkl. MwSt.)
-CostPriceUsage=In einer zukünftigen Version kann dieser Wert für die Margenberechnung verwendet werden.
 CantBeLessThanMinPrice=Der Verkaufspreis darf den Mindestpreis für dieses Produkt (%s ohne MwSt.) nicht unterschreiten. Diese Meldung kann auch angezeigt werden, wenn Sie einen zu hohen Rabatt geben.
 ServicesArea=Leistungs-Übersicht
 SupplierCard=Lieferantenkarte
diff --git a/htdocs/langs/de_CH/projects.lang b/htdocs/langs/de_CH/projects.lang
index fc41771a9f9..37d6bcbca4f 100644
--- a/htdocs/langs/de_CH/projects.lang
+++ b/htdocs/langs/de_CH/projects.lang
@@ -5,7 +5,6 @@ TasksOnProjectsPublicDesc=Diese Ansicht zeigt alle Projektaufgaben, die Sie Lese
 TasksOnProjectsDesc=Es werden alle Projekteaufgaben aller Projekte angezeigt (Ihre Berechtigungen berechtigen Sie alles zu sehen).
 MyTasksDesc=Diese Ansicht ist für Sie beschränkt auf Projekte oder Aufgaben, bei welchen Sie als Ansprechpartner eingetragen sind.
 OnlyOpenedProject=Nur offene Projekte sind sichtbar. (Projekte im Entwurf- oder Geschlossenstatus sind nicht sichtbar)
-AllTaskVisibleButEditIfYouAreAssigned=Alle Aufgaben dieser Projekte sind sichtbar, aber sie können nur auf ihnen zugewiesenen Aufgaben Zeit erfassen. Weisen sie sich dei Aufgabe zu, wenn sie Zeit erfassen möchten.
 TimeSpentByYou=Dein Zeitaufwand
 MyProjectsArea=Mein Projektbereich
 GoToListOfTimeConsumed=Zur Stundenaufwandsliste wechseln
@@ -13,11 +12,11 @@ GoToListOfTasks=Zur Aufgabenliste gehen
 ListFichinterAssociatedProject=Liste Eingriffe, die mit diesem Projekt verknüpft sind
 ChildOfTask=Kindelement von Projekt/Aufgabe
 CloseAProject=Projekt schliessen
-ConfirmCloseAProject=Möchten Sie dieses Projekt wirklich schliessen?
 ProjectsDedicatedToThisThirdParty=Mit diesem Geschäftspartner verknüpfte Projekte
 LinkedToAnotherCompany=Mit Geschäftspartner verknüpft
 ThisWillAlsoRemoveTasks=Diese Aktion löscht ebenfalls alle Aufgaben zum Projekt (<b>%s</b> akutelle Aufgaben) und alle Zeitaufwände.
 CloneTaskFiles=Aufgabe (n) clonen beigetreten Dateien (falls Aufgabe (n) geklont)
 ProjectReferers=Verknüpfte Objekte
 ResourceNotAssignedToTheTask=Nicht der Aufgabe zugewiesen
+OpenedProjectsByThirdparties=Offene Projekte nach Geschäftspartner
 OpportunityPonderatedAmount=Verkaufschancen geschätzer Betrag
diff --git a/htdocs/langs/de_CH/propal.lang b/htdocs/langs/de_CH/propal.lang
index 6dc85f32387..4f6c135a728 100644
--- a/htdocs/langs/de_CH/propal.lang
+++ b/htdocs/langs/de_CH/propal.lang
@@ -1,6 +1,5 @@
 # Dolibarr language file - Source file is en_US - propal
 ProposalCard=Angebotskarte
-LastModifiedProposals=Die letzen %s bearbeiteten Angebote
 PropalsToClose=Zu schliessende Angebote
 DefaultProposalDurationValidity=Standardmässige Gültigkeitsdatuer (Tage)
 UseCustomerContactAsPropalRecipientIfExist=Falls vorhanden die Adresse des Kundenkontakts statt des Geschäftspartners verwenden
diff --git a/htdocs/langs/de_CH/supplier_proposal.lang b/htdocs/langs/de_CH/supplier_proposal.lang
index da2575e76ce..fc7401b6c91 100644
--- a/htdocs/langs/de_CH/supplier_proposal.lang
+++ b/htdocs/langs/de_CH/supplier_proposal.lang
@@ -1,24 +1,27 @@
 # Dolibarr language file - Source file is en_US - supplier_proposal
+SupplierProposal=Angebot Lieferant
 supplier_proposalDESC=Preisanfragen Lieferant verwalten
 CommRequest=Generelle Preisanfrage
 CommRequests=Generelle Preisanfragen
 SearchRequest=Anfragen finden
 DraftRequests=Entwürfe Preisanfragen
-RequestsOpened=Offene Preisanfragen
 SupplierProposalShort=Angebot Lieferant
 SupplierProposals=Angebote Lieferant
 SupplierProposalsShort=Angebote Lieferant
 NewAskPrice=Neue Preisanfrage
-ConfirmValidateAsk=Sind Sie sicher, dass Sie diese Preisanfrage unter dem Namen <b>%s</b> bestätigen wollen?
+ShowSupplierProposal=Preisanfrage zeigen
+SupplierProposalRefFourn=Lieferanten-Nr.
+SupplierProposalRefFournNotice=Bevor die Preisanfrage mit "Angenommen" abgeschlossen wird, sollten Referenzen zum Lieferant eingeholt werden.
 ValidateAsk=Anfrage bestätigen
+SupplierProposalStatusDraft=Entwürfe (benötigen Bestätigung)
 SupplierProposalStatusSigned=Akzeptiert
 SupplierProposalStatusSignedShort=Akzeptiert
 CopyAskFrom=Neue Preisanfrage erstellen (Kopie einer bestehenden Anfrage)
 CreateEmptyAsk=Leere Anfrage erstellen
-ConfirmCloneAsk=Sind Sie sicher, dass Sie die Preisanfrage <b>%s</b> duplizieren wollen?
-ConfirmReOpenAsk=Sind Sie sicher, dass Sie die Preisanfrage <b>%s</b> wiedereröffnen wollen?
 SendAskByMail=Preisanfrage mit E-Mail versenden
 SendAskRef=Preisanfrage %s versenden
-ConfirmDeleteAsk=Sind Sie sicher, dass Sie diese Preisanfrage löschen wollen?
+SupplierProposalCard=Anfragekarte
 DocModelAuroreDescription=Eine vollständige Preisanfrage-Vorlage (Logo...)
-LastSupplierProposals=Letzte Preisanfrage
+DefaultModelSupplierProposalCreate=Standardvorlage erstellen
+DefaultModelSupplierProposalToBill=Standardvorlage beim Abschluss einer Preisanfrage (angenommen)
+DefaultModelSupplierProposalClosed=Standardvorlage beim Abschluss einer Preisanfrage (zurückgewiesen)
diff --git a/htdocs/langs/de_CH/suppliers.lang b/htdocs/langs/de_CH/suppliers.lang
index d1034fa92fb..2fb177df550 100644
--- a/htdocs/langs/de_CH/suppliers.lang
+++ b/htdocs/langs/de_CH/suppliers.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - suppliers
-ConfirmCancelThisOrder=Möchten Sie diese Bestellung wirklich verwerfen <b>%s</b> ?
+TotalBuyingPriceMinShort=Summe der Einkaufspreise der Unterprodukte
 SupplierReputation=Lieferantenbewertung
 DoNotOrderThisProductToThisSupplier=Nicht bestellen
 NotTheGoodQualitySupplier=Falsche Menge
diff --git a/htdocs/langs/de_CH/users.lang b/htdocs/langs/de_CH/users.lang
index 3dae4bbd33d..32cb98fe650 100644
--- a/htdocs/langs/de_CH/users.lang
+++ b/htdocs/langs/de_CH/users.lang
@@ -10,7 +10,6 @@ CreateInternalUserDesc=Dieses Formular erlaubt Ihnen das Anlegen eines unternehm
 PermissionInheritedFromAGroup=Berechtigung durch eine Gruppenzugehörigkeit gererbt.
 UserWillBeInternalUser=Erstellter Benutzer ist intern (mit keinem bestimmten Geschäftspartner verknüpft)
 UserWillBeExternalUser=Erstellter Benutzer ist extern (mit einem bestimmten Geschäftspartner verknüpft)
-ConfirmCreateThirdParty=Möchten Sie zu diesem Mitglied wirklich einen Geschäftspartner erstellen?
 NameToCreate=Name des neuen Geschäftspartners
 DisabledInMonoUserMode=Im Wartungsmodus deaktiviert
 UserAccountancyCode=Kontierungscode Benutzer
diff --git a/htdocs/langs/de_CH/withdrawals.lang b/htdocs/langs/de_CH/withdrawals.lang
index 7035a9787fc..b76caf46b57 100644
--- a/htdocs/langs/de_CH/withdrawals.lang
+++ b/htdocs/langs/de_CH/withdrawals.lang
@@ -2,4 +2,3 @@
 ThirdPartyBankCode=BLZ Geschäftspartner
 NoInvoiceCouldBeWithdrawed=Keine Rechnung erfolgreich abgebucht. Überprüfen Sie die Kontonummern der den Rechnungen zugewiesenen Geschäftspartnern.
 WithdrawalRefusedConfirm=Möchten Sie wirklich eine Abbuchungsablehnung zu diesem Geschäftspartner erstellen?
-WithdrawRequestAmount=Abbachungsauftrag Betrag:
diff --git a/htdocs/langs/de_DE/accountancy.lang b/htdocs/langs/de_DE/accountancy.lang
index 87dcf97094a..991f4b2dc82 100644
--- a/htdocs/langs/de_DE/accountancy.lang
+++ b/htdocs/langs/de_DE/accountancy.lang
@@ -27,7 +27,7 @@ OverviewOfAmountOfLinesNotBound=Übersicht über die Anzahl der nicht an ein Buc
 OverviewOfAmountOfLinesBound=Übersicht über die Anzahl der bereits an ein Buchhaltungskonto zugeordneten Zeilen
 OtherInfo=Zusatzinformationen
 
-AccountancyArea=Rechnungswesen
+AccountancyArea=Buchhaltung
 AccountancyAreaDescIntro=Die Verwendung des Buchhaltungsmoduls erfolgt in mehreren Schritten:
 AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
 AccountancyAreaDescActionOnceBis=Die nächsten Schritte sollten getan werden, um Ihnen in Zukunft  Zeit zu sparen, indem Sie Ihnen das korrekte Standardbuchhaltungskonto vorschlagen, wenn Sie die Journalisierung (Schreiben des Buchungsjournal und des Hauptbuchs) machen.
@@ -140,7 +140,7 @@ DelYear=Jahr zu entfernen
 DelJournal=Journal zu entfernen
 ConfirmDeleteMvt=This will delete all lines of the general ledger for year and/or from a specific journal. At least one criteria is required.
 ConfirmDeleteMvtPartial=Dadurch wird die ausgewählte(n) Zeile(n) aus dem Hauptbuch gelöscht
-DelBookKeeping=Delete record of the general ledger
+DelBookKeeping=Löschen Sie den Eintrag im Hauptbuch
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=Finanzjournal inklusive aller Arten von Zahlungen mit Bankkonto
@@ -194,6 +194,8 @@ ChangeBinding=Ändern der Zuordnung
 
 ## Admin
 ApplyMassCategories=Massenaktualisierung der Kategorien
+AddAccountFromBookKeepingWithNoCategories=Add acccount already used with no categories
+CategoryDeleted=Category for the accounting account has been removed
 
 ## Export
 Exports=Exporte
@@ -209,6 +211,7 @@ Modelcsv_ciel=Export zu Sage Ciel Compta oder Compta Evolution
 Modelcsv_quadratus=Export zu Quadratus QuadraCompta
 Modelcsv_ebp=Export zu EBP
 Modelcsv_cogilog=Export zu Cogilog
+ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
 InitAccountancy=Rechnungswesen initialisieren
diff --git a/htdocs/langs/de_DE/admin.lang b/htdocs/langs/de_DE/admin.lang
index e65135967dd..1b689a8674b 100644
--- a/htdocs/langs/de_DE/admin.lang
+++ b/htdocs/langs/de_DE/admin.lang
@@ -9,17 +9,20 @@ VersionDevelopment=Entwicklung
 VersionUnknown=Unbekannt
 VersionRecommanded=Empfohlen
 FileCheck=Dateien Integritätsprüfung
-FileCheckDesc=This tool allows you to check the integrity of files of your application, comparing each files with the official ones. You can use this tool to detect if some files were modified by a hacker for example.
+FileCheckDesc=This tool allows you to check the integrity of files and setup of your application, comparing each files with the official ones. 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.
 FileIntegrityIsStrictlyConformedWithReference=Files integrity is strictly conformed with the reference.
-FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified of removed.
+FileIntegrityIsOkButFilesWereAdded=Files integrity check has passed, however some new files were added.
+FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified, removed or added.
 GlobalChecksum=Global checksum
 MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
 LocalSignature=Embedded local signature (less reliable)
 RemoteSignature=Remote distant signature (more reliable)
 FilesMissing=Fehlende Dateien
 FilesUpdated=Dateien ersetzt
+FilesModified=Modified Files
+FilesAdded=Added Files
 FileCheckDolibarr=Überprüfen Sie die Integrität von Anwendungsdateien
-AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from a certified package
+AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from an official package
 XmlNotFound=Xml Integrität Datei der Anwendung ​​nicht gefunden
 SessionId=ID Session
 SessionSaveHandler=Handler für Sitzungsspeicherung
@@ -188,7 +191,9 @@ BoxesDesc=Boxen sind auf einigen Seiten angezeigte Informationsbereiche. Sie kö
 OnlyActiveElementsAreShown=Nur Elemente aus <a href="%s">aktiven Module</a> werden angezeigt.
 ModulesDesc=Die Module bestimmen, welche Funktionalität in Dolibarr verfügbar ist. Manche Module erfordern zusätzlich Berechtigungen die Benutzern die das Modul nutzen sollen gewährt werden muss, nachdem das Modul aktiviert wurde. \nKlicken Sie auf die Schaltfläche on/off, um ein Modul zu aktivieren. 
 ModulesMarketPlaceDesc=Sie finden weitere Module auf externen Web-Sites...
-ModulesMarketPlaces=Sie können zusätzliche Module im Web finden...
+ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
+ModulesMarketPlaces=Find external modules...
+GoModuleSetupArea=To deploy/install a new module, go onto the Module setup area at <a href="%s">%s</a>.
 DoliStoreDesc=DoliStore, der offizielle Marktplatz für dolibarr Module/Erweiterungen
 DoliPartnersDesc=Firmenliste die Kundenspezifische Module oder Funktionen entwickeln. (Hinweis: Jedermann mit PHP Erfahrung kann Kundenspezifische Funktionen für Opensource Projekte Entwickeln)
 WebSiteDesc=Anbieter für weitere Module...
@@ -280,20 +285,21 @@ MenuHandlers=Menü-Handler
 MenuAdmin=Menü-Editor
 DoNotUseInProduction=Nicht in Produktion nutzen
 ThisIsProcessToFollow=This is steps to process:
-ThisIsAlternativeProcessToFollow=Dies ist ein alternativer Setup-Prozess:
+ThisIsAlternativeProcessToFollow=This is an alternative setup to process manually:
 StepNb=Schritt %s
 FindPackageFromWebSite=Finden Sie ein Paket, das die gewünschten Funktionen beinhaltet (zum Beispiel auf der offiziellen Website %s).
 DownloadPackageFromWebSite=Installationspaket herunterladen (z.B. von offizieller Webseite %s).
-UnpackPackageInDolibarrRoot=Entpacke die Paketdatei in das Dolibarr Serververzeichnis für externe Module: <b>%s</b>
-SetupIsReadyForUse=Die Installation ist abgeschlossen und das System zur Verwendung der neuen Komponente bereit.
-NotExistsDirect=Kein alternatives Stammverzeichnis definiert.<br>
-InfDirAlt=Seit Version 3 ist es möglich, ein alternatives Stammverzeichnis anzugeben. Dies ermöglicht, Erweiterungen und eigene Templates am gleichen Ort zu speichern.<br>Erstellen Sie einfach ein Verzeichis im Hauptverzeichnis von Dolibarr an (z.B. "eigenes").<br>
-InfDirExample=<br>Danach in der Datei conf.php deklarieren<br> $dolibarr_main_url_root_alt='http://meinserver/custom'<br>$dolibarr_main_document_root_alt='/pfad/zu/dolibarr/htdocs/custom'<br>*Diese Zeilen sind mit "#" auskommentiert, um sie zu aktivieren, einfach das Zeichen entfernen.
+UnpackPackageInDolibarrRoot=Unpack the packaged files into server directory dedicated to Dolibarr: <b>%s</b>
+UnpackPackageInModulesRoot=To deploy/install an external module, unpack the packaged files into the server directory dedicated to modules: <b>%s</b>
+SetupIsReadyForUse=Module deployment is finished. You must however enable and setup the module in your application by going on the page to setup modules: <a href="%s">%s</a>.
+NotExistsDirect=The alternative root directory is not defined to an existing directory.<br>
+InfDirAlt=Since version 3, it is possible to define an alternative root directory. This allows you to store, into a dedicated directory, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
+InfDirExample=<br>Then declare it in the file <strong>conf.php</strong><br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>If these lines are commented with "#", to enable them, just uncomment by removing the "#" character.
 YouCanSubmitFile=Durch diesen Schritt, können Sie das Paket mit diesem Tool senden: Wähle Modul Datei
 CurrentVersion=Aktuelle dolibarr-Version
 CallUpdatePage=Zur Aktualisierung der Daten und Datenbankstrukturen zur Seite %s gehen.
 LastStableVersion=Letzte stabile Version
-LastActivationDate=Last activation date
+LastActivationDate=Latest activation date
 UpdateServerOffline=Update-Server offline
 GenericMaskCodes=Sie können ein beliebiges Numerierungsschema wählen. Dieses Schema könnte z.B. so aussehen:<br><b>{000000}</b> steht für eine 6-stellige Nummer, die sich bei jedem neuen %s automatisch erhöht. Wählen Sie die Anzahl der Nullen je nach gewünschter Nummernlänge. Der Zähler füllt sich automatisch bis zum linken Ende mit Nullen um das gewünschte Format abzubilden. <br><b>{000000+000}</b> führt zu einem ähnlichen Ergebnis, allerdings mit einem Wertsprung in Höhe des Werts rechts des Pluszeichens, der beim ersten %s angewandt wird. <br><b>{000000@x}</b> wie zuvor, jedoch stellt sich der Zähler bei Erreichen des Monats x (zwischen 1 und 12) automatisch auf 0 zurück. Ist diese Option gewählt und x hat den Wert 2 oder höher, ist die Folge {mm}{yy} or {mm}{yyyy} ebenfalls erforderlich. <br><b>{dd}</b> Tag (01 bis 31).<br><b>{mm}</b> Monat (01 bis 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> Jahreszahl 1-, 2- oder 4-stellig. <br>
 GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
@@ -376,11 +382,11 @@ ExtrafieldCheckBox=Kontrollkästchen
 ExtrafieldRadio=Radio button
 ExtrafieldCheckBoxFromList= Kontrollkästchen von Tabelle
 ExtrafieldLink=Verknüpftes Objekt
-ExtrafieldParamHelpselect=Parameterlisten müssen das Format Schlüssel,Wert haben<br><br> zum Beispiel:<br>1,Wert1<br>2,Wert2<br>3,Wert3<br>...<br><br>Um die Liste in Abhängigkeit zu einer anderen zu haben:<br>1,Wert1|parent_list_code:parent_key<br>2,Wert2|parent_list_code:parent_key
+ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list :<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list :<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=Parameterlisten müssen das Format Schlüssel,Wert haben<br><br> zum Beispiel:<br>1,Wert1<br>2,Wert2<br>3,Wert3<br>...
 ExtrafieldParamHelpradio=Parameterlisten müssen das Format Schlüssel,Wert haben<br><br> zum Beispiel:<br>1,Wert1<br>2,Wert2<br>3,Wert3<br>...
-ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
-ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
+ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameter müssen folgendes Format haben ObjektName:Klassenpfad<br>Syntax: ObjektName:Klassenpfad<br> Beispiel: Societe:societe/class/societe.class.php
 LibraryToBuildPDF=Bibliothek zum erstellen von PDF
 WarningUsingFPDF=Achtung: Ihre <b>conf.php</b> enthält <b>$dolibarr_pdf_force_fpdf=1</b> Dies bedeutet, dass Sie die FPDF-Bibliothek verwenden, um PDF-Dateien zu erzeugen. Diese Bibliothek ist alt und unterstützt viele Funktionen nicht (Unicode-, Bild-Transparenz, kyrillische, arabische und asiatische Sprachen, ...), so dass es zu Fehlern bei der PDF-Erstellung kommen kann. <br> Um dieses Problem zu beheben und volle Unterstützung der PDF-Erzeugung zu erhalten, laden Sie bitte die <a href="http://www.tcpdf.org/" target="_blank">TCPDF Bibliothek</a> , dann kommentieren Sie die Zeile <b>$dolibarr_pdf_force_fpdf=1</b> aus oder entfernen diese und fügen statt dessen <b>$dolibarr_lib_TCPDF_PATH='Pfad_zum_TCPDF_Verzeichnisr'</b> ein
@@ -415,10 +421,10 @@ ModuleCompanyCodeDigitaria=Kontierungscode hängt vom Partnercode ab. Der Code s
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=3-Fach Verarbeitungsschritte verwenden wenn der Betrag (ohne Steuer) höher ist als ...
 WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<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).
-
+ClickToShowDescription=Click to show description
 # Modules
 Module0Name=Benutzer und Gruppen
-Module0Desc=Benutzer- und Gruppenverwaltung
+Module0Desc=Users / Employees and Groups management
 Module1Name=Partner
 Module1Desc=Partner- und Kontakteverwaltung
 Module2Name=Vertrieb
@@ -689,7 +695,7 @@ PermissionAdvanced253=Andere interne/externe Benutzer und Gruppen erstellen/bear
 Permission254=Nur externe Benutzer erstellen/bearbeiten
 Permission255=Andere Passwörter ändern
 Permission256=Andere Benutzer löschen oder deaktivieren
-Permission262=Extend access to all third parties (not only third parties that user is a sale representative). Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc). Not effective for projects (only rules on project permissions, visibility and assignement matters).
+Permission262=Extend access to all third parties (not only third parties that user is a sale representative).<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 assignement matters).
 Permission271=Read CA
 Permission272=Rechnungen anzeigen
 Permission273=Ausgabe Rechnungen
@@ -891,7 +897,7 @@ Offset=Wertsprung
 AlwaysActive=Immer aktiv
 Upgrade=Aktualisierung
 MenuUpgrade=Aktualisierung/Erweiterung
-AddExtensionThemeModuleOrOther=Erweiterung hinzufügen (Oberflächen, Module, ...)
+AddExtensionThemeModuleOrOther=Deploy/install external module
 WebServer=Webserver
 DocumentRootServer=Dokumenten-Stammordner des Webservers
 DataRootServer=Daten-Verzeichnis
@@ -1165,10 +1171,6 @@ FreeLegalTextOnOrders=Freier Rechtstext auf Bestellungen
 WatermarkOnDraftOrders=Wasserzeichen auf Bestellentwurf (keines, wenn leer)
 ShippableOrderIconInList=In Auftragsliste ein entsprechendes Icon zufügen, wenn die Bestellung versandbereit ist
 BANK_ASK_PAYMENT_BANK_DURING_ORDER=Fragen Sie nach der Ziel-Bankverbindung
-##### Clicktodial #####
-ClickToDialSetup=Click-to-Dial Moduleinstellungen
-ClickToDialUrlDesc=Definieren Sie hier die URL, die bei einem Klick auf das Telefonsymbol aufgerufen werden soll. In dieser URL können Sie Tags verwenden<br><b>%%1$s</b> wird durch die Telefonnummer des Angerufenen ersetzt<br><b>%%2$s</b> wird durch die Telefonnummer des Anrufers (Ihre) ersetzt<br><b>%%3$s</b> wird durch Ihren Benutzernamen für Click-to-Dial ersetzt (siehe Benutzerdatenblatt)<br><b>%%4$s</b> wird durch Ihr Click-to-Dial-Passwort ersetzt (siehe Benutzerdatenblatt).
-##### Bookmark4u #####
 ##### Interventions #####
 InterventionsSetup=Einstellungen Modul Serviceaufträge
 FreeLegalTextOnInterventions=Freier Text auf Serviceauftragsdokumenten
@@ -1395,7 +1397,7 @@ SendingsSetup=Versandmoduleinstellungen
 SendingsReceiptModel=Versandbelegsvorlage
 SendingsNumberingModules=Nummerierungsmodell Auslieferungen
 SendingsAbility=Unterstützung von Versand-Dokumenten für Kundenlieferungen
-NoNeedForDeliveryReceipts=In den meisten Fällen werden Lieferschein sowohl als Versand- (für die Zusammenstellung der Auslieferung), als auch als Zustellscheine (vom Kunden zu unterschreiben) verwendet. Entsprechend sind Empfangsbelege meist eine doppelte und daher nicht verwendete Option.
+NoNeedForDeliveryReceipts=In most cases, shipping sheets are used both as sheets for customer deliveries (list of products to send) and sheets that is received and signed by customer. So product deliveries receipts is a duplicated feature and is rarely activated.
 FreeLegalTextOnShippings=Freier Text auf Lieferungen
 ##### Deliveries #####
 DeliveryOrderNumberingModules=Zustellscheinnumerierungs-Module
@@ -1477,7 +1479,9 @@ AGENDA_DEFAULT_FILTER_STATUS=Diesen Ereignisstatus automatisch in den Suchfilter
 AGENDA_DEFAULT_VIEW=Welchen Reiter möchten Sie beim Öffnen der Agenda automatisch anzeigen
 AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
 AGENDA_NOTIFICATION_SOUND=Enable sound notification
-##### ClickToDial #####
+##### Clicktodial #####
+ClickToDialSetup=Click-to-Dial Moduleinstellungen
+ClickToDialUrlDesc=Definieren Sie hier die URL, die bei einem Klick auf das Telefonsymbol aufgerufen werden soll. In dieser URL können Sie Tags verwenden<br><b>%%1$s</b> wird durch die Telefonnummer des Angerufenen ersetzt<br><b>%%2$s</b> wird durch die Telefonnummer des Anrufers (Ihre) ersetzt<br><b>%%3$s</b> wird durch Ihren Benutzernamen für Click-to-Dial ersetzt (siehe Benutzerdatenblatt)<br><b>%%4$s</b> wird durch Ihr Click-to-Dial-Passwort ersetzt (siehe Benutzerdatenblatt).
 ClickToDialDesc=Dieses Modul fügt ein Symbol nach Telefonnummern ein. Durch einen Klick auf dieses Symbol kann Dolibarr z.B. durch ein SIP System eine Telefonanlage anweisen, diese Telefonnummer zu wählen.
 ClickToDialUseTelLink=Nur einen Link "Tel:" bei Telefonnummern verwenden
 ClickToDialUseTelLinkDesc=Benutzen Sie diese Methode, wenn Ihre Benutzer ein Software-Telefon oder ein Interface für ein Telefon auf demselben Computer wie der Browser installiert haben. Dieses Telefon/Interface wird aufgerufen, wenn Sie auf einen Link klicken, der mit "tel:" beginnt. Wenn Sie eine vollständige Server-Lösung nutzen wollen (ohne lokale Software-Installation), wählen Sie hier "Nein" und füllen das nächste Feld.
@@ -1505,10 +1509,11 @@ EndPointIs=SOAP-Clients müssen ihre Anfragen an den Dolibarr Endpunkt verfügba
 ##### API ####
 ApiSetup=Modul API - Einstellungen
 ApiDesc=Wenn dieses Modul aktiviert ist, wird Dolibarr zum REST Server für diverse web services.
-ApiProductionMode=Echtbetrieb aktivieren (dadurch wird ein Cache für Service-Management aktiviert)
+ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
 ApiExporerIs=Sie können das API unter dieser URL anschauen
 OnlyActiveElementsAreExposed=Nur Elemente aus aktiven Modulen sind ungeschützt
 ApiKey=Schlüssel für API
+WarningAPIExplorerDisabled=The API explorer has been disabled. API explorer is not required to provide API services. It is a tool for developer to find/test REST APIs. If you need this tool, go into setup of module API REST to activate it.
 ##### Bank #####
 BankSetupModule=Bankmoduleinstellungen
 FreeLegalTextOnChequeReceipts=Freier Rechtstext für Scheckbelege
@@ -1577,7 +1582,7 @@ 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:
 SomethingMakeInstallFromWebNotPossible2=Aus diesem Grund wird die Prozess hier beschriebenen Upgrade ist nur manuelle Schritte ein privilegierter Benutzer tun kann.
 InstallModuleFromWebHasBeenDisabledByFile=Installieren von externen Modul aus der Anwendung wurde von Ihrem Administrator deaktiviert. \nSie müssen ihn bitten, die Datei<strong>%s</strong> zu entfernen, um diese Funktion zu ermöglichen.
-ConfFileMuseContainCustom=Installing an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to have option<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
+ConfFileMuseContainCustom=Installing an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Zeilen hervorheben bei Mouseover
 HighlightLinesColor=Farbe der Zeile hervorheben, wenn die Maus darüberfährt (leer lassen, um den Effekt zu deaktivieren)
 TextTitleColor=Farbe des Seitenkopfs
@@ -1607,6 +1612,7 @@ FixTZ=Zeitzonen-Korrektur
 FillFixTZOnlyIfRequired=Beispiel: +2 (nur ausfüllen, wenn Sie Probleme haben)
 ExpectedChecksum=Erwartete Prüfsumme
 CurrentChecksum=Aktuelle Prüfsumme
+ForcedConstants=Required constant values
 MailToSendProposal=Um Angebot zu schicken
 MailToSendOrder=Um Kundenauftrag zu schicken
 MailToSendInvoice=Um Kundenrechnung zu schicken
@@ -1615,9 +1621,10 @@ MailToSendIntervention=Um Serviceauftrag zu schicken
 MailToSendSupplierRequestForQuotation=Um Anfrage an den Lieferanten schicken
 MailToSendSupplierOrder=Um Lieferantenbestellung zu schicken
 MailToSendSupplierInvoice=Um Lieferantenrechnung zu schicken
+MailToSendContract=To send a contract
 MailToThirdparty=To send email from third party page
 ByDefaultInList=Standardanzeige als Listenansicht
-YouUseLastStableVersion=Sie verwenden die letzte stabile Version
+YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=Beispielnachricht, die Sie nutzen können, um eine Hauptversion anzukündigen. Sie können diese auf Ihrer Website verwenden.
 TitleExampleForMaintenanceRelease=Beispielnachricht, die Sie nutzen können, um ein Wartungsupdate anzukündigen. Sie können diese auf Ihrer Website verwenden.
 ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. 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.
diff --git a/htdocs/langs/de_DE/banks.lang b/htdocs/langs/de_DE/banks.lang
index 549dbf4b565..fa4d7282076 100644
--- a/htdocs/langs/de_DE/banks.lang
+++ b/htdocs/langs/de_DE/banks.lang
@@ -74,7 +74,7 @@ Conciliate=Ausgleichen
 Conciliation=Ausgleich
 ReconciliationLate=Reconciliation late
 IncludeClosedAccount=Geschlossene Konten miteinbeziehen
-OnlyOpenedAccount=Nur offene Konten
+OnlyOpenedAccount=Nur geöffnete Konten
 AccountToCredit=Konto für Gutschrift
 AccountToDebit=Zu belastendes Konto
 DisableConciliation=Zahlungsausgleich für dieses Konto deaktivieren
diff --git a/htdocs/langs/de_DE/bills.lang b/htdocs/langs/de_DE/bills.lang
index 00d5052330c..7850075e6d3 100644
--- a/htdocs/langs/de_DE/bills.lang
+++ b/htdocs/langs/de_DE/bills.lang
@@ -5,9 +5,9 @@ BillsCustomers=Kundenrechnungen
 BillsCustomer=Kundenrechnung
 BillsSuppliers=Lieferantenrechnungen
 BillsCustomersUnpaid=Offene Kundenrechnungen
-BillsCustomersUnpaidForCompany=Offene Kundenrechnungen von %s
-BillsSuppliersUnpaid=Unbezahlte Lieferanten-Rechnungen
-BillsSuppliersUnpaidForCompany=Unbezahlte Rechnungen des Lieferanten %s
+BillsCustomersUnpaidForCompany=Unpaid customer invoices for %s
+BillsSuppliersUnpaid=Unbezahlte Lieferantenrechnungen
+BillsSuppliersUnpaidForCompany=Unpaid supplier invoices for %s
 BillsLate=Verspätete Zahlungen
 BillsStatistics=Statistik Kundenrechnungen
 BillsStatisticsSuppliers=Statistik Lieferantenrechnungen
@@ -63,7 +63,7 @@ paymentInInvoiceCurrency=in Rechnungswährung
 PaidBack=Zurück bezahlt
 DeletePayment=Lösche Zahlung
 ConfirmDeletePayment=Möchten Sie diese Zahlung wirklich löschen?
-ConfirmConvertToReduc=Wollen Sie diese Gutschrift in einen absoluten Rabatt konvertieren ?<br>Der Betrag wird dann unter allen Rabatten gespeichert und kann zukünftig verrechnet werden.
+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.
 SupplierPayments=Lieferantenzahlungen
 ReceivedPayments=Erhaltene Zahlungen
 ReceivedCustomersPayments=Erhaltene Anzahlungen von Kunden
@@ -78,6 +78,7 @@ PaymentMode=Zahlungsart
 PaymentTypeDC=Debit/Credit Card
 PaymentTypePP=PayPal
 IdPaymentMode=Zahlungsart (ID)
+CodePaymentMode=Payment type (code)
 LabelPaymentMode=Zahlungsart (Label)
 PaymentModeShort=Zahlungsart
 PaymentTerm=Zahlungskonditionen
@@ -102,9 +103,10 @@ SearchACustomerInvoice=Kundenrechnung suchen
 SearchASupplierInvoice=Lieferantenrechnung suchen
 CancelBill=Rechnung stornieren
 SendRemindByMail=Zahlungserinnerung per E-Mail versenden
-DoPayment=Zahlung tätigen
-DoPaymentBack=Rückzahlung tätigen
+DoPayment=Enter payment
+DoPaymentBack=Enter refund
 ConvertToReduc=In Rabatt umwandeln
+ConvertExcessReceivedToReduc=Convert excess received into future discount
 EnterPaymentReceivedFromCustomer=Geben Sie die vom Kunden erhaltene Zahlung ein
 EnterPaymentDueToCustomer=Kundenzahlung fällig stellen
 DisabledBecauseRemainderToPayIsZero=Deaktiviert, da Zahlungserinnerung auf null steht
@@ -151,14 +153,14 @@ NoQualifiedRecurringInvoiceTemplateFound=Keine Vorlagen zur Erstellung von wiede
 FoundXQualifiedRecurringInvoiceTemplate=Es wurden %s Vorlagen zur Erstellung von wiederkehrende Rechnung(en) gefunden.
 NotARecurringInvoiceTemplate=keine Vorlage für wiederkehrende Rechnung
 NewBill=Neue Rechnung
-LastBills=%s neueste Rechnungen
-LastCustomersBills=%s neueste Kundenrechnungen
-LastSuppliersBills=%s neueste Lieferantenrechnungen
+LastBills=Latest %s invoices
+LastCustomersBills=Latest %s customer invoices
+LastSuppliersBills=Latest %s supplier invoices
 AllBills=Alle Rechnungen
 OtherBills=Weitere Rechnungen
 DraftBills=Rechnungsentwürfe
-CustomersDraftInvoices=Entwürfe Kundenrechnungen
-SuppliersDraftInvoices=Entwürfe Lieferantenrechnungen
+CustomersDraftInvoices=Customer draft invoices
+SuppliersDraftInvoices=Supplier draft invoices
 Unpaid=Unbezahlte
 ConfirmDeleteBill=Möchten Sie diese Rechnung wirklich löschen?
 ConfirmValidateBill=Möchten Sie diese Rechnung mit der referenz <b>%s</b> wirklich freigeben?
@@ -272,6 +274,7 @@ Deposit=Anzahlung
 Deposits=Einlagen
 DiscountFromCreditNote=Rabatt aus Gutschrift %s
 DiscountFromDeposit=Die Zahlungen aus Anzahlung Rechnung %s
+DiscountFromExcessReceived=Payments from excess received of invoice %s
 AbsoluteDiscountUse=Diese Art von Guthaben kann verwendet werden auf der Rechnung vor der Validierung
 CreditNoteDepositUse=Die Rechnung muss bestätigt werden, um Gutschriften zu erstellen
 NewGlobalDiscount=Neue Rabattregel
@@ -279,8 +282,8 @@ NewRelativeDiscount=Neuer relativer Rabatt
 NoteReason=Anmerkung/Begründung
 ReasonDiscount=Rabattgrund
 DiscountOfferedBy=Rabatt angeboten von
-DiscountStillRemaining=Noch verbleibender Rabatt
-DiscountAlreadyCounted=Rabatt bereits berücksichtigt
+DiscountStillRemaining=Discounts available
+DiscountAlreadyCounted=Discounts already consumed
 BillAddress=Rechnungsanschrift
 HelpEscompte=Bei diesem Rabatt handelt es sich um einen Skonto.
 HelpAbandonBadCustomer=Dieser Betrag wurde aufgegeben (Kundenverschulden) ist als uneinbringlich zu werten.
@@ -333,6 +336,8 @@ InvoiceAutoValidate=Rechnungen automatisch freigeben
 GeneratedFromRecurringInvoice=Erstelle wiederkehrende Rechnung %s aus Vorlage
 DateIsNotEnough=Datum noch nicht erreicht
 InvoiceGeneratedFromTemplate=Rechnung %s erstellt aus Vorlage für wiederkehrende Rechnung %s
+WarningInvoiceDateInFuture=Warning, the invoice date is higher than current date
+WarningInvoiceDateTooFarInFuture=Warning, the invoice date is too far from current date
 # PaymentConditions
 Statut=Status
 PaymentConditionShortRECEP=Due Upon Receipt
@@ -428,7 +433,7 @@ ChequeDeposits=Scheckeinlagen
 Cheques=Schecks
 DepositId=Scheck Nr.
 NbCheque=Schecknummer
-CreditNoteConvertedIntoDiscount=Diese Gutschrift wurde in %s
+CreditNoteConvertedIntoDiscount=This %s has been converted into %s
 UsBillingContactAsIncoiveRecipientIfExist=Verwenden Sie Kunden Abrechnung Kontakt-Adresse anstelle von Dritten als Empfänger-Adresse für Rechnungen
 ShowUnpaidAll=Zeige alle unbezahlten Rechnungen
 ShowUnpaidLateOnly=Zeige nur verspätete unbezahlte Rechnung
diff --git a/htdocs/langs/de_DE/boxes.lang b/htdocs/langs/de_DE/boxes.lang
index 56e5d7c57e9..de619147a95 100644
--- a/htdocs/langs/de_DE/boxes.lang
+++ b/htdocs/langs/de_DE/boxes.lang
@@ -25,8 +25,8 @@ BoxTitleLastSuppliers=%s neueste Lieferanten
 BoxTitleLastModifiedSuppliers=%s zuletzt bearbeitete Lieferanten
 BoxTitleLastModifiedCustomers=%s zuletzt bearbeitete Kunden
 BoxTitleLastCustomersOrProspects=%s neueste Kunden oder Interessenten
-BoxTitleLastCustomerBills=%s neueste Kundenrechnungen
-BoxTitleLastSupplierBills=%s neueste Lieferantenrechnungen
+BoxTitleLastCustomerBills=Latest %s customer invoices
+BoxTitleLastSupplierBills=Latest %s supplier invoices
 BoxTitleLastModifiedProspects=%s zuletzt bearbeitete Leads
 BoxTitleLastModifiedMembers=%s neueste Mitglieder
 BoxTitleLastFicheInter=%s zuletzt bearbeitete Serviceaufträge
@@ -51,12 +51,12 @@ ClickToAdd=Hier klicken um hinzuzufügen.
 NoRecordedCustomers=Keine erfassten Kunden
 NoRecordedContacts=Keine erfassten Kontakte
 NoActionsToDo=Keine Aufgaben/Termine zu erledigen
-NoRecordedOrders=Keine erfassten Kundenaufträge
+NoRecordedOrders=No recorded customer orders
 NoRecordedProposals=Keine erfassten Angebote
-NoRecordedInvoices=Keine erfassten Kundenrechnungen
-NoUnpaidCustomerBills=Keine offenen Kundenrechnungen
-NoUnpaidSupplierBills=Keine offenen Lieferantenrechnungen
-NoModifiedSupplierBills=Keine bearbeiteten Lieferantenrechnungen
+NoRecordedInvoices=No recorded customer invoices
+NoUnpaidCustomerBills=No unpaid customer invoices
+NoUnpaidSupplierBills=No unpaid supplier invoices
+NoModifiedSupplierBills=No recorded supplier invoices
 NoRecordedProducts=Keine erfassten Produkte/Leistungen
 NoRecordedProspects=Keine erfassten Leads
 NoContractedProducts=Keine Produkte/Leistungen im Auftrag
diff --git a/htdocs/langs/de_DE/companies.lang b/htdocs/langs/de_DE/companies.lang
index 65d696df2bd..247d5433842 100644
--- a/htdocs/langs/de_DE/companies.lang
+++ b/htdocs/langs/de_DE/companies.lang
@@ -2,7 +2,7 @@
 ErrorCompanyNameAlreadyExists=Firmenname %s bereits vorhanden. Bitte wählen Sie einen anderen.
 ErrorSetACountryFirst=Wähle zuerst das Land
 SelectThirdParty=Wähle einen Partner
-ConfirmDeleteCompany=Möchten Sie diesen Kontakt und alle verbundenen Informationen wirklich löschen?
+ConfirmDeleteCompany=Möchten Sie diesen Partner und alle damit verbundenen Informationen wirklich löschen?
 DeleteContact=Löschen eines Kontakts/Adresse
 ConfirmDeleteContact=Möchten Sie diesen Partner und alle damit verbundenen Informationen wirklich löschen?
 MenuNewThirdParty=Neuer Partner
@@ -81,6 +81,7 @@ PaymentBankAccount=Bankkonto für Zahlungen
 OverAllProposals=Total proposals
 OverAllOrders=Total orders
 OverAllInvoices=Total invoices
+OverAllSupplierProposals=Total price requests
 ##### Local Taxes #####
 LocalTax1IsUsed=Nutze zweiten Steuersatz
 LocalTax1IsUsedES= RE wird verwendet
@@ -389,7 +390,7 @@ ListCustomersShort=Liste der Kunden
 ThirdPartiesArea=Partner- und Kontaktbereich
 LastModifiedThirdParties=%s zuletzt bearbeitete Partner
 UniqueThirdParties=Gesamte Anzahl der Kontakte
-InActivity=Aktiv
+InActivity=Geöffnet
 ActivityCeased=Inaktiv
 ThirdPartyIsClosed=Third party is closed
 ProductsIntoElements=Liste von Produkten/Leistungen in %s
@@ -404,7 +405,7 @@ MergeThirdparties=Partner zusammenlegen
 ConfirmMergeThirdparties=Möchten Sie wirklich diesen Partner mit dem aktuellen zusammenführen ? Alle verbundenen Objekte werden zusammengeführt, so das Sie die doppelten löschen können.
 ThirdpartiesMergeSuccess=Partner wurden zusammengelegt
 SaleRepresentativeLogin=Login des Vertriebsmitarbeiters
-SaleRepresentativeFirstname=Vorname des Vertriebsmitarbeiters
-SaleRepresentativeLastname=Nachname des Vertriebsmitarbeiters
+SaleRepresentativeFirstname=First name of sales representative
+SaleRepresentativeLastname=Last name of sales representative
 ErrorThirdpartiesMerge=Es gab einen Fehler beim Löschen des Partners. Bitte überprüfen Sie im Protokoll. Änderungen wurden rückgängig gemacht.
 NewCustomerSupplierCodeProposed=Neuer Kunde oder Lieferanten Code bei doppeltem Code empfohlen
diff --git a/htdocs/langs/de_DE/compta.lang b/htdocs/langs/de_DE/compta.lang
index c922b0f811f..46af1629018 100644
--- a/htdocs/langs/de_DE/compta.lang
+++ b/htdocs/langs/de_DE/compta.lang
@@ -65,6 +65,7 @@ PaymentSocialContribution=Sozialabgaben-/Steuer Zahlung
 PaymentVat=USt.-Zahlung
 ListPayment=Liste der Zahlungen
 ListOfCustomerPayments=Liste der Kundenzahlungen
+ListOfSupplierPayments=Liste der Lieferantenzahlungen
 DateStartPeriod=Startdatum für Zeitraum
 DateEndPeriod=Enddatum für Zeitraum
 newLT1Payment=Neue Zahlung Steuer 2
@@ -81,7 +82,7 @@ LT2PaymentES=EKSt. Zahlung
 LT2PaymentsES=EKSt. Zahlungen
 VATPayment=USt. Zahlung
 VATPayments=USt Zahlungen
-VATRefund=Umsatzsteuer Rückerstattung
+VATRefund=Sales tax refund
 Refund=Rückerstattung
 SocialContributionsPayments=Sozialabgaben-/Steuer Zahlungen
 ShowVatPayment=Zeige USt. Zahlung
diff --git a/htdocs/langs/de_DE/cron.lang b/htdocs/langs/de_DE/cron.lang
index a1771301711..9a869bfd7e3 100644
--- a/htdocs/langs/de_DE/cron.lang
+++ b/htdocs/langs/de_DE/cron.lang
@@ -7,7 +7,7 @@ Permission23103 = Lösche geplanten Job
 Permission23104 = Führe geplanten Job aus
 # Admin
 CronSetup= Jobverwaltungs-Konfiguration
-URLToLaunchCronJobs=URL to check and launch qualified cron jobs
+URLToLaunchCronJobs=URL zum Prüfen und Starten von speziellen Jobs
 OrToLaunchASpecificJob=Oder zum Prüfen und Starten von speziellen Jobs
 KeyForCronAccess=Sicherheitsschlüssel für URL zum Starten von Cronjobs
 FileToLaunchCronJobs=Kommandozeile zum Starten von Cronjobs
@@ -17,14 +17,14 @@ CronMethodDoesNotExists=Klasse %s enthält keine Methode %s
 # Menu
 EnabledAndDisabled=Aktiviert und Deaktiviert
 # Page list
-CronLastOutput=Ausgabe der letzten Ausführung
-CronLastResult=Letzter Resultatcode
+CronLastOutput=Latest run output
+CronLastResult=Latest result code
 CronCommand=Befehl
 CronList=Geplante Aufträge
 CronDelete=cronjobs löschen
-CronConfirmDelete=Sind Sie sicher, dass Sie diese geplanten Aufträge löschen wollen?
+CronConfirmDelete=Sind Sie sicher, dass Sie diese geplante Aufträge  jetzt löschen möchten?
 CronExecute=Geplanter Auftrag jetzt ausführen 
-CronConfirmExecute=Sind Sie sicher, dass Sie diese geplante Aufträge  jetzt ausführen möchten?
+CronConfirmExecute=Sind Sie sicher, dass Sie diese geplante Aufträge jetzt ausführen möchten?
 CronInfo=Das Modul "Zeitgesteuerte Cron-Jobs" erlaubt die geplanten Cron-Jobs die programmiert wurden durchzuführen.
 CronTask=Job
 CronNone=Keine
diff --git a/htdocs/langs/de_DE/errors.lang b/htdocs/langs/de_DE/errors.lang
index 5444d99357f..2e20b808f45 100644
--- a/htdocs/langs/de_DE/errors.lang
+++ b/htdocs/langs/de_DE/errors.lang
@@ -11,6 +11,7 @@ ErrorLoginAlreadyExists=Benutzername %s existiert bereits.
 ErrorGroupAlreadyExists=Gruppe %s existiert bereits.
 ErrorRecordNotFound=Eintrag wurde nicht gefunden.
 ErrorFailToCopyFile=Konnte die Datei <b>'%s'</b> nicht nach <b>'%s'</b> kopieren.
+ErrorFailToCopyDir=Failed to copy directory '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToRenameFile=Konnte die Datei <b>'%s'</b> nicht in <b>'%s'</b> umzubenennen.
 ErrorFailToDeleteFile=Fehler beim Löschen der Datei '<b>%s</b>'.
 ErrorFailToCreateFile=Fehler beim Erstellen der Datei '<b>%s</b>'.
@@ -115,7 +116,7 @@ ErrorNoActivatedBarcode=Kein Barcode aktiviert
 ErrUnzipFails=Fehler beim Entpacken von %s mit ZipArchive
 ErrNoZipEngine=Kein Entpackprogramm in PHP gefunden für Datei %s
 ErrorFileMustBeADolibarrPackage=Die Datei %s muss ein Dolibarr ZIP-Paket sein
-ErrorFileRequired=Eine Dolibarr Datei wird benötigt
+ErrorModuleFileRequired=You must select a Dolibarr module package file
 ErrorPhpCurlNotInstalled=PHP CURL ist nicht installiert, aber erforderlich für Paypal
 ErrorFailedToAddToMailmanList=Fehler beim Hinzufügen von %s zur Mailman Liste %s oder SPIP basis
 ErrorFailedToRemoveToMailmanList=Fehler beim Löschen von %s von der Mailman Liste %s oder SPIP basis
@@ -181,6 +182,8 @@ ErrorBankStatementNameMustFollowRegex=Error, bank statement name must follow the
 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>
 
 # 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.
diff --git a/htdocs/langs/de_DE/holiday.lang b/htdocs/langs/de_DE/holiday.lang
index 894d0812110..7294bd9a9ad 100644
--- a/htdocs/langs/de_DE/holiday.lang
+++ b/htdocs/langs/de_DE/holiday.lang
@@ -76,8 +76,8 @@ BoxTitleLastLeaveRequests=%s zuletzt bearbeitete Urlaubsanträge
 HolidaysMonthlyUpdate=Monatliches Update
 ManualUpdate=Manuelles Update
 HolidaysCancelation=Urlaubsantrag stornieren
-EmployeeLastname=Mitarbeiter Nachname
-EmployeeFirstname=Mitarbeiter Vorname
+EmployeeLastname=Employee last name
+EmployeeFirstname=Employee first name
 TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
 
 ## Configuration du Module ##
diff --git a/htdocs/langs/de_DE/ldap.lang b/htdocs/langs/de_DE/ldap.lang
index 404a297dfd5..c8f11f3278a 100644
--- a/htdocs/langs/de_DE/ldap.lang
+++ b/htdocs/langs/de_DE/ldap.lang
@@ -13,8 +13,8 @@ LDAPUsers=Benutzer in LDAP-Datenbank
 LDAPFieldStatus=Status
 LDAPFieldFirstSubscriptionDate=Datum der Erstmitgliedschaft
 LDAPFieldFirstSubscriptionAmount=Höhe des ersten Mitgliedsbeitrags
-LDAPFieldLastSubscriptionDate=Datum der letzten Mitgliedschaft
-LDAPFieldLastSubscriptionAmount=Höhe des letzten Mitgliedsbeitrags
+LDAPFieldLastSubscriptionDate=Letztes Abo-Datum
+LDAPFieldLastSubscriptionAmount=Letzter Abo-Betrag
 LDAPFieldSkype=Skype ID
 LDAPFieldSkypeExample=Beispiel: Skype-Name
 UserSynchronized=Benutzer synchronisiert
diff --git a/htdocs/langs/de_DE/mails.lang b/htdocs/langs/de_DE/mails.lang
index 14c94714479..e79cfa102b5 100644
--- a/htdocs/langs/de_DE/mails.lang
+++ b/htdocs/langs/de_DE/mails.lang
@@ -74,14 +74,18 @@ ResultOfMailSending=Sende-Ergebnis der E-Mail-Kampagne
 NbSelected=Anz. gewählte
 NbIgnored=Anz. ignoriert
 NbSent=Anz. gesendet
-ContactsWithThirdpartyFilter=Contact with customer filters
+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
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Zeile %s in der Datei
 RecipientSelectionModules=Definiert Auswahl von Empfängern
 MailSelectedRecipients=Ausgewählte Empfänger
 MailingArea=E-Mail Kampagnenübersicht
-LastMailings=%s neueste E-Mail Kampagnen
+LastMailings=Latest %s emailings
 TargetsStatistics=Zielstatistiken
 NbOfCompaniesContacts=Einzigartige Partnerkontakte
 MailNoChangePossible=Die Empfängerliste einer freigegebenen E-Mail Kampagne kann nicht mehr geändert werden
@@ -146,3 +150,6 @@ AdvTgtCreateFilter=Filter erstellen
 AdvTgtOrCreateNewFilter=Name des neuen Filters
 NoContactWithCategoryFound=Kein Kontakt/Adresse mit einer Kategorie gefunden
 NoContactLinkedToThirdpartieWithCategoryFound=Kein Kontakt/Adresse mit einer Kategorie gefunden
+OutGoingEmailSetup=Outgoing email setup
+InGoingEmailSetup=Incoming email setup
+
diff --git a/htdocs/langs/de_DE/main.lang b/htdocs/langs/de_DE/main.lang
index b8e678a1516..1f56ef4c4e5 100644
--- a/htdocs/langs/de_DE/main.lang
+++ b/htdocs/langs/de_DE/main.lang
@@ -69,6 +69,7 @@ SetDate=Datum
 SelectDate=Wählen Sie ein Datum
 SeeAlso=Siehe auch %s
 SeeHere=Sehen Sie hier
+Apply=Übernehmen
 BackgroundColorByDefault=Standard-Hintergrundfarbe
 FileRenamed=Datei wurde erfolgreich unbenannt
 FileUploaded=Datei wurde erfolgreich hochgeladen
@@ -87,7 +88,7 @@ Undefined=Nicht definiert
 PasswordForgotten=Passwort vergessen?
 SeeAbove=Siehe oben
 HomeArea=Startseite
-LastConnexion=Letzte Verbindung
+LastConnexion=Latest connection
 PreviousConnexion=Letzte Anmeldung
 PreviousValue=Vorheriger Wert
 ConnectedOnMultiCompany=Mit Entität verbunden
@@ -237,7 +238,7 @@ DateCreation=Erstellungsdatum
 DateCreationShort=Erstelldatum
 DateModification=Änderungsdatum
 DateModificationShort=Änderungsdatum
-DateLastModification=Datum der letzten Änderung
+DateLastModification=Latest modification date
 DateValidation=Freigabedatum
 DateClosing=Schließungsdatum
 DateDue=Fälligkeitsdatum
@@ -433,7 +434,7 @@ Reportings=Berichte
 Draft=Entwurf
 Drafts=Entwürfe
 Validated=Bestätigt
-Opened=geöffnet
+Opened=Geöffnet
 New=Neu
 Discount=Rabatt
 Unknown=Unbekannt
@@ -599,6 +600,8 @@ SessionName=Sitzungsname
 Method=Methode
 Receive=Erhalten
 CompleteOrNoMoreReceptionExpected=Vollständig oder nichts mehr erwartet
+ExpectedValue=Expected Value
+CurrentValue=Aktueller Wert
 PartialWoman=Teilweise
 TotalWoman=Vollständig
 NeverReceived=Nie erhalten
@@ -756,6 +759,7 @@ SomeTranslationAreUncomplete=Some languages may be partially translated or may c
 DirectDownloadLink=Direct download link
 Download=Download
 ActualizeCurrency=Update currency rate
+Fiscalyear=Fiskalisches Jahr
 # Week day
 Monday=Montag
 Tuesday=Dienstag
@@ -812,3 +816,5 @@ SearchIntoContracts=Verträge
 SearchIntoCustomerShipments=Kunden Lieferungen
 SearchIntoExpenseReports=Spesenabrechnungen
 SearchIntoLeaves=Urlaube
+
+BulkActions=Bulk actions
diff --git a/htdocs/langs/de_DE/members.lang b/htdocs/langs/de_DE/members.lang
index 39479879b23..d6819b451c1 100644
--- a/htdocs/langs/de_DE/members.lang
+++ b/htdocs/langs/de_DE/members.lang
@@ -13,7 +13,7 @@ ListOfValidatedPublicMembers=Liste der freigegebenen, öffentlichen Mitglieder
 ErrorThisMemberIsNotPublic=Dieses Mitglied ist nicht öffentlich
 ErrorMemberIsAlreadyLinkedToThisThirdParty=Ein anderes Mitglied (Name: <b>%s</b>, Benutzername: <b>%s</b>) ist bereits mit dem Partner <b>%s</b> verbunden. Bitte entfernen Sie diese Verknüpfung zuerst, da ein Partner nur einem Mitglied zugewiesen sein kann (und umgekehrt).
 ErrorUserPermissionAllowsToLinksToItselfOnly=Aus Sicherheitsgründen müssen Sie die Berechtigungen zur Mitgliederbearbeitung besitzen, um ein Mitglied mit einem fremden Benutzerkonto (einem anderen als Ihrem eigenen) zu verknüpfen.
-ThisIsContentOfYourCard=Hi.<br><br>This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
+ThisIsContentOfYourCard=Hallo.<br><br>Dies sind die Informationen die wir über dich haben. Kotaktiere uns, wenn etwas nicht stimmen sollte.<br><br>
 CardContent=Inhalt der Mitgliedskarte
 SetLinkToUser=Mit Benutzer verknüpft
 SetLinkToThirdParty=Mit Partner verknüpft
@@ -45,7 +45,7 @@ MemberStatusDraft=Entwurf (freizugeben)
 MemberStatusDraftShort=Freizugeben
 MemberStatusActive=Freigegebene (Abonnement ausstehend)
 MemberStatusActiveShort=Freigegeben
-MemberStatusActiveLate=Subscription expired
+MemberStatusActiveLate=Abonnement abgelaufen
 MemberStatusActiveLateShort=Abgelaufen
 MemberStatusPaid=Abonnement aktuell
 MemberStatusPaidShort=Aktuell
@@ -72,9 +72,9 @@ WelcomeEMail=Willkommen E-Mail
 SubscriptionRequired=Abonnement erforderlich
 DeleteType=Mitgliedsart löschen
 VoteAllowed=Stimmrecht
-Physical=Aktiv
-Moral=Passiv
-MorPhy=Moralisch/Physisch
+Physical=Natürliche Person
+Moral=Juristische Person
+MorPhy=Juristisch/Natürlich
 Reenable=Reaktivieren
 ResiliateMember=Mitglied deaktivieren
 ConfirmResiliateMember=Möchten Sie dieses Mitglied wirklich deaktivieren?
@@ -136,7 +136,7 @@ DocForAllMembersCards=Visitenkarten für alle Mitglieder erstellen (Gewähltes A
 DocForOneMemberCards=Visitenkarten für ein bestimmtes Mitglied erstellen (Gewähltes Ausgabeformat: <b>%s</b>)
 DocForLabels=Etiketten erstellen (Gewähltes Ausgabeformat: <b>%s</b>)
 SubscriptionPayment=Abo-Zahlung
-LastSubscriptionDate=Letzter Abo-Termin
+LastSubscriptionDate=Letztes Abo-Datum
 LastSubscriptionAmount=Letzter Abo-Betrag
 MembersStatisticsByCountries=Mitgliederstatistik nach Ländern
 MembersStatisticsByState=Mitgliederstatistik nach Bundesländern
diff --git a/htdocs/langs/de_DE/orders.lang b/htdocs/langs/de_DE/orders.lang
index f1a7477c05e..74f72c165a4 100644
--- a/htdocs/langs/de_DE/orders.lang
+++ b/htdocs/langs/de_DE/orders.lang
@@ -39,7 +39,7 @@ StatusOrderRefusedShort=Abgelehnt
 StatusOrderBilledShort=Verrechnet
 StatusOrderToProcessShort=Zu bearbeiten
 StatusOrderReceivedPartiallyShort=Teilweise erhalten
-StatusOrderReceivedAllShort=Komplett erhalten
+StatusOrderReceivedAllShort=Products received
 StatusOrderCanceled=Storniert
 StatusOrderDraft=Entwurf (freizugeben)
 StatusOrderValidated=Freigegeben
@@ -51,7 +51,7 @@ StatusOrderApproved=Bestellung genehmigt
 StatusOrderRefused=Abgelehnt
 StatusOrderBilled=Verrechnet
 StatusOrderReceivedPartially=Teilweise erhalten
-StatusOrderReceivedAll=Komplett erhalten
+StatusOrderReceivedAll=All products received
 ShippingExist=Eine Lieferung ist vorhanden
 QtyOrdered=Bestellmenge
 ProductQtyInDraft=Produktmenge in Bestellentwurf
diff --git a/htdocs/langs/de_DE/other.lang b/htdocs/langs/de_DE/other.lang
index 4349a237ffc..14edcdb19ed 100644
--- a/htdocs/langs/de_DE/other.lang
+++ b/htdocs/langs/de_DE/other.lang
@@ -68,14 +68,15 @@ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nAnbei erhalten Si
 PredefinedMailContentSendShipping=__CONTACTCIVNAME__ \n\n Als Anlage erhalten Sie unsere Lieferung __ SHIPPINGREF__ \n\n__PERSONALIZED__Mit freundlichen Grüßen\n\n__SIGNATURE__
 PredefinedMailContentSendFichInter=__CONTACTCIVNAME__ \n\n Anbei finden Sie den Serviceauftrag __ FICHINTERREF__ \n\n__PERSONALIZED__Mit freundlichen Grüßen\n\n__SIGNATURE__
 PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n__PERSONALIZED__\n\n__SIGNATURE__
-DemoDesc=Bei Dolibarr handelt es sich um ein kompaktes ERP/CRM-System, bestehend aus einzelnen Modulen. Da eine Demo aller Module kaum eine praxisnahe Anwendung darstellt, stehen Ihnen unterschiedliche Demo-Profile zur Verfügung.
+DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Bitte wählen Sie das Demo-Profil das Ihrem Anwendgsfall am ehesten entspricht
+ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
 DemoFundation=Verwalten Sie die Mitglieder einer Stiftung
 DemoFundation2=Verwalten Sie die Mitglieder und Bankkonten einer Stiftung
-DemoCompanyServiceOnly=Verwalten Sie ein reines Service-/Dienstleistungsunternehmen
+DemoCompanyServiceOnly=Company or freelance selling service only
 DemoCompanyShopWithCashDesk=Verwalten Sie ein Geschäft mit Kasse
-DemoCompanyProductAndStocks=Verwalten Sie den Produktverkauf und die Lagerstandsverwaltung eines kleinen oder mittleren Unternehmen
-DemoCompanyAll=Verwalten Sie ein kleines oder mittleres Unternehmen mit mehreren Aktivitäten (alle wesentlichen Module)
+DemoCompanyProductAndStocks=Company selling products with a shop
+DemoCompanyAll=Company with multiple activities (all main modules)
 CreatedBy=Erstellt von %s
 ModifiedBy=Bearbeitet von %s
 ValidatedBy=Freigegeben von %s
diff --git a/htdocs/langs/de_DE/products.lang b/htdocs/langs/de_DE/products.lang
index e4fa46432e5..fb20acb70bf 100644
--- a/htdocs/langs/de_DE/products.lang
+++ b/htdocs/langs/de_DE/products.lang
@@ -60,7 +60,7 @@ SellingPrice=Verkaufspreis
 SellingPriceHT=Verkaufspreis (ohne Steuern)
 SellingPriceTTC=Verkaufspreis (inkl. USt.)
 CostPriceDescription=Der Preis (netto, ohne Steuern) kann dafür verwendet werden, die durchschnittlichen Kosten dieses Artikel zu speichern. Es kann jeder Preis verwendet werden, der kalkuliert wurde, z. B. der durchschnittliche Einkaufspreis plus durchschnittliche Produktions- und Vertriebskosten.
-CostPriceUsage=In einer zukünftigen Version könnte dieses Feld für die Margenberechnung benutzt werden.
+CostPriceUsage=This value could be used for margin calculation.
 SoldAmount=Verkaufte Menge
 PurchasedAmount=angeschaffte Menge
 NewPrice=Neuer Preis
@@ -142,6 +142,7 @@ ConfirmCloneProduct=Möchten Sie ddas Produkt/service <b>%s</b> wirklich duplizi
 CloneContentProduct=Allgemeine Informationen des Produkts/Leistungen duplizieren
 ClonePricesProduct=Allgemeine Informationen und Preise duplizieren
 CloneCompositionProduct=Dupliziere Produkt-/Leistungszusammenstellung
+CloneCombinationsProduct=Clone product variants
 ProductIsUsed=Produkt in Verwendung
 NewRefForClone=Artikelnummer neues Produkt/Leistung
 SellingPrices=Verkaufspreis
@@ -238,7 +239,7 @@ GlobalVariables=Globale Variablen
 VariableToUpdate=Variable, die aktualisiert wird
 GlobalVariableUpdaters=Globale Variablen aktualisieren
 UpdateInterval=Update-Intervall (Minuten)
-LastUpdated=zuletzt verändert
+LastUpdated=Latest update
 CorrectlyUpdated=erfolgreich aktualisiert
 PropalMergePdfProductActualFile=verwendete Dateien, um in PDF Azur hinzuzufügen sind / ist
 PropalMergePdfProductChooseFile=Wähle PDF-Dateien
@@ -258,4 +259,41 @@ VolumeUnits=Einheit Volumen
 SizeUnits=Einheit Größe
 DeleteProductBuyPrice=Einkaufspreis löschen
 ConfirmDeleteProductBuyPrice=Möchten Sie diesen Einkaufspreis wirklich löschen?
+SubProduct=Sub product
 
+#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
+ProductCombinations=Variants
+HideProductCombinations=Hide products variant in the products selector
+ProductCombination=Variant
+NewProductCombination=New variant
+EditProductCombination=Editing variant
+ProductCombinationGenerator=Variants generator
+Features=Features
+PriceImpact=Price impact
+WeightImpact=Weight impact
+NewProductAttribute=Neues Attribut
+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
+PercentageVariation=Percentage variation
+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 child products
+ConfirmCloneProductCombinations=Would you like to copy all the product variant to the 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
diff --git a/htdocs/langs/de_DE/projects.lang b/htdocs/langs/de_DE/projects.lang
index 4983215a701..c4f11d0b4b0 100644
--- a/htdocs/langs/de_DE/projects.lang
+++ b/htdocs/langs/de_DE/projects.lang
@@ -30,8 +30,8 @@ DeleteATask=Löschen einer Aufgabe
 ConfirmDeleteAProject=Are you sure you want to delete this project?
 ConfirmDeleteATask=Are you sure you want to delete this task?
 OpenedProjects=Offene Projekte
-OpenedTasks=Offene Aufgaben
-OpportunitiesStatusForOpenedProjects=Betrag Verkaufschancen offene Projekt nach Status
+OpenedTasks=Geöffnete Aufgaben
+OpportunitiesStatusForOpenedProjects=Chancen nach Projektstatus
 OpportunitiesStatusForProjects=Betrag Verkaufschancen pro Projekt nach Status
 ShowProject=Zeige Projekt
 SetProject=Projekt setzen
@@ -47,7 +47,7 @@ TaskTimeSpent=Zeitaufwände für Aufgaben
 TaskTimeUser=Benutzer
 TaskTimeNote=Hinweis
 TaskTimeDate=Datum
-TasksOnOpenedProject=Aufgaben in offenen Projekten
+TasksOnOpenedProject=Aufgaben für offenes Projekt
 WorkloadNotDefined=Arbeitsaufwand nicht definiert
 NewTimeSpent=Neuer Zeitaufwand
 MyTimeSpent=Mein Zeitaufwand
@@ -96,6 +96,7 @@ ValidateProject=Projekt freigeben
 ConfirmValidateProject=Are you sure you want to validate this project?
 CloseAProject=Projekt schließen
 ConfirmCloseAProject=Are you sure you want to close this project?
+AlsoCloseAProject=Also close project (keep it open if you still need to follow production tasks on it)
 ReOpenAProject=Projekt öffnen
 ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=Projekt Kontakte
@@ -121,7 +122,7 @@ CloneProjectFiles=Dupliziere verbundene Projektdateien
 CloneTaskFiles=Aufgabe(n) duplizieren beigetreten Dateien (falls Aufgabe (n) dupliziert)
 CloneMoveDate=Update project/tasks dates from now?
 ConfirmCloneProject=Are you sure to clone this project?
-ProjectReportDate=Passe Aufgaben-Datum dem Projekt-Startdatum an
+ProjectReportDate=Change task dates according to new project start date
 ErrorShiftTaskDate=Es ist nicht möglich, das Aufgabendatum dem neuen Projektdatum anzupassen
 ProjectsAndTasksLines=Projekte und Aufgaben
 ProjectCreatedInDolibarr=Projekt %s erstellt
@@ -180,7 +181,7 @@ IdTaskTime=ID Zeit Aufgabe
 YouCanCompleteRef=Wenn Sie die Referenz mit Infromationen vervollständigen möchten (um diese als Suchfilter zu verwenden), wird empfohlen ein Trennzeichen einzusetzen, damit den Nummernkreis der zukünftigen Projekten weiterhin korrekt funktioniert. Zum Beispiel  %s-ABC. Sie können aber auch in den Label Suchbegriffe hinzufügen. Ein bewährtes Verfahren besteht darin, ein dedizierter Feld einzufügen, bekannt unter dem Begriff ergänzenden Attributen.
 OpenedProjectsByThirdparties=Offene Projekte nach Partner
 OnlyOpportunitiesShort=nur Verkaufschancen
-OpenedOpportunitiesShort=Offene Verkaufschancen
+OpenedOpportunitiesShort=geöffnete Verkaufschancen
 NotAnOpportunityShort=keine Verkaufschance
 OpportunityTotalAmount=Verkaufschancen Gesamtbetrag
 OpportunityPonderatedAmount=Verkaufschancen geschätzter Betrag
diff --git a/htdocs/langs/de_DE/propal.lang b/htdocs/langs/de_DE/propal.lang
index 77cd2623d4b..de6266be5e6 100644
--- a/htdocs/langs/de_DE/propal.lang
+++ b/htdocs/langs/de_DE/propal.lang
@@ -26,9 +26,9 @@ AmountOfProposalsByMonthHT=Betrag pro Monat (nach Steuern)
 NbOfProposals=Anzahl der Angebote
 ShowPropal=Zeige Angebot
 PropalsDraft=Entwürfe
-PropalsOpened=geöffnete
+PropalsOpened=Geöffnet
 PropalStatusDraft=Entwurf (freizugeben)
-PropalStatusValidated=Freigegeben (Angebot ist offen)
+PropalStatusValidated=Validated (proposal is opened)
 PropalStatusSigned=Unterzeichnet (ist zu verrechnen)
 PropalStatusNotSigned=Nicht unterzeichnet (geschlossen)
 PropalStatusBilled=Verrechnet
diff --git a/htdocs/langs/de_DE/stocks.lang b/htdocs/langs/de_DE/stocks.lang
index 8a4f50b2452..19ac89e8c91 100644
--- a/htdocs/langs/de_DE/stocks.lang
+++ b/htdocs/langs/de_DE/stocks.lang
@@ -22,13 +22,15 @@ Movements=Lagerbewegungen
 ErrorWarehouseRefRequired=Warenlager-Referenz erforderlich
 ListOfWarehouses=Liste der Warenlager
 ListOfStockMovements=Liste der Lagerbewegungen
+StockMovementForId=Movement ID %d
+ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Warenlager - Übersicht
 Location=Standort
 LocationSummary=Kurzbezeichnung Standort
 NumberOfDifferentProducts=Anzahl unterschiedlicher Produkte
 NumberOfProducts=Anzahl der Produkte
-LastMovement=Letzte Bewegung
-LastMovements=Letzte Bewegungen
+LastMovement=Latest movement
+LastMovements=Latest movements
 Units=Einheiten
 Unit=Einheit
 StockCorrection=Lagerstandsanpassung
diff --git a/htdocs/langs/de_DE/supplier_proposal.lang b/htdocs/langs/de_DE/supplier_proposal.lang
index fb1859ec3f1..3b056883969 100644
--- a/htdocs/langs/de_DE/supplier_proposal.lang
+++ b/htdocs/langs/de_DE/supplier_proposal.lang
@@ -8,7 +8,7 @@ SearchRequest=Anfrage suchen
 DraftRequests=Anfrage erstellen
 SupplierProposalsDraft=Entwurf Lieferantenanfrage
 LastModifiedRequests=Letzte %s geänderte Preisanfragen
-RequestsOpened=offene Preisanfragen
+RequestsOpened=Opened price requests
 SupplierProposalArea=Bereich Lieferantenangebote
 SupplierProposalShort=Lieferanten Angebot
 SupplierProposals=Lieferanten Angebote
@@ -23,7 +23,7 @@ ConfirmValidateAsk=Are you sure you want to validate this price request under na
 DeleteAsk=Anfrage löschen
 ValidateAsk=Anfrage freigeben
 SupplierProposalStatusDraft=Entwurf (muss noch überprüft werden)
-SupplierProposalStatusValidated=Bestätigt (Anfrage ist offen)
+SupplierProposalStatusValidated=Validated (request is opened)
 SupplierProposalStatusClosed=Geschlossen
 SupplierProposalStatusSigned=Bestätigt
 SupplierProposalStatusNotSigned=Abgelehnt
diff --git a/htdocs/langs/de_DE/suppliers.lang b/htdocs/langs/de_DE/suppliers.lang
index a34139b3e9a..77a9542bbec 100644
--- a/htdocs/langs/de_DE/suppliers.lang
+++ b/htdocs/langs/de_DE/suppliers.lang
@@ -24,10 +24,10 @@ ExportDataset_fournisseur_1=Lieferantenrechnungen und Positionen
 ExportDataset_fournisseur_2=Lieferantenrechnungen und Zahlungen
 ExportDataset_fournisseur_3=Lieferantenbestellungen und Auftragszeilen
 ApproveThisOrder=Bestellung bestätigen
-ConfirmApproveThisOrder=Möchten Sie diese Bestellung wirklich bestätigen <b>%s</b> ?
+ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b>?
 DenyingThisOrder=Bestellung ablehnen
-ConfirmDenyingThisOrder=Möchten Sie diese Bestellung wirklich ablehnen <b>%s</b> ?
-ConfirmCancelThisOrder=Möchten Sie die Bestellung <b>%s</b> wirklich stornieren ?
+ConfirmDenyingThisOrder=Are you sure you want to deny this order <b>%s</b>?
+ConfirmCancelThisOrder=Are you sure you want to cancel this order <b>%s</b>?
 AddSupplierOrder=Lieferantenbestellung erstellen
 AddSupplierInvoice=Lieferantenrechnung erstellen
 ListOfSupplierProductForSupplier=Produkt- und Preisliste für Anbieter <b>%s</b>
@@ -41,3 +41,4 @@ DoNotOrderThisProductToThisSupplier=Nicht sortieren
 NotTheGoodQualitySupplier=Ungültige Qualität
 ReputationForThisProduct=Reputation
 BuyerName=Käufer
+AllProductServicePrices=All product / service prices
diff --git a/htdocs/langs/de_DE/withdrawals.lang b/htdocs/langs/de_DE/withdrawals.lang
index 4caf1cc917f..a7ade20d6d6 100644
--- a/htdocs/langs/de_DE/withdrawals.lang
+++ b/htdocs/langs/de_DE/withdrawals.lang
@@ -24,6 +24,7 @@ WithdrawStatistics=Direct debit payment statistics
 WithdrawRejectStatistics=Direct debit payment reject statistics
 LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
+WithdrawRequestsDone=%s direct debit payment requests recorded
 ThirdPartyBankCode=IBAN Partner
 NoInvoiceCouldBeWithdrawed=Keine Rechnung erfolgreich abgebucht. Überprüfen Sie die Kontonummern der den Rechnungen zugewiesenen Partnern.
 ClassCredited=Als eingegangen markieren
@@ -76,8 +77,8 @@ RUM=UMR
 RUMLong=Unique Mandate Reference
 RUMWillBeGenerated=UMR number will be generated once bank account information are saved
 WithdrawMode=Direct debit mode (FRST or RECUR)
-WithdrawRequestAmount=Abbuchungsauftrag Betrag:
-WithdrawRequestErrorNilAmount=Es kann keine Abbuchung für einen Nullbetrag erstellt werden.
+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
diff --git a/htdocs/langs/el_CY/accountancy.lang b/htdocs/langs/el_CY/accountancy.lang
new file mode 100644
index 00000000000..473582c566a
--- /dev/null
+++ b/htdocs/langs/el_CY/accountancy.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - accountancy
+AccountingCategory=Accounting category
diff --git a/htdocs/langs/el_CY/orders.lang b/htdocs/langs/el_CY/orders.lang
deleted file mode 100644
index f719db62ca8..00000000000
--- a/htdocs/langs/el_CY/orders.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - orders
-StatusOrderReceivedAllShort=Everything received
-StatusOrderReceivedAll=Everything received
diff --git a/htdocs/langs/el_GR/accountancy.lang b/htdocs/langs/el_GR/accountancy.lang
index c266d83048a..baae64633d0 100644
--- a/htdocs/langs/el_GR/accountancy.lang
+++ b/htdocs/langs/el_GR/accountancy.lang
@@ -132,7 +132,7 @@ Sens=Σημασία
 Codejournal=Ημερολόγιο
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
-AccountingCategory=Accounting category
+AccountingCategory=Λογιστική κατηγορία
 GroupByAccountAccounting=Group by accounting account
 NotMatch=Not Set
 DeleteMvt=Delete general ledger lines
@@ -152,8 +152,8 @@ FeeAccountNotDefined=Account for fee not defined
 BankAccountNotDefined=Account for bank not defined
 CustomerInvoicePayment=Πληρωμή τιμολογίου προμηθευτή
 ThirdPartyAccount=Λογαριασμός Πελ./Προμ.
-NewAccountingMvt=New transaction
-NumMvts=Numero of transaction
+NewAccountingMvt=Νέα συναλλαγή
+NumMvts=Αριθμός συναλλαγής
 ListeMvts=List of movements
 ErrorDebitCredit=Χρεωστικές και Πιστωτικές δεν μπορούν να χουν την ίδια αξία ταυτόχρονα
 
@@ -194,6 +194,8 @@ ChangeBinding=Change the binding
 
 ## Admin
 ApplyMassCategories=Apply mass categories
+AddAccountFromBookKeepingWithNoCategories=Add acccount already used with no categories
+CategoryDeleted=Category for the accounting account has been removed
 
 ## Export
 Exports=Εξαγωγές
@@ -209,6 +211,7 @@ Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution
 Modelcsv_quadratus=Export towards Quadratus QuadraCompta
 Modelcsv_ebp=Export towards EBP
 Modelcsv_cogilog=Export towards Cogilog
+ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
 InitAccountancy=Init accountancy
diff --git a/htdocs/langs/el_GR/admin.lang b/htdocs/langs/el_GR/admin.lang
index 19d793fa282..b2148d15dac 100644
--- a/htdocs/langs/el_GR/admin.lang
+++ b/htdocs/langs/el_GR/admin.lang
@@ -9,17 +9,20 @@ VersionDevelopment=Υπό ανάπτυξη
 VersionUnknown=Άγνωστη
 VersionRecommanded=Προτεινόμενη
 FileCheck=Files integrity checker
-FileCheckDesc=This tool allows you to check the integrity of files of your application, comparing each files with the official ones. You can use this tool to detect if some files were modified by a hacker for example.
+FileCheckDesc=This tool allows you to check the integrity of files and setup of your application, comparing each files with the official ones. 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.
 FileIntegrityIsStrictlyConformedWithReference=Files integrity is strictly conformed with the reference.
-FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified of removed.
+FileIntegrityIsOkButFilesWereAdded=Files integrity check has passed, however some new files were added.
+FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified, removed or added.
 GlobalChecksum=Global checksum
 MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
 LocalSignature=Embedded local signature (less reliable)
 RemoteSignature=Remote distant signature (more reliable)
 FilesMissing=Αρχεία που λείπουν
 FilesUpdated=Ενημερωμένα αρχεία
+FilesModified=Modified Files
+FilesAdded=Added Files
 FileCheckDolibarr=Check integrity of application files
-AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from a certified package
+AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from an official package
 XmlNotFound=Xml Integrity File of application not found
 SessionId=ID Συνόδου
 SessionSaveHandler=Φορέας χειρισμού αποθήκευσης συνεδριών
@@ -188,7 +191,9 @@ BoxesDesc=Widgets are components showing some information that you can add to pe
 OnlyActiveElementsAreShown=Μόνο στοιχεία από <a href="%s">ενεργοποιημένα modules</a> προβάλλονται.
 ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
-ModulesMarketPlaces=Περισσότερα Αρθρώματα...
+ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
+ModulesMarketPlaces=Find external modules...
+GoModuleSetupArea=To deploy/install a new module, go onto the Module setup area at <a href="%s">%s</a>.
 DoliStoreDesc=Το DoliStore, είναι η επίσημη περιοχή για να βρείτε εξωτερικά modules για το Dolibarr ERP/CRM
 DoliPartnersDesc=List of companies providing custom developed modules or features (Note: anyone experienced in PHP programming can provide custom development for an open source project)
 WebSiteDesc=Reference websites to find more modules...
@@ -280,20 +285,21 @@ MenuHandlers=Διαχειριστές μενού
 MenuAdmin=Επεξεργαστής μενού
 DoNotUseInProduction=Να μην χρησιμοποιείται για παραγωγή
 ThisIsProcessToFollow=This is steps to process:
-ThisIsAlternativeProcessToFollow=This is an alternative setup to process:
+ThisIsAlternativeProcessToFollow=This is an alternative setup to process manually:
 StepNb=Βήμα %s
 FindPackageFromWebSite=Βρείτε ένα πακέτο που να παρέχει την λειτουργία που επιθυμείτε (για παράδειγμα στο επίσημο %s).
 DownloadPackageFromWebSite=Λήψη πακέτου (για παράδειγμα από την επίσημη ιστοσελίδα %s).
-UnpackPackageInDolibarrRoot=Unpack package file into Dolibarr server directory dedicated to external modules: <b>%s</b>
-SetupIsReadyForUse=Η εγκατάσταση τελείωσε και το Dolibarr είναι έτοιμο να χρησιμοποιηθεί με αυτό το νέο στοιχείο.
-NotExistsDirect=Ο εναλλακτικός ριζικός φάκελος δεν έχει ρυθμιστεί.<br>
-InfDirAlt=Από την έκδοση 3 είναι δυνατός ο ορισμός ενός εναλλακτικού ριζικού φακέλου.  Αυτό σας επιτρέπει να αποθηκεύσετε στο ίδιο μέρος πρόσθετες εφαρμογές και μη τυπικά templates.<br>Απλά δημιουργήστε ένα φάκελο στο ριζικό φάκελο του Dolibarr (π.χ.: custom).<br>
-InfDirExample=<br>Κατόπιν δηλώστε το στο αρχείο conf.php<br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>*Αυτές οι γραμμές είναι απενεργοποιημένες με χρήση του χαρακτήρα "#", για να της ενεργοποιήσετε απλά αφαιρέστε το χαρακτήρα.
+UnpackPackageInDolibarrRoot=Unpack the packaged files into server directory dedicated to Dolibarr: <b>%s</b>
+UnpackPackageInModulesRoot=To deploy/install an external module, unpack the packaged files into the server directory dedicated to modules: <b>%s</b>
+SetupIsReadyForUse=Module deployment is finished. You must however enable and setup the module in your application by going on the page to setup modules: <a href="%s">%s</a>.
+NotExistsDirect=The alternative root directory is not defined to an existing directory.<br>
+InfDirAlt=Since version 3, it is possible to define an alternative root directory. This allows you to store, into a dedicated directory, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
+InfDirExample=<br>Then declare it in the file <strong>conf.php</strong><br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>If these lines are commented with "#", to enable them, just uncomment by removing the "#" character.
 YouCanSubmitFile=Για αυτό το βήμα μπορείτε να στείλετε πακέτα χρησιμοποιώντας ατό το εργαλείο: Επιλέξτε αρχείο ενθέματος
 CurrentVersion=Έκδοση Dolibarr
 CallUpdatePage=Μετάβαση στη σελίδα ενημέρωσης της δομής της βάσης δεδομένων και των δεδομένων: %s.
 LastStableVersion=Τελευταία σταθερή έκδοση
-LastActivationDate=Last activation date
+LastActivationDate=Latest activation date
 UpdateServerOffline=Ο διακομιστής ενημερώσεων είναι εκτός σύνδεσης
 GenericMaskCodes=Μπορείτε να χρησιμοποιήσετε οποιαδήποτε μάσκα αρίθμησης. Σε αυτή τη μάσκα  μπορούν να χρησιμοποιηθούν τις παρακάτω ετικέτες:<br>Το <b>{000000}</b> αντιστοιχεί σε έναν αριθμό που θα αυξάνεται σε κάθε %s. Εισάγετε όσα μηδέν επιθυμείτε ως το επιθυμητό μέγεθος για τον μετρητή. Ο μετρητής θα συμπληρωθεί με μηδενικά από τα αριστερά για να έχει όσα μηδενικά υπάρχουν στην μάσκα. <br>Η μάσκα <b>{000000+000}</b> είναι η ίδια όπως προηγουμένως αλλά ένα αντιστάθμισμα που αντιστοιχεί στον αριθμό στα δεξιά του + θα προστεθεί αρχίζοντας από το πρώτο %s. <br>Η μάσκα <b>{000000@x}</b> είναι η ίδια όπως προηγουμένως αλλά ο μετρητής επανέρχεται στο μηδέν όταν έρθει ο μήνας x  (το x είναι μεταξύ του 1 και του 12). Αν αυτή η επιλογή χρησιμοποιηθεί και το x είναι 2 ή μεγαλύτερο, τότε η ακολουθία {yy}{mm} ή {yyyy}{mm} είναι επίσης απαιραίτητη. <br>Η μάσκα <b>{dd}</b> ημέρα (01 έως 31).<br><b>{mm}</b> μήνας (01 έως 12).<br><b>{yy}</b>, <b>{yyyy}</b> ή <b>{y}</b> έτος με χρήση 2, 4 ή 1 αριθμού. <br>
 GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
@@ -376,11 +382,11 @@ ExtrafieldCheckBox=Checkbox
 ExtrafieldRadio=Radio button
 ExtrafieldCheckBoxFromList= Πλαίσιο ελέγχου από τον πίνακα
 ExtrafieldLink=Link to an object
-ExtrafieldParamHelpselect=Η λίστα παραμέτρων θα πρέπει να είναι σαν το κλειδί,value<br><br> για παράδειγμα : <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>Προκειμένου να έχει τη λίστα εξαρτώμενη με μια άλλη: <br>1,value1|parent_list_code:parent_key<br>2,value2|parent_list_code:parent_key
+ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list :<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list :<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=Η λίστα παραμέτρων θα πρέπει να είναι σαν το κλειδί,value<br><br> για παράδειγμα : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=Η λίστα παραμέτρων θα πρέπει να είναι σαν το κλειδί,value<br><br> για παράδειγμα : <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
-ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
+ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Example : Societe:societe/class/societe.class.php
 LibraryToBuildPDF=Βιβλιοθήκη δημιουργίας PDF
 WarningUsingFPDF=Προειδοποίηση: Το αρχείο <b>conf.php</b> περιλαμβάνει την επιλογή <b>dolibarr_pdf_force_fpdf=1</b>. Αυτό σημαίνει πως χρησιμοποιείτε η βιβλιοθήκη FPDF για να δημιουργούνται τα αρχεία PDF. Αυτή η βιβλιοθήκη είναι παλιά και δεν υποστηρίζει πολλές λειτουργίες (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), οπότε μπορεί να παρουσιαστούν λάθη κατά την δημιουργία των PDF.<br>Για να λυθεί αυτό και να μπορέσετε να έχετε πλήρη υποστήριξη δημιουργίας αρχείων PDF, παρακαλώ κατεβάστε την <a href="http://www.tcpdf.org/" target="_blank">βιβλιοθήκη TCPDF</a>,  και μετά απενεργοποιήστε ή διαγράψτε την γραμμή <b>$dolibarr_pdf_force_fpdf=1</b>, και εισάγετε αντί αυτής την <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
@@ -415,10 +421,10 @@ ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The cod
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
 WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<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).
-
+ClickToShowDescription=Click to show description
 # Modules
 Module0Name=Χρήστες & Ομάδες
-Module0Desc=Διαχείριση χρηστών και ομάδων
+Module0Desc=Users / Employees and Groups management
 Module1Name=Στοιχεία
 Module1Desc=Διαχείριση εταιρειών και επαφών (πελάτες, πιθανοί πελάτες...)
 Module2Name=Εμπορικό
@@ -689,7 +695,7 @@ PermissionAdvanced253=Create/modify internal/external users and permissions
 Permission254=Create/modify external users only
 Permission255=Modify other users password
 Permission256=Delete or disable other users
-Permission262=Extend access to all third parties (not only third parties that user is a sale representative). Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc). Not effective for projects (only rules on project permissions, visibility and assignement matters).
+Permission262=Extend access to all third parties (not only third parties that user is a sale representative).<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 assignement matters).
 Permission271=Read CA
 Permission272=Read invoices
 Permission273=Issue invoices
@@ -891,7 +897,7 @@ Offset=Απόκλιση
 AlwaysActive=Πάντα εν ενεργεία
 Upgrade=Αναβάθμιση
 MenuUpgrade=Αναβάθμιση / Επέκταση
-AddExtensionThemeModuleOrOther=Προσθήκη Αρθρώματος (θέμα, άρθρωμα, ...)
+AddExtensionThemeModuleOrOther=Deploy/install external module
 WebServer=Διακομιστής Ιστοσελίδων
 DocumentRootServer=Ριζικός φάκελος διακομιστή ιστοσελίδων
 DataRootServer=Φάκελος Εγγράφων
@@ -1165,10 +1171,6 @@ FreeLegalTextOnOrders=Ελεύθερο κείμενο στις παραγγελ
 WatermarkOnDraftOrders=Watermark on draft orders (none if empty)
 ShippableOrderIconInList=Προσθήκη εικονιδίου στις Παραγγελίες που δείχνει ότι η παραγγελία μπορεί να αποσταλεί
 BANK_ASK_PAYMENT_BANK_DURING_ORDER=Ρωτήστε τον τραπεζικό λογαριασμό για προορισμό της παραγγελίας
-##### Clicktodial #####
-ClickToDialSetup=Click To Dial module setup
-ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with your clicktodial login (defined on your user card)<br><b>__PASS__</b> that will be replaced with your clicktodial password (defined on your user card).
-##### Bookmark4u #####
 ##### Interventions #####
 InterventionsSetup=Interventions module setup
 FreeLegalTextOnInterventions=Ελεύθερο κείμενο στα έντυπα παρέμβασης
@@ -1395,7 +1397,7 @@ SendingsSetup=Sending module setup
 SendingsReceiptModel=Sending receipt model
 SendingsNumberingModules=Σας αποστολές αρίθμησης ενοτήτων
 SendingsAbility=Support shipping sheets for customer deliveries
-NoNeedForDeliveryReceipts=In most cases, sendings receipts are used both as sheets for customer deliveries (list of products to send) and sheets that is recevied and signed by customer. So product deliveries receipts is a duplicated feature and is rarely activated.
+NoNeedForDeliveryReceipts=In most cases, shipping sheets are used both as sheets for customer deliveries (list of products to send) and sheets that is received and signed by customer. So product deliveries receipts is a duplicated feature and is rarely activated.
 FreeLegalTextOnShippings=Ελεύθερο κείμενο για τις μεταφορές
 ##### Deliveries #####
 DeliveryOrderNumberingModules=Products deliveries receipt numbering module
@@ -1477,7 +1479,9 @@ AGENDA_DEFAULT_FILTER_STATUS=Ορίστε αυτό το καθεστώς για
 AGENDA_DEFAULT_VIEW=Ποια καρτέλα θέλετε να ανοίξετε από προεπιλογή κατά την επιλογή του μενού Ατζέντα
 AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
 AGENDA_NOTIFICATION_SOUND=Enable sound notification
-##### ClickToDial #####
+##### Clicktodial #####
+ClickToDialSetup=Click To Dial module setup
+ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with your clicktodial login (defined on your user card)<br><b>__PASS__</b> that will be replaced with your clicktodial password (defined on your user card).
 ClickToDialDesc=This module allows to make phone numbers clickable. A click on this icon will call make your phone to 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.
 ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
 ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on same computer than the browser, and called when you click on a link in your browser that start 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.
@@ -1505,10 +1509,11 @@ EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint availa
 ##### API ####
 ApiSetup=API module setup
 ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
-ApiProductionMode=Enable production mode (this will activate use of a caches for services management)
+ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
 ApiExporerIs=You can explore the APIs at url
 OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
 ApiKey=Key for API
+WarningAPIExplorerDisabled=The API explorer has been disabled. API explorer is not required to provide API services. It is a tool for developer to find/test REST APIs. If you need this tool, go into setup of module API REST to activate it.
 ##### Bank #####
 BankSetupModule=Bank module setup
 FreeLegalTextOnChequeReceipts=Ελεύθερο κείμενο στις λήψεις επιταγών
@@ -1577,7 +1582,7 @@ BackupDumpWizard=Wizard to build database backup dump file
 SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
 SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is only manual steps a privileged user can do.
 InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
-ConfFileMuseContainCustom=Installing an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to have option<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
+ConfFileMuseContainCustom=Installing an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
 HighlightLinesColor=Highlight color of the line when the mouse passes over (keep empty for no highlight)
 TextTitleColor=Χρώμα τίτλου σελίδας
@@ -1607,6 +1612,7 @@ FixTZ=TimeZone fix
 FillFixTZOnlyIfRequired=Example: +2 (fill only if problem experienced)
 ExpectedChecksum=Expected Checksum
 CurrentChecksum=Current Checksum
+ForcedConstants=Required constant values
 MailToSendProposal=To send customer proposal
 MailToSendOrder=Για αποστολή παραγγελίας πελάτη
 MailToSendInvoice=To send customer invoice
@@ -1615,9 +1621,10 @@ MailToSendIntervention=To send intervention
 MailToSendSupplierRequestForQuotation=To send quotation request to supplier
 MailToSendSupplierOrder=To send supplier order
 MailToSendSupplierInvoice=To send supplier invoice
+MailToSendContract=To send a contract
 MailToThirdparty=To send email from third party page
 ByDefaultInList=Show by default on list view
-YouUseLastStableVersion=Χρησιμοποιείτε την τελευταία σταθερή έκδοση
+YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
 TitleExampleForMaintenanceRelease=Example of message you can use to announce this maintenance release (feel free to use it on your web sites)
 ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. 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.
diff --git a/htdocs/langs/el_GR/banks.lang b/htdocs/langs/el_GR/banks.lang
index 14a66490f39..5ba3bd4406d 100644
--- a/htdocs/langs/el_GR/banks.lang
+++ b/htdocs/langs/el_GR/banks.lang
@@ -74,13 +74,13 @@ Conciliate=Πραγματοποίηση Συναλλαγής
 Conciliation=Πραγματοποίηση Συναλλαγής
 ReconciliationLate=Reconciliation late
 IncludeClosedAccount=Συμπερίληψη Κλειστών Λογαριασμών
-OnlyOpenedAccount=Μόνο ανοικτούς λογαριασμούς
+OnlyOpenedAccount=Μόνο Ανοιχτοί Λογαριασμοί
 AccountToCredit=Πίστωση στον Λογαριασμό
 AccountToDebit=Χρέωση στον Λογαριασμό
 DisableConciliation=Απενεργοποίηση της ιδιότητας συμφωνία από αυτό τον λογαριασμό
 ConciliationDisabled=Η ιδιότητα συμφωνία απενεργοποιήθηκε.
 LinkedToAConciliatedTransaction=Linked to a conciliated entry
-StatusAccountOpened=Ανοιχτός
+StatusAccountOpened=Ανοίξτε
 StatusAccountClosed=Κλειστός
 AccountIdShort=Αριθμός
 LineRecord=Συναλλαγή
diff --git a/htdocs/langs/el_GR/bills.lang b/htdocs/langs/el_GR/bills.lang
index 09bdef0db21..2d4e2a07144 100644
--- a/htdocs/langs/el_GR/bills.lang
+++ b/htdocs/langs/el_GR/bills.lang
@@ -2,16 +2,16 @@
 Bill=Τιμολόγιο
 Bills=Τιμολόγια
 BillsCustomers=Τιμολόγια πελατών
-BillsCustomer=Τιμολόγιο πελάτη
+BillsCustomer=Τιμολόγιο Πελάτη
 BillsSuppliers=Τιμολόγια προμηθευτών
-BillsCustomersUnpaid=Απλήρωτα τιμολόγια πελατών
-BillsCustomersUnpaidForCompany=Απλήρωτα τιμολόγια για %s
-BillsSuppliersUnpaid=Απλήρωτα τιμολόγια προμηθευτών
-BillsSuppliersUnpaidForCompany=Απλήρωτα τιμολόγια προμηθευτή για %s
+BillsCustomersUnpaid=Ανεξόφλητα τιμολόγια πελάτη
+BillsCustomersUnpaidForCompany=Unpaid customer invoices for %s
+BillsSuppliersUnpaid=Ανεξόφλητα τιμολόγια προμηθευτή
+BillsSuppliersUnpaidForCompany=Unpaid supplier invoices for %s
 BillsLate=Καθυστερημένες Πληρωμές
 BillsStatistics=Στατιστικά για τα τιμολόγια των πελατών 
 BillsStatisticsSuppliers=Στατιστικά για τα τιμολόγια των προμηθευτών
-DisabledBecauseNotErasable=Απενεργοποιημένο επειδή δεν μπορή να διαγραφή
+DisabledBecauseNotErasable=Απενεργοποιημένο επειδή δεν μπορεί να διαγραφή
 InvoiceStandard=Τυπικό Τιμολόγιο
 InvoiceStandardAsk=Τυπικό Τιμολόγιο
 InvoiceStandardDesc=Αυτό το είδος τιμολογίου είναι το τυπικό τιμολόγιο.
@@ -62,8 +62,8 @@ PaymentsBack=Payments back
 paymentInInvoiceCurrency=in invoices currency
 PaidBack=Paid back
 DeletePayment=Διαγραφή Πληρωμής
-ConfirmDeletePayment=Είστε σίγουροι ότι θέλετε να διαγράψετε αυτήν την πληρωμή;
-ConfirmConvertToReduc=Do you want to convert this credit note or deposit 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.
+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.
 SupplierPayments=Πληρωμές Προμηθευτών
 ReceivedPayments=Ληφθείσες Πληρωμές
 ReceivedCustomersPayments=Ληφθείσες Πληρωμές από πελάτες
@@ -78,6 +78,7 @@ PaymentMode=Τρόπος Πληρωμής
 PaymentTypeDC=Χρεωστική/Πιστωτική κάρτα
 PaymentTypePP=PayPal
 IdPaymentMode=Τύπος πληρωμής (κωδ)
+CodePaymentMode=Payment type (code)
 LabelPaymentMode=Τύπος πληρωμής (ετικέτα)
 PaymentModeShort=Τρόπος πληρωμής
 PaymentTerm=Όρος πληρωμής
@@ -102,9 +103,10 @@ SearchACustomerInvoice=Εύρεση τιμολογίου πελάτη
 SearchASupplierInvoice=Εύρεση τιμολογίου προμηθευτή
 CancelBill=Ακύρωση Τιμολογίου
 SendRemindByMail=Αποστολή υπενθύμισης με email
-DoPayment=Εισαγωγή Πληρωμής
-DoPaymentBack=Do payment back
+DoPayment=Enter payment
+DoPaymentBack=Enter refund
 ConvertToReduc=Μετατροπή σε μελλοντική έκπτωση
+ConvertExcessReceivedToReduc=Convert excess received into future discount
 EnterPaymentReceivedFromCustomer=Εισαγωγή πληρωμής από πελάτη
 EnterPaymentDueToCustomer=Πληρωμή προς προμηθευτή
 DisabledBecauseRemainderToPayIsZero=Ανενεργό λόγο μηδενικού υπολοίπου πληρωμής
@@ -151,16 +153,16 @@ NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified
 FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
 NotARecurringInvoiceTemplate=Not a recurring template invoice
 NewBill=Νέο τιμολόγιο
-LastBills=Τελευταία %s τιμολόγια
-LastCustomersBills=Τελευταία %s τιμολόγια πελατών
-LastSuppliersBills=Τελευταία %s τιμολόγια προμηθευτών
+LastBills=Latest %s invoices
+LastCustomersBills=Latest %s customer invoices
+LastSuppliersBills=Latest %s supplier invoices
 AllBills=Όλα τα τιμολόγια
 OtherBills=Άλλα τιμολόγια
 DraftBills=Προσχέδια τιμολογίων
-CustomersDraftInvoices=Προσχέδια τιμολογίων πελατών
-SuppliersDraftInvoices=Προσχέδια τιμολογίων προμηθευτών
+CustomersDraftInvoices=Customer draft invoices
+SuppliersDraftInvoices=Supplier draft invoices
 Unpaid=Απλήρωτο
-ConfirmDeleteBill=Are you sure you want to delete this invoice?
+ConfirmDeleteBill=Είσαστε σίγουρος ότι θέλετε να διαγράψετε αυτό το τιμολόγιο;
 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?
@@ -272,6 +274,7 @@ Deposit=Κατάθεση
 Deposits=Καταθέσεις
 DiscountFromCreditNote=Έκπτωση από το πιστωτικό τιμολόγιο %s
 DiscountFromDeposit=Πληρωμές από το τιμολόγιο κατάθεσης %s
+DiscountFromExcessReceived=Payments from excess received of invoice %s
 AbsoluteDiscountUse=This kind of credit can be used on invoice before its validation
 CreditNoteDepositUse=Invoice must be validated to use this kind of credits
 NewGlobalDiscount=Νέα απόλυτη έκπτωση
@@ -279,8 +282,8 @@ NewRelativeDiscount=Νέα σχετική έκπτωση
 NoteReason=Σημείωση/Αιτία
 ReasonDiscount=Αιτία
 DiscountOfferedBy=Παραχωρούνται από
-DiscountStillRemaining=Η έκπτωση παραμένει
-DiscountAlreadyCounted=Η έκπτωση υπολογίστηκε ήδη
+DiscountStillRemaining=Discounts available
+DiscountAlreadyCounted=Discounts already consumed
 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.
@@ -333,6 +336,8 @@ InvoiceAutoValidate=Αυτόματη επικύρωση τιμολογίων
 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
 # PaymentConditions
 Statut=Κατάσταση
 PaymentConditionShortRECEP=Due Upon Receipt
@@ -351,6 +356,14 @@ 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
 FixAmount=Διορθώση ποσού
 VarAmount=Μεταβλητή ποσού (%% tot.)
 # PaymentType
@@ -420,7 +433,7 @@ ChequeDeposits=Επιταγές κατάθεσης
 Cheques=Επιταγές
 DepositId=Id Κατάθεση 
 NbCheque=Αριθμός επιταγών
-CreditNoteConvertedIntoDiscount=Αυτό το πιστωτικό τιμολόγιο ή το τιμολόγιο καταθέσεων έχει μετατραπεί σε %s
+CreditNoteConvertedIntoDiscount=This %s has been converted into %s
 UsBillingContactAsIncoiveRecipientIfExist=Χρησιμοποιήστε πελάτη διεύθυνση επικοινωνίας χρέωσης αντί των Πελ./Προμ. διεύθυνση για τα τιμολόγια
 ShowUnpaidAll=Εμφάνιση όλων των απλήρωτων τιμολογίων
 ShowUnpaidLateOnly=Εμφάνιση μόνο των καθυστερημένων απλήρωτων τιμολογίων
diff --git a/htdocs/langs/el_GR/boxes.lang b/htdocs/langs/el_GR/boxes.lang
index be574573981..1a895af0be2 100644
--- a/htdocs/langs/el_GR/boxes.lang
+++ b/htdocs/langs/el_GR/boxes.lang
@@ -25,8 +25,8 @@ BoxTitleLastSuppliers=Latest %s recorded suppliers
 BoxTitleLastModifiedSuppliers=Latest %s modified suppliers
 BoxTitleLastModifiedCustomers=Οι %s πιο πρόσφατα τροποποιημένοι πελάτες
 BoxTitleLastCustomersOrProspects=Τελευταίοι %s πελάτες ή προοπτικές
-BoxTitleLastCustomerBills=Τα %s πιο πρόσφατα τιμολόγια πελατών
-BoxTitleLastSupplierBills=Τα %s πιο πρόσφατα τιμολόγια προμηθευτών
+BoxTitleLastCustomerBills=Latest %s customer invoices
+BoxTitleLastSupplierBills=Latest %s supplier invoices
 BoxTitleLastModifiedProspects=Οι %s πιο πρόσφατα τροποποιημένες προσφορές
 BoxTitleLastModifiedMembers=Τελευταία %s Μέλη
 BoxTitleLastFicheInter=Latest %s modified interventions
@@ -51,12 +51,12 @@ ClickToAdd=Πατήστε εδώ για προσθήκη.
 NoRecordedCustomers=Δεν υπάρχουν καταχωρημένοι πελάτες
 NoRecordedContacts=Δεν υπάρχουν καταγεγραμμένες επαφές
 NoActionsToDo=Δεν υπάρχουν ενέργειες που πρέπει να γίνουν
-NoRecordedOrders=Δεν υπάρχουν καταχωρημένες παραγγελίες πελατών
+NoRecordedOrders=No recorded customer orders
 NoRecordedProposals=Δεν υπάρχουν καταχωρημένες προσφορές
-NoRecordedInvoices=Δεν υπάρχουν καταχωρημένα τιμολόγια πελατών
-NoUnpaidCustomerBills=Δεν υπάρχουν απλήρωτα τιμολόγια πελατών
-NoUnpaidSupplierBills=Δεν υπάρχουν απλήρωτα τιμολόγια προμηθευτών
-NoModifiedSupplierBills=Δεν υπάρχουν τροποποιημένα τιμολόγια προμηθευτών
+NoRecordedInvoices=No recorded customer invoices
+NoUnpaidCustomerBills=No unpaid customer invoices
+NoUnpaidSupplierBills=No unpaid supplier invoices
+NoModifiedSupplierBills=No recorded supplier invoices
 NoRecordedProducts=Δεν υπάρχουν καταχωρημένα προϊόντα/υπηρεσίες
 NoRecordedProspects=Δεν υπάρχουν προσφορές
 NoContractedProducts=Δεν υπάρχουν καταχωρημένα συμβόλαια με προϊόντα/υπηρεσίες
diff --git a/htdocs/langs/el_GR/cashdesk.lang b/htdocs/langs/el_GR/cashdesk.lang
index ef825a159bb..9292e676d05 100644
--- a/htdocs/langs/el_GR/cashdesk.lang
+++ b/htdocs/langs/el_GR/cashdesk.lang
@@ -25,7 +25,7 @@ Difference=Διαφορά
 TotalTicket=Σύνολο
 NoVAT=Χωρίς Φ.Π.Α. για αυτή την πώληση
 Change=Ρέστα
-BankToPay=Account for payment
+BankToPay=Λογαριασμός για πληρωμή
 ShowCompany=Εμφάνιση εταιρείας
 ShowStock=Εμφάνιση αποθήκης
 DeleteArticle=Κάντε κλικ για να καταργήσετε αυτό το προϊόν
diff --git a/htdocs/langs/el_GR/commercial.lang b/htdocs/langs/el_GR/commercial.lang
index aa0a3b03e4b..751db45d14a 100644
--- a/htdocs/langs/el_GR/commercial.lang
+++ b/htdocs/langs/el_GR/commercial.lang
@@ -28,7 +28,7 @@ ShowCustomer=Εμφάνιση Πελάτη
 ShowProspect=Εμφάνιση Προοπτικής
 ListOfProspects=Λίστα Προοπτικών
 ListOfCustomers=Λίστα Πελατών
-LastDoneTasks=Latest %s completed actions
+LastDoneTasks=Πιο πρόσφατες %s ολοκληρωμένες πράξεις
 LastActionsToDo=Παλαιότερες %s ημιτελείς ενέργειες
 DoneAndToDoActions=Ολοκληρωμένα και τρέχοντα συμβάντα
 DoneActions=Ολοκληρωμένα συμβάντα
diff --git a/htdocs/langs/el_GR/companies.lang b/htdocs/langs/el_GR/companies.lang
index 63c0bb0d819..5bb4073d895 100644
--- a/htdocs/langs/el_GR/companies.lang
+++ b/htdocs/langs/el_GR/companies.lang
@@ -81,6 +81,7 @@ PaymentBankAccount=Payment bank account
 OverAllProposals=Total proposals
 OverAllOrders=Total orders
 OverAllInvoices=Total invoices
+OverAllSupplierProposals=Total price requests
 ##### Local Taxes #####
 LocalTax1IsUsed=Χρησιμοποιήστε το δεύτερο φόρο
 LocalTax1IsUsedES= RE is used
@@ -389,7 +390,7 @@ ListCustomersShort=Λίστα Πελατών
 ThirdPartiesArea=Περιοχή Πελ./Προμ. και επαφών
 LastModifiedThirdParties=Τελευταία %s τροποποιημένα στοιχεία
 UniqueThirdParties=Σύνολο μοναδικών Πελ./Προμ.
-InActivity=Ανοιχτό
+InActivity=Ανοίξτε
 ActivityCeased=Κλειστό
 ThirdPartyIsClosed=Third party is closed
 ProductsIntoElements=Κατάλογος των προϊόντων/υπηρεσιών σε %s
@@ -404,7 +405,7 @@ MergeThirdparties=Συγχώνευση  Πελ./Προμ.
 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 so you will be able to delete the duplicate one.
 ThirdpartiesMergeSuccess= Πελ./Προμ. έχουν συγχωνευθεί
 SaleRepresentativeLogin=Login of sales representative
-SaleRepresentativeFirstname=Όνομα αντιπροσώπου πωλήσεων
-SaleRepresentativeLastname=Επίθετο αντιπροσώπου πωλήσεων
+SaleRepresentativeFirstname=First name of sales representative
+SaleRepresentativeLastname=Last name of sales representative
 ErrorThirdpartiesMerge=Υπήρξε ένα σφάλμα κατά τη διαγραφή των Πελ./Προμ.. Παρακαλώ ελέγξτε το αρχείο καταγραφής. Αλλαγές έχουν επανέλθει.
 NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/el_GR/compta.lang b/htdocs/langs/el_GR/compta.lang
index 24228dafaab..c0cb883b521 100644
--- a/htdocs/langs/el_GR/compta.lang
+++ b/htdocs/langs/el_GR/compta.lang
@@ -65,6 +65,7 @@ PaymentSocialContribution=Πληρωμή Κοινωνικής/Φορολογικ
 PaymentVat=Πληρωμή Φ.Π.Α.
 ListPayment=Λίστα πληρωμών
 ListOfCustomerPayments=Λίστα πληρωμών πελατών
+ListOfSupplierPayments=Λίστα πληρωμών προμηθευτών
 DateStartPeriod=Ημερομηνία έναρξης περιόδου
 DateEndPeriod=Ημερομηνία λήξης περιόδου
 newLT1Payment=New tax 2 payment
@@ -81,7 +82,7 @@ LT2PaymentES=IRPF Πληρωμής
 LT2PaymentsES=Πληρωμές IRPF
 VATPayment=Πληρωμή ΦΠΑ πωλήσεων
 VATPayments=Πληρωμές ΦΠΑ πωλήσεων
-VATRefund=Sales tax refund Refund
+VATRefund=Sales tax refund
 Refund=Refund
 SocialContributionsPayments=Πληρωμές Κοινωνικών/Φορολογικών εισφορών
 ShowVatPayment=Εμφάνιση πληρωμής φόρου
@@ -199,7 +200,7 @@ OtherCountriesCustomersReport=Αναφορά για πελάτες εξωτερ
 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
+LinkedFichinter=Σύνδεσμος σε μία παρέμβαση
 ImportDataset_tax_contrib=Κοινωνικές/φορολογικές εισφορές
 ImportDataset_tax_vat=Vat payments
 ErrorBankAccountNotFound=Error: Bank account not found
diff --git a/htdocs/langs/el_GR/cron.lang b/htdocs/langs/el_GR/cron.lang
index 02338e8515b..5cb45d0d0ff 100644
--- a/htdocs/langs/el_GR/cron.lang
+++ b/htdocs/langs/el_GR/cron.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - cron
 # About page
 # Right
-Permission23101 = Read Scheduled job
+Permission23101 = Λεπτομέρειες προγραμματισμένης εργασίας
 Permission23102 = Δημιουργία/ενημέρωση προγραμματισμένης εργασίας
 Permission23103 = Διαγραφή προγραμματισμένης εργασίας
 Permission23104 = Εκτέλεση προγραμματισμένης εργασίας
@@ -15,16 +15,16 @@ CronExplainHowToRunUnix=Στο Unix περιβάλλον θα πρέπει να
 CronExplainHowToRunWin=Σε Microsoft (tm) Windows περιβάλλον μπορείτε να χρησιμοποιήσετε τα εργαλεία Προγραμματισμένη εργασία ώστε να εκτελείτε η γραμμή εντολών καθένα 5 λεπτά
 CronMethodDoesNotExists=Class %s does not contains any method %s
 # Menu
-EnabledAndDisabled=Enabled and disabled
+EnabledAndDisabled=Ενεργοποίηση και απενεργοποίηση
 # Page list
-CronLastOutput=Τελευταία εκτέλεση εξόδου
-CronLastResult=Τελευταίος κωδικός αποτελέσματος
+CronLastOutput=Latest run output
+CronLastResult=Latest result code
 CronCommand=Εντολή
 CronList=Προγραμματισμένες εργασίες
 CronDelete=Διαγραφή προγραμματισμένων εργασιών
-CronConfirmDelete=Είστε σίγουροι ότι θέλετε να διαγράψετε αυτές τις προγραμματισμένες εργασίες;
+CronConfirmDelete=Are you sure you want to delete these scheduled jobs?
 CronExecute=Launch scheduled job
-CronConfirmExecute=Are you sure you want to execute these scheduled jobs now ?
+CronConfirmExecute=Are you sure you want to execute these scheduled jobs now?
 CronInfo=Scheduled job module allow to execute job that have been planned
 CronTask=Εργασία
 CronNone=Καμία
@@ -39,7 +39,7 @@ CronMethod=Μέθοδος
 CronModule=Module
 CronNoJobs=Δεν έχουν καταχωρηθεί εργασίες
 CronPriority=Προτεραιότητα
-CronLabel=Label
+CronLabel=Ετικέτα
 CronNbRun=Nb. έναρξης
 CronMaxRun=Max nb. launch
 CronEach=Κάθε
diff --git a/htdocs/langs/el_GR/errors.lang b/htdocs/langs/el_GR/errors.lang
index 8336537f6f3..0937639e4b8 100644
--- a/htdocs/langs/el_GR/errors.lang
+++ b/htdocs/langs/el_GR/errors.lang
@@ -11,6 +11,7 @@ ErrorLoginAlreadyExists=Είσοδος %s υπάρχει ήδη.
 ErrorGroupAlreadyExists=Ομάδα %s υπάρχει ήδη.
 ErrorRecordNotFound=Εγγραφή δεν βρέθηκε.
 ErrorFailToCopyFile=Απέτυχε η αντιγραφή του αρχείου <b>&quot;%s»</b> σε <b>«%s».</b>
+ErrorFailToCopyDir=Failed to copy directory '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToRenameFile=Απέτυχε η μετονομασία του αρχείου <b>&quot;%s»</b> σε <b>«%s».</b>
 ErrorFailToDeleteFile=Αποτυχία για να αφαιρέσετε το αρχείο <b>%s</b>.
 ErrorFailToCreateFile=Απέτυχε η δημιουργία του αρχείου <b>%s</b>.
@@ -115,7 +116,7 @@ ErrorNoActivatedBarcode=Δεν ενεργοποιείται τύπου barcode
 ErrUnzipFails=Failed to unzip %s with ZipArchive
 ErrNoZipEngine=No engine to unzip %s file in this PHP
 ErrorFileMustBeADolibarrPackage=The file %s must be a Dolibarr zip package
-ErrorFileRequired=It takes a package Dolibarr file
+ErrorModuleFileRequired=You must select a Dolibarr module package file
 ErrorPhpCurlNotInstalled=The PHP CURL is not installed, this is essential to talk with 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
@@ -181,6 +182,8 @@ ErrorBankStatementNameMustFollowRegex=Error, bank statement name must follow the
 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>
 
 # 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.
diff --git a/htdocs/langs/el_GR/holiday.lang b/htdocs/langs/el_GR/holiday.lang
index 6666499ee6b..9b8b1d8d848 100644
--- a/htdocs/langs/el_GR/holiday.lang
+++ b/htdocs/langs/el_GR/holiday.lang
@@ -76,8 +76,9 @@ BoxTitleLastLeaveRequests=Latest %s modified leave requests
 HolidaysMonthlyUpdate=Μηνιαία ενημέρωση
 ManualUpdate=Χειροκίνητη ενημέρωση
 HolidaysCancelation=Αφήστε το αίτημα ακύρωσης
-EmployeeLastname=Employee lastname
-EmployeeFirstname=Employee firstname
+EmployeeLastname=Employee last name
+EmployeeFirstname=Employee first name
+TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
 
 ## Configuration du Module ##
 LastUpdateCP=Latest automatic update of leaves allocation
diff --git a/htdocs/langs/el_GR/install.lang b/htdocs/langs/el_GR/install.lang
index 558175ba792..49b7e5c34f5 100644
--- a/htdocs/langs/el_GR/install.lang
+++ b/htdocs/langs/el_GR/install.lang
@@ -4,12 +4,12 @@ MiscellaneousChecks=Ελέγχος Προαπαιτούμενων
 ConfFileExists=Το αρχείο ρυθμίσεων <b>%s</b> υπάρχει.
 ConfFileDoesNotExistsAndCouldNotBeCreated=Το αρχείο ρυθμίσεων <b>%s</b> δεν υπάρχει και δεν μπορεί να δημιουργηθεί!
 ConfFileCouldBeCreated=Το αρχείο ρυθμίσεων <b>%s</b>θα μπορούσε να δημιουργηθεί.
-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=Το αρχείο ρυθμίσεων <b>%s</b> δεν είναι εγγράψιμο. Ελέγξτε τις άδειες. Για πρώτη εγκατάσταση, ο web server σας θα πρέπει να έχει άδεια για να μπορεί να εγγράφει σε αυτό το αρχείο κατά την διάρκεια της διαδικασίας ρύθμισης. (Π.χ. "chmod 666" σε ένα ΛΣ τύπου Unix).
 ConfFileIsWritable=Το αρχείο ρυθμίσεων <b>%s</b> είναι εγγράψιμο.
 ConfFileReload=Φορτώσετε εκ νέου όλες τις πληροφορίες από το αρχείο ρυθμίσεων.
 PHPSupportSessions=Η PHP υποστηρίζει συνεδρίες.
 PHPSupportPOSTGETOk=Η PHP υποστηρίζει μεταβλητές POST και 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.
+PHPSupportPOSTGETKo=Είναι πιθανόν ότι οι ρυθμίσεις σας PHP δεν υποστηρίζουν τις μεταβλητές POST και/ή GET. Ελέγξτε την παράμετρο <b>variables_order</b> στο php.ini.
 PHPSupportGD=This PHP support GD graphical functions.
 PHPSupportCurl=Η php υποστηρίζει Curl
 PHPSupportUTF8=Αυτή η PHP υποστηρίζει UTF8 λειτουργίες.
@@ -175,7 +175,7 @@ MigrationReopeningContracts=Open contract closed by error
 MigrationReopenThisContract=Reopen contract %s
 MigrationReopenedContractsNumber=%s contracts modified
 MigrationReopeningContractsNothingToUpdate=No closed contract to open
-MigrationBankTransfertsUpdate=Update links between bank entry and a bank transfer
+MigrationBankTransfertsUpdate=Ενημέρωση συνδέσμων μεταξύ τραπεζικής εισαγωγής και τραπεζικής μεταφοράς
 MigrationBankTransfertsNothingToUpdate=All links are up to date
 MigrationShipmentOrderMatching=Sendings receipt update
 MigrationDeliveryOrderMatching=Delivery receipt update
diff --git a/htdocs/langs/el_GR/ldap.lang b/htdocs/langs/el_GR/ldap.lang
index f84ed504d55..a87209e1230 100644
--- a/htdocs/langs/el_GR/ldap.lang
+++ b/htdocs/langs/el_GR/ldap.lang
@@ -13,8 +13,8 @@ LDAPUsers=Οι χρήστες στην βάση δεδομένων LDAP
 LDAPFieldStatus=Κατάσταση
 LDAPFieldFirstSubscriptionDate=Πρώτη ημερομηνία εγγραφής
 LDAPFieldFirstSubscriptionAmount=Πρώτο ποσό εγγραφής
-LDAPFieldLastSubscriptionDate=Τελευταία ημερομηνία εγγραφής
-LDAPFieldLastSubscriptionAmount=Τελευταίο ποσό συνδρομής
+LDAPFieldLastSubscriptionDate=Latest subscription date
+LDAPFieldLastSubscriptionAmount=Latest subscription amount
 LDAPFieldSkype=Skype id
 LDAPFieldSkypeExample=Example : skypeName
 UserSynchronized=Συγχρονισμένος χρήστης
diff --git a/htdocs/langs/el_GR/mails.lang b/htdocs/langs/el_GR/mails.lang
index 418094e563c..0baf9be0051 100644
--- a/htdocs/langs/el_GR/mails.lang
+++ b/htdocs/langs/el_GR/mails.lang
@@ -35,7 +35,7 @@ MailingStatusSentPartialy=Στάλθηκε μερικώς
 MailingStatusSentCompletely=Στάλθηκε πλήρως
 MailingStatusError=Σφάλμα
 MailingStatusNotSent=Δεν στάλθηκε
-MailSuccessfulySent=Email successfully sent (from %s to %s)
+MailSuccessfulySent=Email successfully accepted for delivery (from %s to %s)
 MailingSuccessfullyValidated=Το Ηλεκτρονικό ταχυδρομείο επικυρωθίκε με επιτυχία
 MailUnsubcribe=Διαγραφή
 MailingStatusNotContact=Μην επιτρέπετε την επαφή πια
@@ -59,7 +59,7 @@ CloneEMailing=Clone Emailing
 ConfirmCloneEMailing=Are you sure you want to clone this emailing?
 CloneContent=Clone message
 CloneReceivers=Cloner recipients
-DateLastSend=Date of latest sending
+DateLastSend=Ημερομηνία τελευταίας αποστολής
 DateSending=Date sending
 SentTo=Sent to <b>%s</b>
 MailingStatusRead=Ανάγνωση
@@ -74,22 +74,28 @@ ResultOfMailSending=Result of mass EMail sending
 NbSelected=Αρ. επιλεγμένων
 NbIgnored=Nb ignored
 NbSent=Αρ. απεσταλμένων
+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
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Σειρά %s στο αρχείο
 RecipientSelectionModules=Ορίζονται αιτήματα για την επιλογή του παραλήπτη
 MailSelectedRecipients=Επιλεγμένοι αποδέκτες
 MailingArea=Emailings περιοχή
-LastMailings=Last %s emailings
+LastMailings=Latest %s emailings
 TargetsStatistics=Στατιστικά στοχων
 NbOfCompaniesContacts=Μοναδικές επαφές/διευθύνσεις
 MailNoChangePossible=Παραλήπτες με επικυρωμένες ηλεκτρονικές διευθύνσεις δεν μπορούν να αλλάξουν
 SearchAMailing=Αναζήτηση Ταχυδρομείου
 SendMailing=Αποστολή ηλεκτρονικού ταχυδρομείου
 SendMail=Αποστολή email
-MailingNeedCommand=Για λόγους ασφαλείας, αποστολή ηλεκτρονικού ταχυδρομείου είναι καλύτερη όταν γίνεται από την γραμμή εντολών. Εάν έχετε ένα, ζητήστε από το διαχειριστή του διακομιστή σας για να ξεκινήσει την ακόλουθη εντολή για να στείλετε το ηλεκτρονικό ταχυδρομείο σε όλους τους παραλήπτες:
+SentBy=Στάλθηκε από
+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=Μπορείτε, ωστόσο, να τους στείλετε σε απευθείας σύνδεση με την προσθήκη της παραμέτρου MAILING_LIMIT_SENDBYWEB με την αξία του μέγιστου αριθμού των μηνυμάτων ηλεκτρονικού ταχυδρομείου που θέλετε να στείλετε από τη συνεδρία. Για το σκοπό αυτό, πηγαίνετε στο Αρχική - Ρυθμίσεις - Άλλες Ρυθμίσεις.
-ConfirmSendingEmailing=If you can't or prefer sending them with your www browser, please confirm you are sure you want to send emailing now from your browser?
+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=Σημείωση: Η αποστολή μηνυμάτων ηλεκτρονικού ταχυδρομείου από διαδικτυακή διεπαφή γίνεται αρκετές φορές για λόγους ασφαλείας και τη λήξη χρόνου, <b>%s</b> παραλήπτες ταυτόχρονα για κάθε συνεδρία αποστολής.
 TargetsReset=Εκκαθάριση λίστας
 ToClearAllRecipientsClickHere=Κάντε κλικ εδώ για να καταργήσετε τη λίστα παραληπτών για αυτό το ηλεκτρονικό ταχυδρομείο
@@ -124,8 +130,8 @@ MailAdvTargetRecipients=Recipients (advanced selection)
 AdvTgtTitle=Fill input fields to preselect the thirdparties 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
-AdvTgtMinVal=Minimum value
-AdvTgtMaxVal=Maximum value
+AdvTgtMinVal=Ελάχιστη τιμή
+AdvTgtMaxVal=Μέγιστη τιμή
 AdvTgtSearchDtHelp=Use interval to select date value
 AdvTgtStartDt=Start dt.
 AdvTgtEndDt=End dt.
@@ -144,3 +150,6 @@ AdvTgtCreateFilter=Create filter
 AdvTgtOrCreateNewFilter=Name of new filter
 NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
+OutGoingEmailSetup=Outgoing email setup
+InGoingEmailSetup=Incoming email setup
+
diff --git a/htdocs/langs/el_GR/main.lang b/htdocs/langs/el_GR/main.lang
index 9dbe326df22..9119eed919c 100644
--- a/htdocs/langs/el_GR/main.lang
+++ b/htdocs/langs/el_GR/main.lang
@@ -69,6 +69,7 @@ SetDate=Ορισμός ημερομηνίας
 SelectDate=Επιλέξτε μια ημερομηνία
 SeeAlso=Δείτε επίσης %s
 SeeHere=Δείτε εδώ
+Apply=Εφαρμογή
 BackgroundColorByDefault=Προκαθορισμένο χρώμα φόντου
 FileRenamed=Το αρχείο μετονομάστηκε με επιτυχία
 FileUploaded=Το αρχείο ανέβηκε με επιτυχία
@@ -87,7 +88,7 @@ Undefined=Ακαθόριστο
 PasswordForgotten=Έχετε ξεχάσει τον κωδικό πρόσβασής σας;
 SeeAbove=Δείτε παραπάνω
 HomeArea=Αρχική
-LastConnexion=Τελευταία Σύνδεση
+LastConnexion=Latest connection
 PreviousConnexion=Προηγούμενη Σύνδεση
 PreviousValue=Προηγούμενη τιμή
 ConnectedOnMultiCompany=Σύνδεση στην οντότητα
@@ -237,7 +238,7 @@ DateCreation=Ημερομηνία Δημιουργίας
 DateCreationShort=Ημερομηνία δημιουργίας
 DateModification=Ημερομηνία Τροποποίησης
 DateModificationShort=Ημερ. Τροπ.
-DateLastModification=Τελευτ. Τροπ
+DateLastModification=Latest modification date
 DateValidation=Ημερομηνία Επικύρωσης
 DateClosing=Ημερομηνία Κλεισίματος
 DateDue=Καταληκτική Ημερομηνία
@@ -433,7 +434,7 @@ Reportings=Αναφορές
 Draft=Προσχέδιο
 Drafts=Προσχέδια
 Validated=Επικυρωμένο
-Opened=Ανοιχτό
+Opened=Ανοίξτε
 New=Νέο
 Discount=Έκπτωση
 Unknown=Άγνωστο
@@ -599,6 +600,8 @@ SessionName=Όνομα συνόδου
 Method=Μέθοδος
 Receive=Παραλαβή
 CompleteOrNoMoreReceptionExpected=Ολοκληρώθηκε ή δεν αναμένετε κάτι περισσότερο
+ExpectedValue=Expected Value
+CurrentValue=Τρέχουσα Τιμή
 PartialWoman=Μερική
 TotalWoman=Συνολικές
 NeverReceived=Δεν παραλήφθηκε
@@ -756,6 +759,7 @@ SomeTranslationAreUncomplete=Some languages may be partially translated or may c
 DirectDownloadLink=Direct download link
 Download=Download
 ActualizeCurrency=Update currency rate
+Fiscalyear=Οικονομικό έτος
 # Week day
 Monday=Δευτέρα
 Tuesday=Τρίτη
@@ -812,3 +816,5 @@ SearchIntoContracts=Συμβόλαια
 SearchIntoCustomerShipments=Αποστολές Πελάτη
 SearchIntoExpenseReports=Αναφορές εξόδων
 SearchIntoLeaves=Άδειες
+
+BulkActions=Bulk actions
diff --git a/htdocs/langs/el_GR/members.lang b/htdocs/langs/el_GR/members.lang
index 6f4c74e1265..217c92300d7 100644
--- a/htdocs/langs/el_GR/members.lang
+++ b/htdocs/langs/el_GR/members.lang
@@ -45,7 +45,7 @@ MemberStatusDraft=Draft (needs to be validated)
 MemberStatusDraftShort=Προσχέδιο
 MemberStatusActive=Validated (waiting subscription)
 MemberStatusActiveShort=Επικυρωμένη
-MemberStatusActiveLate=Ληγμένη συνδρομή
+MemberStatusActiveLate=Subscription expired
 MemberStatusActiveLateShort=Ληγμένη
 MemberStatusPaid=Ενεργή συνδρομή
 MemberStatusPaidShort=Ενεργή
@@ -136,8 +136,8 @@ DocForAllMembersCards=Generate business cards for all members (Format for output
 DocForOneMemberCards=Generate business cards for a particular member (Format for output actually setup: <b>%s</b>)
 DocForLabels=Generate address sheets (Format for output actually setup: <b>%s</b>)
 SubscriptionPayment=Subscription payment
-LastSubscriptionDate=Τελευταία ημερομηνία εγγραφής
-LastSubscriptionAmount=Τελευταία ποσό συνδρομής
+LastSubscriptionDate=Latest subscription date
+LastSubscriptionAmount=Latest subscription amount
 MembersStatisticsByCountries=Μέλη στατιστικές ανά χώρα
 MembersStatisticsByState=Τα μέλη στατιστικών στοιχείων από πολιτεία / επαρχία
 MembersStatisticsByTown=Τα μέλη στατιστικών στοιχείων από την πόλη
@@ -149,7 +149,7 @@ MembersByStateDesc=Αυτή η οθόνη σας δείξει στατιστικ
 MembersByTownDesc=Αυτή η οθόνη σας δείξει στατιστικά στοιχεία σχετικά με τα μέλη από την πόλη.
 MembersStatisticsDesc=Επιλέξτε στατιστικά στοιχεία που θέλετε να διαβάσετε ...
 MenuMembersStats=Στατιστικά
-LastMemberDate=Τελευταία ημερομηνία μέλος
+LastMemberDate=Latest member date
 Nature=Φύση
 Public=Δημόσιο
 NewMemberbyWeb=Νέο μέλος πρόσθεσε. Εν αναμονή έγκρισης
diff --git a/htdocs/langs/el_GR/orders.lang b/htdocs/langs/el_GR/orders.lang
index 78e31979762..dace308f76f 100644
--- a/htdocs/langs/el_GR/orders.lang
+++ b/htdocs/langs/el_GR/orders.lang
@@ -39,7 +39,7 @@ StatusOrderRefusedShort=Αρνήθηκε
 StatusOrderBilledShort=Χρεώνεται
 StatusOrderToProcessShort=Προς επεξεργασία
 StatusOrderReceivedPartiallyShort=Λήφθηκε μερικώς
-StatusOrderReceivedAllShort=Λήφθηκε πλήρως
+StatusOrderReceivedAllShort=Products received
 StatusOrderCanceled=Ακυρωμένη
 StatusOrderDraft=Προσχέδιο (χρειάζεται επικύρωση)
 StatusOrderValidated=Επικυρωμένη
@@ -51,7 +51,7 @@ StatusOrderApproved=Εγγεκριμένη
 StatusOrderRefused=Αρνήθηκε
 StatusOrderBilled=Χρεώνεται
 StatusOrderReceivedPartially=Λήφθηκε μερικώς
-StatusOrderReceivedAll=Λήφθηκε πλήρως
+StatusOrderReceivedAll=All products received
 ShippingExist=Μια αποστολή, υπάρχει
 QtyOrdered=Qty ordered
 ProductQtyInDraft=Ποσότητα του προϊόντος στην πρόχειρη παραγγελία
diff --git a/htdocs/langs/el_GR/other.lang b/htdocs/langs/el_GR/other.lang
index 1fdcd5d1874..083a67112da 100644
--- a/htdocs/langs/el_GR/other.lang
+++ b/htdocs/langs/el_GR/other.lang
@@ -68,14 +68,15 @@ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nΕδώ θα βρ
 PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nΕδώ θα βρείτε την αποστολή __SHIPPINGREF__\n\n__PERSONALIZED__Με εκτίμηση\n\n__SIGNATURE__
 PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nΕδώ θα βρείτε την παρέμβαση __FICHINTERREF__\n\n__PERSONALIZED__Με εκτίμηση\n\n__SIGNATURE__
 PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n__PERSONALIZED__\n\n__SIGNATURE__
-DemoDesc=Dolibarr is a compact ERP/CRM supporting several functional modules. A demo showcasing all modules makes no sense as this scenario never occurs. So, several demo profiles are available.
+DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
+ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
 DemoFundation=Διαχειριστείτε τα μέλη του ιδρύματος
 DemoFundation2=Διαχειριστείτε τα μέλη και τον τραπεζικό λογαριασμό του ιδρύματος
-DemoCompanyServiceOnly=Διαχειριστείτε μια δραστηριότητα παροχής υπηρεσιών ελεύθερος πώλησης μόνο
+DemoCompanyServiceOnly=Company or freelance selling service only
 DemoCompanyShopWithCashDesk=Διαχειριστείτε το κατάστημα με ένα ταμείο
-DemoCompanyProductAndStocks=Διαχειριστείτε μια μικρή ή μεσαία επιχείρηση πώλησης προϊόντων
-DemoCompanyAll=Διαχειριστείτε μια μικρή ή μεσαία εταιρεία με πολλαπλές δραστηριότητες (όλες οι κύριες ενότητες)
+DemoCompanyProductAndStocks=Company selling products with a shop
+DemoCompanyAll=Company with multiple activities (all main modules)
 CreatedBy=Δημιουργήθηκε από %s
 ModifiedBy=Τροποποίηθηκε από %s
 ValidatedBy=Επικυρώθηκε από  %s
diff --git a/htdocs/langs/el_GR/products.lang b/htdocs/langs/el_GR/products.lang
index 398aee87ae9..1db4dbb0732 100644
--- a/htdocs/langs/el_GR/products.lang
+++ b/htdocs/langs/el_GR/products.lang
@@ -60,7 +60,7 @@ SellingPrice=Τιμή Πώλησης
 SellingPriceHT=Τιμή Πώλησης (χωρίς Φ.Π.Α.)
 SellingPriceTTC=Τιμή Πώλησης (με Φ.Π.Α)
 CostPriceDescription=This price (net of tax) can be used to store the average amount this product cost to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
-CostPriceUsage=In a future version, this value could be used for margin calculation.
+CostPriceUsage=This value could be used for margin calculation.
 SoldAmount=Sold amount
 PurchasedAmount=Purchased amount
 NewPrice=Νέα Τιμή
@@ -142,6 +142,7 @@ ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b>?
 CloneContentProduct=Κλώνος όλες τις κύριες πληροφορίες του προϊόντος / υπηρεσίας
 ClonePricesProduct=Κλώνος κύριες πληροφορίες και τιμές
 CloneCompositionProduct=Clone packaged product/service
+CloneCombinationsProduct=Clone product variants
 ProductIsUsed=Μεταχειρισμένο
 NewRefForClone=Ref. of new product/service
 SellingPrices=Τιμές Πώλησης
@@ -210,7 +211,7 @@ 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
+PricingRule=Κανόνες για τιμές πώλησης
 AddCustomerPrice=Προσθήκη τιμής ανά πελάτη
 ForceUpdateChildPriceSoc=Ορισμός ίδιας τιμής για τις θυγατρικές του πελάτη
 PriceByCustomerLog=Log of previous customer prices
@@ -238,7 +239,7 @@ GlobalVariables=Καθολικές μεταβλητές
 VariableToUpdate=Variable to update
 GlobalVariableUpdaters=Global variable updaters
 UpdateInterval=Update interval (minutes)
-LastUpdated=Τελευταία ενημέρωση
+LastUpdated=Latest update
 CorrectlyUpdated=Correctly updated
 PropalMergePdfProductActualFile=Αρχείο/α που θα προστεθούν στο AZUR pdf
 PropalMergePdfProductChooseFile=Επιλογή αρχείων pdf
@@ -258,4 +259,41 @@ VolumeUnits=Volume unit
 SizeUnits=Μονάδα μεγέθους
 DeleteProductBuyPrice=Delete buying price
 ConfirmDeleteProductBuyPrice=Are you sure you want to delete this buying price?
+SubProduct=Sub product
 
+#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
+ProductCombinations=Variants
+HideProductCombinations=Hide products variant in the products selector
+ProductCombination=Variant
+NewProductCombination=New variant
+EditProductCombination=Editing variant
+ProductCombinationGenerator=Variants generator
+Features=Features
+PriceImpact=Price impact
+WeightImpact=Weight impact
+NewProductAttribute=Νέο χαρακτηριστικό
+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
+PercentageVariation=Percentage variation
+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 child products
+ConfirmCloneProductCombinations=Would you like to copy all the product variant to the 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
diff --git a/htdocs/langs/el_GR/projects.lang b/htdocs/langs/el_GR/projects.lang
index fa060804ea2..183242493a1 100644
--- a/htdocs/langs/el_GR/projects.lang
+++ b/htdocs/langs/el_GR/projects.lang
@@ -30,8 +30,8 @@ DeleteATask=Διαγραφή Εργασίας
 ConfirmDeleteAProject=Are you sure you want to delete this project?
 ConfirmDeleteATask=Are you sure you want to delete this task?
 OpenedProjects=Ανοιχτά έργα
-OpenedTasks=Open tasks
-OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
+OpenedTasks=Opened tasks
+OpportunitiesStatusForOpenedProjects=Opportunities amount of opened projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=Εμφάνιση έργου
 SetProject=Set project
@@ -47,7 +47,7 @@ TaskTimeSpent=Ο χρόνος που δαπανάται σε εργασίες
 TaskTimeUser=Χρήστης
 TaskTimeNote=Σημείωση
 TaskTimeDate=Ημερομηνία
-TasksOnOpenedProject=Tasks on open projects
+TasksOnOpenedProject=Εργασίες σχετικές με τα ανοικτά έργα
 WorkloadNotDefined=Ο φόρτος εργασίας δεν ορίζεται
 NewTimeSpent=Νέος χρόνος που δαπανάται
 MyTimeSpent=Ο χρόνος μου πέρασε
@@ -58,6 +58,7 @@ TaskDateEnd=Ημερομηνία λήξης εργασιών
 TaskDescription=Περιγραφή των εργασιών
 NewTask=Νέα Εργασία
 AddTask=Δημιουργία εργασίας
+AddTimeSpent=Create time spent
 Activity=Δραστηριότητα
 Activities=Εργασίες/Δραστηριότητες
 MyActivities=Οι εργασίες/δραστηρ. μου
@@ -95,6 +96,7 @@ ValidateProject=Επικύρωση projet
 ConfirmValidateProject=Are you sure you want to validate this project?
 CloseAProject=Κλείσιμο έργου
 ConfirmCloseAProject=Are you sure you want to close this project?
+AlsoCloseAProject=Also close project (keep it open if you still need to follow production tasks on it)
 ReOpenAProject=Άνοιγμα έργου
 ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=Επαφές Project
@@ -120,7 +122,7 @@ CloneProjectFiles=Κλώνος έργου εντάχθηκαν αρχεία
 CloneTaskFiles=Ο κλώνος εργασία (ες) εντάχθηκαν αρχεία (εάν εργασία (ες) που κλωνοποιήθηκε)
 CloneMoveDate=Update project/tasks dates from now?
 ConfirmCloneProject=Are you sure to clone this project?
-ProjectReportDate=Change task date according project start date
+ProjectReportDate=Change task dates according to new project start date
 ErrorShiftTaskDate=Impossible to shift task date according to new project start date
 ProjectsAndTasksLines=Projects and tasks
 ProjectCreatedInDolibarr=Έργο %s δημιουργήθηκε
@@ -177,9 +179,9 @@ ProjectsStatistics=Statistics on projects/leads
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 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.
-OpenedProjectsByThirdparties=Open projects by thirdparties
+OpenedProjectsByThirdparties=Opened projects by thirdparties
 OnlyOpportunitiesShort=Μόνο ευκαιρίες
-OpenedOpportunitiesShort=Ανοιχτές ευαιρίες
+OpenedOpportunitiesShort=Opened opportunities
 NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount
diff --git a/htdocs/langs/el_GR/propal.lang b/htdocs/langs/el_GR/propal.lang
index a97c3305b12..69aeecce113 100644
--- a/htdocs/langs/el_GR/propal.lang
+++ b/htdocs/langs/el_GR/propal.lang
@@ -3,7 +3,7 @@ Proposals=Προσφορές
 Proposal=Προσφορά
 ProposalShort=Προσφορά
 ProposalsDraft=Σχέδιο Προσφοράς
-ProposalsOpened=Open commercial proposals
+ProposalsOpened=Άνοιγμα Προσφορών
 Prop=Προσφορές
 CommercialProposal=Προσφορά
 ProposalCard=Καρτέλα Προσφοράς
@@ -26,9 +26,9 @@ AmountOfProposalsByMonthHT=Ποσό ανά μήνα (μετά από φόρου
 NbOfProposals=Αριθμός Προσφορών
 ShowPropal=Εμφάνιση Προσφοράς
 PropalsDraft=Σχέδιο
-PropalsOpened=Άνοιγμα
+PropalsOpened=Ανοίξτε
 PropalStatusDraft=Προσχέδιο (χρειάζεται επικύρωση)
-PropalStatusValidated=Επικυρωμένη (η Προσφορά είναι ανοιχτή)
+PropalStatusValidated=Validated (proposal is opened)
 PropalStatusSigned=Υπογραφή (ανάγκες χρέωσης)
 PropalStatusNotSigned=Δεν έχει υπογραφεί (κλειστό)
 PropalStatusBilled=Χρεώνεται
diff --git a/htdocs/langs/el_GR/stocks.lang b/htdocs/langs/el_GR/stocks.lang
index 2af6fbd2538..8a8a964e2e7 100644
--- a/htdocs/langs/el_GR/stocks.lang
+++ b/htdocs/langs/el_GR/stocks.lang
@@ -22,13 +22,15 @@ Movements=Κινήματα
 ErrorWarehouseRefRequired=Αποθήκη όνομα αναφοράς απαιτείται
 ListOfWarehouses=Κατάλογος των αποθηκών
 ListOfStockMovements=Κατάλογος των κινήσεων των αποθεμάτων
+StockMovementForId=Movement ID %d
+ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Περιοχή αποθηκών
 Location=Τοποθεσία
 LocationSummary=Σύντομη τοποθεσία όνομα
 NumberOfDifferentProducts=Αριθμός διαφορετικών προϊόντων
 NumberOfProducts=Συνολικός αριθμός προϊόντων
-LastMovement=Τελευταία κίνηση
-LastMovements=Τελευταία κινήσεις
+LastMovement=Latest movement
+LastMovements=Latest movements
 Units=Μονάδες
 Unit=Μονάδα
 StockCorrection=Σωστή απόθεμα
diff --git a/htdocs/langs/el_GR/supplier_proposal.lang b/htdocs/langs/el_GR/supplier_proposal.lang
index 7589633a025..9402af3af18 100644
--- a/htdocs/langs/el_GR/supplier_proposal.lang
+++ b/htdocs/langs/el_GR/supplier_proposal.lang
@@ -8,7 +8,7 @@ SearchRequest=Αναζήτηση αιτήματος
 DraftRequests=Πρόχειρα αιτήματα
 SupplierProposalsDraft=Draft supplier proposals
 LastModifiedRequests=Τελευταίες %s τροποποιημένες αιτήσεις τιμών
-RequestsOpened=Ανοιχτές αιτήσεις τιμών
+RequestsOpened=Opened price requests
 SupplierProposalArea=Περιοχή προτάσεων προμηθευτών
 SupplierProposalShort=Πρόταση προμηθευτή
 SupplierProposals=Προσφορές προμηθευτών
@@ -23,7 +23,7 @@ ConfirmValidateAsk=Είστε σίγουροι ότι θέλετε να επικ
 DeleteAsk=Διαγραφή αίτησης
 ValidateAsk=Επικύρωση αίτησης
 SupplierProposalStatusDraft=Πρόχειρο (Χρειάζεται επικύρωση)
-SupplierProposalStatusValidated=Επικυρωμένη (η αίτηση είναι ανοικτή)
+SupplierProposalStatusValidated=Validated (request is opened)
 SupplierProposalStatusClosed=Κλειστό
 SupplierProposalStatusSigned=Αποδεκτή
 SupplierProposalStatusNotSigned=Απορρίφθηκε
diff --git a/htdocs/langs/el_GR/suppliers.lang b/htdocs/langs/el_GR/suppliers.lang
index 9738e553182..5c8e126090d 100644
--- a/htdocs/langs/el_GR/suppliers.lang
+++ b/htdocs/langs/el_GR/suppliers.lang
@@ -7,13 +7,13 @@ History=Ιστορικό
 ListOfSuppliers=Λίστα προμηθευτών
 ShowSupplier=Εμφάνιση προμηθευτή
 OrderDate=Ημερ. παραγγελίας
-BuyingPriceMin=Best buying price
-BuyingPriceMinShort=Best buying price
-TotalBuyingPriceMinShort=Total of subproducts buying prices
+BuyingPriceMin=Καλύτερη τιμή αγοράς
+BuyingPriceMinShort=Καλύτερη τιμή αγοράς
+TotalBuyingPriceMinShort=Σύνολο των υποπροϊόντων τιμές αγοράς
 TotalSellingPriceMinShort=Total of subproducts selling prices
 SomeSubProductHaveNoPrices=Ορισμένα υπο-προϊόντα δεν έχουν καμία τιμή που να ορίζεται
-AddSupplierPrice=Add buying price
-ChangeSupplierPrice=Change buying price
+AddSupplierPrice=Προσθήκη τιμής αγοράς
+ChangeSupplierPrice=Αλλαγή τιμής αγοράς
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=Ο προμηθευτής αναφοράς έχει ήδη συσχετιστεί με μια αναφορά: %s
 NoRecordedSuppliers=Δεν υπάρχουν προμηθευτές
 SupplierPayment=Πληρωμή προμηθευτή
@@ -24,10 +24,10 @@ ExportDataset_fournisseur_1=Λίστα τιμολογίων προμηθευτή
 ExportDataset_fournisseur_2=Τιμολόγια και πληρωμές προμηθευτή
 ExportDataset_fournisseur_3=Παραγγελίες σε προμηθευτές και σειρά γραμμών
 ApproveThisOrder=Έγκριση της παραγγελίας
-ConfirmApproveThisOrder=Είστε σίγουροι ότι θέλετε να εγκρίνετε την παραγγελία <b>%s</b> ;
+ConfirmApproveThisOrder=Είστε σίγουροι πως θέλετε να επικυρώσετε την παραγγελία <b>%s</b>;
 DenyingThisOrder=Απόρριψη παραγγελίας
-ConfirmDenyingThisOrder=Είστε σίγουροι ότι θέλετε να αρνηθείτε την παραγγελία <b>%s</b> ;
-ConfirmCancelThisOrder=Είστε σίγουροι ότι θέλετε να ακυρώσετε την παραγγελία <b>%s</b> ;
+ConfirmDenyingThisOrder=Είστε σίγουροι πως θέλετε να αρνηθήτε αυτή την παραγγελία <b>%s</b>;
+ConfirmCancelThisOrder=Είστε σίγουροι πως θέλετε να ακυρώσετε αυτή την παραγγελία <b>%s</b>;
 AddSupplierOrder=Δημιουργία παραγγελίας προμηθευτή
 AddSupplierInvoice=Δημιουργία τιμολογίου προμηθευτή
 ListOfSupplierProductForSupplier=Λίστα προϊόντων και τιμών του προμηθευτή <b>%s</b>
@@ -37,7 +37,8 @@ MenuOrdersSupplierToBill=Παραγγελίες προμηθευτών για τ
 NbDaysToDelivery=Καθυστέρηση παράδοσης σε ημέρες
 DescNbDaysToDelivery=Η μεγαλύτερη καθυστέρηση παραδόσεων των προϊόντων από αυτή τη παραγγελία
 SupplierReputation=Supplier reputation
-DoNotOrderThisProductToThisSupplier=Do not order
-NotTheGoodQualitySupplier=Wrong quality
+DoNotOrderThisProductToThisSupplier=Να μην γίνει παραγγελία
+NotTheGoodQualitySupplier=Λάθος ποσότητα
 ReputationForThisProduct=Reputation
-BuyerName=Buyer name
+BuyerName=Όνομα αγοραστή
+AllProductServicePrices=All product / service prices
diff --git a/htdocs/langs/el_GR/withdrawals.lang b/htdocs/langs/el_GR/withdrawals.lang
index 808a5ecb7c9..330c2540ee6 100644
--- a/htdocs/langs/el_GR/withdrawals.lang
+++ b/htdocs/langs/el_GR/withdrawals.lang
@@ -24,6 +24,7 @@ WithdrawStatistics=Direct debit payment statistics
 WithdrawRejectStatistics=Direct debit payment reject statistics
 LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
+WithdrawRequestsDone=%s direct debit payment requests recorded
 ThirdPartyBankCode=Τρίτο κόμμα τραπεζικός κωδικός
 NoInvoiceCouldBeWithdrawed=Δεν τιμολόγιο αποσύρθηκε με επιτυχία. Βεβαιωθείτε ότι το τιμολόγιο είναι για τις επιχειρήσεις με έγκυρη απαγόρευση.
 ClassCredited=Ταξινομήστε πιστώνεται
@@ -76,8 +77,8 @@ RUM=UMR
 RUMLong=Unique Mandate Reference
 RUMWillBeGenerated=UMR number will be generated once bank account information are saved
 WithdrawMode=Direct debit mode (FRST or RECUR)
-WithdrawRequestAmount=Withdraw request amount:
-WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil amount.
+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
diff --git a/htdocs/langs/en_AU/accountancy.lang b/htdocs/langs/en_AU/accountancy.lang
index 22f36b26563..527f1fd139d 100644
--- a/htdocs/langs/en_AU/accountancy.lang
+++ b/htdocs/langs/en_AU/accountancy.lang
@@ -1,2 +1,4 @@
 # Dolibarr language file - Source file is en_US - accountancy
-ProductsBinding=Products bindings
+AccountingCategory=Accounting category
+ErrorNoAccountingCategoryForThisCountry=No accounting category available for country %s (See Home - Setup - Dictionaries)
+WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
diff --git a/htdocs/langs/en_AU/admin.lang b/htdocs/langs/en_AU/admin.lang
index deb1bbf850b..31be2c5dff6 100644
--- a/htdocs/langs/en_AU/admin.lang
+++ b/htdocs/langs/en_AU/admin.lang
@@ -1,21 +1,36 @@
 # Dolibarr language file - Source file is en_US - admin
+FileCheckDesc=This tool allows you to check the integrity of files and setup of your application, comparing each files with the official ones. 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.
+FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified, removed or added.
 AntiVirusCommandExample=Example for ClamWin: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe<br>Example for ClamAv: /usr/bin/clamscan
 AntiVirusParamExample=Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
+ModulesMarketPlaces=Find external modules...
 OtherResources=Other resources
+ThisIsAlternativeProcessToFollow=This is an alternative setup to process manually:
+UnpackPackageInDolibarrRoot=Unpack the packaged files into server directory dedicated to Dolibarr: <b>%s</b>
+UnpackPackageInModulesRoot=To deploy/install an external module, unpack the packaged files into the server directory dedicated to modules: <b>%s</b>
+NotExistsDirect=The alternative root directory is not defined to an existing directory.<br>
+InfDirAlt=Since version 3, it is possible to define an alternative root directory. This allows you to store, into a dedicated directory, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
+InfDirExample=<br>Then declare it in the file <strong>conf.php</strong><br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>If these lines are commented with "#", to enable them, just uncomment by removing the "#" character.
 ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
 HideAnyVATInformationOnPDF=Hide all information related to GST on generated PDF
 OldVATRates=Old GST rate
 NewVATRates=New GST rate
+ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list :<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list :<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
+ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+Module0Desc=Users / Employees and Groups management
 DictionaryVAT=GST Rates or Sales Tax Rates
+DictionaryAccountancyCategory=Accounting categories
 VATManagement=GST Management
 VATIsNotUsedDesc=By default the proposed GST rate is 0 which can be used for cases like associations, individuals and small companies.
 LocalTax1IsUsedDesc=Use a second type of tax (other than GST)
 LocalTax1IsNotUsedDesc=Do not use other type of tax (other than GST)
 LocalTax2IsUsedDesc=Use a third type of tax (other than GST)
 LocalTax2IsNotUsedDesc=Do not use other type of tax (other than GST)
+AddExtensionThemeModuleOrOther=Deploy/install external module
 ConstDesc=This page allows you to edit all other parameters not available in previous pages. These are mostly reserved parameters for developers or advanced troubleshooting. For a list of options <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">check here</a>.
 OptionVatMode=GST due
 YourCompanyDoesNotUseVAT=Your company has been defined to not use GST (Home - Setup - Company/Foundation), so there is no GST options to setup.
-ApiProductionMode=Enable production mode (this will activate use of a caches for services management)
+ConfFileMuseContainCustom=Installing an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 TextTitleColor=Colour of page title
 LinkColor=Colour of links
diff --git a/htdocs/langs/en_AU/banks.lang b/htdocs/langs/en_AU/banks.lang
index 6de8dd5e677..3a409c94893 100644
--- a/htdocs/langs/en_AU/banks.lang
+++ b/htdocs/langs/en_AU/banks.lang
@@ -1,15 +1,10 @@
 # Dolibarr language file - Source file is en_US - banks
-ValidateCheckReceipt=Validate this cheque receipt ?
-ConfirmValidateCheckReceipt=Are you sure you want to validate this cheque receipt, no change will be possible once this is done ?
-DeleteCheckReceipt=Delete this cheque receipt ?
-ConfirmDeleteCheckReceipt=Are you sure you want to delete this cheque receipt ?
 BankChecks=Bank cheques
 ShowCheckReceipt=Show cheque deposit receipt
 NumberOfCheques=Nb of cheque
 FutureTransaction=Transaction in future. No way to conciliate.
 SelectChequeTransactionAndGenerate=Select/filter checks to include into the cheque deposit receipt and click on "Create".
 RejectCheck=Cheque returned
-ConfirmRejectCheck=Are you sure you want to mark this cheque as rejected ?
 RejectCheckDate=Date the cheque was returned
 CheckRejected=Cheque returned
 CheckRejectedAndInvoicesReopened=Cheque returned and invoices reopened
diff --git a/htdocs/langs/en_AU/bills.lang b/htdocs/langs/en_AU/bills.lang
index 05d48a95c5f..f7d30ca05d8 100644
--- a/htdocs/langs/en_AU/bills.lang
+++ b/htdocs/langs/en_AU/bills.lang
@@ -1,4 +1,6 @@
 # Dolibarr language file - Source file is en_US - bills
+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.
 PaymentTypeCHQ=Cheque
 PaymentTypeShortCHQ=Cheque
 BankCode=BSB
@@ -18,3 +20,4 @@ ChequesArea=Cheque deposits area
 ChequeDeposits=Cheque deposits
 Cheques=Cheques
 NbCheque=Number of cheques
+CreditNoteConvertedIntoDiscount=This %s has been converted into %s
diff --git a/htdocs/langs/en_AU/compta.lang b/htdocs/langs/en_AU/compta.lang
index c1d0e756193..92e9fc2d0ec 100644
--- a/htdocs/langs/en_AU/compta.lang
+++ b/htdocs/langs/en_AU/compta.lang
@@ -8,7 +8,6 @@ VATSummary=GST balance
 VATPaid=GST paid
 VATCollected=GST to collect
 PaymentVat=GST payment
-VATRefund=Sales tax refund Refund
 ShowVatPayment=Show GST payment
 CheckReceipt=Cheque deposit
 CheckReceiptShort=Cheque deposit
diff --git a/htdocs/langs/en_AU/mails.lang b/htdocs/langs/en_AU/mails.lang
deleted file mode 100644
index 455190c8587..00000000000
--- a/htdocs/langs/en_AU/mails.lang
+++ /dev/null
@@ -1,4 +0,0 @@
-# Dolibarr language file - Source file is en_US - mails
-MailSuccessfulySent=Email successfully sent (from %s to %s)
-MailingNeedCommand=For security reason, sending an emailing is better when performed from command line. If you have one, ask your server administrator to launch the following command to send the emailing to all recipients:
-ConfirmSendingEmailing=If you can't or prefer sending them with your www browser, please confirm you are sure you want to send emailing now from your browser?
diff --git a/htdocs/langs/en_AU/members.lang b/htdocs/langs/en_AU/members.lang
deleted file mode 100644
index fcd4f3eb8d7..00000000000
--- a/htdocs/langs/en_AU/members.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - members
-MemberStatusActiveLate=subscription expired
diff --git a/htdocs/langs/en_AU/orders.lang b/htdocs/langs/en_AU/orders.lang
deleted file mode 100644
index f719db62ca8..00000000000
--- a/htdocs/langs/en_AU/orders.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - orders
-StatusOrderReceivedAllShort=Everything received
-StatusOrderReceivedAll=Everything received
diff --git a/htdocs/langs/en_AU/withdrawals.lang b/htdocs/langs/en_AU/withdrawals.lang
index ebcabe21448..503597bc8ec 100644
--- a/htdocs/langs/en_AU/withdrawals.lang
+++ b/htdocs/langs/en_AU/withdrawals.lang
@@ -1,3 +1,2 @@
 # Dolibarr language file - Source file is en_US - withdrawals
 ThirdPartyBankCode=Third party bank code or BSB
-DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Withdrawal 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.
diff --git a/htdocs/langs/en_CA/accountancy.lang b/htdocs/langs/en_CA/accountancy.lang
index 22f36b26563..527f1fd139d 100644
--- a/htdocs/langs/en_CA/accountancy.lang
+++ b/htdocs/langs/en_CA/accountancy.lang
@@ -1,2 +1,4 @@
 # Dolibarr language file - Source file is en_US - accountancy
-ProductsBinding=Products bindings
+AccountingCategory=Accounting category
+ErrorNoAccountingCategoryForThisCountry=No accounting category available for country %s (See Home - Setup - Dictionaries)
+WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
diff --git a/htdocs/langs/en_CA/admin.lang b/htdocs/langs/en_CA/admin.lang
index 906ae2d1f12..cab5d65c3be 100644
--- a/htdocs/langs/en_CA/admin.lang
+++ b/htdocs/langs/en_CA/admin.lang
@@ -1,11 +1,26 @@
 # Dolibarr language file - Source file is en_US - admin
+FileCheckDesc=This tool allows you to check the integrity of files and setup of your application, comparing each files with the official ones. 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.
+FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified, removed or added.
 AntiVirusCommandExample=Example for ClamWin: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe<br>Example for ClamAv: /usr/bin/clamscan
 AntiVirusParamExample=Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
+ModulesMarketPlaces=Find external modules...
+ThisIsAlternativeProcessToFollow=This is an alternative setup to process manually:
+UnpackPackageInDolibarrRoot=Unpack the packaged files into server directory dedicated to Dolibarr: <b>%s</b>
+UnpackPackageInModulesRoot=To deploy/install an external module, unpack the packaged files into the server directory dedicated to modules: <b>%s</b>
+NotExistsDirect=The alternative root directory is not defined to an existing directory.<br>
+InfDirAlt=Since version 3, it is possible to define an alternative root directory. This allows you to store, into a dedicated directory, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
+InfDirExample=<br>Then declare it in the file <strong>conf.php</strong><br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>If these lines are commented with "#", to enable them, just uncomment by removing the "#" character.
 ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
+ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list :<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list :<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
+ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+Module0Desc=Users / Employees and Groups management
+DictionaryAccountancyCategory=Accounting categories
 VATManagement=GST Management
 LocalTax1IsUsedDesc=Use a second tax (PST)
 LocalTax1IsNotUsedDesc=Do not use second tax (PST)
 LocalTax1Management=PST Management
 LocalTax2IsNotUsedDesc=Do not use second tax (PST)
+AddExtensionThemeModuleOrOther=Deploy/install external module
 ConstDesc=This page allows you to edit all other parameters not available in previous pages. These are mostly reserved parameters for developers or advanced troubleshooting. For a list of options <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">check here</a>.
-ApiProductionMode=Enable production mode (this will activate use of a caches for services management)
+ConfFileMuseContainCustom=Installing an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
diff --git a/htdocs/langs/en_CA/compta.lang b/htdocs/langs/en_CA/compta.lang
deleted file mode 100644
index 4d40c57399f..00000000000
--- a/htdocs/langs/en_CA/compta.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - compta
-VATRefund=Sales tax refund Refund
diff --git a/htdocs/langs/en_CA/mails.lang b/htdocs/langs/en_CA/mails.lang
deleted file mode 100644
index 455190c8587..00000000000
--- a/htdocs/langs/en_CA/mails.lang
+++ /dev/null
@@ -1,4 +0,0 @@
-# Dolibarr language file - Source file is en_US - mails
-MailSuccessfulySent=Email successfully sent (from %s to %s)
-MailingNeedCommand=For security reason, sending an emailing is better when performed from command line. If you have one, ask your server administrator to launch the following command to send the emailing to all recipients:
-ConfirmSendingEmailing=If you can't or prefer sending them with your www browser, please confirm you are sure you want to send emailing now from your browser?
diff --git a/htdocs/langs/en_CA/members.lang b/htdocs/langs/en_CA/members.lang
deleted file mode 100644
index fcd4f3eb8d7..00000000000
--- a/htdocs/langs/en_CA/members.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - members
-MemberStatusActiveLate=subscription expired
diff --git a/htdocs/langs/en_CA/orders.lang b/htdocs/langs/en_CA/orders.lang
deleted file mode 100644
index f719db62ca8..00000000000
--- a/htdocs/langs/en_CA/orders.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - orders
-StatusOrderReceivedAllShort=Everything received
-StatusOrderReceivedAll=Everything received
diff --git a/htdocs/langs/en_CA/withdrawals.lang b/htdocs/langs/en_CA/withdrawals.lang
deleted file mode 100644
index a6f0f06fc82..00000000000
--- a/htdocs/langs/en_CA/withdrawals.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - withdrawals
-DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Withdrawal 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.
diff --git a/htdocs/langs/en_GB/accountancy.lang b/htdocs/langs/en_GB/accountancy.lang
index 22f36b26563..527f1fd139d 100644
--- a/htdocs/langs/en_GB/accountancy.lang
+++ b/htdocs/langs/en_GB/accountancy.lang
@@ -1,2 +1,4 @@
 # Dolibarr language file - Source file is en_US - accountancy
-ProductsBinding=Products bindings
+AccountingCategory=Accounting category
+ErrorNoAccountingCategoryForThisCountry=No accounting category available for country %s (See Home - Setup - Dictionaries)
+WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
diff --git a/htdocs/langs/en_GB/admin.lang b/htdocs/langs/en_GB/admin.lang
index 7a6593be237..cd792090ba7 100644
--- a/htdocs/langs/en_GB/admin.lang
+++ b/htdocs/langs/en_GB/admin.lang
@@ -2,6 +2,8 @@
 Foundation=Company
 VersionProgram=Program Version
 VersionLastInstall=Version Initially Installed
+FileCheckDesc=This tool allows you to check the integrity of files and setup of your application, comparing each files with the official ones. 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.
+FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified, removed or added.
 SessionSavePath=Storage session localisation
 PurgeSessions=Purge sessions
 NoSessionListWithThisHandler=The Saved session handler configured in your PHP does not allow listing of all running sessions.
@@ -31,11 +33,24 @@ ImportMySqlDesc=To import a backup file, you must use the mysql command from the
 ImportPostgreSqlDesc=To import a backup file, you must use the pg_restore command from the command line:
 FileNameToGenerate=File name to be generated\n
 CommandsToDisableForeignKeysForImportWarning=This is mandatory if you want to restore your sql dumps later
+ModulesMarketPlaces=Find external modules...
+ThisIsAlternativeProcessToFollow=This is an alternative setup to process manually:
+UnpackPackageInDolibarrRoot=Unpack the packaged files into server directory dedicated to Dolibarr: <b>%s</b>
+UnpackPackageInModulesRoot=To deploy/install an external module, unpack the packaged files into the server directory dedicated to modules: <b>%s</b>
+NotExistsDirect=The alternative root directory is not defined to an existing directory.<br>
+InfDirAlt=Since version 3, it is possible to define an alternative root directory. This allows you to store, into a dedicated directory, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
+InfDirExample=<br>Then declare it in the file <strong>conf.php</strong><br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>If these lines are commented with "#", to enable them, just uncomment by removing the "#" character.
 ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
+ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list :<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list :<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
+ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+Module0Desc=Users / Employees and Groups management
 Permission300=Read barcodes
 Permission301=Create/modify barcodes
 Permission302=Delete barcodes
+DictionaryAccountancyCategory=Accounting categories
+AddExtensionThemeModuleOrOther=Deploy/install external module
 ConstDesc=This page allows you to edit all other parameters not available in previous pages. These are mostly reserved parameters for developers or advanced troubleshooting. For a list of options <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">check here</a>.
 GenbarcodeLocation=Barcode generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".<br>For example: /usr/local/bin/genbarcode
-ApiProductionMode=Enable production mode (this will activate use of a caches for services management)
+ConfFileMuseContainCustom=Installing an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 ToGenerateCodeDefineAutomaticRuleFirst=To be able to automatically generate codes, you must first set a rule to define the barcode number.
diff --git a/htdocs/langs/en_GB/banks.lang b/htdocs/langs/en_GB/banks.lang
index 38ce1953eeb..6bc449c5864 100644
--- a/htdocs/langs/en_GB/banks.lang
+++ b/htdocs/langs/en_GB/banks.lang
@@ -1,15 +1,9 @@
 # Dolibarr language file - Source file is en_US - banks
 RIBControlError=Integrity check of values fails. This means the account details are incomplete or wrong (check country, numbers and IBAN).
-RemoveFromRubriqueConfirm=Are you sure you want to remove link between the transaction and the category?
 CheckTransmitter=Drawer
-ValidateCheckReceipt=Validate this cheque receipt?
-ConfirmValidateCheckReceipt=Are you sure you want to validate this cheque receipt? No change will be possible once this is done.
-DeleteCheckReceipt=Delete this cheque receipt?
-ConfirmDeleteCheckReceipt=Are you sure you want to delete this cheque receipt?
 BankChecks=Bank cheques
 ShowCheckReceipt=Show cheque deposit receipt
 NumberOfCheques=No. of cheques
-ConfirmDeleteTransaction=Are you sure you want to delete this transaction?
 FutureTransaction=Transaction in future: cannot be reconciled
 SelectChequeTransactionAndGenerate=Select/filter cheques to include in the cheque deposit receipt, then click "Create".
 InputReceiptNumber=Identify the bank statement to reconcile. Use a sortable numeric value: YYYYMM or YYYYMMDD
@@ -20,9 +14,7 @@ AllRIB=All bank accounts
 LabelRIB=Bank account Label
 NoBANRecord=No bank account record
 DeleteARib=Delete bank account record
-ConfirmDeleteRib=Are you sure you want to delete this bank account record?
 RejectCheck=Cheque returned
-ConfirmRejectCheck=Are you sure you want to mark this cheque as rejected?
 RejectCheckDate=Date the cheque was returned
 CheckRejected=Cheque returned
 CheckRejectedAndInvoicesReopened=Cheque returned and invoices reopened
diff --git a/htdocs/langs/en_GB/bills.lang b/htdocs/langs/en_GB/bills.lang
index d89326427cb..8ab8c428de3 100644
--- a/htdocs/langs/en_GB/bills.lang
+++ b/htdocs/langs/en_GB/bills.lang
@@ -1,5 +1,7 @@
 # Dolibarr language file - Source file is en_US - bills
 InvoiceReplacementDesc=<b>Replacement invoice</b> is used to cancel and replace completely an invoice with no payment already received.<br><br>Note: Only an invoice with no payment on it can be replaced. If the invoice you replace is not yet closed, it will be automatically closed to 'abandoned'.
+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.
 ErrorVATIntraNotConfigured=Intracommunitary VAT number not yet defined
 EscompteOffered=Dscnt.offered (pay.befor.term)
 PaymentTypeCHQ=Cheque
@@ -20,3 +22,4 @@ ChequesArea=Cheque deposits area
 ChequeDeposits=Cheque deposits
 Cheques=Cheques
 NbCheque=Number of cheques
+CreditNoteConvertedIntoDiscount=This %s has been converted into %s
diff --git a/htdocs/langs/en_GB/companies.lang b/htdocs/langs/en_GB/companies.lang
index 5c10101a1e1..db4c81a57bd 100644
--- a/htdocs/langs/en_GB/companies.lang
+++ b/htdocs/langs/en_GB/companies.lang
@@ -1,4 +1,3 @@
 # Dolibarr language file - Source file is en_US - companies
 Zip=Postcode
 Gencod=Barcode
-VATIntraCheck=Cheque
diff --git a/htdocs/langs/en_GB/compta.lang b/htdocs/langs/en_GB/compta.lang
index 8681d54e176..48f980f4449 100644
--- a/htdocs/langs/en_GB/compta.lang
+++ b/htdocs/langs/en_GB/compta.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - compta
-VATRefund=Sales tax refund Refund
 CheckReceipt=Cheque deposit
 CheckReceiptShort=Cheque deposit
 NewCheckDeposit=New cheque deposit
diff --git a/htdocs/langs/en_GB/mails.lang b/htdocs/langs/en_GB/mails.lang
deleted file mode 100644
index 455190c8587..00000000000
--- a/htdocs/langs/en_GB/mails.lang
+++ /dev/null
@@ -1,4 +0,0 @@
-# Dolibarr language file - Source file is en_US - mails
-MailSuccessfulySent=Email successfully sent (from %s to %s)
-MailingNeedCommand=For security reason, sending an emailing is better when performed from command line. If you have one, ask your server administrator to launch the following command to send the emailing to all recipients:
-ConfirmSendingEmailing=If you can't or prefer sending them with your www browser, please confirm you are sure you want to send emailing now from your browser?
diff --git a/htdocs/langs/en_GB/members.lang b/htdocs/langs/en_GB/members.lang
deleted file mode 100644
index fcd4f3eb8d7..00000000000
--- a/htdocs/langs/en_GB/members.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - members
-MemberStatusActiveLate=subscription expired
diff --git a/htdocs/langs/en_GB/withdrawals.lang b/htdocs/langs/en_GB/withdrawals.lang
index a6f0f06fc82..406c0114459 100644
--- a/htdocs/langs/en_GB/withdrawals.lang
+++ b/htdocs/langs/en_GB/withdrawals.lang
@@ -1,2 +1,25 @@
 # Dolibarr language file - Source file is en_US - withdrawals
-DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Withdrawal 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.
+NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Payment status must be set to 'credited' before declaring reject on specific lines.
+NbOfInvoiceToWithdraw=No. of invoices with direct debit orders
+NbOfInvoiceToWithdrawWithInfo=No. of customer invoices with direct debit payment orders having defined bank account information
+AmountToWithdraw=Amount to pay
+NoInvoiceToWithdraw=No customer invoice in payment mode "payment" is waiting. Go to 'Payment' tab on invoice card to make a request.
+NoInvoiceCouldBeWithdrawed=No invoice paid successfully. Check that the invoice is on a company with a valid BAN.
+ClassCreditedConfirm=Are you sure you want to classify this Payment receipt as credited on your bank account?
+WithdrawalRefused=Payment refused
+WithdrawalRefusedConfirm=Are you sure you want to enter a Payment rejection for Company
+RefusedInvoicing=Invoicing the rejection
+NoInvoiceRefused=Do not charge for the rejection
+StatusMotif6=Account without a balance
+CreateAll=Pay it all
+OrderWaiting=Waiting for action
+NotifyTransmision=Payment Transmission
+NotifyCredit=Payment Credit
+WithdrawalFileNotCapable=Unable to generate Payment receipt file for your country %s (Your country is not supported)
+ShowWithdraw=Show Payment
+IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one payment not yet processed, it won't be set as paid to allow prior Payment management.
+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 the payment order is closed, payment on the invoice will be automatically recorded, and the invoice closed if the outstanding balance is null.
+WithdrawalFile=Payment file
+RUMWillBeGenerated=UMR number will be generated once bank account information is saved
+SEPALegalText=By signing this mandate form, you authorise (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.
+InfoRejectMessage=Hello,<br><br>the direct debit payment order for invoice %s related to the company %s, for an amount of %s has been refused by the bank.<br><br>--<br>%s
diff --git a/htdocs/langs/en_IN/accountancy.lang b/htdocs/langs/en_IN/accountancy.lang
index 22f36b26563..527f1fd139d 100644
--- a/htdocs/langs/en_IN/accountancy.lang
+++ b/htdocs/langs/en_IN/accountancy.lang
@@ -1,2 +1,4 @@
 # Dolibarr language file - Source file is en_US - accountancy
-ProductsBinding=Products bindings
+AccountingCategory=Accounting category
+ErrorNoAccountingCategoryForThisCountry=No accounting category available for country %s (See Home - Setup - Dictionaries)
+WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
diff --git a/htdocs/langs/en_IN/admin.lang b/htdocs/langs/en_IN/admin.lang
index c48c759f0fe..5efda8865d6 100644
--- a/htdocs/langs/en_IN/admin.lang
+++ b/htdocs/langs/en_IN/admin.lang
@@ -1,6 +1,21 @@
 # Dolibarr language file - Source file is en_US - admin
+FileCheckDesc=This tool allows you to check the integrity of files and setup of your application, comparing each files with the official ones. 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.
+FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified, removed or added.
 AntiVirusCommandExample=Example for ClamWin: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe<br>Example for ClamAv: /usr/bin/clamscan
 AntiVirusParamExample=Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
+ModulesMarketPlaces=Find external modules...
+ThisIsAlternativeProcessToFollow=This is an alternative setup to process manually:
+UnpackPackageInDolibarrRoot=Unpack the packaged files into server directory dedicated to Dolibarr: <b>%s</b>
+UnpackPackageInModulesRoot=To deploy/install an external module, unpack the packaged files into the server directory dedicated to modules: <b>%s</b>
+NotExistsDirect=The alternative root directory is not defined to an existing directory.<br>
+InfDirAlt=Since version 3, it is possible to define an alternative root directory. This allows you to store, into a dedicated directory, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
+InfDirExample=<br>Then declare it in the file <strong>conf.php</strong><br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>If these lines are commented with "#", to enable them, just uncomment by removing the "#" character.
 ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
+ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list :<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list :<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
+ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+Module0Desc=Users / Employees and Groups management
+DictionaryAccountancyCategory=Accounting categories
+AddExtensionThemeModuleOrOther=Deploy/install external module
 ConstDesc=This page allows you to edit all other parameters not available in previous pages. These are mostly reserved parameters for developers or advanced troubleshooting. For a list of options <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">check here</a>.
-ApiProductionMode=Enable production mode (this will activate use of a caches for services management)
+ConfFileMuseContainCustom=Installing an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
diff --git a/htdocs/langs/en_IN/compta.lang b/htdocs/langs/en_IN/compta.lang
deleted file mode 100644
index 4d40c57399f..00000000000
--- a/htdocs/langs/en_IN/compta.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - compta
-VATRefund=Sales tax refund Refund
diff --git a/htdocs/langs/en_IN/mails.lang b/htdocs/langs/en_IN/mails.lang
deleted file mode 100644
index 455190c8587..00000000000
--- a/htdocs/langs/en_IN/mails.lang
+++ /dev/null
@@ -1,4 +0,0 @@
-# Dolibarr language file - Source file is en_US - mails
-MailSuccessfulySent=Email successfully sent (from %s to %s)
-MailingNeedCommand=For security reason, sending an emailing is better when performed from command line. If you have one, ask your server administrator to launch the following command to send the emailing to all recipients:
-ConfirmSendingEmailing=If you can't or prefer sending them with your www browser, please confirm you are sure you want to send emailing now from your browser?
diff --git a/htdocs/langs/en_IN/members.lang b/htdocs/langs/en_IN/members.lang
deleted file mode 100644
index fcd4f3eb8d7..00000000000
--- a/htdocs/langs/en_IN/members.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - members
-MemberStatusActiveLate=subscription expired
diff --git a/htdocs/langs/en_IN/orders.lang b/htdocs/langs/en_IN/orders.lang
deleted file mode 100644
index f719db62ca8..00000000000
--- a/htdocs/langs/en_IN/orders.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - orders
-StatusOrderReceivedAllShort=Everything received
-StatusOrderReceivedAll=Everything received
diff --git a/htdocs/langs/en_IN/withdrawals.lang b/htdocs/langs/en_IN/withdrawals.lang
deleted file mode 100644
index a6f0f06fc82..00000000000
--- a/htdocs/langs/en_IN/withdrawals.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - withdrawals
-DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Withdrawal 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.
diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang
index b56efc312e7..f51493c2763 100644
--- a/htdocs/langs/en_US/accountancy.lang
+++ b/htdocs/langs/en_US/accountancy.lang
@@ -26,6 +26,8 @@ InvoiceLabel=Invoice label
 OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to accounting account
 OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to accounting account
 OtherInfo=Other information
+DeleteCptCategory=Remove accounting account from group
+ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group ?
 
 AccountancyArea=Accountancy area
 AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
@@ -132,7 +134,7 @@ Sens=Sens
 Codejournal=Journal
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
-AccountingCategory=Accounting category
+AccountingCategory=Accounting account groups
 GroupByAccountAccounting=Group by accounting account
 NotMatch=Not Set
 DeleteMvt=Delete general ledger lines
@@ -156,7 +158,7 @@ NewAccountingMvt=New transaction
 NumMvts=Numero of transaction
 ListeMvts=List of movements
 ErrorDebitCredit=Debit and Credit cannot have a value at the same time
-
+AddCompteFromBK=Add accounting accounts to the group 
 ReportThirdParty=List third party account
 DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
 ListAccounts=List of the accounting accounts
@@ -235,11 +237,11 @@ Calculated=Calculated
 Formula=Formula
 
 ## Error
-ErrorNoAccountingCategoryForThisCountry=No accounting category available for country %s (See Home - Setup - Dictionaries)
+ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See Home - Setup - Dictionaries)
 ExportNotSupported=The export format setuped is not supported into this page
 BookeppingLineAlreayExists=Lines already existing into bookeeping
 
 Binded=Lines bound
 ToBind=Lines to bind
 
-WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version. 
+WarningReportNotReliable=Warning, this report is not based on the General Ledger, so does not contains transaction modified manualy in the General ledger. It will be replaced by a more complete report in a next version. 
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 18c0373e993..4776dffc835 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -224,7 +224,9 @@ OfficialDemo=Dolibarr online demo
 OfficialMarketPlace=Official market place for external modules/addons
 OfficialWebHostingService=Referenced web hosting services (Cloud hosting)
 ReferencedPreferredPartners=Preferred Partners
-OtherResources=Autres ressources
+OtherResources=Other resources
+ExternalResources=External resources
+SocialNetworks=Social Networks
 ForDocumentationSeeWiki=For user or developer documentation (Doc, FAQs...),<br>take a look at the Dolibarr Wiki:<br><b><a href="%s" target="_blank">%s</a></b>
 ForAnswersSeeForum=For any other questions/help, you can use the Dolibarr forum:<br><b><a href="%s" target="_blank">%s</a></b>
 HelpCenterDesc1=This area can help you to get a Help support service on Dolibarr.
@@ -421,7 +423,7 @@ ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The cod
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.  
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
 WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<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). 
-
+ClickToShowDescription=Click to show description
 # Modules
 Module0Name=Users & groups
 Module0Desc=Users / Employees and Groups management
@@ -842,7 +844,7 @@ DictionaryStaff=Staff
 DictionaryAvailability=Delivery delay
 DictionaryOrderMethods=Ordering methods
 DictionarySource=Origin of proposals/orders
-DictionaryAccountancyCategory=Accounting categories
+DictionaryAccountancyCategory=Accounting account groups
 DictionaryAccountancysystem=Models for chart of accounts
 DictionaryEMailTemplates=Emails templates
 DictionaryUnits=Units
@@ -1171,10 +1173,6 @@ FreeLegalTextOnOrders=Free text on orders
 WatermarkOnDraftOrders=Watermark on draft orders (none if empty)
 ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable
 BANK_ASK_PAYMENT_BANK_DURING_ORDER=Ask for bank account destination of order
-##### Clicktodial #####
-ClickToDialSetup=Click To Dial module setup
-ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with your clicktodial login (defined on your user card)<br><b>__PASS__</b> that will be replaced with your clicktodial password (defined on your user card).
-##### Bookmark4u #####
 ##### Interventions #####
 InterventionsSetup=Interventions module setup
 FreeLegalTextOnInterventions=Free text on intervention documents
@@ -1483,7 +1481,9 @@ AGENDA_DEFAULT_FILTER_STATUS=Set automatically this status for events into searc
 AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
 AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
 AGENDA_NOTIFICATION_SOUND=Enable sound notification
-##### ClickToDial #####
+##### Clicktodial #####
+ClickToDialSetup=Click To Dial module setup
+ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with your clicktodial login (defined on your user card)<br><b>__PASS__</b> that will be replaced with your clicktodial password (defined on your user card).
 ClickToDialDesc=This module allows to make phone numbers clickable. A click on this icon will call make your phone to 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.
 ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
 ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on same computer than the browser, and called when you click on a link in your browser that start 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.
diff --git a/htdocs/langs/en_US/boxes.lang b/htdocs/langs/en_US/boxes.lang
index 38b03b4268d..0e6c5019cac 100644
--- a/htdocs/langs/en_US/boxes.lang
+++ b/htdocs/langs/en_US/boxes.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - Source file is en_US - boxes
+BoxLoginInformation=Login information
 BoxLastRssInfos=Rss information
 BoxLastProducts=Latest %s products/services
 BoxProductsAlertStock=Stock alerts for products
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 338f9fca3dc..705355c16b4 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -794,8 +794,9 @@ SetRef=Set ref
 Select2ResultFoundUseArrows=Some results found. Use arrows to select.
 Select2NotFound=No result found
 Select2Enter=Enter
-Select2MoreCharacter=or more characters<br /><br /><strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
-Select2MoreCharacters=or more characters<br /><br /><strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
+Select2MoreCharacter=or more character
+Select2MoreCharacters=or more characters
+Select2MoreCharactersMore=<strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
 Select2LoadingMoreResults=Loading more results...
 Select2SearchInProgress=Search in progress...
 SearchIntoThirdparties=Thirdparties
diff --git a/htdocs/langs/en_US/members.lang b/htdocs/langs/en_US/members.lang
index 21feb74c829..d306d6e4998 100644
--- a/htdocs/langs/en_US/members.lang
+++ b/htdocs/langs/en_US/members.lang
@@ -150,6 +150,7 @@ MembersByTownDesc=This screen show you statistics on members by town.
 MembersStatisticsDesc=Choose statistics you want to read...
 MenuMembersStats=Statistics
 LastMemberDate=Latest member date
+LatestSubscriptionDate=Latest subscription date
 Nature=Nature
 Public=Information are public
 NewMemberbyWeb=New member added. Awaiting approval
diff --git a/htdocs/langs/en_US/products.lang b/htdocs/langs/en_US/products.lang
index 9897facb0bb..b38b714ddfb 100644
--- a/htdocs/langs/en_US/products.lang
+++ b/htdocs/langs/en_US/products.lang
@@ -175,6 +175,18 @@ m2=m²
 m3=m³
 liter=liter
 l=L
+unitP=Piece
+unitSET=Set
+unitS=Second
+unitH=Hour
+unitD=Day
+unitKG=Kilogram
+unitG=Gram
+unitM=Meter
+unitLM=Linear meter
+unitM2=Square meter
+unitM3=Cubic meter
+unitL=Liter
 ProductCodeModel=Product ref template
 ServiceCodeModel=Service ref template
 CurrentProductPrice=Current price
diff --git a/htdocs/langs/en_US/trips.lang b/htdocs/langs/en_US/trips.lang
index ac650ab98c7..49feb34d79c 100644
--- a/htdocs/langs/en_US/trips.lang
+++ b/htdocs/langs/en_US/trips.lang
@@ -70,6 +70,7 @@ DATE_SAVE=Validation date
 DATE_CANCEL=Cancelation date
 DATE_PAIEMENT=Payment date
 BROUILLONNER=Reopen
+ExpenseReportRef=Ref. expense report
 ValidateAndSubmit=Validate and submit for approval
 ValidatedWaitingApproval=Validated (waiting for approval)
 NOT_AUTHOR=You are not the author of this expense report. Operation cancelled.
diff --git a/htdocs/langs/es_AR/accountancy.lang b/htdocs/langs/es_AR/accountancy.lang
new file mode 100644
index 00000000000..527f1fd139d
--- /dev/null
+++ b/htdocs/langs/es_AR/accountancy.lang
@@ -0,0 +1,4 @@
+# Dolibarr language file - Source file is en_US - accountancy
+AccountingCategory=Accounting category
+ErrorNoAccountingCategoryForThisCountry=No accounting category available for country %s (See Home - Setup - Dictionaries)
+WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
diff --git a/htdocs/langs/es_AR/admin.lang b/htdocs/langs/es_AR/admin.lang
index 32551a05778..d2d93b1b324 100644
--- a/htdocs/langs/es_AR/admin.lang
+++ b/htdocs/langs/es_AR/admin.lang
@@ -2,4 +2,5 @@
 AntiVirusCommandExample=Example for ClamWin: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe<br>Example for ClamAv: /usr/bin/clamscan
 AntiVirusParamExample=Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
 ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
-ApiProductionMode=Enable production mode (this will activate use of a caches for services management)
+DictionaryAccountancyCategory=Accounting categories
+ConstDesc=This page allows you to edit all other parameters not available in previous pages. These are mostly reserved parameters for developers or advanced troubleshooting. For a list of options <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">check here</a>.
diff --git a/htdocs/langs/es_AR/compta.lang b/htdocs/langs/es_AR/compta.lang
deleted file mode 100644
index 4d40c57399f..00000000000
--- a/htdocs/langs/es_AR/compta.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - compta
-VATRefund=Sales tax refund Refund
diff --git a/htdocs/langs/es_AR/mails.lang b/htdocs/langs/es_AR/mails.lang
deleted file mode 100644
index 455190c8587..00000000000
--- a/htdocs/langs/es_AR/mails.lang
+++ /dev/null
@@ -1,4 +0,0 @@
-# Dolibarr language file - Source file is en_US - mails
-MailSuccessfulySent=Email successfully sent (from %s to %s)
-MailingNeedCommand=For security reason, sending an emailing is better when performed from command line. If you have one, ask your server administrator to launch the following command to send the emailing to all recipients:
-ConfirmSendingEmailing=If you can't or prefer sending them with your www browser, please confirm you are sure you want to send emailing now from your browser?
diff --git a/htdocs/langs/es_AR/main.lang b/htdocs/langs/es_AR/main.lang
index 2e691473326..3cac612b5fd 100644
--- a/htdocs/langs/es_AR/main.lang
+++ b/htdocs/langs/es_AR/main.lang
@@ -19,3 +19,5 @@ FormatDateHourShort=%m/%d/%Y %I:%M %p
 FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p
 FormatDateHourTextShort=%b %d, %Y, %I:%M %p
 FormatDateHourText=%B %d, %Y, %I:%M %p
+Select2MoreCharacter=or more characters<br /><br /><strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
+Select2MoreCharacters=or more characters<br /><br /><strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
diff --git a/htdocs/langs/es_AR/members.lang b/htdocs/langs/es_AR/members.lang
deleted file mode 100644
index fcd4f3eb8d7..00000000000
--- a/htdocs/langs/es_AR/members.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - members
-MemberStatusActiveLate=subscription expired
diff --git a/htdocs/langs/es_AR/orders.lang b/htdocs/langs/es_AR/orders.lang
deleted file mode 100644
index f719db62ca8..00000000000
--- a/htdocs/langs/es_AR/orders.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - orders
-StatusOrderReceivedAllShort=Everything received
-StatusOrderReceivedAll=Everything received
diff --git a/htdocs/langs/es_AR/withdrawals.lang b/htdocs/langs/es_AR/withdrawals.lang
deleted file mode 100644
index a6f0f06fc82..00000000000
--- a/htdocs/langs/es_AR/withdrawals.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - withdrawals
-DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Withdrawal 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.
diff --git a/htdocs/langs/es_BO/accountancy.lang b/htdocs/langs/es_BO/accountancy.lang
new file mode 100644
index 00000000000..527f1fd139d
--- /dev/null
+++ b/htdocs/langs/es_BO/accountancy.lang
@@ -0,0 +1,4 @@
+# Dolibarr language file - Source file is en_US - accountancy
+AccountingCategory=Accounting category
+ErrorNoAccountingCategoryForThisCountry=No accounting category available for country %s (See Home - Setup - Dictionaries)
+WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
diff --git a/htdocs/langs/es_BO/admin.lang b/htdocs/langs/es_BO/admin.lang
index 32551a05778..d2d93b1b324 100644
--- a/htdocs/langs/es_BO/admin.lang
+++ b/htdocs/langs/es_BO/admin.lang
@@ -2,4 +2,5 @@
 AntiVirusCommandExample=Example for ClamWin: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe<br>Example for ClamAv: /usr/bin/clamscan
 AntiVirusParamExample=Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
 ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
-ApiProductionMode=Enable production mode (this will activate use of a caches for services management)
+DictionaryAccountancyCategory=Accounting categories
+ConstDesc=This page allows you to edit all other parameters not available in previous pages. These are mostly reserved parameters for developers or advanced troubleshooting. For a list of options <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">check here</a>.
diff --git a/htdocs/langs/es_BO/compta.lang b/htdocs/langs/es_BO/compta.lang
deleted file mode 100644
index 4d40c57399f..00000000000
--- a/htdocs/langs/es_BO/compta.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - compta
-VATRefund=Sales tax refund Refund
diff --git a/htdocs/langs/es_BO/mails.lang b/htdocs/langs/es_BO/mails.lang
deleted file mode 100644
index 455190c8587..00000000000
--- a/htdocs/langs/es_BO/mails.lang
+++ /dev/null
@@ -1,4 +0,0 @@
-# Dolibarr language file - Source file is en_US - mails
-MailSuccessfulySent=Email successfully sent (from %s to %s)
-MailingNeedCommand=For security reason, sending an emailing is better when performed from command line. If you have one, ask your server administrator to launch the following command to send the emailing to all recipients:
-ConfirmSendingEmailing=If you can't or prefer sending them with your www browser, please confirm you are sure you want to send emailing now from your browser?
diff --git a/htdocs/langs/es_BO/main.lang b/htdocs/langs/es_BO/main.lang
index 2e691473326..3cac612b5fd 100644
--- a/htdocs/langs/es_BO/main.lang
+++ b/htdocs/langs/es_BO/main.lang
@@ -19,3 +19,5 @@ FormatDateHourShort=%m/%d/%Y %I:%M %p
 FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p
 FormatDateHourTextShort=%b %d, %Y, %I:%M %p
 FormatDateHourText=%B %d, %Y, %I:%M %p
+Select2MoreCharacter=or more characters<br /><br /><strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
+Select2MoreCharacters=or more characters<br /><br /><strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
diff --git a/htdocs/langs/es_BO/members.lang b/htdocs/langs/es_BO/members.lang
deleted file mode 100644
index fcd4f3eb8d7..00000000000
--- a/htdocs/langs/es_BO/members.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - members
-MemberStatusActiveLate=subscription expired
diff --git a/htdocs/langs/es_BO/orders.lang b/htdocs/langs/es_BO/orders.lang
deleted file mode 100644
index f719db62ca8..00000000000
--- a/htdocs/langs/es_BO/orders.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - orders
-StatusOrderReceivedAllShort=Everything received
-StatusOrderReceivedAll=Everything received
diff --git a/htdocs/langs/es_BO/withdrawals.lang b/htdocs/langs/es_BO/withdrawals.lang
deleted file mode 100644
index a6f0f06fc82..00000000000
--- a/htdocs/langs/es_BO/withdrawals.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - withdrawals
-DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Withdrawal 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.
diff --git a/htdocs/langs/es_CL/accountancy.lang b/htdocs/langs/es_CL/accountancy.lang
index 0b359bb7d76..7861a5bb087 100644
--- a/htdocs/langs/es_CL/accountancy.lang
+++ b/htdocs/langs/es_CL/accountancy.lang
@@ -12,6 +12,7 @@ ACCOUNTING_MISCELLANEOUS_JOURNAL=Diario misceláneo
 Code_tiers=Socio de Negocio
 Labelcompte=Cuenta
 Sens=Significado
+AccountingCategory=Accounting category
 ThirdPartyAccount=Cuenta de socio de negocio
 ErrorDebitCredit=Débito y crédito no pueden tener el mismo valor
 ListAccounts=Lista de cuentas contables
@@ -22,3 +23,5 @@ ErrorAccountancyCodeIsAlreadyUse=No puede eliminar esta cuenta porque está sien
 OptionsDeactivatedForThisExportModel=Opciones desactivadas para este modelo de exportación
 Selectmodelcsv=Seleccione un modelo
 Modelcsv_normal=Exportación clasica
+ErrorNoAccountingCategoryForThisCountry=No accounting category available for country %s (See Home - Setup - Dictionaries)
+WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
diff --git a/htdocs/langs/es_CL/admin.lang b/htdocs/langs/es_CL/admin.lang
index aa953c6a5d3..b10bffe101b 100644
--- a/htdocs/langs/es_CL/admin.lang
+++ b/htdocs/langs/es_CL/admin.lang
@@ -12,12 +12,13 @@ Permission25=Enviar las cotizaciones
 Permission26=Cerrar cotizaciones
 Permission27=Eliminar cotizaciones
 Permission28=Exportar las cotizaciones
+DictionaryAccountancyCategory=Accounting categories
 Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Tolerancia de retraso antes de la alerta (en días) sobre cotizaciones a cerrar
 Delays_MAIN_DELAY_PROPALS_TO_BILL=Tolerancia de retraso antes de la alerta (en días) sobre cotizaciones no facturadas
+ConstDesc=This page allows you to edit all other parameters not available in previous pages. These are mostly reserved parameters for developers or advanced troubleshooting. For a list of options <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">check here</a>.
 PropalSetup=Configuración del módulo Cotizaciones
 ProposalsNumberingModules=Módulos de numeración de cotizaciones
 ProposalsPDFModules=Modelos de documentos de cotizaciones
 FreeLegalTextOnProposal=Texto libre en cotizaciones
 WatermarkOnDraftProposal=Marca de agua en cotizaciones borrador (en caso de estar vacío)
 FCKeditorForProductDetails=Creación/edición WYSIWIG de las líneas de detalle de los productos (en pedidos, cotizaciones, facturas, etc.)
-ApiProductionMode=Enable production mode (this will activate use of a caches for services management)
diff --git a/htdocs/langs/es_CL/banks.lang b/htdocs/langs/es_CL/banks.lang
index ff076440577..cdeaeb42c78 100644
--- a/htdocs/langs/es_CL/banks.lang
+++ b/htdocs/langs/es_CL/banks.lang
@@ -1,3 +1,2 @@
 # Dolibarr language file - Source file is en_US - banks
-StatusAccountOpened=Abierto
 StatusAccountClosed=Cerrado
diff --git a/htdocs/langs/es_CL/bills.lang b/htdocs/langs/es_CL/bills.lang
index 495d9631776..fb96574bf4f 100644
--- a/htdocs/langs/es_CL/bills.lang
+++ b/htdocs/langs/es_CL/bills.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - Source file is en_US - bills
+ConfirmDeletePayment=Are you sure you want to delete this payment ?
 BillStatusDraft=Borrador (debe ser validado)
 BillShortStatusValidated=Validado
 BillShortStatusClosedUnpaid=Cerrado
diff --git a/htdocs/langs/es_CL/companies.lang b/htdocs/langs/es_CL/companies.lang
index 5a3be368047..ba5e8b7d802 100644
--- a/htdocs/langs/es_CL/companies.lang
+++ b/htdocs/langs/es_CL/companies.lang
@@ -2,4 +2,3 @@
 Prospect=Cliente
 ContactForProposals=Contacto de cotizaciones
 NoContactForAnyProposal=Este contacto no es contacto de ninguna cotización
-InActivity=Abierto
diff --git a/htdocs/langs/es_CL/compta.lang b/htdocs/langs/es_CL/compta.lang
index f17e61d3999..acda3729a75 100644
--- a/htdocs/langs/es_CL/compta.lang
+++ b/htdocs/langs/es_CL/compta.lang
@@ -1,7 +1,6 @@
 # Dolibarr language file - Source file is en_US - compta
 Debit=Débito
 Credit=Crédito
-VATRefund=Sales tax refund Refund
 ProposalStats=Estadísticas de cotizaciones
 Dispatched=Despachado
 ToDispatch=Para despachar
diff --git a/htdocs/langs/es_CL/mails.lang b/htdocs/langs/es_CL/mails.lang
deleted file mode 100644
index 455190c8587..00000000000
--- a/htdocs/langs/es_CL/mails.lang
+++ /dev/null
@@ -1,4 +0,0 @@
-# Dolibarr language file - Source file is en_US - mails
-MailSuccessfulySent=Email successfully sent (from %s to %s)
-MailingNeedCommand=For security reason, sending an emailing is better when performed from command line. If you have one, ask your server administrator to launch the following command to send the emailing to all recipients:
-ConfirmSendingEmailing=If you can't or prefer sending them with your www browser, please confirm you are sure you want to send emailing now from your browser?
diff --git a/htdocs/langs/es_CL/main.lang b/htdocs/langs/es_CL/main.lang
index 7712ceff6ee..22986688452 100644
--- a/htdocs/langs/es_CL/main.lang
+++ b/htdocs/langs/es_CL/main.lang
@@ -25,5 +25,6 @@ Amount=Cantidad
 List=Lista
 CommercialProposalsShort=Cotizaciones
 Drafts=Borrador
-Opened=Abierto
 ClassifyBilled=Clasificar pago
+Select2MoreCharacter=or more characters<br /><br /><strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
+Select2MoreCharacters=or more characters<br /><br /><strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
diff --git a/htdocs/langs/es_CL/orders.lang b/htdocs/langs/es_CL/orders.lang
index c01213b90f5..91f80c52381 100644
--- a/htdocs/langs/es_CL/orders.lang
+++ b/htdocs/langs/es_CL/orders.lang
@@ -1,2 +1,5 @@
 # Dolibarr language file - Source file is en_US - orders
+StatusOrderBilledShort=Pagado
 StatusOrderDraft=Borrador (debe ser validado)
+StatusOrderBilled=Pagado
+TypeContact_commande_external_BILLING=Contacto cliente de facturación cotización
diff --git a/htdocs/langs/es_CL/projects.lang b/htdocs/langs/es_CL/projects.lang
index d483e1e5659..056395c9f7d 100644
--- a/htdocs/langs/es_CL/projects.lang
+++ b/htdocs/langs/es_CL/projects.lang
@@ -1,2 +1,3 @@
 # Dolibarr language file - Source file is en_US - projects
 ListProposalsAssociatedProject=Listado de cotizaciones asociadas al proyecto
+OppStatusPROPO=Cotización
diff --git a/htdocs/langs/es_CL/propal.lang b/htdocs/langs/es_CL/propal.lang
index 2377eb837f1..8e86c84c39e 100644
--- a/htdocs/langs/es_CL/propal.lang
+++ b/htdocs/langs/es_CL/propal.lang
@@ -3,7 +3,6 @@ Proposals=Cotizaciones
 Proposal=Cotización
 ProposalShort=Cotización
 ProposalsDraft=Cotizaciones borrador
-ProposalsOpened=Cotizaciones abiertas
 Prop=Cotizaciones
 CommercialProposal=Cotización
 ProposalCard=Ficha cotización
@@ -12,10 +11,6 @@ NewPropal=Nueva cotización
 DeleteProp=Borrar Cotización
 ValidateProp=Validar cotización
 AddProp=Crear cotización
-ConfirmDeleteProp=¿Está seguro de querer eliminar esta cotización?
-ConfirmValidateProp=¿Está seguro de querer validar esta cotización bajo la referencia <b>%s</b> ?
-LastPropals=Últimas %s cotizaciones
-LastModifiedProposals=Las %s últimas cotizaciones modificadas
 AllPropals=Todas las cotizacioness
 SearchAProposal=Buscar una cotización
 ProposalsStatistics=Estadísticas de cotizaciones
@@ -24,7 +19,6 @@ AmountOfProposalsByMonthHT=Cantidad mensual (IVA incluido)
 NbOfProposals=Número cotizaciones
 ShowPropal=Ver cotización
 PropalStatusDraft=Borrador (debe ser validado)
-PropalStatusValidated=Validado (cotización abierta)
 PropalStatusSigned=Firmado (necesita pago)
 PropalStatusBilled=Pagado
 PropalStatusBilledShort=Pagado
@@ -45,8 +39,6 @@ CreateEmptyPropal=Crear cotización vacía
 DefaultProposalDurationValidity=Validar duración de cotización (en días)
 UseCustomerContactAsPropalRecipientIfExist=Utilizar dirección contacto de seguimiento de cliente definido en vez de la dirección del tercero como destinatario de las cotizaciones
 ClonePropal=Clonar cotización
-ConfirmClonePropal=¿Está seguro de querer clonar la cotización <b>%s</b>?
-ConfirmReOpenProp=¿Está seguro de querer reabrir la cotización <b>%s</b> ?
 ProposalsAndProposalsLines=Cotizaciones a clientes y líneas de cotizaciones
 ProposalLine=Línea de cotización
 AvailabilityPeriod=Retraso disponible
diff --git a/htdocs/langs/es_CL/withdrawals.lang b/htdocs/langs/es_CL/withdrawals.lang
deleted file mode 100644
index a6f0f06fc82..00000000000
--- a/htdocs/langs/es_CL/withdrawals.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - withdrawals
-DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Withdrawal 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.
diff --git a/htdocs/langs/es_CO/accountancy.lang b/htdocs/langs/es_CO/accountancy.lang
new file mode 100644
index 00000000000..527f1fd139d
--- /dev/null
+++ b/htdocs/langs/es_CO/accountancy.lang
@@ -0,0 +1,4 @@
+# Dolibarr language file - Source file is en_US - accountancy
+AccountingCategory=Accounting category
+ErrorNoAccountingCategoryForThisCountry=No accounting category available for country %s (See Home - Setup - Dictionaries)
+WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
diff --git a/htdocs/langs/es_CO/admin.lang b/htdocs/langs/es_CO/admin.lang
index eafd89a5562..d76f0f29b46 100644
--- a/htdocs/langs/es_CO/admin.lang
+++ b/htdocs/langs/es_CO/admin.lang
@@ -8,7 +8,8 @@ Position=Puesto
 ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
 Module42Name=Log
 DictionaryCanton=Departamento
+DictionaryAccountancyCategory=Accounting categories
 LTRate=Tipo
 MenuCompanySetup=Empresa o institución
 CompanyName=Nombre
-ApiProductionMode=Enable production mode (this will activate use of a caches for services management)
+ConstDesc=This page allows you to edit all other parameters not available in previous pages. These are mostly reserved parameters for developers or advanced troubleshooting. For a list of options <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">check here</a>.
diff --git a/htdocs/langs/es_CO/banks.lang b/htdocs/langs/es_CO/banks.lang
index 5fe75379d11..cdeaeb42c78 100644
--- a/htdocs/langs/es_CO/banks.lang
+++ b/htdocs/langs/es_CO/banks.lang
@@ -1,3 +1,2 @@
 # Dolibarr language file - Source file is en_US - banks
-StatusAccountOpened=Activo
 StatusAccountClosed=Cerrado
diff --git a/htdocs/langs/es_CO/bills.lang b/htdocs/langs/es_CO/bills.lang
index 6f9b44c17bc..146bc3e64e5 100644
--- a/htdocs/langs/es_CO/bills.lang
+++ b/htdocs/langs/es_CO/bills.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - Source file is en_US - bills
+ConfirmDeletePayment=Are you sure you want to delete this payment ?
 BillStatusPaid=Pagado
 BillStatusStarted=Empezado
 BillShortStatusPaid=Pagado
diff --git a/htdocs/langs/es_CO/compta.lang b/htdocs/langs/es_CO/compta.lang
index 838711d8ca4..006f13c57a0 100644
--- a/htdocs/langs/es_CO/compta.lang
+++ b/htdocs/langs/es_CO/compta.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - compta
 Param=Configuración
-VATRefund=Sales tax refund Refund
 ByThirdParties=Por empresa
 CodeNotDef=No definida
diff --git a/htdocs/langs/es_CO/mails.lang b/htdocs/langs/es_CO/mails.lang
deleted file mode 100644
index 455190c8587..00000000000
--- a/htdocs/langs/es_CO/mails.lang
+++ /dev/null
@@ -1,4 +0,0 @@
-# Dolibarr language file - Source file is en_US - mails
-MailSuccessfulySent=Email successfully sent (from %s to %s)
-MailingNeedCommand=For security reason, sending an emailing is better when performed from command line. If you have one, ask your server administrator to launch the following command to send the emailing to all recipients:
-ConfirmSendingEmailing=If you can't or prefer sending them with your www browser, please confirm you are sure you want to send emailing now from your browser?
diff --git a/htdocs/langs/es_CO/main.lang b/htdocs/langs/es_CO/main.lang
index d5be6da3c20..7a728c47ba8 100644
--- a/htdocs/langs/es_CO/main.lang
+++ b/htdocs/langs/es_CO/main.lang
@@ -36,3 +36,5 @@ FindBug=Señalar un bug
 Currency=Moneda
 SelectElementAndClickRefresh=Seleccione un elemento y haga clic en Actualizar
 PrintFile=Imprimir archivo %s
+Select2MoreCharacter=or more characters<br /><br /><strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
+Select2MoreCharacters=or more characters<br /><br /><strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
diff --git a/htdocs/langs/es_CO/members.lang b/htdocs/langs/es_CO/members.lang
index c5b4236ebf2..a193615bad5 100644
--- a/htdocs/langs/es_CO/members.lang
+++ b/htdocs/langs/es_CO/members.lang
@@ -1,4 +1,3 @@
 # Dolibarr language file - Source file is en_US - members
 MemberStatusDraftShort=Borrador
-MemberStatusActiveLate=subscription expired
 SubscriptionLate=Retraso
diff --git a/htdocs/langs/es_CO/propal.lang b/htdocs/langs/es_CO/propal.lang
index 8e659bc7845..3f666282a62 100644
--- a/htdocs/langs/es_CO/propal.lang
+++ b/htdocs/langs/es_CO/propal.lang
@@ -2,4 +2,3 @@
 Proposals=Cotizaciones
 Prop=Cotizaciones
 PropalsDraft=Borradores
-PropalsOpened=Activo
diff --git a/htdocs/langs/es_CO/withdrawals.lang b/htdocs/langs/es_CO/withdrawals.lang
deleted file mode 100644
index a6f0f06fc82..00000000000
--- a/htdocs/langs/es_CO/withdrawals.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - withdrawals
-DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Withdrawal 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.
diff --git a/htdocs/langs/es_DO/accountancy.lang b/htdocs/langs/es_DO/accountancy.lang
new file mode 100644
index 00000000000..527f1fd139d
--- /dev/null
+++ b/htdocs/langs/es_DO/accountancy.lang
@@ -0,0 +1,4 @@
+# Dolibarr language file - Source file is en_US - accountancy
+AccountingCategory=Accounting category
+ErrorNoAccountingCategoryForThisCountry=No accounting category available for country %s (See Home - Setup - Dictionaries)
+WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
diff --git a/htdocs/langs/es_DO/admin.lang b/htdocs/langs/es_DO/admin.lang
index b8168c6b0e1..0f082f7a0d8 100644
--- a/htdocs/langs/es_DO/admin.lang
+++ b/htdocs/langs/es_DO/admin.lang
@@ -9,6 +9,7 @@ Permission91=Consultar impuestos e ITBIS
 Permission92=Crear/modificar impuestos e ITBIS
 Permission93=Eliminar impuestos e ITBIS
 DictionaryVAT=Tasa de ITBIS (Impuesto sobre ventas en EEUU)
+DictionaryAccountancyCategory=Accounting categories
 VATManagement=Gestión ITBIS
 VATIsNotUsedDesc=El tipo de ITBIS propuesto por defecto es 0. Este es el caso de asociaciones, particulares o algunas pequeñas sociedades.
 VATIsUsedExampleFR=En Francia, se trata de las sociedades u organismos que eligen un régimen fiscal general (General simplificado o General normal), régimen en el cual se declara el ITBIS.
@@ -16,6 +17,7 @@ VATIsNotUsedExampleFR=En Francia, se trata de asociaciones exentas de ITBIS o so
 LocalTax1IsUsedDesc=Uso de un 2º tipo de impuesto (Distinto del ITBIS)
 LocalTax1IsNotUsedDesc=No usar un 2º tipo de impuesto (Distinto del ITBIS)
 LocalTax2IsNotUsedDesc=No usar un 2º tipo de impuesto (Distinto del ITBIS)
+ConstDesc=This page allows you to edit all other parameters not available in previous pages. These are mostly reserved parameters for developers or advanced troubleshooting. For a list of options <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">check here</a>.
 UnitPriceOfProduct=Precio unitario sin ITBIS de un producto
 ShowVATIntaInAddress=Ocultar el identificador ITBIS en las direcciones de los documentos
 OptionVatMode=Opción de carga de ITBIS
@@ -23,4 +25,3 @@ OptionVatDefaultDesc=La carga del ITBIS es: <br>-en el envío de los bienes (en
 OptionVatDebitOptionDesc=La carga del ITBIS es: <br>-en el envío de los bienes (en la práctica se usa la fecha de la factura)<br>-sobre la facturación de los servicios
 SummaryOfVatExigibilityUsedByDefault=Tiempo de exigibilidad de ITBIS por defecto según la opción eligida
 YourCompanyDoesNotUseVAT=Su empresa está configurada como no sujeta al ITBIS (Inicio - Configuración - Empresa/Institución), por lo que no hay opción para la paremetrización del ITBIS.
-ApiProductionMode=Enable production mode (this will activate use of a caches for services management)
diff --git a/htdocs/langs/es_DO/compta.lang b/htdocs/langs/es_DO/compta.lang
deleted file mode 100644
index 4d40c57399f..00000000000
--- a/htdocs/langs/es_DO/compta.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - compta
-VATRefund=Sales tax refund Refund
diff --git a/htdocs/langs/es_DO/mails.lang b/htdocs/langs/es_DO/mails.lang
deleted file mode 100644
index 455190c8587..00000000000
--- a/htdocs/langs/es_DO/mails.lang
+++ /dev/null
@@ -1,4 +0,0 @@
-# Dolibarr language file - Source file is en_US - mails
-MailSuccessfulySent=Email successfully sent (from %s to %s)
-MailingNeedCommand=For security reason, sending an emailing is better when performed from command line. If you have one, ask your server administrator to launch the following command to send the emailing to all recipients:
-ConfirmSendingEmailing=If you can't or prefer sending them with your www browser, please confirm you are sure you want to send emailing now from your browser?
diff --git a/htdocs/langs/es_DO/main.lang b/htdocs/langs/es_DO/main.lang
index 2e691473326..3cac612b5fd 100644
--- a/htdocs/langs/es_DO/main.lang
+++ b/htdocs/langs/es_DO/main.lang
@@ -19,3 +19,5 @@ FormatDateHourShort=%m/%d/%Y %I:%M %p
 FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p
 FormatDateHourTextShort=%b %d, %Y, %I:%M %p
 FormatDateHourText=%B %d, %Y, %I:%M %p
+Select2MoreCharacter=or more characters<br /><br /><strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
+Select2MoreCharacters=or more characters<br /><br /><strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
diff --git a/htdocs/langs/es_DO/members.lang b/htdocs/langs/es_DO/members.lang
deleted file mode 100644
index fcd4f3eb8d7..00000000000
--- a/htdocs/langs/es_DO/members.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - members
-MemberStatusActiveLate=subscription expired
diff --git a/htdocs/langs/es_DO/orders.lang b/htdocs/langs/es_DO/orders.lang
deleted file mode 100644
index f719db62ca8..00000000000
--- a/htdocs/langs/es_DO/orders.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - orders
-StatusOrderReceivedAllShort=Everything received
-StatusOrderReceivedAll=Everything received
diff --git a/htdocs/langs/es_DO/withdrawals.lang b/htdocs/langs/es_DO/withdrawals.lang
deleted file mode 100644
index a6f0f06fc82..00000000000
--- a/htdocs/langs/es_DO/withdrawals.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - withdrawals
-DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Withdrawal 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.
diff --git a/htdocs/langs/es_EC/accountancy.lang b/htdocs/langs/es_EC/accountancy.lang
new file mode 100644
index 00000000000..527f1fd139d
--- /dev/null
+++ b/htdocs/langs/es_EC/accountancy.lang
@@ -0,0 +1,4 @@
+# Dolibarr language file - Source file is en_US - accountancy
+AccountingCategory=Accounting category
+ErrorNoAccountingCategoryForThisCountry=No accounting category available for country %s (See Home - Setup - Dictionaries)
+WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
diff --git a/htdocs/langs/es_EC/admin.lang b/htdocs/langs/es_EC/admin.lang
index 32551a05778..d2d93b1b324 100644
--- a/htdocs/langs/es_EC/admin.lang
+++ b/htdocs/langs/es_EC/admin.lang
@@ -2,4 +2,5 @@
 AntiVirusCommandExample=Example for ClamWin: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe<br>Example for ClamAv: /usr/bin/clamscan
 AntiVirusParamExample=Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
 ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
-ApiProductionMode=Enable production mode (this will activate use of a caches for services management)
+DictionaryAccountancyCategory=Accounting categories
+ConstDesc=This page allows you to edit all other parameters not available in previous pages. These are mostly reserved parameters for developers or advanced troubleshooting. For a list of options <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">check here</a>.
diff --git a/htdocs/langs/es_EC/compta.lang b/htdocs/langs/es_EC/compta.lang
deleted file mode 100644
index 4d40c57399f..00000000000
--- a/htdocs/langs/es_EC/compta.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - compta
-VATRefund=Sales tax refund Refund
diff --git a/htdocs/langs/es_EC/mails.lang b/htdocs/langs/es_EC/mails.lang
deleted file mode 100644
index 455190c8587..00000000000
--- a/htdocs/langs/es_EC/mails.lang
+++ /dev/null
@@ -1,4 +0,0 @@
-# Dolibarr language file - Source file is en_US - mails
-MailSuccessfulySent=Email successfully sent (from %s to %s)
-MailingNeedCommand=For security reason, sending an emailing is better when performed from command line. If you have one, ask your server administrator to launch the following command to send the emailing to all recipients:
-ConfirmSendingEmailing=If you can't or prefer sending them with your www browser, please confirm you are sure you want to send emailing now from your browser?
diff --git a/htdocs/langs/es_EC/main.lang b/htdocs/langs/es_EC/main.lang
index 1602d6a7ffa..9eb281a31c2 100644
--- a/htdocs/langs/es_EC/main.lang
+++ b/htdocs/langs/es_EC/main.lang
@@ -19,3 +19,5 @@ FormatDateHourShort=%d/%m/%Y %H:%M
 FormatDateHourSecShort=%d/%m/%Y %H:%M:%S
 FormatDateHourTextShort=%d %b %Y %H:%M
 FormatDateHourText=%d %B %Y %H:%M
+Select2MoreCharacter=or more characters<br /><br /><strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
+Select2MoreCharacters=or more characters<br /><br /><strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
diff --git a/htdocs/langs/es_EC/members.lang b/htdocs/langs/es_EC/members.lang
deleted file mode 100644
index fcd4f3eb8d7..00000000000
--- a/htdocs/langs/es_EC/members.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - members
-MemberStatusActiveLate=subscription expired
diff --git a/htdocs/langs/es_EC/orders.lang b/htdocs/langs/es_EC/orders.lang
deleted file mode 100644
index f719db62ca8..00000000000
--- a/htdocs/langs/es_EC/orders.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - orders
-StatusOrderReceivedAllShort=Everything received
-StatusOrderReceivedAll=Everything received
diff --git a/htdocs/langs/es_EC/withdrawals.lang b/htdocs/langs/es_EC/withdrawals.lang
deleted file mode 100644
index a6f0f06fc82..00000000000
--- a/htdocs/langs/es_EC/withdrawals.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - withdrawals
-DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Withdrawal 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.
diff --git a/htdocs/langs/es_ES/accountancy.lang b/htdocs/langs/es_ES/accountancy.lang
index ca8de6bd834..f43e55635d6 100644
--- a/htdocs/langs/es_ES/accountancy.lang
+++ b/htdocs/langs/es_ES/accountancy.lang
@@ -194,6 +194,8 @@ ChangeBinding=Cambiar la unión
 
 ## Admin
 ApplyMassCategories=Aplicar categorías en masa
+AddAccountFromBookKeepingWithNoCategories=Add acccount already used with no categories
+CategoryDeleted=Category for the accounting account has been removed
 
 ## Export
 Exports=Exportaciones
@@ -209,6 +211,7 @@ Modelcsv_ciel=Exportar hacia Sage Ciel Compta o Compta Evolution
 Modelcsv_quadratus=Exportar hacia Quadratus QuadraCompta
 Modelcsv_ebp=Exportar a EBP
 Modelcsv_cogilog=Eportar a Cogilog
+ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
 InitAccountancy=Iniciar contabilidad
diff --git a/htdocs/langs/es_ES/admin.lang b/htdocs/langs/es_ES/admin.lang
index 9b6a08b4c44..4111d3ead8a 100644
--- a/htdocs/langs/es_ES/admin.lang
+++ b/htdocs/langs/es_ES/admin.lang
@@ -9,17 +9,20 @@ VersionDevelopment=Desarrollo
 VersionUnknown=Desconocida
 VersionRecommanded=Recomendada
 FileCheck=Comprobador de integridad de archivos
-FileCheckDesc=Esta herramienta le permite comprobar la integridad de los archivos de la aplicación, comparando cada archivo con los oficiales. Se puede utilizar esta herramienta para detectar si algunos archivos fueron modificados por un hacker por ejemplo.
+FileCheckDesc=This tool allows you to check the integrity of files and setup of your application, comparing each files with the official ones. 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.
 FileIntegrityIsStrictlyConformedWithReference=La integridad de los archivos se ajusta estrictamente a la referencia.
-FileIntegritySomeFilesWereRemovedOrModified=El chequeo de integridad de archivos ha fallado. Algunos archivos han sido removidos o modificados.
+FileIntegrityIsOkButFilesWereAdded=Files integrity check has passed, however some new files were added.
+FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified, removed or added.
 GlobalChecksum=Suma de comprobación global
 MakeIntegrityAnalysisFrom=Realizar el análisis de la integridad de los archivos de la aplicación desde
 LocalSignature=Firma local incrustada (menos segura)
 RemoteSignature=Firma remota (más segura)
 FilesMissing=Archivos no encontrados
 FilesUpdated=Archivos actualizados
+FilesModified=Modified Files
+FilesAdded=Added Files
 FileCheckDolibarr=Comprobar la integradad de los archivos de la aplicación
-AvailableOnlyOnPackagedVersions=El archivo local para la comprobación de integridad sólo está disponible cuando la aplicación se instala desde un paquete certificado
+AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from an official package
 XmlNotFound=No se encuentra el archivo xml
 SessionId=ID sesión
 SessionSaveHandler=Modalidad de salvaguardado de sesiones
@@ -188,7 +191,9 @@ BoxesDesc=Los paneles son componentes que muestran algunos datos que pueden aña
 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 un módulo/función.
 ModulesMarketPlaceDesc=Puede encontrar más módulos para descargar en sitios web externos en Internet ...
-ModulesMarketPlaces=Más módulos...
+ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
+ModulesMarketPlaces=Find external modules...
+GoModuleSetupArea=To deploy/install a new module, go onto the Module setup area at <a href="%s">%s</a>.
 DoliStoreDesc=DoliStore, el sitio oficial de módulos complementarios y para Dolibarr ERP/CRM
 DoliPartnersDesc=Lista de empresas que ofrecen módulos y desarrollos a medida (Nota: cualquier persona con experiencia en programación PHP puede ofrecer desarrollos a medida para un proyecto de código abierto)
 WebSiteDesc=Sitios web de referencia para encontrar más módulos ...
@@ -280,20 +285,21 @@ MenuHandlers=Gestores menú
 MenuAdmin=Editor menú
 DoNotUseInProduction=No usar en producción
 ThisIsProcessToFollow=Estos son los pasos para proceder:
-ThisIsAlternativeProcessToFollow=Este es una configuración alternativa para procesar:
+ThisIsAlternativeProcessToFollow=This is an alternative setup to process manually:
 StepNb=Paso %s
 FindPackageFromWebSite=Buscar el paquete que responde a su necesidad (por ejemplo en el sitio web %s)
 DownloadPackageFromWebSite=Descargue el paquete (por ejemplo desde el sitio web oficial %s).
-UnpackPackageInDolibarrRoot=Descomprima el archivo del paquete en el directorio del servidor de Dolibarr dedicado a los módulos externos: <b>%s</b>
-SetupIsReadyForUse=La instalación ha finalizado y Dolibarr está disponible con el nuevo componente.
-NotExistsDirect=No existe el directorio alternativo.<br>
-InfDirAlt=Desde la versión 3 es posible definir un directorio root alternativo, esto le permite almacenar en el mismo lugar módulos y temas personalizados.<br>Basta con crear un directorio en el raíz de Dolibarr (por ejemplo: custom).<br>
-InfDirExample=<br>Seguidamente se declara en el archivo conf.php:<br> $dolibarr_main_url_root_alt='http://miservidor/custom'<br>$dolibarr_main_document_root_alt='/directorio/de/dolibarr/htdocs/custom'<br>*Estas lineas vienen comentadas con un "#", para descomentarlas solo hay que retirar el caracter.
+UnpackPackageInDolibarrRoot=Unpack the packaged files into server directory dedicated to Dolibarr: <b>%s</b>
+UnpackPackageInModulesRoot=To deploy/install an external module, unpack the packaged files into the server directory dedicated to modules: <b>%s</b>
+SetupIsReadyForUse=Module deployment is finished. You must however enable and setup the module in your application by going on the page to setup modules: <a href="%s">%s</a>.
+NotExistsDirect=The alternative root directory is not defined to an existing directory.<br>
+InfDirAlt=Since version 3, it is possible to define an alternative root directory. This allows you to store, into a dedicated directory, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
+InfDirExample=<br>Then declare it in the file <strong>conf.php</strong><br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>If these lines are commented with "#", to enable them, just uncomment by removing the "#" character.
 YouCanSubmitFile=Para este paso, puede enviar el paquete usando esta herramienta: Seleccionar el archivo del módulo
 CurrentVersion=Versión actual de Dolibarr
 CallUpdatePage=Ir a la página de actualización de la estructura de la base de datos y sus datos: %s.
 LastStableVersion=Última versión estable
-LastActivationDate=Última fecha de activación
+LastActivationDate=Latest activation date
 UpdateServerOffline=Actualizar servidor offline
 GenericMaskCodes=Puede introducir cualquier máscara numérica. En esta máscara, puede utilizar las siguientes etiquetas:<br><b>{000000} </b> corresponde a un número que se incrementa en cada uno de %s. Introduzca tantos ceros como longitud desee mostrar. El contador se completará a partir de ceros por la izquierda con el fin de tener tantos ceros como la máscara. <br> <b> {000000+000}</ b> Igual que el anterior, con una compensación correspondiente al número a la derecha del signo + se aplica a partir del primer %s. <br> <b> {000000@x}</b> igual que el anterior, pero el contador se restablece a cero cuando se llega a x meses (x entre 1 y 12). Si esta opción se utiliza y x es de 2 o superior, entonces la secuencia {yy}{mm} o {yyyy}{mm} también es necesaria. <br> <b> {dd} </b> días (01 a 31). <br><b> {mm}</b> mes (01 a 12). <br><b>{yy}</b>, <b>{yyyy}</b> ou <b>{y}</b> año en 2, 4 ó 1 cifra.<br>
 GenericMaskCodes2=<b>{cccc}</b> código de cliente con n caracteres<br><b>{cccc000}</b> código de cliente con n caracteres es seguido por un contador dedicado a clientes. Este contador dedicado a clientes se reseteará al mismo tiempo que el contador global.<br><b>{tttt}</b> El código del tipo de empresa con n caracteres (vea diccionarios->tipos de empresa).<br>
@@ -376,11 +382,11 @@ ExtrafieldCheckBox=Casilla de verificación
 ExtrafieldRadio=Botón de selección excluyente
 ExtrafieldCheckBoxFromList= Casilla de selección de tabla
 ExtrafieldLink=Objeto adjuntado
-ExtrafieldParamHelpselect=El listado de parámetros tiene que ser key,valor<br><br> por ejemplo:\n<br>1,value1<br>2,value2<br>3,value3<br>...<br><br>Para tener la lista en función de otra:<br>1,value1|parent_list_code:parent_key<br>2,value2|parent_list_code:parent_key
+ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list :<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list :<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=El listado de parámetros tiene que ser key,valor<br><br> por ejemplo:\n<br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=El listado de parámetros tiene que ser key,valor<br><br> por ejemplo:\n<br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=Lista de parámetros viene de una tabla<br>Sintaxis: nombre_tabla: etiqueta_campo: identificador_campo :: filtro <br> Ejemplo: c_typent: libelle: id :: filtro <br><br> filtro puede ser una prueba simple (por ejemplo, activo = 1) para mostrar el valor sólo el valor activo<br>También puedes utilizar $ID$ en el filtro como el id actual del objeto actual<br>Para hacer un SELECT en el filtro usa $SEL$<br> si desea filtrar un campo extra utilizar la sintáxis extra.fieldcode = ... (donde el código de campo es el código del campo extra) <br><br> para tener la lista en función de otra: <br> c_typent: libelle: id: parent_list_code | parent_column: filtro
-ExtrafieldParamHelpchkbxlst=Lista de parámetros viene de una tabla<br>Sintaxis: nombre_tabla: etiqueta_campo: identificador_campo :: filtro <br> Ejemplo: c_typent: libelle: id :: filtro <br> filtro puede ser una prueba simple (por ejemplo, activo = 1) para mostrar el valor sólo se activa <br> si desea filtrar un campo extra utilizar la sintáxis extra.fieldcode = ... (donde el código de campo es el código del campo extra) <br> para tener la lista en función de otra: <br> c_typent: libelle: id: parent_list_code | parent_column: filtro
+ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Los parámetros deben ser ObjectName: Classpath<br>Sintaxis: ObjectName:Classpath<br>Ejemplo: Societe:societe/class/societe.class.php
 LibraryToBuildPDF=Libreria usada en la generación de los PDF
 WarningUsingFPDF=Atención: Su archivo <b>conf.php</b> contiene la directiva <b>dolibarr_pdf_force_fpdf=1</b>. Esto hace que se use la librería FPDF para generar sus archivos PDF. Esta librería es antigua y no cubre algunas funcionalidades (Unicode, transparencia de imágenes, idiomas cirílicos, árabes o asiáticos, etc.), por lo que puede tener problemas en la generación de los PDF.<br>Para resolverlo, y disponer de un soporte completo de PDF, puede descargar la <a href="http://www.tcpdf.org/" target="_blank">librería TCPDF</a> , y a continuación comentar o eliminar la línea <b>$dolibarr_pdf_force_fpdf=1</b>, y añadir en su lugar <b>$dolibarr_lib_TCPDF_PATH='ruta_a_TCPDF'</b>
@@ -415,10 +421,10 @@ ModuleCompanyCodeDigitaria=Devuelve un código contable compuesto siguiendo el c
 Use3StepsApproval=De forma predeterminada, los pedidos a proveedor deben ser creados y aprobados por 2 usuarios diferentes (un paso/usuario para crear y un paso/usuario para aprobar. Tenga en cuenta que si el usuario tiene tanto el permiso para crear y aprobar, un paso usuario será suficiente) . Puede pedir con esta opción introducir una tercera etapa de aprobación/usuario, si la cantidad es superior a un valor específico (por lo que serán necesarios 3 pasos: 1 validación, 2=primera aprobación y 3=segunda aprobación si la cantidad es suficiente).<br>Deje vacío si una aprobación (2 pasos) es suficiente, si se establece en un valor muy bajo (0,1) se requiere siempre una segunda aprobación (3 pasos).
 UseDoubleApproval=Usar 3 pasos de aprobación si el importe (sin IVA) es mayor que...
 WarningPHPMail=ADVERTENCIA: Algunos proveedores de correo electrónico (como Yahoo) no le permiten enviar un e-mail desde otro servidor que no sea el servidor de Yahoo si la dirección de correo electrónico utilizada como remitente es su correo e-mail de Yahoo (como myemail@yahoo.com, myemail@yahoo.fr, ...). Su configuración actual utiliza el servidor de la aplicación para enviar e-mail, por lo que algunos destinatarios (compatibles con el protocolo restrictivo DMARC) le preguntarán a Yahoo si pueden aceptar su e-mail y Yahoo responderá "no" porque el servidor no es un servidor Propiedad de Yahoo, por lo que algunos de sus e-mails enviados pueden no ser aceptados. Si su proveedor de correo electrónico (como Yahoo) tiene esta restricción, debe cambiar la configuración de e-mail para elegir el método "servidor SMTP" y introdudir el servidor SMTP y credenciales proporcionadas por su proveedor de correo electrónico (pregunte a su proveedor de correo electrónico las credenciales SMTP para su cuenta).
-
+ClickToShowDescription=Click to show description
 # Modules
 Module0Name=Usuarios y grupos
-Module0Desc=Gestión de usuarios y grupos
+Module0Desc=Users / Employees and Groups management
 Module1Name=Terceros
 Module1Desc=Gestión de terceros (empresas, particulares) y contactos
 Module2Name=Comercial
@@ -519,8 +525,8 @@ Module2200Name=Precios dinámicos
 Module2200Desc=Activar el uso de expresiones matemáticas para precios
 Module2300Name=Programador
 Module2300Desc=Gestión del Trabajo programado
-Module2400Name=Events/Agenda
-Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous.
+Module2400Name=Eventos/Agenda
+Module2400Desc=Siga los eventos o citas. Registre eventos manuales en las agendas o deje a la aplicación registrar eventos automáticos para fines de seguimiento.
 Module2500Name=Gestión Electrónica de Documentos
 Module2500Desc=Permite administrar una base de documentos
 Module2600Name=API/Servicios web (servidor SOAP)
@@ -586,7 +592,7 @@ Permission34=Eliminar productos
 Permission36=Ver/gestionar los productos ocultos
 Permission38=Exportar productos
 Permission41=Leer proyectos y tareas (proyectos compartidos y proyectos de los que soy contacto). También puede introducir tiempos consumidos en tareas asignadas.
-Permission42=Create/modify projects (shared project and projects i'm contact for). Can also create tasks and assign users to project and tasks
+Permission42=Crear/modificar proyectos (proyectos compartidos y proyectos de los que soy contacto). También puede crear tareas y asignar usuarios a proyectos y tareas
 Permission44=Eliminar proyectos y tareas (compartidos o soy contacto)
 Permission45=Exportar proyectos
 Permission61=Consultar intervenciones
@@ -689,7 +695,7 @@ PermissionAdvanced253=Crear/modificar usuarios internos/externos y sus permisos
 Permission254=Modificar la contraseña de otros usuarios
 Permission255=Eliminar o desactivar otros usuarios
 Permission256=Consultar sus permisos
-Permission262=Extend access to all third parties (not only third parties that user is a sale representative). Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc). Not effective for projects (only rules on project permissions, visibility and assignement matters).
+Permission262=Extend access to all third parties (not only third parties that user is a sale representative).<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 assignement matters).
 Permission271=Consultar el CA
 Permission272=Consultar las facturas
 Permission273=Emitir las facturas
@@ -891,7 +897,7 @@ Offset=Decálogo
 AlwaysActive=Siempre activo
 Upgrade=Actualización
 MenuUpgrade=Actualización / Extensión
-AddExtensionThemeModuleOrOther=Añadir extensión (tema, módulo, etc.)
+AddExtensionThemeModuleOrOther=Deploy/install external module
 WebServer=Servidor web
 DocumentRootServer=Directorio raíz de las páginas web
 DataRootServer=Directorio raíz de los archivos de datos
@@ -998,7 +1004,7 @@ TriggerAlwaysActive=Triggers de este archivo siempre activos, ya que los módulo
 TriggerActiveAsModuleActive=Triggers de este archivo activos ya que el módulo <b>%s</b> está activado
 GeneratedPasswordDesc=Indique aquí que norma quiere utilizar para generar las contraseñas cuando quiera generar una nueva contraseña
 DictionaryDesc=Inserte aquí los datos de referencia. Puede añadir sus datos a los predefinidos.
-ConstDesc=This page allows you to edit all other parameters not available in previous pages. These are mostly reserved parameters for developers or advanced troubleshooting. For a list of options <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">check here</a>.
+ConstDesc=Esta página le permite editar todos los demás parámetros que no se encuentran en las páginas anteriores. Estos son reservados en su mayoría a desarrolladores o soluciones avanzadas. Para obtener una lista de opcoines  <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">haga clic aquí</a>.
 MiscellaneousDesc=Todos los otros parámetros relacionados con la seguridad se definen aquí.
 LimitsSetup=Configuración de límites y precisiones
 LimitsDesc=Puede definir aquí los límites y precisiones utilizados por Dolibarr
@@ -1165,10 +1171,6 @@ FreeLegalTextOnOrders=Texto libre en pedidos
 WatermarkOnDraftOrders=Marca de agua en pedidos borrador (en caso de estar vacío)
 ShippableOrderIconInList=Añadir un icono en el listado de pedidos que indica si el pedido es enviable
 BANK_ASK_PAYMENT_BANK_DURING_ORDER=Preguntar por cuenta bancaria a usar en el pedido
-##### Clicktodial #####
-ClickToDialSetup=Configuración del módulo Click To Dial
-ClickToDialUrlDesc=URL de llamada haciendo click en el icono teléfono. <br>La URL completa de llamada será: URL?login=...&password=...&caller=...&called=telellamada
-##### Bookmark4u #####
 ##### Interventions #####
 InterventionsSetup=Configuración del módulo intervenciones
 FreeLegalTextOnInterventions=Texto adicional en las fichas de intervención
@@ -1395,7 +1397,7 @@ SendingsSetup=Configuración del módulo Expediciones
 SendingsReceiptModel=Modelo de notas de entrega
 SendingsNumberingModules=Módulos de numeración de notas de entrega
 SendingsAbility=Soporte de hojas de envío para entregas a clientes
-NoNeedForDeliveryReceipts=En la mayoría de los casos, las notas de entrega (lista de productos enviados) también actúan como notas de recepción y son firmadas por el cliente. La gestión de las notas de recepción es por lo tanto redundante y rara vez se activará.
+NoNeedForDeliveryReceipts=In most cases, shipping sheets are used both as sheets for customer deliveries (list of products to send) and sheets that is received and signed by customer. So product deliveries receipts is a duplicated feature and is rarely activated.
 FreeLegalTextOnShippings=Texto libre en envíos
 ##### Deliveries #####
 DeliveryOrderNumberingModules=Módulos de numeración de las notas de recepción
@@ -1475,9 +1477,11 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Establecer automáticamente este valor por defecto
 AGENDA_DEFAULT_FILTER_TYPE=Establecer por defecto este tipo de evento en el filtro de búsqueda en la vista de la agenda
 AGENDA_DEFAULT_FILTER_STATUS=Establecer por defecto este estado de eventos en el filtro de búsqueda en la vista de la agenda
 AGENDA_DEFAULT_VIEW=Establecer la pestaña por defecto al seleccionar el menú Agenda
-AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
-AGENDA_NOTIFICATION_SOUND=Enable sound notification
-##### ClickToDial #####
+AGENDA_NOTIFICATION=Activar notificación de eventos en el navegador cuando se alcanza la fecha del evento (el usuario puede rechazar las notificaciones en la pregunta de confirmación del explorador)
+AGENDA_NOTIFICATION_SOUND=Activar sonido de notificación
+##### Clicktodial #####
+ClickToDialSetup=Configuración del módulo Click To Dial
+ClickToDialUrlDesc=URL de llamada haciendo click en el icono teléfono. <br>La URL completa de llamada será: URL?login=...&password=...&caller=...&called=telellamada
 ClickToDialDesc=Este módulo permite hacer clicables los números de teléfono. Un clic en este icono hará que su teléfono llame al número de teléfono. Esto puede ser usado para llamar a un sistema de centralitas desde Dolibarr que puede llamar al número de teléfono en un sistema SIP, por ejemplo.
 ClickToDialUseTelLink=Utilice el enlace "tel:" que aparece en los números de teléfono
 ClickToDialUseTelLinkDesc=Utilice este método si los usuarios tienen un softphone o una interfaz de software instalado en mismo equipo que el navegador, y se llama al hacer clic en un enlace en el navegador que comienza con "tel:". Si necesita una solución de servidor completa (sin necesidad de instalación de software local), debe establecer este en "No" y rellenar siguiente campo.
@@ -1505,10 +1509,11 @@ EndPointIs=Los clientes SOAP deberán enviar sus solicitudes al punto final en l
 ##### API ####
 ApiSetup=Configuración del módulo API
 ApiDesc=Mediante la activación de este módulo, Dolibarr se convierte en un servidor REST ofreciendo diversos servicios web.
-ApiProductionMode=Activar el modo de producción (esto activará uso de cachés para la gestión de los servicios)
+ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
 ApiExporerIs=Puede explorar las API en la url
 OnlyActiveElementsAreExposed=Sólo son expuestos los elementos de los módulos activos
 ApiKey=Clave para API
+WarningAPIExplorerDisabled=The API explorer has been disabled. API explorer is not required to provide API services. It is a tool for developer to find/test REST APIs. If you need this tool, go into setup of module API REST to activate it.
 ##### Bank #####
 BankSetupModule=Configuración del módulo Banco
 FreeLegalTextOnChequeReceipts=Mención complementaria en las remesas de cheques
@@ -1577,7 +1582,7 @@ 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:
 SomethingMakeInstallFromWebNotPossible2=Por esta razón, explicaremos aquí los pasos del proceso de actualización manual que puede realizar un usuario con privilegios. 
 InstallModuleFromWebHasBeenDisabledByFile=La instalación de módulos externos desde la aplicación se encuentra desactivada por el administrador. Debe requerirle que elimine el archivo <strong>%s</strong> para habilitar esta funcionalidad.
-ConfFileMuseContainCustom=Instalar un módulo externo desde la aplicación necesita guardar los archivos del módulo en el directorio <strong>%s</strong>. Para que este directorio pueda ser procesado por Dolibarr, necesita configurar su <strong>conf/conf.php</strong> para disponer de la opción<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
+ConfFileMuseContainCustom=Installing an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Resaltar líneas de los listados cuando el ratón pasa por encima de ellas
 HighlightLinesColor=Resalta el color de la línea cuando el ratón pasa por encima (mantener vacío para no resaltar)
 TextTitleColor=Color para la página de título
@@ -1607,6 +1612,7 @@ FixTZ=Corrección de zona horaria
 FillFixTZOnlyIfRequired=Ejemplo: +2 (complete sólo si tiene problemas)
 ExpectedChecksum=Esperando la suma de comprobación
 CurrentChecksum=Suma de comprobación actual
+ForcedConstants=Required constant values
 MailToSendProposal=Para enviar presupuesto a cliente
 MailToSendOrder=Para enviar pedido de cliente
 MailToSendInvoice=Para enviar factura a cliente
@@ -1615,9 +1621,10 @@ MailToSendIntervention=Para enviar intervención
 MailToSendSupplierRequestForQuotation=Para enviar solicitud de presupuesto de proveedor
 MailToSendSupplierOrder=Para enviar pedido a proveedor
 MailToSendSupplierInvoice=Para enviar factura de proveedor
+MailToSendContract=To send a contract
 MailToThirdparty=Para enviar e-mail desde la página del tercero
 ByDefaultInList=Mostrar por defecto en modo lista
-YouUseLastStableVersion=Debe usar la última versión estable
+YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=Ejemplo de mensaje que puede usar para anunciar esta release mayor (no dude en usarlo en sus sitios web)
 TitleExampleForMaintenanceRelease=Ejemplo de mensaje que puede usar para anunciar esta versión de mantenimiento (no dude en usarlo en sus sitios web)
 ExampleOfNewsMessageForMajorRelease=Disponible ERP/CRM Dolibarr %s. La versión %s es una versión mayor con un montón de nuevas características, tanto para usuarios como para desarrolladores. Se puede descargar desde la sección de descargas del portal https://www.dolibarr.org (subdirectorio versiones estables). Puede leer <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> para ver la lista completa de los cambios.
diff --git a/htdocs/langs/es_ES/banks.lang b/htdocs/langs/es_ES/banks.lang
index 79a7bf22fad..e0b3ba4abc3 100644
--- a/htdocs/langs/es_ES/banks.lang
+++ b/htdocs/langs/es_ES/banks.lang
@@ -74,13 +74,13 @@ Conciliate=Conciliar
 Conciliation=Conciliación
 ReconciliationLate=Conciliación tardía
 IncludeClosedAccount=Incluir cuentas cerradas
-OnlyOpenedAccount=Sólo cuentas abiertas
+OnlyOpenedAccount=Solamente cuentas abiertas
 AccountToCredit=Cuenta de crédito
 AccountToDebit=Cuenta de débito
 DisableConciliation=Desactivar la función de conciliación para esta cuenta
 ConciliationDisabled=Función de conciliación desactivada
 LinkedToAConciliatedTransaction=Enlazado a un registro conciliado
-StatusAccountOpened=Abierta
+StatusAccountOpened=Abierto
 StatusAccountClosed=Cerrada
 AccountIdShort=Número
 LineRecord=Registro
diff --git a/htdocs/langs/es_ES/bills.lang b/htdocs/langs/es_ES/bills.lang
index 4d40eddea1c..a28a3d3b60a 100644
--- a/htdocs/langs/es_ES/bills.lang
+++ b/htdocs/langs/es_ES/bills.lang
@@ -2,12 +2,12 @@
 Bill=Factura
 Bills=Facturas
 BillsCustomers=Facturas a clientes
-BillsCustomer=Factura a clientes
+BillsCustomer=Factura a cliente
 BillsSuppliers=Facturas de proveedores
-BillsCustomersUnpaid=Facturas a clientes pendientes de cobro
-BillsCustomersUnpaidForCompany=Facturas a clientes pendientes de cobro de %s
-BillsSuppliersUnpaid=Facturas de proveedores pendientes de pago
-BillsSuppliersUnpaidForCompany=Facturas de proveedores pendientes de pago de %s
+BillsCustomersUnpaid=Facturas a cliente pendientes de cobro
+BillsCustomersUnpaidForCompany=Unpaid customer invoices for %s
+BillsSuppliersUnpaid=Facturas de proveedor pendientes de pago
+BillsSuppliersUnpaidForCompany=Unpaid supplier invoices for %s
 BillsLate=Retraso en el pago
 BillsStatistics=Estadísticas de facturas a clientes
 BillsStatisticsSuppliers=Estadísticas de facturas de proveedores
@@ -63,7 +63,7 @@ paymentInInvoiceCurrency=en la divisa de las facturas
 PaidBack=Reembolsado
 DeletePayment=Eliminar el pago
 ConfirmDeletePayment=¿Está seguro de querer eliminar este pago?
-ConfirmConvertToReduc=¿Quiere convertir este abono en una reducción futura?<br>El importe de este abono se almacenará para este cliente. Podrá utilizarse para reducir el importe de una próxima factura del cliente.
+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.
 SupplierPayments=Pagos a proveedores
 ReceivedPayments=Pagos recibidos
 ReceivedCustomersPayments=Pagos recibidos de cliente
@@ -78,6 +78,7 @@ PaymentMode=Forma de pago
 PaymentTypeDC=Tarjeta de Débito/Crédito
 PaymentTypePP=PayPal
 IdPaymentMode=Tipo de pago (id)
+CodePaymentMode=Payment type (code)
 LabelPaymentMode=Tipo de pago (etiqueta)
 PaymentModeShort=Forma de pago
 PaymentTerm=Condición de pago
@@ -102,9 +103,10 @@ SearchACustomerInvoice=Buscar una factura a cliente
 SearchASupplierInvoice=Buscar una factura de proveedor
 CancelBill=Anular una factura
 SendRemindByMail=Enviar recordatorio
-DoPayment=Emitir pago
-DoPaymentBack=Emitir reembolso
+DoPayment=Enter payment
+DoPaymentBack=Enter refund
 ConvertToReduc=Convertir en reducción futura
+ConvertExcessReceivedToReduc=Convert excess received into future discount
 EnterPaymentReceivedFromCustomer=Añadir pago recibido de cliente
 EnterPaymentDueToCustomer=Realizar pago de abonos al cliente
 DisabledBecauseRemainderToPayIsZero=Desactivado ya que el resto a pagar es 0
@@ -113,24 +115,24 @@ BillStatus=Estado de la factura
 StatusOfGeneratedInvoices=Estado de las facturas generadas
 BillStatusDraft=Borrador (a validar)
 BillStatusPaid=Pagada
-BillStatusPaidBackOrConverted=Refund or converted into discount
+BillStatusPaidBackOrConverted=Reembolsada o convertida en descuento
 BillStatusConverted=Pagada (lista para factura final)
 BillStatusCanceled=Abandonada
 BillStatusValidated=Validada (a pagar)
 BillStatusStarted=Pagada parcialmente
 BillStatusNotPaid=Pendiente de pago
-BillStatusNotRefunded=Not refunded
+BillStatusNotRefunded=No reembolsada
 BillStatusClosedUnpaid=Cerrada (pendiente de pago)
 BillStatusClosedPaidPartially=Cerrada (pagada parcialmente)
 BillShortStatusDraft=Borrador
 BillShortStatusPaid=Pagada
-BillShortStatusPaidBackOrConverted=Refund or converted
+BillShortStatusPaidBackOrConverted=Reembolsada o convertida
 BillShortStatusConverted=Tratada
 BillShortStatusCanceled=Abandonada
 BillShortStatusValidated=Validada
 BillShortStatusStarted=Pago parcial
 BillShortStatusNotPaid=Pte. pago
-BillShortStatusNotRefunded=Not refunded
+BillShortStatusNotRefunded=No reembolsada
 BillShortStatusClosedUnpaid=Cerrada (pte. pago)
 BillShortStatusClosedPaidPartially=Cerrada (pago parcial)
 PaymentStatusToValidShort=A validar
@@ -151,14 +153,14 @@ NoQualifiedRecurringInvoiceTemplateFound=Sin plantilla de factura recurrente apt
 FoundXQualifiedRecurringInvoiceTemplate=Encontradas %s plantilllas de facturas recurrentes aptas para la generación
 NotARecurringInvoiceTemplate=No es una plantilla de factura recurrente
 NewBill=Nueva factura
-LastBills=Las %s últimas facturas
-LastCustomersBills=Las %s últimas facturas a clientes
-LastSuppliersBills=Las %s últimas facturas de proveedores
+LastBills=Latest %s invoices
+LastCustomersBills=Latest %s customer invoices
+LastSuppliersBills=Latest %s supplier invoices
 AllBills=Todas las facturas
 OtherBills=Otras facturas
 DraftBills=Facturas borrador
-CustomersDraftInvoices=Facturas a clientes borrador
-SuppliersDraftInvoices=Facturas de proveedores borrador
+CustomersDraftInvoices=Customer draft invoices
+SuppliersDraftInvoices=Supplier draft invoices
 Unpaid=Pendientes
 ConfirmDeleteBill=¿Está seguro de querer eliminar esta factura?
 ConfirmValidateBill=¿Está seguro de querer validar esta factura con referencia <b>%s</b>?
@@ -205,7 +207,7 @@ AlreadyPaidNoCreditNotesNoDeposits=Ya pagado (excluidos los abonos y anticipos)
 Abandoned=Abandonada
 RemainderToPay=Resta por pagar
 RemainderToTake=Resta por cobrar
-RemainderToPayBack=Remaining amount to refund
+RemainderToPayBack=Resta por reembolsar
 Rest=Pendiente
 AmountExpected=Importe reclamado
 ExcessReceived=Recibido en exceso
@@ -272,6 +274,7 @@ Deposit=Anticipo
 Deposits=Anticipos
 DiscountFromCreditNote=Descuento resultante del abono %s
 DiscountFromDeposit=Pagos de la factura de anticipo %s
+DiscountFromExcessReceived=Payments from excess received of invoice %s
 AbsoluteDiscountUse=Este tipo de descuento no puede ser utilizado en una factura antes de su validación
 CreditNoteDepositUse=La factura debe ser validada para usar este tipo de crédito.
 NewGlobalDiscount=Nuevo descuento fijo
@@ -279,8 +282,8 @@ NewRelativeDiscount=Nuevo descuento
 NoteReason=Nota/Motivo
 ReasonDiscount=Motivo
 DiscountOfferedBy=Acordado por
-DiscountStillRemaining=Descuentos fijos pendientes
-DiscountAlreadyCounted=Descuentos fijos ya aplicados
+DiscountStillRemaining=Discounts available
+DiscountAlreadyCounted=Discounts already consumed
 BillAddress=Dirección de facturación
 HelpEscompte=Un <b>descuento</b> es un descuento acordado sobre una factura dada, a un cliente que realizó su pago mucho antes del vencimiento.
 HelpAbandonBadCustomer=Este importe se abandonó (cliente juzgado como moroso) y se considera como una pérdida excepcional.
@@ -333,6 +336,8 @@ InvoiceAutoValidate=Validar facturas automáticamente
 GeneratedFromRecurringInvoice=Generado desde la plantilla de facturas recurrentes %s
 DateIsNotEnough=Aún no se ha alcanzado la fecha
 InvoiceGeneratedFromTemplate=Factura %s generada desde la plantilla de factura recurrente %s
+WarningInvoiceDateInFuture=Warning, the invoice date is higher than current date
+WarningInvoiceDateTooFarInFuture=Warning, the invoice date is too far from current date
 # PaymentConditions
 Statut=Estado
 PaymentConditionShortRECEP=Acuse de recibo
@@ -351,6 +356,14 @@ PaymentConditionShortPT_ORDER=Orden
 PaymentConditionPT_ORDER=A la recepción del pedido
 PaymentConditionShortPT_5050=50/50
 PaymentConditionPT_5050=Pago 50%% por adelantado, 50%% a la 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
 FixAmount=Importe fijo
 VarAmount=Importe variable (%% total)
 # PaymentType
@@ -420,7 +433,7 @@ ChequeDeposits=Depósito de cheques
 Cheques=Cheques
 DepositId=Id. depósito
 NbCheque=Número de cheques
-CreditNoteConvertedIntoDiscount=Este abono se convirtió en %s
+CreditNoteConvertedIntoDiscount=This %s has been converted into %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
 ShowUnpaidAll=Mostrar todos los pendientes
 ShowUnpaidLateOnly=Mostrar los pendientes en retraso solamente
diff --git a/htdocs/langs/es_ES/boxes.lang b/htdocs/langs/es_ES/boxes.lang
index 02287fbd050..11bf2fb13d0 100644
--- a/htdocs/langs/es_ES/boxes.lang
+++ b/htdocs/langs/es_ES/boxes.lang
@@ -25,8 +25,8 @@ BoxTitleLastSuppliers=Últimos %s proveedores registrados
 BoxTitleLastModifiedSuppliers=Últimos %s proveedores modificados
 BoxTitleLastModifiedCustomers=Últimos %s clientes modificados
 BoxTitleLastCustomersOrProspects=Últimos %s clientes o clientes potenciales
-BoxTitleLastCustomerBills=Últimas %s facturas a clientes
-BoxTitleLastSupplierBills=Últimas %s facturas de proveedores
+BoxTitleLastCustomerBills=Latest %s customer invoices
+BoxTitleLastSupplierBills=Latest %s supplier invoices
 BoxTitleLastModifiedProspects=Últimos %s presupuestos modificados
 BoxTitleLastModifiedMembers=Últimos %s miembros
 BoxTitleLastFicheInter=Últimas %s intervenciones modificadas
@@ -51,12 +51,12 @@ ClickToAdd=Haga clic aquí para añadir.
 NoRecordedCustomers=Ningún cliente registrado
 NoRecordedContacts=Ningún contacto registrado
 NoActionsToDo=Sin eventos a realizar
-NoRecordedOrders=Sin pedidos de clientes registrados
+NoRecordedOrders=No recorded customer orders
 NoRecordedProposals=Sin presupuestos registrados
-NoRecordedInvoices=Sin facturas a clientes registrados
-NoUnpaidCustomerBills=Sin facturas a clientes pendientes de pago
-NoUnpaidSupplierBills=Sin facturas de proveedores pendientes de pago
-NoModifiedSupplierBills=Sin facturas de proveedores modificadas
+NoRecordedInvoices=No recorded customer invoices
+NoUnpaidCustomerBills=No unpaid customer invoices
+NoUnpaidSupplierBills=No unpaid supplier invoices
+NoModifiedSupplierBills=No recorded supplier invoices
 NoRecordedProducts=Sin productos/servicios registrados
 NoRecordedProspects=Sin clientes potenciales registrados
 NoContractedProducts=Sin productos/servicios contratados
diff --git a/htdocs/langs/es_ES/cashdesk.lang b/htdocs/langs/es_ES/cashdesk.lang
index c05167aed05..326ccef53bb 100644
--- a/htdocs/langs/es_ES/cashdesk.lang
+++ b/htdocs/langs/es_ES/cashdesk.lang
@@ -25,7 +25,7 @@ Difference=Diferencia
 TotalTicket=Total
 NoVAT=Sin IVA en esta venta
 Change=Cambio
-BankToPay=Account for payment
+BankToPay=Cuenta de pago
 ShowCompany=Ver empresa
 ShowStock=Ver almacén
 DeleteArticle=Haga clic para quitar este artículo
diff --git a/htdocs/langs/es_ES/companies.lang b/htdocs/langs/es_ES/companies.lang
index f62cb5251b4..5665819eec9 100644
--- a/htdocs/langs/es_ES/companies.lang
+++ b/htdocs/langs/es_ES/companies.lang
@@ -78,9 +78,10 @@ VATIsNotUsed=No sujeto a IVA
 CopyAddressFromSoc=Copiar dirección de la empresa
 ThirdpartyNotCustomerNotSupplierSoNoRef=Tercero que no es cliente ni proveedor, sin objetos referenciados
 PaymentBankAccount=Cuenta bancaria de pago
-OverAllProposals=Total proposals
-OverAllOrders=Total orders
-OverAllInvoices=Total invoices
+OverAllProposals=Total presupuestos
+OverAllOrders=Total pedidos
+OverAllInvoices=Total facturas
+OverAllSupplierProposals=Total price requests
 ##### Local Taxes #####
 LocalTax1IsUsed=Usar segunda tasa
 LocalTax1IsUsedES= Sujeto a RE
@@ -389,9 +390,9 @@ ListCustomersShort=Listado de clientes
 ThirdPartiesArea=Área terceros y contactos
 LastModifiedThirdParties=Últimos %s terceros modificados
 UniqueThirdParties=Total de terceros únicos
-InActivity=Activo
+InActivity=Abierto
 ActivityCeased=Cerrado
-ThirdPartyIsClosed=Third party is closed
+ThirdPartyIsClosed=El tercero está cerrado
 ProductsIntoElements=Lista de productos/servicios en %s
 CurrentOutstandingBill=Riesgo alcanzado
 OutstandingBill=Importe máximo para facturas pendientes
@@ -404,7 +405,7 @@ MergeThirdparties=Fusionar terceros
 ConfirmMergeThirdparties=¿Está seguro de que quiere fusionar este tercero con el actual? Todos los objetos relacionados (facturas, pedidos, etc.) se moverán al tercero actual, por lo que será capaz de eliminar el duplicado.
 ThirdpartiesMergeSuccess=Los terceros han sido fusionados
 SaleRepresentativeLogin=Inicio de sesión del comercial
-SaleRepresentativeFirstname=Nombre del comercial
-SaleRepresentativeLastname=Apellidos del comercial
+SaleRepresentativeFirstname=First name of sales representative
+SaleRepresentativeLastname=Last name of sales representative
 ErrorThirdpartiesMerge=Se produjo un error al eliminar los terceros. Por favor, compruebe el log. Los cambios han sido anulados.
 NewCustomerSupplierCodeProposed=El código de cliente o proveedor sugerido se encuentra duplicado
diff --git a/htdocs/langs/es_ES/compta.lang b/htdocs/langs/es_ES/compta.lang
index e4586f69622..d8915b34e50 100644
--- a/htdocs/langs/es_ES/compta.lang
+++ b/htdocs/langs/es_ES/compta.lang
@@ -65,6 +65,7 @@ PaymentSocialContribution=Pagos tasas sociales/fiscales
 PaymentVat=Pago IVA
 ListPayment=Listado de pagos
 ListOfCustomerPayments=Listado de pagos de clientes
+ListOfSupplierPayments=Listado de pagos a proveedores
 DateStartPeriod=Fecha inicio periodo
 DateEndPeriod=Fecha final periodo
 newLT1Payment=Nuevo pago de RE
@@ -81,7 +82,7 @@ LT2PaymentES=Pago IRPF
 LT2PaymentsES=Pagos IRPF
 VATPayment=Pago IVA
 VATPayments=Pagos IVA
-VATRefund=Devolución IVA
+VATRefund=Sales tax refund
 Refund=Devolución
 SocialContributionsPayments=Pagos tasas sociales/fiscales
 ShowVatPayment=Ver pagos IVA
@@ -194,7 +195,7 @@ CloneTax=Clonar una tasa social/fiscal
 ConfirmCloneTax=Confirmar la clonación de una tasa social/fiscal
 CloneTaxForNextMonth=Clonarla para el próximo mes
 SimpleReport=informe simple
-AddExtraReport=Extra reports (add foreign and national customer report)
+AddExtraReport=Informes adicionales (añade informe de clientes extranjeros y nacionales)
 OtherCountriesCustomersReport=Informe de clientes extranjeros
 BasedOnTwoFirstLettersOfVATNumberBeingDifferentFromYourCompanyCountry=Basado en que las dos primeras letras del IVA intracomunitario sea diferente al de el código de país de su empresa
 SameCountryCustomersWithVAT=Informe de clientes nacionales
diff --git a/htdocs/langs/es_ES/cron.lang b/htdocs/langs/es_ES/cron.lang
index 7e8e1761115..ccbc726e6ec 100644
--- a/htdocs/langs/es_ES/cron.lang
+++ b/htdocs/langs/es_ES/cron.lang
@@ -17,8 +17,8 @@ CronMethodDoesNotExists=La clase %s no contiene ningún método %s
 # Menu
 EnabledAndDisabled=Habilitado y deshabilitado
 # Page list
-CronLastOutput=Res. ult. ejec.
-CronLastResult=Últ. cód. res.
+CronLastOutput=Latest run output
+CronLastResult=Latest result code
 CronCommand=Comando
 CronList=Tareas programadas
 CronDelete=Borrar tareas programadas
diff --git a/htdocs/langs/es_ES/errors.lang b/htdocs/langs/es_ES/errors.lang
index 9ed4d1f35b9..24cac4e7d8e 100644
--- a/htdocs/langs/es_ES/errors.lang
+++ b/htdocs/langs/es_ES/errors.lang
@@ -11,6 +11,7 @@ ErrorLoginAlreadyExists=El login %s ya existe.
 ErrorGroupAlreadyExists=El grupo %s ya existe.
 ErrorRecordNotFound=Registro no encontrado
 ErrorFailToCopyFile=Error al copiar el archivo '<b>%s</b>' en '<b>%s</b>'.
+ErrorFailToCopyDir=Failed to copy directory '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToRenameFile=Error al renombrar el archivo '<b>%s</b>' a '<b>%s</b>'.
 ErrorFailToDeleteFile=Error al eliminar el archivo '<b>%s</b>'.
 ErrorFailToCreateFile=Error al crear el archivo  '<b>%s</b>'
@@ -115,7 +116,7 @@ ErrorNoActivatedBarcode=No hay activado ningún tipo de código de barras
 ErrUnzipFails=No se ha podido descomprimir el archivo %s con ZipArchive
 ErrNoZipEngine=En este PHP no hay motor para descomprimir el archivo %s
 ErrorFileMustBeADolibarrPackage=El archivo %s debe ser un paquete Dolibarr en formato zip
-ErrorFileRequired=Se requiere un archivo de paquete Dolibarr en formato zip
+ErrorModuleFileRequired=You must select a Dolibarr module package file
 ErrorPhpCurlNotInstalled=La extensión PHP CURL no se encuentra instalada, es indispensable para dialogar con Paypal.
 ErrorFailedToAddToMailmanList=Ha ocurrido un error al intentar añadir un registro a la lista Mailman o base de datos SPIP
 ErrorFailedToRemoveToMailmanList=Error en la eliminación de %s de la lista Mailmain %s o base SPIP
@@ -179,8 +180,10 @@ ErrorModuleNotFound=No se ha encontrado el archivo del módulo.
 ErrorFieldAccountNotDefinedForBankLine=Valor para la cuenta contable no definida para la línea bancaria origen %s
 ErrorBankStatementNameMustFollowRegex=Error, el nombre de estado de la cuenta bancaria debe seguir la siguiente regla de sintaxis %s
 ErrorPhpMailDelivery=Compruebe que no use un número demasiado alto de destinatarios y que su contenido de correo electrónico no sea similar a un Spam. Pida también a su administrador que verifique el cortafuegos y los archivos  de los registros del servidor para obtener una información más completa.
-ErrorUserNotAssignedToTask=User must be assigned to task to be able to enter time consumed.
-ErrorTaskAlreadyAssigned=Task already assigned to user
+ErrorUserNotAssignedToTask=El usuario debe ser asignado a la tarea para que pueda ingresar tiempo consumido.
+ErrorTaskAlreadyAssigned=Tarea ya asignada al usuario
+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>
 
 # 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.
diff --git a/htdocs/langs/es_ES/exports.lang b/htdocs/langs/es_ES/exports.lang
index 815f6e6e0f6..882a654002d 100644
--- a/htdocs/langs/es_ES/exports.lang
+++ b/htdocs/langs/es_ES/exports.lang
@@ -110,7 +110,7 @@ Enclosure=Delimitador de campos
 SpecialCode=Código especial
 ExportStringFilter=%% permite reemplazar uno o más carácteres en el texto
 ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : filtros por un año/mes/día<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD : filtros entre un rango de años/meses/días<br> > YYYY, > YYYYMM, > YYYYMMDD : filtros en todos los años/meses/días siguientes <br> < YYYY, < YYYYMM, < YYYYMMDD : filtros en todos los años/meses/días anteriores 
-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
+ExportNumericFilter=NNNNN filtros por un valor<br>NNNNN+NNNNN filtros por un rango de valores<br>< NNNNN filtros por valores bajos<br>> NNNNN filteros por valores altos
 ImportFromLine=Empezar la importación desde la línea nº
 EndAtLineNb=Terminar en la línea nº
 SetThisValueTo2ToExcludeFirstLine=Por ejemplo, indicar 3 para excluir las 2 primeras líneas
diff --git a/htdocs/langs/es_ES/holiday.lang b/htdocs/langs/es_ES/holiday.lang
index f4a68e20e36..bcb16ff6c22 100644
--- a/htdocs/langs/es_ES/holiday.lang
+++ b/htdocs/langs/es_ES/holiday.lang
@@ -76,8 +76,8 @@ BoxTitleLastLeaveRequests=Últimos %s días retribuidos
 HolidaysMonthlyUpdate=Actualización mensual
 ManualUpdate=Actualización manual
 HolidaysCancelation=Anulación días libres
-EmployeeLastname=Apellidos empleado
-EmployeeFirstname=Nombre empleado
+EmployeeLastname=Employee last name
+EmployeeFirstname=Employee first name
 TypeWasDisabledOrRemoved=El tipo de día libre (id %s) ha sido desactivado o eliminado
 
 ## Configuration du Module ##
diff --git a/htdocs/langs/es_ES/interventions.lang b/htdocs/langs/es_ES/interventions.lang
index 20bf774b8e7..4ec5620c045 100644
--- a/htdocs/langs/es_ES/interventions.lang
+++ b/htdocs/langs/es_ES/interventions.lang
@@ -41,7 +41,7 @@ InterventionDeletedInDolibarr=Intervención %s eliminada
 InterventionsArea=Área intervenciones
 DraftFichinter=Intervenciones borrador
 LastModifiedInterventions=Últimas %s intervenciones modificadas
-FichinterToProcess=Interventions to process
+FichinterToProcess=Intervenciones a procesar
 ##### Types de contacts #####
 TypeContact_fichinter_external_CUSTOMER=Contacto cliente seguimiento intervención
 # Modele numérotation
diff --git a/htdocs/langs/es_ES/languages.lang b/htdocs/langs/es_ES/languages.lang
index b3ad4084a0f..037075e12a9 100644
--- a/htdocs/langs/es_ES/languages.lang
+++ b/htdocs/langs/es_ES/languages.lang
@@ -12,7 +12,7 @@ Language_de_DE=Alemán
 Language_de_AT=Alemán (Austria)
 Language_de_CH=Alemán (Suiza)
 Language_el_GR=Griego
-Language_el_CY=Greek (Cyprus)
+Language_el_CY=Griego (Chipre)
 Language_en_AU=Inglés (Australia)
 Language_en_CA=Inglés (Canadá)
 Language_en_GB=Inglés (Reino Unido)
diff --git a/htdocs/langs/es_ES/ldap.lang b/htdocs/langs/es_ES/ldap.lang
index b0ec3358ba8..bde6f38ab4f 100644
--- a/htdocs/langs/es_ES/ldap.lang
+++ b/htdocs/langs/es_ES/ldap.lang
@@ -13,8 +13,8 @@ LDAPUsers=Usuarios en la base de datos LDAP
 LDAPFieldStatus=Estatuto
 LDAPFieldFirstSubscriptionDate=Fecha primera adhesión
 LDAPFieldFirstSubscriptionAmount=Importe primera adhesión
-LDAPFieldLastSubscriptionDate=Fecha última adhesión
-LDAPFieldLastSubscriptionAmount=Importe última adhesión
+LDAPFieldLastSubscriptionDate=Latest subscription date
+LDAPFieldLastSubscriptionAmount=Latest subscription amount
 LDAPFieldSkype=Id Skype
 LDAPFieldSkypeExample=Ejemplo: nombreskype
 UserSynchronized=Usuario sincronizado
diff --git a/htdocs/langs/es_ES/loan.lang b/htdocs/langs/es_ES/loan.lang
index ada29e599de..e86cec91bac 100644
--- a/htdocs/langs/es_ES/loan.lang
+++ b/htdocs/langs/es_ES/loan.lang
@@ -43,7 +43,7 @@ LoanCalcDesc=Esta <b> calculadora de hipotecas </b> puede utilizarse para calcul
 GoToInterest=%s se destinará al INTERÉS
 GoToPrincipal=%s se destinará al PRINCIPAL
 YouWillSpend=Pagará %s en el año %s
-ListLoanAssociatedProject=List of loan associated with the project
+ListLoanAssociatedProject=Listado de préstamos asociados al proyecto
 # Admin
 ConfigLoan=Configuración del módulo préstamos
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Cuenta contable por defecto para el capital
diff --git a/htdocs/langs/es_ES/mails.lang b/htdocs/langs/es_ES/mails.lang
index 7498ed3e112..32f30c0f5cd 100644
--- a/htdocs/langs/es_ES/mails.lang
+++ b/htdocs/langs/es_ES/mails.lang
@@ -74,14 +74,18 @@ ResultOfMailSending=Resultado del envío masivo de e-mails
 NbSelected=Nº seleccionados
 NbIgnored=Nº ignorados
 NbSent=Nº enviados
-ContactsWithThirdpartyFilter=Filtro de contactos con tercero
+ConfirmUnvalidateEmailing=Are you sure you want to change email <b>%s</b> to draft status?
+MailingModuleDescContactsWithThirdpartyFilter=Filtro de contactos con tercero
+MailingModuleDescContactsByCompanyCategory=Contacts by third party category
+MailingModuleDescContactsByCategory=Contacts by categories
+MailingModuleDescContactsByFunction=Contacts by position
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Línea %s en archivo
 RecipientSelectionModules=Módulos de selección de los destinatarios
 MailSelectedRecipients=Destinatarios seleccionados
 MailingArea=Área E-Mailings
-LastMailings=Los %s últimos E-Mailings
+LastMailings=Latest %s emailings
 TargetsStatistics=Estadísticas destinatarios
 NbOfCompaniesContacts=Contactos/direcciones únicos
 MailNoChangePossible=Destinatarios de un E-Mailing validado no modificables
@@ -146,3 +150,6 @@ AdvTgtCreateFilter=Crear filtro
 AdvTgtOrCreateNewFilter=Nombre del nuevo filtro
 NoContactWithCategoryFound=No se han encontrado contactos/direcciones con alguna categoría
 NoContactLinkedToThirdpartieWithCategoryFound=No se han encontrado contactos/direcciones con alguna categoría
+OutGoingEmailSetup=Outgoing email setup
+InGoingEmailSetup=Incoming email setup
+
diff --git a/htdocs/langs/es_ES/main.lang b/htdocs/langs/es_ES/main.lang
index 4a8b651bc0a..5d1cd73fc20 100644
--- a/htdocs/langs/es_ES/main.lang
+++ b/htdocs/langs/es_ES/main.lang
@@ -63,12 +63,13 @@ ErrorNoVATRateDefinedForSellerCountry=Error, ningún tipo de IVA definido para e
 ErrorNoSocialContributionForSellerCountry=Error, ningún tipo de tasa social/fiscal definida para el país '%s'.
 ErrorFailedToSaveFile=Error, el registro del archivo falló.
 ErrorCannotAddThisParentWarehouse=Intenta añadir un almacén padre que ya es hijo del actual
-MaxNbOfRecordPerPage=Max nb of record per page
+MaxNbOfRecordPerPage=Nº máximo de registros por página
 NotAuthorized=No está autorizado para hacer esto.
 SetDate=Fijar fecha
 SelectDate=Seleccione una fecha
 SeeAlso=Ver también %s
 SeeHere=Vea aquí
+Apply=Aplicar
 BackgroundColorByDefault=Color de fondo
 FileRenamed=El archivo ha sido renombrado correctamente
 FileUploaded=El archivo se ha subido correctamente
@@ -87,7 +88,7 @@ Undefined=No definido
 PasswordForgotten=¿Olvidó su contraseña?
 SeeAbove=Mencionado anteriormente
 HomeArea=Área inicio
-LastConnexion=Última conexión
+LastConnexion=Latest connection
 PreviousConnexion=Conexión anterior
 PreviousValue=Valor previo
 ConnectedOnMultiCompany=Conexión a la entidad
@@ -237,7 +238,7 @@ DateCreation=Fecha de creación
 DateCreationShort=Fecha creación
 DateModification=Fecha de modificación
 DateModificationShort=Fecha modif.
-DateLastModification=Fecha última modificación
+DateLastModification=Latest modification date
 DateValidation=Fecha de validación
 DateClosing=Fecha de cierre
 DateDue=Fecha de vencimiento
@@ -433,7 +434,7 @@ Reportings=Informes
 Draft=Borrador
 Drafts=Borradores
 Validated=Validado
-Opened=Activo
+Opened=Abierto
 New=Nuevo
 Discount=Descuento
 Unknown=Desconocido
@@ -461,7 +462,7 @@ DeletePicture=Eliminar imagen
 ConfirmDeletePicture=¿Confirma la eliminación de la imagen?
 Login=Login
 CurrentLogin=Login actual
-EnterLoginDetail=Enter login details
+EnterLoginDetail=Introduzca los datos de inicio de sesión
 January=enero
 February=febrero
 March=marzo
@@ -599,6 +600,8 @@ SessionName=Nombre sesión
 Method=Método
 Receive=Recepción
 CompleteOrNoMoreReceptionExpected=Completado o no se espera más
+ExpectedValue=Expected Value
+CurrentValue=Valor actual
 PartialWoman=Parcial
 TotalWoman=Total
 NeverReceived=Nunca recibido
@@ -756,6 +759,7 @@ SomeTranslationAreUncomplete=Algunos idiomas pueden estar parcialmente traducido
 DirectDownloadLink=Enlace de descarga directa
 Download=Descargar
 ActualizeCurrency=Actualizar el tipo de cambio
+Fiscalyear=Año fiscal
 # Week day
 Monday=Lunes
 Tuesday=Martes
@@ -790,8 +794,8 @@ SetRef=Establecer ref
 Select2ResultFoundUseArrows=Varios resultados encontrados. Use las flechas para seleccionar.
 Select2NotFound=No se han encontrado registros
 Select2Enter=Introducir
-Select2MoreCharacter=or more characters<br /><br /><strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
-Select2MoreCharacters=or more characters<br /><br /><strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
+Select2MoreCharacter=o más caracteres<br /><br /><strong>sintáxis de búsqueda:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Cualquier carácter</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Empezar con</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> Acabar con</kbd> (ab$)<br />
+Select2MoreCharacters=o más caracteres<br /><br /><strong>sintáxis de búsqueda:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Cualquier carácter</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Empezar con</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> Acabar con</kbd> (ab$)<br />
 Select2LoadingMoreResults=Cargando más resultados...
 Select2SearchInProgress=Búsqueda en progreso...
 SearchIntoThirdparties=Terceros
@@ -812,3 +816,5 @@ SearchIntoContracts=Contratos
 SearchIntoCustomerShipments=Envíos a clientes
 SearchIntoExpenseReports=Informes de gastos
 SearchIntoLeaves=Permisos
+
+BulkActions=Bulk actions
diff --git a/htdocs/langs/es_ES/members.lang b/htdocs/langs/es_ES/members.lang
index 848212cc961..01ccac1c965 100644
--- a/htdocs/langs/es_ES/members.lang
+++ b/htdocs/langs/es_ES/members.lang
@@ -136,8 +136,8 @@ DocForAllMembersCards=Generación de tarjetas para todos los miembros
 DocForOneMemberCards=Generación de tarjetas para un miembro en particular
 DocForLabels=Generación de etiquetas de direcciones
 SubscriptionPayment=Pago cuota
-LastSubscriptionDate=Fecha de la última cotización
-LastSubscriptionAmount=Importe de la última cotización
+LastSubscriptionDate=Latest subscription date
+LastSubscriptionAmount=Latest subscription amount
 MembersStatisticsByCountries=Estadísticas de miembros por país
 MembersStatisticsByState=Estadísticas de miembros por departamento/provincia/región
 MembersStatisticsByTown=Estadísticas de miembros por población
@@ -149,7 +149,7 @@ MembersByStateDesc=Esta pantalla presenta una estadística del número de miembr
 MembersByTownDesc=Esta pantalla presenta una estadística del número de miembros por población.
 MembersStatisticsDesc=Elija las estadísticas que desea consultar...
 MenuMembersStats=Estadísticas
-LastMemberDate=Fecha último miembro
+LastMemberDate=Latest member date
 Nature=Naturaleza
 Public=Información pública
 NewMemberbyWeb=Nuevo miembro añadido. En espera de validación
diff --git a/htdocs/langs/es_ES/orders.lang b/htdocs/langs/es_ES/orders.lang
index 177c3534619..ed1c49642de 100644
--- a/htdocs/langs/es_ES/orders.lang
+++ b/htdocs/langs/es_ES/orders.lang
@@ -39,7 +39,7 @@ StatusOrderRefusedShort=Rechazado
 StatusOrderBilledShort=Facturado
 StatusOrderToProcessShort=A procesar
 StatusOrderReceivedPartiallyShort=Recibido parcialmente
-StatusOrderReceivedAllShort=Recibido
+StatusOrderReceivedAllShort=Products received
 StatusOrderCanceled=Anulado
 StatusOrderDraft=Borrador (a validar)
 StatusOrderValidated=Validado
@@ -51,7 +51,7 @@ StatusOrderApproved=Aprobado
 StatusOrderRefused=Rechazado
 StatusOrderBilled=Facturado
 StatusOrderReceivedPartially=Recibido parcialmente
-StatusOrderReceivedAll=Recibido
+StatusOrderReceivedAll=All products received
 ShippingExist=Existe una expedición
 QtyOrdered=Cant. pedida
 ProductQtyInDraft=Cantidades en pedidos borrador
diff --git a/htdocs/langs/es_ES/other.lang b/htdocs/langs/es_ES/other.lang
index 6e728566c12..b00c0e483ce 100644
--- a/htdocs/langs/es_ES/other.lang
+++ b/htdocs/langs/es_ES/other.lang
@@ -68,14 +68,15 @@ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nLe adjuntamos la
 PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nLe adjuntamos el envío __SHIPPINGREF__\n\n__PERSONALIZED__Cordialmente\n\n__SIGNATURE__
 PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nLe adjuntamos la intervención __FICHINTERREF__\n\n__PERSONALIZED__Cordialmente\n\n__SIGNATURE__
 PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n__PERSONALIZED__\n\n__SIGNATURE__
-DemoDesc=Dolibarr es un ERP/CRM compacto compuesto de varios módulos funcionales. Una demostración que muestre todos los módulos no tiene sentido ya que nunca se produce esta situación. Por lo tanto, se encuentran disponibles varios perfiles de demostración.
+DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Elija el perfil de demostración que mejor se adapte a sus necesidades ...
+ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
 DemoFundation=Gestión de miembros de una asociación
 DemoFundation2=Gestión de miembros y tesorería de una asociación
-DemoCompanyServiceOnly=Gestión de un trabajador por cuenta propia realizando servicios
+DemoCompanyServiceOnly=Company or freelance selling service only
 DemoCompanyShopWithCashDesk=Gestión de una tienda con caja
-DemoCompanyProductAndStocks=Gestión de una PYME con venta de productos
-DemoCompanyAll=Gestión de una PYME con actividades múltiples (todos los módulos principales)
+DemoCompanyProductAndStocks=Company selling products with a shop
+DemoCompanyAll=Company with multiple activities (all main modules)
 CreatedBy=Creado por %s
 ModifiedBy=Modificado por %s
 ValidatedBy=Validado por %s
diff --git a/htdocs/langs/es_ES/products.lang b/htdocs/langs/es_ES/products.lang
index acad6cd72de..3a5d2dd4fc8 100644
--- a/htdocs/langs/es_ES/products.lang
+++ b/htdocs/langs/es_ES/products.lang
@@ -60,7 +60,7 @@ SellingPrice=Precio de venta
 SellingPriceHT=PVP sin IVA
 SellingPriceTTC=PVP con IVA
 CostPriceDescription=Este precio (neto de impuestos) se puede utilizar para almacenar la cantidad promedio de este costo del producto para su empresa. Puede ser cualquier precio calculado por usted, por ejemplo, desde el precio medio de compra, más costo promedio de producción y distribución.
-CostPriceUsage=En una versión futura, este valor podría ser utilizado para el cálculo del margen.
+CostPriceUsage=This value could be used for margin calculation.
 SoldAmount=Importe ventas
 PurchasedAmount=Importe compras
 NewPrice=Nuevo precio
@@ -142,6 +142,7 @@ ConfirmCloneProduct=¿Está seguro de querer clonar el producto o servicio <b>%s
 CloneContentProduct=Clonar solamente la información general del producto/servicio
 ClonePricesProduct=Clonar la información general y los precios
 CloneCompositionProduct=Clonar producto/servicio compuesto
+CloneCombinationsProduct=Clone product variants
 ProductIsUsed=Este producto es utilizado
 NewRefForClone=Ref. del nuevo producto/servicio
 SellingPrices=Precios de venta
@@ -238,7 +239,7 @@ GlobalVariables=Variables globales
 VariableToUpdate=Variable a actualizar
 GlobalVariableUpdaters=Actualizaciones de variables globales
 UpdateInterval=Intervalo de actualización (minutos)
-LastUpdated=Última actualización
+LastUpdated=Latest update
 CorrectlyUpdated=Actualizado correctamente
 PropalMergePdfProductActualFile=Archivos que se usan para añadir en el PDF Azur son
 PropalMergePdfProductChooseFile=Seleccione los archivos PDF
@@ -258,4 +259,41 @@ VolumeUnits=Volumen unitario
 SizeUnits=Tamaño unitario
 DeleteProductBuyPrice=Eliminar precio de compra
 ConfirmDeleteProductBuyPrice=¿Está seguro de querer eliminar este precio de compra?
+SubProduct=Sub product
 
+#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
+ProductCombinations=Variants
+HideProductCombinations=Hide products variant in the products selector
+ProductCombination=Variant
+NewProductCombination=New variant
+EditProductCombination=Editing variant
+ProductCombinationGenerator=Variants generator
+Features=Features
+PriceImpact=Price impact
+WeightImpact=Weight impact
+NewProductAttribute=Nuevo 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
+PercentageVariation=Percentage variation
+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 child products
+ConfirmCloneProductCombinations=Would you like to copy all the product variant to the 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
diff --git a/htdocs/langs/es_ES/projects.lang b/htdocs/langs/es_ES/projects.lang
index 17dcaf473b0..d1af2c2dd5f 100644
--- a/htdocs/langs/es_ES/projects.lang
+++ b/htdocs/langs/es_ES/projects.lang
@@ -31,7 +31,7 @@ ConfirmDeleteAProject=¿Está seguro de querer eliminar este proyecto?
 ConfirmDeleteATask=¿Está usted seguro de querer eliminar esta tarea?
 OpenedProjects=Proyectos abiertos
 OpenedTasks=Tareas abiertas
-OpportunitiesStatusForOpenedProjects=Importe oportunidades de proyectos por estado
+OpportunitiesStatusForOpenedProjects=Importe oportunidades de proyectos abiertos por estado
 OpportunitiesStatusForProjects=Importe oportunidades de proyectos por estado
 ShowProject=Ver proyecto
 SetProject=Definir proyecto
@@ -96,6 +96,7 @@ ValidateProject=Validar proyecto
 ConfirmValidateProject=¿Está seguro de querer validar este proyecto?
 CloseAProject=Cerrar proyecto
 ConfirmCloseAProject=¿Está seguro de querer cerrar este proyecto?
+AlsoCloseAProject=Also close project (keep it open if you still need to follow production tasks on it)
 ReOpenAProject=Reabrir proyecto
 ConfirmReOpenAProject=Está seguro de querer reabrir este proyecto?
 ProjectContact=Contactos proyecto
@@ -121,7 +122,7 @@ CloneProjectFiles=Clonar los archivos adjuntos del proyecto
 CloneTaskFiles=Clonar los archivos adjuntos de la(s) tarea(s) (si se clonan  la(s) tarea(s))
 CloneMoveDate=¿Actualizar las fechas de los proyectos/tareas?
 ConfirmCloneProject=¿Está seguro de querer clonar este proyecto?
-ProjectReportDate=Cambiar las fechas de las tareas en función de la fecha de inicio del proyecto
+ProjectReportDate=Change task dates according to new project start date
 ErrorShiftTaskDate=Se ha producido un error en el cambio de las fechas de las tareas
 ProjectsAndTasksLines=Proyectos y tareas
 ProjectCreatedInDolibarr=Proyecto %s creado
@@ -178,7 +179,7 @@ ProjectsStatistics=Estadísticas de proyectos/leads
 TaskAssignedToEnterTime=Tarea asignada. Debería poder introducir tiempos en esta tarea.
 IdTaskTime=Id
 YouCanCompleteRef=Si desea completar la referencia con alguna información (para usarlo como filtros de búsqueda), se recomienda añadir un caracter - para separarlo, la numeración automática seguirá funcionando correctamente para los próximos proyectos. Por ejemplo %s-ABC. También puede preferir añadir claves de búsqueda en la etiqueta. Pero la mejor práctica puede ser añadir un campo dedicado, también llamados atributos adicionales.
-OpenedProjectsByThirdparties=Proyectos abiertos por terceros
+OpenedProjectsByThirdparties=Proyectos abiertos de terceros
 OnlyOpportunitiesShort=Solamente oportunidades
 OpenedOpportunitiesShort=Oportunidades abiertas
 NotAnOpportunityShort=No es una oportunidad
diff --git a/htdocs/langs/es_ES/propal.lang b/htdocs/langs/es_ES/propal.lang
index 3e6668aa196..570d07ee198 100644
--- a/htdocs/langs/es_ES/propal.lang
+++ b/htdocs/langs/es_ES/propal.lang
@@ -28,7 +28,7 @@ ShowPropal=Ver presupuesto
 PropalsDraft=Borrador
 PropalsOpened=Abierto
 PropalStatusDraft=Borrador (a validar)
-PropalStatusValidated=Validado (presupuesto abierto)
+PropalStatusValidated=Validated (proposal is opened)
 PropalStatusSigned=Firmado (a facturar)
 PropalStatusNotSigned=No firmado (cerrado)
 PropalStatusBilled=Facturado
diff --git a/htdocs/langs/es_ES/stocks.lang b/htdocs/langs/es_ES/stocks.lang
index 41d1010dba6..afb461c406c 100644
--- a/htdocs/langs/es_ES/stocks.lang
+++ b/htdocs/langs/es_ES/stocks.lang
@@ -22,13 +22,15 @@ Movements=Movimientos
 ErrorWarehouseRefRequired=El nombre de referencia del almacén es obligatorio
 ListOfWarehouses=Listado de almacenes
 ListOfStockMovements=Listado de movimientos de stock
+StockMovementForId=Movement ID %d
+ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Área almacenes
 Location=Lugar
 LocationSummary=Nombre corto del lugar
 NumberOfDifferentProducts=Número de productos diferentes
 NumberOfProducts=Numero total de productos
-LastMovement=Último movimiento
-LastMovements=Últimos movimientos
+LastMovement=Latest movement
+LastMovements=Latest movements
 Units=Unidades
 Unit=Unidad
 StockCorrection=Corrección stock
@@ -140,4 +142,4 @@ ProductStockWarehouseCreated=Límite stock para alertas y stock óptimo deseado
 ProductStockWarehouseUpdated=Límite stock para alertas y stock óptimo deseado actualizado correctamente
 ProductStockWarehouseDeleted=Límite stock para alertas y stock óptimo deseado eliminado correctamente
 AddNewProductStockWarehouse=Indicar nuevo límite para alertas y stock óptimo deseado
-AddStockLocationLine=Decrease quantity then click to add another warehouse for this product
+AddStockLocationLine=Disminuya la cantidad, y a continuación, haga clic para agregar otro almacén para este producto
diff --git a/htdocs/langs/es_ES/supplier_proposal.lang b/htdocs/langs/es_ES/supplier_proposal.lang
index 9f3ebb78cb2..3c6e8bce7ed 100644
--- a/htdocs/langs/es_ES/supplier_proposal.lang
+++ b/htdocs/langs/es_ES/supplier_proposal.lang
@@ -8,7 +8,7 @@ SearchRequest=Buscar un presupuesto
 DraftRequests=Presupuestos borrador
 SupplierProposalsDraft=Presupuestos de proveedor borrador
 LastModifiedRequests=Últimos %s consultas de precios modificados
-RequestsOpened=Presupuestos abiertos
+RequestsOpened=Opened price requests
 SupplierProposalArea=Área presupuestos de proveedores
 SupplierProposalShort=Presupuesto de proveedor
 SupplierProposals=Presupuestos de proveedor
@@ -23,7 +23,7 @@ ConfirmValidateAsk=¿Está seguro de querer validar este presupuesto bajo la ref
 DeleteAsk=Eliminar presupuesto
 ValidateAsk=Validar presupuesto
 SupplierProposalStatusDraft=Borrador (a validar)
-SupplierProposalStatusValidated=Validado (presupuesto abierto)
+SupplierProposalStatusValidated=Validated (request is opened)
 SupplierProposalStatusClosed=Cerrado
 SupplierProposalStatusSigned=Aceptado
 SupplierProposalStatusNotSigned=Rechazado
diff --git a/htdocs/langs/es_ES/suppliers.lang b/htdocs/langs/es_ES/suppliers.lang
index d0ea9008506..c27f636b3a0 100644
--- a/htdocs/langs/es_ES/suppliers.lang
+++ b/htdocs/langs/es_ES/suppliers.lang
@@ -41,3 +41,4 @@ DoNotOrderThisProductToThisSupplier=No realizar pedidos
 NotTheGoodQualitySupplier=Mala calidad
 ReputationForThisProduct=Reputación
 BuyerName=Nombre del comprador
+AllProductServicePrices=All product / service prices
diff --git a/htdocs/langs/es_ES/trips.lang b/htdocs/langs/es_ES/trips.lang
index ee718f85bcd..2a03d3b4bf8 100644
--- a/htdocs/langs/es_ES/trips.lang
+++ b/htdocs/langs/es_ES/trips.lang
@@ -21,17 +21,17 @@ ListToApprove=En espera de aprobación
 ExpensesArea=Área de gastos
 ClassifyRefunded=Clasificar 'Reembolsado'
 ExpenseReportWaitingForApproval=Se ha enviado un nuevo gasto para ser aprobado
-ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n - User: %s\n - Period: %s\nClick here to validate: %s
-ExpenseReportWaitingForReApproval=An expense report has been submitted for re-approval
-ExpenseReportWaitingForReApprovalMessage=An expense report has been submitted and is waiting for re-approval.\nThe %s, you refused to approve the expense report for this reason: %s.\nA new version has been proposed and waiting for your approval.\n - User: %s\n - Period: %s\nClick here to validate: %s
-ExpenseReportApproved=An expense report was approved
-ExpenseReportApprovedMessage=The expense report %s was approved.\n - User: %s\n - Approved by: %s\nClick here to show the expense report: %s
-ExpenseReportRefused=An expense report was refused
-ExpenseReportRefusedMessage=The expense report %s was refused.\n - User: %s\n - Refused by: %s\n - Motive for refusal: %s\nClick here to show the expense report: %s
-ExpenseReportCanceled=An expense report was canceled
-ExpenseReportCanceledMessage=The expense report %s was canceled.\n - User: %s\n - Canceled by: %s\n - Motive for cancellation: %s\nClick here to show the expense report: %s
-ExpenseReportPaid=An expense report was paid
-ExpenseReportPaidMessage=The expense report %s was paid.\n - User: %s\n - Paid by: %s\nClick here to show the expense report: %s
+ExpenseReportWaitingForApprovalMessage=Se ha enviado un nuevo gasto y está a la espera para ser aprobado.\n- Usuario: %s\n- Periodo. %s\nHaga clic aquí para validarlo: %s
+ExpenseReportWaitingForReApproval=Se ha enviado un nuevo gasto para reaprobalo
+ExpenseReportWaitingForReApprovalMessage=Se ha enviado un nuevo gasto y está a la espera para ser reaprobado.\nEl %s, rechazó su aprobación por esta razón: %s\nSe a propuesto una nueva versión y espera su aprobación\n- Usuario: %s\n- Periodo. %s\nHaga clic aquí para validarlo: %s
+ExpenseReportApproved=Un nuevo gasto se ha aprobado
+ExpenseReportApprovedMessage=El gasto %s ha sido aprobado.\n- Usuario: %s\n- Aprobado por: %s\nHaga clic aquí para validarlo: %s
+ExpenseReportRefused=Un gasto ha sido rechazado
+ExpenseReportRefusedMessage=El gasto %s ha sido rechazado.\n- Usuario: %s\n- Rechazado por: %s\n- Motivo del rechazo: %s\nHaga clic aquí ver el gasto: %s
+ExpenseReportCanceled=Un gasto ha sido cancelado
+ExpenseReportCanceledMessage=El gasto %s ha sido cancelado.\n- Usuario: %s\n- Cancelado por: %s\n- Motivo de la cancelación: %s\nHaga clic aquí ver el gasto: %s
+ExpenseReportPaid=Un gasto ha sido pagado
+ExpenseReportPaidMessage=El gasto %s ha sido pagado.\n- Usuario: %s\n- Pagado por: %s\nHaga clic aquí ver el gasto: %s
 TripId=Id de gasto
 AnyOtherInThisListCanValidate=Persona a informar para la validación
 TripSociete=Información de la empresa
diff --git a/htdocs/langs/es_ES/withdrawals.lang b/htdocs/langs/es_ES/withdrawals.lang
index 3419151e345..6aa8957e4a9 100644
--- a/htdocs/langs/es_ES/withdrawals.lang
+++ b/htdocs/langs/es_ES/withdrawals.lang
@@ -24,6 +24,7 @@ WithdrawStatistics=Estadísticas de domiciliaciones
 WithdrawRejectStatistics=Estadísticas de domiciliaciones devueltas
 LastWithdrawalReceipt=Las %s últimas domiciliaciones
 MakeWithdrawRequest=Realizar una petición de domiciliación
+WithdrawRequestsDone=%s direct debit payment requests recorded
 ThirdPartyBankCode=Código banco del tercero
 NoInvoiceCouldBeWithdrawed=No se ha domiciliado ninguna factura. Asegúrese de que las facturas son de empresas con los datos de cuentas bancarias correctos.
 ClassCredited=Clasificar como "Abonada"
@@ -76,8 +77,8 @@ RUM=RUM
 RUMLong=Referencia Única de Mandato
 RUMWillBeGenerated=El número RUM se generará una vez que se guarde la información de la cuenta bancaria
 WithdrawMode=Modo domiciliación (FRST o RECUR)
-WithdrawRequestAmount=Importe petición domiciliación:
-WithdrawRequestErrorNilAmount=No es posible crear una petición de domiciliación con importe nulo
+WithdrawRequestAmount=Amount of Direct debit request:
+WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty amount.
 SepaMandate=Mandato SEPA
 SepaMandateShort=Mandato SEPA
 PleaseReturnMandate=Devuelva este formulario de mandato por e-mail a %s o por correo a
diff --git a/htdocs/langs/es_MX/accountancy.lang b/htdocs/langs/es_MX/accountancy.lang
index 1195e791ea0..dcb386435b9 100644
--- a/htdocs/langs/es_MX/accountancy.lang
+++ b/htdocs/langs/es_MX/accountancy.lang
@@ -3,33 +3,25 @@ ACCOUNTING_EXPORT_SEPARATORCSV=Separador de columnas para el archivo de exportac
 ACCOUNTING_EXPORT_DATE=Formato de fecha para el archivo de exportación
 ACCOUNTING_EXPORT_PIECE=Exportar el número de pieza
 ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Exportación con cuenta global
-AccountAccountingSuggest=Sugerencia de cuenta contable
 Bookkeeping=Libro mayor
 CAHTF=Total de compra al proveedor antes de impuestos
 Processing=Procesando
-EndProcessing=Fin del proceso
 SelectedLines=Partidas seleccionadas
 Lineofinvoice=Partida de factura
-ACCOUNTING_LENGTH_DESCRIPTION=Longitud para mostrar la descripción de productos y servicios en los listados (Ideal = 50)
-ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Longitud para mostrar el formato de descripción de la cuenta de productos y servicios en listados (Ideal = 50)
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Diario de varios
 ACCOUNTING_EXPENSEREPORT_JOURNAL=Diario de reporte de gastos
 ACCOUNTING_SOCIAL_JOURNAL=Diario Social
-ACCOUNTING_ACCOUNT_TRANSFER_CASH=Cuenta de transferencia
-ACCOUNTING_ACCOUNT_SUSPENSE=Cuenta de espera
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Cuenta contable por defecto para productos comprados (si no ha sido definido por la hoja de producto)
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Cuenta contable por defecto para los productos vendidos (si no ha sido definido en la hoja del producto)
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Cuenta contable por defecto para los servicios comprados (si no ha sido definido en la hoja del servicio)
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Cuenta contable por defecto para los servicios vendidos (si no ha sido definido en la hoja del servicio)
 Labelcompte=Descripción de la cuenta
 Sens=Significado
-DelBookKeeping=Borrar los registros del libro mayor
+AccountingCategory=Accounting category
 DescFinanceJournal=Diario financiero incluyendo todos los tipos de pagos por cuenta bancaria
 ErrorDebitCredit=Débito y Crédito no pueden tener un valor al mismo tiempo
 Pcgtype=Tipo de cuenta
 Pcgsubtype=Subtipo de cuenta
 TotalVente=Facturación total antes de impuestos
 TotalMarge=Margen de ventas total
+DescVentilDoneSupplier=Consulte aquí la lista de partidas de las facturas a proveedores y sus cuentas contables
 ErrorAccountancyCodeIsAlreadyUse=Error, no es posible eliminar ésta cuenta contable porque está siendo usada
 MvtNotCorrectlyBalanced=Movimiento balanceado incorrectamente. Crédito = %s. Débito = %s
-GeneralLedgerIsWritten=Las operaciones son escritas en el libro mayor
+ErrorNoAccountingCategoryForThisCountry=No accounting category available for country %s (See Home - Setup - Dictionaries)
+WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
diff --git a/htdocs/langs/es_MX/admin.lang b/htdocs/langs/es_MX/admin.lang
index 1b59b491f99..805b7042142 100644
--- a/htdocs/langs/es_MX/admin.lang
+++ b/htdocs/langs/es_MX/admin.lang
@@ -54,8 +54,9 @@ Module50Name=productos
 Module770Name=Reporte de gastos
 Module1400Name=Contabilidad
 DictionaryCanton=Estado/Provincia
+DictionaryAccountancyCategory=Accounting categories
 Upgrade=Actualizar
 MenuCompanySetup=Empresa/Fundación
 CompanyName=Nombre
+ConstDesc=This page allows you to edit all other parameters not available in previous pages. These are mostly reserved parameters for developers or advanced troubleshooting. For a list of options <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">check here</a>.
 LDAPFieldFirstName=Nombre(s)
-ApiProductionMode=Enable production mode (this will activate use of a caches for services management)
diff --git a/htdocs/langs/es_MX/banks.lang b/htdocs/langs/es_MX/banks.lang
index 81e2d6e77b3..389e2f15817 100644
--- a/htdocs/langs/es_MX/banks.lang
+++ b/htdocs/langs/es_MX/banks.lang
@@ -28,40 +28,20 @@ BankType2=Cuenta de caja/efectivo
 AccountsArea=Área de cuentas
 AccountCard=Ficha de cuenta
 DeleteAccount=Eliminar cuenta
-ConfirmDeleteAccount=¿Seguro que quieres eliminar esta cuenta?
-BankTransactionByCategories=Transacciones bancarias por categorías
-BankTransactionForCategory=Transacciones bancarias por categoría <b>%s</b>
-RemoveFromRubriqueConfirm=¿Seguro que deseas eliminar el vínculo entre la transacción y la categoría?
 IdTransaction=ID de transacción
-ListTransactions=Listar transacciones
-ListTransactionsByCategory=Listar transacciones/categoría
-TransactionsToConciliate=Transacciones a conciliar
 Conciliable=Puede ser conciliado
-OnlyOpenedAccount=Sólo las cuentas abiertas
 DisableConciliation=Desactivar función de conciliación para esta cuenta
 ConciliationDisabled=Característica conciliación deshabilitada
-LinkedToAConciliatedTransaction=Ligado a una transacción conciliada
 LineRecord=Transacción
-AddBankRecord=Añadir transacción
-AddBankRecordLong=Añadir transacción manualmente
 DateConciliating=Fecha de conciliación
-BankLineConciliated=Transacción conciliada
 CustomerInvoicePayment=Pago de cliente
 WithdrawalPayment=Pago de retiro
 SocialContributionPayment=Pago de impuesto social/fiscal
 TransferFromToDone=La transferencia de <b>%s</b> hacia <b>%s</b> de <b>%s</b> %s ha sido registrada.
-ValidateCheckReceipt=¿Validar este recibo de cheque?
-ConfirmValidateCheckReceipt=¿Seguro que deseas validar este recibo de cheque? Ningún cambio será posible una vez que se valide
-DeleteCheckReceipt=¿Eliminar este recibo de cheque?
-ConfirmDeleteCheckReceipt=¿Seguro que quieres borrar este recibo de cheque?
 BankChecks=Cheques bancarios
 BankChecksToReceipt=Cheques en espera de depósito
 ShowCheckReceipt=Mostrar recibo de depósito de cheque
 NumberOfCheques=Número de cheque
-DeleteTransaction=Eliminar transacción
-ConfirmDeleteTransaction=¿Seguro que quieres eliminar esta transacción?
-ThisWillAlsoDeleteBankRecord=Esto también eliminará las transacciones bancarias generadas
-ExportDataset_banque_1=Transacciones bancarias y estado de cuenta
 ExportDataset_banque_2=Ficha de depósito
 TransactionOnTheOtherAccount=Transacción en la otra cuenta
 PaymentNumberUpdateSucceeded=Número de pago actualizado con éxito
@@ -74,9 +54,7 @@ SelectChequeTransactionAndGenerate=Seleccione/filtre los cheques a incluir en el
 InputReceiptNumber=Seleccione el estado de cuenta bancaria relacionado con la conciliación. Utilice un valor numérico ordenable: AAAAMM o AAAAMMDD
 EventualyAddCategory=Eventualmente, especifique una categoría en la que clasificar los registros
 ThenCheckLinesAndConciliate=A continuación, compruebe las líneas presentes en el estado de cuenta bancaria y haga clic
-ConfirmDeleteRib=¿Seguro que quieres borrar esta cuenta bancaria?
 RejectCheck=Cheque rechazado
-ConfirmRejectCheck=¿Seguro que quieres marcar este cheque como rechazado?
 RejectCheckDate=Fecha en la que el cheque fue rechazado
 CheckRejected=Cheque rechazado
 CheckRejectedAndInvoicesReopened=Cheque rechazado y facturas reabiertas
diff --git a/htdocs/langs/es_MX/bills.lang b/htdocs/langs/es_MX/bills.lang
index 687c700ca3c..5ce71ba2860 100644
--- a/htdocs/langs/es_MX/bills.lang
+++ b/htdocs/langs/es_MX/bills.lang
@@ -1,4 +1,6 @@
 # Dolibarr language file - Source file is en_US - bills
+BillsCustomers=Facturas de clientes
+ConfirmDeletePayment=Are you sure you want to delete this payment ?
 PaymentAmount=Importe de pago
 BillStatusPaid=Pagado
 BillStatusStarted=Iniciado
diff --git a/htdocs/langs/es_MX/compta.lang b/htdocs/langs/es_MX/compta.lang
index 74dd3d3a086..9c1cd218356 100644
--- a/htdocs/langs/es_MX/compta.lang
+++ b/htdocs/langs/es_MX/compta.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - compta
 Param=Configuración
 PaymentSocialContribution=Pago de impuesto social/fiscal
-VATRefund=Sales tax refund Refund
 ByThirdParties=Por terceros
diff --git a/htdocs/langs/es_MX/mails.lang b/htdocs/langs/es_MX/mails.lang
deleted file mode 100644
index 455190c8587..00000000000
--- a/htdocs/langs/es_MX/mails.lang
+++ /dev/null
@@ -1,4 +0,0 @@
-# Dolibarr language file - Source file is en_US - mails
-MailSuccessfulySent=Email successfully sent (from %s to %s)
-MailingNeedCommand=For security reason, sending an emailing is better when performed from command line. If you have one, ask your server administrator to launch the following command to send the emailing to all recipients:
-ConfirmSendingEmailing=If you can't or prefer sending them with your www browser, please confirm you are sure you want to send emailing now from your browser?
diff --git a/htdocs/langs/es_MX/main.lang b/htdocs/langs/es_MX/main.lang
index 6100f51f1f8..2b4fb4f03cd 100644
--- a/htdocs/langs/es_MX/main.lang
+++ b/htdocs/langs/es_MX/main.lang
@@ -84,7 +84,6 @@ AmountByMonth=Cantidad por mes
 DateEnd=Fecha de finalización
 DateCreationShort=Fecha de creación
 DateModificationShort=Fecha Modif.
-DateLastModification=Fecha de última modificación
 DateOperation=Fecha de operación
 DateOperationShort=Fecha Op.
 DateBuild=Fecha de generación del informe
@@ -135,7 +134,6 @@ Category=Tag/Categoría
 ChangedBy=Cambiado por
 ResultKo=Fallo
 Reporting=Informes
-Opened=Abierta
 ByCompanies=Por terceros
 ByUsers=Por usuarios
 Links=Vínculos
@@ -293,6 +291,8 @@ ShortThursday=MJ
 SelectMailModel=Seleccionar plantilla de correo electrónico
 Select2NotFound=No se encontró ningún resultado
 Select2Enter=Entrar
+Select2MoreCharacter=or more characters<br /><br /><strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
+Select2MoreCharacters=or more characters<br /><br /><strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
 SearchIntoCustomerInvoices=Facturas de clientes
 SearchIntoCustomerOrders=Pedidos de los clientes
 SearchIntoCustomerProposals=Propuestas de clientes
diff --git a/htdocs/langs/es_MX/members.lang b/htdocs/langs/es_MX/members.lang
index 918da46dbb6..fab3f9372d5 100644
--- a/htdocs/langs/es_MX/members.lang
+++ b/htdocs/langs/es_MX/members.lang
@@ -1,3 +1,4 @@
 # Dolibarr language file - Source file is en_US - members
 MemberStatusDraftShort=Borrador
 SubscriptionLate=Tarde
+SubscriptionPayment=Pago de suscripción
diff --git a/htdocs/langs/es_MX/propal.lang b/htdocs/langs/es_MX/propal.lang
index c97cd12e452..1ca83ddaf67 100644
--- a/htdocs/langs/es_MX/propal.lang
+++ b/htdocs/langs/es_MX/propal.lang
@@ -2,5 +2,4 @@
 Proposals=Propuestas comerciales
 Prop=Propuestas comerciales
 PropalsDraft=Borradores
-PropalsOpened=Abierta
 PropalStatusClosedShort=Cerrada
diff --git a/htdocs/langs/es_MX/supplier_proposal.lang b/htdocs/langs/es_MX/supplier_proposal.lang
index f76bff22b57..32d548f1f3f 100644
--- a/htdocs/langs/es_MX/supplier_proposal.lang
+++ b/htdocs/langs/es_MX/supplier_proposal.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - Source file is en_US - supplier_proposal
 SupplierProposals=Propuestas de proveedores
+SupplierProposalsShort=Propuestas de proveedores
 SupplierProposalStatusClosed=Cerrada
 SupplierProposalStatusClosedShort=Cerrada
diff --git a/htdocs/langs/es_MX/users.lang b/htdocs/langs/es_MX/users.lang
index 10850911bca..3e1587b1ba1 100644
--- a/htdocs/langs/es_MX/users.lang
+++ b/htdocs/langs/es_MX/users.lang
@@ -1,2 +1,3 @@
 # Dolibarr language file - Source file is en_US - users
+LastName=Apellido
 FirstName=Nombre(s)
diff --git a/htdocs/langs/es_MX/withdrawals.lang b/htdocs/langs/es_MX/withdrawals.lang
index 902ace98f26..9843b1e36c2 100644
--- a/htdocs/langs/es_MX/withdrawals.lang
+++ b/htdocs/langs/es_MX/withdrawals.lang
@@ -1,3 +1,2 @@
 # Dolibarr language file - Source file is en_US - withdrawals
 StatusRefused=Rechazado
-DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Withdrawal 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.
diff --git a/htdocs/langs/es_PA/accountancy.lang b/htdocs/langs/es_PA/accountancy.lang
new file mode 100644
index 00000000000..527f1fd139d
--- /dev/null
+++ b/htdocs/langs/es_PA/accountancy.lang
@@ -0,0 +1,4 @@
+# Dolibarr language file - Source file is en_US - accountancy
+AccountingCategory=Accounting category
+ErrorNoAccountingCategoryForThisCountry=No accounting category available for country %s (See Home - Setup - Dictionaries)
+WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
diff --git a/htdocs/langs/es_PA/admin.lang b/htdocs/langs/es_PA/admin.lang
index 32551a05778..d2d93b1b324 100644
--- a/htdocs/langs/es_PA/admin.lang
+++ b/htdocs/langs/es_PA/admin.lang
@@ -2,4 +2,5 @@
 AntiVirusCommandExample=Example for ClamWin: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe<br>Example for ClamAv: /usr/bin/clamscan
 AntiVirusParamExample=Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
 ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
-ApiProductionMode=Enable production mode (this will activate use of a caches for services management)
+DictionaryAccountancyCategory=Accounting categories
+ConstDesc=This page allows you to edit all other parameters not available in previous pages. These are mostly reserved parameters for developers or advanced troubleshooting. For a list of options <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">check here</a>.
diff --git a/htdocs/langs/es_PA/compta.lang b/htdocs/langs/es_PA/compta.lang
deleted file mode 100644
index 4d40c57399f..00000000000
--- a/htdocs/langs/es_PA/compta.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - compta
-VATRefund=Sales tax refund Refund
diff --git a/htdocs/langs/es_PA/mails.lang b/htdocs/langs/es_PA/mails.lang
deleted file mode 100644
index 455190c8587..00000000000
--- a/htdocs/langs/es_PA/mails.lang
+++ /dev/null
@@ -1,4 +0,0 @@
-# Dolibarr language file - Source file is en_US - mails
-MailSuccessfulySent=Email successfully sent (from %s to %s)
-MailingNeedCommand=For security reason, sending an emailing is better when performed from command line. If you have one, ask your server administrator to launch the following command to send the emailing to all recipients:
-ConfirmSendingEmailing=If you can't or prefer sending them with your www browser, please confirm you are sure you want to send emailing now from your browser?
diff --git a/htdocs/langs/es_PA/main.lang b/htdocs/langs/es_PA/main.lang
index 1602d6a7ffa..9eb281a31c2 100644
--- a/htdocs/langs/es_PA/main.lang
+++ b/htdocs/langs/es_PA/main.lang
@@ -19,3 +19,5 @@ FormatDateHourShort=%d/%m/%Y %H:%M
 FormatDateHourSecShort=%d/%m/%Y %H:%M:%S
 FormatDateHourTextShort=%d %b %Y %H:%M
 FormatDateHourText=%d %B %Y %H:%M
+Select2MoreCharacter=or more characters<br /><br /><strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
+Select2MoreCharacters=or more characters<br /><br /><strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
diff --git a/htdocs/langs/es_PA/members.lang b/htdocs/langs/es_PA/members.lang
deleted file mode 100644
index fcd4f3eb8d7..00000000000
--- a/htdocs/langs/es_PA/members.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - members
-MemberStatusActiveLate=subscription expired
diff --git a/htdocs/langs/es_PA/orders.lang b/htdocs/langs/es_PA/orders.lang
deleted file mode 100644
index f719db62ca8..00000000000
--- a/htdocs/langs/es_PA/orders.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - orders
-StatusOrderReceivedAllShort=Everything received
-StatusOrderReceivedAll=Everything received
diff --git a/htdocs/langs/es_PA/withdrawals.lang b/htdocs/langs/es_PA/withdrawals.lang
deleted file mode 100644
index a6f0f06fc82..00000000000
--- a/htdocs/langs/es_PA/withdrawals.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - withdrawals
-DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Withdrawal 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.
diff --git a/htdocs/langs/es_PE/accountancy.lang b/htdocs/langs/es_PE/accountancy.lang
index 6c32eb25b99..adbb619ec03 100644
--- a/htdocs/langs/es_PE/accountancy.lang
+++ b/htdocs/langs/es_PE/accountancy.lang
@@ -12,6 +12,8 @@ ConfigAccountingExpert=Configuración del módulo experto en contabilidad
 Journaux=Revistas
 JournalFinancial=Revistas financieras
 BackToChartofaccounts=Retornar gráfico de cuentas
-Selectchartofaccounts=Seleccionar un gráfico de cuentas
 Addanaccount=Agregar una cuenta contable
+AccountingCategory=Accounting category
 OptionsDeactivatedForThisExportModel=Para este modelo de exportación, las opciones están desactivadas
+ErrorNoAccountingCategoryForThisCountry=No accounting category available for country %s (See Home - Setup - Dictionaries)
+WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
diff --git a/htdocs/langs/es_PE/admin.lang b/htdocs/langs/es_PE/admin.lang
index 5533a0caacf..6a74a637304 100644
--- a/htdocs/langs/es_PE/admin.lang
+++ b/htdocs/langs/es_PE/admin.lang
@@ -6,10 +6,11 @@ Permission91=Consultar impuestos e IGV
 Permission92=Crear/modificar impuestos e IGV
 Permission93=Eliminar impuestos e IGV
 DictionaryVAT=Tasa de IGV (Impuesto sobre ventas en EEUU)
+DictionaryAccountancyCategory=Accounting categories
 VATManagement=Gestión IGV
 VATIsNotUsedDesc=El tipo de IGV propuesto por defecto es 0. Este es el caso de asociaciones, particulares o algunas pequeñas sociedades.
+ConstDesc=This page allows you to edit all other parameters not available in previous pages. These are mostly reserved parameters for developers or advanced troubleshooting. For a list of options <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">check here</a>.
 UnitPriceOfProduct=Precio unitario sin IGV de un producto
 OptionVatMode=Opción de carga de IGV
 OptionVatDefaultDesc=La carga del IGV es: <br>-en el envío de los bienes (en la práctica se usa la fecha de la factura)<br>-sobre el pago por los servicios
 OptionVatDebitOptionDesc=La carga del IGV es: <br>-en el envío de los bienes (en la práctica se usa la fecha de la factura)<br>-sobre la facturación de los servicios
-ApiProductionMode=Enable production mode (this will activate use of a caches for services management)
diff --git a/htdocs/langs/es_PE/bills.lang b/htdocs/langs/es_PE/bills.lang
index adca33be66b..cbb0d6d1c89 100644
--- a/htdocs/langs/es_PE/bills.lang
+++ b/htdocs/langs/es_PE/bills.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - Source file is en_US - bills
+ConfirmDeletePayment=Are you sure you want to delete this payment ?
 ErrorVATIntraNotConfigured=Número de IGV intracomunitario aún no configurado
 ConfirmClassifyPaidPartiallyReasonDiscountNoVat=El resto a pagar <b>(%s %s)</b> es un descuento acordado después de la factura. Acepto perder el IGV de este descuento
 AmountOfBillsByMonthHT=Importe de las facturas por mes (Sin IGV)
diff --git a/htdocs/langs/es_PE/compta.lang b/htdocs/langs/es_PE/compta.lang
index 52cdb9236d5..ccf6d5b6d12 100644
--- a/htdocs/langs/es_PE/compta.lang
+++ b/htdocs/langs/es_PE/compta.lang
@@ -6,7 +6,6 @@ VATSummary=Balance de IGV
 VATPaid=IGV Pagado
 VATCollected=IGV recuperado
 PaymentVat=Pago IGV
-VATRefund=Sales tax refund Refund
 ShowVatPayment=Ver pagos IGV
 VATReportByCustomersInInputOutputMode=Informe por cliente del IGV repercutido y pagado (IGV pagado)
 VATReportByCustomersInDueDebtMode=Informe por cliente del IGV repercutido y pagado (IGV debido)
diff --git a/htdocs/langs/es_PE/mails.lang b/htdocs/langs/es_PE/mails.lang
deleted file mode 100644
index 455190c8587..00000000000
--- a/htdocs/langs/es_PE/mails.lang
+++ /dev/null
@@ -1,4 +0,0 @@
-# Dolibarr language file - Source file is en_US - mails
-MailSuccessfulySent=Email successfully sent (from %s to %s)
-MailingNeedCommand=For security reason, sending an emailing is better when performed from command line. If you have one, ask your server administrator to launch the following command to send the emailing to all recipients:
-ConfirmSendingEmailing=If you can't or prefer sending them with your www browser, please confirm you are sure you want to send emailing now from your browser?
diff --git a/htdocs/langs/es_PE/main.lang b/htdocs/langs/es_PE/main.lang
index 6398e2fbb24..7efec544220 100644
--- a/htdocs/langs/es_PE/main.lang
+++ b/htdocs/langs/es_PE/main.lang
@@ -25,3 +25,5 @@ HT=Sin IGV
 TTC=IGV incluido
 VAT=IGV
 VATRate=Tasa IGV
+Select2MoreCharacter=or more characters<br /><br /><strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
+Select2MoreCharacters=or more characters<br /><br /><strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
diff --git a/htdocs/langs/es_PE/members.lang b/htdocs/langs/es_PE/members.lang
deleted file mode 100644
index fcd4f3eb8d7..00000000000
--- a/htdocs/langs/es_PE/members.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - members
-MemberStatusActiveLate=subscription expired
diff --git a/htdocs/langs/es_PE/orders.lang b/htdocs/langs/es_PE/orders.lang
deleted file mode 100644
index f719db62ca8..00000000000
--- a/htdocs/langs/es_PE/orders.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - orders
-StatusOrderReceivedAllShort=Everything received
-StatusOrderReceivedAll=Everything received
diff --git a/htdocs/langs/es_PE/withdrawals.lang b/htdocs/langs/es_PE/withdrawals.lang
deleted file mode 100644
index a6f0f06fc82..00000000000
--- a/htdocs/langs/es_PE/withdrawals.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - withdrawals
-DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Withdrawal 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.
diff --git a/htdocs/langs/es_PY/accountancy.lang b/htdocs/langs/es_PY/accountancy.lang
new file mode 100644
index 00000000000..527f1fd139d
--- /dev/null
+++ b/htdocs/langs/es_PY/accountancy.lang
@@ -0,0 +1,4 @@
+# Dolibarr language file - Source file is en_US - accountancy
+AccountingCategory=Accounting category
+ErrorNoAccountingCategoryForThisCountry=No accounting category available for country %s (See Home - Setup - Dictionaries)
+WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
diff --git a/htdocs/langs/es_PY/admin.lang b/htdocs/langs/es_PY/admin.lang
index 32551a05778..d2d93b1b324 100644
--- a/htdocs/langs/es_PY/admin.lang
+++ b/htdocs/langs/es_PY/admin.lang
@@ -2,4 +2,5 @@
 AntiVirusCommandExample=Example for ClamWin: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe<br>Example for ClamAv: /usr/bin/clamscan
 AntiVirusParamExample=Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
 ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
-ApiProductionMode=Enable production mode (this will activate use of a caches for services management)
+DictionaryAccountancyCategory=Accounting categories
+ConstDesc=This page allows you to edit all other parameters not available in previous pages. These are mostly reserved parameters for developers or advanced troubleshooting. For a list of options <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">check here</a>.
diff --git a/htdocs/langs/es_PY/compta.lang b/htdocs/langs/es_PY/compta.lang
deleted file mode 100644
index 4d40c57399f..00000000000
--- a/htdocs/langs/es_PY/compta.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - compta
-VATRefund=Sales tax refund Refund
diff --git a/htdocs/langs/es_PY/mails.lang b/htdocs/langs/es_PY/mails.lang
deleted file mode 100644
index 455190c8587..00000000000
--- a/htdocs/langs/es_PY/mails.lang
+++ /dev/null
@@ -1,4 +0,0 @@
-# Dolibarr language file - Source file is en_US - mails
-MailSuccessfulySent=Email successfully sent (from %s to %s)
-MailingNeedCommand=For security reason, sending an emailing is better when performed from command line. If you have one, ask your server administrator to launch the following command to send the emailing to all recipients:
-ConfirmSendingEmailing=If you can't or prefer sending them with your www browser, please confirm you are sure you want to send emailing now from your browser?
diff --git a/htdocs/langs/es_PY/main.lang b/htdocs/langs/es_PY/main.lang
index 1602d6a7ffa..9eb281a31c2 100644
--- a/htdocs/langs/es_PY/main.lang
+++ b/htdocs/langs/es_PY/main.lang
@@ -19,3 +19,5 @@ FormatDateHourShort=%d/%m/%Y %H:%M
 FormatDateHourSecShort=%d/%m/%Y %H:%M:%S
 FormatDateHourTextShort=%d %b %Y %H:%M
 FormatDateHourText=%d %B %Y %H:%M
+Select2MoreCharacter=or more characters<br /><br /><strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
+Select2MoreCharacters=or more characters<br /><br /><strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
diff --git a/htdocs/langs/es_PY/members.lang b/htdocs/langs/es_PY/members.lang
deleted file mode 100644
index fcd4f3eb8d7..00000000000
--- a/htdocs/langs/es_PY/members.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - members
-MemberStatusActiveLate=subscription expired
diff --git a/htdocs/langs/es_PY/orders.lang b/htdocs/langs/es_PY/orders.lang
deleted file mode 100644
index f719db62ca8..00000000000
--- a/htdocs/langs/es_PY/orders.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - orders
-StatusOrderReceivedAllShort=Everything received
-StatusOrderReceivedAll=Everything received
diff --git a/htdocs/langs/es_PY/withdrawals.lang b/htdocs/langs/es_PY/withdrawals.lang
deleted file mode 100644
index a6f0f06fc82..00000000000
--- a/htdocs/langs/es_PY/withdrawals.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - withdrawals
-DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Withdrawal 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.
diff --git a/htdocs/langs/es_VE/accountancy.lang b/htdocs/langs/es_VE/accountancy.lang
new file mode 100644
index 00000000000..527f1fd139d
--- /dev/null
+++ b/htdocs/langs/es_VE/accountancy.lang
@@ -0,0 +1,4 @@
+# Dolibarr language file - Source file is en_US - accountancy
+AccountingCategory=Accounting category
+ErrorNoAccountingCategoryForThisCountry=No accounting category available for country %s (See Home - Setup - Dictionaries)
+WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
diff --git a/htdocs/langs/es_VE/admin.lang b/htdocs/langs/es_VE/admin.lang
index 40d755c0ae6..577667cb7ec 100644
--- a/htdocs/langs/es_VE/admin.lang
+++ b/htdocs/langs/es_VE/admin.lang
@@ -5,9 +5,10 @@ Permission20002=Crear/modificar sus días retribuidos
 Permission20003=Eliminar peticiones de días libres retribuidos
 Permission2402=Crear/eliminar acciones (eventos o tareas) vinculadas a su cuenta
 Permission2403=Modificar acciones (eventos o tareas) vinculadas a su cuenta
+DictionaryAccountancyCategory=Accounting categories
+ConstDesc=This page allows you to edit all other parameters not available in previous pages. These are mostly reserved parameters for developers or advanced troubleshooting. For a list of options <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">check here</a>.
 SupplierProposalSetup=Configuración del módulo Solicitudes a proveedor
 SupplierProposalNumberingModules=Modelos de numeración de solicitud de precios a proveedor
 SupplierProposalPDFModules=Modelos de documentos de solicitud de precios a proveedores
 FreeLegalTextOnSupplierProposal=Texto libre en solicitudes de precios a proveedores
 WatermarkOnDraftSupplierProposal=Marca de agua en solicitudes de precios a proveedor (en caso de estar vacío)
-ApiProductionMode=Enable production mode (this will activate use of a caches for services management)
diff --git a/htdocs/langs/es_VE/bills.lang b/htdocs/langs/es_VE/bills.lang
index f9c29e02605..9f955a6b8b6 100644
--- a/htdocs/langs/es_VE/bills.lang
+++ b/htdocs/langs/es_VE/bills.lang
@@ -1,5 +1,6 @@
 # Dolibarr language file - Source file is en_US - bills
-BillsCustomer=Facturas a clientes
+BillsCustomersUnpaid=Facturas a clientes pendientes de cobro
+BillsSuppliersUnpaid=Facturas de proveedores pendientes de pago
 CreateCreditNote=Crear factura de abono
 ErrorVATIntraNotConfigured=IVA aún no configurado
 SupplierBillsToPay=Facturas de proveedores pendientes de pago
diff --git a/htdocs/langs/es_VE/compta.lang b/htdocs/langs/es_VE/compta.lang
index d3246267189..8b29ff0ce15 100644
--- a/htdocs/langs/es_VE/compta.lang
+++ b/htdocs/langs/es_VE/compta.lang
@@ -14,7 +14,6 @@ LT1PaymentES=-
 LT1PaymentsES=-
 LT2PaymentES=Pago ISLR
 LT2PaymentsES=Pagos ISLR
-VATRefund=Sales tax refund Refund
 CalcModeLT1=-
 CalcModeLT1Debt=-
 CalcModeLT1Rec=-
diff --git a/htdocs/langs/es_VE/mails.lang b/htdocs/langs/es_VE/mails.lang
deleted file mode 100644
index 9d3c137c863..00000000000
--- a/htdocs/langs/es_VE/mails.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - mails
-ConfirmSendingEmailing=If you can't or prefer sending them with your www browser, please confirm you are sure you want to send emailing now from your browser?
diff --git a/htdocs/langs/es_VE/main.lang b/htdocs/langs/es_VE/main.lang
index abd0c6a5425..88fff0a960a 100644
--- a/htdocs/langs/es_VE/main.lang
+++ b/htdocs/langs/es_VE/main.lang
@@ -30,6 +30,8 @@ FindBug=Señalar un bug
 LinkToOrder=Enlazar a un pedido
 Progress=Progresión
 Export=Exportación
+Select2MoreCharacter=or more characters<br /><br /><strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
+Select2MoreCharacters=or more characters<br /><br /><strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
 SearchIntoSupplierProposals=Presupuestos de proveedores
 SearchIntoExpenseReports=Gastos
 SearchIntoLeaves=Días libres
diff --git a/htdocs/langs/es_VE/propal.lang b/htdocs/langs/es_VE/propal.lang
deleted file mode 100644
index 789b294dea2..00000000000
--- a/htdocs/langs/es_VE/propal.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - propal
-PropalsOpened=Abiertos
diff --git a/htdocs/langs/es_VE/supplier_proposal.lang b/htdocs/langs/es_VE/supplier_proposal.lang
index 42be9bbe032..b225441e044 100644
--- a/htdocs/langs/es_VE/supplier_proposal.lang
+++ b/htdocs/langs/es_VE/supplier_proposal.lang
@@ -8,7 +8,6 @@ SearchRequest=Encontrar una solicitud
 DraftRequests=Solicitudes en borrador
 SupplierProposalsDraft=Presupuestos a proveedor en borrador
 LastModifiedRequests=Últimas %s solicitudes de precios modificadas
-RequestsOpened=Abrir solicitudes de precios
 SupplierProposalArea=Área de presupuestos de proveedores
 SupplierProposals=Presupuestos de proveedores
 SupplierProposalsShort=Presupuestos de proveedores
@@ -20,11 +19,11 @@ SupplierProposalRefFournNotice=Antes de cerrar a "Aceptado", pensar para captar
 ConfirmValidateAsk=¿Seguro que deseas validar ésta solicitud de precio bajo el nombre <b> %s</b>?
 DeleteAsk=Borrar solicitud
 ValidateAsk=Validar solicitud
-SupplierProposalStatusValidated=Validado (solicitud abierta)
 SupplierProposalStatusClosed=Cerrada
 SupplierProposalStatusSigned=Aceptada
 SupplierProposalStatusNotSigned=Devuelta
 SupplierProposalStatusDraftShort=A validar
+SupplierProposalStatusValidatedShort=Validada
 SupplierProposalStatusClosedShort=Cerrada
 SupplierProposalStatusSignedShort=Aceptada
 SupplierProposalStatusNotSignedShort=Devuelta
diff --git a/htdocs/langs/es_VE/withdrawals.lang b/htdocs/langs/es_VE/withdrawals.lang
deleted file mode 100644
index a6f0f06fc82..00000000000
--- a/htdocs/langs/es_VE/withdrawals.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - withdrawals
-DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Withdrawal 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.
diff --git a/htdocs/langs/et_EE/accountancy.lang b/htdocs/langs/et_EE/accountancy.lang
index 50fcbe5db4e..84908682ac7 100644
--- a/htdocs/langs/et_EE/accountancy.lang
+++ b/htdocs/langs/et_EE/accountancy.lang
@@ -194,6 +194,8 @@ ChangeBinding=Change the binding
 
 ## Admin
 ApplyMassCategories=Apply mass categories
+AddAccountFromBookKeepingWithNoCategories=Add acccount already used with no categories
+CategoryDeleted=Category for the accounting account has been removed
 
 ## Export
 Exports=Eksportimised
@@ -209,6 +211,7 @@ Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution
 Modelcsv_quadratus=Export towards Quadratus QuadraCompta
 Modelcsv_ebp=Export towards EBP
 Modelcsv_cogilog=Export towards Cogilog
+ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
 InitAccountancy=Init accountancy
diff --git a/htdocs/langs/et_EE/admin.lang b/htdocs/langs/et_EE/admin.lang
index 3160caeac27..6db1ee2021a 100644
--- a/htdocs/langs/et_EE/admin.lang
+++ b/htdocs/langs/et_EE/admin.lang
@@ -9,17 +9,20 @@ VersionDevelopment=Arendusversioon
 VersionUnknown=Teadmata
 VersionRecommanded=Soovitatav
 FileCheck=Files integrity checker
-FileCheckDesc=This tool allows you to check the integrity of files of your application, comparing each files with the official ones. You can use this tool to detect if some files were modified by a hacker for example.
+FileCheckDesc=This tool allows you to check the integrity of files and setup of your application, comparing each files with the official ones. 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.
 FileIntegrityIsStrictlyConformedWithReference=Files integrity is strictly conformed with the reference.
-FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified of removed.
+FileIntegrityIsOkButFilesWereAdded=Files integrity check has passed, however some new files were added.
+FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified, removed or added.
 GlobalChecksum=Global checksum
 MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
 LocalSignature=Embedded local signature (less reliable)
 RemoteSignature=Remote distant signature (more reliable)
 FilesMissing=Missing Files
 FilesUpdated=Updated Files
+FilesModified=Modified Files
+FilesAdded=Added Files
 FileCheckDolibarr=Check integrity of application files
-AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from a certified package
+AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from an official package
 XmlNotFound=Xml Integrity File of application not found
 SessionId=Sessiooni ID
 SessionSaveHandler=Sessioonide töötleja
@@ -188,7 +191,9 @@ BoxesDesc=Widgets are components showing some information that you can add to pe
 OnlyActiveElementsAreShown=Näidatakse ainult elemente <a href="%s">sisse lülitatud moodulitest</a>.
 ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
-ModulesMarketPlaces=Rohkem mooduleid...
+ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
+ModulesMarketPlaces=Find external modules...
+GoModuleSetupArea=To deploy/install a new module, go onto the Module setup area at <a href="%s">%s</a>.
 DoliStoreDesc=DoliStore on ametlik Dolibarr ERP/CRM moodulite müümiseks kasutatav koht
 DoliPartnersDesc=List of companies providing custom developed modules or features (Note: anyone experienced in PHP programming can provide custom development for an open source project)
 WebSiteDesc=Reference websites to find more modules...
@@ -280,20 +285,21 @@ MenuHandlers=Menüüde töötlejad
 MenuAdmin=Menüü toimeti
 DoNotUseInProduction=Ära kasuta tootmispaigaldustes
 ThisIsProcessToFollow=This is steps to process:
-ThisIsAlternativeProcessToFollow=This is an alternative setup to process:
+ThisIsAlternativeProcessToFollow=This is an alternative setup to process manually:
 StepNb=Samm %s
 FindPackageFromWebSite=Leia pakett, mis võimaldab soovitud funktsionaalsuse (näiteks ametlikul veebilehel %s).
 DownloadPackageFromWebSite=Download package (for example from official web site %s).
-UnpackPackageInDolibarrRoot=Unpack package file into Dolibarr server directory dedicated to external modules: <b>%s</b>
-SetupIsReadyForUse=Paigaldamine on lõpetatud ja Dolibarr on valmis kasutama uut komponenti.
-NotExistsDirect=Alternatiivset juurkausta pole määratletud.<br>
-InfDirAlt=Alates versioonist 3 on võimalik määratleda alternatiivne juurkaust. See võimaldab samas kohas säilitada liidesed ja enda loodud mallid.<br>Lihtsalt loo Dolibarri juurkausta lisakataloog (näiteks: custom).<br>
-InfDirExample=<br>Seejärel määratle seadistusfails conf.php parameetrid<br>$dolibarr_main_url_root_alt='http://minuserver/custom'<br>$dolibarr_main_document_root_alt='/rada//dolibarr/htdocs/custom'<br>*Need read on välja kommenteeritud sümboliga "#", kasutamiseks eemalda trellid.
+UnpackPackageInDolibarrRoot=Unpack the packaged files into server directory dedicated to Dolibarr: <b>%s</b>
+UnpackPackageInModulesRoot=To deploy/install an external module, unpack the packaged files into the server directory dedicated to modules: <b>%s</b>
+SetupIsReadyForUse=Module deployment is finished. You must however enable and setup the module in your application by going on the page to setup modules: <a href="%s">%s</a>.
+NotExistsDirect=The alternative root directory is not defined to an existing directory.<br>
+InfDirAlt=Since version 3, it is possible to define an alternative root directory. This allows you to store, into a dedicated directory, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
+InfDirExample=<br>Then declare it in the file <strong>conf.php</strong><br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>If these lines are commented with "#", to enable them, just uncomment by removing the "#" character.
 YouCanSubmitFile=For this step, you can send package using this tool: Select module file
 CurrentVersion=Dolibarri praegune versioo
 CallUpdatePage=Go to the page that updates the database structure and data: %s.
 LastStableVersion=Viimane stabiilne versioon
-LastActivationDate=Last activation date
+LastActivationDate=Latest activation date
 UpdateServerOffline=Update server offline
 GenericMaskCodes=Sa võid sisestada suvalise numeratsiooni maski. Järgnevas maskis saab kasutada järgmisi silte:<br><b>{000000}</b> vastab arvule, mida suurendatakse iga sündmuse %s korral. Sisesta niipalju nulle, kui soovid loenduri pikkuseks. Loendurile lisatakse vasakult alates niipalju nulle, et ta oleks maskiga sama pikk.<br><b>{000000+000}</b> on eelmisega sama, kuid esimesele %s lisatakse nihe, mis vastab + märgist paremal asuvale arvule.<br><b>{000000@x}</b> on eelmisega sama, ent kuuni x jõudmisel nullitakse loendur (x on 1 ja 12 vahel, või 0 seadistuses määratletud majandusaasta alguse kasutamiseks, või 99 loenduri nullimiseks iga kuu alguses). Kui kasutad seda funktsiooni ja x on 2 või kõrgem, siis on jada {yy}{mm} or {yyyy}{mm} nõutud.<br><b>{dd}</b> päev (01 kuni 31).<br><b>{mm}</b> kuu (01 kuni 12).<br><b>{yy}</b>, <b>{yyyy}</b> või <b>{y}</b> aasta 2, 4 või 1 numbri kasutamisks.<br>
 GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
@@ -376,11 +382,11 @@ ExtrafieldCheckBox=Märkeruut
 ExtrafieldRadio=Raadionupp
 ExtrafieldCheckBoxFromList= Checkbox from table
 ExtrafieldLink=Link to an object
-ExtrafieldParamHelpselect=Parameetrite nimekiri peab olema kujul võti,väärtus<br><br>Näiteks:<br>1,väärtus1<br>2,väärtus2<br>3,väärtus3<br>jne<br><br>Nimekirja teisest nimekirjast sõltuvaks muutmiseks:<br>1,väärtus1|ema_nimekirja_kood:ema_võti<br>2,väärtus2|ema_nimekirja_kood:ema_võti
+ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list :<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list :<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=Parameetrite nimekiri peab olema kujul võti,väärtus<br><br>Näiteks:<br>1,väärtus1<br>2,väärtus2<br>3,väärtus3<br>...
 ExtrafieldParamHelpradio=Parameetrite nimekiri peab olema kujul võti,väärtus<br><br>Näiteks:<br>1,väärtus1<br>2,väärtus2<br>3,väärtus3<br>...
-ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
-ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
+ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Example : Societe:societe/class/societe.class.php
 LibraryToBuildPDF=Library used for PDF generation
 WarningUsingFPDF=Hoiatus: <b>conf.php</b> sisaldab direktiivi <b>dolibarr_pdf_force_fpdf=1</b>. See tähendab, et PDF failide loomiseks kasutatakse FPDF teeki. FPDF teek on vananenud ja ei toeta paljusid võimalusi (Unicode, läbipaistvad pildid, kirillitsa, araabia ja aasia märgistikke jne), seega võib PDFi loomise ajal tekkida vigu.<br>Probleemide vältimiseks ja täieliku PDFi loomise toe jaoks palun lae alla <a href="http://www.tcpdf.org/" target="_blank">TCPDF teek</a> ning seejärel kommenteeri välja või kustuta rida <b>$dolibarr_pdf_force_fpdf=1</b> ja lisa rida <b>$dolibarr_lib_TCPDF_PATH='TCPDF_kausta_rada'</b>
@@ -415,10 +421,10 @@ ModuleCompanyCodeDigitaria=Raamatupidamine kood sõltub kolmanda isiku koodist.
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
 WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<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).
-
+ClickToShowDescription=Click to show description
 # Modules
 Module0Name=Kasutajad ja grupid
-Module0Desc=Kasutajate ja gruppide haldamine
+Module0Desc=Users / Employees and Groups management
 Module1Name=Kolmandad isikud
 Module1Desc=Ettevõtete ja kontaktide haldamine (kliendid, huvilised)
 Module2Name=Äritegevus
@@ -689,7 +695,7 @@ PermissionAdvanced253=Väliste ja sisemiste kasutajate ja õiguste loomine/muutm
 Permission254=Ainult väliste kasutajate loomine/muutmine
 Permission255=Teiste kasutajate paroolide muutmine
 Permission256=Teiste kasutajate kustutamine või keelamine
-Permission262=Extend access to all third parties (not only third parties that user is a sale representative). Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc). Not effective for projects (only rules on project permissions, visibility and assignement matters).
+Permission262=Extend access to all third parties (not only third parties that user is a sale representative).<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 assignement matters).
 Permission271=CA vaatamine
 Permission272=Arvete vaatamine
 Permission273=Arvete väljastamine
@@ -891,7 +897,7 @@ Offset=Nihe
 AlwaysActive=Alati aktiivne
 Upgrade=Uuenda
 MenuUpgrade=Uuendada/laienda
-AddExtensionThemeModuleOrOther=Lisa laiendus (teema, moodul jne)
+AddExtensionThemeModuleOrOther=Deploy/install external module
 WebServer=Veebiserver
 DocumentRootServer=Veebiserveri juurkaust
 DataRootServer=Andmefailide kataloog
@@ -1165,10 +1171,6 @@ FreeLegalTextOnOrders=Vaba tekst tellimustel
 WatermarkOnDraftOrders=Vesimärk tellimuste mustanditel (puudub, kui tühi)
 ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable
 BANK_ASK_PAYMENT_BANK_DURING_ORDER=Ask for bank account destination of order
-##### Clicktodial #####
-ClickToDialSetup=Click To Dial mooduli seadistamine
-ClickToDialUrlDesc=Url, mida kasutatakse telefoni pildi klõpsamisel. URLi sees saab kasutada järgmisi silte:<br><b>__PHONETO__</b> asendatakse helistatava inimese telefoninumbriga<br><b>__PHONEFROM__</b> asendatakse helistaja (Sinu) telefoninumbriga<br><b>__LOGIN__</b> asendatakse clicktodial kasutajanimega (määratletud Sinu kasutajakaardil)<br><b>__PASS__</b> asendatakse clicktodial parooliga (määratletud Sinu kasutajakaardil).
-##### Bookmark4u #####
 ##### Interventions #####
 InterventionsSetup=Sekkumiste mooduli seadistamine
 FreeLegalTextOnInterventions=Vaba tekst sekkumiste dokumentidel
@@ -1395,7 +1397,7 @@ SendingsSetup=Saatmiste mooduli seadistamine
 SendingsReceiptModel=Saatekviitungi mudel
 SendingsNumberingModules=Saatmiste numeratsiooni moodulid
 SendingsAbility=Support shipping sheets for customer deliveries
-NoNeedForDeliveryReceipts=Enamikul juhtudel on saatedokumendid kasutatud nii kontrollehtedena (nimekiri toodetest, mida saata) kui lehtedena, mille saab klient endale ja allkirjastab. Seega on saatedokumentide väljastamine dubleeritud võimalus ja aktiveeritakse harva.
+NoNeedForDeliveryReceipts=In most cases, shipping sheets are used both as sheets for customer deliveries (list of products to send) and sheets that is received and signed by customer. So product deliveries receipts is a duplicated feature and is rarely activated.
 FreeLegalTextOnShippings=Free text on shipments
 ##### Deliveries #####
 DeliveryOrderNumberingModules=Saatedokumentide numeratsiooni moodul
@@ -1477,7 +1479,9 @@ AGENDA_DEFAULT_FILTER_STATUS=Seda liiki tegevuse staatus lisatakse automaatselt
 AGENDA_DEFAULT_VIEW=Vaikimisi avatav sakk päevakava avamisel
 AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
 AGENDA_NOTIFICATION_SOUND=Enable sound notification
-##### ClickToDial #####
+##### Clicktodial #####
+ClickToDialSetup=Click To Dial mooduli seadistamine
+ClickToDialUrlDesc=Url, mida kasutatakse telefoni pildi klõpsamisel. URLi sees saab kasutada järgmisi silte:<br><b>__PHONETO__</b> asendatakse helistatava inimese telefoninumbriga<br><b>__PHONEFROM__</b> asendatakse helistaja (Sinu) telefoninumbriga<br><b>__LOGIN__</b> asendatakse clicktodial kasutajanimega (määratletud Sinu kasutajakaardil)<br><b>__PASS__</b> asendatakse clicktodial parooliga (määratletud Sinu kasutajakaardil).
 ClickToDialDesc=This module allows to make phone numbers clickable. A click on this icon will call make your phone to 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.
 ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
 ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on same computer than the browser, and called when you click on a link in your browser that start 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.
@@ -1505,10 +1509,11 @@ EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint availa
 ##### API ####
 ApiSetup=API module setup
 ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
-ApiProductionMode=Enable production mode (this will activate use of a caches for services management)
+ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
 ApiExporerIs=You can explore the APIs at url
 OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
 ApiKey=Key for API
+WarningAPIExplorerDisabled=The API explorer has been disabled. API explorer is not required to provide API services. It is a tool for developer to find/test REST APIs. If you need this tool, go into setup of module API REST to activate it.
 ##### Bank #####
 BankSetupModule=Pangamooduli seadistamine
 FreeLegalTextOnChequeReceipts=Vaba tekst tšekikviitungitel
@@ -1577,7 +1582,7 @@ BackupDumpWizard=Wizard to build database backup dump file
 SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
 SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is only manual steps a privileged user can do.
 InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
-ConfFileMuseContainCustom=Installing an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to have option<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
+ConfFileMuseContainCustom=Installing an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
 HighlightLinesColor=Highlight color of the line when the mouse passes over (keep empty for no highlight)
 TextTitleColor=Color of page title
@@ -1607,6 +1612,7 @@ FixTZ=Ajavööndi parandus
 FillFixTZOnlyIfRequired=Example: +2 (fill only if problem experienced)
 ExpectedChecksum=Expected Checksum
 CurrentChecksum=Current Checksum
+ForcedConstants=Required constant values
 MailToSendProposal=To send customer proposal
 MailToSendOrder=To send customer order
 MailToSendInvoice=To send customer invoice
@@ -1615,9 +1621,10 @@ MailToSendIntervention=To send intervention
 MailToSendSupplierRequestForQuotation=To send quotation request to supplier
 MailToSendSupplierOrder=To send supplier order
 MailToSendSupplierInvoice=To send supplier invoice
+MailToSendContract=To send a contract
 MailToThirdparty=To send email from third party page
 ByDefaultInList=Show by default on list view
-YouUseLastStableVersion=You use the last stable version
+YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
 TitleExampleForMaintenanceRelease=Example of message you can use to announce this maintenance release (feel free to use it on your web sites)
 ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. 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.
diff --git a/htdocs/langs/et_EE/banks.lang b/htdocs/langs/et_EE/banks.lang
index c9fb4976895..5515c8e1610 100644
--- a/htdocs/langs/et_EE/banks.lang
+++ b/htdocs/langs/et_EE/banks.lang
@@ -74,13 +74,13 @@ Conciliate=Vii vastavusse
 Conciliation=Vastavusse viimine
 ReconciliationLate=Reconciliation late
 IncludeClosedAccount=Sh suletud tehingute summad
-OnlyOpenedAccount=Only open accounts
+OnlyOpenedAccount=Ainult avatud tehingud
 AccountToCredit=Krediteeritav konto
 AccountToDebit=Debiteeritav konto
 DisableConciliation=Keela sellel kontol vastavusse viimise funktsioonid
 ConciliationDisabled=Vastavusse viimine on keelatud
 LinkedToAConciliatedTransaction=Linked to a conciliated entry
-StatusAccountOpened=Ava
+StatusAccountOpened=Avatud
 StatusAccountClosed=Suletud
 AccountIdShort=Number
 LineRecord=Tehing
diff --git a/htdocs/langs/et_EE/bills.lang b/htdocs/langs/et_EE/bills.lang
index d85de4b88ff..282591fcf34 100644
--- a/htdocs/langs/et_EE/bills.lang
+++ b/htdocs/langs/et_EE/bills.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - bills
 Bill=Arve
 Bills=Arved
-BillsCustomers=Kliendi arved
-BillsCustomer=Kliendi arve
-BillsSuppliers=Ostuarved
-BillsCustomersUnpaid=Tasumata müügiarved
-BillsCustomersUnpaidForCompany=Tasumata müügiarved ühikuga %s
-BillsSuppliersUnpaid=Tasumata ostuarved
-BillsSuppliersUnpaidForCompany=Tasumata ostuarved ühikuga %s
+BillsCustomers=Customer invoices
+BillsCustomer=Müügiarve
+BillsSuppliers=Supplier invoices
+BillsCustomersUnpaid=Maksmata kliendiarved
+BillsCustomersUnpaidForCompany=Unpaid customer invoices for %s
+BillsSuppliersUnpaid=Maksmata tarnijate arved
+BillsSuppliersUnpaidForCompany=Unpaid supplier invoices for %s
 BillsLate=Hilinenud maksed
 BillsStatistics=Müügiiarvete statistika
 BillsStatisticsSuppliers=Ostuarvete statistika
@@ -62,8 +62,8 @@ PaymentsBack=Tagasimaksed
 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 credit note or deposit 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.
+ConfirmDeletePayment=Kas oled täiesti kindel, et soovid selle makse kustutada?
+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.
 SupplierPayments=Hankijate maksed
 ReceivedPayments=Laekunud maksed
 ReceivedCustomersPayments=Klientidelt laekunud maksed
@@ -78,6 +78,7 @@ PaymentMode=Makse liik
 PaymentTypeDC=Debit/Credit Card
 PaymentTypePP=PayPal
 IdPaymentMode=Payment type (id)
+CodePaymentMode=Payment type (code)
 LabelPaymentMode=Payment type (label)
 PaymentModeShort=Makse liik
 PaymentTerm=Maksetähtaeg
@@ -102,9 +103,10 @@ SearchACustomerInvoice=Otsi müügiarvet
 SearchASupplierInvoice=Otsi ostuarvet
 CancelBill=Tühista arve
 SendRemindByMail=Saada meeldetuletus e-postiga
-DoPayment=Soorita makse
-DoPaymentBack=Soorita tagasimakse
+DoPayment=Enter payment
+DoPaymentBack=Enter refund
 ConvertToReduc=Teisenda tuleviku allahindluseks
+ConvertExcessReceivedToReduc=Convert excess received into future discount
 EnterPaymentReceivedFromCustomer=Sisesta kliendilt saadud makse
 EnterPaymentDueToCustomer=Soorita kliendile makse
 DisabledBecauseRemainderToPayIsZero=Keelatud, sest järele jäänud maksmata on null
@@ -151,14 +153,14 @@ NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified
 FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
 NotARecurringInvoiceTemplate=Not a recurring template invoice
 NewBill=Uus arve
-LastBills=Viimased %s arvet
-LastCustomersBills=Viimased %s müügiarvet
-LastSuppliersBills=Viimased %s ostuarvet
+LastBills=Latest %s invoices
+LastCustomersBills=Latest %s customer invoices
+LastSuppliersBills=Latest %s supplier invoices
 AllBills=Kõik arved
 OtherBills=Muud arved
 DraftBills=Arve mustandid
-CustomersDraftInvoices=Müügiarvete mustandid
-SuppliersDraftInvoices=Ostuarvete mustandid
+CustomersDraftInvoices=Customer draft invoices
+SuppliersDraftInvoices=Supplier draft invoices
 Unpaid=Maksmata
 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>?
@@ -272,6 +274,7 @@ Deposit=Hoius
 Deposits=Hoiused
 DiscountFromCreditNote=Allahindlus kreeditarvelt %s
 DiscountFromDeposit=Maksed ettemaksuarvelt %s
+DiscountFromExcessReceived=Payments from excess received of invoice %s
 AbsoluteDiscountUse=Seda liiki krediiti saab kasutada arvel enne selle kinnitamist
 CreditNoteDepositUse=Invoice must be validated to use this kind of credits
 NewGlobalDiscount=Uus summaline allahindlus
@@ -279,8 +282,8 @@ NewRelativeDiscount=Uus protsentuaalne allahindlus
 NoteReason=Märkus/põhjus
 ReasonDiscount=Põhjus
 DiscountOfferedBy=Andis
-DiscountStillRemaining=Allahindlusi veel jäänud
-DiscountAlreadyCounted=Allahindlusi juba antud
+DiscountStillRemaining=Discounts available
+DiscountAlreadyCounted=Discounts already consumed
 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.
@@ -333,6 +336,8 @@ 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
 # PaymentConditions
 Statut=Staatus
 PaymentConditionShortRECEP=Due Upon Receipt
@@ -351,6 +356,14 @@ PaymentConditionShortPT_ORDER=Tellimus
 PaymentConditionPT_ORDER=Tellimisel
 PaymentConditionShortPT_5050=50-50
 PaymentConditionPT_5050=50%% ette, 50%% üleandmisel
+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
 FixAmount=Fikseeritud summa
 VarAmount=Muutuv summa (%% kogusummast)
 # PaymentType
@@ -420,7 +433,7 @@ ChequeDeposits=Tšekkide deponeerimised
 Cheques=Tšekid
 DepositId=Id deposit
 NbCheque=Number of checks
-CreditNoteConvertedIntoDiscount=See kreeditarve või ettemaksuarve on teisendatud üksuseks %s
+CreditNoteConvertedIntoDiscount=This %s has been converted into %s
 UsBillingContactAsIncoiveRecipientIfExist=Kasuta arvete saatmiseks kliendi arveaadressi kolmanda isiku aadressi asemel
 ShowUnpaidAll=Näita kõiki maksmata arved
 ShowUnpaidLateOnly=Näita ainult hilinenud maksmata arveid
diff --git a/htdocs/langs/et_EE/boxes.lang b/htdocs/langs/et_EE/boxes.lang
index 1bf5c70df24..0e27d8de904 100644
--- a/htdocs/langs/et_EE/boxes.lang
+++ b/htdocs/langs/et_EE/boxes.lang
@@ -25,8 +25,8 @@ BoxTitleLastSuppliers=Latest %s recorded suppliers
 BoxTitleLastModifiedSuppliers=Latest %s modified suppliers
 BoxTitleLastModifiedCustomers=Latest %s modified customers
 BoxTitleLastCustomersOrProspects=Latest %s customers or prospects
-BoxTitleLastCustomerBills=Latest %s customer's invoices
-BoxTitleLastSupplierBills=Latest %s supplier's invoices
+BoxTitleLastCustomerBills=Latest %s customer invoices
+BoxTitleLastSupplierBills=Latest %s supplier invoices
 BoxTitleLastModifiedProspects=Latest %s modified prospects
 BoxTitleLastModifiedMembers=Latest %s members
 BoxTitleLastFicheInter=Latest %s modified interventions
@@ -51,12 +51,12 @@ ClickToAdd=Klõpsa lisamiseks siia.
 NoRecordedCustomers=Kliente pole salvestatud
 NoRecordedContacts=Kontakte pole salvestatud
 NoActionsToDo=Täitmist vajavaid tegevusi ei ole
-NoRecordedOrders=Müügitellimusi pole salvestatud
+NoRecordedOrders=No recorded customer orders
 NoRecordedProposals=Pakkumisi pole salvestatud
-NoRecordedInvoices=Müügiarveid pole salvestatud
-NoUnpaidCustomerBills=Tasumata müügiarveid pole
-NoUnpaidSupplierBills=Maksmata ostuarveid ei ole
-NoModifiedSupplierBills=Ostuarveid pole salvestatud
+NoRecordedInvoices=No recorded customer invoices
+NoUnpaidCustomerBills=No unpaid customer invoices
+NoUnpaidSupplierBills=No unpaid supplier invoices
+NoModifiedSupplierBills=No recorded supplier invoices
 NoRecordedProducts=Tooteid/teenuseid pole salvestatud
 NoRecordedProspects=Huvilisi pole salvestatud
 NoContractedProducts=Lepingulisi tooteid/teenuseid ei ole
diff --git a/htdocs/langs/et_EE/companies.lang b/htdocs/langs/et_EE/companies.lang
index 1ed6586a2c5..8d129612639 100644
--- a/htdocs/langs/et_EE/companies.lang
+++ b/htdocs/langs/et_EE/companies.lang
@@ -81,6 +81,7 @@ PaymentBankAccount=Payment bank account
 OverAllProposals=Total proposals
 OverAllOrders=Total orders
 OverAllInvoices=Total invoices
+OverAllSupplierProposals=Total price requests
 ##### Local Taxes #####
 LocalTax1IsUsed=Kasuta teist maksu
 LocalTax1IsUsedES= RE on kasutuses
@@ -404,7 +405,7 @@ MergeThirdparties=Merge third parties
 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 so you will be able to delete the duplicate one.
 ThirdpartiesMergeSuccess=Thirdparties have been merged
 SaleRepresentativeLogin=Login of sales representative
-SaleRepresentativeFirstname=Firstname of sales representative
-SaleRepresentativeLastname=Lastname of sales representative
+SaleRepresentativeFirstname=First name of sales representative
+SaleRepresentativeLastname=Last name of sales representative
 ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
 NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/et_EE/compta.lang b/htdocs/langs/et_EE/compta.lang
index 8d1b3bd131c..438e49810cf 100644
--- a/htdocs/langs/et_EE/compta.lang
+++ b/htdocs/langs/et_EE/compta.lang
@@ -65,6 +65,7 @@ PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=KM makse
 ListPayment=Maksete nimekiri
 ListOfCustomerPayments=Klientide maksete nimekiri
+ListOfSupplierPayments=Hankijate maksete nimekiri
 DateStartPeriod=Perioodi alguse kuupäev
 DateEndPeriod=Perioodi lõpu kuupäev
 newLT1Payment=New tax 2 payment
@@ -81,7 +82,7 @@ LT2PaymentES=IRPF makse
 LT2PaymentsES=IRPF maksed
 VATPayment=Sales tax payment
 VATPayments=Sales tax payments
-VATRefund=Sales tax refund Refund
+VATRefund=Sales tax refund
 Refund=Refund
 SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Näita käibemaksu makset
diff --git a/htdocs/langs/et_EE/cron.lang b/htdocs/langs/et_EE/cron.lang
index 4522e64bb5e..63d52066ff6 100644
--- a/htdocs/langs/et_EE/cron.lang
+++ b/htdocs/langs/et_EE/cron.lang
@@ -17,14 +17,14 @@ CronMethodDoesNotExists=Class %s does not contains any method %s
 # Menu
 EnabledAndDisabled=Enabled and disabled
 # Page list
-CronLastOutput=Viimase käivituse väljund
-CronLastResult=Viimane vastuse kood
+CronLastOutput=Latest run output
+CronLastResult=Latest result code
 CronCommand=Käsk
-CronList=Scheduled jobs
+CronList=Plaanitud käivitused
 CronDelete=Delete scheduled jobs
-CronConfirmDelete=Are you sure you want to delete these scheduled jobs ?
+CronConfirmDelete=Are you sure you want to delete these scheduled jobs?
 CronExecute=Launch scheduled job
-CronConfirmExecute=Are you sure you want to execute these scheduled jobs now ?
+CronConfirmExecute=Are you sure you want to execute these scheduled jobs now?
 CronInfo=Scheduled job module allow to execute job that have been planned
 CronTask=Tegevus
 CronNone=Mitte ükski
@@ -33,13 +33,13 @@ CronDtEnd=Not after
 CronDtNextLaunch=Järgmine käivitus
 CronDtLastLaunch=Start date of latest execution
 CronDtLastResult=End date of latest execution
-CronFrequency=Frequency
+CronFrequency=Sagedus
 CronClass=Class
 CronMethod=Meetod
 CronModule=Moodul
 CronNoJobs=Pole ühtki registreeritud programm
 CronPriority=Prioriteet
-CronLabel=Label
+CronLabel=Nimi
 CronNbRun=Käivituste arv
 CronMaxRun=Max nb. launch
 CronEach=Iga
@@ -65,7 +65,7 @@ CronMethodHelp=Kasutatava objekti korral käivitatav meetod. <BR> Näiteks Dolib
 CronArgsHelp=Meetodile antavad argumendid. <BR> Näiteks Dolibarri Product objekti /htdocs/product/class/product.class.php meetodi fetch kasutamisel võivad parameetrite väärtusteks olla <i>0, ProductRef</i>.
 CronCommandHelp=Käivitatav süsteemi käsk.
 CronCreateJob=Create new Scheduled Job
-CronFrom=From
+CronFrom=Kellelt
 # Info
 # Common
 CronType=Job type
diff --git a/htdocs/langs/et_EE/errors.lang b/htdocs/langs/et_EE/errors.lang
index aca930a141f..b20e11b3c9f 100644
--- a/htdocs/langs/et_EE/errors.lang
+++ b/htdocs/langs/et_EE/errors.lang
@@ -11,6 +11,7 @@ ErrorLoginAlreadyExists=Kasutajanimi %s on juba olemas.
 ErrorGroupAlreadyExists=Grupp %s on juba olemas.
 ErrorRecordNotFound=Kirjet ei leitud.
 ErrorFailToCopyFile=Ei suutnud kopeerida faili '<b>%s</b>' asukohta '<b>%s</b>'.
+ErrorFailToCopyDir=Failed to copy directory '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToRenameFile=Ei suutnud ümber nimetada faili '<b>%s</b>' failiks '<b>%s</b>'.
 ErrorFailToDeleteFile=Ei suutnud kustutada faili '<b>%s</b>'.
 ErrorFailToCreateFile=Ei suutnud luua faili '<b>%s</b>'.
@@ -115,7 +116,7 @@ ErrorNoActivatedBarcode=Ühtki vöötkoodi tüüpi pole aktiveeritud
 ErrUnzipFails=%s lahti pakkimine ZipArchivega ebaõnnestus
 ErrNoZipEngine=Antud PHPs pole ühtki mootorit, millega faili %s lahti pakkida
 ErrorFileMustBeADolibarrPackage=Fail %s peab olema Dolibarri zip formaadis pakk
-ErrorFileRequired=See nõuab Dolibarri paki faili
+ErrorModuleFileRequired=You must select a Dolibarr module package file
 ErrorPhpCurlNotInstalled=PHP CURLei ole paigaldatud, see on PayPaliga suhtlemiseks vajalik
 ErrorFailedToAddToMailmanList=Kirje %s Mailmani listi %s või SPIPi baasi lisamine ebaõnnestus
 ErrorFailedToRemoveToMailmanList=Kirje %s Mailmaini listist %s või SPIPi baasist eemaldamine ebaõnnestus
@@ -181,6 +182,8 @@ ErrorBankStatementNameMustFollowRegex=Error, bank statement name must follow the
 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>
 
 # 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.
diff --git a/htdocs/langs/et_EE/holiday.lang b/htdocs/langs/et_EE/holiday.lang
index b72b70157c0..113c588e496 100644
--- a/htdocs/langs/et_EE/holiday.lang
+++ b/htdocs/langs/et_EE/holiday.lang
@@ -76,8 +76,8 @@ BoxTitleLastLeaveRequests=Latest %s modified leave requests
 HolidaysMonthlyUpdate=Igakuine uuendus
 ManualUpdate=Käsitsi uuendus
 HolidaysCancelation=Leave request cancelation
-EmployeeLastname=Employee lastname
-EmployeeFirstname=Employee firstname
+EmployeeLastname=Employee last name
+EmployeeFirstname=Employee first name
 TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
 
 ## Configuration du Module ##
diff --git a/htdocs/langs/et_EE/ldap.lang b/htdocs/langs/et_EE/ldap.lang
index f64253a5676..98af4539400 100644
--- a/htdocs/langs/et_EE/ldap.lang
+++ b/htdocs/langs/et_EE/ldap.lang
@@ -13,8 +13,8 @@ LDAPUsers=LDAPi andmebaasis olevad kasutajad
 LDAPFieldStatus=Staatus
 LDAPFieldFirstSubscriptionDate=Esimese tellimuse kuupäev
 LDAPFieldFirstSubscriptionAmount=Esimese tellimuse kogus
-LDAPFieldLastSubscriptionDate=Viimase tellimuse kuupäev
-LDAPFieldLastSubscriptionAmount=Viimse tellimuse kogus
+LDAPFieldLastSubscriptionDate=Latest subscription date
+LDAPFieldLastSubscriptionAmount=Latest subscription amount
 LDAPFieldSkype=Skype id
 LDAPFieldSkypeExample=Example : skypeName
 UserSynchronized=Kasutaja sünkroniseeritud
diff --git a/htdocs/langs/et_EE/mails.lang b/htdocs/langs/et_EE/mails.lang
index cca812dc0f2..885c305e9c9 100644
--- a/htdocs/langs/et_EE/mails.lang
+++ b/htdocs/langs/et_EE/mails.lang
@@ -74,14 +74,18 @@ ResultOfMailSending=Result of mass EMail sending
 NbSelected=Nb selected
 NbIgnored=Nb ignored
 NbSent=Nb sent
-ContactsWithThirdpartyFilter=Contact with customer filters
+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
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Rida %s failis
 RecipientSelectionModules=Määratletud päringud saaja valimiseks
 MailSelectedRecipients=Valitud saajad
 MailingArea=E-postituste ala
-LastMailings=Viimased %s e-postitust
+LastMailings=Latest %s emailings
 TargetsStatistics=Sihtmärkide statistika
 NbOfCompaniesContacts=Unikaalseid kontakte/aadresse
 MailNoChangePossible=Kinnitatud e-postituse saajaid ei ole võimalik muuta
@@ -146,3 +150,6 @@ AdvTgtCreateFilter=Create filter
 AdvTgtOrCreateNewFilter=Name of new filter
 NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
+OutGoingEmailSetup=Outgoing email setup
+InGoingEmailSetup=Incoming email setup
+
diff --git a/htdocs/langs/et_EE/main.lang b/htdocs/langs/et_EE/main.lang
index 185f805769d..74357ce0010 100644
--- a/htdocs/langs/et_EE/main.lang
+++ b/htdocs/langs/et_EE/main.lang
@@ -69,6 +69,7 @@ SetDate=Sea kuupäev
 SelectDate=Vali kuupäev
 SeeAlso=Vaata lisaks %s
 SeeHere=Vaata siia
+Apply=Rakenda
 BackgroundColorByDefault=Vaikimisi taustavärv
 FileRenamed=The file was successfully renamed
 FileUploaded=Fail on edukalt üles laetud
@@ -87,7 +88,7 @@ Undefined=Määratlemata
 PasswordForgotten=Password forgotten?
 SeeAbove=Vt eespool
 HomeArea=Kodu ala
-LastConnexion=Viimane sisselogimine
+LastConnexion=Latest connection
 PreviousConnexion=Eelmine sisselogimine
 PreviousValue=Previous value
 ConnectedOnMultiCompany=Keskkonda sisse logitud
@@ -237,7 +238,7 @@ DateCreation=Loomise kuupäev
 DateCreationShort=Creat. date
 DateModification=Muutmise kuupäev
 DateModificationShort=Muutm kuupäev
-DateLastModification=Viimati muutmise kuupäev
+DateLastModification=Latest modification date
 DateValidation=Kinnitamise kuupäev
 DateClosing=Lõpetamise kuupäev
 DateDue=Tähtaeg
@@ -433,7 +434,7 @@ Reportings=Aruandlus
 Draft=Mustand
 Drafts=Mustandid
 Validated=Kinnitatud
-Opened=Ava
+Opened=Avatud
 New=Uus
 Discount=Allahindlus
 Unknown=Tundmatu
@@ -599,6 +600,8 @@ SessionName=Sessiooni nimi
 Method=Meetod
 Receive=Võta vastu
 CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
+ExpectedValue=Expected Value
+CurrentValue=Praegune väärtus
 PartialWoman=Osaline
 TotalWoman=Täielik
 NeverReceived=Pole vastu võetud
@@ -756,6 +759,7 @@ SomeTranslationAreUncomplete=Some languages may be partially translated or may c
 DirectDownloadLink=Direct download link
 Download=Download
 ActualizeCurrency=Update currency rate
+Fiscalyear=Majandusaasta
 # Week day
 Monday=Esmaspäev
 Tuesday=Teisipäev
@@ -812,3 +816,5 @@ SearchIntoContracts=Lepingud
 SearchIntoCustomerShipments=Customer shipments
 SearchIntoExpenseReports=Expense reports
 SearchIntoLeaves=Leaves
+
+BulkActions=Bulk actions
diff --git a/htdocs/langs/et_EE/members.lang b/htdocs/langs/et_EE/members.lang
index ad386c1ac3d..176469d5ec6 100644
--- a/htdocs/langs/et_EE/members.lang
+++ b/htdocs/langs/et_EE/members.lang
@@ -136,8 +136,8 @@ DocForAllMembersCards=Loo kõigi liikmete kohta visiitkaardid
 DocForOneMemberCards=Loo mõne kindla liikme visiitkaart
 DocForLabels=Loo aadressilehed
 SubscriptionPayment=Liikmemaks
-LastSubscriptionDate=Viimase liikmelisuse kuupäev
-LastSubscriptionAmount=Viimase liikmelisuse makse
+LastSubscriptionDate=Latest subscription date
+LastSubscriptionAmount=Latest subscription amount
 MembersStatisticsByCountries=Liikmete statistika riigi alusel
 MembersStatisticsByState=Liikmete statistika osariigi/provintsi alusel
 MembersStatisticsByTown=Liikmete statistika linna alusel
@@ -149,7 +149,7 @@ MembersByStateDesc=See riik näitab liikmete statistikat osariigi/provintsi/kant
 MembersByTownDesc=See ekraan näitab liikmete statistikat linna alusel.
 MembersStatisticsDesc=Vali soovitud statistika...
 MenuMembersStats=Statistika
-LastMemberDate=Viimase liikme kuupäev
+LastMemberDate=Latest member date
 Nature=Loomus
 Public=Informatsioon on avalik
 NewMemberbyWeb=Uus liige lisatud, ootab heaks kiitmist
diff --git a/htdocs/langs/et_EE/orders.lang b/htdocs/langs/et_EE/orders.lang
index 158aeb94531..d04b6361c9b 100644
--- a/htdocs/langs/et_EE/orders.lang
+++ b/htdocs/langs/et_EE/orders.lang
@@ -39,7 +39,7 @@ StatusOrderRefusedShort=Keeldutud
 StatusOrderBilledShort=Arve esitatud
 StatusOrderToProcessShort=Töödelda
 StatusOrderReceivedPartiallyShort=Osaliselt kohale jõudnud
-StatusOrderReceivedAllShort=Täielikult kohale jõudnud
+StatusOrderReceivedAllShort=Products received
 StatusOrderCanceled=Tühistatud
 StatusOrderDraft=Mustand (vajab kinnitamist)
 StatusOrderValidated=Kinnitatud
@@ -51,7 +51,7 @@ StatusOrderApproved=Heaks kiidetud
 StatusOrderRefused=Keeldutud
 StatusOrderBilled=Arve esitatud
 StatusOrderReceivedPartially=Osaliselt kohale jõudnud
-StatusOrderReceivedAll=Täielikult kohale jõudnud
+StatusOrderReceivedAll=All products received
 ShippingExist=Saadetis on olemas
 QtyOrdered=Tellitud kogus
 ProductQtyInDraft=Product quantity into draft orders
diff --git a/htdocs/langs/et_EE/other.lang b/htdocs/langs/et_EE/other.lang
index d14df9ceaa1..2d280d66fdb 100644
--- a/htdocs/langs/et_EE/other.lang
+++ b/htdocs/langs/et_EE/other.lang
@@ -68,14 +68,15 @@ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find her
 PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nYou will find here the shipping __SHIPPINGREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nYou will find here the intervention __FICHINTERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n__PERSONALIZED__\n\n__SIGNATURE__
-DemoDesc=Dolibarr is a compact ERP/CRM supporting several functional modules. A demo showcasing all modules makes no sense as this scenario never occurs. So, several demo profiles are available.
+DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
+ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
 DemoFundation=Halda ühenduse liikmeid
 DemoFundation2=Halda ühenduse liikmeid ja pangakontosid
-DemoCompanyServiceOnly=Halda vabakutselist ainult müügiga tegelevat teenust
+DemoCompanyServiceOnly=Company or freelance selling service only
 DemoCompanyShopWithCashDesk=Halda kassaga poodi
-DemoCompanyProductAndStocks=Halda tooteid müüvat väikese või keskmise suurusega ettevõtet
-DemoCompanyAll=Halda väikest või keskmise suurusega ettevõtet, mis tegeleb mitmel alal (kõik põhimoodulid)
+DemoCompanyProductAndStocks=Company selling products with a shop
+DemoCompanyAll=Company with multiple activities (all main modules)
 CreatedBy=Lõi %s
 ModifiedBy=Muutis %s
 ValidatedBy=Kinnitas %s
diff --git a/htdocs/langs/et_EE/products.lang b/htdocs/langs/et_EE/products.lang
index 0ed226fe7a4..d7fd8621831 100644
--- a/htdocs/langs/et_EE/products.lang
+++ b/htdocs/langs/et_EE/products.lang
@@ -60,7 +60,7 @@ SellingPrice=Müügihind
 SellingPriceHT=Müügihind (km-ta)
 SellingPriceTTC=Müügihinna (km-ga)
 CostPriceDescription=This price (net of tax) can be used to store the average amount this product cost to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
-CostPriceUsage=In a future version, this value could be used for margin calculation.
+CostPriceUsage=This value could be used for margin calculation.
 SoldAmount=Sold amount
 PurchasedAmount=Purchased amount
 NewPrice=Uus hind
@@ -142,6 +142,7 @@ ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b>?
 CloneContentProduct=Klooni toote/teenuse kogu põhiline info
 ClonePricesProduct=Klooni põhiline info ja hinnad
 CloneCompositionProduct=Clone packaged product/service
+CloneCombinationsProduct=Clone product variants
 ProductIsUsed=Seda toodet kasutatakse
 NewRefForClone=Uue toote/teenuse viide
 SellingPrices=Selling prices
@@ -238,7 +239,7 @@ GlobalVariables=Global variables
 VariableToUpdate=Variable to update
 GlobalVariableUpdaters=Global variable updaters
 UpdateInterval=Uuendamise intervall (minutities)
-LastUpdated=Viimati uuendatud
+LastUpdated=Latest update
 CorrectlyUpdated=Õigesti uuendatud
 PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
 PropalMergePdfProductChooseFile=Select PDF files
@@ -258,4 +259,41 @@ VolumeUnits=Volume unit
 SizeUnits=Size unit
 DeleteProductBuyPrice=Delete buying price
 ConfirmDeleteProductBuyPrice=Are you sure you want to delete this buying price?
+SubProduct=Sub product
 
+#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
+ProductCombinations=Variants
+HideProductCombinations=Hide products variant in the products selector
+ProductCombination=Variant
+NewProductCombination=New variant
+EditProductCombination=Editing variant
+ProductCombinationGenerator=Variants generator
+Features=Features
+PriceImpact=Price impact
+WeightImpact=Weight impact
+NewProductAttribute=Uus atribuut
+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
+PercentageVariation=Percentage variation
+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 child products
+ConfirmCloneProductCombinations=Would you like to copy all the product variant to the 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
diff --git a/htdocs/langs/et_EE/projects.lang b/htdocs/langs/et_EE/projects.lang
index 38fda5c43c1..8bc0cc14333 100644
--- a/htdocs/langs/et_EE/projects.lang
+++ b/htdocs/langs/et_EE/projects.lang
@@ -29,9 +29,9 @@ DeleteAProject=Kustuta projekt
 DeleteATask=Kustuta ülesanne
 ConfirmDeleteAProject=Are you sure you want to delete this project?
 ConfirmDeleteATask=Are you sure you want to delete this task?
-OpenedProjects=Open projects
-OpenedTasks=Open tasks
-OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
+OpenedProjects=Opened projects
+OpenedTasks=Opened tasks
+OpportunitiesStatusForOpenedProjects=Opportunities amount of opened projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=Kuva projekt
 SetProject=Määra projekt
@@ -47,7 +47,7 @@ TaskTimeSpent=Ülesannetel kulutatud aeg
 TaskTimeUser=Kasutaja
 TaskTimeNote=Märkus
 TaskTimeDate=Kuupäev
-TasksOnOpenedProject=Tasks on open projects
+TasksOnOpenedProject=Tasks on opened projects
 WorkloadNotDefined=Workload not defined
 NewTimeSpent=Aeg kulutatud uuesti
 MyTimeSpent=Minu poolt kulutatud aeg
@@ -96,6 +96,7 @@ ValidateProject=Kinnita projekt
 ConfirmValidateProject=Are you sure you want to validate this project?
 CloseAProject=Sulge projekt
 ConfirmCloseAProject=Are you sure you want to close this project?
+AlsoCloseAProject=Also close project (keep it open if you still need to follow production tasks on it)
 ReOpenAProject=Ava projekt
 ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=Projekti kontaktid
@@ -121,7 +122,7 @@ CloneProjectFiles=Klooni projekti ühised failid
 CloneTaskFiles=Klooni ülesande/(ülesannete) ühised failid (kui ülesanne/(ülesanded) kloonitakse)
 CloneMoveDate=Update project/tasks dates from now?
 ConfirmCloneProject=Are you sure to clone this project?
-ProjectReportDate=Muuda ülesande kuupäeva vastavalt projekti alguskuupäevale
+ProjectReportDate=Change task dates according to new project start date
 ErrorShiftTaskDate=Ülesande kuupäeva ei ole võimalik nihutada vastavalt uuele projekti alguskuupäevale
 ProjectsAndTasksLines=Projektid ja ülesanded
 ProjectCreatedInDolibarr=Projekt %s on loodud
@@ -178,9 +179,9 @@ ProjectsStatistics=Statistics on projects/leads
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 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.
-OpenedProjectsByThirdparties=Open projects by thirdparties
+OpenedProjectsByThirdparties=Opened projects by thirdparties
 OnlyOpportunitiesShort=Only opportunities
-OpenedOpportunitiesShort=Open opportunities
+OpenedOpportunitiesShort=Opened opportunities
 NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount
diff --git a/htdocs/langs/et_EE/propal.lang b/htdocs/langs/et_EE/propal.lang
index 04a0e1f808c..e0199926c7e 100644
--- a/htdocs/langs/et_EE/propal.lang
+++ b/htdocs/langs/et_EE/propal.lang
@@ -3,7 +3,7 @@ Proposals=Pakkumised
 Proposal=Pakkumine
 ProposalShort=Pakkumine
 ProposalsDraft=Koosta pakkumiste mustandeid
-ProposalsOpened=Open commercial proposals
+ProposalsOpened=Avatud pakkumised
 Prop=Pakkumised
 CommercialProposal=Pakkumine
 ProposalCard=Pakkumise kaart
@@ -26,9 +26,9 @@ AmountOfProposalsByMonthHT=Arv kuus (km-ta)
 NbOfProposals=Pakkumisi
 ShowPropal=Näita pakkumist
 PropalsDraft=Mustandid
-PropalsOpened=Ava
+PropalsOpened=Avatud
 PropalStatusDraft=Mustand (vajab kinnitamist)
-PropalStatusValidated=Kinnitatud (pakkumine lahti)
+PropalStatusValidated=Validated (proposal is opened)
 PropalStatusSigned=Allkirjastatud (vaja arve esitada)
 PropalStatusNotSigned=Allkirjastamata (suletud)
 PropalStatusBilled=Arve esitatud
diff --git a/htdocs/langs/et_EE/stocks.lang b/htdocs/langs/et_EE/stocks.lang
index 0cf2d99db06..cb51cebf33f 100644
--- a/htdocs/langs/et_EE/stocks.lang
+++ b/htdocs/langs/et_EE/stocks.lang
@@ -22,13 +22,15 @@ Movements=Liikumised
 ErrorWarehouseRefRequired=Lao viide on nõutud
 ListOfWarehouses=Ladude nimekiri
 ListOfStockMovements=Laojääkide nimekiri
+StockMovementForId=Movement ID %d
+ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Warehouses area
 Location=Asukoht
 LocationSummary=Asukoha lühike nimi
 NumberOfDifferentProducts=Erinevate toodete arv
 NumberOfProducts=Toodete koguarv
-LastMovement=Viimane liikumine
-LastMovements=Viimased liikumised
+LastMovement=Latest movement
+LastMovements=Latest movements
 Units=Ühikud
 Unit=Ühik
 StockCorrection=Õige laojääk
diff --git a/htdocs/langs/et_EE/supplier_proposal.lang b/htdocs/langs/et_EE/supplier_proposal.lang
index 1062b059e33..f9b05eb73fa 100644
--- a/htdocs/langs/et_EE/supplier_proposal.lang
+++ b/htdocs/langs/et_EE/supplier_proposal.lang
@@ -8,7 +8,7 @@ SearchRequest=Find a request
 DraftRequests=Draft requests
 SupplierProposalsDraft=Draft supplier proposals
 LastModifiedRequests=Latest %s modified price requests
-RequestsOpened=Open price requests
+RequestsOpened=Opened price requests
 SupplierProposalArea=Supplier proposals area
 SupplierProposalShort=Supplier proposal
 SupplierProposals=Supplier proposals
@@ -23,7 +23,7 @@ ConfirmValidateAsk=Are you sure you want to validate this price request under na
 DeleteAsk=Delete request
 ValidateAsk=Validate request
 SupplierProposalStatusDraft=Mustand (vajab kinnitamist)
-SupplierProposalStatusValidated=Validated (request is open)
+SupplierProposalStatusValidated=Validated (request is opened)
 SupplierProposalStatusClosed=Suletud
 SupplierProposalStatusSigned=Accepted
 SupplierProposalStatusNotSigned=Keeldutud
diff --git a/htdocs/langs/et_EE/suppliers.lang b/htdocs/langs/et_EE/suppliers.lang
index 25403a893ce..59b14c66626 100644
--- a/htdocs/langs/et_EE/suppliers.lang
+++ b/htdocs/langs/et_EE/suppliers.lang
@@ -9,7 +9,7 @@ ShowSupplier=Kuva hankija
 OrderDate=Tellimuse kuupäev
 BuyingPriceMin=Best buying price
 BuyingPriceMinShort=Best buying price
-TotalBuyingPriceMinShort=Total of subproducts buying prices
+TotalBuyingPriceMinShort=Alatoodete ostuhindade kogu summa
 TotalSellingPriceMinShort=Total of subproducts selling prices
 SomeSubProductHaveNoPrices=Mõnedel alatoodetel pole määratletud hinda
 AddSupplierPrice=Add buying price
@@ -24,10 +24,10 @@ ExportDataset_fournisseur_1=Ostuarvete nimekiri ja arvete read
 ExportDataset_fournisseur_2=Ostuarved ja maksed
 ExportDataset_fournisseur_3=Ostutellimused ja tellimuste read
 ApproveThisOrder=KIida see tellimuse heaks
-ConfirmApproveThisOrder=Kas oled täiesti kindel, et soovid heaks kiita tellimuse <b>%s</b> ?
+ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b>?
 DenyingThisOrder=Deny this order
-ConfirmDenyingThisOrder=Kas oled täiesti kindel, et soovid tagasi lükata tellimuse <b>%s</b> ?
-ConfirmCancelThisOrder=Kas oled täiesti kindel, et soovid tühistada telllimuse <b>%s</b> ?
+ConfirmDenyingThisOrder=Are you sure you want to deny this order <b>%s</b>?
+ConfirmCancelThisOrder=Are you sure you want to cancel this order <b>%s</b>?
 AddSupplierOrder=Loo ostutellimus
 AddSupplierInvoice=Loo ostuarve
 ListOfSupplierProductForSupplier=Hankija <b>%s</b> toodete ja hindade nimekiri
@@ -41,3 +41,4 @@ DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Wrong quality
 ReputationForThisProduct=Reputation
 BuyerName=Buyer name
+AllProductServicePrices=All product / service prices
diff --git a/htdocs/langs/et_EE/users.lang b/htdocs/langs/et_EE/users.lang
index 30839f5392b..d782755dbba 100644
--- a/htdocs/langs/et_EE/users.lang
+++ b/htdocs/langs/et_EE/users.lang
@@ -36,7 +36,7 @@ AdministratorDesc=Administraator
 DefaultRights=Vaikimisi õigused
 DefaultRightsDesc=Määratle siin <u>vaikimisi</u> õigused, mis antakse automaatselt <u>uuele kasutajale</u> (mine kasutaja kaardile olemasoleva kasutaja õiguste muutmiseks).
 DolibarrUsers=Dolibarri kasutajad
-LastName=Last Name
+LastName=Perekonnanimi
 FirstName=Eesnimi
 ListOfGroups=Gruppide nimekiri
 NewGroup=Uus grupp
diff --git a/htdocs/langs/et_EE/withdrawals.lang b/htdocs/langs/et_EE/withdrawals.lang
index 3ba4c8dadd5..4fb61d1141d 100644
--- a/htdocs/langs/et_EE/withdrawals.lang
+++ b/htdocs/langs/et_EE/withdrawals.lang
@@ -24,6 +24,7 @@ WithdrawStatistics=Direct debit payment statistics
 WithdrawRejectStatistics=Direct debit payment reject statistics
 LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
+WithdrawRequestsDone=%s direct debit payment requests recorded
 ThirdPartyBankCode=Kolmanda isiku pangakood
 NoInvoiceCouldBeWithdrawed=Ei õnnestunud ühegi arvega seotud väljamakset teha. Kontrolli, et arve on seotud kehtiva BANiga ettevõttega.
 ClassCredited=Määra krediteerituks
@@ -76,8 +77,8 @@ RUM=UMR
 RUMLong=Unique Mandate Reference
 RUMWillBeGenerated=UMR number will be generated once bank account information are saved
 WithdrawMode=Direct debit mode (FRST or RECUR)
-WithdrawRequestAmount=Withdraw request amount:
-WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil amount.
+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
diff --git a/htdocs/langs/eu_ES/accountancy.lang b/htdocs/langs/eu_ES/accountancy.lang
index 5de95948fbf..4c2336b97b0 100644
--- a/htdocs/langs/eu_ES/accountancy.lang
+++ b/htdocs/langs/eu_ES/accountancy.lang
@@ -194,6 +194,8 @@ ChangeBinding=Change the binding
 
 ## Admin
 ApplyMassCategories=Apply mass categories
+AddAccountFromBookKeepingWithNoCategories=Add acccount already used with no categories
+CategoryDeleted=Category for the accounting account has been removed
 
 ## Export
 Exports=Exports
@@ -209,6 +211,7 @@ Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution
 Modelcsv_quadratus=Export towards Quadratus QuadraCompta
 Modelcsv_ebp=Export towards EBP
 Modelcsv_cogilog=Export towards Cogilog
+ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
 InitAccountancy=Init accountancy
diff --git a/htdocs/langs/eu_ES/admin.lang b/htdocs/langs/eu_ES/admin.lang
index 3340d079cd3..3a6f9d05f72 100644
--- a/htdocs/langs/eu_ES/admin.lang
+++ b/htdocs/langs/eu_ES/admin.lang
@@ -9,17 +9,20 @@ VersionDevelopment=Garapena
 VersionUnknown=Ezezaguna
 VersionRecommanded=Gomendatua
 FileCheck=Files integrity checker
-FileCheckDesc=This tool allows you to check the integrity of files of your application, comparing each files with the official ones. You can use this tool to detect if some files were modified by a hacker for example.
+FileCheckDesc=This tool allows you to check the integrity of files and setup of your application, comparing each files with the official ones. 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.
 FileIntegrityIsStrictlyConformedWithReference=Files integrity is strictly conformed with the reference.
-FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified of removed.
+FileIntegrityIsOkButFilesWereAdded=Files integrity check has passed, however some new files were added.
+FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified, removed or added.
 GlobalChecksum=Global checksum
 MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
 LocalSignature=Embedded local signature (less reliable)
 RemoteSignature=Remote distant signature (more reliable)
 FilesMissing=Missing Files
 FilesUpdated=Updated Files
+FilesModified=Modified Files
+FilesAdded=Added Files
 FileCheckDolibarr=Check integrity of application files
-AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from a certified package
+AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from an official package
 XmlNotFound=Xml Integrity File of application not found
 SessionId=Sesioaren ID
 SessionSaveHandler=Kudeatzailea sesioak gordetzeko
@@ -188,7 +191,9 @@ BoxesDesc=Widgets are components showing some information that you can add to pe
 OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
 ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
-ModulesMarketPlaces=Modulu gehiago...
+ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
+ModulesMarketPlaces=Find external modules...
+GoModuleSetupArea=To deploy/install a new module, go onto the Module setup area at <a href="%s">%s</a>.
 DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules
 DoliPartnersDesc=List of companies providing custom developed modules or features (Note: anyone experienced in PHP programming can provide custom development for an open source project)
 WebSiteDesc=Reference websites to find more modules...
@@ -280,20 +285,21 @@ MenuHandlers=Menu maneiatzailea
 MenuAdmin=Menu editorea
 DoNotUseInProduction=Do not use in production
 ThisIsProcessToFollow=This is steps to process:
-ThisIsAlternativeProcessToFollow=This is an alternative setup to process:
+ThisIsAlternativeProcessToFollow=This is an alternative setup to process manually:
 StepNb=%s pausua
 FindPackageFromWebSite=Find a package that provides feature you want (for example on official web site %s).
 DownloadPackageFromWebSite=Download package (for example from official web site %s).
-UnpackPackageInDolibarrRoot=Unpack package file into Dolibarr server directory dedicated to external modules: <b>%s</b>
-SetupIsReadyForUse=Install is finished and Dolibarr is ready to use with this new component.
-NotExistsDirect=The alternative root directory is not defined.<br>
-InfDirAlt=Since version 3 it is possible to define an alternative root directory.This allows you to store, same place, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
-InfDirExample=<br>Then declare it in the file conf.php<br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>*These lines are commented with "#", to uncomment only remove the character.
+UnpackPackageInDolibarrRoot=Unpack the packaged files into server directory dedicated to Dolibarr: <b>%s</b>
+UnpackPackageInModulesRoot=To deploy/install an external module, unpack the packaged files into the server directory dedicated to modules: <b>%s</b>
+SetupIsReadyForUse=Module deployment is finished. You must however enable and setup the module in your application by going on the page to setup modules: <a href="%s">%s</a>.
+NotExistsDirect=The alternative root directory is not defined to an existing directory.<br>
+InfDirAlt=Since version 3, it is possible to define an alternative root directory. This allows you to store, into a dedicated directory, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
+InfDirExample=<br>Then declare it in the file <strong>conf.php</strong><br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>If these lines are commented with "#", to enable them, just uncomment by removing the "#" character.
 YouCanSubmitFile=For this step, you can send package using this tool: Select module file
 CurrentVersion=Dolibarr-en uneko bertsioa
 CallUpdatePage=Go to the page that updates the database structure and data: %s.
 LastStableVersion=Latest stable version
-LastActivationDate=Last activation date
+LastActivationDate=Latest activation date
 UpdateServerOffline=Update server offline
 GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s. <br><b>{000000@x}</b> same as previous but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
 GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
@@ -376,11 +382,11 @@ ExtrafieldCheckBox=Checkbox
 ExtrafieldRadio=Radio botoia
 ExtrafieldCheckBoxFromList= Checkbox from table
 ExtrafieldLink=Link to an object
-ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>In order to have the list depending on another :<br>1,value1|parent_list_code:parent_key<br>2,value2|parent_list_code:parent_key
+ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list :<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list :<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
-ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
+ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Example : Societe:societe/class/societe.class.php
 LibraryToBuildPDF=Library used for PDF generation
 WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
@@ -415,10 +421,10 @@ ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The cod
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
 WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<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).
-
+ClickToShowDescription=Click to show description
 # Modules
 Module0Name=Erabiltzaileak & Taldeak
-Module0Desc=Erabiltzaile eta taldeen kudeaketa
+Module0Desc=Users / Employees and Groups management
 Module1Name=Third parties
 Module1Desc=Companies and contact management (customers, prospects...)
 Module2Name=Komertziala
@@ -689,7 +695,7 @@ PermissionAdvanced253=Create/modify internal/external users and permissions
 Permission254=Create/modify external users only
 Permission255=Modify other users password
 Permission256=Delete or disable other users
-Permission262=Extend access to all third parties (not only third parties that user is a sale representative). Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc). Not effective for projects (only rules on project permissions, visibility and assignement matters).
+Permission262=Extend access to all third parties (not only third parties that user is a sale representative).<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 assignement matters).
 Permission271=Read CA
 Permission272=Read invoices
 Permission273=Issue invoices
@@ -891,7 +897,7 @@ Offset=Offset
 AlwaysActive=Always active
 Upgrade=Upgrade
 MenuUpgrade=Upgrade / Extend
-AddExtensionThemeModuleOrOther=Add extension (theme, module, ...)
+AddExtensionThemeModuleOrOther=Deploy/install external module
 WebServer=Web server
 DocumentRootServer=Web server's root directory
 DataRootServer=Data files directory
@@ -1165,10 +1171,6 @@ FreeLegalTextOnOrders=Free text on orders
 WatermarkOnDraftOrders=Watermark on draft orders (none if empty)
 ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable
 BANK_ASK_PAYMENT_BANK_DURING_ORDER=Ask for bank account destination of order
-##### Clicktodial #####
-ClickToDialSetup=Click To Dial module setup
-ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with your clicktodial login (defined on your user card)<br><b>__PASS__</b> that will be replaced with your clicktodial password (defined on your user card).
-##### Bookmark4u #####
 ##### Interventions #####
 InterventionsSetup=Interventions module setup
 FreeLegalTextOnInterventions=Free text on intervention documents
@@ -1395,7 +1397,7 @@ SendingsSetup=Sending module setup
 SendingsReceiptModel=Sending receipt model
 SendingsNumberingModules=Sendings numbering modules
 SendingsAbility=Support shipping sheets for customer deliveries
-NoNeedForDeliveryReceipts=In most cases, sendings receipts are used both as sheets for customer deliveries (list of products to send) and sheets that is recevied and signed by customer. So product deliveries receipts is a duplicated feature and is rarely activated.
+NoNeedForDeliveryReceipts=In most cases, shipping sheets are used both as sheets for customer deliveries (list of products to send) and sheets that is received and signed by customer. So product deliveries receipts is a duplicated feature and is rarely activated.
 FreeLegalTextOnShippings=Free text on shipments
 ##### Deliveries #####
 DeliveryOrderNumberingModules=Products deliveries receipt numbering module
@@ -1477,7 +1479,9 @@ AGENDA_DEFAULT_FILTER_STATUS=Set automatically this status for events into searc
 AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
 AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
 AGENDA_NOTIFICATION_SOUND=Enable sound notification
-##### ClickToDial #####
+##### Clicktodial #####
+ClickToDialSetup=Click To Dial module setup
+ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with your clicktodial login (defined on your user card)<br><b>__PASS__</b> that will be replaced with your clicktodial password (defined on your user card).
 ClickToDialDesc=This module allows to make phone numbers clickable. A click on this icon will call make your phone to 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.
 ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
 ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on same computer than the browser, and called when you click on a link in your browser that start 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.
@@ -1505,10 +1509,11 @@ EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint availa
 ##### API ####
 ApiSetup=API module setup
 ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
-ApiProductionMode=Enable production mode (this will activate use of a caches for services management)
+ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
 ApiExporerIs=You can explore the APIs at url
 OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
 ApiKey=Key for API
+WarningAPIExplorerDisabled=The API explorer has been disabled. API explorer is not required to provide API services. It is a tool for developer to find/test REST APIs. If you need this tool, go into setup of module API REST to activate it.
 ##### Bank #####
 BankSetupModule=Bank module setup
 FreeLegalTextOnChequeReceipts=Free text on cheque receipts
@@ -1577,7 +1582,7 @@ BackupDumpWizard=Wizard to build database backup dump file
 SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
 SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is only manual steps a privileged user can do.
 InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
-ConfFileMuseContainCustom=Installing an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to have option<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
+ConfFileMuseContainCustom=Installing an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
 HighlightLinesColor=Highlight color of the line when the mouse passes over (keep empty for no highlight)
 TextTitleColor=Color of page title
@@ -1607,6 +1612,7 @@ FixTZ=TimeZone fix
 FillFixTZOnlyIfRequired=Example: +2 (fill only if problem experienced)
 ExpectedChecksum=Expected Checksum
 CurrentChecksum=Current Checksum
+ForcedConstants=Required constant values
 MailToSendProposal=To send customer proposal
 MailToSendOrder=To send customer order
 MailToSendInvoice=To send customer invoice
@@ -1615,9 +1621,10 @@ MailToSendIntervention=To send intervention
 MailToSendSupplierRequestForQuotation=To send quotation request to supplier
 MailToSendSupplierOrder=To send supplier order
 MailToSendSupplierInvoice=To send supplier invoice
+MailToSendContract=To send a contract
 MailToThirdparty=To send email from third party page
 ByDefaultInList=Show by default on list view
-YouUseLastStableVersion=You use the last stable version
+YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
 TitleExampleForMaintenanceRelease=Example of message you can use to announce this maintenance release (feel free to use it on your web sites)
 ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. 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.
diff --git a/htdocs/langs/eu_ES/banks.lang b/htdocs/langs/eu_ES/banks.lang
index e62be2f1517..c976cd39643 100644
--- a/htdocs/langs/eu_ES/banks.lang
+++ b/htdocs/langs/eu_ES/banks.lang
@@ -74,13 +74,13 @@ Conciliate=Reconcile
 Conciliation=Reconciliation
 ReconciliationLate=Reconciliation late
 IncludeClosedAccount=Include closed accounts
-OnlyOpenedAccount=Only open accounts
+OnlyOpenedAccount=Only opened accounts
 AccountToCredit=Account to credit
 AccountToDebit=Account to debit
 DisableConciliation=Disable reconciliation feature for this account
 ConciliationDisabled=Reconciliation feature disabled
 LinkedToAConciliatedTransaction=Linked to a conciliated entry
-StatusAccountOpened=Open
+StatusAccountOpened=Opened
 StatusAccountClosed=Closed
 AccountIdShort=Zenbakia
 LineRecord=Transaction
diff --git a/htdocs/langs/eu_ES/bills.lang b/htdocs/langs/eu_ES/bills.lang
index 33ad671f267..d44f2f61f1a 100644
--- a/htdocs/langs/eu_ES/bills.lang
+++ b/htdocs/langs/eu_ES/bills.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - bills
 Bill=Invoice
 Bills=Fakturak
-BillsCustomers=Customers invoices
-BillsCustomer=Customers invoice
-BillsSuppliers=Suppliers invoices
-BillsCustomersUnpaid=Unpaid customers invoices
-BillsCustomersUnpaidForCompany=Unpaid customer's invoices for %s
-BillsSuppliersUnpaid=Unpaid supplier's invoices
-BillsSuppliersUnpaidForCompany=Unpaid supplier's invoices for %s
+BillsCustomers=Customer invoices
+BillsCustomer=Customer invoice
+BillsSuppliers=Supplier invoices
+BillsCustomersUnpaid=Unpaid customer invoices
+BillsCustomersUnpaidForCompany=Unpaid customer invoices for %s
+BillsSuppliersUnpaid=Unpaid supplier invoices
+BillsSuppliersUnpaidForCompany=Unpaid supplier invoices for %s
 BillsLate=Late payments
 BillsStatistics=Customers invoices statistics
 BillsStatisticsSuppliers=Suppliers invoices statistics
@@ -62,8 +62,8 @@ PaymentsBack=Payments back
 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 credit note or deposit 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.
+ConfirmDeletePayment=Ziur zaude ordainketa hay ezabatu nahi duzuna?
+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.
 SupplierPayments=Hornitzaileei ordainketak
 ReceivedPayments=Jasotako ordainketak
 ReceivedCustomersPayments=Bezeroen jasotako ordainketak
@@ -78,6 +78,7 @@ PaymentMode=Ordainketa mota
 PaymentTypeDC=Debit/Credit Card
 PaymentTypePP=PayPal
 IdPaymentMode=Payment type (id)
+CodePaymentMode=Payment type (code)
 LabelPaymentMode=Payment type (label)
 PaymentModeShort=Ordainketa mota
 PaymentTerm=Payment term
@@ -102,9 +103,10 @@ SearchACustomerInvoice=Search for a customer invoice
 SearchASupplierInvoice=Search for a supplier invoice
 CancelBill=Cancel an invoice
 SendRemindByMail=Oroigarria e-postaz bidali
-DoPayment=Ordainketa egin
-DoPaymentBack=Do payment back
+DoPayment=Enter payment
+DoPaymentBack=Enter refund
 ConvertToReduc=Convert into future discount
+ConvertExcessReceivedToReduc=Convert excess received into future discount
 EnterPaymentReceivedFromCustomer=Enter payment received from customer
 EnterPaymentDueToCustomer=Make payment due to customer
 DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
@@ -151,14 +153,14 @@ NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified
 FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
 NotARecurringInvoiceTemplate=Not a recurring template invoice
 NewBill=New invoice
-LastBills=Last %s invoices
-LastCustomersBills=Last %s customers invoices
-LastSuppliersBills=Last %s suppliers invoices
+LastBills=Latest %s invoices
+LastCustomersBills=Latest %s customer invoices
+LastSuppliersBills=Latest %s supplier invoices
 AllBills=Faktura guztiak
 OtherBills=Other invoices
 DraftBills=Fakturen zirriborroak
-CustomersDraftInvoices=Customers draft invoices
-SuppliersDraftInvoices=Suppliers draft invoices
+CustomersDraftInvoices=Customer draft invoices
+SuppliersDraftInvoices=Supplier draft invoices
 Unpaid=Ordaindu gabekoak
 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>?
@@ -272,6 +274,7 @@ Deposit=Deposit
 Deposits=Deposits
 DiscountFromCreditNote=Discount from credit note %s
 DiscountFromDeposit=Payments from deposit invoice %s
+DiscountFromExcessReceived=Payments from excess received of invoice %s
 AbsoluteDiscountUse=This kind of credit can be used on invoice before its validation
 CreditNoteDepositUse=Invoice must be validated to use this kind of credits
 NewGlobalDiscount=New absolute discount
@@ -279,8 +282,8 @@ NewRelativeDiscount=New relative discount
 NoteReason=Note/Reason
 ReasonDiscount=Reason
 DiscountOfferedBy=Granted by
-DiscountStillRemaining=Discounts still remaining
-DiscountAlreadyCounted=Discounts already counted
+DiscountStillRemaining=Discounts available
+DiscountAlreadyCounted=Discounts already consumed
 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.
@@ -333,6 +336,8 @@ 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
 # PaymentConditions
 Statut=Status
 PaymentConditionShortRECEP=Due Upon Receipt
@@ -351,6 +356,14 @@ PaymentConditionShortPT_ORDER=Order
 PaymentConditionPT_ORDER=On order
 PaymentConditionShortPT_5050=50-50
 PaymentConditionPT_5050=50%% in advance, 50%% on delivery
+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
 FixAmount=Fix amount
 VarAmount=Variable amount (%% tot.)
 # PaymentType
@@ -420,7 +433,7 @@ ChequeDeposits=Checks deposits
 Cheques=Checks
 DepositId=Id deposit
 NbCheque=Number of checks
-CreditNoteConvertedIntoDiscount=This credit note or deposit invoice has been converted into %s
+CreditNoteConvertedIntoDiscount=This %s has been converted into %s
 UsBillingContactAsIncoiveRecipientIfExist=Use customer billing contact address instead of third party address as recipient for invoices
 ShowUnpaidAll=Show all unpaid invoices
 ShowUnpaidLateOnly=Show late unpaid invoices only
diff --git a/htdocs/langs/eu_ES/boxes.lang b/htdocs/langs/eu_ES/boxes.lang
index 98970318e85..b06629ee51f 100644
--- a/htdocs/langs/eu_ES/boxes.lang
+++ b/htdocs/langs/eu_ES/boxes.lang
@@ -25,8 +25,8 @@ BoxTitleLastSuppliers=Latest %s recorded suppliers
 BoxTitleLastModifiedSuppliers=Latest %s modified suppliers
 BoxTitleLastModifiedCustomers=Latest %s modified customers
 BoxTitleLastCustomersOrProspects=Latest %s customers or prospects
-BoxTitleLastCustomerBills=Latest %s customer's invoices
-BoxTitleLastSupplierBills=Latest %s supplier's invoices
+BoxTitleLastCustomerBills=Latest %s customer invoices
+BoxTitleLastSupplierBills=Latest %s supplier invoices
 BoxTitleLastModifiedProspects=Latest %s modified prospects
 BoxTitleLastModifiedMembers=Latest %s members
 BoxTitleLastFicheInter=Latest %s modified interventions
@@ -51,12 +51,12 @@ ClickToAdd=Click here to add.
 NoRecordedCustomers=No recorded customers
 NoRecordedContacts=No recorded contacts
 NoActionsToDo=No actions to do
-NoRecordedOrders=No recorded customer's orders
+NoRecordedOrders=No recorded customer orders
 NoRecordedProposals=No recorded proposals
-NoRecordedInvoices=No recorded customer's invoices
-NoUnpaidCustomerBills=No unpaid customer's invoices
-NoUnpaidSupplierBills=No unpaid supplier's invoices
-NoModifiedSupplierBills=No recorded supplier's invoices
+NoRecordedInvoices=No recorded customer invoices
+NoUnpaidCustomerBills=No unpaid customer invoices
+NoUnpaidSupplierBills=No unpaid supplier invoices
+NoModifiedSupplierBills=No recorded supplier invoices
 NoRecordedProducts=No recorded products/services
 NoRecordedProspects=No recorded prospects
 NoContractedProducts=No products/services contracted
@@ -79,6 +79,6 @@ BoxTitleLastModifiedCustomerOrders=Latest %s modified customer orders
 BoxTitleLastModifiedPropals=Latest %s modified propals
 ForCustomersInvoices=Customers invoices
 ForCustomersOrders=Customers orders
-ForProposals=Proposals
+ForProposals=Proposamenak
 LastXMonthRolling=The latest %s month rolling
 ChooseBoxToAdd=Add widget to your dashboard
diff --git a/htdocs/langs/eu_ES/companies.lang b/htdocs/langs/eu_ES/companies.lang
index ee4fc748aa7..7df6ad2b73b 100644
--- a/htdocs/langs/eu_ES/companies.lang
+++ b/htdocs/langs/eu_ES/companies.lang
@@ -81,6 +81,7 @@ PaymentBankAccount=Payment bank account
 OverAllProposals=Total proposals
 OverAllOrders=Total orders
 OverAllInvoices=Total invoices
+OverAllSupplierProposals=Total price requests
 ##### Local Taxes #####
 LocalTax1IsUsed=Use second tax
 LocalTax1IsUsedES= RE is used
@@ -389,7 +390,7 @@ ListCustomersShort=List of customers
 ThirdPartiesArea=Third parties and contact area
 LastModifiedThirdParties=Latest %s modified third parties
 UniqueThirdParties=Total of unique third parties
-InActivity=Open
+InActivity=Opened
 ActivityCeased=Closed
 ThirdPartyIsClosed=Third party is closed
 ProductsIntoElements=List of products/services into %s
@@ -404,7 +405,7 @@ MergeThirdparties=Merge third parties
 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 so you will be able to delete the duplicate one.
 ThirdpartiesMergeSuccess=Thirdparties have been merged
 SaleRepresentativeLogin=Login of sales representative
-SaleRepresentativeFirstname=Firstname of sales representative
-SaleRepresentativeLastname=Lastname of sales representative
+SaleRepresentativeFirstname=First name of sales representative
+SaleRepresentativeLastname=Last name of sales representative
 ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
 NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/eu_ES/compta.lang b/htdocs/langs/eu_ES/compta.lang
index 15806e0e829..f2f3dd5c1ac 100644
--- a/htdocs/langs/eu_ES/compta.lang
+++ b/htdocs/langs/eu_ES/compta.lang
@@ -65,6 +65,7 @@ PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=VAT payment
 ListPayment=List of payments
 ListOfCustomerPayments=List of customer payments
+ListOfSupplierPayments=List of supplier payments
 DateStartPeriod=Date start period
 DateEndPeriod=Date end period
 newLT1Payment=New tax 2 payment
@@ -81,7 +82,7 @@ LT2PaymentES=IRPF Payment
 LT2PaymentsES=IRPF Payments
 VATPayment=Sales tax payment
 VATPayments=Sales tax payments
-VATRefund=Sales tax refund Refund
+VATRefund=Sales tax refund
 Refund=Refund
 SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Show VAT payment
diff --git a/htdocs/langs/eu_ES/cron.lang b/htdocs/langs/eu_ES/cron.lang
index cb68b31c80f..b1e8bcb36d2 100644
--- a/htdocs/langs/eu_ES/cron.lang
+++ b/htdocs/langs/eu_ES/cron.lang
@@ -17,14 +17,14 @@ CronMethodDoesNotExists=Class %s does not contains any method %s
 # Menu
 EnabledAndDisabled=Enabled and disabled
 # Page list
-CronLastOutput=Last run output
-CronLastResult=Last result code
+CronLastOutput=Latest run output
+CronLastResult=Latest result code
 CronCommand=Command
 CronList=Scheduled jobs
 CronDelete=Delete scheduled jobs
-CronConfirmDelete=Are you sure you want to delete these scheduled jobs ?
+CronConfirmDelete=Are you sure you want to delete these scheduled jobs?
 CronExecute=Launch scheduled job
-CronConfirmExecute=Are you sure you want to execute these scheduled jobs now ?
+CronConfirmExecute=Are you sure you want to execute these scheduled jobs now?
 CronInfo=Scheduled job module allow to execute job that have been planned
 CronTask=Job
 CronNone=None
diff --git a/htdocs/langs/eu_ES/errors.lang b/htdocs/langs/eu_ES/errors.lang
index 629f063be37..9e2eb6817ef 100644
--- a/htdocs/langs/eu_ES/errors.lang
+++ b/htdocs/langs/eu_ES/errors.lang
@@ -11,6 +11,7 @@ ErrorLoginAlreadyExists=Login %s already exists.
 ErrorGroupAlreadyExists=Group %s already exists.
 ErrorRecordNotFound=Record not found.
 ErrorFailToCopyFile=Failed to copy file '<b>%s</b>' into '<b>%s</b>'.
+ErrorFailToCopyDir=Failed to copy directory '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToRenameFile=Failed to rename file '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToDeleteFile=Failed to remove file '<b>%s</b>'.
 ErrorFailToCreateFile=Failed to create file '<b>%s</b>'.
@@ -115,7 +116,7 @@ ErrorNoActivatedBarcode=No barcode type activated
 ErrUnzipFails=Failed to unzip %s with ZipArchive
 ErrNoZipEngine=No engine to unzip %s file in this PHP
 ErrorFileMustBeADolibarrPackage=The file %s must be a Dolibarr zip package
-ErrorFileRequired=It takes a package Dolibarr file
+ErrorModuleFileRequired=You must select a Dolibarr module package file
 ErrorPhpCurlNotInstalled=The PHP CURL is not installed, this is essential to talk with 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
@@ -181,6 +182,8 @@ ErrorBankStatementNameMustFollowRegex=Error, bank statement name must follow the
 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>
 
 # 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.
diff --git a/htdocs/langs/eu_ES/holiday.lang b/htdocs/langs/eu_ES/holiday.lang
index f09d3d75360..10e7c6344ee 100644
--- a/htdocs/langs/eu_ES/holiday.lang
+++ b/htdocs/langs/eu_ES/holiday.lang
@@ -76,8 +76,8 @@ BoxTitleLastLeaveRequests=Latest %s modified leave requests
 HolidaysMonthlyUpdate=Monthly update
 ManualUpdate=Manual update
 HolidaysCancelation=Leave request cancelation
-EmployeeLastname=Employee lastname
-EmployeeFirstname=Employee firstname
+EmployeeLastname=Employee last name
+EmployeeFirstname=Employee first name
 TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
 
 ## Configuration du Module ##
diff --git a/htdocs/langs/eu_ES/ldap.lang b/htdocs/langs/eu_ES/ldap.lang
index a17019d00fb..42e699de311 100644
--- a/htdocs/langs/eu_ES/ldap.lang
+++ b/htdocs/langs/eu_ES/ldap.lang
@@ -13,8 +13,8 @@ LDAPUsers=Users in LDAP database
 LDAPFieldStatus=Status
 LDAPFieldFirstSubscriptionDate=First subscription date
 LDAPFieldFirstSubscriptionAmount=First subscription amount
-LDAPFieldLastSubscriptionDate=Last subscription date
-LDAPFieldLastSubscriptionAmount=Last subscription amount
+LDAPFieldLastSubscriptionDate=Latest subscription date
+LDAPFieldLastSubscriptionAmount=Latest subscription amount
 LDAPFieldSkype=Skype id
 LDAPFieldSkypeExample=Example : skypeName
 UserSynchronized=User synchronized
diff --git a/htdocs/langs/eu_ES/mails.lang b/htdocs/langs/eu_ES/mails.lang
index 104754e5e87..fc75ec1e053 100644
--- a/htdocs/langs/eu_ES/mails.lang
+++ b/htdocs/langs/eu_ES/mails.lang
@@ -74,14 +74,18 @@ ResultOfMailSending=Result of mass EMail sending
 NbSelected=Nb selected
 NbIgnored=Nb ignored
 NbSent=Nb sent
-ContactsWithThirdpartyFilter=Contact with customer filters
+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
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Line %s in file
 RecipientSelectionModules=Defined requests for recipient's selection
 MailSelectedRecipients=Selected recipients
 MailingArea=EMailings area
-LastMailings=Last %s emailings
+LastMailings=Latest %s emailings
 TargetsStatistics=Targets statistics
 NbOfCompaniesContacts=Unique contacts/addresses
 MailNoChangePossible=Recipients for validated emailing can't be changed
@@ -146,3 +150,6 @@ AdvTgtCreateFilter=Create filter
 AdvTgtOrCreateNewFilter=Name of new filter
 NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
+OutGoingEmailSetup=Outgoing email setup
+InGoingEmailSetup=Incoming email setup
+
diff --git a/htdocs/langs/eu_ES/main.lang b/htdocs/langs/eu_ES/main.lang
index 8f24d7ed97c..82408d60634 100644
--- a/htdocs/langs/eu_ES/main.lang
+++ b/htdocs/langs/eu_ES/main.lang
@@ -69,6 +69,7 @@ SetDate=Set date
 SelectDate=Select a date
 SeeAlso=See also %s
 SeeHere=See here
+Apply=Apply
 BackgroundColorByDefault=Default background color
 FileRenamed=The file was successfully renamed
 FileUploaded=The file was successfully uploaded
@@ -87,7 +88,7 @@ Undefined=Undefined
 PasswordForgotten=Password forgotten?
 SeeAbove=See above
 HomeArea=Home area
-LastConnexion=Last connection
+LastConnexion=Latest connection
 PreviousConnexion=Previous connection
 PreviousValue=Previous value
 ConnectedOnMultiCompany=Connected on environment
@@ -237,7 +238,7 @@ DateCreation=Creation date
 DateCreationShort=Creat. date
 DateModification=Modification date
 DateModificationShort=Modif. date
-DateLastModification=Last modification date
+DateLastModification=Latest modification date
 DateValidation=Validation date
 DateClosing=Closing date
 DateDue=Due date
@@ -433,7 +434,7 @@ Reportings=Reporting
 Draft=Draft
 Drafts=Drafts
 Validated=Validated
-Opened=Open
+Opened=Opened
 New=New
 Discount=Discount
 Unknown=Ezezaguna
@@ -599,6 +600,8 @@ SessionName=Session name
 Method=Method
 Receive=Receive
 CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
+ExpectedValue=Expected Value
+CurrentValue=Current value
 PartialWoman=Partial
 TotalWoman=Total
 NeverReceived=Never received
@@ -756,6 +759,7 @@ SomeTranslationAreUncomplete=Some languages may be partially translated or may c
 DirectDownloadLink=Direct download link
 Download=Download
 ActualizeCurrency=Update currency rate
+Fiscalyear=Fiscal year
 # Week day
 Monday=Monday
 Tuesday=Tuesday
@@ -812,3 +816,5 @@ SearchIntoContracts=Kontratuak
 SearchIntoCustomerShipments=Customer shipments
 SearchIntoExpenseReports=Expense reports
 SearchIntoLeaves=Leaves
+
+BulkActions=Bulk actions
diff --git a/htdocs/langs/eu_ES/members.lang b/htdocs/langs/eu_ES/members.lang
index 4dbeb3af728..97413ad6208 100644
--- a/htdocs/langs/eu_ES/members.lang
+++ b/htdocs/langs/eu_ES/members.lang
@@ -136,8 +136,8 @@ DocForAllMembersCards=Generate business cards for all members
 DocForOneMemberCards=Generate business cards for a particular member
 DocForLabels=Generate address sheets
 SubscriptionPayment=Subscription payment
-LastSubscriptionDate=Last subscription date
-LastSubscriptionAmount=Last subscription amount
+LastSubscriptionDate=Latest subscription date
+LastSubscriptionAmount=Latest subscription amount
 MembersStatisticsByCountries=Members statistics by country
 MembersStatisticsByState=Members statistics by state/province
 MembersStatisticsByTown=Members statistics by town
@@ -149,7 +149,7 @@ MembersByStateDesc=This screen show you statistics on members by state/provinces
 MembersByTownDesc=This screen show you statistics on members by town.
 MembersStatisticsDesc=Choose statistics you want to read...
 MenuMembersStats=Statistics
-LastMemberDate=Last member date
+LastMemberDate=Latest member date
 Nature=Nature
 Public=Information are public
 NewMemberbyWeb=New member added. Awaiting approval
diff --git a/htdocs/langs/eu_ES/orders.lang b/htdocs/langs/eu_ES/orders.lang
index 0576fb41c6a..fc4b781423f 100644
--- a/htdocs/langs/eu_ES/orders.lang
+++ b/htdocs/langs/eu_ES/orders.lang
@@ -39,7 +39,7 @@ StatusOrderRefusedShort=Refused
 StatusOrderBilledShort=Billed
 StatusOrderToProcessShort=To process
 StatusOrderReceivedPartiallyShort=Partially received
-StatusOrderReceivedAllShort=Everything received
+StatusOrderReceivedAllShort=Products received
 StatusOrderCanceled=Canceled
 StatusOrderDraft=Draft (needs to be validated)
 StatusOrderValidated=Validated
@@ -51,7 +51,7 @@ StatusOrderApproved=Approved
 StatusOrderRefused=Refused
 StatusOrderBilled=Billed
 StatusOrderReceivedPartially=Partially received
-StatusOrderReceivedAll=Everything received
+StatusOrderReceivedAll=All products received
 ShippingExist=A shipment exists
 QtyOrdered=Qty ordered
 ProductQtyInDraft=Product quantity into draft orders
diff --git a/htdocs/langs/eu_ES/other.lang b/htdocs/langs/eu_ES/other.lang
index 492b696326a..eb41a1862a4 100644
--- a/htdocs/langs/eu_ES/other.lang
+++ b/htdocs/langs/eu_ES/other.lang
@@ -68,14 +68,15 @@ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find her
 PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nYou will find here the shipping __SHIPPINGREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nYou will find here the intervention __FICHINTERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n__PERSONALIZED__\n\n__SIGNATURE__
-DemoDesc=Dolibarr is a compact ERP/CRM supporting several functional modules. A demo showcasing all modules makes no sense as this scenario never occurs. So, several demo profiles are available.
+DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
+ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
 DemoFundation=Manage members of a foundation
 DemoFundation2=Manage members and bank account of a foundation
-DemoCompanyServiceOnly=Manage a freelance activity selling service only
+DemoCompanyServiceOnly=Company or freelance selling service only
 DemoCompanyShopWithCashDesk=Manage a shop with a cash desk
-DemoCompanyProductAndStocks=Manage a small or medium company selling products
-DemoCompanyAll=Manage a small or medium company with multiple activities (all main modules)
+DemoCompanyProductAndStocks=Company selling products with a shop
+DemoCompanyAll=Company with multiple activities (all main modules)
 CreatedBy=Created by %s
 ModifiedBy=Modified by %s
 ValidatedBy=Validated by %s
diff --git a/htdocs/langs/eu_ES/products.lang b/htdocs/langs/eu_ES/products.lang
index e920d49eaa8..e30308fed02 100644
--- a/htdocs/langs/eu_ES/products.lang
+++ b/htdocs/langs/eu_ES/products.lang
@@ -60,7 +60,7 @@ SellingPrice=Selling price
 SellingPriceHT=Selling price (net of tax)
 SellingPriceTTC=Selling price (inc. tax)
 CostPriceDescription=This price (net of tax) can be used to store the average amount this product cost to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
-CostPriceUsage=In a future version, this value could be used for margin calculation.
+CostPriceUsage=This value could be used for margin calculation.
 SoldAmount=Sold amount
 PurchasedAmount=Purchased amount
 NewPrice=New price
@@ -142,6 +142,7 @@ ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b>?
 CloneContentProduct=Clone all main informations of product/service
 ClonePricesProduct=Clone main informations and prices
 CloneCompositionProduct=Clone packaged product/service
+CloneCombinationsProduct=Clone product variants
 ProductIsUsed=This product is used
 NewRefForClone=Ref. of new product/service
 SellingPrices=Selling prices
@@ -238,7 +239,7 @@ GlobalVariables=Global variables
 VariableToUpdate=Variable to update
 GlobalVariableUpdaters=Global variable updaters
 UpdateInterval=Update interval (minutes)
-LastUpdated=Last updated
+LastUpdated=Latest update
 CorrectlyUpdated=Correctly updated
 PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
 PropalMergePdfProductChooseFile=Select PDF files
@@ -258,4 +259,41 @@ VolumeUnits=Volume unit
 SizeUnits=Size unit
 DeleteProductBuyPrice=Delete buying price
 ConfirmDeleteProductBuyPrice=Are you sure you want to delete this buying price?
+SubProduct=Sub product
 
+#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
+ProductCombinations=Variants
+HideProductCombinations=Hide products variant in the products selector
+ProductCombination=Variant
+NewProductCombination=New variant
+EditProductCombination=Editing variant
+ProductCombinationGenerator=Variants generator
+Features=Features
+PriceImpact=Price impact
+WeightImpact=Weight impact
+NewProductAttribute=New attribute
+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
+PercentageVariation=Percentage variation
+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 child products
+ConfirmCloneProductCombinations=Would you like to copy all the product variant to the 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
diff --git a/htdocs/langs/eu_ES/projects.lang b/htdocs/langs/eu_ES/projects.lang
index af49b58b6be..72f0eadeaed 100644
--- a/htdocs/langs/eu_ES/projects.lang
+++ b/htdocs/langs/eu_ES/projects.lang
@@ -29,9 +29,9 @@ DeleteAProject=Delete a project
 DeleteATask=Delete a task
 ConfirmDeleteAProject=Are you sure you want to delete this project?
 ConfirmDeleteATask=Are you sure you want to delete this task?
-OpenedProjects=Open projects
-OpenedTasks=Open tasks
-OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
+OpenedProjects=Opened projects
+OpenedTasks=Opened tasks
+OpportunitiesStatusForOpenedProjects=Opportunities amount of opened projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=Show project
 SetProject=Set project
@@ -47,7 +47,7 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=Erabiltzailea
 TaskTimeNote=Oharra
 TaskTimeDate=Date
-TasksOnOpenedProject=Tasks on open projects
+TasksOnOpenedProject=Tasks on opened projects
 WorkloadNotDefined=Workload not defined
 NewTimeSpent=New time spent
 MyTimeSpent=My time spent
@@ -96,6 +96,7 @@ ValidateProject=Validate projet
 ConfirmValidateProject=Are you sure you want to validate this project?
 CloseAProject=Close project
 ConfirmCloseAProject=Are you sure you want to close this project?
+AlsoCloseAProject=Also close project (keep it open if you still need to follow production tasks on it)
 ReOpenAProject=Open project
 ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=Project contacts
@@ -121,7 +122,7 @@ CloneProjectFiles=Clone project joined files
 CloneTaskFiles=Clone task(s) joined files (if task(s) cloned)
 CloneMoveDate=Update project/tasks dates from now?
 ConfirmCloneProject=Are you sure to clone this project?
-ProjectReportDate=Change task date according project start date
+ProjectReportDate=Change task dates according to new project start date
 ErrorShiftTaskDate=Impossible to shift task date according to new project start date
 ProjectsAndTasksLines=Projects and tasks
 ProjectCreatedInDolibarr=Project %s created
@@ -178,9 +179,9 @@ ProjectsStatistics=Statistics on projects/leads
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 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.
-OpenedProjectsByThirdparties=Open projects by thirdparties
+OpenedProjectsByThirdparties=Opened projects by thirdparties
 OnlyOpportunitiesShort=Only opportunities
-OpenedOpportunitiesShort=Open opportunities
+OpenedOpportunitiesShort=Opened opportunities
 NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount
diff --git a/htdocs/langs/eu_ES/propal.lang b/htdocs/langs/eu_ES/propal.lang
index 52260fe2b4e..a14d25ce779 100644
--- a/htdocs/langs/eu_ES/propal.lang
+++ b/htdocs/langs/eu_ES/propal.lang
@@ -3,7 +3,7 @@ Proposals=Commercial proposals
 Proposal=Commercial proposal
 ProposalShort=Proposal
 ProposalsDraft=Draft commercial proposals
-ProposalsOpened=Open commercial proposals
+ProposalsOpened=Opened commercial proposals
 Prop=Commercial proposals
 CommercialProposal=Commercial proposal
 ProposalCard=Proposal card
@@ -26,9 +26,9 @@ AmountOfProposalsByMonthHT=Amount by month (net of tax)
 NbOfProposals=Number of commercial proposals
 ShowPropal=Show proposal
 PropalsDraft=Drafts
-PropalsOpened=Open
+PropalsOpened=Opened
 PropalStatusDraft=Draft (needs to be validated)
-PropalStatusValidated=Validated (proposal is open)
+PropalStatusValidated=Validated (proposal is opened)
 PropalStatusSigned=Signed (needs billing)
 PropalStatusNotSigned=Not signed (closed)
 PropalStatusBilled=Billed
diff --git a/htdocs/langs/eu_ES/stocks.lang b/htdocs/langs/eu_ES/stocks.lang
index f20ae08bc03..1753a055c48 100644
--- a/htdocs/langs/eu_ES/stocks.lang
+++ b/htdocs/langs/eu_ES/stocks.lang
@@ -22,13 +22,15 @@ Movements=Movements
 ErrorWarehouseRefRequired=Warehouse reference name is required
 ListOfWarehouses=List of warehouses
 ListOfStockMovements=List of stock movements
+StockMovementForId=Movement ID %d
+ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Warehouses area
 Location=Kokapena
 LocationSummary=Short name location
 NumberOfDifferentProducts=Number of different products
 NumberOfProducts=Total number of products
-LastMovement=Last movement
-LastMovements=Last movements
+LastMovement=Latest movement
+LastMovements=Latest movements
 Units=Units
 Unit=Unit
 StockCorrection=Correct stock
diff --git a/htdocs/langs/eu_ES/supplier_proposal.lang b/htdocs/langs/eu_ES/supplier_proposal.lang
index 621d7784e35..61b031459b0 100644
--- a/htdocs/langs/eu_ES/supplier_proposal.lang
+++ b/htdocs/langs/eu_ES/supplier_proposal.lang
@@ -8,7 +8,7 @@ SearchRequest=Find a request
 DraftRequests=Draft requests
 SupplierProposalsDraft=Draft supplier proposals
 LastModifiedRequests=Latest %s modified price requests
-RequestsOpened=Open price requests
+RequestsOpened=Opened price requests
 SupplierProposalArea=Supplier proposals area
 SupplierProposalShort=Supplier proposal
 SupplierProposals=Supplier proposals
@@ -23,7 +23,7 @@ ConfirmValidateAsk=Are you sure you want to validate this price request under na
 DeleteAsk=Delete request
 ValidateAsk=Validate request
 SupplierProposalStatusDraft=Draft (needs to be validated)
-SupplierProposalStatusValidated=Validated (request is open)
+SupplierProposalStatusValidated=Validated (request is opened)
 SupplierProposalStatusClosed=Closed
 SupplierProposalStatusSigned=Accepted
 SupplierProposalStatusNotSigned=Refused
diff --git a/htdocs/langs/eu_ES/suppliers.lang b/htdocs/langs/eu_ES/suppliers.lang
index 766e4a9bfe9..099140ba012 100644
--- a/htdocs/langs/eu_ES/suppliers.lang
+++ b/htdocs/langs/eu_ES/suppliers.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - suppliers
-Suppliers=Suppliers
+Suppliers=Hornitzaileak
 SuppliersInvoice=Suppliers invoice
 ShowSupplierInvoice=Show Supplier Invoice
 NewSupplier=New supplier
@@ -24,10 +24,10 @@ ExportDataset_fournisseur_1=Supplier invoices list and invoice lines
 ExportDataset_fournisseur_2=Supplier invoices and payments
 ExportDataset_fournisseur_3=Supplier orders and order lines
 ApproveThisOrder=Approve this order
-ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b> ?
+ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b>?
 DenyingThisOrder=Deny this order
-ConfirmDenyingThisOrder=Are you sure you want to deny this order <b>%s</b> ?
-ConfirmCancelThisOrder=Are you sure you want to cancel this order <b>%s</b> ?
+ConfirmDenyingThisOrder=Are you sure you want to deny this order <b>%s</b>?
+ConfirmCancelThisOrder=Are you sure you want to cancel this order <b>%s</b>?
 AddSupplierOrder=Create supplier order
 AddSupplierInvoice=Create supplier invoice
 ListOfSupplierProductForSupplier=List of products and prices for supplier <b>%s</b>
@@ -41,3 +41,4 @@ DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Wrong quality
 ReputationForThisProduct=Reputation
 BuyerName=Buyer name
+AllProductServicePrices=All product / service prices
diff --git a/htdocs/langs/eu_ES/users.lang b/htdocs/langs/eu_ES/users.lang
index 824b5d497ad..559c43e6e28 100644
--- a/htdocs/langs/eu_ES/users.lang
+++ b/htdocs/langs/eu_ES/users.lang
@@ -36,7 +36,7 @@ AdministratorDesc=Administrator
 DefaultRights=Default permissions
 DefaultRightsDesc=Define here <u>default</u> permissions that are automatically granted to a <u>new created</u> user (Go on user card to change permission of an existing user).
 DolibarrUsers=Dolibarr users
-LastName=Last Name
+LastName=Last name
 FirstName=First name
 ListOfGroups=List of groups
 NewGroup=New group
diff --git a/htdocs/langs/eu_ES/withdrawals.lang b/htdocs/langs/eu_ES/withdrawals.lang
index 6e560a1abb1..a99d890e5f9 100644
--- a/htdocs/langs/eu_ES/withdrawals.lang
+++ b/htdocs/langs/eu_ES/withdrawals.lang
@@ -24,6 +24,7 @@ WithdrawStatistics=Direct debit payment statistics
 WithdrawRejectStatistics=Direct debit payment reject statistics
 LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
+WithdrawRequestsDone=%s direct debit payment requests recorded
 ThirdPartyBankCode=Third party bank code
 NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoice are on companies with a valid BAN.
 ClassCredited=Classify credited
@@ -76,8 +77,8 @@ RUM=UMR
 RUMLong=Unique Mandate Reference
 RUMWillBeGenerated=UMR number will be generated once bank account information are saved
 WithdrawMode=Direct debit mode (FRST or RECUR)
-WithdrawRequestAmount=Withdraw request amount:
-WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil amount.
+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
diff --git a/htdocs/langs/fa_IR/accountancy.lang b/htdocs/langs/fa_IR/accountancy.lang
index ee50d7c8143..8d860a072db 100644
--- a/htdocs/langs/fa_IR/accountancy.lang
+++ b/htdocs/langs/fa_IR/accountancy.lang
@@ -194,6 +194,8 @@ ChangeBinding=Change the binding
 
 ## Admin
 ApplyMassCategories=Apply mass categories
+AddAccountFromBookKeepingWithNoCategories=Add acccount already used with no categories
+CategoryDeleted=Category for the accounting account has been removed
 
 ## Export
 Exports=صادرات
@@ -209,6 +211,7 @@ Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution
 Modelcsv_quadratus=Export towards Quadratus QuadraCompta
 Modelcsv_ebp=Export towards EBP
 Modelcsv_cogilog=Export towards Cogilog
+ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
 InitAccountancy=Init accountancy
diff --git a/htdocs/langs/fa_IR/admin.lang b/htdocs/langs/fa_IR/admin.lang
index 2e188ab9dba..aa97c4106d7 100644
--- a/htdocs/langs/fa_IR/admin.lang
+++ b/htdocs/langs/fa_IR/admin.lang
@@ -9,17 +9,20 @@ VersionDevelopment=توسعه
 VersionUnknown=ناشناخته
 VersionRecommanded=توصیه شده
 FileCheck=Files integrity checker
-FileCheckDesc=This tool allows you to check the integrity of files of your application, comparing each files with the official ones. You can use this tool to detect if some files were modified by a hacker for example.
+FileCheckDesc=This tool allows you to check the integrity of files and setup of your application, comparing each files with the official ones. 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.
 FileIntegrityIsStrictlyConformedWithReference=Files integrity is strictly conformed with the reference.
-FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified of removed.
+FileIntegrityIsOkButFilesWereAdded=Files integrity check has passed, however some new files were added.
+FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified, removed or added.
 GlobalChecksum=Global checksum
 MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
 LocalSignature=Embedded local signature (less reliable)
 RemoteSignature=Remote distant signature (more reliable)
 FilesMissing=Missing Files
 FilesUpdated=بروزرسانی فایلها
+FilesModified=Modified Files
+FilesAdded=Added Files
 FileCheckDolibarr=Check integrity of application files
-AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from a certified package
+AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from an official package
 XmlNotFound=Xml Integrity File of application not found
 SessionId=شناسه جلسه
 SessionSaveHandler=هندلر برای صرفه جویی در جلسات
@@ -188,7 +191,9 @@ BoxesDesc=Widgets are components showing some information that you can add to pe
 OnlyActiveElementsAreShown=تنها عناصر از <a href="%s">ماژول های فعال</a> نمایش داده می شود.
 ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
-ModulesMarketPlaces=ماژول های بیشتر ...
+ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
+ModulesMarketPlaces=Find external modules...
+GoModuleSetupArea=To deploy/install a new module, go onto the Module setup area at <a href="%s">%s</a>.
 DoliStoreDesc=DoliStore، محل رسمی بازار برای ماژول های خارجی Dolibarr ERP / CRM
 DoliPartnersDesc=List of companies providing custom developed modules or features (Note: anyone experienced in PHP programming can provide custom development for an open source project)
 WebSiteDesc=Reference websites to find more modules...
@@ -280,20 +285,21 @@ MenuHandlers=گرداننده منو
 MenuAdmin=ویرایشگر منو
 DoNotUseInProduction=آیا در استفاده از تولید نیست
 ThisIsProcessToFollow=This is steps to process:
-ThisIsAlternativeProcessToFollow=This is an alternative setup to process:
+ThisIsAlternativeProcessToFollow=This is an alternative setup to process manually:
 StepNb=مرحله٪ s را
 FindPackageFromWebSite=پیدا کردن یک بسته است که ویژگی فراهم می کند شما می خواهید (به عنوان مثال در وب سایت رسمی٪ بازدید کنندگان).
 DownloadPackageFromWebSite=Download package (for example from official web site %s).
-UnpackPackageInDolibarrRoot=Unpack package file into Dolibarr server directory dedicated to external modules: <b>%s</b>
-SetupIsReadyForUse=نصب به پایان رسید و Dolibarr آماده استفاده است با این بخش جدید است.
-NotExistsDirect=ریشه جایگزین تعریف نشده است. <br>
-InfDirAlt=از آنجا که نسخه 3 این امکان وجود دارد که تعریف کند directory.This ریشه جایگزین شما اجازه می دهد برای ذخیره، همان محل، پلاگین ها و قالب های سفارشی. <br> (: سفارشی به عنوان مثال) فقط یک پوشه در ریشه Dolibarr ایجاد کنید. <br>
-InfDirExample=<br> سپس آن را در conf.php فایل اعلام <br> $ dolibarr_main_url_root_alt = 'http://myserver/custom' <br> $ dolibarr_main_document_root_alt = '/ راه / از / dolibarr / htdocs / سفارشی' <br> * این خطوط با "#" نظر، به کامنت فقط حذف شخصیت.
+UnpackPackageInDolibarrRoot=Unpack the packaged files into server directory dedicated to Dolibarr: <b>%s</b>
+UnpackPackageInModulesRoot=To deploy/install an external module, unpack the packaged files into the server directory dedicated to modules: <b>%s</b>
+SetupIsReadyForUse=Module deployment is finished. You must however enable and setup the module in your application by going on the page to setup modules: <a href="%s">%s</a>.
+NotExistsDirect=The alternative root directory is not defined to an existing directory.<br>
+InfDirAlt=Since version 3, it is possible to define an alternative root directory. This allows you to store, into a dedicated directory, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
+InfDirExample=<br>Then declare it in the file <strong>conf.php</strong><br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>If these lines are commented with "#", to enable them, just uncomment by removing the "#" character.
 YouCanSubmitFile=For this step, you can send package using this tool: Select module file
 CurrentVersion=نسخه فعلی Dolibarr
 CallUpdatePage=Go to the page that updates the database structure and data: %s.
 LastStableVersion=Latest stable version
-LastActivationDate=Last activation date
+LastActivationDate=Latest activation date
 UpdateServerOffline=بروزرسانی آفلاین سرور
 GenericMaskCodes=شما می توانید ماسک شماره را وارد کنید. در این ماسک، تگ های زیر می تواند مورد استفاده قرار گیرد: <br> <b>{000000}</b> مربوط به تعداد خواهد شد که در هر یک از٪ s را افزایش مییابد. به عنوان بسیاری از صفر را وارد کنید به عنوان طول مورد نظر از ضد. شمارنده خواهد شد صفر از سمت چپ به منظور به صفر کرده اند و بسیاری از ماسک به پایان رسید. <br> <b>{000.000 +000}</b> همان قبلی است اما جبران مربوطه را به شماره در سمت راست علامت + شروع به کار رفته در اولین٪ است. <br> <b>{000000 @ X}</b> همان قبلی است اما شمارنده به صفر زمانی که ماه X برسد (x بین 1 و 12، و یا 0 به استفاده از ماه های اولیه سال مالی تعیین شده در تنظیمات خود را، و یا 99 به صفر هر ماه ). اگر این گزینه استفاده می شود و x است 2 یا بالاتر، و سپس دنباله {YY} {میلی متر} یا {تاریخ برای ورود yyyy} {میلی متر} نیز مورد نیاز است. <br> <b>{تولد}</b> روز (01 تا 31). <br> <b>{میلی متر}</b> ماه (01 تا 12). <br> <b>{YY}، {تاریخ برای ورود yyyy}</b> یا <b>{Y}</b> سال بیش از 2، 4 و یا 1 عدد. <br>
 GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
@@ -376,11 +382,11 @@ ExtrafieldCheckBox=جعبه
 ExtrafieldRadio=دکمه های رادیویی
 ExtrafieldCheckBoxFromList= Checkbox from table
 ExtrafieldLink=Link to an object
-ExtrafieldParamHelpselect=فهرست پارامترها را به مانند کلید، ارزش است <br><br> به عنوان مثال: <br> 1، VALUE1 <br> 2، VALUE2 <br> 3، value3 <br> ... <br><br> به منظور داشتن لیست بسته به نوع دیگر: <br> 1، VALUE1 | parent_list_code: parent_key <br> 2، VALUE2 | parent_list_code: parent_key
+ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list :<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list :<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=فهرست پارامترها را به مانند کلید، ارزش است <br><br> به عنوان مثال: <br> 1، VALUE1 <br> 2، VALUE2 <br> 3، value3 <br> ...
 ExtrafieldParamHelpradio=فهرست پارامترها را به مانند کلید، ارزش است <br><br> به عنوان مثال: <br> 1، VALUE1 <br> 2، VALUE2 <br> 3، value3 <br> ...
-ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
-ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
+ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Example : Societe:societe/class/societe.class.php
 LibraryToBuildPDF=Library used for PDF generation
 WarningUsingFPDF=اخطار: <b>conf.php</b> شما شامل <b>dolibarr_pdf_force_fpdf</b> بخشنامه <b>= 1.</b> این به این معنی شما استفاده از کتابخانه FPDF برای تولید فایل های PDF. این کتابخانه قدیمی است و بسیاری از ویژگی های (یونیکد، شفافیت تصویر، زبان سیریلیک، عربی و آسیایی، ...) را پشتیبانی نمی کند، بنابراین شما ممکن است خطا در PDF نسل را تجربه کنند. <br> برای حل این و دارای پشتیبانی کامل از PDF نسل، لطفا دانلود کنید <a href="http://www.tcpdf.org/" target="_blank">کتابخانه TCPDF</a> ، پس از آن اظهار نظر و یا حذف خط <b>$ dolibarr_pdf_force_fpdf = 1،</b> و اضافه کردن به جای <b>$ dolibarr_lib_TCPDF_PATH = 'path_to_TCPDF_dir'</b>
@@ -415,10 +421,10 @@ ModuleCompanyCodeDigitaria=کد حسابداری بستگی به کد های ش
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
 WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<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).
-
+ClickToShowDescription=Click to show description
 # Modules
 Module0Name=کاربران و گروه های
-Module0Desc=کاربران و گروه های مدیریت
+Module0Desc=Users / Employees and Groups management
 Module1Name=احزاب سوم
 Module1Desc=شرکت ها و مدیریت تماس (مشتریان، چشم انداز ...)
 Module2Name=تجاری
@@ -689,7 +695,7 @@ PermissionAdvanced253=ایجاد / تغییر کاربران خارجی / داخ
 Permission254=ایجاد / تغییر کاربران خارجی فقط
 Permission255=تغییر دیگر کاربران رمز عبور
 Permission256=حذف و یا کاربران دیگر را غیر فعال کنید
-Permission262=Extend access to all third parties (not only third parties that user is a sale representative). Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc). Not effective for projects (only rules on project permissions, visibility and assignement matters).
+Permission262=Extend access to all third parties (not only third parties that user is a sale representative).<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 assignement matters).
 Permission271=خوانده شده CA
 Permission272=خوانده شده فاکتورها
 Permission273=صورت حساب شماره
@@ -891,7 +897,7 @@ Offset=افست
 AlwaysActive=همیشه فعال
 Upgrade=به روز رسانی
 MenuUpgrade=ارتقا / تمدید
-AddExtensionThemeModuleOrOther=اضافه کردن پسوند (تم، ماژول، ...)
+AddExtensionThemeModuleOrOther=Deploy/install external module
 WebServer=وب سرور
 DocumentRootServer=دایرکتوری ریشه وب سرور
 DataRootServer=دایرکتوری فایل داده ها
@@ -1165,10 +1171,6 @@ FreeLegalTextOnOrders=متن رایگان در سفارشات
 WatermarkOnDraftOrders=تعیین میزان مد آب به دستور پیش نویس (هیچ اگر خالی)
 ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable
 BANK_ASK_PAYMENT_BANK_DURING_ORDER=Ask for bank account destination of order
-##### Clicktodial #####
-ClickToDialSetup=کلیک کنید تا شماره گیری راه اندازی ماژول
-ClickToDialUrlDesc=آدرس نامیده می شود که با کلیک بر روی picto تلفن انجام می شود. در URL، شما می توانید برچسب ها <br> <b>__PHONETO__</b> خواهد شد که با شماره تلفن از فرد جایگزین را به تماس <br> <b>__PHONEFROM__</b> خواهد شد که با شماره تلفن تماس شخص (شما) به جای <br> <b>__LOGIN__</b> خواهد شد که با ورود clicktodial خود را جایگزین (تعریف شده در کارت کاربر شما) <br> <b>__PASS__</b> خواهد شد که با رمز عبور clicktodial شما (تعریف شده در کارت کاربر خود را) جایگزین شده است.
-##### Bookmark4u #####
 ##### Interventions #####
 InterventionsSetup=راه اندازی ماژول مداخلات
 FreeLegalTextOnInterventions=متن رایگان در اسناد مداخله
@@ -1395,7 +1397,7 @@ SendingsSetup=در حال ارسال راه اندازی ماژول
 SendingsReceiptModel=ارسال مدل رسید
 SendingsNumberingModules=Sendings تعداد ماژول ها
 SendingsAbility=Support shipping sheets for customer deliveries
-NoNeedForDeliveryReceipts=در اغلب موارد، sendings رسید هر دو به عنوان ورق برای تحویل به مشتری (لیستی از محصولات برای ارسال) و ورق است که recevied و امضا شده توسط مشتری استفاده می شود. بنابراین تحویل محصول رسید یکی از ویژگی های تکرار است و به ندرت فعال می شود.
+NoNeedForDeliveryReceipts=In most cases, shipping sheets are used both as sheets for customer deliveries (list of products to send) and sheets that is received and signed by customer. So product deliveries receipts is a duplicated feature and is rarely activated.
 FreeLegalTextOnShippings=Free text on shipments
 ##### Deliveries #####
 DeliveryOrderNumberingModules=محصولات تحویل رسید ماژول شماره
@@ -1477,7 +1479,9 @@ AGENDA_DEFAULT_FILTER_STATUS=تنظیم به صورت خودکار این وضع
 AGENDA_DEFAULT_VIEW=کدام زبانه می خواهید برای باز کردن به طور پیش فرض هنگام انتخاب دستور کار منو
 AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
 AGENDA_NOTIFICATION_SOUND=Enable sound notification
-##### ClickToDial #####
+##### Clicktodial #####
+ClickToDialSetup=کلیک کنید تا شماره گیری راه اندازی ماژول
+ClickToDialUrlDesc=آدرس نامیده می شود که با کلیک بر روی picto تلفن انجام می شود. در URL، شما می توانید برچسب ها <br> <b>__PHONETO__</b> خواهد شد که با شماره تلفن از فرد جایگزین را به تماس <br> <b>__PHONEFROM__</b> خواهد شد که با شماره تلفن تماس شخص (شما) به جای <br> <b>__LOGIN__</b> خواهد شد که با ورود clicktodial خود را جایگزین (تعریف شده در کارت کاربر شما) <br> <b>__PASS__</b> خواهد شد که با رمز عبور clicktodial شما (تعریف شده در کارت کاربر خود را) جایگزین شده است.
 ClickToDialDesc=This module allows to make phone numbers clickable. A click on this icon will call make your phone to 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.
 ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
 ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on same computer than the browser, and called when you click on a link in your browser that start 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.
@@ -1505,10 +1509,11 @@ EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint availa
 ##### API ####
 ApiSetup=API module setup
 ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
-ApiProductionMode=Enable production mode (this will activate use of a caches for services management)
+ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
 ApiExporerIs=You can explore the APIs at url
 OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
 ApiKey=Key for API
+WarningAPIExplorerDisabled=The API explorer has been disabled. API explorer is not required to provide API services. It is a tool for developer to find/test REST APIs. If you need this tool, go into setup of module API REST to activate it.
 ##### Bank #####
 BankSetupModule=راه اندازی ماژول بانک
 FreeLegalTextOnChequeReceipts=متن رایگان در چک رسید
@@ -1577,7 +1582,7 @@ BackupDumpWizard=Wizard to build database backup dump file
 SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
 SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is only manual steps a privileged user can do.
 InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
-ConfFileMuseContainCustom=Installing an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to have option<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
+ConfFileMuseContainCustom=Installing an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
 HighlightLinesColor=Highlight color of the line when the mouse passes over (keep empty for no highlight)
 TextTitleColor=Color of page title
@@ -1607,6 +1612,7 @@ FixTZ=ثابت منطقه زمانی
 FillFixTZOnlyIfRequired=Example: +2 (fill only if problem experienced)
 ExpectedChecksum=Expected Checksum
 CurrentChecksum=Current Checksum
+ForcedConstants=Required constant values
 MailToSendProposal=To send customer proposal
 MailToSendOrder=To send customer order
 MailToSendInvoice=To send customer invoice
@@ -1615,9 +1621,10 @@ MailToSendIntervention=To send intervention
 MailToSendSupplierRequestForQuotation=To send quotation request to supplier
 MailToSendSupplierOrder=To send supplier order
 MailToSendSupplierInvoice=To send supplier invoice
+MailToSendContract=To send a contract
 MailToThirdparty=To send email from third party page
 ByDefaultInList=Show by default on list view
-YouUseLastStableVersion=You use the last stable version
+YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
 TitleExampleForMaintenanceRelease=Example of message you can use to announce this maintenance release (feel free to use it on your web sites)
 ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. 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.
diff --git a/htdocs/langs/fa_IR/banks.lang b/htdocs/langs/fa_IR/banks.lang
index 5f18cc4ca56..52a8d6d686d 100644
--- a/htdocs/langs/fa_IR/banks.lang
+++ b/htdocs/langs/fa_IR/banks.lang
@@ -74,13 +74,13 @@ Conciliate=وفق دادن
 Conciliation=مصالحه
 ReconciliationLate=Reconciliation late
 IncludeClosedAccount=شامل حساب های بسته شده
-OnlyOpenedAccount=Only open accounts
+OnlyOpenedAccount=حساب های تنها باز
 AccountToCredit=حساب به اعتبار
 AccountToDebit=حساب به بدهی
 DisableConciliation=غیر فعال کردن ویژگی های آشتی برای این حساب
 ConciliationDisabled=از ویژگی های آشتی غیر فعال است
 LinkedToAConciliatedTransaction=Linked to a conciliated entry
-StatusAccountOpened=باز
+StatusAccountOpened=افتتاح شد
 StatusAccountClosed=بسته شده
 AccountIdShort=شماره
 LineRecord=معامله
diff --git a/htdocs/langs/fa_IR/bills.lang b/htdocs/langs/fa_IR/bills.lang
index 8859c36137d..144082e94f2 100644
--- a/htdocs/langs/fa_IR/bills.lang
+++ b/htdocs/langs/fa_IR/bills.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - bills
 Bill=صورت حساب
 Bills=صورت حساب
-BillsCustomers=مشتریان فاکتورها
-BillsCustomer=Customers invoice
-BillsSuppliers=تولید کنندگان فاکتورها
-BillsCustomersUnpaid=صورت حساب مشتریان پرداخت نشده
-BillsCustomersUnpaidForCompany=صورت حساب به مشتری پرداخت نشده است برای٪ s
-BillsSuppliersUnpaid=فاکتورها منبع پرداخت نشده است
-BillsSuppliersUnpaidForCompany=فاکتورها منبع پرداخت نشده است برای٪ s
+BillsCustomers=Customer invoices
+BillsCustomer=صورت حساب به مشتری
+BillsSuppliers=Supplier invoices
+BillsCustomersUnpaid=Unpaid customer invoices
+BillsCustomersUnpaidForCompany=Unpaid customer invoices for %s
+BillsSuppliersUnpaid=Unpaid supplier invoices
+BillsSuppliersUnpaidForCompany=Unpaid supplier invoices for %s
 BillsLate=پرداخت در اواخر
 BillsStatistics=Customers invoices statistics
 BillsStatisticsSuppliers=Suppliers invoices statistics
@@ -62,8 +62,8 @@ PaymentsBack=پرداخت به عقب
 paymentInInvoiceCurrency=in invoices currency
 PaidBack=پرداخت به عقب
 DeletePayment=حذف پرداخت
-ConfirmDeletePayment=Are you sure you want to delete this payment?
-ConfirmConvertToReduc=Do you want to convert this credit note or deposit 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.
+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.
 SupplierPayments=تولید کنندگان پرداخت
 ReceivedPayments=دریافت پرداخت
 ReceivedCustomersPayments=پرداخت دریافت از مشتریان
@@ -78,6 +78,7 @@ PaymentMode=نحوه پرداخت
 PaymentTypeDC=Debit/Credit Card
 PaymentTypePP=PayPal
 IdPaymentMode=Payment type (id)
+CodePaymentMode=Payment type (code)
 LabelPaymentMode=Payment type (label)
 PaymentModeShort=نحوه پرداخت
 PaymentTerm=مدت پرداخت
@@ -102,9 +103,10 @@ SearchACustomerInvoice=جستجو برای یک صورتحساب مشتری
 SearchASupplierInvoice=جستجو برای یک فاکتور منبع
 CancelBill=لغو فاکتور
 SendRemindByMail=ارسال یادآور با ایمیل
-DoPayment=آیا پرداخت
-DoPaymentBack=آیا پرداخت به عقب
+DoPayment=Enter payment
+DoPaymentBack=Enter refund
 ConvertToReduc=تبدیل به تخفیف آینده
+ConvertExcessReceivedToReduc=Convert excess received into future discount
 EnterPaymentReceivedFromCustomer=پرداخت های دریافت شده از مشتری را وارد کنید
 EnterPaymentDueToCustomer=پرداخت با توجه به مشتری
 DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
@@ -151,14 +153,14 @@ NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified
 FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
 NotARecurringInvoiceTemplate=Not a recurring template invoice
 NewBill=صورت حساب جدید
-LastBills=تاریخ و زمان آخرین٪ s را فاکتورها
-LastCustomersBills=تاریخ و زمان آخرین٪ مشتریان فاکتورها
-LastSuppliersBills=تاریخ و زمان آخرین٪ بازدید کنندگان تامین کنندگان فاکتورها
+LastBills=Latest %s invoices
+LastCustomersBills=Latest %s customer invoices
+LastSuppliersBills=Latest %s supplier invoices
 AllBills=تمام فاکتورها
 OtherBills=دیگر فاکتورها
 DraftBills=فاکتورها پیش نویس
-CustomersDraftInvoices=مشتریان پیش نویس فاکتورها
-SuppliersDraftInvoices=تولید کنندگان پیش نویس فاکتورها
+CustomersDraftInvoices=Customer draft invoices
+SuppliersDraftInvoices=Supplier draft invoices
 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>?
@@ -272,6 +274,7 @@ Deposit=سپرده
 Deposits=سپرده ها
 DiscountFromCreditNote=تخفیف از اعتبار توجه داشته باشید از٪ s
 DiscountFromDeposit=پرداخت از سپرده فاکتور از٪ s
+DiscountFromExcessReceived=Payments from excess received of invoice %s
 AbsoluteDiscountUse=این نوع از اعتبار را می توان در صورتحساب قبل از اعتبار آن استفاده می شود
 CreditNoteDepositUse=Invoice must be validated to use this kind of credits
 NewGlobalDiscount=تخفیف های جدید مطلق
@@ -279,8 +282,8 @@ NewRelativeDiscount=تخفیف نسبی جدید
 NoteReason=توجه داشته باشید / عقل
 ReasonDiscount=دلیل
 DiscountOfferedBy=اعطا شده از
-DiscountStillRemaining=تخفیف هنوز هم باقی مانده
-DiscountAlreadyCounted=تخفیف در حال حاضر شمارش
+DiscountStillRemaining=Discounts available
+DiscountAlreadyCounted=Discounts already consumed
 BillAddress=آدرس بیل
 HelpEscompte=این تخفیف تخفیف اعطا شده به مشتری است، زیرا پرداخت آن قبل از واژه ساخته شده است.
 HelpAbandonBadCustomer=این مقدار متوقف شده (مشتری گفته می شود یک مشتری بد) است و به عنوان یک شل استثنایی در نظر گرفته.
@@ -333,6 +336,8 @@ 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
 # PaymentConditions
 Statut=وضعیت
 PaymentConditionShortRECEP=Due Upon Receipt
@@ -351,6 +356,14 @@ 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
 FixAmount=ثابت مقدار
 VarAmount=مقدار متغیر (٪٪ جمع.)
 # PaymentType
@@ -420,7 +433,7 @@ ChequeDeposits=چک سپرده
 Cheques=چک
 DepositId=Id deposit
 NbCheque=Number of checks
-CreditNoteConvertedIntoDiscount=این یادداشت اعتباری و یا واریز صورت حساب شده است به٪ s را تبدیل
+CreditNoteConvertedIntoDiscount=This %s has been converted into %s
 UsBillingContactAsIncoiveRecipientIfExist=استفاده از حسابداری و مدیریت مشتری آدرس تماس به جای آدرس شخص ثالث به عنوان دریافت کننده برای صورت حساب
 ShowUnpaidAll=نمایش همه فاکتورها پرداخت نشده
 ShowUnpaidLateOnly=نمایش فاکتورها اواخر سال پرداخت نشده و تنها
diff --git a/htdocs/langs/fa_IR/boxes.lang b/htdocs/langs/fa_IR/boxes.lang
index f81be5d5321..1c7a22492b8 100644
--- a/htdocs/langs/fa_IR/boxes.lang
+++ b/htdocs/langs/fa_IR/boxes.lang
@@ -25,8 +25,8 @@ BoxTitleLastSuppliers=Latest %s recorded suppliers
 BoxTitleLastModifiedSuppliers=Latest %s modified suppliers
 BoxTitleLastModifiedCustomers=Latest %s modified customers
 BoxTitleLastCustomersOrProspects=Latest %s customers or prospects
-BoxTitleLastCustomerBills=Latest %s customer's invoices
-BoxTitleLastSupplierBills=Latest %s supplier's invoices
+BoxTitleLastCustomerBills=Latest %s customer invoices
+BoxTitleLastSupplierBills=Latest %s supplier invoices
 BoxTitleLastModifiedProspects=Latest %s modified prospects
 BoxTitleLastModifiedMembers=Latest %s members
 BoxTitleLastFicheInter=Latest %s modified interventions
@@ -51,12 +51,12 @@ ClickToAdd=برای اضافه کردن اینجا کلیک کنید.
 NoRecordedCustomers=بدون مشتریان ثبت
 NoRecordedContacts=بدون اطلاعات تماس ثبت
 NoActionsToDo=هیچ عملیاتی برای انجام
-NoRecordedOrders=سفارشات بدون مشتری ثبت شده است
+NoRecordedOrders=No recorded customer orders
 NoRecordedProposals=هیچ طرح ثبت
-NoRecordedInvoices=فاکتورهای هیچ مشتری ثبت شده است
-NoUnpaidCustomerBills=فاکتورهای هیچ مشتری پرداخت نشده است
-NoUnpaidSupplierBills=فاکتورها بدون منبع پرداخت نشده است
-NoModifiedSupplierBills=فاکتورها بدون منبع ثبت در
+NoRecordedInvoices=No recorded customer invoices
+NoUnpaidCustomerBills=No unpaid customer invoices
+NoUnpaidSupplierBills=No unpaid supplier invoices
+NoModifiedSupplierBills=No recorded supplier invoices
 NoRecordedProducts=بدون ثبت محصولات / خدمات
 NoRecordedProspects=بدون چشم انداز ثبت
 NoContractedProducts=محصولات / خدمات قرارداد
diff --git a/htdocs/langs/fa_IR/companies.lang b/htdocs/langs/fa_IR/companies.lang
index c5762e057ea..043f486baae 100644
--- a/htdocs/langs/fa_IR/companies.lang
+++ b/htdocs/langs/fa_IR/companies.lang
@@ -81,6 +81,7 @@ PaymentBankAccount=Payment bank account
 OverAllProposals=Total proposals
 OverAllOrders=Total orders
 OverAllInvoices=Total invoices
+OverAllSupplierProposals=Total price requests
 ##### Local Taxes #####
 LocalTax1IsUsed=استفاده از مالیات دوم
 LocalTax1IsUsedES= RE استفاده شده است
@@ -389,7 +390,7 @@ ListCustomersShort=فهرست مشتریان
 ThirdPartiesArea=Third parties and contact area
 LastModifiedThirdParties=Latest %s modified third parties
 UniqueThirdParties=مجموع اشخاص ثالث منحصر به فرد
-InActivity=باز
+InActivity=افتتاح شد
 ActivityCeased=بسته
 ThirdPartyIsClosed=Third party is closed
 ProductsIntoElements=List of products/services into %s
@@ -404,7 +405,7 @@ MergeThirdparties=Merge third parties
 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 so you will be able to delete the duplicate one.
 ThirdpartiesMergeSuccess=Thirdparties have been merged
 SaleRepresentativeLogin=Login of sales representative
-SaleRepresentativeFirstname=Firstname of sales representative
-SaleRepresentativeLastname=Lastname of sales representative
+SaleRepresentativeFirstname=First name of sales representative
+SaleRepresentativeLastname=Last name of sales representative
 ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
 NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/fa_IR/compta.lang b/htdocs/langs/fa_IR/compta.lang
index 9c8d4ee7ae0..2b09183ed71 100644
--- a/htdocs/langs/fa_IR/compta.lang
+++ b/htdocs/langs/fa_IR/compta.lang
@@ -65,6 +65,7 @@ PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=پرداخت مالیات بر ارزش افزوده
 ListPayment=فهرست پرداخت
 ListOfCustomerPayments=لیست پرداخت های مشتری
+ListOfSupplierPayments=لیست پرداخت های منبع
 DateStartPeriod=دوره تاریخ شروع
 DateEndPeriod=دوره تاریخ پایان
 newLT1Payment=New tax 2 payment
@@ -81,7 +82,7 @@ LT2PaymentES=پرداخت IRPF
 LT2PaymentsES=IRPF پرداخت
 VATPayment=Sales tax payment
 VATPayments=Sales tax payments
-VATRefund=Sales tax refund Refund
+VATRefund=Sales tax refund
 Refund=Refund
 SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=نمایش پرداخت مالیات بر ارزش افزوده
diff --git a/htdocs/langs/fa_IR/cron.lang b/htdocs/langs/fa_IR/cron.lang
index 15faee6fdc5..21bca90a3c6 100644
--- a/htdocs/langs/fa_IR/cron.lang
+++ b/htdocs/langs/fa_IR/cron.lang
@@ -17,14 +17,14 @@ CronMethodDoesNotExists=Class %s does not contains any method %s
 # Menu
 EnabledAndDisabled=Enabled and disabled
 # Page list
-CronLastOutput=تاریخ و زمان آخرین خروجی اجرا
-CronLastResult=آخرین نتیجه
+CronLastOutput=Latest run output
+CronLastResult=Latest result code
 CronCommand=فرمان
-CronList=Scheduled jobs
+CronList=شغل برنامه ریزی
 CronDelete=Delete scheduled jobs
-CronConfirmDelete=Are you sure you want to delete these scheduled jobs ?
+CronConfirmDelete=Are you sure you want to delete these scheduled jobs?
 CronExecute=Launch scheduled job
-CronConfirmExecute=Are you sure you want to execute these scheduled jobs now ?
+CronConfirmExecute=Are you sure you want to execute these scheduled jobs now?
 CronInfo=Scheduled job module allow to execute job that have been planned
 CronTask=کار
 CronNone=هیچ یک
@@ -33,13 +33,13 @@ CronDtEnd=Not after
 CronDtNextLaunch=اعدام بعدی
 CronDtLastLaunch=Start date of latest execution
 CronDtLastResult=End date of latest execution
-CronFrequency=Frequency
+CronFrequency=فرکانس
 CronClass=Class
 CronMethod=روش
 CronModule=واحد
 CronNoJobs=بدون شغل ثبت نام
 CronPriority=اولویت
-CronLabel=Label
+CronLabel=برچسب
 CronNbRun=نیوبیوم. راه اندازی
 CronMaxRun=Max nb. launch
 CronEach=هر
@@ -65,7 +65,7 @@ CronMethodHelp=روش شی برای راه اندازی. <BR> برای exemple 
 CronArgsHelp=استدلال از روش. <BR> برای exemple به بهانه روش Dolibarr محصولات شی / htdocs / محصول / کلاس / product.class.php، مقدار پارامترهای می تواند <i>0، ProductRef</i>
 CronCommandHelp=خط فرمان سیستم را اجرا کند.
 CronCreateJob=Create new Scheduled Job
-CronFrom=From
+CronFrom=از
 # Info
 # Common
 CronType=Job type
diff --git a/htdocs/langs/fa_IR/errors.lang b/htdocs/langs/fa_IR/errors.lang
index 25a16342e6e..3540240bd0f 100644
--- a/htdocs/langs/fa_IR/errors.lang
+++ b/htdocs/langs/fa_IR/errors.lang
@@ -11,6 +11,7 @@ ErrorLoginAlreadyExists=ورود به٪ s در حال حاضر وجود دارد
 ErrorGroupAlreadyExists=گروه٪ s در حال حاضر وجود دارد.
 ErrorRecordNotFound=صفحه موجود نیست.
 ErrorFailToCopyFile=برای کپی کردن پرونده <b>«٪ s 'به'٪ s»</b> شکست خورد.
+ErrorFailToCopyDir=Failed to copy directory '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToRenameFile=برای تغییر نام فایل <b>'٪ s'</b> را به <b>'٪ s</b> »شکست خورد.
 ErrorFailToDeleteFile=حذف پرونده <b>«٪ s»</b> شکست خورد.
 ErrorFailToCreateFile=برای ایجاد پرونده <b>«٪ s»</b> شکست خورد.
@@ -115,7 +116,7 @@ ErrorNoActivatedBarcode=بدون بارکد از نوع فعال
 ErrUnzipFails=برای جدا کردن٪ s با ZipArchive ناموفق
 ErrNoZipEngine=بدون موتور را از حالت زیپ خارج از٪ s فایل در این PHP
 ErrorFileMustBeADolibarrPackage=پرونده٪ s باید یک بسته فشرده Dolibarr است
-ErrorFileRequired=طول می کشد تا یک فایل Dolibarr بسته
+ErrorModuleFileRequired=You must select a Dolibarr module package file
 ErrorPhpCurlNotInstalled=PHP CURL نصب نشده است، این ضروری است که با پی پال صحبت
 ErrorFailedToAddToMailmanList=برای اضافه کردن رکورد٪ به پستچی فهرست٪ یا پایه SPIP ناموفق
 ErrorFailedToRemoveToMailmanList=برای حذف رکورد٪ به پستچی فهرست٪ یا پایه SPIP ناموفق
@@ -181,6 +182,8 @@ ErrorBankStatementNameMustFollowRegex=Error, bank statement name must follow the
 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>
 
 # 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.
diff --git a/htdocs/langs/fa_IR/holiday.lang b/htdocs/langs/fa_IR/holiday.lang
index 2a41b94bb56..faf326a3976 100644
--- a/htdocs/langs/fa_IR/holiday.lang
+++ b/htdocs/langs/fa_IR/holiday.lang
@@ -76,8 +76,8 @@ BoxTitleLastLeaveRequests=Latest %s modified leave requests
 HolidaysMonthlyUpdate=به روز رسانی ماهانه
 ManualUpdate=دستی به روز رسانی
 HolidaysCancelation=Leave request cancelation
-EmployeeLastname=Employee lastname
-EmployeeFirstname=Employee firstname
+EmployeeLastname=Employee last name
+EmployeeFirstname=Employee first name
 TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
 
 ## Configuration du Module ##
diff --git a/htdocs/langs/fa_IR/ldap.lang b/htdocs/langs/fa_IR/ldap.lang
index e089b2a73da..6a0e45e53e2 100644
--- a/htdocs/langs/fa_IR/ldap.lang
+++ b/htdocs/langs/fa_IR/ldap.lang
@@ -13,8 +13,8 @@ LDAPUsers=کاربران در پایگاه داده LDAP
 LDAPFieldStatus=وضعیت
 LDAPFieldFirstSubscriptionDate=تاریخ اولین عضویت
 LDAPFieldFirstSubscriptionAmount=اولین مبلغ آبونمان
-LDAPFieldLastSubscriptionDate=آخرین تاریخ اشتراک
-LDAPFieldLastSubscriptionAmount=تاریخ و زمان آخرین مبلغ آبونمان
+LDAPFieldLastSubscriptionDate=Latest subscription date
+LDAPFieldLastSubscriptionAmount=Latest subscription amount
 LDAPFieldSkype=Skype id
 LDAPFieldSkypeExample=Example : skypeName
 UserSynchronized=تعریف کاربر
diff --git a/htdocs/langs/fa_IR/mails.lang b/htdocs/langs/fa_IR/mails.lang
index 608f214257b..486c03b1fd1 100644
--- a/htdocs/langs/fa_IR/mails.lang
+++ b/htdocs/langs/fa_IR/mails.lang
@@ -74,14 +74,18 @@ ResultOfMailSending=Result of mass EMail sending
 NbSelected=Nb selected
 NbIgnored=Nb ignored
 NbSent=Nb sent
-ContactsWithThirdpartyFilter=Contact with customer filters
+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
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=خط٪ در فایل
 RecipientSelectionModules=درخواست تعریف شده برای انتخاب گیرنده
 MailSelectedRecipients=دریافت کنندگان برگزیده
 MailingArea=منطقه ارسال ایمیل ها
-LastMailings=تاریخ و زمان آخرین٪ s را ارسال ایمیل ها
+LastMailings=Latest %s emailings
 TargetsStatistics=آمار اهداف
 NbOfCompaniesContacts=تماس با ما منحصر به فرد / آدرس
 MailNoChangePossible=دریافت کنندگان برای ایمیل معتبر نمی تواند تغییر کند
@@ -146,3 +150,6 @@ AdvTgtCreateFilter=Create filter
 AdvTgtOrCreateNewFilter=Name of new filter
 NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
+OutGoingEmailSetup=Outgoing email setup
+InGoingEmailSetup=Incoming email setup
+
diff --git a/htdocs/langs/fa_IR/main.lang b/htdocs/langs/fa_IR/main.lang
index b7432097cf2..dea1ee95bb5 100644
--- a/htdocs/langs/fa_IR/main.lang
+++ b/htdocs/langs/fa_IR/main.lang
@@ -69,6 +69,7 @@ SetDate=تاریخ تنظیم
 SelectDate=یک تاریخ را انتخاب کنید
 SeeAlso=همچنین نگاه کنید به٪ s را
 SeeHere=See here
+Apply=درخواست
 BackgroundColorByDefault=رنگ به طور پیش فرض پس زمینه
 FileRenamed=The file was successfully renamed
 FileUploaded=فایل با موفقیت آپلود شد
@@ -87,7 +88,7 @@ Undefined=تعریف نشده
 PasswordForgotten=Password forgotten?
 SeeAbove=در بالا مشاهده کنید
 HomeArea=منطقه خانه
-LastConnexion=آخرین اتصال
+LastConnexion=Latest connection
 PreviousConnexion=ارتباط قبلی
 PreviousValue=Previous value
 ConnectedOnMultiCompany=اتصال در محیط زیست
@@ -237,7 +238,7 @@ DateCreation=تاریخ ایجاد
 DateCreationShort=Creat. date
 DateModification=تاریخ اصلاح
 DateModificationShort=تغییریافته. تاریخ
-DateLastModification=آخرین تاریخ اصلاح
+DateLastModification=Latest modification date
 DateValidation=تاریخ اعتبار
 DateClosing=تاریخ بسته شدن
 DateDue=موعد مقرر
@@ -433,7 +434,7 @@ Reportings=گزارش
 Draft=پیش نویس
 Drafts=نوعی بازی چکرز
 Validated=اعتبار
-Opened=باز
+Opened=افتتاح شد
 New=جدید
 Discount=تخفیف
 Unknown=ناشناخته
@@ -599,6 +600,8 @@ SessionName=نام و نام خانوادگی را وارد نمایید
 Method=روش
 Receive=دریافت
 CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
+ExpectedValue=Expected Value
+CurrentValue=ارزش کنونی
 PartialWoman=بخشی
 TotalWoman=کل
 NeverReceived=هرگز دریافت
@@ -756,6 +759,7 @@ SomeTranslationAreUncomplete=Some languages may be partially translated or may c
 DirectDownloadLink=Direct download link
 Download=Download
 ActualizeCurrency=Update currency rate
+Fiscalyear=سال مالی
 # Week day
 Monday=دوشنبه
 Tuesday=سهشنبه
@@ -812,3 +816,5 @@ SearchIntoContracts=قراردادها
 SearchIntoCustomerShipments=Customer shipments
 SearchIntoExpenseReports=Expense reports
 SearchIntoLeaves=Leaves
+
+BulkActions=Bulk actions
diff --git a/htdocs/langs/fa_IR/members.lang b/htdocs/langs/fa_IR/members.lang
index db36136220b..64cff7955d7 100644
--- a/htdocs/langs/fa_IR/members.lang
+++ b/htdocs/langs/fa_IR/members.lang
@@ -136,8 +136,8 @@ DocForAllMembersCards=ایجاد کارت های کسب و کار برای هم
 DocForOneMemberCards=ایجاد کارت های کسب و کار برای یک عضو خاص
 DocForLabels=تولید ورق آدرس
 SubscriptionPayment=پرداخت اشتراک
-LastSubscriptionDate=آخرین تاریخ اشتراک
-LastSubscriptionAmount=تاریخ و زمان آخرین مبلغ آبونمان
+LastSubscriptionDate=Latest subscription date
+LastSubscriptionAmount=Latest subscription amount
 MembersStatisticsByCountries=آمار کاربران بر اساس کشور
 MembersStatisticsByState=آمار کاربران توسط ایالت / استان
 MembersStatisticsByTown=آمار کاربران توسط شهر
@@ -149,7 +149,7 @@ MembersByStateDesc=این صفحه آمار در عضو های دولتی / اس
 MembersByTownDesc=این صفحه آمار در عضو های شهر شما نشان می دهد.
 MembersStatisticsDesc=را انتخاب کنید آمار شما می خواهید به عنوان خوانده شده ...
 MenuMembersStats=ارقام
-LastMemberDate=آخرین تاریخ عضو
+LastMemberDate=Latest member date
 Nature=طبیعت
 Public=اطلاعات عمومی
 NewMemberbyWeb=عضو جدید اضافه شده است. در انتظار تایید
diff --git a/htdocs/langs/fa_IR/orders.lang b/htdocs/langs/fa_IR/orders.lang
index ffc25708bb8..985764a766f 100644
--- a/htdocs/langs/fa_IR/orders.lang
+++ b/htdocs/langs/fa_IR/orders.lang
@@ -39,7 +39,7 @@ StatusOrderRefusedShort=رد
 StatusOrderBilledShort=ثبت شده در صورتحساب یا لیست
 StatusOrderToProcessShort=به پردازش
 StatusOrderReceivedPartiallyShort=نیمه دریافت کرد
-StatusOrderReceivedAllShort=دریافت همه چیز
+StatusOrderReceivedAllShort=Products received
 StatusOrderCanceled=لغو شد
 StatusOrderDraft=پیش نویس (نیاز به تایید می شود)
 StatusOrderValidated=اعتبار
@@ -51,7 +51,7 @@ StatusOrderApproved=تایید شده
 StatusOrderRefused=رد
 StatusOrderBilled=ثبت شده در صورتحساب یا لیست
 StatusOrderReceivedPartially=نیمه دریافت کرد
-StatusOrderReceivedAll=دریافت همه چیز
+StatusOrderReceivedAll=All products received
 ShippingExist=حمل و نقل وجود دارد
 QtyOrdered=تعداد سفارش داده شده
 ProductQtyInDraft=Product quantity into draft orders
diff --git a/htdocs/langs/fa_IR/other.lang b/htdocs/langs/fa_IR/other.lang
index 65b4e21feb2..0a20729b42e 100644
--- a/htdocs/langs/fa_IR/other.lang
+++ b/htdocs/langs/fa_IR/other.lang
@@ -68,14 +68,15 @@ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find her
 PredefinedMailContentSendShipping=__CONTACTCIVNAME__ شما در اینجا خواهید دید حمل و نقل __ SHIPPINGREF__ __ PERSONALIZED__Sincerely __ SIGNATURE__
 PredefinedMailContentSendFichInter=__CONTACTCIVNAME__ شما در اینجا را پیدا خواهد کرد از مداخله __ FICHINTERREF__ __ PERSONALIZED__Sincerely __ SIGNATURE__
 PredefinedMailContentThirdparty=__CONTACTCIVNAME__ __ PERSONALIZED__ __ SIGNATURE__
-DemoDesc=Dolibarr is a compact ERP/CRM supporting several functional modules. A demo showcasing all modules makes no sense as this scenario never occurs. So, several demo profiles are available.
+DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
+ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
 DemoFundation=مدیریت اعضای پایه
 DemoFundation2=مدیریت اعضا و حساب بانکی از یک پایه
-DemoCompanyServiceOnly=مدیریت تنها یک سرویس فروش فعالیت های آزاد
+DemoCompanyServiceOnly=Company or freelance selling service only
 DemoCompanyShopWithCashDesk=مدیریت یک فروشگاه با یک میز نقدی
-DemoCompanyProductAndStocks=مدیریت یک شرکت کوچک یا متوسط ​​فروش محصولات
-DemoCompanyAll=مدیریت یک شرکت کوچک یا متوسط ​​با فعالیت های متعدد (تمام ماژول های اصلی)
+DemoCompanyProductAndStocks=Company selling products with a shop
+DemoCompanyAll=Company with multiple activities (all main modules)
 CreatedBy=ایجاد شده توسط٪ s
 ModifiedBy=اصلاح شده توسط٪ s
 ValidatedBy=تایید شده توسط٪ s
diff --git a/htdocs/langs/fa_IR/products.lang b/htdocs/langs/fa_IR/products.lang
index 7ac4dd9a279..9f5976afe3c 100644
--- a/htdocs/langs/fa_IR/products.lang
+++ b/htdocs/langs/fa_IR/products.lang
@@ -60,7 +60,7 @@ SellingPrice=قیمت فروش
 SellingPriceHT=قیمت فروش (خالص از مالیات)
 SellingPriceTTC=قیمت فروش (مالیات شرکت)
 CostPriceDescription=This price (net of tax) can be used to store the average amount this product cost to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
-CostPriceUsage=In a future version, this value could be used for margin calculation.
+CostPriceUsage=This value could be used for margin calculation.
 SoldAmount=Sold amount
 PurchasedAmount=Purchased amount
 NewPrice=قیمت های جدید
@@ -142,6 +142,7 @@ ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b>?
 CloneContentProduct=کلون تمام اطلاعات اصلی محصول / خدمات
 ClonePricesProduct=اطلاعات اصلی کلون و قیمت
 CloneCompositionProduct=Clone packaged product/service
+CloneCombinationsProduct=Clone product variants
 ProductIsUsed=این محصول مورد استفاده قرار گیرد
 NewRefForClone=کد عکس. محصول جدید / خدمات
 SellingPrices=Selling prices
@@ -238,7 +239,7 @@ GlobalVariables=Global variables
 VariableToUpdate=Variable to update
 GlobalVariableUpdaters=Global variable updaters
 UpdateInterval=Update interval (minutes)
-LastUpdated=Last updated
+LastUpdated=Latest update
 CorrectlyUpdated=Correctly updated
 PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
 PropalMergePdfProductChooseFile=Select PDF files
@@ -258,4 +259,41 @@ VolumeUnits=Volume unit
 SizeUnits=Size unit
 DeleteProductBuyPrice=Delete buying price
 ConfirmDeleteProductBuyPrice=Are you sure you want to delete this buying price?
+SubProduct=Sub product
 
+#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
+ProductCombinations=Variants
+HideProductCombinations=Hide products variant in the products selector
+ProductCombination=Variant
+NewProductCombination=New variant
+EditProductCombination=Editing variant
+ProductCombinationGenerator=Variants generator
+Features=Features
+PriceImpact=Price impact
+WeightImpact=Weight impact
+NewProductAttribute=ویژگی های جدید
+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
+PercentageVariation=Percentage variation
+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 child products
+ConfirmCloneProductCombinations=Would you like to copy all the product variant to the 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
diff --git a/htdocs/langs/fa_IR/projects.lang b/htdocs/langs/fa_IR/projects.lang
index 362c9d17c0e..71713cc130c 100644
--- a/htdocs/langs/fa_IR/projects.lang
+++ b/htdocs/langs/fa_IR/projects.lang
@@ -29,9 +29,9 @@ DeleteAProject=حذف یک پروژه
 DeleteATask=حذف کار
 ConfirmDeleteAProject=Are you sure you want to delete this project?
 ConfirmDeleteATask=Are you sure you want to delete this task?
-OpenedProjects=Open projects
-OpenedTasks=Open tasks
-OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
+OpenedProjects=Opened projects
+OpenedTasks=Opened tasks
+OpportunitiesStatusForOpenedProjects=Opportunities amount of opened projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=نمایش پروژه
 SetProject=تنظیم پروژه
@@ -47,7 +47,7 @@ TaskTimeSpent=مدت زمان صرف شده در کارها
 TaskTimeUser=کاربر
 TaskTimeNote=یادداشت
 TaskTimeDate=تاریخ
-TasksOnOpenedProject=Tasks on open projects
+TasksOnOpenedProject=Tasks on opened projects
 WorkloadNotDefined=Workload not defined
 NewTimeSpent=زمان جدید به سر برد
 MyTimeSpent=وقت من صرف
@@ -96,6 +96,7 @@ ValidateProject=اعتبارسنجی projet
 ConfirmValidateProject=Are you sure you want to validate this project?
 CloseAProject=بستن پروژه
 ConfirmCloseAProject=Are you sure you want to close this project?
+AlsoCloseAProject=Also close project (keep it open if you still need to follow production tasks on it)
 ReOpenAProject=پروژه گسترش
 ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=تماس با ما پروژه
@@ -121,7 +122,7 @@ CloneProjectFiles=پروژه کلون فایل های پیوست
 CloneTaskFiles=کار کلون (بازدید کنندگان) فایل پیوست (در صورت کار (بازدید کنندگان) شبیه سازی شده)
 CloneMoveDate=Update project/tasks dates from now?
 ConfirmCloneProject=Are you sure to clone this project?
-ProjectReportDate=تاریخ کار تغییر بر اساس تاریخ شروع پروژه
+ProjectReportDate=Change task dates according to new project start date
 ErrorShiftTaskDate=غیر ممکن است به تغییر تاریخ کار با توجه به پروژه جدید تاریخ شروع
 ProjectsAndTasksLines=پروژه ها و وظایف
 ProjectCreatedInDolibarr=پروژه٪ s را ایجاد
@@ -178,9 +179,9 @@ ProjectsStatistics=Statistics on projects/leads
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 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.
-OpenedProjectsByThirdparties=Open projects by thirdparties
+OpenedProjectsByThirdparties=Opened projects by thirdparties
 OnlyOpportunitiesShort=Only opportunities
-OpenedOpportunitiesShort=Open opportunities
+OpenedOpportunitiesShort=Opened opportunities
 NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount
diff --git a/htdocs/langs/fa_IR/propal.lang b/htdocs/langs/fa_IR/propal.lang
index 30674a6fc3c..20ecb71efdb 100644
--- a/htdocs/langs/fa_IR/propal.lang
+++ b/htdocs/langs/fa_IR/propal.lang
@@ -3,7 +3,7 @@ Proposals=طرح های تجاری
 Proposal=پیشنهاد تجاری
 ProposalShort=پیشنهاد
 ProposalsDraft=طرح تجاری پیش نویس
-ProposalsOpened=Open commercial proposals
+ProposalsOpened=طرح های تجاری افتتاح شد
 Prop=طرح های تجاری
 CommercialProposal=پیشنهاد تجاری
 ProposalCard=کارت های پیشنهادی
@@ -26,9 +26,9 @@ AmountOfProposalsByMonthHT=مقدار در ماه (خالص از مالیات)
 NbOfProposals=تعداد طرح های تجاری
 ShowPropal=نمایش پیشنهاد
 PropalsDraft=نوعی بازی چکرز
-PropalsOpened=باز
+PropalsOpened=افتتاح شد
 PropalStatusDraft=پیش نویس (نیاز به تایید می شود)
-PropalStatusValidated=اعتبار (پیشنهاد باز است)
+PropalStatusValidated=Validated (proposal is opened)
 PropalStatusSigned=امضا (نیازهای حسابداری و مدیریت)
 PropalStatusNotSigned=امضا نشده (بسته شده)
 PropalStatusBilled=ثبت شده در صورتحساب یا لیست
diff --git a/htdocs/langs/fa_IR/stocks.lang b/htdocs/langs/fa_IR/stocks.lang
index 76fc6dc88af..4adca6e9c5b 100644
--- a/htdocs/langs/fa_IR/stocks.lang
+++ b/htdocs/langs/fa_IR/stocks.lang
@@ -22,13 +22,15 @@ Movements=جنبش
 ErrorWarehouseRefRequired=نام انبار مرجع مورد نیاز است
 ListOfWarehouses=لیست انبار
 ListOfStockMovements=فهرست جنبش های سهام
+StockMovementForId=Movement ID %d
+ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Warehouses area
 Location=محل
 LocationSummary=محل نام کوتاه
 NumberOfDifferentProducts=تعداد محصولات مختلف
 NumberOfProducts=تعداد کل محصولات
-LastMovement=جنبش آخرین
-LastMovements=تاریخ و زمان آخرین جنبش های
+LastMovement=Latest movement
+LastMovements=Latest movements
 Units=واحد
 Unit=واحد
 StockCorrection=سهام صحیح
diff --git a/htdocs/langs/fa_IR/supplier_proposal.lang b/htdocs/langs/fa_IR/supplier_proposal.lang
index 6f350135490..5f34841c171 100644
--- a/htdocs/langs/fa_IR/supplier_proposal.lang
+++ b/htdocs/langs/fa_IR/supplier_proposal.lang
@@ -8,7 +8,7 @@ SearchRequest=Find a request
 DraftRequests=Draft requests
 SupplierProposalsDraft=Draft supplier proposals
 LastModifiedRequests=Latest %s modified price requests
-RequestsOpened=Open price requests
+RequestsOpened=Opened price requests
 SupplierProposalArea=Supplier proposals area
 SupplierProposalShort=Supplier proposal
 SupplierProposals=Supplier proposals
@@ -23,7 +23,7 @@ ConfirmValidateAsk=Are you sure you want to validate this price request under na
 DeleteAsk=Delete request
 ValidateAsk=Validate request
 SupplierProposalStatusDraft=پیش نویس (نیاز به تایید می شود)
-SupplierProposalStatusValidated=Validated (request is open)
+SupplierProposalStatusValidated=Validated (request is opened)
 SupplierProposalStatusClosed=بسته
 SupplierProposalStatusSigned=Accepted
 SupplierProposalStatusNotSigned=رد
diff --git a/htdocs/langs/fa_IR/suppliers.lang b/htdocs/langs/fa_IR/suppliers.lang
index 8e1df1f792a..66ab317d2e9 100644
--- a/htdocs/langs/fa_IR/suppliers.lang
+++ b/htdocs/langs/fa_IR/suppliers.lang
@@ -9,7 +9,7 @@ ShowSupplier=منبع نمایش
 OrderDate=تاریخ سفارش
 BuyingPriceMin=Best buying price
 BuyingPriceMinShort=Best buying price
-TotalBuyingPriceMinShort=Total of subproducts buying prices
+TotalBuyingPriceMinShort=کل subproducts خرید قیمت
 TotalSellingPriceMinShort=Total of subproducts selling prices
 SomeSubProductHaveNoPrices=برخی از زیر محصولات هیچ قیمت تعریف شده
 AddSupplierPrice=Add buying price
@@ -24,10 +24,10 @@ ExportDataset_fournisseur_1=فهرست فاکتورها تامین کننده و
 ExportDataset_fournisseur_2=فاکتورها تامین کننده و پرداخت
 ExportDataset_fournisseur_3=سفارشات تامین کننده و خطوط جهت
 ApproveThisOrder=تصویب این منظور
-ConfirmApproveThisOrder=آیا مطمئن هستید که می خواهید برای تایید <b>از٪ s؟</b>
+ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b>?
 DenyingThisOrder=Deny this order
-ConfirmDenyingThisOrder=آیا مطمئن هستید که می خواهید برای انکار این منظور <b>از٪ s؟</b>
-ConfirmCancelThisOrder=آیا مطمئن هستید که می خواهید به لغو این منظور <b>از٪ s؟</b>
+ConfirmDenyingThisOrder=Are you sure you want to deny this order <b>%s</b>?
+ConfirmCancelThisOrder=Are you sure you want to cancel this order <b>%s</b>?
 AddSupplierOrder=ایجاد نظم عرضه کننده کالا
 AddSupplierInvoice=ایجاد کننده کالا فاکتور
 ListOfSupplierProductForSupplier=لیست محصولات و قیمت ها را برای عرضه کننده کالا <b>از٪ s</b>
@@ -41,3 +41,4 @@ DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Wrong quality
 ReputationForThisProduct=Reputation
 BuyerName=Buyer name
+AllProductServicePrices=All product / service prices
diff --git a/htdocs/langs/fa_IR/users.lang b/htdocs/langs/fa_IR/users.lang
index 763f38e657b..77e395f4a9a 100644
--- a/htdocs/langs/fa_IR/users.lang
+++ b/htdocs/langs/fa_IR/users.lang
@@ -36,7 +36,7 @@ AdministratorDesc=مدیر
 DefaultRights=مجوزهای پیش پندار
 DefaultRightsDesc=تعریف در اینجا مجوز <u>به طور پیش فرض</u> است که به طور خودکار به یک کاربر <u>جدید ایجاد شده</u> (برو روی کارت کاربر به تغییر مجوز یک کاربر موجود) اعطا می شود.
 DolibarrUsers=Dolibarr کاربران
-LastName=Last Name
+LastName=نام خانوادگی
 FirstName=نام اول
 ListOfGroups=لیست گروهها
 NewGroup=گروه تازه
diff --git a/htdocs/langs/fa_IR/withdrawals.lang b/htdocs/langs/fa_IR/withdrawals.lang
index 2be4c0286bc..452781c07bf 100644
--- a/htdocs/langs/fa_IR/withdrawals.lang
+++ b/htdocs/langs/fa_IR/withdrawals.lang
@@ -24,6 +24,7 @@ WithdrawStatistics=Direct debit payment statistics
 WithdrawRejectStatistics=Direct debit payment reject statistics
 LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
+WithdrawRequestsDone=%s direct debit payment requests recorded
 ThirdPartyBankCode=کد های بانکی شخص ثالث
 NoInvoiceCouldBeWithdrawed=بدون فاکتور با موفقیت withdrawed. بررسی کنید که فاکتور در شرکت های با BAN معتبر هستند.
 ClassCredited=طبقه بندی اعتبار
@@ -76,8 +77,8 @@ RUM=UMR
 RUMLong=Unique Mandate Reference
 RUMWillBeGenerated=UMR number will be generated once bank account information are saved
 WithdrawMode=Direct debit mode (FRST or RECUR)
-WithdrawRequestAmount=Withdraw request amount:
-WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil amount.
+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
diff --git a/htdocs/langs/fi_FI/accountancy.lang b/htdocs/langs/fi_FI/accountancy.lang
index 142601af85e..d7118bfdea3 100644
--- a/htdocs/langs/fi_FI/accountancy.lang
+++ b/htdocs/langs/fi_FI/accountancy.lang
@@ -194,6 +194,8 @@ ChangeBinding=Change the binding
 
 ## Admin
 ApplyMassCategories=Apply mass categories
+AddAccountFromBookKeepingWithNoCategories=Add acccount already used with no categories
+CategoryDeleted=Category for the accounting account has been removed
 
 ## Export
 Exports=Exports
@@ -209,6 +211,7 @@ Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution
 Modelcsv_quadratus=Export towards Quadratus QuadraCompta
 Modelcsv_ebp=Export towards EBP
 Modelcsv_cogilog=Export towards Cogilog
+ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
 InitAccountancy=Init accountancy
diff --git a/htdocs/langs/fi_FI/admin.lang b/htdocs/langs/fi_FI/admin.lang
index 20df475645b..59260a6f31a 100644
--- a/htdocs/langs/fi_FI/admin.lang
+++ b/htdocs/langs/fi_FI/admin.lang
@@ -9,17 +9,20 @@ VersionDevelopment=Kehitys
 VersionUnknown=Tuntematon
 VersionRecommanded=Suositeltava
 FileCheck=Files integrity checker
-FileCheckDesc=This tool allows you to check the integrity of files of your application, comparing each files with the official ones. You can use this tool to detect if some files were modified by a hacker for example.
+FileCheckDesc=This tool allows you to check the integrity of files and setup of your application, comparing each files with the official ones. 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.
 FileIntegrityIsStrictlyConformedWithReference=Files integrity is strictly conformed with the reference.
-FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified of removed.
+FileIntegrityIsOkButFilesWereAdded=Files integrity check has passed, however some new files were added.
+FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified, removed or added.
 GlobalChecksum=Global checksum
 MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
 LocalSignature=Embedded local signature (less reliable)
 RemoteSignature=Remote distant signature (more reliable)
 FilesMissing=Missing Files
 FilesUpdated=Updated Files
+FilesModified=Modified Files
+FilesAdded=Added Files
 FileCheckDolibarr=Check integrity of application files
-AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from a certified package
+AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from an official package
 XmlNotFound=Xml Integrity File of application not found
 SessionId=Istunnon tunnus
 SessionSaveHandler=Handler tallentaa istuntojen
@@ -188,7 +191,9 @@ BoxesDesc=Widgets are components showing some information that you can add to pe
 OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
 ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
-ModulesMarketPlaces=Lisää moduuleja ...
+ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
+ModulesMarketPlaces=Find external modules...
+GoModuleSetupArea=To deploy/install a new module, go onto the Module setup area at <a href="%s">%s</a>.
 DoliStoreDesc=DoliStore, virallinen markkinapaikka Dolibarr ERP / CRM ulkoisten moduulien
 DoliPartnersDesc=List of companies providing custom developed modules or features (Note: anyone experienced in PHP programming can provide custom development for an open source project)
 WebSiteDesc=Reference websites to find more modules...
@@ -280,20 +285,21 @@ MenuHandlers=Valikko käsitteleville
 MenuAdmin=Valikko editor
 DoNotUseInProduction=Do not use in production
 ThisIsProcessToFollow=This is steps to process:
-ThisIsAlternativeProcessToFollow=This is an alternative setup to process:
+ThisIsAlternativeProcessToFollow=This is an alternative setup to process manually:
 StepNb=Vaihe %s
 FindPackageFromWebSite=Etsi paketti, joka sisältää haluamasi toiminnon (esimerkiksi www-sivuston %s).
 DownloadPackageFromWebSite=Download package (for example from official web site %s).
-UnpackPackageInDolibarrRoot=Unpack package file into Dolibarr server directory dedicated to external modules: <b>%s</b>
-SetupIsReadyForUse=Asenna on päättynyt ja Dolibarr on valmis käyttämään tätä uutta komponenttia.
-NotExistsDirect=The alternative root directory is not defined.<br>
-InfDirAlt=Since version 3 it is possible to define an alternative root directory.This allows you to store, same place, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
-InfDirExample=<br>Then declare it in the file conf.php<br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>*These lines are commented with "#", to uncomment only remove the character.
+UnpackPackageInDolibarrRoot=Unpack the packaged files into server directory dedicated to Dolibarr: <b>%s</b>
+UnpackPackageInModulesRoot=To deploy/install an external module, unpack the packaged files into the server directory dedicated to modules: <b>%s</b>
+SetupIsReadyForUse=Module deployment is finished. You must however enable and setup the module in your application by going on the page to setup modules: <a href="%s">%s</a>.
+NotExistsDirect=The alternative root directory is not defined to an existing directory.<br>
+InfDirAlt=Since version 3, it is possible to define an alternative root directory. This allows you to store, into a dedicated directory, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
+InfDirExample=<br>Then declare it in the file <strong>conf.php</strong><br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>If these lines are commented with "#", to enable them, just uncomment by removing the "#" character.
 YouCanSubmitFile=For this step, you can send package using this tool: Select module file
 CurrentVersion=Dolibarr nykyinen versio
 CallUpdatePage=Go to the page that updates the database structure and data: %s.
 LastStableVersion=Latest stable version
-LastActivationDate=Last activation date
+LastActivationDate=Latest activation date
 UpdateServerOffline=Update server offline
 GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s. <br><b>{000000@x}</b> same as previous but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
 GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
@@ -376,11 +382,11 @@ ExtrafieldCheckBox=Checkbox
 ExtrafieldRadio=Radio button
 ExtrafieldCheckBoxFromList= Checkbox from table
 ExtrafieldLink=Link to an object
-ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>In order to have the list depending on another :<br>1,value1|parent_list_code:parent_key<br>2,value2|parent_list_code:parent_key
+ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list :<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list :<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
-ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
+ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Example : Societe:societe/class/societe.class.php
 LibraryToBuildPDF=Library used for PDF generation
 WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
@@ -415,10 +421,10 @@ ModuleCompanyCodeDigitaria=Kirjanpito-koodi riippuu kolmannen osapuolen koodi. K
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
 WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<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).
-
+ClickToShowDescription=Click to show description
 # Modules
 Module0Name=Käyttäjät & ryhmät
-Module0Desc=Käyttäjien ja ryhmien hallinta
+Module0Desc=Users / Employees and Groups management
 Module1Name=Kolmannet osapuolet
 Module1Desc=Yritykset ja yhteystiedot hallinto
 Module2Name=Kaupalliset
@@ -689,7 +695,7 @@ PermissionAdvanced253=Luo / muokkaa sisäiset / ulkoiset käyttäjät ja käytt
 Permission254=Poista tai poistaa muiden käyttäjien
 Permission255=Luoda / muuttaa omaa käyttäjän tiedot
 Permission256=Muokkaa oma salasana
-Permission262=Extend access to all third parties (not only third parties that user is a sale representative). Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc). Not effective for projects (only rules on project permissions, visibility and assignement matters).
+Permission262=Extend access to all third parties (not only third parties that user is a sale representative).<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 assignement matters).
 Permission271=Lue CA
 Permission272=Lue laskut
 Permission273=Laskutuksen
@@ -891,7 +897,7 @@ Offset=Offset
 AlwaysActive=Aina aktiivinen
 Upgrade=Päivitys
 MenuUpgrade=Upgrade / Extend
-AddExtensionThemeModuleOrOther=Lisää laajennus (teema, moduulin ...)
+AddExtensionThemeModuleOrOther=Deploy/install external module
 WebServer=Web-palvelin
 DocumentRootServer=Web-palvelimen juuressa
 DataRootServer=Data-hakemistoon
@@ -1165,10 +1171,6 @@ FreeLegalTextOnOrders=Vapaa tekstihaku tilauksissa
 WatermarkOnDraftOrders=Watermark on draft orders (none if empty)
 ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable
 BANK_ASK_PAYMENT_BANK_DURING_ORDER=Ask for bank account destination of order
-##### Clicktodial #####
-ClickToDialSetup=Napsauttamalla Dial-moduulin asetukset
-ClickToDialUrlDesc=Url kutsutaan kun napsautat puhelimen picto on tehty. Dans l'url, vous pouvez käytä les baliiseja <br> <b>%% 1 $ s</b> qui seerumien remplac par le tlphone de <b>l'appelbr&gt;%%</b> 2 $ s qui seerumien remplac par le tlphone de l'appelant (le votre) <br> <b>%% 3 $ s</b> qui seerumien remplac par votre sisäänkirjoittautumissivuksesi clicktodial (dfini sur votre fiche utilisateur) <br> <b>%% 4</b> $ s qui seerumien remplac par votre mot de elähtänyt clicktodial (dfini sur votre fiche utilisateur).
-##### Bookmark4u #####
 ##### Interventions #####
 InterventionsSetup=Interventions moduulin asetukset
 FreeLegalTextOnInterventions=Vapaa teksti interventio asiakirjojen
@@ -1395,7 +1397,7 @@ SendingsSetup=Lähetysvalinnat-moduulin asetukset
 SendingsReceiptModel=Lähettävä vastaanottanut malli
 SendingsNumberingModules=Lähetysten numerointi moduulit
 SendingsAbility=Support shipping sheets for customer deliveries
-NoNeedForDeliveryReceipts=Useimmissa tapauksissa sendings tulot käytetään sekä piirturilevyt asiakas toimitukset (tuotteiden luettelon lähettää) ja levyt on recevied ja allekirjoittanut asiakas. Joten tuotteen toimitusten kuitit on kahdennettu ominaisuus ja se on harvoin käytössä.
+NoNeedForDeliveryReceipts=In most cases, shipping sheets are used both as sheets for customer deliveries (list of products to send) and sheets that is received and signed by customer. So product deliveries receipts is a duplicated feature and is rarely activated.
 FreeLegalTextOnShippings=Free text on shipments
 ##### Deliveries #####
 DeliveryOrderNumberingModules=Tuotteiden toimitukset vastaanottamisesta numerointiin moduuli
@@ -1477,7 +1479,9 @@ AGENDA_DEFAULT_FILTER_STATUS=Set automatically this status for events into searc
 AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
 AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
 AGENDA_NOTIFICATION_SOUND=Enable sound notification
-##### ClickToDial #####
+##### Clicktodial #####
+ClickToDialSetup=Napsauttamalla Dial-moduulin asetukset
+ClickToDialUrlDesc=Url kutsutaan kun napsautat puhelimen picto on tehty. Dans l'url, vous pouvez käytä les baliiseja <br> <b>%% 1 $ s</b> qui seerumien remplac par le tlphone de <b>l'appelbr&gt;%%</b> 2 $ s qui seerumien remplac par le tlphone de l'appelant (le votre) <br> <b>%% 3 $ s</b> qui seerumien remplac par votre sisäänkirjoittautumissivuksesi clicktodial (dfini sur votre fiche utilisateur) <br> <b>%% 4</b> $ s qui seerumien remplac par votre mot de elähtänyt clicktodial (dfini sur votre fiche utilisateur).
 ClickToDialDesc=This module allows to make phone numbers clickable. A click on this icon will call make your phone to 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.
 ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
 ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on same computer than the browser, and called when you click on a link in your browser that start 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.
@@ -1505,10 +1509,11 @@ EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint availa
 ##### API ####
 ApiSetup=API module setup
 ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
-ApiProductionMode=Enable production mode (this will activate use of a caches for services management)
+ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
 ApiExporerIs=You can explore the APIs at url
 OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
 ApiKey=Key for API
+WarningAPIExplorerDisabled=The API explorer has been disabled. API explorer is not required to provide API services. It is a tool for developer to find/test REST APIs. If you need this tool, go into setup of module API REST to activate it.
 ##### Bank #####
 BankSetupModule=Pankki-moduulin asetukset
 FreeLegalTextOnChequeReceipts=Vapaa teksti sekkiä kuitit
@@ -1577,7 +1582,7 @@ BackupDumpWizard=Wizard to build database backup dump file
 SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
 SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is only manual steps a privileged user can do.
 InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
-ConfFileMuseContainCustom=Installing an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to have option<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
+ConfFileMuseContainCustom=Installing an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
 HighlightLinesColor=Highlight color of the line when the mouse passes over (keep empty for no highlight)
 TextTitleColor=Color of page title
@@ -1607,6 +1612,7 @@ FixTZ=TimeZone fix
 FillFixTZOnlyIfRequired=Example: +2 (fill only if problem experienced)
 ExpectedChecksum=Expected Checksum
 CurrentChecksum=Current Checksum
+ForcedConstants=Required constant values
 MailToSendProposal=To send customer proposal
 MailToSendOrder=To send customer order
 MailToSendInvoice=To send customer invoice
@@ -1615,9 +1621,10 @@ MailToSendIntervention=To send intervention
 MailToSendSupplierRequestForQuotation=To send quotation request to supplier
 MailToSendSupplierOrder=To send supplier order
 MailToSendSupplierInvoice=To send supplier invoice
+MailToSendContract=To send a contract
 MailToThirdparty=To send email from third party page
 ByDefaultInList=Show by default on list view
-YouUseLastStableVersion=You use the last stable version
+YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
 TitleExampleForMaintenanceRelease=Example of message you can use to announce this maintenance release (feel free to use it on your web sites)
 ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. 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.
diff --git a/htdocs/langs/fi_FI/banks.lang b/htdocs/langs/fi_FI/banks.lang
index 9fffd2f7dab..e669b038ad8 100644
--- a/htdocs/langs/fi_FI/banks.lang
+++ b/htdocs/langs/fi_FI/banks.lang
@@ -5,7 +5,7 @@ BankName=Pankin nimi
 FinancialAccount=Tili
 BankAccount=Pankkitili
 BankAccounts=Pankkitilit
-ShowAccount=Show Account
+ShowAccount=Näytä tili
 AccountRef=Rahoitustase ref
 AccountLabel=Rahoitustase etiketti
 CashAccount=Käteistili
@@ -28,12 +28,12 @@ Reconciliation=Yhteensovittaminen
 RIB=Pankkitilin numero
 IBAN=IBAN-numero
 BIC=BIC / SWIFT-koodi
-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 hyväksytty
+SwiftVNotalid=BIC/SWIFT virheellinen
+IbanValid=BAN hyväksytty
+IbanNotValid=BAN virheellinen
+StandingOrders=Suoraveloitus tilauset
+StandingOrder=Suoraveloitus tilaus
 AccountStatement=Tiliote
 AccountStatementShort=Laskelma
 AccountStatements=Tiliotteet
@@ -57,12 +57,12 @@ BankType2=Käteistili
 AccountsArea=Tilialue
 AccountCard=Tii-kortti
 DeleteAccount=Poista tili
-ConfirmDeleteAccount=Are you sure you want to delete this account?
+ConfirmDeleteAccount=Haluatko varmasti poistaa tämän tilin?
 Account=Tili
-BankTransactionByCategories=Bank entries by categories
-BankTransactionForCategory=Bank entries for category <b>%s</b>
+BankTransactionByCategories=Pankkitapahtumat luokittain
+BankTransactionForCategory=Pankkitapahtumat luokassa <b>%s</b>
 RemoveFromRubrique=Poista linkki kategoriaan
-RemoveFromRubriqueConfirm=Are you sure you want to remove link between the entry and the category?
+RemoveFromRubriqueConfirm=Haluatko varamsti poistaa linkin tapahtuman ja luokan väliltä?
 ListBankTransactions=List of bank entries
 IdTransaction=Tapahtumatunnus
 BankTransactions=Bank entries
@@ -72,15 +72,15 @@ TransactionsToConciliate=Entries to reconcile
 Conciliable=Conciliable
 Conciliate=Sovita
 Conciliation=Yhteensovita
-ReconciliationLate=Reconciliation late
+ReconciliationLate=Täsmäytys myöhässä
 IncludeClosedAccount=Sisällytä suljettu tilit
-OnlyOpenedAccount=Only open accounts
+OnlyOpenedAccount=Vain avatut tilit
 AccountToCredit=Luottotili
 AccountToDebit=Käteistili
 DisableConciliation=Poista sovittelu ominaisuus tämän tilin
 ConciliationDisabled=Sovittelukomitea ominaisuus pois päältä
 LinkedToAConciliatedTransaction=Linked to a conciliated entry
-StatusAccountOpened=Avoinna
+StatusAccountOpened=Avattu
 StatusAccountClosed=Suljettu
 AccountIdShort=Numero
 LineRecord=Tapahtuma
@@ -89,8 +89,8 @@ AddBankRecordLong=Add entry manually
 ConciliatedBy=Sovetteli
 DateConciliating=Sovittelupäivä
 BankLineConciliated=Entry reconciled
-Reconciled=Reconciled
-NotReconciled=Not reconciled
+Reconciled=Täsmäytetty
+NotReconciled=Täsmäyttämätön
 CustomerInvoicePayment=Asiakasmaksu
 SupplierInvoicePayment=Toimittajan maksu
 SubscriptionPayment=Tilaus maksu
@@ -98,7 +98,7 @@ WithdrawalPayment=Hyvitysmaksu
 SocialContributionPayment=Social/fiscal tax payment
 BankTransfer=Pankkisiirto
 BankTransfers=Pankkisiirrot
-MenuBankInternalTransfer=Internal transfer
+MenuBankInternalTransfer=Sisäinen siirto
 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)
 TransferFrom=Mistä
 TransferTo=mihin
@@ -142,11 +142,11 @@ LabelRIB=BAN tunnus
 NoBANRecord=Ei BAN tietuetta
 DeleteARib=Poista BAN tiedue
 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
+RejectCheck=Shekki palautunut
+ConfirmRejectCheck=Haluatko varmasti merkitä tämän shekin hylätyksi?
+RejectCheckDate=Shekin palautumispäivä
+CheckRejected=Shekki palautunut
+CheckRejectedAndInvoicesReopened=Shekki palautunut ja lasku avautunut uudelleen
 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.
diff --git a/htdocs/langs/fi_FI/bills.lang b/htdocs/langs/fi_FI/bills.lang
index 14be10eabe4..6d5ef382ba6 100644
--- a/htdocs/langs/fi_FI/bills.lang
+++ b/htdocs/langs/fi_FI/bills.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - bills
 Bill=Lasku
 Bills=Laskut
-BillsCustomers=Asiakkaiden laskut
-BillsCustomer=Customers invoice
-BillsSuppliers=Tavarantoimittajat laskujen
-BillsCustomersUnpaid=Maksamattomat asiakkaiden laskut
-BillsCustomersUnpaidForCompany=Maksamattomat asiakkaiden laskut %s
-BillsSuppliersUnpaid=Maksamattomat toimittajien laskut
-BillsSuppliersUnpaidForCompany=Maksamattomat toimittajan laskut %s
+BillsCustomers=Customer invoices
+BillsCustomer=Asiakas lasku
+BillsSuppliers=Supplier invoices
+BillsCustomersUnpaid=Unpaid customer invoices
+BillsCustomersUnpaidForCompany=Unpaid customer invoices for %s
+BillsSuppliersUnpaid=Unpaid supplier invoices
+BillsSuppliersUnpaidForCompany=Unpaid supplier invoices for %s
 BillsLate=Maksuviivästykset
 BillsStatistics=Customers invoices statistics
 BillsStatisticsSuppliers=Suppliers invoices statistics
@@ -62,8 +62,8 @@ PaymentsBack=Maksut takaisin
 paymentInInvoiceCurrency=in invoices currency
 PaidBack=Paid back
 DeletePayment=Poista maksu
-ConfirmDeletePayment=Are you sure you want to delete this payment?
-ConfirmConvertToReduc=Do you want to convert this credit note or deposit 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.
+ConfirmDeletePayment=Oletko varma, että haluat poistaa tämän maksutavan?
+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.
 SupplierPayments=Tavarantoimittajat maksut
 ReceivedPayments=Vastaanotetut maksut
 ReceivedCustomersPayments=Saatujen maksujen asiakkaille
@@ -78,6 +78,7 @@ PaymentMode=Maksutapa
 PaymentTypeDC=Debit/Credit Card
 PaymentTypePP=PayPal
 IdPaymentMode=Payment type (id)
+CodePaymentMode=Payment type (code)
 LabelPaymentMode=Payment type (label)
 PaymentModeShort=Maksutapa
 PaymentTerm=Maksuaika
@@ -102,9 +103,10 @@ SearchACustomerInvoice=Haku asiakkaan laskussa
 SearchASupplierInvoice=Haku toimittajan laskun
 CancelBill=Peruuta lasku
 SendRemindByMail=EMail muistutus
-DoPayment=Ei maksua
-DoPaymentBack=Onko maksaminen takaisin
+DoPayment=Enter payment
+DoPaymentBack=Enter refund
 ConvertToReduc=Muunna tulevaisuudessa edullisista
+ConvertExcessReceivedToReduc=Convert excess received into future discount
 EnterPaymentReceivedFromCustomer=Kirjoita maksun saanut asiakas
 EnterPaymentDueToCustomer=Tee maksun asiakkaan
 DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
@@ -151,14 +153,14 @@ NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified
 FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
 NotARecurringInvoiceTemplate=Not a recurring template invoice
 NewBill=Uusi lasku
-LastBills=Viimeisin %s laskut
-LastCustomersBills=Viimeisin %s asiakkaiden laskut
-LastSuppliersBills=Viimeisin %s tavarantoimittajien laskut
+LastBills=Latest %s invoices
+LastCustomersBills=Latest %s customer invoices
+LastSuppliersBills=Latest %s supplier invoices
 AllBills=Kaikkien laskujen
 OtherBills=Muut laskut
 DraftBills=Luonnos laskut
-CustomersDraftInvoices=Asiakkaat luonnos laskut
-SuppliersDraftInvoices=Tavarantoimittajat luonnos laskut
+CustomersDraftInvoices=Customer draft invoices
+SuppliersDraftInvoices=Supplier draft invoices
 Unpaid=Maksamattomat
 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>?
@@ -214,7 +216,7 @@ EscompteOfferedShort=Alennus
 SendBillRef=Submission of invoice %s
 SendReminderBillRef=Submission of invoice %s (reminder)
 StandingOrders=Direct debit orders
-StandingOrder=Direct debit order
+StandingOrder=Suoraveloitus tilaus
 NoDraftBills=Ei Luonnos laskut
 NoOtherDraftBills=Mikään muu luonnos laskut
 NoDraftInvoices=Ei Luonnos laskut
@@ -272,6 +274,7 @@ Deposit=Talletuslokero
 Deposits=Talletukset
 DiscountFromCreditNote=Alennus menoilmoitus %s
 DiscountFromDeposit=Maksut tallettaa laskun %s
+DiscountFromExcessReceived=Payments from excess received of invoice %s
 AbsoluteDiscountUse=Tällainen luotto voidaan käyttää laskun ennen sen validointi
 CreditNoteDepositUse=Invoice must be validated to use this kind of credits
 NewGlobalDiscount=Uusi edullisista
@@ -279,8 +282,8 @@ NewRelativeDiscount=Uusi suhteellinen alennus
 NoteReason=Huomautus / syy
 ReasonDiscount=Perustelu
 DiscountOfferedBy=Myöntämä
-DiscountStillRemaining=Discount vielä jäljellä
-DiscountAlreadyCounted=Discount jo laskea
+DiscountStillRemaining=Discounts available
+DiscountAlreadyCounted=Discounts already consumed
 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ä.
@@ -333,6 +336,8 @@ 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
 # PaymentConditions
 Statut=Tila
 PaymentConditionShortRECEP=Due Upon Receipt
@@ -351,6 +356,14 @@ PaymentConditionShortPT_ORDER=Tilata
 PaymentConditionPT_ORDER=On order
 PaymentConditionShortPT_5050=50-50
 PaymentConditionPT_5050=50%% in advance, 50%% on delivery
+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
 FixAmount=Fix amount
 VarAmount=Variable amount (%% tot.)
 # PaymentType
@@ -420,7 +433,7 @@ ChequeDeposits=Sekit talletukset
 Cheques=Sekit
 DepositId=Id deposit
 NbCheque=Number of checks
-CreditNoteConvertedIntoDiscount=Tämä menoilmoitus on muunnettava %s
+CreditNoteConvertedIntoDiscount=This %s has been converted into %s
 UsBillingContactAsIncoiveRecipientIfExist=Käytä asiakkaiden laskutus osoite sijaan kolmannen osapuolen osoite vastaanottajalle laskut
 ShowUnpaidAll=Näytä kaikki maksamattomat laskut
 ShowUnpaidLateOnly=Näytä myöhään unpaid laskun vain
diff --git a/htdocs/langs/fi_FI/boxes.lang b/htdocs/langs/fi_FI/boxes.lang
index 9db6a9d29e1..f58d4b0a5b3 100644
--- a/htdocs/langs/fi_FI/boxes.lang
+++ b/htdocs/langs/fi_FI/boxes.lang
@@ -25,8 +25,8 @@ BoxTitleLastSuppliers=Latest %s recorded suppliers
 BoxTitleLastModifiedSuppliers=Latest %s modified suppliers
 BoxTitleLastModifiedCustomers=Latest %s modified customers
 BoxTitleLastCustomersOrProspects=Latest %s customers or prospects
-BoxTitleLastCustomerBills=Latest %s customer's invoices
-BoxTitleLastSupplierBills=Latest %s supplier's invoices
+BoxTitleLastCustomerBills=Latest %s customer invoices
+BoxTitleLastSupplierBills=Latest %s supplier invoices
 BoxTitleLastModifiedProspects=Latest %s modified prospects
 BoxTitleLastModifiedMembers=Latest %s members
 BoxTitleLastFicheInter=Latest %s modified interventions
@@ -51,12 +51,12 @@ ClickToAdd=Klikkaa tästä lisätäksesi.
 NoRecordedCustomers=Ei tallennettuja asiakkaita
 NoRecordedContacts=Ei tallennettuja yhteystietoja
 NoActionsToDo=Ei tehtäviä toimenpiteitä
-NoRecordedOrders=Ei tallennettuja asiakastilauksia
+NoRecordedOrders=No recorded customer orders
 NoRecordedProposals=Ei tallennettuja ehdotuksia
-NoRecordedInvoices=Ei tallennettuja asiakkaan laskuja
-NoUnpaidCustomerBills=Ei maksamattomia asiakkaiden laskuja
-NoUnpaidSupplierBills=Ei maksamattomia toimittajien laskuja
-NoModifiedSupplierBills=Ei tallennettuja toimittajien laskuja
+NoRecordedInvoices=No recorded customer invoices
+NoUnpaidCustomerBills=No unpaid customer invoices
+NoUnpaidSupplierBills=No unpaid supplier invoices
+NoModifiedSupplierBills=No recorded supplier invoices
 NoRecordedProducts=Ei tallennettuja tuotteita/palveluita
 NoRecordedProspects=Ei talennettuja mahdollisuuksia
 NoContractedProducts=Ei tuotteita/palveluita sopimuksissa
diff --git a/htdocs/langs/fi_FI/companies.lang b/htdocs/langs/fi_FI/companies.lang
index 8856672be6f..9981abce2eb 100644
--- a/htdocs/langs/fi_FI/companies.lang
+++ b/htdocs/langs/fi_FI/companies.lang
@@ -81,6 +81,7 @@ PaymentBankAccount=Payment bank account
 OverAllProposals=Total proposals
 OverAllOrders=Total orders
 OverAllInvoices=Total invoices
+OverAllSupplierProposals=Total price requests
 ##### Local Taxes #####
 LocalTax1IsUsed=Use second tax
 LocalTax1IsUsedES= RE käytössä
@@ -389,7 +390,7 @@ ListCustomersShort=Luettelo asiakkaiden
 ThirdPartiesArea=Third parties and contact area
 LastModifiedThirdParties=Latest %s modified third parties
 UniqueThirdParties=Yhteensä ainutlaatuinen kolmannen osapuolen
-InActivity=Avoinna
+InActivity=Avattu
 ActivityCeased=Kiinni
 ThirdPartyIsClosed=Third party is closed
 ProductsIntoElements=List of products/services into %s
@@ -404,7 +405,7 @@ MergeThirdparties=Merge third parties
 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 so you will be able to delete the duplicate one.
 ThirdpartiesMergeSuccess=Thirdparties have been merged
 SaleRepresentativeLogin=Login of sales representative
-SaleRepresentativeFirstname=Firstname of sales representative
-SaleRepresentativeLastname=Lastname of sales representative
+SaleRepresentativeFirstname=First name of sales representative
+SaleRepresentativeLastname=Last name of sales representative
 ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
 NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/fi_FI/compta.lang b/htdocs/langs/fi_FI/compta.lang
index ad887f92534..19f6b0ce05e 100644
--- a/htdocs/langs/fi_FI/compta.lang
+++ b/htdocs/langs/fi_FI/compta.lang
@@ -65,6 +65,7 @@ PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=ALV-maksu
 ListPayment=Luettelo maksut
 ListOfCustomerPayments=Luettelo asiakkaan maksut
+ListOfSupplierPayments=Luettelo toimittaja maksut
 DateStartPeriod=Date start period
 DateEndPeriod=Date end period
 newLT1Payment=New tax 2 payment
@@ -81,7 +82,7 @@ LT2PaymentES=IRPF Maksu
 LT2PaymentsES=IRPF maksut
 VATPayment=Sales tax payment
 VATPayments=Sales tax payments
-VATRefund=Sales tax refund Refund
+VATRefund=Sales tax refund
 Refund=Refund
 SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Näytä arvonlisäveron maksaminen
diff --git a/htdocs/langs/fi_FI/cron.lang b/htdocs/langs/fi_FI/cron.lang
index c43a01a5e8c..36ad552631f 100644
--- a/htdocs/langs/fi_FI/cron.lang
+++ b/htdocs/langs/fi_FI/cron.lang
@@ -17,14 +17,14 @@ CronMethodDoesNotExists=Class %s does not contains any method %s
 # Menu
 EnabledAndDisabled=Enabled and disabled
 # Page list
-CronLastOutput=Viimeisen ajon tulostus
-CronLastResult=Viimeisen tuloksen koodi
+CronLastOutput=Latest run output
+CronLastResult=Latest result code
 CronCommand=Command
 CronList=Scheduled jobs
 CronDelete=Delete scheduled jobs
-CronConfirmDelete=Are you sure you want to delete these scheduled jobs ?
+CronConfirmDelete=Are you sure you want to delete these scheduled jobs?
 CronExecute=Launch scheduled job
-CronConfirmExecute=Are you sure you want to execute these scheduled jobs now ?
+CronConfirmExecute=Are you sure you want to execute these scheduled jobs now?
 CronInfo=Scheduled job module allow to execute job that have been planned
 CronTask=Job
 CronNone=Ei mitään
@@ -33,13 +33,13 @@ CronDtEnd=Not after
 CronDtNextLaunch=Next execution
 CronDtLastLaunch=Start date of latest execution
 CronDtLastResult=End date of latest execution
-CronFrequency=Frequency
+CronFrequency=Toistuvuus
 CronClass=Class
 CronMethod=Menetelmä
 CronModule=Moduuli
 CronNoJobs=No jobs registered
 CronPriority=Prioriteetti
-CronLabel=Label
+CronLabel=Etiketti
 CronNbRun=Nb. launch
 CronMaxRun=Max nb. launch
 CronEach=Every
@@ -65,7 +65,7 @@ CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of
 CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
 CronCommandHelp=The system command line to execute.
 CronCreateJob=Create new Scheduled Job
-CronFrom=From
+CronFrom=Mistä
 # Info
 # Common
 CronType=Job type
diff --git a/htdocs/langs/fi_FI/errors.lang b/htdocs/langs/fi_FI/errors.lang
index 6b324ea3f00..63489d7b0a8 100644
--- a/htdocs/langs/fi_FI/errors.lang
+++ b/htdocs/langs/fi_FI/errors.lang
@@ -11,6 +11,7 @@ ErrorLoginAlreadyExists=Kirjaudu %s on jo olemassa.
 ErrorGroupAlreadyExists=Ryhmän %s on jo olemassa.
 ErrorRecordNotFound=Levykauppa ei löytynyt.
 ErrorFailToCopyFile=Epäonnistui kopioida tiedoston <b>%s</b> ilmaisuksi <b>%s</b> &quot;.
+ErrorFailToCopyDir=Failed to copy directory '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToRenameFile=Epäonnistui nimetä tiedoston <b>%s</b> ilmaisuksi <b>%s</b> &quot;.
 ErrorFailToDeleteFile=Epäonnistui poistaa tiedoston <b>' %s'.</b>
 ErrorFailToCreateFile=Luominen epäonnistui file <b>' %s'.</b>
@@ -115,7 +116,7 @@ ErrorNoActivatedBarcode=Ei viivakoodin tyyppi aktivoitu
 ErrUnzipFails=Failed to unzip %s with ZipArchive
 ErrNoZipEngine=No engine to unzip %s file in this PHP
 ErrorFileMustBeADolibarrPackage=The file %s must be a Dolibarr zip package
-ErrorFileRequired=It takes a package Dolibarr file
+ErrorModuleFileRequired=You must select a Dolibarr module package file
 ErrorPhpCurlNotInstalled=The PHP CURL is not installed, this is essential to talk with 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
@@ -181,6 +182,8 @@ ErrorBankStatementNameMustFollowRegex=Error, bank statement name must follow the
 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>
 
 # 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.
diff --git a/htdocs/langs/fi_FI/holiday.lang b/htdocs/langs/fi_FI/holiday.lang
index 9e3f1d5c164..0532515e60c 100644
--- a/htdocs/langs/fi_FI/holiday.lang
+++ b/htdocs/langs/fi_FI/holiday.lang
@@ -76,8 +76,8 @@ BoxTitleLastLeaveRequests=Latest %s modified leave requests
 HolidaysMonthlyUpdate=Monthly update
 ManualUpdate=Manual update
 HolidaysCancelation=Leave request cancelation
-EmployeeLastname=Employee lastname
-EmployeeFirstname=Employee firstname
+EmployeeLastname=Employee last name
+EmployeeFirstname=Employee first name
 TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
 
 ## Configuration du Module ##
diff --git a/htdocs/langs/fi_FI/ldap.lang b/htdocs/langs/fi_FI/ldap.lang
index d3981c4cb26..fe2931d0308 100644
--- a/htdocs/langs/fi_FI/ldap.lang
+++ b/htdocs/langs/fi_FI/ldap.lang
@@ -13,8 +13,8 @@ LDAPUsers=Käyttäjät LDAP-tietokanta
 LDAPFieldStatus=Tila
 LDAPFieldFirstSubscriptionDate=Ensimmäisen tilauksen päivämäärä
 LDAPFieldFirstSubscriptionAmount=Fist merkinnän määrästä
-LDAPFieldLastSubscriptionDate=Viimeisin tilaus päivämäärän
-LDAPFieldLastSubscriptionAmount=Viimeisin tilaus määrä
+LDAPFieldLastSubscriptionDate=Latest subscription date
+LDAPFieldLastSubscriptionAmount=Latest subscription amount
 LDAPFieldSkype=Skype id
 LDAPFieldSkypeExample=Example : skypeName
 UserSynchronized=Käyttäjän synkronoidaan
diff --git a/htdocs/langs/fi_FI/mails.lang b/htdocs/langs/fi_FI/mails.lang
index 709e4f13866..d309580e0ee 100644
--- a/htdocs/langs/fi_FI/mails.lang
+++ b/htdocs/langs/fi_FI/mails.lang
@@ -74,14 +74,18 @@ ResultOfMailSending=Result of mass EMail sending
 NbSelected=Nb selected
 NbIgnored=Nb ignored
 NbSent=Nb sent
-ContactsWithThirdpartyFilter=Contact with customer filters
+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
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Rivi %s tiedosto
 RecipientSelectionModules=Määritelty pyynnöt vastaanottajien valinta
 MailSelectedRecipients=Valitut vastaanottajat
 MailingArea=EMailings alueella
-LastMailings=Viimeisin %s emailings
+LastMailings=Latest %s emailings
 TargetsStatistics=Tavoitteet tilastot
 NbOfCompaniesContacts=Ainutlaatuinen yhteyksiä yritysten
 MailNoChangePossible=Vastaanottajat validoitava sähköpostia ei voi muuttaa
@@ -146,3 +150,6 @@ AdvTgtCreateFilter=Create filter
 AdvTgtOrCreateNewFilter=Name of new filter
 NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
+OutGoingEmailSetup=Outgoing email setup
+InGoingEmailSetup=Incoming email setup
+
diff --git a/htdocs/langs/fi_FI/main.lang b/htdocs/langs/fi_FI/main.lang
index 64fb5e2144f..434e925176a 100644
--- a/htdocs/langs/fi_FI/main.lang
+++ b/htdocs/langs/fi_FI/main.lang
@@ -69,6 +69,7 @@ SetDate=Aseta päivä
 SelectDate=Valitse päivä
 SeeAlso=See also %s
 SeeHere=See here
+Apply=Apply
 BackgroundColorByDefault=Default taustaväri
 FileRenamed=The file was successfully renamed
 FileUploaded=Tiedosto on siirretty onnistuneesti
@@ -87,7 +88,7 @@ Undefined=Määrittelemätön
 PasswordForgotten=Password forgotten?
 SeeAbove=Katso edellä
 HomeArea=Etusivu alue
-LastConnexion=Viimeisin yhteys
+LastConnexion=Latest connection
 PreviousConnexion=Edellinen yhteydessä
 PreviousValue=Previous value
 ConnectedOnMultiCompany=Connected on kokonaisuus
@@ -237,7 +238,7 @@ DateCreation=Luotu
 DateCreationShort=Creat. date
 DateModification=Muokattu
 DateModificationShort=Muokattu
-DateLastModification=Muokattu viimeksi
+DateLastModification=Latest modification date
 DateValidation=Vahvistettu
 DateClosing=Suljettu
 DateDue=Eräpäivä
@@ -433,7 +434,7 @@ Reportings=Raportointi
 Draft=Vedos
 Drafts=Vedokset
 Validated=Vahvistetut
-Opened=Avoinna
+Opened=Avattu
 New=Uusi
 Discount=Alennus
 Unknown=Tuntematon
@@ -599,6 +600,8 @@ SessionName=Istunnon nimi
 Method=Menetelmä
 Receive=Vastaanota
 CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
+ExpectedValue=Expected Value
+CurrentValue=Nykyinen arvo
 PartialWoman=Osittainen
 TotalWoman=Yhteensä
 NeverReceived=Ei ole saapunut
@@ -756,6 +759,7 @@ SomeTranslationAreUncomplete=Some languages may be partially translated or may c
 DirectDownloadLink=Direct download link
 Download=Download
 ActualizeCurrency=Update currency rate
+Fiscalyear=Fiscal year
 # Week day
 Monday=Maanantai
 Tuesday=Tiistai
@@ -812,3 +816,5 @@ SearchIntoContracts=Sopimukset
 SearchIntoCustomerShipments=Customer shipments
 SearchIntoExpenseReports=Expense reports
 SearchIntoLeaves=Leaves
+
+BulkActions=Bulk actions
diff --git a/htdocs/langs/fi_FI/members.lang b/htdocs/langs/fi_FI/members.lang
index 9a80c69e829..3c22ee5b42b 100644
--- a/htdocs/langs/fi_FI/members.lang
+++ b/htdocs/langs/fi_FI/members.lang
@@ -136,8 +136,8 @@ DocForAllMembersCards=Luo käyntikortteja kaikkien jäsenten (malli lähtö tode
 DocForOneMemberCards=Luo käyntikortit erityisesti jäsen (malli lähtö todella setup: <b>%s)</b>
 DocForLabels=Luo osoite arkkia (malli lähtö todella setup: <b>%s)</b>
 SubscriptionPayment=Tilaus maksu
-LastSubscriptionDate=Viimeinen merkintäpäivä
-LastSubscriptionAmount=Viime merkinnän määrästä
+LastSubscriptionDate=Latest subscription date
+LastSubscriptionAmount=Latest subscription amount
 MembersStatisticsByCountries=Jäsenten tilastot maittain
 MembersStatisticsByState=Jäsenten tilastot valtio / lääni
 MembersStatisticsByTown=Jäsenten tilastot kaupunki
@@ -149,7 +149,7 @@ MembersByStateDesc=Tämä ruutu näyttää tilastoja jäsenistä valtion / maaku
 MembersByTownDesc=Tämä ruutu näyttää tilastoja jäsenille kaupungin.
 MembersStatisticsDesc=Valitse tilastot haluat lukea ...
 MenuMembersStats=Tilasto
-LastMemberDate=Viimeinen Tulokas
+LastMemberDate=Latest member date
 Nature=Luonto
 Public=Tiedot ovat julkisia
 NewMemberbyWeb=Uusi jäsen. Odottaa hyväksyntää
diff --git a/htdocs/langs/fi_FI/orders.lang b/htdocs/langs/fi_FI/orders.lang
index 678f51c5951..fbad93b50c1 100644
--- a/htdocs/langs/fi_FI/orders.lang
+++ b/htdocs/langs/fi_FI/orders.lang
@@ -39,7 +39,7 @@ StatusOrderRefusedShort=Kieltäydytty
 StatusOrderBilledShort=Laskutetun
 StatusOrderToProcessShort=Käsitellä
 StatusOrderReceivedPartiallyShort=Osittain saanut
-StatusOrderReceivedAllShort=Kaikki saivat
+StatusOrderReceivedAllShort=Products received
 StatusOrderCanceled=Peruutettu
 StatusOrderDraft=Luonnos (on vahvistettu)
 StatusOrderValidated=Validoidut
@@ -51,7 +51,7 @@ StatusOrderApproved=Hyväksyttiin
 StatusOrderRefused=Kieltäydytty
 StatusOrderBilled=Laskutetun
 StatusOrderReceivedPartially=Osittain saanut
-StatusOrderReceivedAll=Kaikki saivat
+StatusOrderReceivedAll=All products received
 ShippingExist=Lähetys olemassa
 QtyOrdered=Kpl velvoitti
 ProductQtyInDraft=Product quantity into draft orders
diff --git a/htdocs/langs/fi_FI/other.lang b/htdocs/langs/fi_FI/other.lang
index e993e567c8e..2acdf6fedf9 100644
--- a/htdocs/langs/fi_FI/other.lang
+++ b/htdocs/langs/fi_FI/other.lang
@@ -68,14 +68,15 @@ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find her
 PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nYou will find here the shipping __SHIPPINGREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nYou will find here the intervention __FICHINTERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n__PERSONALIZED__\n\n__SIGNATURE__
-DemoDesc=Dolibarr is a compact ERP/CRM supporting several functional modules. A demo showcasing all modules makes no sense as this scenario never occurs. So, several demo profiles are available.
+DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
+ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
 DemoFundation=Hallitse jäseniä säätiön
 DemoFundation2=Jäsenten hallinta ja pankkitilille säätiön
-DemoCompanyServiceOnly=Hallinnoi freelance toimintaa myymällä palvelua vain
+DemoCompanyServiceOnly=Company or freelance selling service only
 DemoCompanyShopWithCashDesk=Hallinnoi liikkeen kanssa kassa
-DemoCompanyProductAndStocks=Hallitse pieni tai keskisuuri yritys myy tuotteitaan
-DemoCompanyAll=Hallitse pieni tai keskisuuri yritys, jossa on useita toimintoja (kaikki tärkeimmät moduulit)
+DemoCompanyProductAndStocks=Company selling products with a shop
+DemoCompanyAll=Company with multiple activities (all main modules)
 CreatedBy=Created by %s
 ModifiedBy=Muuttanut %s
 ValidatedBy=Vahvistaja %s
diff --git a/htdocs/langs/fi_FI/products.lang b/htdocs/langs/fi_FI/products.lang
index 8a1d92cdb9a..a5c0d494bcd 100644
--- a/htdocs/langs/fi_FI/products.lang
+++ b/htdocs/langs/fi_FI/products.lang
@@ -60,7 +60,7 @@ SellingPrice=Myyntihinta
 SellingPriceHT=Myyntihinta (ilman veroja)
 SellingPriceTTC=Myyntihinta (sis. alv)
 CostPriceDescription=This price (net of tax) can be used to store the average amount this product cost to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
-CostPriceUsage=In a future version, this value could be used for margin calculation.
+CostPriceUsage=This value could be used for margin calculation.
 SoldAmount=Sold amount
 PurchasedAmount=Purchased amount
 NewPrice=Uusi hinta
@@ -142,6 +142,7 @@ ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b>?
 CloneContentProduct=Klooni kaikki tärkeimmät tiedot tuotteen / palvelun
 ClonePricesProduct=Klooni tärkeimmät tiedot ja hinnat
 CloneCompositionProduct=Clone packaged product/service
+CloneCombinationsProduct=Clone product variants
 ProductIsUsed=Tämä tuote on käytetty
 NewRefForClone=Ref. uuden tuotteen tai palvelun
 SellingPrices=Selling prices
@@ -238,7 +239,7 @@ GlobalVariables=Global variables
 VariableToUpdate=Variable to update
 GlobalVariableUpdaters=Global variable updaters
 UpdateInterval=Update interval (minutes)
-LastUpdated=Last updated
+LastUpdated=Latest update
 CorrectlyUpdated=Correctly updated
 PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
 PropalMergePdfProductChooseFile=Select PDF files
@@ -258,4 +259,41 @@ VolumeUnits=Volume unit
 SizeUnits=Size unit
 DeleteProductBuyPrice=Delete buying price
 ConfirmDeleteProductBuyPrice=Are you sure you want to delete this buying price?
+SubProduct=Sub product
 
+#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
+ProductCombinations=Variants
+HideProductCombinations=Hide products variant in the products selector
+ProductCombination=Variant
+NewProductCombination=New variant
+EditProductCombination=Editing variant
+ProductCombinationGenerator=Variants generator
+Features=Features
+PriceImpact=Price impact
+WeightImpact=Weight impact
+NewProductAttribute=Uusi ominaisuus
+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
+PercentageVariation=Percentage variation
+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 child products
+ConfirmCloneProductCombinations=Would you like to copy all the product variant to the 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
diff --git a/htdocs/langs/fi_FI/projects.lang b/htdocs/langs/fi_FI/projects.lang
index 4c9c58836d4..2a82b3eda86 100644
--- a/htdocs/langs/fi_FI/projects.lang
+++ b/htdocs/langs/fi_FI/projects.lang
@@ -29,9 +29,9 @@ DeleteAProject=Poista hanke
 DeleteATask=Poista tehtävä
 ConfirmDeleteAProject=Are you sure you want to delete this project?
 ConfirmDeleteATask=Are you sure you want to delete this task?
-OpenedProjects=Open projects
-OpenedTasks=Open tasks
-OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
+OpenedProjects=Opened projects
+OpenedTasks=Opened tasks
+OpportunitiesStatusForOpenedProjects=Opportunities amount of opened projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=Näytä hankkeen
 SetProject=Aseta hankkeen
@@ -47,7 +47,7 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=Käyttäjä
 TaskTimeNote=Huomautus
 TaskTimeDate=Date
-TasksOnOpenedProject=Tasks on open projects
+TasksOnOpenedProject=Tasks on opened projects
 WorkloadNotDefined=Workload not defined
 NewTimeSpent=Uusi käytetty aika
 MyTimeSpent=Oma käytetty aika
@@ -96,6 +96,7 @@ ValidateProject=Vahvista projet
 ConfirmValidateProject=Are you sure you want to validate this project?
 CloseAProject=Sulje projekti
 ConfirmCloseAProject=Are you sure you want to close this project?
+AlsoCloseAProject=Also close project (keep it open if you still need to follow production tasks on it)
 ReOpenAProject=Avaa projekti
 ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=Hankkeen yhteystiedot
@@ -121,7 +122,7 @@ CloneProjectFiles=Clone project joined files
 CloneTaskFiles=Clone task(s) joined files (if task(s) cloned)
 CloneMoveDate=Update project/tasks dates from now?
 ConfirmCloneProject=Are you sure to clone this project?
-ProjectReportDate=Change task date according project start date
+ProjectReportDate=Change task dates according to new project start date
 ErrorShiftTaskDate=Impossible to shift task date according to new project start date
 ProjectsAndTasksLines=Projects and tasks
 ProjectCreatedInDolibarr=Project %s created
@@ -178,9 +179,9 @@ ProjectsStatistics=Statistics on projects/leads
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 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.
-OpenedProjectsByThirdparties=Open projects by thirdparties
+OpenedProjectsByThirdparties=Opened projects by thirdparties
 OnlyOpportunitiesShort=Only opportunities
-OpenedOpportunitiesShort=Open opportunities
+OpenedOpportunitiesShort=Opened opportunities
 NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount
diff --git a/htdocs/langs/fi_FI/propal.lang b/htdocs/langs/fi_FI/propal.lang
index 8bda2ca2ae9..ace01a6760c 100644
--- a/htdocs/langs/fi_FI/propal.lang
+++ b/htdocs/langs/fi_FI/propal.lang
@@ -3,7 +3,7 @@ Proposals=Kaupalliset ehdotuksia
 Proposal=Kaupalliset ehdotus
 ProposalShort=Ehdotus
 ProposalsDraft=Luonnos kaupallinen ehdotuksia
-ProposalsOpened=Open commercial proposals
+ProposalsOpened=Avoinna kaupallinen ehdotuksia
 Prop=Kaupalliset ehdotuksia
 CommercialProposal=Kaupalliset ehdotus
 ProposalCard=Ehdotus kortti
@@ -26,9 +26,9 @@ AmountOfProposalsByMonthHT=Määrä kuukausittain (ilman veroja)
 NbOfProposals=Numero kaupallisten ehdotuksia
 ShowPropal=Näytä ehdotus
 PropalsDraft=Drafts
-PropalsOpened=Avoinna
+PropalsOpened=Avattu
 PropalStatusDraft=Luonnos (on vahvistettu)
-PropalStatusValidated=Validoidut (ehdotus on avattu)
+PropalStatusValidated=Validated (proposal is opened)
 PropalStatusSigned=Allekirjoitettu (laskuttaa)
 PropalStatusNotSigned=Ei ole kirjautunut (suljettu)
 PropalStatusBilled=Laskutetun
diff --git a/htdocs/langs/fi_FI/stocks.lang b/htdocs/langs/fi_FI/stocks.lang
index eb060c06d6b..b2fc64fa585 100644
--- a/htdocs/langs/fi_FI/stocks.lang
+++ b/htdocs/langs/fi_FI/stocks.lang
@@ -22,13 +22,15 @@ Movements=Liikkeet
 ErrorWarehouseRefRequired=Warehouse viite nimi tarvitaan
 ListOfWarehouses=Luettelo varastoissa
 ListOfStockMovements=Luettelo varastojen muutokset
+StockMovementForId=Movement ID %d
+ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Warehouses area
 Location=Lieu
 LocationSummary=Lyhyt nimi sijainti
 NumberOfDifferentProducts=Number of different products
 NumberOfProducts=Kokonaismäärä tuotteet
-LastMovement=Viimeisin liikkuvuus
-LastMovements=Viimeisin liikkeet
+LastMovement=Latest movement
+LastMovements=Latest movements
 Units=Yksiköt
 Unit=Yksikkö
 StockCorrection=Oikea varastossa
diff --git a/htdocs/langs/fi_FI/supplier_proposal.lang b/htdocs/langs/fi_FI/supplier_proposal.lang
index 58ab18b3f12..7eea6f02e24 100644
--- a/htdocs/langs/fi_FI/supplier_proposal.lang
+++ b/htdocs/langs/fi_FI/supplier_proposal.lang
@@ -8,7 +8,7 @@ SearchRequest=Find a request
 DraftRequests=Draft requests
 SupplierProposalsDraft=Draft supplier proposals
 LastModifiedRequests=Latest %s modified price requests
-RequestsOpened=Open price requests
+RequestsOpened=Opened price requests
 SupplierProposalArea=Supplier proposals area
 SupplierProposalShort=Supplier proposal
 SupplierProposals=Supplier proposals
@@ -23,7 +23,7 @@ ConfirmValidateAsk=Are you sure you want to validate this price request under na
 DeleteAsk=Delete request
 ValidateAsk=Validate request
 SupplierProposalStatusDraft=Luonnos (on vahvistettu)
-SupplierProposalStatusValidated=Validated (request is open)
+SupplierProposalStatusValidated=Validated (request is opened)
 SupplierProposalStatusClosed=Suljettu
 SupplierProposalStatusSigned=Accepted
 SupplierProposalStatusNotSigned=Refused
diff --git a/htdocs/langs/fi_FI/suppliers.lang b/htdocs/langs/fi_FI/suppliers.lang
index 5a3eded0d69..93d4f4681e6 100644
--- a/htdocs/langs/fi_FI/suppliers.lang
+++ b/htdocs/langs/fi_FI/suppliers.lang
@@ -24,10 +24,10 @@ ExportDataset_fournisseur_1=Toimittajan laskujen luettelo ja laskut "linjat
 ExportDataset_fournisseur_2=Toimittajan laskut ja maksut
 ExportDataset_fournisseur_3=Supplier orders and order lines
 ApproveThisOrder=Hyväksy tämä tilaus
-ConfirmApproveThisOrder=Oletko varma, että haluat hyväksyä tämän tilauksen?
+ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b>?
 DenyingThisOrder=Deny this order
-ConfirmDenyingThisOrder=Oletko varma, että haluat kieltää tämän tilauksen?
-ConfirmCancelThisOrder=Oletko varma, että haluat peruuttaa tämän tilauksen?
+ConfirmDenyingThisOrder=Are you sure you want to deny this order <b>%s</b>?
+ConfirmCancelThisOrder=Are you sure you want to cancel this order <b>%s</b>?
 AddSupplierOrder=Luo toimittaja jotta
 AddSupplierInvoice=Luo toimittajan laskun
 ListOfSupplierProductForSupplier=Luettelo tuotteista ja hinnoista <b>toimittaja %s</b>
@@ -41,3 +41,4 @@ DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Wrong quality
 ReputationForThisProduct=Reputation
 BuyerName=Buyer name
+AllProductServicePrices=All product / service prices
diff --git a/htdocs/langs/fi_FI/users.lang b/htdocs/langs/fi_FI/users.lang
index f2990190205..6fc433fb605 100644
--- a/htdocs/langs/fi_FI/users.lang
+++ b/htdocs/langs/fi_FI/users.lang
@@ -36,7 +36,7 @@ AdministratorDesc=Administrator
 DefaultRights=Oletus käyttöoikeudet
 DefaultRightsDesc=Määritä tässä default käyttöoikeudet automaattisesti joka myönnetään uusille käyttäjille.
 DolibarrUsers=Dolibarr käyttäjät
-LastName=Last Name
+LastName=Sukunimi
 FirstName=Etunimi
 ListOfGroups=Luettelo ryhmien
 NewGroup=Uusi ryhmä
diff --git a/htdocs/langs/fi_FI/withdrawals.lang b/htdocs/langs/fi_FI/withdrawals.lang
index 2e3b987e0e2..57d929dafe9 100644
--- a/htdocs/langs/fi_FI/withdrawals.lang
+++ b/htdocs/langs/fi_FI/withdrawals.lang
@@ -6,7 +6,7 @@ StandingOrder=Direct debit payment order
 NewStandingOrder=New direct debit order
 StandingOrderToProcess=Jotta prosessi
 WithdrawalsReceipts=Direct debit orders
-WithdrawalReceipt=Direct debit order
+WithdrawalReceipt=Suoraveloitus tilaus
 LastWithdrawalReceipts=Latest %s direct debit files
 WithdrawalsLines=Direct debit order lines
 RequestStandingOrderToTreat=Request for direct debit payment order to process
@@ -24,6 +24,7 @@ WithdrawStatistics=Direct debit payment statistics
 WithdrawRejectStatistics=Direct debit payment reject statistics
 LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
+WithdrawRequestsDone=%s direct debit payment requests recorded
 ThirdPartyBankCode=Kolmannen osapuolen pankin koodi
 NoInvoiceCouldBeWithdrawed=N: o laskun withdrawed menestyksekkäästi. Tarkista, että laskussa yrityksiin, joilla on voimassa oleva kielto.
 ClassCredited=Luokittele hyvitetään
@@ -76,8 +77,8 @@ RUM=UMR
 RUMLong=Unique Mandate Reference
 RUMWillBeGenerated=UMR number will be generated once bank account information are saved
 WithdrawMode=Direct debit mode (FRST or RECUR)
-WithdrawRequestAmount=Withdraw request amount:
-WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil amount.
+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
diff --git a/htdocs/langs/fr_BE/accountancy.lang b/htdocs/langs/fr_BE/accountancy.lang
index f4190e6e567..126e5734e28 100644
--- a/htdocs/langs/fr_BE/accountancy.lang
+++ b/htdocs/langs/fr_BE/accountancy.lang
@@ -1,10 +1,9 @@
 # Dolibarr language file - Source file is en_US - accountancy
 ConfigAccountingExpert=Configuration du module de compta expert
-ProductsBinding=Products bindings
 Processing=Exécution
-EndProcessing=Fin de l'exécution
 Lineofinvoice=Lignes de facture
 Doctype=Type de document
+AccountingCategory=Accounting category
 ThirdPartyAccount=Compte tiers
 ErrorDebitCredit=Débit et crédit ne peuvent pas être non-nuls en même temps
 Pcgtype=Classe du compte
@@ -12,3 +11,5 @@ Pcgsubtype=Sous-classe du compte
 TotalMarge=Marge de ventes totale
 Selectmodelcsv=Sélectionnez un modèle d'export
 Modelcsv_normal=Export classique
+ErrorNoAccountingCategoryForThisCountry=No accounting category available for country %s (See Home - Setup - Dictionaries)
+WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
diff --git a/htdocs/langs/fr_BE/admin.lang b/htdocs/langs/fr_BE/admin.lang
index 9326888e62a..1ba55ed1f3c 100644
--- a/htdocs/langs/fr_BE/admin.lang
+++ b/htdocs/langs/fr_BE/admin.lang
@@ -2,6 +2,8 @@
 Foundation=Fondation
 VersionExperimental=Expérimentale
 VersionRecommanded=Recommandée
+FileCheckDesc=This tool allows you to check the integrity of files and setup of your application, comparing each files with the official ones. 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.
+FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified, removed or added.
 SessionId=ID de session
 SessionSaveHandler=Gestionnaire de sessions
 PurgeSessions=Nettoyage des sessions
@@ -21,11 +23,22 @@ IfModuleEnabled=Note: oui ne fonctionne que si le module <b>%s</b> est activé
 RemoveLock=Supprimez le fichier <b>%s</b> s'il existe pour autoriser l'utilisation de l'outil de mise à jour.
 AntiVirusCommandExample=Example for ClamWin: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe<br>Example for ClamAv: /usr/bin/clamscan
 AntiVirusParamExample=Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
+ModulesMarketPlaces=Find external modules...
+ThisIsAlternativeProcessToFollow=This is an alternative setup to process manually:
+UnpackPackageInDolibarrRoot=Unpack the packaged files into server directory dedicated to Dolibarr: <b>%s</b>
+UnpackPackageInModulesRoot=To deploy/install an external module, unpack the packaged files into the server directory dedicated to modules: <b>%s</b>
+NotExistsDirect=The alternative root directory is not defined to an existing directory.<br>
+InfDirAlt=Since version 3, it is possible to define an alternative root directory. This allows you to store, into a dedicated directory, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
+InfDirExample=<br>Then declare it in the file <strong>conf.php</strong><br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>If these lines are commented with "#", to enable them, just uncomment by removing the "#" character.
 ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
+ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list :<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list :<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
+Module0Desc=Users / Employees and Groups management
 Module20Name=Propales
 Module30Name=Factures
 DictionaryPaymentConditions=Conditions de paiement
+DictionaryAccountancyCategory=Accounting categories
+AddExtensionThemeModuleOrOther=Deploy/install external module
 ConstDesc=This page allows you to edit all other parameters not available in previous pages. These are mostly reserved parameters for developers or advanced troubleshooting. For a list of options <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">check here</a>.
 SuppliersPayment=Paiements fournisseurs
 Target=Objectif
-ApiProductionMode=Enable production mode (this will activate use of a caches for services management)
+ConfFileMuseContainCustom=Installing an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
diff --git a/htdocs/langs/fr_BE/bills.lang b/htdocs/langs/fr_BE/bills.lang
index de17b5a1dce..28f69acb856 100644
--- a/htdocs/langs/fr_BE/bills.lang
+++ b/htdocs/langs/fr_BE/bills.lang
@@ -1,6 +1,4 @@
 # Dolibarr language file - Source file is en_US - bills
-BillsCustomer=Facture clients
-BillsCustomersUnpaidForCompany=Facture clients impayées pour %s
 BillsLate=Paiements en retard
 InvoiceStandardDesc=Ce type de facture est le type commun.
 InvoiceDeposit=Facture d'accompte
@@ -23,6 +21,7 @@ SupplierBills=factures fournisseurs
 Payment=Paiement
 Payments=Paiements
 DeletePayment=Supprimer paiement
+ConfirmDeletePayment=Êtes-vous certain de vouloir supprimer ce paiement?
 SupplierPayments=Paiements fournisseurs
 ReceivedPayments=Paiements reçus
 ReceivedCustomersPayments=Paiements reçus de clients
@@ -56,6 +55,5 @@ PaymentTypeLIQ=En espèces
 PaymentTypeShortLIQ=En espèces
 PaymentTypeCB=Carte de crédit
 PaymentTypeShortCB=Carte de crédit
-CreditNoteConvertedIntoDiscount=Ce crédit ou acompte a été converti en %s
 Cash=En espèces
 TerreNumRefModelDesc1=Renvoie le numéro sous la forme %syymm-nnnn pour les factures et %syymm-nnnn pour les notes de crédits où yy est l'année, mm le mois et nnnn un compteur séquentiel sans rupture et sans remise à 0
diff --git a/htdocs/langs/fr_BE/boxes.lang b/htdocs/langs/fr_BE/boxes.lang
index 85bda7e24e5..fe6398a72d8 100644
--- a/htdocs/langs/fr_BE/boxes.lang
+++ b/htdocs/langs/fr_BE/boxes.lang
@@ -10,12 +10,7 @@ ClickToAdd=Cliquer ici pour ajouter
 NoRecordedCustomers=Aucun client enregistré
 NoRecordedContacts=Aucun contact enregistré
 NoActionsToDo=Aucune action à faire
-NoRecordedOrders=Aucune commande client enregistrée
 NoRecordedProposals=Aucune propale enregistrée
-NoRecordedInvoices=Aucune facture client enregistrée
-NoUnpaidCustomerBills=Aucune facture client non payée
-NoUnpaidSupplierBills=Aucune facture fournisseur impayée
-NoModifiedSupplierBills=Aucune facture fournisseur enregistrée
 NoRecordedProducts=Aucun produit/service enregistré
 NoRecordedProspects=Aucun prospect enregistré
 NoContractedProducts=Aucun produit/service contraté
diff --git a/htdocs/langs/fr_BE/compta.lang b/htdocs/langs/fr_BE/compta.lang
index efc59a2e4e4..e2c889c3ed2 100644
--- a/htdocs/langs/fr_BE/compta.lang
+++ b/htdocs/langs/fr_BE/compta.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - compta
-VATRefund=Sales tax refund Refund
 SalesTurnover=Chiffre d'affaires des ventes
 Dispatched=Envoyé
 ToDispatch=Envoyer
diff --git a/htdocs/langs/fr_BE/mails.lang b/htdocs/langs/fr_BE/mails.lang
index 4116e411797..0259ac9b0ed 100644
--- a/htdocs/langs/fr_BE/mails.lang
+++ b/htdocs/langs/fr_BE/mails.lang
@@ -1,5 +1,2 @@
 # Dolibarr language file - Source file is en_US - mails
 MailingStatusSentCompletely=Complètement envoyé
-MailSuccessfulySent=Email successfully sent (from %s to %s)
-MailingNeedCommand=For security reason, sending an emailing is better when performed from command line. If you have one, ask your server administrator to launch the following command to send the emailing to all recipients:
-ConfirmSendingEmailing=If you can't or prefer sending them with your www browser, please confirm you are sure you want to send emailing now from your browser?
diff --git a/htdocs/langs/fr_BE/main.lang b/htdocs/langs/fr_BE/main.lang
index b23a0e13878..95dd21ca4b0 100644
--- a/htdocs/langs/fr_BE/main.lang
+++ b/htdocs/langs/fr_BE/main.lang
@@ -26,3 +26,5 @@ AmountPayment=Montant de paiement
 Discount=Ristourne
 Unknown=Inconnue
 Check=Chèque
+Select2MoreCharacter=or more characters<br /><br /><strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
+Select2MoreCharacters=or more characters<br /><br /><strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
diff --git a/htdocs/langs/fr_BE/members.lang b/htdocs/langs/fr_BE/members.lang
deleted file mode 100644
index fcd4f3eb8d7..00000000000
--- a/htdocs/langs/fr_BE/members.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - members
-MemberStatusActiveLate=subscription expired
diff --git a/htdocs/langs/fr_BE/withdrawals.lang b/htdocs/langs/fr_BE/withdrawals.lang
index a6f0f06fc82..eb336cadcc0 100644
--- a/htdocs/langs/fr_BE/withdrawals.lang
+++ b/htdocs/langs/fr_BE/withdrawals.lang
@@ -1,2 +1,2 @@
 # Dolibarr language file - Source file is en_US - withdrawals
-DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Withdrawal 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.
+StatusTrans=Envoyé
diff --git a/htdocs/langs/fr_CA/accountancy.lang b/htdocs/langs/fr_CA/accountancy.lang
index f3d2ec419f0..50f9b46c36b 100644
--- a/htdocs/langs/fr_CA/accountancy.lang
+++ b/htdocs/langs/fr_CA/accountancy.lang
@@ -5,21 +5,18 @@ ACCOUNTING_EXPORT_PIECE=Exporter le nombre de pièces
 ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Exporter avec compte global
 Selectformat=Sélectionner le format de date pour le fichier
 ACCOUNTING_EXPORT_PREFIX_SPEC=Spécifiez le préfixe du nom de fichier
-AccountAccountingSuggest=Compte comptable suggéré
-ProductsBinding=Products bindings
 AccountBalance=Solde du compte
 CAHTF=Total achats fournisseur avant taxes
-ACCOUNTING_LENGTH_DESCRIPTION=Longueur pour l'affichage des produits et services description dans les listes (valeur conseillée = 50 )
-ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Longueur pour l'affichage des produits et services compte formulaire de description dans les listes (valeur conseillée = 50 )
 ACCOUNTING_EXPENSEREPORT_JOURNAL=Note de frais
+AccountingCategory=Accounting category
 FinanceJournal=Journal des finances
 DescFinanceJournal=Journal de banque comprenant tous les types de règlements autres que espèce\t
 TotalVente=Chiffre d'affaires total avant taxes
+DescVentilDoneSupplier=Consultez ici la liste des lignes de factures fournisseur et leur compte comptable
 MvtNotCorrectlyBalanced=Le mouvement n'est pas correctement équilibré. Crédit = %s. Débit = %s
-GeneralLedgerIsWritten=Les opérations sont écrites dans le grand livre général
 InitAccountancy=Compabilité initiale
 OptionModeProductSell=Mode de ventes
 OptionModeProductBuy=Mode d'achats
-OptionModeProductSellDesc=Voir tous les produits sans compte comptable défini pour les ventes.
-OptionModeProductBuyDesc=Voir tous les produits sans compte comptable défini pour les achats.
 Range=Gamme de compte comptable
+ErrorNoAccountingCategoryForThisCountry=No accounting category available for country %s (See Home - Setup - Dictionaries)
+WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
diff --git a/htdocs/langs/fr_CA/admin.lang b/htdocs/langs/fr_CA/admin.lang
index 8b795eda4cc..ab9f0974912 100644
--- a/htdocs/langs/fr_CA/admin.lang
+++ b/htdocs/langs/fr_CA/admin.lang
@@ -1,6 +1,9 @@
 # Dolibarr language file - Source file is en_US - admin
+FileCheckDesc=This tool allows you to check the integrity of files and setup of your application, comparing each files with the official ones. 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.
+FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified, removed or added.
 FilesUpdated=Mettre à jour les fichiers
 PurgeDeleteTemporaryFilesShort=Supprimer les fichiers temporaires
+ModulesMarketPlaces=Find external modules...
 InstrucToEncodePass=Pour chiffrer le mot de passe de la base dans le fichier de configuration <b>conf.php</b>, remplacer la ligne<br><b>$dolibarr_main_db_pass="...";</b><br>par<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
 InstrucToClearPass=Pour avoir le mot de passe de la base décodé (en clair) dans le fichier de configuration <b>conf.php</b>, remplacer dans ce fichier la ligne<br><b>$dolibarr_main_db_pass="crypted:..."</b><br>par<br><b>$dolibarr_main_db_pass="%s"</b>
 MAIN_MAIL_EMAIL_STARTTLS=Utilisation du chiffrement TLS (SSL)
@@ -11,8 +14,13 @@ ModuleFamilyProducts=Gestion des produits
 ModuleFamilyHr=Gestion des ressources humaines (GRH)
 ModuleFamilyPortal=Site internet et autres applications frontales
 ModuleFamilyInterface=Interfaces avec les systèmes externes
+ThisIsAlternativeProcessToFollow=This is an alternative setup to process manually:
 DownloadPackageFromWebSite=Télécharger le package %s.
-UnpackPackageInDolibarrRoot=Décompresser le paquet dans le répertoire dédié aux modules externes : <b>%s</b>
+UnpackPackageInDolibarrRoot=Unpack the packaged files into server directory dedicated to Dolibarr: <b>%s</b>
+UnpackPackageInModulesRoot=To deploy/install an external module, unpack the packaged files into the server directory dedicated to modules: <b>%s</b>
+NotExistsDirect=The alternative root directory is not defined to an existing directory.<br>
+InfDirAlt=Since version 3, it is possible to define an alternative root directory. This allows you to store, into a dedicated directory, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
+InfDirExample=<br>Then declare it in the file <strong>conf.php</strong><br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>If these lines are commented with "#", to enable them, just uncomment by removing the "#" character.
 YouCanSubmitFile=Sélectionner le module :
 DisableLinkToHelp=Masquer lien vers l'aide en ligne "<b>%s</b>"
 ListOfDirectoriesForModelGenODT=Liste des répertoires contenant des fichiers de modèles avec le format OpenDocument . <br><br> Mettez ici le chemin complet des répertoires .<br>Ajouter un retour chariot entre répertoire eah.<br> Pour ajouter un répertoire du module de GED , ajouter ici<b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br> Fichiers dans ces répertoires doit se terminer par <b>.odt</b> or <b>.ods</b>.
@@ -20,9 +28,11 @@ HideAnyVATInformationOnPDF=Cacher toutes les informations en rapport avec la TPS
 PlaceCustomerAddressToIsoLocation=Utilisez french standard position (La Poste) pour le client position d'adresse
 OldVATRates=Ancien taux de TPS/TVH
 NewVATRates=Nouveau taux de TPS/TVH
+ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list :<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list :<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelplink=Les paramètres doivent être ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Exemple : Societe:societe/class/societe.class.php
 LocalTaxDesc=Certains pays appliquent 2 voire 3 taux sur chaque ligne de facture. Si c'est le cas, choisissez le type du deuxième et troisième taux et sa valeur. Les types possibles sont:<br>1 : taxe locale sur les produits et services hors TPS/TVH (la taxe locale est calculée sur le montant hors taxe)<br>2 : taxe locale sur les produits et services avant TPS/TVH (la taxe locale est appliquée sur le montant + TPS/TVH)<br>3 : taxe locale uniquement sur les produits hors TPS/TVH (la taxe locale est calculée sur le montant hors taxe)<br>4 : taxe locale uniquement sur les produits avant TPS/TVH (la taxe locale est calculée sur le montant + TPS/TVH)<br>5 : taxe locale uniquement sur les services hors TPS/TVH (la taxe locale est calculée sur le montant hors taxe)<br>6 : taxe locale uniquement sur les service avant TPS/TVH (la taxe locale est calculée sur le montant + TPS/TVH)
 EnableFileCache=Activer le cache de fichiers
+Module0Desc=Users / Employees and Groups management
 Module75Name=Notes de frais et déplacements
 Module500Name=Dépenses spéciales (taxes, charges, dividendes)
 Module500Desc=Gestion des dépenses spéciales comme les taxes, charges sociales et dividendes
@@ -70,6 +80,7 @@ LocalTax1IsUsedDesc=Utilisation d'un 2ème type taxe (autre que TPS/TVH)
 LocalTax1IsNotUsedDesc=Pas d'utilisation de 2ème type taxe (autre que TPS/TVH)
 LocalTax2IsUsedDesc=Utilisation d'un 3ème type taxe  (autre que TPS/TVH)
 LocalTax2IsNotUsedDesc=Pas d'utilisation de 3ème type taxe  (autre que TPS/TVH)
+AddExtensionThemeModuleOrOther=Deploy/install external module
 DefaultMaxSizeList=Longueur maximale des listes
 DefaultMaxSizeShortList=Longueur maximale par défaut des listes
 CompanyObject=Objet de la compagnie
@@ -114,10 +125,10 @@ ClickToDialUseTelLink=Utilisez juste un lien "tel: " sur les numéros de télép
 ClickToDialUseTelLinkDesc=Utilisez cette méthode si vos utilisateurs ont un softphone ou une interface de logiciel installé sur un même ordinateur que le navigateur , et a appelé lorsque vous cliquez sur un lien dans votre navigateur qui commencent par "tel: " . Si vous avez besoin d'une solution de serveur complet (pas besoin d'installation locale du logiciel ) , vous devez définir ce "Non" et remplir champ suivant.
 ApiSetup=Configuration du module API
 ApiDesc=En activant ce module , Dolibarr devenir un serveur REST pour fournir des services Web divers .
-ApiProductionMode=Activer le mode de production (active l'utilisation d'un cache pour la gestion des services )
 OnlyActiveElementsAreExposed=Seuls les éléments de modules activés sont exposés
 ApiKey=Clé API
 SalariesSetup=Configuration du module salariés
+ConfFileMuseContainCustom=Installing an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Mettez en surbrillance les lignes de table lorsque déplacement de la souris passe au-dessus
 HighlightLinesColor=Mettez en surbrillance la couleur de la ligne lorsque la souris passe au-dessus (gardez vide pour ne pas mettre en évidence)
 TextTitleColor=Couleur de la page titre
diff --git a/htdocs/langs/fr_CA/banks.lang b/htdocs/langs/fr_CA/banks.lang
index 29860799f53..2ff7e2dd8c5 100644
--- a/htdocs/langs/fr_CA/banks.lang
+++ b/htdocs/langs/fr_CA/banks.lang
@@ -1,14 +1,11 @@
 # Dolibarr language file - Source file is en_US - banks
-OnlyOpenedAccount=Uniquement comptes ouverts
 SocialContributionPayment=Règlement charge sociale
 DefaultRIB=RIB par défaut
 AllRIB=Tous les RIB
 LabelRIB=Nom du RIB
 NoBANRecord=Aucun RIB enregistré
 DeleteARib=Supprimé RIB enregistré
-ConfirmDeleteRib=Etes vous sur de vouloir supprimé ce RIB ?
 RejectCheck=Chèque renvoyé
-ConfirmRejectCheck=Etes-vous sûr que vous voulez marquer ce chèque comme rejeté ?
 RejectCheckDate=Date à laquelle le chèque a été retourné
 CheckRejected=Chèque renvoyé
 CheckRejectedAndInvoicesReopened=Chèques retournés et factures rouvertes
diff --git a/htdocs/langs/fr_CA/compta.lang b/htdocs/langs/fr_CA/compta.lang
index 04202414056..dd117ca45c7 100644
--- a/htdocs/langs/fr_CA/compta.lang
+++ b/htdocs/langs/fr_CA/compta.lang
@@ -21,7 +21,6 @@ PaymentVat=Règlement TPS/TVH
 newLT1PaymentES=Nouveau règlement de RE (TVQ)
 LT1PaymentES=Règlement RE (TVQ)
 LT1PaymentsES=Règlements RE (TVQ)
-VATRefund=Sales tax refund Refund
 SocialContributionsPayments=Règlements charges sociales
 ShowVatPayment=Affiche paiement TPS/TVH
 PaySocialContribution=Payer une charge sociale
diff --git a/htdocs/langs/fr_CA/holiday.lang b/htdocs/langs/fr_CA/holiday.lang
index 6c841b2c1a4..c0339838872 100644
--- a/htdocs/langs/fr_CA/holiday.lang
+++ b/htdocs/langs/fr_CA/holiday.lang
@@ -1,2 +1,11 @@
 # Dolibarr language file - Source file is en_US - holiday
 HRM=Gestion des ressources humaines
+DateDebCP=Date de début
+DateFinCP=Date de fin
+DateCreateCP=Date création
+ApprovedCP=Approuver
+CancelCP=Annulé
+RefuseCP=Refusé
+EditCP=Éditer
+StatutCP=État
+MotifCP=Raison
diff --git a/htdocs/langs/fr_CA/main.lang b/htdocs/langs/fr_CA/main.lang
index 297953becfc..60ac3ced263 100644
--- a/htdocs/langs/fr_CA/main.lang
+++ b/htdocs/langs/fr_CA/main.lang
@@ -55,5 +55,7 @@ ConfirmDeletePicture=Etes-vous sur de vouloir supprimer cette image ?
 EMail=Courriel
 DeleteLine=Suppression de ligne
 SelectMailModel=Choisir modèle de courriel
+Select2MoreCharacter=or more characters<br /><br /><strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
+Select2MoreCharacters=or more characters<br /><br /><strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
 SearchIntoMembers=Membres
 SearchIntoExpenseReports=Note de frais
diff --git a/htdocs/langs/fr_CA/members.lang b/htdocs/langs/fr_CA/members.lang
index 669910b69ec..a7293341530 100644
--- a/htdocs/langs/fr_CA/members.lang
+++ b/htdocs/langs/fr_CA/members.lang
@@ -1,2 +1,5 @@
 # Dolibarr language file - Source file is en_US - members
+Members=Membres
 MemberStatusActiveShort=Validée
+SubscriptionLate=Retard
+ImportDataset_member_1=Membres
diff --git a/htdocs/langs/fr_CA/orders.lang b/htdocs/langs/fr_CA/orders.lang
index fb38f38845e..497d078c595 100644
--- a/htdocs/langs/fr_CA/orders.lang
+++ b/htdocs/langs/fr_CA/orders.lang
@@ -1,3 +1,16 @@
 # Dolibarr language file - Source file is en_US - orders
+StatusOrderCanceledShort=Annulé
+StatusOrderProcessedShort=Traité
+StatusOrderApprovedShort=Approuver
+StatusOrderRefusedShort=Refusé
 StatusOrderBilledShort=Facturées
+StatusOrderCanceled=Annulé
+StatusOrderProcessed=Traité
+StatusOrderApproved=Approuver
+StatusOrderRefused=Refusé
 StatusOrderBilled=Facturées
+TypeContact_commande_external_BILLING=Contact client facturation
+TypeContact_commande_external_SHIPPING=Contact client livraison
+TypeContact_order_supplier_external_BILLING=Contact fournisseur facturation
+TypeContact_order_supplier_external_SHIPPING=Contact fournisseur livraison
+OrderByFax=Télécopie
diff --git a/htdocs/langs/fr_CA/propal.lang b/htdocs/langs/fr_CA/propal.lang
index 44d4c6d4406..c883ba1ad88 100644
--- a/htdocs/langs/fr_CA/propal.lang
+++ b/htdocs/langs/fr_CA/propal.lang
@@ -1,18 +1,15 @@
 # Dolibarr language file - Source file is en_US - propal
+ProposalsDraft=Propositions brouillons
 DeleteProp=Supprimer la proposition commerciale
 ValidateProp=Valider la proposition commerciale
-ConfirmDeleteProp=Êtes-vous sûr de vouloir supprimer cette proposition commerciale ?
-ConfirmValidateProp=Êtes-vous sûr de vouloir valider cette proposition commerciale sous le nom <b>%s</b> ?
-LastPropals=Dernière %s propositions
-LastModifiedProposals=Dernière %s propositions modifiées
 AllPropals=Toutes les propositions
 SearchAProposal=Rechercher une proposition
 NoProposal=Pas de propositions
-PropalsOpened=Ouverte
 PropalStatusNotSigned=Non signée (close)
 RefProposal=Référence de la proposition commerciale
 SendPropalByMail=Envoyer proposition commerciale par courriel
 DateEndPropal=Date de validité se terminant
+SetAcceptedRefused=Accepté/refusé
 ErrorPropalNotFound=Pas de proposition %s trouvées
 AddToDraftProposals=Ajouter un brouillon de proposition
 NoDraftProposals=Pas de brouillons de propositions
@@ -20,10 +17,10 @@ CopyPropalFrom=Créer proposition commerciale en copiant proposition existante
 DefaultProposalDurationValidity=Durée de validité par défaut de la proposition commerciale (en jours)
 UseCustomerContactAsPropalRecipientIfExist=\n
 ClonePropal=Dupliquer proposition commerciale
-ConfirmClonePropal=Etes-vous sûr de vouloir dupliquer la proposition commerciale <b>%s</b> ?
-ConfirmReOpenProp=Etes-vous sûr que vous voulez rouvrir la proposition commerciale <b>%s</b> ?
 ProposalsAndProposalsLines=Proposition commerciale et des lignes
 ProposalLine=ligne de proposition
 AvailabilityPeriod=Délai de disponibilité
 SetAvailability=Indiquer le délai de disponibilité
 AvailabilityTypeAV_NOW=Immédiatement
+TypeContact_propal_external_BILLING=Contact client facturation
+ProposalsStatisticsSuppliers=Statistiques des propositions par fournisseurs
diff --git a/htdocs/langs/fr_CA/supplier_proposal.lang b/htdocs/langs/fr_CA/supplier_proposal.lang
index 62d814d6e78..1ba2ff4572d 100644
--- a/htdocs/langs/fr_CA/supplier_proposal.lang
+++ b/htdocs/langs/fr_CA/supplier_proposal.lang
@@ -1,3 +1,4 @@
 # Dolibarr language file - Source file is en_US - supplier_proposal
 SupplierProposalStatusClosed=Fermées
+SupplierProposalStatusValidatedShort=Validée
 SupplierProposalStatusClosedShort=Fermées
diff --git a/htdocs/langs/fr_CA/suppliers.lang b/htdocs/langs/fr_CA/suppliers.lang
index 6e51169216c..ee2194a28ed 100644
--- a/htdocs/langs/fr_CA/suppliers.lang
+++ b/htdocs/langs/fr_CA/suppliers.lang
@@ -2,6 +2,7 @@
 SuppliersInvoice=Factures fournisseurs
 ShowSupplierInvoice=Afficher une facture fournisseur
 ListOfSuppliers=Liste fournisseurs
+TotalBuyingPriceMinShort=Total de sous-produits par prix d'achat
 SomeSubProductHaveNoPrices=Certains sous-produits n'ont pas de prix défini
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=Ce fournisseur de référence est déjà associé à une référence : %s
 NoRecordedSuppliers=Aucun fournisseurs enregistrés
@@ -11,9 +12,6 @@ ExportDataset_fournisseur_1=Liste des factures des fournisseurs et des lignes de
 ExportDataset_fournisseur_2=Factures des fournisseurs et paiements
 ExportDataset_fournisseur_3=Commandes fournisseurs et les lignes de commande
 ApproveThisOrder=Approuver cette commande
-ConfirmApproveThisOrder=Êtes-vous sûr de vouloir approuver la commande <b>%s</b> ?
-ConfirmDenyingThisOrder=Êtes-vous sûr de vouloir refuser la commande <b>%s</b> ?
-ConfirmCancelThisOrder=Êtes-vous sûr de vouloir annuler la commande <b>%s</b> ?
 ListOfSupplierProductForSupplier=Liste des produits et des prix pour le fournisseur <b>%s</b>
 SentToSuppliers=Envoyer aux fournisseurs
 MenuOrdersSupplierToBill=Commandes de fournisseur à facturer
diff --git a/htdocs/langs/fr_CA/withdrawals.lang b/htdocs/langs/fr_CA/withdrawals.lang
index a6f0f06fc82..9efc4180748 100644
--- a/htdocs/langs/fr_CA/withdrawals.lang
+++ b/htdocs/langs/fr_CA/withdrawals.lang
@@ -1,2 +1,2 @@
 # Dolibarr language file - Source file is en_US - withdrawals
-DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Withdrawal 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.
+StatusRefused=Refusé
diff --git a/htdocs/langs/fr_CH/accountancy.lang b/htdocs/langs/fr_CH/accountancy.lang
index 22f36b26563..527f1fd139d 100644
--- a/htdocs/langs/fr_CH/accountancy.lang
+++ b/htdocs/langs/fr_CH/accountancy.lang
@@ -1,2 +1,4 @@
 # Dolibarr language file - Source file is en_US - accountancy
-ProductsBinding=Products bindings
+AccountingCategory=Accounting category
+ErrorNoAccountingCategoryForThisCountry=No accounting category available for country %s (See Home - Setup - Dictionaries)
+WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
diff --git a/htdocs/langs/fr_CH/admin.lang b/htdocs/langs/fr_CH/admin.lang
index c48c759f0fe..1bd89b517fd 100644
--- a/htdocs/langs/fr_CH/admin.lang
+++ b/htdocs/langs/fr_CH/admin.lang
@@ -1,6 +1,19 @@
 # Dolibarr language file - Source file is en_US - admin
+FileCheckDesc=This tool allows you to check the integrity of files and setup of your application, comparing each files with the official ones. 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.
+FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified, removed or added.
 AntiVirusCommandExample=Example for ClamWin: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe<br>Example for ClamAv: /usr/bin/clamscan
 AntiVirusParamExample=Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
+ModulesMarketPlaces=Find external modules...
+ThisIsAlternativeProcessToFollow=This is an alternative setup to process manually:
+UnpackPackageInDolibarrRoot=Unpack the packaged files into server directory dedicated to Dolibarr: <b>%s</b>
+UnpackPackageInModulesRoot=To deploy/install an external module, unpack the packaged files into the server directory dedicated to modules: <b>%s</b>
+NotExistsDirect=The alternative root directory is not defined to an existing directory.<br>
+InfDirAlt=Since version 3, it is possible to define an alternative root directory. This allows you to store, into a dedicated directory, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
+InfDirExample=<br>Then declare it in the file <strong>conf.php</strong><br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>If these lines are commented with "#", to enable them, just uncomment by removing the "#" character.
 ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
+ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list :<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list :<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
+Module0Desc=Users / Employees and Groups management
+DictionaryAccountancyCategory=Accounting categories
+AddExtensionThemeModuleOrOther=Deploy/install external module
 ConstDesc=This page allows you to edit all other parameters not available in previous pages. These are mostly reserved parameters for developers or advanced troubleshooting. For a list of options <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">check here</a>.
-ApiProductionMode=Enable production mode (this will activate use of a caches for services management)
+ConfFileMuseContainCustom=Installing an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
diff --git a/htdocs/langs/fr_CH/compta.lang b/htdocs/langs/fr_CH/compta.lang
deleted file mode 100644
index 4d40c57399f..00000000000
--- a/htdocs/langs/fr_CH/compta.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - compta
-VATRefund=Sales tax refund Refund
diff --git a/htdocs/langs/fr_CH/mails.lang b/htdocs/langs/fr_CH/mails.lang
deleted file mode 100644
index 455190c8587..00000000000
--- a/htdocs/langs/fr_CH/mails.lang
+++ /dev/null
@@ -1,4 +0,0 @@
-# Dolibarr language file - Source file is en_US - mails
-MailSuccessfulySent=Email successfully sent (from %s to %s)
-MailingNeedCommand=For security reason, sending an emailing is better when performed from command line. If you have one, ask your server administrator to launch the following command to send the emailing to all recipients:
-ConfirmSendingEmailing=If you can't or prefer sending them with your www browser, please confirm you are sure you want to send emailing now from your browser?
diff --git a/htdocs/langs/fr_CH/main.lang b/htdocs/langs/fr_CH/main.lang
index 2e691473326..3cac612b5fd 100644
--- a/htdocs/langs/fr_CH/main.lang
+++ b/htdocs/langs/fr_CH/main.lang
@@ -19,3 +19,5 @@ FormatDateHourShort=%m/%d/%Y %I:%M %p
 FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p
 FormatDateHourTextShort=%b %d, %Y, %I:%M %p
 FormatDateHourText=%B %d, %Y, %I:%M %p
+Select2MoreCharacter=or more characters<br /><br /><strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
+Select2MoreCharacters=or more characters<br /><br /><strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
diff --git a/htdocs/langs/fr_CH/members.lang b/htdocs/langs/fr_CH/members.lang
deleted file mode 100644
index fcd4f3eb8d7..00000000000
--- a/htdocs/langs/fr_CH/members.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - members
-MemberStatusActiveLate=subscription expired
diff --git a/htdocs/langs/fr_CH/orders.lang b/htdocs/langs/fr_CH/orders.lang
deleted file mode 100644
index f719db62ca8..00000000000
--- a/htdocs/langs/fr_CH/orders.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - orders
-StatusOrderReceivedAllShort=Everything received
-StatusOrderReceivedAll=Everything received
diff --git a/htdocs/langs/fr_CH/withdrawals.lang b/htdocs/langs/fr_CH/withdrawals.lang
deleted file mode 100644
index a6f0f06fc82..00000000000
--- a/htdocs/langs/fr_CH/withdrawals.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - withdrawals
-DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Withdrawal 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.
diff --git a/htdocs/langs/fr_FR/accountancy.lang b/htdocs/langs/fr_FR/accountancy.lang
index f23668a0a88..4385ab771f5 100644
--- a/htdocs/langs/fr_FR/accountancy.lang
+++ b/htdocs/langs/fr_FR/accountancy.lang
@@ -194,6 +194,8 @@ ChangeBinding=Changer les liens
 
 ## Admin
 ApplyMassCategories=Application en masse des catégories
+AddAccountFromBookKeepingWithNoCategories=Add acccount already used with no categories
+CategoryDeleted=Category for the accounting account has been removed
 
 ## Export
 Exports=Exports
@@ -209,6 +211,7 @@ Modelcsv_ciel=Export vers Sage Ciel Compta ou Compta Evolution
 Modelcsv_quadratus=Export vers Quadratus QuadraCompta
 Modelcsv_ebp=Export vers EBP
 Modelcsv_cogilog=Export vers Cogilog
+ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
 InitAccountancy=Initialisation comptabilité
diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index 92881c8a571..d7f1314c517 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -9,17 +9,20 @@ VersionDevelopment=Développement
 VersionUnknown=Inconnue
 VersionRecommanded=Recommandé
 FileCheck=Vérification de l'intégrité des fichiers
-FileCheckDesc=Cet outil vous permet de vérifier l'intégrité des fichiers de votre application, en comparant chaque fichier avec les fichiers officiels. Vous pouvez utiliser cet outil pour détecter si certains fichiers ont été modifiés par un pirate informatique par exemple.
+FileCheckDesc=Cet outil permet de vérifier l'intégrité des fichiers et le bon déroulement de l'installation de l'application en comparant les nouveaux fichiers aux anciens. La valeur de certains paramètres d'installation peut aussi être vérifiée. Il est possible d'utiliser cet outil pour vérifier si des fichiers ont été piratés par exemple.
 FileIntegrityIsStrictlyConformedWithReference=L'intégrité des fichiers a été vérifiée
-FileIntegritySomeFilesWereRemovedOrModified=Le vérification de l'intégrité des fichiers a échoué. Des fichiers ont été modifiés ou déplacés.
+FileIntegrityIsOkButFilesWereAdded=La vérification de l'intégrité des fichiers a été effectuée avec succès. cependant, des fichiers ont été ajoutés.
+FileIntegritySomeFilesWereRemovedOrModified=La vérification de l'intégrité des fichiers a échoué. Des fichiers ont été modifiés, déplacés ou ajoutés.
 GlobalChecksum=Vérification
 MakeIntegrityAnalysisFrom=Faire l'analyse de l'intégrité des fichiers de l'application depuis
 LocalSignature=La signature locale intégrée (moins fiable)
 RemoteSignature=La signature sur le serveur distant (plus fiable)
 FilesMissing=Fichiers manquants
 FilesUpdated=Fichiers modifiés
+FilesModified=Fichiers modifiés
+FilesAdded=Fichiers ajoutés
 FileCheckDolibarr=Vérifier l'intégrité des fichiers
-AvailableOnlyOnPackagedVersions=Le fichier local pour vérification d'intégrité est disponible uniquement lorsque l'application est installé à partir d'un package certifié
+AvailableOnlyOnPackagedVersions=Le fichier local de vérification de l'intégrité de l'installation n'est disponible que depuis un package d'installation officiel
 XmlNotFound=Fichier Xml d'intégrité de Dolibarr non trouvé
 SessionId=ID Session
 SessionSaveHandler=Modalité de sauvegarde des sessions
@@ -188,7 +191,9 @@ BoxesDesc=Les widgets sont des composants montrant des informations que vous pou
 OnlyActiveElementsAreShown=Seuls les éléments en rapport avec un <a href="%s">module actif</a> sont présentés.
 ModulesDesc=Les modules déterminent les fonctionnalités qui seront actives sur l'environnement. Certains modules nécessitent le paramétrage de permissions utilisateurs à définir suite à l'installation du module. Cliquez sur les boutons on/off pour activer/désactiver les modules.
 ModulesMarketPlaceDesc=D'autres modules/extensions sont disponibles en téléchargement sur des sites externes sur Internet...
-ModulesMarketPlaces=Plus de modules...
+ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
+ModulesMarketPlaces=Rechercher les modules externes
+GoModuleSetupArea=To deploy/install a new module, go onto the Module setup area at <a href="%s">%s</a>.
 DoliStoreDesc=DoliStore, la place de marché officielle des modules et extensions complémentaires pour Dolibarr ERP/CRM
 DoliPartnersDesc=Liste de quelques sociétés qui peuvent fournir/développer des modules ou fonctions sur mesure  (Remarque: Toute société Open Source connaissant le langage PHP peut fournir du développement spécifique)
 WebSiteDesc=Sites fournisseurs à consulter pour trouver plus de modules...
@@ -280,20 +285,21 @@ MenuHandlers=Gestionnaires de menu
 MenuAdmin=Édition menu
 DoNotUseInProduction=Ne pas utiliser en production
 ThisIsProcessToFollow=Procédure d'installation
-ThisIsAlternativeProcessToFollow=Voici une procédure de configuration alternative 
+ThisIsAlternativeProcessToFollow=Il s'agit d'une procédure alternative d'installation à effectuer manuellement :
 StepNb=Étape %s
 FindPackageFromWebSite=Recherche le paquet qui répond à votre besoin (par exemple sur le site web %s).
 DownloadPackageFromWebSite=Télécharger le package (par exemple depuis le site web officiel %s)
-UnpackPackageInDolibarrRoot=Décompressez le fichier du package dans le répertoire du serveur Dolibarr dédié aux modules externes: <b>%s</b>
-SetupIsReadyForUse=L'installation est terminée et Dolibarr est prêt à être utilisé avec le nouveau composant.
-NotExistsDirect=Il n'y a pas répertoire alternatif.<br>
-InfDirAlt=Depuis la version 3, il est possible de définir un répertoire alternatif qui vous permet de stocker dans le même endroit les modules et thèmes personnalisés.<br>Il suffit de créer un répertoire à la racine de Dolibarr (par exemple : custom).<br>
-InfDirExample=<br>Ensuite, déclarer dans le fichier conf.php:<br> $dolibarr_main_url_root_alt='http://monserveur/custom'<br>$dolibarr_main_document_root_alt='/repertoire/de/dolibarr/htdocs/custom'<br>*Ces lignes sont commentées par "#". Pour les décommenter, il suffit de supprimer le caractère.
+UnpackPackageInDolibarrRoot=Décompresser le dossier dans le dossier du serveur dédié à Dolibarr : <b>%s</b>
+UnpackPackageInModulesRoot=Pour installer un module externe, décompresser ses fichiers dans le répertoire dédié aux modules : <b>%s</b>
+SetupIsReadyForUse=L"installation du module est terminée. Il est cependant nécessaire de procéer à son activation et à son paramétrage : <a href="%s">%s</a>
+NotExistsDirect=Le dossier racine alternatif n'est pas défini.<br>
+InfDirAlt=Depuis les versions 3, il est possible de définir un dossier racine alternatif. Cela permet d'installer modules et thèmes additionnels dans un répertoire dédié.<br/>Créer un dossier racine alternatif à Dolibarr (ex : custom).<br/>
+InfDirExample=<br>Ensuite, déclarer dans le fichier <strong>conf.php</strong> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br> Si ces lignes sont commentées avec un symbole "#" ou "//", les activer en supprimant le caractère ""#".
 YouCanSubmitFile=Pour cette étape, vous pouvez soumettre votre package en utilisant cet outil: Sélectionner le fichier du module
 CurrentVersion=Version actuelle de Dolibarr
 CallUpdatePage=Aller à la page de mise à jour de la structure et des données de la base : %s.
 LastStableVersion=Dernière version stable disponible
-LastActivationDate=Dernière date d'activation
+LastActivationDate=Date de dernière activation
 UpdateServerOffline=Serveur de mise à jour hors ligne
 GenericMaskCodes=Vous pouvez saisir tout masque de numérotation. Dans ce masque, les balises suivantes peuvent être utilisées:<br><b>{000000}</b> correspond à un numéro qui sera incrémenté à chaque %s. Mettre autant de zéro que la longueur désirée du compteur. Le compteur sera complété par des 0 à gauche afin d'avoir autant de zéro que dans le masque.<br><b>{000000+000}</b> idem que précédemment mais un décalage correspondant au nombre à droite du + est appliqué dès la première %s.<br><b>{000000@x}</b> idem que précédemment mais le compteur est remis à zéro le xème mois de l'année (x entre 1 et 12, ou 0 pour utiliser le mois de début d'exercice fiscal défini dans votre configuration, ou 99 pour remise à zéro chaque mois). Si cette option est utilisée et x vaut 2 ou plus, alors la séquence {yy}{mm} ou {yyyy}{mm} est obligatoire. <br><b>{dd}</b> jour (01 à 31).<br><b>{mm}</b> mois (01 à 12).<br><b>{yy}</b>, <b>{yyyy}</b> ou <b>{y}</b> année sur 2, 4 ou 1 chiffres.<br>
 GenericMaskCodes2=<b>{cccc}</b> le code client sur n lettres<br><b>{cccc000}</b> le code client sur n lettres est suivi d'un compteur propre au client. Ce compteur propre au client est aussi remis à zéro en même temps que le compteur global.<br><b>{tttt}</b> Le code du type de tiers sur n caractères (voir dictionnaires-types de tiers).<br>
@@ -376,11 +382,11 @@ ExtrafieldCheckBox=Case à cocher
 ExtrafieldRadio=Bouton radio
 ExtrafieldCheckBoxFromList= Liste à cocher issue d'une table
 ExtrafieldLink=Lier à un objet
-ExtrafieldParamHelpselect=La liste doit être de la forme clef,valeur<br><br> par exemple : <br>1,valeur1<br>2,valeur2<br>3,valeur3<br>...<br><br>Pour que la liste soit dépendante d'une autre :<br>1,valeur1|code_liste_parent:clef_parent<br>2,valeur2|code_liste_parent:clef_parent
+ExtrafieldParamHelpselect=Les paramètres d'une liste fonctionnent comme des clés,<br><br> par exemple :\n<br>1, valeur1<br>2,valeur2<br>3,valeur3<br>...<br><br>Pour afficher unne liste dépendant d'une autre liste d'attributs supplémentaires :\n<br>1, valeur1|options_<i>code_liste_parente</i>:clé_parente<br>\n2,valeur2|option_<i>Code_liste_parente</i>:clé_parente
 ExtrafieldParamHelpcheckbox=La liste doit être de la forme clef,valeur<br><br> par exemple : <br>1,valeur1<br>2,valeur2<br>3,valeur3<br>...
 ExtrafieldParamHelpradio=La liste doit être de la forme clef,valeur<br><br> par exemple : <br>1,valeur1<br>2,valeur2<br>3,valeur3<br>...
-ExtrafieldParamHelpsellist=Les paramètres de la liste viennent de la table<br>Syntax : table_name:label_field:id_field::filter<br>Exemple : c_typent:libelle:id::filter<br><br>Le filtre peut être un simple test (e.g. actif=1) pour seulement montrer la valeur active<br>Vous pouvez aussi utiliser $ID$ dans le filtre qui est le ID actuel de l'objet<br>Pour faire un SELECT dans le filtre, utilisez $SEL$<br>Si vous voulez filtrer sur un extrafield, utilisez la syntaxe extra.fieldcode=... (ou fieldcode est le code de l'extrafield)<br><br>Pour avoir une liste qui dépend d'un autre:<br>\nc_typent:libelle:id:parent_list_code|parent_column:filter
-ExtrafieldParamHelpchkbxlst=Les paramètres de la liste viennent de la table<br>Syntax : table_name:label_field:id_field::filter<br>Exemple : c_typent:libelle:id::filter<br><br>Le filtre peut être un simple test (e.g. actif=1) pour seulement montrer la valeur active<br>Vous pouvez aussi utiliser $ID$ dans le filtre qui est le ID actuel de l'objet<br>Pour faire un SELECT dans le filtre, utilisez $SEL$<br>Si vous voulez filtrer sur un extrafield, utilisez la syntaxe extra.fieldcode=... (ou fieldcode est le code de l'extrafield)<br><br>Pour avoir une liste qui dépend d'un autre:<br>\nc_typent:libelle:id:parent_list_code|parent_column:filter
+ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Les paramètres doivent être ObjectName: Classpath<br>Syntaxe: ObjectName:Classpath<br>Exemple: Société:societe/class/societe.class.php
 LibraryToBuildPDF=Bibliothèque utilisée pour la génération des PDF
 WarningUsingFPDF=Attention : votre fichier <b>conf.php</b> contient la directive <b>dolibarr_pdf_force_fpdf=1</b>. Cela signifie que vous utilisez la librairie FPDF pour générer vos fichiers PDF. Cette librairie est ancienne et ne couvre pas de nombreuses fonctionnalités (Unicode, transparence des images, langues cyrilliques, arabes ou asiatiques...), aussi vous pouvez rencontrer des problèmes durant la génération des PDF.<br>Pour résoudre cela et avoir une prise en charge complète de PDF, vous pouvez télécharger la <a href="http://www.tcpdf.org/" target="_blank">bibliothèque TCPDF</a> puis commenter ou supprimer la ligne <b>$dolibarr_pdf_force_fpdf=1</b>, et ajouter à la place <b>$dolibarr_lib_TCPDF_PATH='chemin_vers_TCPDF'</b>
@@ -415,10 +421,10 @@ ModuleCompanyCodeDigitaria=Renvoie un code comptable composé suivant le code ti
 Use3StepsApproval=Par défaut, les commandes fournisseurs nécessitent d'être créées et approuvées en deux étapes/utilisateurs (une étape/utilisateur pour créer et une étape/utilisateur pour approuver. Si un utilisateur à les deux permissions, ces deux actions sont effectuées en une seule fois). Cette option ajoute la nécessité d'une approbation par une troisième étape/utilisateur, si le montant de la commande est supérieur au montant d'une valeur définie (soit 3 étapes nécessaire: 1 =Validation, 2=Première approbation et 3=seconde approbation si le montant l'exige).<br>Laissez le champ vide si une seule approbation (2 étapes) sont suffisantes, placez une valeur très faibe (0.1) si une deuxième approbation (3 étapes) est toujours exigée.
 UseDoubleApproval=Activer l'approbation en trois étapes si le montant HT est supérieur à...
 WarningPHPMail=Attention : Certains serveurs de messagerie (Yahoo) ne permettent pas l'envoi d'e-mails depuis un autre serveur que le leur si l'adresse d'envoi utilisée est une adresse Yahoo (myemail@yahoo.fr, myemail@yahoo.com...) Votre configuration actuelle utilise le serveur de l'application pour l'envoi d'e-mails. Le serveur de certains destinataires (compatibles avec le protocole restrictif DMARC) demanderont aux serveurs Yahoo l'autorisation de recevoir les e-mails et Yahoo la refusera car le serveur ne lui appartient pas. Une partie de vos e-mails envoyés risquent de ne pas être reçus.\n<br/>Si votre serveur e-mail impose cette restriction, vous devrez modifier votre configuration et opter pour la méthode d'envoi SMTP en saisissant les identifiants SMTP fournis par votre FAI
-
+ClickToShowDescription=Cliquer pour afficher la description
 # Modules
 Module0Name=Utilisateurs & groupes
-Module0Desc=Gestion des utilisateurs et des groupes
+Module0Desc=Gestion des utilisateurs et groupes
 Module1Name=Tiers
 Module1Desc=Gestion des tiers (sociétés, particuliers) et contacts
 Module2Name=Commercial
@@ -520,7 +526,7 @@ Module2200Desc=Active l'usage d'expressions mathématiques
 Module2300Name=Travaux programmés
 Module2300Desc=Travaux planifiées
 Module2400Name=Événements/Agenda
-Module2400Desc=Suivre les événements terminés et à venir. Permet  à l'application de journaliser les événements automatiques pour des raisons de suivi ou d'enregistrer manuellement événements ou rendez-vous.
+Module2400Desc=Suivre les événements terminés et à venir. Permet à l'application de journaliser les événements automatiques pour des raisons de suivi ou d'enregistrer manuellement événements ou rendez-vous.
 Module2500Name=Gestion électronique de documents
 Module2500Desc=Permet de stocker et administrer une base de documents
 Module2600Name=API/Web services (serveur SOAP)
@@ -689,7 +695,7 @@ PermissionAdvanced253=Créer/modifier les utilisateurs internes/externes et leur
 Permission254=Créer/modifier les utilisateurs externes seulement
 Permission255=Modifier le mot de passe des autres utilisateurs
 Permission256=Supprimer ou désactiver les autres utilisateurs
-Permission262=Étendre l'accès à tous les tiers (Pas seulement ceux pour lesquels l'utilisateur est représentant commercial). Ineffectif pour les utilisateurs externes (Toujours limité à eux-mêmes pour les propositions commerciales, commandes, factures, contrats, etc.). Ineffectif pour les projets (Seules les règles de permissions, visibilité et affectation comptent pour les projets).
+Permission262=Etendre l'accès à tous les utilisateurs (pas seulement ceux dont l'utilisateur est enregistré en tant que commercial). <br>Non effectif pour les utilisateurs externes (toujours limités à eux-mêmes sur les propositions commerciales, commandes, factures, contrats, etc).<br>Non effectif sur les projets (seules s'appliquent les permissions propres au module projets, et les règles de visibilité et d'assignation des tâches)
 Permission271=Consulter le chiffre d'affaires
 Permission272=Consulter les factures
 Permission273=Émettre les factures
@@ -891,7 +897,7 @@ Offset=Décalage
 AlwaysActive=Toujours actif
 Upgrade=Mise à jour
 MenuUpgrade=Mise à jour / extension
-AddExtensionThemeModuleOrOther=Ajout d'extension (thème, module, ...)
+AddExtensionThemeModuleOrOther=Installer le module externe
 WebServer=Serveur Web
 DocumentRootServer=Répertoire racine des pages web
 DataRootServer=Répertoire racine des fichiers de données
@@ -1165,10 +1171,6 @@ FreeLegalTextOnOrders=Mention complémentaire sur les commandes
 WatermarkOnDraftOrders=Filigrane sur les brouillons de commandes (aucun si vide)
 ShippableOrderIconInList=Ajouter une icône dans la liste des commandes qui indique si la commande est expédiable.  
 BANK_ASK_PAYMENT_BANK_DURING_ORDER=Demander le compte bancaire cible durant la commande
-##### Clicktodial #####
-ClickToDialSetup=Configuration du module Click To Dial
-ClickToDialUrlDesc=URL appelée lors d'un clic sur le pictogramme téléphone. Dans l'URL, vous pouvez utiliser les balises<br><b>__PHONETO__</b> qui sera remplacée par le téléphone de l'appelé<br><b>__PHONEFROM__</b> qui sera remplacée par le téléphone de l'appelant (le votre, défini sur votre fiche utilisateur)<br><b>__LOGIN__</b> qui sera remplacée par votre identifiant clicktodial (défini sur votre fiche utilisateur)<br><b>__PASS__</b> qui sera remplacée par votre mot de passe clicktodial (défini sur votre fiche utilisateur).
-##### Bookmark4u #####
 ##### Interventions #####
 InterventionsSetup=Configuration du module Interventions
 FreeLegalTextOnInterventions=Mention complémentaire sur les fiches d'intervention
@@ -1395,7 +1397,7 @@ SendingsSetup=Configuration du module Expédition/Livraison
 SendingsReceiptModel=Modèles de bordereau d'expédition
 SendingsNumberingModules=Modèles de numérotation des expéditions
 SendingsAbility=Prise en charge des bons d'expédition pour les livraisons clients
-NoNeedForDeliveryReceipts=Dans la plupart des cas, ce sont les bons d'expédition/livraison (liste des produits à envoyer par le transporteur) qui font office de bons de réception et qui sont signés par le client. La gestion des bons de réception fait donc double emploi et sera rarement activée.
+NoNeedForDeliveryReceipts=Dans le plupart des cas, la fiche expédition est utilisée en tant que bon d'expédition (liste des produits expédiés) et bon de livraison (signée par le client). Le bon de réception est un doublon de fonctionnalité et est rarement utilisé.
 FreeLegalTextOnShippings=Mention complémentaire sur les expéditions
 ##### Deliveries #####
 DeliveryOrderNumberingModules=Modèle de numérotation des bons de réception client
@@ -1477,7 +1479,9 @@ AGENDA_DEFAULT_FILTER_STATUS=Régler automatiquement le statut d'événement dan
 AGENDA_DEFAULT_VIEW=Quel onglet voulez-vous voir ouvrir par défaut quand on choisit le menu Agenda
 AGENDA_NOTIFICATION=Activer les notifications d'événements dans le navigateur utilisateur quand la date de l'événement est atteinte (Chaque utilisateur peut refuser ceci au moment de la question de confirmation posée par le navigateur).
 AGENDA_NOTIFICATION_SOUND=Activer les notifications sonores.
-##### ClickToDial #####
+##### Clicktodial #####
+ClickToDialSetup=Configuration du module Click To Dial
+ClickToDialUrlDesc=URL appelée lors d'un clic sur le pictogramme téléphone. Dans l'URL, vous pouvez utiliser les balises<br><b>__PHONETO__</b> qui sera remplacée par le téléphone de l'appelé<br><b>__PHONEFROM__</b> qui sera remplacée par le téléphone de l'appelant (le votre, défini sur votre fiche utilisateur)<br><b>__LOGIN__</b> qui sera remplacée par votre identifiant clicktodial (défini sur votre fiche utilisateur)<br><b>__PASS__</b> qui sera remplacée par votre mot de passe clicktodial (défini sur votre fiche utilisateur).
 ClickToDialDesc=Ce module permet de rendre un numéro de téléphone cliquable. Un clique sur cet icone fera votre téléphone appeler le numéro cliqué. Ce module peut être utilisé pour appeler un système de centre d'appel à partir de Dolibarr. 
 ClickToDialUseTelLink=Utiliser un lien «Tel.» sur les numéros de téléphone
 ClickToDialUseTelLinkDesc=Utilisez cette méthode si vos utilisateurs ont un softphone ou une interface de logiciel installé sur un même ordinateur que le navigateur, et a appelé lorsque vous cliquez sur un lien dans votre navigateur qui commencent par "tel:". Si vous avez besoin d'une solution de serveur complet (pas besoin d'installation locale du logiciel), vous devez définir ce "Non" et remplissez champ suivant.
@@ -1505,10 +1509,11 @@ EndPointIs=Les clients SOAP doivent envoyer leur requêtes vers le point de sort
 ##### API ####
 ApiSetup=Configuration du module API REST
 ApiDesc=En activant ce module, Dolibarr devient aussi serveur de services API de type REST
-ApiProductionMode=Activer le mode « production » (ceci activera l'utilisation du cache pour la gestion des services)
+ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
 ApiExporerIs=Vous pouvez accéder aux API par l'URL
 OnlyActiveElementsAreExposed=Seuls les éléments en rapport avec un module actif sont présentés.
 ApiKey=Clé pour l'API
+WarningAPIExplorerDisabled=The API explorer has been disabled. API explorer is not required to provide API services. It is a tool for developer to find/test REST APIs. If you need this tool, go into setup of module API REST to activate it.
 ##### Bank #####
 BankSetupModule=Configuration du module Banque
 FreeLegalTextOnChequeReceipts=Mention complémentaire sur les bordereaux de remises de chèques
@@ -1577,7 +1582,7 @@ BackupDumpWizard=Assistant de génération d'un fichier de sauvegarde de la base
 SomethingMakeInstallFromWebNotPossible=L'installation de module externe est impossible depuis l'interface web pour la raison suivante : 
 SomethingMakeInstallFromWebNotPossible2=Pour cette raison, le processus de mise à jour décrit ici est uniquement une série de manipulations que seul un utilisateur ayant des droits privilégiés peut faire
 InstallModuleFromWebHasBeenDisabledByFile=L'installation de module externe depuis l'application a été désactivé par l'administrator. Vous devez lui demander de supprimer le fichier <strong>%s</strong> pour permettre cette fonctionnalité.
-ConfFileMuseContainCustom=L'installation d'un module externe nécessite son enregistrement dans le répertoire <strong>%s</strong> et le condiguration du fichier <strong>conf/conf.php</strong> afin d'activer les lignes <br/><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
+ConfFileMuseContainCustom=L'installation d'un module externe nécessite de le placer dans le répertoire <strong>%s</strong>. Pour que ce répertoire soit reconnu par Dolibarr, il est nécessaire de paramétrer le fichier de configuration <strong>conf/conf.php</strong> pour lui ajouter les lignes suivantes :<br>\n<strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Mettez en surbrillance les lignes de la table lorsque la souris passe au-dessus
 HighlightLinesColor=Mettez en surbrillance les lignes de la table lorsque la souris passe au-dessus (garder vide pour ne pas avoir de surbrillance)
 TextTitleColor=Couleur du titre des pages
@@ -1607,6 +1612,7 @@ FixTZ=Correction du fuseau horaire
 FillFixTZOnlyIfRequired=Exemple : +2 (ne renseigner que si vous rencontrez des problèmes)
 ExpectedChecksum=Somme de contrôle attendue
 CurrentChecksum=Somme de contrôle actuelle
+ForcedConstants=Required constant values
 MailToSendProposal=Pour l'envoi de proposition commerciale client
 MailToSendOrder=Pour l'envoi de commande client
 MailToSendInvoice=Pour l'envoi de facture client
@@ -1615,6 +1621,7 @@ MailToSendIntervention=Pour l'envoi de fiche intervention
 MailToSendSupplierRequestForQuotation=Pour l'envoi de demande de prix fournisseur
 MailToSendSupplierOrder=Pour l'envoi de commande fournisseur
 MailToSendSupplierInvoice=Pour l'envoi de facture fournisseur
+MailToSendContract=Envoyer un contrat
 MailToThirdparty=Envoy email depuis la fiche Tiers
 ByDefaultInList=Afficher par défaut sur les vues listes
 YouUseLastStableVersion=Vous utilisez la dernière version stable
diff --git a/htdocs/langs/fr_FR/banks.lang b/htdocs/langs/fr_FR/banks.lang
index ce32d962af6..dd28ee72266 100644
--- a/htdocs/langs/fr_FR/banks.lang
+++ b/htdocs/langs/fr_FR/banks.lang
@@ -74,13 +74,13 @@ Conciliate=Rapprocher
 Conciliation=Rapprochement
 ReconciliationLate=Rapprochement en retard
 IncludeClosedAccount=Inclure comptes fermés
-OnlyOpenedAccount=Seulement les comptes ouverts
+OnlyOpenedAccount=Uniquement comptes ouverts
 AccountToCredit=Compte à créditer
 AccountToDebit=Compte à débiter
 DisableConciliation=Désactiver la fonction de rapprochement pour ce compte
 ConciliationDisabled=Fonction rapprochement désactivée
 LinkedToAConciliatedTransaction=Lié à une écriture rapprochée
-StatusAccountOpened=Ouvert
+StatusAccountOpened=Ouverte
 StatusAccountClosed=Fermé
 AccountIdShort=Numéro
 LineRecord=Ecriture
diff --git a/htdocs/langs/fr_FR/bills.lang b/htdocs/langs/fr_FR/bills.lang
index f0473d737fa..51f190dd42c 100644
--- a/htdocs/langs/fr_FR/bills.lang
+++ b/htdocs/langs/fr_FR/bills.lang
@@ -5,9 +5,9 @@ BillsCustomers=Factures clients
 BillsCustomer=Facture client
 BillsSuppliers=Factures fournisseurs
 BillsCustomersUnpaid=Factures clients impayées
-BillsCustomersUnpaidForCompany=Factures clients impayées pour %s
+BillsCustomersUnpaidForCompany=Unpaid customer invoices for %s
 BillsSuppliersUnpaid=Factures fournisseurs impayées
-BillsSuppliersUnpaidForCompany=Factures fournisseurs impayées pour %s
+BillsSuppliersUnpaidForCompany=Unpaid supplier invoices for %s
 BillsLate=Retards de paiement
 BillsStatistics=Statistiques factures clients
 BillsStatisticsSuppliers=Statistiques factures fournisseurs
@@ -63,7 +63,7 @@ paymentInInvoiceCurrency=Dans la devise des factures
 PaidBack=Remboursé
 DeletePayment=Supprimer le paiement
 ConfirmDeletePayment=Êtes-vous sûr de vouloir supprimer ce paiement ?
-ConfirmConvertToReduc=Voulez-vous convertir cet avoir ou acompte en réduction future ?<br>Le montant sera alors stocké en réduction fixe en attente pour le client. Cette dernière pourra être utilisée pour réduire le montant d'une facture en cours ou prochaine de ce client.
+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.
 SupplierPayments=Règlements fournisseurs
 ReceivedPayments=Règlements reçus
 ReceivedCustomersPayments=Règlements reçus du client
@@ -78,6 +78,7 @@ PaymentMode=Mode de règlement
 PaymentTypeDC=Carte débit/crédit
 PaymentTypePP=PayPal
 IdPaymentMode=Type de paiement (id)
+CodePaymentMode=Payment type (code)
 LabelPaymentMode=Type de paiement (libellé)
 PaymentModeShort=Mode de règlement
 PaymentTerm=Condition de règlement
@@ -102,9 +103,10 @@ SearchACustomerInvoice=Rechercher une facture client
 SearchASupplierInvoice=Rechercher une facture fournisseur
 CancelBill=Annuler une facture
 SendRemindByMail=Envoyer rappel
-DoPayment=Saisir règlement
-DoPaymentBack=Émettre remboursement
+DoPayment=Enter payment
+DoPaymentBack=Enter refund
 ConvertToReduc=Convertir en réduction future
+ConvertExcessReceivedToReduc=Convert excess received into future discount
 EnterPaymentReceivedFromCustomer=Saisie d'un règlement reçu du client
 EnterPaymentDueToCustomer=Saisie d'un remboursement d'un avoir client
 DisabledBecauseRemainderToPayIsZero=Désactivé car reste à payer est nul
@@ -151,14 +153,14 @@ NoQualifiedRecurringInvoiceTemplateFound=Pas de facture récurrente qualifiée p
 FoundXQualifiedRecurringInvoiceTemplate=%s facture(s) récurrente(s) qualifiées pour la génération
 NotARecurringInvoiceTemplate=Pas une facture récurrente
 NewBill=Nouvelle facture
-LastBills=Les %s dernières factures
-LastCustomersBills=Les %s dernières factures clients
-LastSuppliersBills=Les %s dernières factures fournisseurs
+LastBills=Latest %s invoices
+LastCustomersBills=Latest %s customer invoices
+LastSuppliersBills=Latest %s supplier invoices
 AllBills=Toutes les factures
 OtherBills=Autres factures
 DraftBills=Factures brouillons
-CustomersDraftInvoices=Factures clients brouillons
-SuppliersDraftInvoices=Factures fournisseurs brouillons
+CustomersDraftInvoices=Customer draft invoices
+SuppliersDraftInvoices=Supplier draft invoices
 Unpaid=Impayées
 ConfirmDeleteBill=Êtes-vous sûr de vouloir supprimer cette facture ?
 ConfirmValidateBill=Êtes-vous sûr de vouloir valider cette facture sous la référence <b>%s</b> ?
@@ -272,6 +274,7 @@ Deposit=Acompte
 Deposits=Acomptes
 DiscountFromCreditNote=Remise issue de l'avoir %s
 DiscountFromDeposit=Paiements issus de l'acompte %s
+DiscountFromExcessReceived=Payments from excess received of invoice %s
 AbsoluteDiscountUse=Ce type de crédit ne peut s'utiliser que sur une facture non validée
 CreditNoteDepositUse=La facture doit être validée pour pouvoir utiliser ce type de crédit
 NewGlobalDiscount=Nouvelle ligne de déduction
@@ -279,8 +282,8 @@ NewRelativeDiscount=Nouvelle remise relative
 NoteReason=Note/Motif
 ReasonDiscount=Motif
 DiscountOfferedBy=Accordé par
-DiscountStillRemaining=Remises restant en cours
-DiscountAlreadyCounted=Remises déjà appliquées
+DiscountStillRemaining=Discounts available
+DiscountAlreadyCounted=Discounts already consumed
 BillAddress=Adresse de facturation
 HelpEscompte=Un <b>escompte</b> est une remise accordée, sur une facture donnée, à un client car ce dernier a réalisé son règlement bien avant l'échéance.
 HelpAbandonBadCustomer=Ce montant a été abandonné (client jugé mauvais payeur) et est considéré comme une perte exceptionnelle.
@@ -333,6 +336,8 @@ InvoiceAutoValidate=Valider les factures automatiquement
 GeneratedFromRecurringInvoice=Généré depuis la facture modèle récurrente %s
 DateIsNotEnough=Date pas encore atteinte
 InvoiceGeneratedFromTemplate=Facture %s généré depuis la facture modèle récurrente %s
+WarningInvoiceDateInFuture=Warning, the invoice date is higher than current date
+WarningInvoiceDateTooFarInFuture=Warning, the invoice date is too far from current date
 # PaymentConditions
 Statut=État
 PaymentConditionShortRECEP=A réception
@@ -428,7 +433,7 @@ ChequeDeposits=Dépôts de chèques
 Cheques=Chèques
 DepositId=Id dépôt
 NbCheque=Nombre de chèques
-CreditNoteConvertedIntoDiscount=Cet avoir ou acompte a été converti en %s
+CreditNoteConvertedIntoDiscount=This %s has been converted into %s
 UsBillingContactAsIncoiveRecipientIfExist=Utiliser l'adresse du contact facturation client de la facture plutôt que l'adresse du tiers comme destinataire des factures
 ShowUnpaidAll=Afficher tous les impayés
 ShowUnpaidLateOnly=Afficher uniquement les factures impayées en retard
diff --git a/htdocs/langs/fr_FR/boxes.lang b/htdocs/langs/fr_FR/boxes.lang
index 0f70293e3d1..3e6d6795162 100644
--- a/htdocs/langs/fr_FR/boxes.lang
+++ b/htdocs/langs/fr_FR/boxes.lang
@@ -25,8 +25,8 @@ BoxTitleLastSuppliers=les %s derniers fournisseurs enregistrés
 BoxTitleLastModifiedSuppliers=Les %s derniers fournisseurs modifiés
 BoxTitleLastModifiedCustomers=Les %s derniers clients modifiés
 BoxTitleLastCustomersOrProspects=Les %s derniers clients ou prospects
-BoxTitleLastCustomerBills=Les%s dernières factures clients
-BoxTitleLastSupplierBills=Les %s dernières factures fournisseurs
+BoxTitleLastCustomerBills=Latest %s customer invoices
+BoxTitleLastSupplierBills=Latest %s supplier invoices
 BoxTitleLastModifiedProspects=Les %s derniers prospects modifiés
 BoxTitleLastModifiedMembers=Les %s derniers adhérents
 BoxTitleLastFicheInter=Les %s dernières interventions modifiées
@@ -51,12 +51,12 @@ ClickToAdd=Cliquer ici pour ajouter.
 NoRecordedCustomers=Pas de client enregistré
 NoRecordedContacts=Pas de contact enregistré
 NoActionsToDo=Pas d'événements à réaliser
-NoRecordedOrders=Pas de commande client enregistrée
+NoRecordedOrders=No recorded customer orders
 NoRecordedProposals=Pas de proposition commerciale enregistrée
-NoRecordedInvoices=Pas de facture client enregistrée
-NoUnpaidCustomerBills=Pas de facture client impayée
-NoUnpaidSupplierBills=Pas de facture fournisseur impayée
-NoModifiedSupplierBills=Pas de facture fournisseur modifiée
+NoRecordedInvoices=No recorded customer invoices
+NoUnpaidCustomerBills=No unpaid customer invoices
+NoUnpaidSupplierBills=No unpaid supplier invoices
+NoModifiedSupplierBills=No recorded supplier invoices
 NoRecordedProducts=Pas de produit/service enregistré
 NoRecordedProspects=Pas de prospect enregistré
 NoContractedProducts=Pas de produit/service contracté
diff --git a/htdocs/langs/fr_FR/cashdesk.lang b/htdocs/langs/fr_FR/cashdesk.lang
index daa887540c8..0227aee95ea 100644
--- a/htdocs/langs/fr_FR/cashdesk.lang
+++ b/htdocs/langs/fr_FR/cashdesk.lang
@@ -25,7 +25,7 @@ Difference=Difference
 TotalTicket=Total ticket
 NoVAT=Pas de TVA pour cette vente
 Change=Rendu
-BankToPay=Compte pour le paiement
+BankToPay=Compte pour le règlement
 ShowCompany=Voir société
 ShowStock=Voir entrepôt
 DeleteArticle=Cliquez pour enlever cet article
diff --git a/htdocs/langs/fr_FR/companies.lang b/htdocs/langs/fr_FR/companies.lang
index f186f98b4df..4d73cca26df 100644
--- a/htdocs/langs/fr_FR/companies.lang
+++ b/htdocs/langs/fr_FR/companies.lang
@@ -81,6 +81,7 @@ PaymentBankAccount=Compte bancaire paiements
 OverAllProposals=Total des propositions commerciales
 OverAllOrders=Total des commandes
 OverAllInvoices=Total des factures
+OverAllSupplierProposals=Total price requests
 ##### Local Taxes #####
 LocalTax1IsUsed=Assujetti à la deuxième taxe
 LocalTax1IsUsedES= Assujetti à RE
@@ -243,9 +244,9 @@ ProfId4RU=Id. prof.4 (OKPO)
 ProfId5RU=-
 ProfId6RU=-
 ProfId1DZ=RC
-ProfId2DZ=Art.
-ProfId3DZ=NIF
-ProfId4DZ=NIS
+ProfId2DZ=Article
+ProfId3DZ=Numéro d'identification du fournisseur 
+ProfId4DZ=Numéro d'identification du client
 VATIntra=Numéro de TVA
 VATIntraShort=Num. TVA
 VATIntraSyntaxIsValid=Syntaxe valide
@@ -389,7 +390,7 @@ ListCustomersShort=Liste clients
 ThirdPartiesArea=Espace tiers et contacts
 LastModifiedThirdParties=Les %s derniers tiers modifiés
 UniqueThirdParties=Total de tiers uniques
-InActivity=En activité
+InActivity=Ouverte
 ActivityCeased=Clos
 ThirdPartyIsClosed=Le tiers est clôturé
 ProductsIntoElements=Liste des produits/services dans %s
@@ -404,7 +405,7 @@ MergeThirdparties=Fursion de tiers
 ConfirmMergeThirdparties=Etes-vous sûr que vous voulez fusionner ce tiers dans l'actuel ? Tous les objets liés (factures, commandes, ...) seront déplacés sur le tiers en cours de sorte que vous serez en mesure de supprimer le doublon.
 ThirdpartiesMergeSuccess=Les tiers ont été fusionnés
 SaleRepresentativeLogin=Login du commercial
-SaleRepresentativeFirstname=Prénom du commercial
-SaleRepresentativeLastname=Nom du commercial
+SaleRepresentativeFirstname=First name of sales representative
+SaleRepresentativeLastname=Last name of sales representative
 ErrorThirdpartiesMerge=Une erreur est survenue lors de la suppression de ce tiers. La modification n'a pas pu être effectuée.
 NewCustomerSupplierCodeProposed=Nouveau code client ou fournisseur proposé en cas de doublon de code
diff --git a/htdocs/langs/fr_FR/compta.lang b/htdocs/langs/fr_FR/compta.lang
index b72af130b92..a31f78f8b5b 100644
--- a/htdocs/langs/fr_FR/compta.lang
+++ b/htdocs/langs/fr_FR/compta.lang
@@ -82,7 +82,7 @@ LT2PaymentES=Règlement IRPF
 LT2PaymentsES=Règlements IRPF
 VATPayment=Règlement TVA
 VATPayments=Règlements TVA
-VATRefund=Remboursement TVA
+VATRefund=Sales tax refund
 Refund=Rembourser
 SocialContributionsPayments=Paiements de charges fiscales/sociales
 ShowVatPayment=Affiche paiement TVA
diff --git a/htdocs/langs/fr_FR/cron.lang b/htdocs/langs/fr_FR/cron.lang
index caeab63a7cb..a38c33b7693 100644
--- a/htdocs/langs/fr_FR/cron.lang
+++ b/htdocs/langs/fr_FR/cron.lang
@@ -17,8 +17,8 @@ CronMethodDoesNotExists=La classe %s ne contient aucune méthode %s
 # Menu
 EnabledAndDisabled=Activés et désactivés
 # Page list
-CronLastOutput=Sortie du dernier lancement
-CronLastResult=Dernier code de retour
+CronLastOutput=Latest run output
+CronLastResult=Latest result code
 CronCommand=Commande
 CronList=Travaux planifiés
 CronDelete=Effacer les travaux planifiés
diff --git a/htdocs/langs/fr_FR/errors.lang b/htdocs/langs/fr_FR/errors.lang
index 09128fab47d..b54ef041667 100644
--- a/htdocs/langs/fr_FR/errors.lang
+++ b/htdocs/langs/fr_FR/errors.lang
@@ -11,6 +11,7 @@ ErrorLoginAlreadyExists=L'identifiant %s existe déjà.
 ErrorGroupAlreadyExists=Le groupe %s existe déjà.
 ErrorRecordNotFound=Enregistrement non trouvé.
 ErrorFailToCopyFile=Echec de la copie du fichier '<b>%s</b>' en '<b>%s</b>'.
+ErrorFailToCopyDir=Failed to copy directory '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToRenameFile=Echec du renommage du fichier '<b>%s</b>' en '<b>%s</b>'.
 ErrorFailToDeleteFile=Echec de l'effacement du fichier '<b>%s</b>'.
 ErrorFailToCreateFile=Echec de la création du fichier '<b>%s</b>'.
@@ -115,7 +116,7 @@ ErrorNoActivatedBarcode=Aucun type de code-barres activé
 ErrUnzipFails=Impossible de décompresser le fichier %s avec ZipArchive
 ErrNoZipEngine=Pas de moteur pour décompresser le fichier %s dans ce PHP
 ErrorFileMustBeADolibarrPackage=Le fichier doit être un package Dolibarr
-ErrorFileRequired=Il faut un fichier de package Dolibarr
+ErrorModuleFileRequired=You must select a Dolibarr module package file
 ErrorPhpCurlNotInstalled=L'extension PHP CURL n'est pas installée, ceci est indispensable pour dialoguer avec Paypal.
 ErrorFailedToAddToMailmanList=Echec de l'ajout de %s à la liste Mailman %s ou base SPIP
 ErrorFailedToRemoveToMailmanList=Echec de la suppression de %s de la liste Mailman %s ou base SPIP
@@ -181,6 +182,8 @@ ErrorBankStatementNameMustFollowRegex=Erreur, le nom de relevé bancaire doit su
 ErrorPhpMailDelivery=Assurez-vous que vous n'utilisez pas un nombre de destinataires trop élevé et que le contenu de votre message n'est pas similaire à du Spam. Demandez aussi à votre administrateur de vérifier le pare-feu et les journaux serveur pour une information plus complète.
 ErrorUserNotAssignedToTask=L'utilisateur doit être assigné à une tâche pour qu'il puisse entrer le temps consommé.
 ErrorTaskAlreadyAssigned=Tâche déjà assignée à l'utilisateur
+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>
 
 # 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 5080d6e6463..5bac554fd67 100644
--- a/htdocs/langs/fr_FR/holiday.lang
+++ b/htdocs/langs/fr_FR/holiday.lang
@@ -76,8 +76,8 @@ BoxTitleLastLeaveRequests=Les %s dernières demandes de congés modifiées
 HolidaysMonthlyUpdate=Mise à jour mensuelle
 ManualUpdate=Mise à jour manuelle
 HolidaysCancelation=Annulation de la demande de congés
-EmployeeLastname=Nom du salarié
-EmployeeFirstname=Prénom du salarié
+EmployeeLastname=Employee last name
+EmployeeFirstname=Employee first name
 TypeWasDisabledOrRemoved=Le type de congés (id %s) a été désactivé ou supprimé
 
 ## Configuration du Module ##
diff --git a/htdocs/langs/fr_FR/ldap.lang b/htdocs/langs/fr_FR/ldap.lang
index f3afca85ea0..26ef0ec46c6 100644
--- a/htdocs/langs/fr_FR/ldap.lang
+++ b/htdocs/langs/fr_FR/ldap.lang
@@ -13,8 +13,8 @@ LDAPUsers=Utilisateurs en base LDAP
 LDAPFieldStatus=Statut
 LDAPFieldFirstSubscriptionDate=Date de première adhésion
 LDAPFieldFirstSubscriptionAmount=Montant première adhésion
-LDAPFieldLastSubscriptionDate=Date de dernière adhésion
-LDAPFieldLastSubscriptionAmount=Montant dernière adhésion
+LDAPFieldLastSubscriptionDate=Latest subscription date
+LDAPFieldLastSubscriptionAmount=Latest subscription amount
 LDAPFieldSkype=Identifiant Skype
 LDAPFieldSkypeExample=Exemple : skypeName
 UserSynchronized=Utilisateur synchronisé
diff --git a/htdocs/langs/fr_FR/mails.lang b/htdocs/langs/fr_FR/mails.lang
index 23c58f1a492..0a2dd413bbb 100644
--- a/htdocs/langs/fr_FR/mails.lang
+++ b/htdocs/langs/fr_FR/mails.lang
@@ -35,7 +35,7 @@ MailingStatusSentPartialy=Envoyé partiellement
 MailingStatusSentCompletely=Envoyé complètement
 MailingStatusError=Erreur
 MailingStatusNotSent=Non envoyé
-MailSuccessfulySent=Email successfully accepted for delivery (from %s to %s)
+MailSuccessfulySent=L'e-mail est prêt à être envoyé (de %s à %s)
 MailingSuccessfullyValidated=Email validé
 MailUnsubcribe=Désinscription
 MailingStatusNotContact=Ne plus contacter
@@ -74,14 +74,18 @@ ResultOfMailSending=Résultat de l'envoi d'EMail en masse
 NbSelected=Nb sélectionné
 NbIgnored=Nb ignoré
 NbSent=Nb envoyé
-ContactsWithThirdpartyFilter=Contact with customer filters
+ConfirmUnvalidateEmailing=Are you sure you want to change email <b>%s</b> to draft status?
+MailingModuleDescContactsWithThirdpartyFilter=Contact avec filtres des tiers
+MailingModuleDescContactsByCompanyCategory=Contacts by third party category
+MailingModuleDescContactsByCategory=Contacts by categories
+MailingModuleDescContactsByFunction=Contacts by position
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Ligne %s du fichier
 RecipientSelectionModules=Modules de sélection des destinataires
 MailSelectedRecipients=Destinataires sélectionnés
 MailingArea=Espace emailings
-LastMailings=Les %s derniers emailings
+LastMailings=Latest %s emailings
 TargetsStatistics=Statistiques destinataires
 NbOfCompaniesContacts=Contacts/adresses uniques
 MailNoChangePossible=Destinataires d'un emailing validé non modifiables
@@ -89,9 +93,9 @@ SearchAMailing=Rechercher un emailing
 SendMailing=Envoi emailing
 SendMail=Envoyer email
 SentBy=Envoyé par
-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:
+MailingNeedCommand=L'envoi d'un e-mailing peut être réalisé depuis une ligne de commande. Demandez à l'administrateur de votre serveur de lancer la commande suivante pour envoyer l'e-mailing à tous les destinataires :
 MailingNeedCommand2=Vous pouvez toutefois quand même les envoyer par l'interface écran en ajoutant le paramètre MAILING_LIMIT_SENDBYWEB avec la valeur du nombre maximum d'emails envoyés par session d'envoi. Pour cela, aller dans Accueil - Configuration - Divers.
-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 ?
+ConfirmSendingEmailing=Si vous souhaitez envoyer l'e-mailing depuis cet écran, veuillez confirmer son envoi maintenant, depuis votre navigateur.
 LimitSendingEmailing=Remarque: L'envoi d'Emailings à partir de l'interface web se fait en plusieurs fois pour des raisons de sécurité et de timeout, <b>%s</b> bénéficiaires à la fois pour chaque session d'envoi.
 TargetsReset=Vider liste
 ToClearAllRecipientsClickHere=Pour vider la liste des destinataires de cet emailing, cliquez sur le bouton
@@ -146,3 +150,6 @@ AdvTgtCreateFilter=Créer filtre
 AdvTgtOrCreateNewFilter=Nom du nouveau filtre
 NoContactWithCategoryFound=Pas de contact/adresses avec cette catégorie
 NoContactLinkedToThirdpartieWithCategoryFound=Pas de contact/adresses associés à un ters avec cette catégorie
+OutGoingEmailSetup=Outgoing email setup
+InGoingEmailSetup=Incoming email setup
+
diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang
index f65a5dd126c..0c6db69fed3 100644
--- a/htdocs/langs/fr_FR/main.lang
+++ b/htdocs/langs/fr_FR/main.lang
@@ -69,6 +69,7 @@ SetDate=Définir date
 SelectDate=Sélectionnez une date
 SeeAlso=Voir aussi %s
 SeeHere=Regardez ici
+Apply=Appliquer
 BackgroundColorByDefault=Couleur de fond
 FileRenamed=Le fichier a été renommé avec succès
 FileUploaded=Le fichier a été transféré avec succès
@@ -87,7 +88,7 @@ Undefined=Non défini
 PasswordForgotten=Mot de passe oublié ?
 SeeAbove=Voir ci-dessus
 HomeArea=Espace accueil
-LastConnexion=Dernière connexion
+LastConnexion=Latest connection
 PreviousConnexion=Connexion précédente
 PreviousValue=Valeur précédente
 ConnectedOnMultiCompany=Connexion sur l'entité
@@ -237,7 +238,7 @@ DateCreation=Date création
 DateCreationShort=Date de création
 DateModification=Date modification
 DateModificationShort=Date modif.
-DateLastModification=Date dernière modification
+DateLastModification=Latest modification date
 DateValidation=Date validation
 DateClosing=Date clôture
 DateDue=Date échéance
@@ -433,7 +434,7 @@ Reportings=Rapports
 Draft=Brouillon
 Drafts=Brouillons
 Validated=Validé
-Opened=Ouvert
+Opened=Ouverte
 New=Nouveau
 Discount=Remise
 Unknown=Inconnu
@@ -599,6 +600,8 @@ SessionName=Nom session
 Method=Méthode
 Receive=Réceptionner
 CompleteOrNoMoreReceptionExpected=Complète ou plus de réception attendue
+ExpectedValue=Expected Value
+CurrentValue=Valeur courante
 PartialWoman=Partielle
 TotalWoman=Totale
 NeverReceived=Jamais reçu
@@ -756,6 +759,7 @@ SomeTranslationAreUncomplete=Certaines langues sont traduites partiellement ou p
 DirectDownloadLink=Lien de téléchargement direct
 Download=Téléchargement
 ActualizeCurrency=Mettre à jour le taux de devise
+Fiscalyear=Exercice fiscal
 # Week day
 Monday=Lundi
 Tuesday=Mardi
@@ -790,8 +794,8 @@ SetRef=Définir réf.
 Select2ResultFoundUseArrows=Résultats trouvés. Utilisez les flèches pour sélectionner.
 Select2NotFound=Aucun enregistrement trouvé
 Select2Enter=Entrez
-Select2MoreCharacter=or more characters<br /><br /><strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
-Select2MoreCharacters=or more characters<br /><br /><strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
+Select2MoreCharacter=ou plus de caractères<br /><br /><strong>syntaxe de recherche:</strong><br /><kbd><strong> |</strong></kbd><kbd> OU</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> n'importe quel caractère</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Commence par</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> Finit par</kbd> (ab$)<br />
+Select2MoreCharacters=ou plus de caractères<br /><br /><strong>syntaxe de recherche:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> N'importe quel caractère</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Commence par</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> Finit par</kbd> (ab$)<br />
 Select2LoadingMoreResults=Charger plus de résultats...
 Select2SearchInProgress=Recherche en cours...
 SearchIntoThirdparties=Tiers
@@ -812,7 +816,7 @@ SearchIntoContracts=Contrats
 SearchIntoCustomerShipments=Expéditions clients
 SearchIntoExpenseReports=Notes de frais
 SearchIntoLeaves=Congés
-
+BulkActions=Bulk actions
 #Numbers translate
 centimes=centimes
 one=un
@@ -848,4 +852,4 @@ thousand=mille
 million=million
 billion=milliard
 trillion=billion
-quadrillion=quadrillion
\ No newline at end of file
+quadrillion=quadrillion
diff --git a/htdocs/langs/fr_FR/members.lang b/htdocs/langs/fr_FR/members.lang
index 19b8d2fc6b5..f0cf0959db7 100644
--- a/htdocs/langs/fr_FR/members.lang
+++ b/htdocs/langs/fr_FR/members.lang
@@ -136,8 +136,8 @@ DocForAllMembersCards=Génération de cartes pour tous les adhérents
 DocForOneMemberCards=Génération de cartes pour un adhérent particulier
 DocForLabels=Génération d'étiquettes d'adresses
 SubscriptionPayment=Paiement cotisation
-LastSubscriptionDate=Date de la dernière cotisation
-LastSubscriptionAmount=Montant de la dernière cotisation
+LastSubscriptionDate=Latest subscription date
+LastSubscriptionAmount=Latest subscription amount
 MembersStatisticsByCountries=Statistiques des membres par pays
 MembersStatisticsByState=Statistiques des membres par département/province/canton
 MembersStatisticsByTown=Statistiques des membres par ville
@@ -149,7 +149,7 @@ MembersByStateDesc=Cet écran vous présente une vue statistique du nombre d'adh
 MembersByTownDesc=Cet écran vous présente une vue statistique du nombre d'adhérents par ville.
 MembersStatisticsDesc=Choisissez les statistiques que vous désirez consulter...
 MenuMembersStats=Statistiques
-LastMemberDate=Date dernier adhérent
+LastMemberDate=Latest member date
 Nature=Nature
 Public=Informations publiques
 NewMemberbyWeb=Nouvel adhérent ajouté. En attente de validation
diff --git a/htdocs/langs/fr_FR/orders.lang b/htdocs/langs/fr_FR/orders.lang
index ff201e28517..e11178cc422 100644
--- a/htdocs/langs/fr_FR/orders.lang
+++ b/htdocs/langs/fr_FR/orders.lang
@@ -39,7 +39,7 @@ StatusOrderRefusedShort=Refusée
 StatusOrderBilledShort=Facturée
 StatusOrderToProcessShort=À traiter
 StatusOrderReceivedPartiallyShort=Reçue partiellement
-StatusOrderReceivedAllShort=Reçue complètement
+StatusOrderReceivedAllShort=Products received
 StatusOrderCanceled=Annulée
 StatusOrderDraft=Brouillon (à valider)
 StatusOrderValidated=Validée
@@ -51,7 +51,7 @@ StatusOrderApproved=Approuvée
 StatusOrderRefused=Refusée
 StatusOrderBilled=Facturée
 StatusOrderReceivedPartially=Reçue partiellement
-StatusOrderReceivedAll=Reçue complètement
+StatusOrderReceivedAll=All products received
 ShippingExist=Une expédition existe
 QtyOrdered=Qté commandée
 ProductQtyInDraft=Quantité de produit en commandes brouillons
diff --git a/htdocs/langs/fr_FR/other.lang b/htdocs/langs/fr_FR/other.lang
index f2acf9d21c8..9afda5964a1 100644
--- a/htdocs/langs/fr_FR/other.lang
+++ b/htdocs/langs/fr_FR/other.lang
@@ -68,14 +68,15 @@ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nVous trouverez ci
 PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nVeuillez trouver ci-joint le bon d'expédition __SHIPPINGREF__\n\n__PERSONALIZED__Cordialement\n\n__SIGNATURE__
 PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nVeuillez trouver ci-joint la fiche d'intervention __FICHINTERREF__\n\n__PERSONALIZED__Cordialement\n\n__SIGNATURE__
 PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n__PERSONALIZED__\n\n__SIGNATURE__
-DemoDesc=Dolibarr est un logiciel de gestion d'activité professionnelle ou associative composé de modules fonctionnels indépendants et optionnels. Une démonstration qui inclut tous ces modules n'a pas de sens car les modules ne sont jamais tous utilisés en même temps. Aussi, plusieurs profils de démonstration type sont disponibles.
+DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Veuillez choisir le profil de démonstration qui correspond le mieux à votre activité…
+ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
 DemoFundation=Gestion des adhérents d'une association
 DemoFundation2=Gestion des adhérents et trésorerie d'une association
-DemoCompanyServiceOnly=Gestion d'une activité d'indépendant faisant du service
+DemoCompanyServiceOnly=Company or freelance selling service only
 DemoCompanyShopWithCashDesk=Gestion d'un magasin avec caisse
-DemoCompanyProductAndStocks=Gestion d'une PME revendeuse de produits
-DemoCompanyAll=Gestion d'une PME aux activités multiples (tous les modules principaux)
+DemoCompanyProductAndStocks=Company selling products with a shop
+DemoCompanyAll=Company with multiple activities (all main modules)
 CreatedBy=Créé par %s
 ModifiedBy=Modifié par %s
 ValidatedBy=Validé par %s
diff --git a/htdocs/langs/fr_FR/products.lang b/htdocs/langs/fr_FR/products.lang
index 05959e8d355..9a996ffb1f8 100644
--- a/htdocs/langs/fr_FR/products.lang
+++ b/htdocs/langs/fr_FR/products.lang
@@ -60,7 +60,7 @@ SellingPrice=Prix de vente
 SellingPriceHT=Prix de vente HT
 SellingPriceTTC=Prix de vente TTC
 CostPriceDescription=Ce prix (net de taxe) peut être utilisé pour stocker le montant moyen du coût de ce produit pour votre entreprise. Il peut être calculé par exemple à partir du prix d'achat moyen majoré des coûts moyens de production et de distribution.
-CostPriceUsage=Dans une version future, cette valeur pourrait être utilisée pour le calcul de la marge.
+CostPriceUsage=This value could be used for margin calculation.
 SoldAmount=Solde
 PurchasedAmount=Montant des achats
 NewPrice=Nouveau prix
@@ -142,6 +142,7 @@ ConfirmCloneProduct=Êtes-vous sûr de vouloir cloner le produit ou service <b>%
 CloneContentProduct=Cloner les informations générales du produit/service
 ClonePricesProduct=Cloner les informations générales et les prix
 CloneCompositionProduct=Cloner le produits packagés
+CloneCombinationsProduct=Clone product variants
 ProductIsUsed=Ce produit est utilisé
 NewRefForClone=Réf. du nouveau produit/service
 SellingPrices=Prix de vente
@@ -238,7 +239,7 @@ GlobalVariables=Variables globales
 VariableToUpdate=Variable à mettre à jour
 GlobalVariableUpdaters=Mis à jour variable globale
 UpdateInterval=Intervale de mise à jour (minutes)
-LastUpdated=Dernière mise à jour
+LastUpdated=Latest update
 CorrectlyUpdated=Mise à jour avec succès
 PropalMergePdfProductActualFile=Fichiers utilisés pour l'ajout au PDF Azur sont
 PropalMergePdfProductChooseFile=Sélectionnez les fichiers PDF
@@ -258,4 +259,41 @@ VolumeUnits=Unité de volume
 SizeUnits=Unité de taille
 DeleteProductBuyPrice=Effacer le prix d'achat
 ConfirmDeleteProductBuyPrice=Êtes-vous sur de vouloir supprimer ce prix d'achat ?
+SubProduct=Sub product
 
+#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
+ProductCombinations=Variants
+HideProductCombinations=Hide products variant in the products selector
+ProductCombination=Variant
+NewProductCombination=New variant
+EditProductCombination=Editing variant
+ProductCombinationGenerator=Variants generator
+Features=Features
+PriceImpact=Price impact
+WeightImpact=Weight impact
+NewProductAttribute=Nouvel attribut
+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
+PercentageVariation=Percentage variation
+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 child products
+ConfirmCloneProductCombinations=Would you like to copy all the product variant to the 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
diff --git a/htdocs/langs/fr_FR/projects.lang b/htdocs/langs/fr_FR/projects.lang
index 654189d3bbd..bf4cf1baecf 100644
--- a/htdocs/langs/fr_FR/projects.lang
+++ b/htdocs/langs/fr_FR/projects.lang
@@ -47,7 +47,7 @@ TaskTimeSpent=Temps consommé sur les tâches
 TaskTimeUser=Utilisateur
 TaskTimeNote=Note
 TaskTimeDate=Date
-TasksOnOpenedProject=Tâches sur les projets ouverts
+TasksOnOpenedProject=Tâches sur projets ouverts
 WorkloadNotDefined=Charge de travail non définie
 NewTimeSpent=Nouveau consommé
 MyTimeSpent=Mon consommé
@@ -96,6 +96,7 @@ ValidateProject=Valider projet
 ConfirmValidateProject=Êtes-vous sûr de vouloir valider ce projet ?
 CloseAProject=Clore projet
 ConfirmCloseAProject=Êtes-vous sûr de vouloir clore ce projet ?
+AlsoCloseAProject=Also close project (keep it open if you still need to follow production tasks on it)
 ReOpenAProject=Réouvrir projet
 ConfirmReOpenAProject=Êtes-vous sûr de vouloir rouvrir ce projet ?
 ProjectContact=Contacts projet
@@ -121,7 +122,7 @@ CloneProjectFiles=Cloner les pièces jointes du projet
 CloneTaskFiles=Cloner les pièces jointes des tâche(s) (si tâche(s) cloner)
 CloneMoveDate=Mettre à jour les dates projet/tâches à partir de maintenant
 ConfirmCloneProject=Êtes-vous sûr de vouloir cloner ce projet ?
-ProjectReportDate=Reporter les dates des tâches en fonction de la date de départ.
+ProjectReportDate=Change task dates according to new project start date
 ErrorShiftTaskDate=Une erreur s'est produite dans le report des dates des tâches.
 ProjectsAndTasksLines=Projets et tâches
 ProjectCreatedInDolibarr=Projet %s créé
diff --git a/htdocs/langs/fr_FR/propal.lang b/htdocs/langs/fr_FR/propal.lang
index c0be6dc4d06..3d6541d8df7 100644
--- a/htdocs/langs/fr_FR/propal.lang
+++ b/htdocs/langs/fr_FR/propal.lang
@@ -26,9 +26,9 @@ AmountOfProposalsByMonthHT=Montant par mois (HT)
 NbOfProposals=Nombre de propositions commerciales
 ShowPropal=Afficher proposition
 PropalsDraft=Brouillons
-PropalsOpened=En cours
+PropalsOpened=Ouverte
 PropalStatusDraft=Brouillon (à valider)
-PropalStatusValidated=Validée (proposition ouverte)
+PropalStatusValidated=Validated (proposal is opened)
 PropalStatusSigned=Signée (à facturer)
 PropalStatusNotSigned=Non signée (fermée)
 PropalStatusBilled=Facturée
diff --git a/htdocs/langs/fr_FR/stocks.lang b/htdocs/langs/fr_FR/stocks.lang
index 876da721ae0..f0c155f2c3f 100644
--- a/htdocs/langs/fr_FR/stocks.lang
+++ b/htdocs/langs/fr_FR/stocks.lang
@@ -22,13 +22,15 @@ Movements=Mouvements
 ErrorWarehouseRefRequired=Le nom de référence de l'entrepôt est obligatoire
 ListOfWarehouses=Liste des entrepôts
 ListOfStockMovements=Liste des mouvements de stock
+StockMovementForId=Movement ID %d
+ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Espace entrepôts
 Location=Lieu
 LocationSummary=Nom court du lieu
 NumberOfDifferentProducts=Nombre de produits différents
 NumberOfProducts=Nombre total de produits
-LastMovement=Dernier mouvement
-LastMovements=Derniers mouvements
+LastMovement=Latest movement
+LastMovements=Latest movements
 Units=Unités
 Unit=Unité
 StockCorrection=Corriger le stock
@@ -140,4 +142,4 @@ ProductStockWarehouseCreated=Alerte de limite de stock et de stock désiré ajou
 ProductStockWarehouseUpdated=Alerte de limite de stock et de stock désiré actualisée
 ProductStockWarehouseDeleted=Alerte de limite de stock et de stock désiré supprimée
 AddNewProductStockWarehouse=Définir la limite d'alerte et de stock désiré optimal
-AddStockLocationLine=Decrease quantity then click to add another warehouse for this product
+AddStockLocationLine=Diminuer la quantité puis cliquer pour ajouter ce produit dans un autre entrepôt
diff --git a/htdocs/langs/fr_FR/supplier_proposal.lang b/htdocs/langs/fr_FR/supplier_proposal.lang
index 764b094ae68..edff5f02030 100644
--- a/htdocs/langs/fr_FR/supplier_proposal.lang
+++ b/htdocs/langs/fr_FR/supplier_proposal.lang
@@ -8,7 +8,7 @@ SearchRequest=Rechercher une demande
 DraftRequests=Demandes brouillons
 SupplierProposalsDraft=Propositions de fournisseur brouillon
 LastModifiedRequests=Les %s dernières demandes de prix modifiées
-RequestsOpened=Demandes de prix ouvertes
+RequestsOpened=Opened price requests
 SupplierProposalArea=Zone des propositions de fournisseurs
 SupplierProposalShort=Proposition commerciale fournisseur
 SupplierProposals=Propositions commerciales fournisseurs
@@ -23,7 +23,7 @@ ConfirmValidateAsk=Êtes-vous sûr de vouloir valider cette demande de prix sous
 DeleteAsk=Supprimer demande
 ValidateAsk=Valider demande
 SupplierProposalStatusDraft=Brouillon (à valider)
-SupplierProposalStatusValidated=Validée (demande ouverte)
+SupplierProposalStatusValidated=Validated (request is opened)
 SupplierProposalStatusClosed=Fermé
 SupplierProposalStatusSigned=Accepté
 SupplierProposalStatusNotSigned=Refusé
diff --git a/htdocs/langs/fr_FR/suppliers.lang b/htdocs/langs/fr_FR/suppliers.lang
index 94c22ec47c8..b5593fab2cc 100644
--- a/htdocs/langs/fr_FR/suppliers.lang
+++ b/htdocs/langs/fr_FR/suppliers.lang
@@ -41,4 +41,5 @@ DoNotOrderThisProductToThisSupplier=Ne pas commander
 NotTheGoodQualitySupplier=Mauvaise qualité
 ReputationForThisProduct=Réputation
 BuyerName=Nom de l'acheteur
-SuppliersPaymentModel=Model liste des factures réglées par ce paiement
\ No newline at end of file
+SuppliersPaymentModel=Model liste des factures réglées par ce paiement
+AllProductServicePrices=All product / service prices
\ No newline at end of file
diff --git a/htdocs/langs/fr_FR/trips.lang b/htdocs/langs/fr_FR/trips.lang
index c4fc019e12c..d1097d4cfae 100644
--- a/htdocs/langs/fr_FR/trips.lang
+++ b/htdocs/langs/fr_FR/trips.lang
@@ -21,17 +21,17 @@ ListToApprove=En attente d'approbation
 ExpensesArea=Espace notes de frais
 ClassifyRefunded=Classer 'Remboursé'
 ExpenseReportWaitingForApproval=Une nouvelle note de frais a été soumise pour approbation
-ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n - User: %s\n - Period: %s\nClick here to validate: %s
-ExpenseReportWaitingForReApproval=An expense report has been submitted for re-approval
-ExpenseReportWaitingForReApprovalMessage=An expense report has been submitted and is waiting for re-approval.\nThe %s, you refused to approve the expense report for this reason: %s.\nA new version has been proposed and waiting for your approval.\n - User: %s\n - Period: %s\nClick here to validate: %s
-ExpenseReportApproved=An expense report was approved
-ExpenseReportApprovedMessage=The expense report %s was approved.\n - User: %s\n - Approved by: %s\nClick here to show the expense report: %s
-ExpenseReportRefused=An expense report was refused
-ExpenseReportRefusedMessage=The expense report %s was refused.\n - User: %s\n - Refused by: %s\n - Motive for refusal: %s\nClick here to show the expense report: %s
-ExpenseReportCanceled=An expense report was canceled
-ExpenseReportCanceledMessage=The expense report %s was canceled.\n - User: %s\n - Canceled by: %s\n - Motive for cancellation: %s\nClick here to show the expense report: %s
-ExpenseReportPaid=An expense report was paid
-ExpenseReportPaidMessage=The expense report %s was paid.\n - User: %s\n - Paid by: %s\nClick here to show the expense report: %s
+ExpenseReportWaitingForApprovalMessage=Une nouvelle note de frais a été enregistrée et est en attente d'approbation.<br/>\n- Utilisateur : %s<br/>\n- Période : %s<br/>\nCliquez ici pour afficher la note de frais %s.
+ExpenseReportWaitingForReApproval=Une note de frais a été soumise pour ré-approbation
+ExpenseReportWaitingForReApprovalMessage=Une note de frais a été enregistrée et est en attente de ré-approbation.<br/>\nVous avez précédemment refusée la note de frais %s pour le motif suivant : %s<br/>\n- Utilisateur : %s<br/>\n- Période : %s<br/>\nCliquez ici pour valider la note de frais %s.
+ExpenseReportApproved=Une note de frais a été approuvée
+ExpenseReportApprovedMessage=La note de frais %s a été approuvée.<br/>\n- Utilisateur : %s<br/>\n- Approuvée par : %s<br/>\nCliquez ici pour afficher la note de frais %s.
+ExpenseReportRefused=Une note de frais a été refusée
+ExpenseReportRefusedMessage=La note de frais %s a été refusée.<br/>\n- Utilisateur : %s<br/>\n- Refusée par : %s<br/>\n- Motif du refus : %s<br/>\nCliquez ici pour afficher la note de frais %s.
+ExpenseReportCanceled=Une note de frais a été annulée
+ExpenseReportCanceledMessage=La note de frais %s a été annulée.<br/>\n- Utilisateur : %s<br/>\n- Annulée par : %s<br/>\n- Motif de l'annulation :%s<br/>\nCliquez ici pour afficher la note de frais %s.
+ExpenseReportPaid=Une note de frais a été réglée
+ExpenseReportPaidMessage=La note de frais %s a été réglée.<br/>\n- Utilisateur : %s<br/>\n- Réglée par : %s<br/>\nCliquez ici pour afficher la note de frais %s.
 TripId=Id note de frais
 AnyOtherInThisListCanValidate=Personne à informer pour la validation.
 TripSociete=Information société
diff --git a/htdocs/langs/fr_FR/withdrawals.lang b/htdocs/langs/fr_FR/withdrawals.lang
index 4e758daa75e..8ba27e360d5 100644
--- a/htdocs/langs/fr_FR/withdrawals.lang
+++ b/htdocs/langs/fr_FR/withdrawals.lang
@@ -24,6 +24,7 @@ WithdrawStatistics=Statistiques des prélèvements
 WithdrawRejectStatistics=Statistiques des rejets de prélèvements
 LastWithdrawalReceipt=Les %s derniers bons de prélèvements
 MakeWithdrawRequest=Faire une demande de prélèvement
+WithdrawRequestsDone=%s direct debit payment requests recorded
 ThirdPartyBankCode=Code banque du tiers
 NoInvoiceCouldBeWithdrawed=Aucune facture percevable, prélevée avec succès. Vérifiez que les factures sont sur des sociétés  dont le compte bancaire par défaut est correctement renseigné.
 ClassCredited=Classer crédité
@@ -76,8 +77,8 @@ RUM=RUM
 RUMLong=Référence Unique de Mandat
 RUMWillBeGenerated=Le numéro de RUM sera généré une fois les informations de compte bancaire sont enregistrées
 WithdrawMode=Mode de prélévement (FRST ou RECUR)
-WithdrawRequestAmount=Montant de la demande de prélèvement
-WithdrawRequestErrorNilAmount=Impossible de créer une demande de prélèvement pour un montant nul
+WithdrawRequestAmount=Amount of Direct debit request:
+WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty amount.
 SepaMandate=Mandat prélèvement SEPA
 SepaMandateShort=Mandat SEPA
 PleaseReturnMandate=Merci de retourner ce formulaire mandat par email à %s ou par courrier à
diff --git a/htdocs/langs/he_IL/accountancy.lang b/htdocs/langs/he_IL/accountancy.lang
index 5de95948fbf..4c2336b97b0 100644
--- a/htdocs/langs/he_IL/accountancy.lang
+++ b/htdocs/langs/he_IL/accountancy.lang
@@ -194,6 +194,8 @@ ChangeBinding=Change the binding
 
 ## Admin
 ApplyMassCategories=Apply mass categories
+AddAccountFromBookKeepingWithNoCategories=Add acccount already used with no categories
+CategoryDeleted=Category for the accounting account has been removed
 
 ## Export
 Exports=Exports
@@ -209,6 +211,7 @@ Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution
 Modelcsv_quadratus=Export towards Quadratus QuadraCompta
 Modelcsv_ebp=Export towards EBP
 Modelcsv_cogilog=Export towards Cogilog
+ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
 InitAccountancy=Init accountancy
diff --git a/htdocs/langs/he_IL/admin.lang b/htdocs/langs/he_IL/admin.lang
index ed4c530e477..efd1da50dbc 100644
--- a/htdocs/langs/he_IL/admin.lang
+++ b/htdocs/langs/he_IL/admin.lang
@@ -9,17 +9,20 @@ VersionDevelopment=התפתחות
 VersionUnknown=לא ידוע
 VersionRecommanded=מומלץ
 FileCheck=Files integrity checker
-FileCheckDesc=This tool allows you to check the integrity of files of your application, comparing each files with the official ones. You can use this tool to detect if some files were modified by a hacker for example.
+FileCheckDesc=This tool allows you to check the integrity of files and setup of your application, comparing each files with the official ones. 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.
 FileIntegrityIsStrictlyConformedWithReference=Files integrity is strictly conformed with the reference.
-FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified of removed.
+FileIntegrityIsOkButFilesWereAdded=Files integrity check has passed, however some new files were added.
+FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified, removed or added.
 GlobalChecksum=Global checksum
 MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
 LocalSignature=Embedded local signature (less reliable)
 RemoteSignature=Remote distant signature (more reliable)
 FilesMissing=Missing Files
 FilesUpdated=Updated Files
+FilesModified=Modified Files
+FilesAdded=Added Files
 FileCheckDolibarr=Check integrity of application files
-AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from a certified package
+AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from an official package
 XmlNotFound=Xml Integrity File of application not found
 SessionId=מושב מזהה
 SessionSaveHandler=הנדלר להציל הפעלות
@@ -188,7 +191,9 @@ BoxesDesc=Widgets are components showing some information that you can add to pe
 OnlyActiveElementsAreShown=האלמנטים היחידים של <a href="%s">מודולים המאפשרים</a> מוצגים.
 ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
-ModulesMarketPlaces=מודולים נוספים ...
+ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
+ModulesMarketPlaces=Find external modules...
+GoModuleSetupArea=To deploy/install a new module, go onto the Module setup area at <a href="%s">%s</a>.
 DoliStoreDesc=DoliStore, במקום השוק הרשמי של מודולים Dolibarr ERP / CRM חיצוניות
 DoliPartnersDesc=List of companies providing custom developed modules or features (Note: anyone experienced in PHP programming can provide custom development for an open source project)
 WebSiteDesc=Reference websites to find more modules...
@@ -280,20 +285,21 @@ MenuHandlers=תפריט מטפלים
 MenuAdmin=תפריט העורך
 DoNotUseInProduction=Do not use in production
 ThisIsProcessToFollow=This is steps to process:
-ThisIsAlternativeProcessToFollow=This is an alternative setup to process:
+ThisIsAlternativeProcessToFollow=This is an alternative setup to process manually:
 StepNb=שלב %s
 FindPackageFromWebSite=מצא חבילה המספקת התכונה הרצויה (לדוגמה על %s באתר הרשמי של רשת).
 DownloadPackageFromWebSite=Download package (for example from official web site %s).
-UnpackPackageInDolibarrRoot=Unpack package file into Dolibarr server directory dedicated to external modules: <b>%s</b>
-SetupIsReadyForUse=התקן הוא סיים Dolibarr מוכן לשימוש עם מרכיב חדש זה.
-NotExistsDirect=The alternative root directory is not defined.<br>
-InfDirAlt=Since version 3 it is possible to define an alternative root directory.This allows you to store, same place, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
-InfDirExample=<br>Then declare it in the file conf.php<br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>*These lines are commented with "#", to uncomment only remove the character.
+UnpackPackageInDolibarrRoot=Unpack the packaged files into server directory dedicated to Dolibarr: <b>%s</b>
+UnpackPackageInModulesRoot=To deploy/install an external module, unpack the packaged files into the server directory dedicated to modules: <b>%s</b>
+SetupIsReadyForUse=Module deployment is finished. You must however enable and setup the module in your application by going on the page to setup modules: <a href="%s">%s</a>.
+NotExistsDirect=The alternative root directory is not defined to an existing directory.<br>
+InfDirAlt=Since version 3, it is possible to define an alternative root directory. This allows you to store, into a dedicated directory, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
+InfDirExample=<br>Then declare it in the file <strong>conf.php</strong><br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>If these lines are commented with "#", to enable them, just uncomment by removing the "#" character.
 YouCanSubmitFile=For this step, you can send package using this tool: Select module file
 CurrentVersion=Dolibarr הגרסה הנוכחית
 CallUpdatePage=Go to the page that updates the database structure and data: %s.
 LastStableVersion=Latest stable version
-LastActivationDate=Last activation date
+LastActivationDate=Latest activation date
 UpdateServerOffline=Update server offline
 GenericMaskCodes=אתה רשאי להיכנס לכל מסכת מספור. במסכת זו, התגים הבאים יכול לשמש: <br> <b>{000000}</b> המתאים למספר אשר יהיה מוגדל על %s כל אחד. הזן כמו אפסים רבים ככל האורך הרצוי של הדלפק. נגד יושלם עד אפסים משמאל כדי שיהיה כמו אפסים רבים ככל המסכה. <br> <b>{000} 000000</b> זהה לקודם, אך קוזז המתאים למספר בצד ימין של סימן + מיושם החל מיום %s הראשונים. <br> <b>{000000 @ x}</b> זהה לקודם אבל הדלפק מתאפס לאפס כאשר x חודש הוא הגיע (x בין 1 ל 12 או 0 כדי להשתמש בחודשים הראשונים של שנת הכספים מוגדרת בהגדרות שלך). אם אפשרות זו בשימוש, x הוא 2 או יותר, אז רצף {yy} {מ&quot;מ} או {yyyy} {מ&quot;מ} נדרש גם. <br> <b>Dd {}</b> היום (01 עד 31). <br> <b>{מ&quot;מ}</b> החודש (01 עד 12). <br> <b>{Yy}, {yyyy}</b> או <b>{y}</b> השנה על 2, 4 או 1 מספרים. <br>
 GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
@@ -376,11 +382,11 @@ ExtrafieldCheckBox=Checkbox
 ExtrafieldRadio=Radio button
 ExtrafieldCheckBoxFromList= Checkbox from table
 ExtrafieldLink=Link to an object
-ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>In order to have the list depending on another :<br>1,value1|parent_list_code:parent_key<br>2,value2|parent_list_code:parent_key
+ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list :<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list :<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
-ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
+ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Example : Societe:societe/class/societe.class.php
 LibraryToBuildPDF=Library used for PDF generation
 WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
@@ -415,10 +421,10 @@ ModuleCompanyCodeDigitaria=קוד חשבונאות תלוי קוד של צד ש
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
 WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<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).
-
+ClickToShowDescription=Click to show description
 # Modules
 Module0Name=משתמשים להקות
-Module0Desc=משתמשים וניהול קבוצות
+Module0Desc=Users / Employees and Groups management
 Module1Name=צדדים שלישיים
 Module1Desc=חברות ניהול של איש הקשר
 Module2Name=מסחרי
@@ -689,7 +695,7 @@ PermissionAdvanced253=יצירה / שינוי משתמשים פנימיים / ח
 Permission254=יצירה / שינוי משתמשים חיצוניים בלבד
 Permission255=שינוי סיסמה משתמשים אחרים
 Permission256=מחיקה או ביטול של משתמשים אחרים
-Permission262=Extend access to all third parties (not only third parties that user is a sale representative). Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc). Not effective for projects (only rules on project permissions, visibility and assignement matters).
+Permission262=Extend access to all third parties (not only third parties that user is a sale representative).<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 assignement matters).
 Permission271=לקרוא CA
 Permission272=לקרוא חשבוניות
 Permission273=להוציא חשבוניות
@@ -891,7 +897,7 @@ Offset=לקזז
 AlwaysActive=פעיל תמיד
 Upgrade=שדרוג
 MenuUpgrade=שדרוג / הארך
-AddExtensionThemeModuleOrOther=הוסף הרחבה (נושא, מודול, ...)
+AddExtensionThemeModuleOrOther=Deploy/install external module
 WebServer=שרת אינטרנט
 DocumentRootServer=שורש מדריך אתרים שרת
 DataRootServer=קבצי נתונים בספרייה
@@ -1165,10 +1171,6 @@ FreeLegalTextOnOrders=טקסט חינם על הזמנות
 WatermarkOnDraftOrders=סימן מים על צווי הגיוס (כל אם ריק)
 ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable
 BANK_ASK_PAYMENT_BANK_DURING_ORDER=Ask for bank account destination of order
-##### Clicktodial #####
-ClickToDialSetup=לחץ כדי לחייג ההתקנה מודול
-ClickToDialUrlDesc=כתובת האתר נקרא כאשר לחיצה על הטלפון picto נעשה. ב-URL, ניתן להשתמש בתגיות <br> <b>__PHONETO__</b> כי יוחלף מספר הטלפון של אדם לקרוא <br> <b>__PHONEFROM__</b> כי יוחלף מספר הטלפון של אדם קורא (שלך) <br> <b>__LOGIN__</b> כי יוחלפו התחברות clicktodial שלך (המוגדר בכרטיס המשתמש שלך) <br> <b>__PASS__</b> כי יוחלף עם הסיסמה clicktodial שלך (המוגדר בכרטיס המשתמש שלך).
-##### Bookmark4u #####
 ##### Interventions #####
 InterventionsSetup=התערבויות מודול ההתקנה
 FreeLegalTextOnInterventions=טקסט חופשי במסמכים התערבות
@@ -1395,7 +1397,7 @@ SendingsSetup=שליחת ההתקנה מודול
 SendingsReceiptModel=שליחת מודל קבלת
 SendingsNumberingModules=Sendings מספור מודולים
 SendingsAbility=Support shipping sheets for customer deliveries
-NoNeedForDeliveryReceipts=ברוב המקרים, קבלות sendings משמשים הן יריעות עבור משלוחים של לקוחות (רשימת המוצרים לשלוח) ויריעות כי הוא recevied ונחתם על ידי הלקוח. אז משלוחים קבלות המוצר הוא תכונה כפולות מופעל לעתים נדירות.
+NoNeedForDeliveryReceipts=In most cases, shipping sheets are used both as sheets for customer deliveries (list of products to send) and sheets that is received and signed by customer. So product deliveries receipts is a duplicated feature and is rarely activated.
 FreeLegalTextOnShippings=Free text on shipments
 ##### Deliveries #####
 DeliveryOrderNumberingModules=מוצרים משלוחים מספור מודול קבלת
@@ -1477,7 +1479,9 @@ AGENDA_DEFAULT_FILTER_STATUS=Set automatically this status for events into searc
 AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
 AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
 AGENDA_NOTIFICATION_SOUND=Enable sound notification
-##### ClickToDial #####
+##### Clicktodial #####
+ClickToDialSetup=לחץ כדי לחייג ההתקנה מודול
+ClickToDialUrlDesc=כתובת האתר נקרא כאשר לחיצה על הטלפון picto נעשה. ב-URL, ניתן להשתמש בתגיות <br> <b>__PHONETO__</b> כי יוחלף מספר הטלפון של אדם לקרוא <br> <b>__PHONEFROM__</b> כי יוחלף מספר הטלפון של אדם קורא (שלך) <br> <b>__LOGIN__</b> כי יוחלפו התחברות clicktodial שלך (המוגדר בכרטיס המשתמש שלך) <br> <b>__PASS__</b> כי יוחלף עם הסיסמה clicktodial שלך (המוגדר בכרטיס המשתמש שלך).
 ClickToDialDesc=This module allows to make phone numbers clickable. A click on this icon will call make your phone to 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.
 ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
 ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on same computer than the browser, and called when you click on a link in your browser that start 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.
@@ -1505,10 +1509,11 @@ EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint availa
 ##### API ####
 ApiSetup=API module setup
 ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
-ApiProductionMode=Enable production mode (this will activate use of a caches for services management)
+ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
 ApiExporerIs=You can explore the APIs at url
 OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
 ApiKey=Key for API
+WarningAPIExplorerDisabled=The API explorer has been disabled. API explorer is not required to provide API services. It is a tool for developer to find/test REST APIs. If you need this tool, go into setup of module API REST to activate it.
 ##### Bank #####
 BankSetupModule=בנק ההתקנה מודול
 FreeLegalTextOnChequeReceipts=טקסט חופשי על קבלות הסימון
@@ -1577,7 +1582,7 @@ BackupDumpWizard=Wizard to build database backup dump file
 SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
 SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is only manual steps a privileged user can do.
 InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
-ConfFileMuseContainCustom=Installing an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to have option<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
+ConfFileMuseContainCustom=Installing an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
 HighlightLinesColor=Highlight color of the line when the mouse passes over (keep empty for no highlight)
 TextTitleColor=Color of page title
@@ -1607,6 +1612,7 @@ FixTZ=TimeZone fix
 FillFixTZOnlyIfRequired=Example: +2 (fill only if problem experienced)
 ExpectedChecksum=Expected Checksum
 CurrentChecksum=Current Checksum
+ForcedConstants=Required constant values
 MailToSendProposal=To send customer proposal
 MailToSendOrder=To send customer order
 MailToSendInvoice=To send customer invoice
@@ -1615,9 +1621,10 @@ MailToSendIntervention=To send intervention
 MailToSendSupplierRequestForQuotation=To send quotation request to supplier
 MailToSendSupplierOrder=To send supplier order
 MailToSendSupplierInvoice=To send supplier invoice
+MailToSendContract=To send a contract
 MailToThirdparty=To send email from third party page
 ByDefaultInList=Show by default on list view
-YouUseLastStableVersion=You use the last stable version
+YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
 TitleExampleForMaintenanceRelease=Example of message you can use to announce this maintenance release (feel free to use it on your web sites)
 ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. 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.
diff --git a/htdocs/langs/he_IL/banks.lang b/htdocs/langs/he_IL/banks.lang
index 7ae841cf0f3..f0c41d5d5bf 100644
--- a/htdocs/langs/he_IL/banks.lang
+++ b/htdocs/langs/he_IL/banks.lang
@@ -74,13 +74,13 @@ Conciliate=Reconcile
 Conciliation=Reconciliation
 ReconciliationLate=Reconciliation late
 IncludeClosedAccount=Include closed accounts
-OnlyOpenedAccount=Only open accounts
+OnlyOpenedAccount=Only opened accounts
 AccountToCredit=Account to credit
 AccountToDebit=Account to debit
 DisableConciliation=Disable reconciliation feature for this account
 ConciliationDisabled=Reconciliation feature disabled
 LinkedToAConciliatedTransaction=Linked to a conciliated entry
-StatusAccountOpened=Open
+StatusAccountOpened=Opened
 StatusAccountClosed=Closed
 AccountIdShort=Number
 LineRecord=Transaction
diff --git a/htdocs/langs/he_IL/bills.lang b/htdocs/langs/he_IL/bills.lang
index 9c65db8e0db..55338e46e0b 100644
--- a/htdocs/langs/he_IL/bills.lang
+++ b/htdocs/langs/he_IL/bills.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - bills
 Bill=Invoice
 Bills=חשבוניות
-BillsCustomers=Customers invoices
-BillsCustomer=Customers invoice
-BillsSuppliers=Suppliers invoices
-BillsCustomersUnpaid=Unpaid customers invoices
-BillsCustomersUnpaidForCompany=Unpaid customer's invoices for %s
-BillsSuppliersUnpaid=Unpaid supplier's invoices
-BillsSuppliersUnpaidForCompany=Unpaid supplier's invoices for %s
+BillsCustomers=Customer invoices
+BillsCustomer=Customer invoice
+BillsSuppliers=Supplier invoices
+BillsCustomersUnpaid=Unpaid customer invoices
+BillsCustomersUnpaidForCompany=Unpaid customer invoices for %s
+BillsSuppliersUnpaid=Unpaid supplier invoices
+BillsSuppliersUnpaidForCompany=Unpaid supplier invoices for %s
 BillsLate=Late payments
 BillsStatistics=Customers invoices statistics
 BillsStatisticsSuppliers=Suppliers invoices statistics
@@ -62,8 +62,8 @@ PaymentsBack=Payments back
 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 credit note or deposit 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.
+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.
 SupplierPayments=Suppliers payments
 ReceivedPayments=Received payments
 ReceivedCustomersPayments=Payments received from customers
@@ -78,6 +78,7 @@ PaymentMode=Payment type
 PaymentTypeDC=Debit/Credit Card
 PaymentTypePP=PayPal
 IdPaymentMode=Payment type (id)
+CodePaymentMode=Payment type (code)
 LabelPaymentMode=Payment type (label)
 PaymentModeShort=Payment type
 PaymentTerm=Payment term
@@ -102,9 +103,10 @@ SearchACustomerInvoice=Search for a customer invoice
 SearchASupplierInvoice=Search for a supplier invoice
 CancelBill=Cancel an invoice
 SendRemindByMail=Send reminder by EMail
-DoPayment=Do payment
-DoPaymentBack=Do payment back
+DoPayment=Enter payment
+DoPaymentBack=Enter refund
 ConvertToReduc=Convert into future discount
+ConvertExcessReceivedToReduc=Convert excess received into future discount
 EnterPaymentReceivedFromCustomer=Enter payment received from customer
 EnterPaymentDueToCustomer=Make payment due to customer
 DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
@@ -151,14 +153,14 @@ NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified
 FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
 NotARecurringInvoiceTemplate=Not a recurring template invoice
 NewBill=New invoice
-LastBills=Last %s invoices
-LastCustomersBills=Last %s customers invoices
-LastSuppliersBills=Last %s suppliers invoices
+LastBills=Latest %s invoices
+LastCustomersBills=Latest %s customer invoices
+LastSuppliersBills=Latest %s supplier invoices
 AllBills=All invoices
 OtherBills=Other invoices
 DraftBills=Draft invoices
-CustomersDraftInvoices=Customers draft invoices
-SuppliersDraftInvoices=Suppliers draft invoices
+CustomersDraftInvoices=Customer draft invoices
+SuppliersDraftInvoices=Supplier draft invoices
 Unpaid=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>?
@@ -272,6 +274,7 @@ Deposit=Deposit
 Deposits=Deposits
 DiscountFromCreditNote=Discount from credit note %s
 DiscountFromDeposit=Payments from deposit invoice %s
+DiscountFromExcessReceived=Payments from excess received of invoice %s
 AbsoluteDiscountUse=This kind of credit can be used on invoice before its validation
 CreditNoteDepositUse=Invoice must be validated to use this kind of credits
 NewGlobalDiscount=New absolute discount
@@ -279,8 +282,8 @@ NewRelativeDiscount=New relative discount
 NoteReason=Note/Reason
 ReasonDiscount=Reason
 DiscountOfferedBy=Granted by
-DiscountStillRemaining=Discounts still remaining
-DiscountAlreadyCounted=Discounts already counted
+DiscountStillRemaining=Discounts available
+DiscountAlreadyCounted=Discounts already consumed
 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.
@@ -333,6 +336,8 @@ 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
 # PaymentConditions
 Statut=Status
 PaymentConditionShortRECEP=Due Upon Receipt
@@ -351,6 +356,14 @@ PaymentConditionShortPT_ORDER=סדר
 PaymentConditionPT_ORDER=On order
 PaymentConditionShortPT_5050=50-50
 PaymentConditionPT_5050=50%% in advance, 50%% on delivery
+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
 FixAmount=Fix amount
 VarAmount=Variable amount (%% tot.)
 # PaymentType
@@ -420,7 +433,7 @@ ChequeDeposits=Checks deposits
 Cheques=Checks
 DepositId=Id deposit
 NbCheque=Number of checks
-CreditNoteConvertedIntoDiscount=This credit note or deposit invoice has been converted into %s
+CreditNoteConvertedIntoDiscount=This %s has been converted into %s
 UsBillingContactAsIncoiveRecipientIfExist=Use customer billing contact address instead of third party address as recipient for invoices
 ShowUnpaidAll=Show all unpaid invoices
 ShowUnpaidLateOnly=Show late unpaid invoices only
diff --git a/htdocs/langs/he_IL/boxes.lang b/htdocs/langs/he_IL/boxes.lang
index 5c510a2da5d..f17876b7f52 100644
--- a/htdocs/langs/he_IL/boxes.lang
+++ b/htdocs/langs/he_IL/boxes.lang
@@ -25,8 +25,8 @@ BoxTitleLastSuppliers=Latest %s recorded suppliers
 BoxTitleLastModifiedSuppliers=Latest %s modified suppliers
 BoxTitleLastModifiedCustomers=Latest %s modified customers
 BoxTitleLastCustomersOrProspects=Latest %s customers or prospects
-BoxTitleLastCustomerBills=Latest %s customer's invoices
-BoxTitleLastSupplierBills=Latest %s supplier's invoices
+BoxTitleLastCustomerBills=Latest %s customer invoices
+BoxTitleLastSupplierBills=Latest %s supplier invoices
 BoxTitleLastModifiedProspects=Latest %s modified prospects
 BoxTitleLastModifiedMembers=Latest %s members
 BoxTitleLastFicheInter=Latest %s modified interventions
@@ -51,12 +51,12 @@ ClickToAdd=Click here to add.
 NoRecordedCustomers=No recorded customers
 NoRecordedContacts=No recorded contacts
 NoActionsToDo=No actions to do
-NoRecordedOrders=No recorded customer's orders
+NoRecordedOrders=No recorded customer orders
 NoRecordedProposals=No recorded proposals
-NoRecordedInvoices=No recorded customer's invoices
-NoUnpaidCustomerBills=No unpaid customer's invoices
-NoUnpaidSupplierBills=No unpaid supplier's invoices
-NoModifiedSupplierBills=No recorded supplier's invoices
+NoRecordedInvoices=No recorded customer invoices
+NoUnpaidCustomerBills=No unpaid customer invoices
+NoUnpaidSupplierBills=No unpaid supplier invoices
+NoModifiedSupplierBills=No recorded supplier invoices
 NoRecordedProducts=No recorded products/services
 NoRecordedProspects=No recorded prospects
 NoContractedProducts=No products/services contracted
diff --git a/htdocs/langs/he_IL/companies.lang b/htdocs/langs/he_IL/companies.lang
index 56828e5ddf3..1d5fa3da993 100644
--- a/htdocs/langs/he_IL/companies.lang
+++ b/htdocs/langs/he_IL/companies.lang
@@ -81,6 +81,7 @@ PaymentBankAccount=Payment bank account
 OverAllProposals=Total proposals
 OverAllOrders=Total orders
 OverAllInvoices=Total invoices
+OverAllSupplierProposals=Total price requests
 ##### Local Taxes #####
 LocalTax1IsUsed=Use second tax
 LocalTax1IsUsedES= RE is used
@@ -389,7 +390,7 @@ ListCustomersShort=רשימת לקוחות
 ThirdPartiesArea=Third parties and contact area
 LastModifiedThirdParties=Latest %s modified third parties
 UniqueThirdParties=Total of unique third parties
-InActivity=Open
+InActivity=Opened
 ActivityCeased=Closed
 ThirdPartyIsClosed=Third party is closed
 ProductsIntoElements=List of products/services into %s
@@ -404,7 +405,7 @@ MergeThirdparties=Merge third parties
 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 so you will be able to delete the duplicate one.
 ThirdpartiesMergeSuccess=Thirdparties have been merged
 SaleRepresentativeLogin=Login of sales representative
-SaleRepresentativeFirstname=Firstname of sales representative
-SaleRepresentativeLastname=Lastname of sales representative
+SaleRepresentativeFirstname=First name of sales representative
+SaleRepresentativeLastname=Last name of sales representative
 ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
 NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/he_IL/compta.lang b/htdocs/langs/he_IL/compta.lang
index 5c9710d13ec..ae9d9019fb1 100644
--- a/htdocs/langs/he_IL/compta.lang
+++ b/htdocs/langs/he_IL/compta.lang
@@ -65,6 +65,7 @@ PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=VAT payment
 ListPayment=List of payments
 ListOfCustomerPayments=List of customer payments
+ListOfSupplierPayments=List of supplier payments
 DateStartPeriod=Date start period
 DateEndPeriod=Date end period
 newLT1Payment=New tax 2 payment
@@ -81,7 +82,7 @@ LT2PaymentES=IRPF Payment
 LT2PaymentsES=IRPF Payments
 VATPayment=Sales tax payment
 VATPayments=Sales tax payments
-VATRefund=Sales tax refund Refund
+VATRefund=Sales tax refund
 Refund=Refund
 SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Show VAT payment
diff --git a/htdocs/langs/he_IL/cron.lang b/htdocs/langs/he_IL/cron.lang
index cb68b31c80f..b1e8bcb36d2 100644
--- a/htdocs/langs/he_IL/cron.lang
+++ b/htdocs/langs/he_IL/cron.lang
@@ -17,14 +17,14 @@ CronMethodDoesNotExists=Class %s does not contains any method %s
 # Menu
 EnabledAndDisabled=Enabled and disabled
 # Page list
-CronLastOutput=Last run output
-CronLastResult=Last result code
+CronLastOutput=Latest run output
+CronLastResult=Latest result code
 CronCommand=Command
 CronList=Scheduled jobs
 CronDelete=Delete scheduled jobs
-CronConfirmDelete=Are you sure you want to delete these scheduled jobs ?
+CronConfirmDelete=Are you sure you want to delete these scheduled jobs?
 CronExecute=Launch scheduled job
-CronConfirmExecute=Are you sure you want to execute these scheduled jobs now ?
+CronConfirmExecute=Are you sure you want to execute these scheduled jobs now?
 CronInfo=Scheduled job module allow to execute job that have been planned
 CronTask=Job
 CronNone=None
diff --git a/htdocs/langs/he_IL/errors.lang b/htdocs/langs/he_IL/errors.lang
index 629f063be37..9e2eb6817ef 100644
--- a/htdocs/langs/he_IL/errors.lang
+++ b/htdocs/langs/he_IL/errors.lang
@@ -11,6 +11,7 @@ ErrorLoginAlreadyExists=Login %s already exists.
 ErrorGroupAlreadyExists=Group %s already exists.
 ErrorRecordNotFound=Record not found.
 ErrorFailToCopyFile=Failed to copy file '<b>%s</b>' into '<b>%s</b>'.
+ErrorFailToCopyDir=Failed to copy directory '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToRenameFile=Failed to rename file '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToDeleteFile=Failed to remove file '<b>%s</b>'.
 ErrorFailToCreateFile=Failed to create file '<b>%s</b>'.
@@ -115,7 +116,7 @@ ErrorNoActivatedBarcode=No barcode type activated
 ErrUnzipFails=Failed to unzip %s with ZipArchive
 ErrNoZipEngine=No engine to unzip %s file in this PHP
 ErrorFileMustBeADolibarrPackage=The file %s must be a Dolibarr zip package
-ErrorFileRequired=It takes a package Dolibarr file
+ErrorModuleFileRequired=You must select a Dolibarr module package file
 ErrorPhpCurlNotInstalled=The PHP CURL is not installed, this is essential to talk with 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
@@ -181,6 +182,8 @@ ErrorBankStatementNameMustFollowRegex=Error, bank statement name must follow the
 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>
 
 # 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.
diff --git a/htdocs/langs/he_IL/holiday.lang b/htdocs/langs/he_IL/holiday.lang
index 57f93d00f03..c0bfa960e21 100644
--- a/htdocs/langs/he_IL/holiday.lang
+++ b/htdocs/langs/he_IL/holiday.lang
@@ -76,8 +76,8 @@ BoxTitleLastLeaveRequests=Latest %s modified leave requests
 HolidaysMonthlyUpdate=Monthly update
 ManualUpdate=Manual update
 HolidaysCancelation=Leave request cancelation
-EmployeeLastname=Employee lastname
-EmployeeFirstname=Employee firstname
+EmployeeLastname=Employee last name
+EmployeeFirstname=Employee first name
 TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
 
 ## Configuration du Module ##
diff --git a/htdocs/langs/he_IL/ldap.lang b/htdocs/langs/he_IL/ldap.lang
index a17019d00fb..42e699de311 100644
--- a/htdocs/langs/he_IL/ldap.lang
+++ b/htdocs/langs/he_IL/ldap.lang
@@ -13,8 +13,8 @@ LDAPUsers=Users in LDAP database
 LDAPFieldStatus=Status
 LDAPFieldFirstSubscriptionDate=First subscription date
 LDAPFieldFirstSubscriptionAmount=First subscription amount
-LDAPFieldLastSubscriptionDate=Last subscription date
-LDAPFieldLastSubscriptionAmount=Last subscription amount
+LDAPFieldLastSubscriptionDate=Latest subscription date
+LDAPFieldLastSubscriptionAmount=Latest subscription amount
 LDAPFieldSkype=Skype id
 LDAPFieldSkypeExample=Example : skypeName
 UserSynchronized=User synchronized
diff --git a/htdocs/langs/he_IL/mails.lang b/htdocs/langs/he_IL/mails.lang
index 00bb1d9c72a..1b55ea13034 100644
--- a/htdocs/langs/he_IL/mails.lang
+++ b/htdocs/langs/he_IL/mails.lang
@@ -74,14 +74,18 @@ ResultOfMailSending=Result of mass EMail sending
 NbSelected=Nb selected
 NbIgnored=Nb ignored
 NbSent=Nb sent
-ContactsWithThirdpartyFilter=Contact with customer filters
+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
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Line %s in file
 RecipientSelectionModules=Defined requests for recipient's selection
 MailSelectedRecipients=Selected recipients
 MailingArea=EMailings area
-LastMailings=Last %s emailings
+LastMailings=Latest %s emailings
 TargetsStatistics=Targets statistics
 NbOfCompaniesContacts=Unique contacts/addresses
 MailNoChangePossible=Recipients for validated emailing can't be changed
@@ -146,3 +150,6 @@ AdvTgtCreateFilter=Create filter
 AdvTgtOrCreateNewFilter=Name of new filter
 NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
+OutGoingEmailSetup=Outgoing email setup
+InGoingEmailSetup=Incoming email setup
+
diff --git a/htdocs/langs/he_IL/main.lang b/htdocs/langs/he_IL/main.lang
index 8cf35a0e217..53b993292cd 100644
--- a/htdocs/langs/he_IL/main.lang
+++ b/htdocs/langs/he_IL/main.lang
@@ -69,6 +69,7 @@ SetDate=Set date
 SelectDate=Select a date
 SeeAlso=See also %s
 SeeHere=See here
+Apply=Apply
 BackgroundColorByDefault=Default background color
 FileRenamed=The file was successfully renamed
 FileUploaded=The file was successfully uploaded
@@ -87,7 +88,7 @@ Undefined=Undefined
 PasswordForgotten=Password forgotten?
 SeeAbove=See above
 HomeArea=Home area
-LastConnexion=Last connection
+LastConnexion=Latest connection
 PreviousConnexion=Previous connection
 PreviousValue=Previous value
 ConnectedOnMultiCompany=Connected on environment
@@ -237,7 +238,7 @@ DateCreation=Creation date
 DateCreationShort=Creat. date
 DateModification=Modification date
 DateModificationShort=Modif. date
-DateLastModification=Last modification date
+DateLastModification=Latest modification date
 DateValidation=Validation date
 DateClosing=Closing date
 DateDue=Due date
@@ -433,7 +434,7 @@ Reportings=Reporting
 Draft=Draft
 Drafts=Drafts
 Validated=Validated
-Opened=Open
+Opened=Opened
 New=New
 Discount=Discount
 Unknown=לא ידוע
@@ -599,6 +600,8 @@ SessionName=Session name
 Method=Method
 Receive=Receive
 CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
+ExpectedValue=Expected Value
+CurrentValue=Current value
 PartialWoman=Partial
 TotalWoman=Total
 NeverReceived=Never received
@@ -756,6 +759,7 @@ SomeTranslationAreUncomplete=Some languages may be partially translated or may c
 DirectDownloadLink=Direct download link
 Download=Download
 ActualizeCurrency=Update currency rate
+Fiscalyear=Fiscal year
 # Week day
 Monday=Monday
 Tuesday=Tuesday
@@ -812,3 +816,5 @@ SearchIntoContracts=חוזים
 SearchIntoCustomerShipments=Customer shipments
 SearchIntoExpenseReports=Expense reports
 SearchIntoLeaves=Leaves
+
+BulkActions=Bulk actions
diff --git a/htdocs/langs/he_IL/members.lang b/htdocs/langs/he_IL/members.lang
index 7816c8573cd..9bc61ce6fc5 100644
--- a/htdocs/langs/he_IL/members.lang
+++ b/htdocs/langs/he_IL/members.lang
@@ -136,8 +136,8 @@ DocForAllMembersCards=Generate business cards for all members
 DocForOneMemberCards=Generate business cards for a particular member
 DocForLabels=Generate address sheets
 SubscriptionPayment=Subscription payment
-LastSubscriptionDate=Last subscription date
-LastSubscriptionAmount=Last subscription amount
+LastSubscriptionDate=Latest subscription date
+LastSubscriptionAmount=Latest subscription amount
 MembersStatisticsByCountries=Members statistics by country
 MembersStatisticsByState=Members statistics by state/province
 MembersStatisticsByTown=Members statistics by town
@@ -149,7 +149,7 @@ MembersByStateDesc=This screen show you statistics on members by state/provinces
 MembersByTownDesc=This screen show you statistics on members by town.
 MembersStatisticsDesc=Choose statistics you want to read...
 MenuMembersStats=Statistics
-LastMemberDate=Last member date
+LastMemberDate=Latest member date
 Nature=Nature
 Public=Information are public
 NewMemberbyWeb=New member added. Awaiting approval
diff --git a/htdocs/langs/he_IL/orders.lang b/htdocs/langs/he_IL/orders.lang
index 5cd760f8df4..428229faa13 100644
--- a/htdocs/langs/he_IL/orders.lang
+++ b/htdocs/langs/he_IL/orders.lang
@@ -39,7 +39,7 @@ StatusOrderRefusedShort=Refused
 StatusOrderBilledShort=Billed
 StatusOrderToProcessShort=To process
 StatusOrderReceivedPartiallyShort=Partially received
-StatusOrderReceivedAllShort=Everything received
+StatusOrderReceivedAllShort=Products received
 StatusOrderCanceled=Canceled
 StatusOrderDraft=Draft (needs to be validated)
 StatusOrderValidated=Validated
@@ -51,7 +51,7 @@ StatusOrderApproved=Approved
 StatusOrderRefused=Refused
 StatusOrderBilled=Billed
 StatusOrderReceivedPartially=Partially received
-StatusOrderReceivedAll=Everything received
+StatusOrderReceivedAll=All products received
 ShippingExist=A shipment exists
 QtyOrdered=Qty ordered
 ProductQtyInDraft=Product quantity into draft orders
diff --git a/htdocs/langs/he_IL/other.lang b/htdocs/langs/he_IL/other.lang
index 7ff30f30a50..ba4a8398a3b 100644
--- a/htdocs/langs/he_IL/other.lang
+++ b/htdocs/langs/he_IL/other.lang
@@ -68,14 +68,15 @@ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find her
 PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nYou will find here the shipping __SHIPPINGREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nYou will find here the intervention __FICHINTERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n__PERSONALIZED__\n\n__SIGNATURE__
-DemoDesc=Dolibarr is a compact ERP/CRM supporting several functional modules. A demo showcasing all modules makes no sense as this scenario never occurs. So, several demo profiles are available.
+DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
+ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
 DemoFundation=Manage members of a foundation
 DemoFundation2=Manage members and bank account of a foundation
-DemoCompanyServiceOnly=Manage a freelance activity selling service only
+DemoCompanyServiceOnly=Company or freelance selling service only
 DemoCompanyShopWithCashDesk=Manage a shop with a cash desk
-DemoCompanyProductAndStocks=Manage a small or medium company selling products
-DemoCompanyAll=Manage a small or medium company with multiple activities (all main modules)
+DemoCompanyProductAndStocks=Company selling products with a shop
+DemoCompanyAll=Company with multiple activities (all main modules)
 CreatedBy=Created by %s
 ModifiedBy=Modified by %s
 ValidatedBy=Validated by %s
diff --git a/htdocs/langs/he_IL/products.lang b/htdocs/langs/he_IL/products.lang
index db157be333f..abc093b0803 100644
--- a/htdocs/langs/he_IL/products.lang
+++ b/htdocs/langs/he_IL/products.lang
@@ -60,7 +60,7 @@ SellingPrice=Selling price
 SellingPriceHT=Selling price (net of tax)
 SellingPriceTTC=Selling price (inc. tax)
 CostPriceDescription=This price (net of tax) can be used to store the average amount this product cost to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
-CostPriceUsage=In a future version, this value could be used for margin calculation.
+CostPriceUsage=This value could be used for margin calculation.
 SoldAmount=Sold amount
 PurchasedAmount=Purchased amount
 NewPrice=New price
@@ -142,6 +142,7 @@ ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b>?
 CloneContentProduct=Clone all main informations of product/service
 ClonePricesProduct=Clone main informations and prices
 CloneCompositionProduct=Clone packaged product/service
+CloneCombinationsProduct=Clone product variants
 ProductIsUsed=This product is used
 NewRefForClone=Ref. of new product/service
 SellingPrices=Selling prices
@@ -238,7 +239,7 @@ GlobalVariables=Global variables
 VariableToUpdate=Variable to update
 GlobalVariableUpdaters=Global variable updaters
 UpdateInterval=Update interval (minutes)
-LastUpdated=Last updated
+LastUpdated=Latest update
 CorrectlyUpdated=Correctly updated
 PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
 PropalMergePdfProductChooseFile=Select PDF files
@@ -258,4 +259,41 @@ VolumeUnits=Volume unit
 SizeUnits=Size unit
 DeleteProductBuyPrice=Delete buying price
 ConfirmDeleteProductBuyPrice=Are you sure you want to delete this buying price?
+SubProduct=Sub product
 
+#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
+ProductCombinations=Variants
+HideProductCombinations=Hide products variant in the products selector
+ProductCombination=Variant
+NewProductCombination=New variant
+EditProductCombination=Editing variant
+ProductCombinationGenerator=Variants generator
+Features=Features
+PriceImpact=Price impact
+WeightImpact=Weight impact
+NewProductAttribute=New attribute
+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
+PercentageVariation=Percentage variation
+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 child products
+ConfirmCloneProductCombinations=Would you like to copy all the product variant to the 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
diff --git a/htdocs/langs/he_IL/projects.lang b/htdocs/langs/he_IL/projects.lang
index 8c9a1166899..3f2e1c48449 100644
--- a/htdocs/langs/he_IL/projects.lang
+++ b/htdocs/langs/he_IL/projects.lang
@@ -29,9 +29,9 @@ DeleteAProject=Delete a project
 DeleteATask=Delete a task
 ConfirmDeleteAProject=Are you sure you want to delete this project?
 ConfirmDeleteATask=Are you sure you want to delete this task?
-OpenedProjects=Open projects
-OpenedTasks=Open tasks
-OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
+OpenedProjects=Opened projects
+OpenedTasks=Opened tasks
+OpportunitiesStatusForOpenedProjects=Opportunities amount of opened projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=Show project
 SetProject=Set project
@@ -47,7 +47,7 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
 TaskTimeDate=Date
-TasksOnOpenedProject=Tasks on open projects
+TasksOnOpenedProject=Tasks on opened projects
 WorkloadNotDefined=Workload not defined
 NewTimeSpent=New time spent
 MyTimeSpent=My time spent
@@ -96,6 +96,7 @@ ValidateProject=Validate projet
 ConfirmValidateProject=Are you sure you want to validate this project?
 CloseAProject=Close project
 ConfirmCloseAProject=Are you sure you want to close this project?
+AlsoCloseAProject=Also close project (keep it open if you still need to follow production tasks on it)
 ReOpenAProject=Open project
 ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=Project contacts
@@ -121,7 +122,7 @@ CloneProjectFiles=Clone project joined files
 CloneTaskFiles=Clone task(s) joined files (if task(s) cloned)
 CloneMoveDate=Update project/tasks dates from now?
 ConfirmCloneProject=Are you sure to clone this project?
-ProjectReportDate=Change task date according project start date
+ProjectReportDate=Change task dates according to new project start date
 ErrorShiftTaskDate=Impossible to shift task date according to new project start date
 ProjectsAndTasksLines=Projects and tasks
 ProjectCreatedInDolibarr=Project %s created
@@ -178,9 +179,9 @@ ProjectsStatistics=Statistics on projects/leads
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 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.
-OpenedProjectsByThirdparties=Open projects by thirdparties
+OpenedProjectsByThirdparties=Opened projects by thirdparties
 OnlyOpportunitiesShort=Only opportunities
-OpenedOpportunitiesShort=Open opportunities
+OpenedOpportunitiesShort=Opened opportunities
 NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount
diff --git a/htdocs/langs/he_IL/propal.lang b/htdocs/langs/he_IL/propal.lang
index 0ee2d61218a..195ed1bb2ed 100644
--- a/htdocs/langs/he_IL/propal.lang
+++ b/htdocs/langs/he_IL/propal.lang
@@ -3,7 +3,7 @@ Proposals=Commercial proposals
 Proposal=Commercial proposal
 ProposalShort=Proposal
 ProposalsDraft=Draft commercial proposals
-ProposalsOpened=Open commercial proposals
+ProposalsOpened=Opened commercial proposals
 Prop=Commercial proposals
 CommercialProposal=Commercial proposal
 ProposalCard=Proposal card
@@ -26,9 +26,9 @@ AmountOfProposalsByMonthHT=Amount by month (net of tax)
 NbOfProposals=Number of commercial proposals
 ShowPropal=Show proposal
 PropalsDraft=Drafts
-PropalsOpened=Open
+PropalsOpened=Opened
 PropalStatusDraft=Draft (needs to be validated)
-PropalStatusValidated=Validated (proposal is open)
+PropalStatusValidated=Validated (proposal is opened)
 PropalStatusSigned=Signed (needs billing)
 PropalStatusNotSigned=Not signed (closed)
 PropalStatusBilled=Billed
diff --git a/htdocs/langs/he_IL/stocks.lang b/htdocs/langs/he_IL/stocks.lang
index b740167c583..e906c245f8c 100644
--- a/htdocs/langs/he_IL/stocks.lang
+++ b/htdocs/langs/he_IL/stocks.lang
@@ -22,13 +22,15 @@ Movements=Movements
 ErrorWarehouseRefRequired=Warehouse reference name is required
 ListOfWarehouses=List of warehouses
 ListOfStockMovements=List of stock movements
+StockMovementForId=Movement ID %d
+ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Warehouses area
 Location=Location
 LocationSummary=Short name location
 NumberOfDifferentProducts=Number of different products
 NumberOfProducts=Total number of products
-LastMovement=Last movement
-LastMovements=Last movements
+LastMovement=Latest movement
+LastMovements=Latest movements
 Units=Units
 Unit=Unit
 StockCorrection=Correct stock
diff --git a/htdocs/langs/he_IL/supplier_proposal.lang b/htdocs/langs/he_IL/supplier_proposal.lang
index 621d7784e35..61b031459b0 100644
--- a/htdocs/langs/he_IL/supplier_proposal.lang
+++ b/htdocs/langs/he_IL/supplier_proposal.lang
@@ -8,7 +8,7 @@ SearchRequest=Find a request
 DraftRequests=Draft requests
 SupplierProposalsDraft=Draft supplier proposals
 LastModifiedRequests=Latest %s modified price requests
-RequestsOpened=Open price requests
+RequestsOpened=Opened price requests
 SupplierProposalArea=Supplier proposals area
 SupplierProposalShort=Supplier proposal
 SupplierProposals=Supplier proposals
@@ -23,7 +23,7 @@ ConfirmValidateAsk=Are you sure you want to validate this price request under na
 DeleteAsk=Delete request
 ValidateAsk=Validate request
 SupplierProposalStatusDraft=Draft (needs to be validated)
-SupplierProposalStatusValidated=Validated (request is open)
+SupplierProposalStatusValidated=Validated (request is opened)
 SupplierProposalStatusClosed=Closed
 SupplierProposalStatusSigned=Accepted
 SupplierProposalStatusNotSigned=Refused
diff --git a/htdocs/langs/he_IL/suppliers.lang b/htdocs/langs/he_IL/suppliers.lang
index dc8cf83599e..60b76686563 100644
--- a/htdocs/langs/he_IL/suppliers.lang
+++ b/htdocs/langs/he_IL/suppliers.lang
@@ -24,10 +24,10 @@ ExportDataset_fournisseur_1=Supplier invoices list and invoice lines
 ExportDataset_fournisseur_2=Supplier invoices and payments
 ExportDataset_fournisseur_3=Supplier orders and order lines
 ApproveThisOrder=Approve this order
-ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b> ?
+ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b>?
 DenyingThisOrder=Deny this order
-ConfirmDenyingThisOrder=Are you sure you want to deny this order <b>%s</b> ?
-ConfirmCancelThisOrder=Are you sure you want to cancel this order <b>%s</b> ?
+ConfirmDenyingThisOrder=Are you sure you want to deny this order <b>%s</b>?
+ConfirmCancelThisOrder=Are you sure you want to cancel this order <b>%s</b>?
 AddSupplierOrder=Create supplier order
 AddSupplierInvoice=Create supplier invoice
 ListOfSupplierProductForSupplier=List of products and prices for supplier <b>%s</b>
@@ -41,3 +41,4 @@ DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Wrong quality
 ReputationForThisProduct=Reputation
 BuyerName=Buyer name
+AllProductServicePrices=All product / service prices
diff --git a/htdocs/langs/he_IL/users.lang b/htdocs/langs/he_IL/users.lang
index 4e1c0910ea0..cf67b99c316 100644
--- a/htdocs/langs/he_IL/users.lang
+++ b/htdocs/langs/he_IL/users.lang
@@ -36,7 +36,7 @@ AdministratorDesc=Administrator
 DefaultRights=Default permissions
 DefaultRightsDesc=Define here <u>default</u> permissions that are automatically granted to a <u>new created</u> user (Go on user card to change permission of an existing user).
 DolibarrUsers=Dolibarr users
-LastName=Last Name
+LastName=Last name
 FirstName=שם פרטי
 ListOfGroups=List of groups
 NewGroup=New group
diff --git a/htdocs/langs/he_IL/withdrawals.lang b/htdocs/langs/he_IL/withdrawals.lang
index 6e560a1abb1..a99d890e5f9 100644
--- a/htdocs/langs/he_IL/withdrawals.lang
+++ b/htdocs/langs/he_IL/withdrawals.lang
@@ -24,6 +24,7 @@ WithdrawStatistics=Direct debit payment statistics
 WithdrawRejectStatistics=Direct debit payment reject statistics
 LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
+WithdrawRequestsDone=%s direct debit payment requests recorded
 ThirdPartyBankCode=Third party bank code
 NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoice are on companies with a valid BAN.
 ClassCredited=Classify credited
@@ -76,8 +77,8 @@ RUM=UMR
 RUMLong=Unique Mandate Reference
 RUMWillBeGenerated=UMR number will be generated once bank account information are saved
 WithdrawMode=Direct debit mode (FRST or RECUR)
-WithdrawRequestAmount=Withdraw request amount:
-WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil amount.
+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
diff --git a/htdocs/langs/hr_HR/accountancy.lang b/htdocs/langs/hr_HR/accountancy.lang
index 34d34840297..896f98e2c24 100644
--- a/htdocs/langs/hr_HR/accountancy.lang
+++ b/htdocs/langs/hr_HR/accountancy.lang
@@ -194,6 +194,8 @@ ChangeBinding=Change the binding
 
 ## Admin
 ApplyMassCategories=Primjeni masovne kategorije
+AddAccountFromBookKeepingWithNoCategories=Add acccount already used with no categories
+CategoryDeleted=Category for the accounting account has been removed
 
 ## Export
 Exports=Exports
@@ -209,6 +211,7 @@ Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution
 Modelcsv_quadratus=Export towards Quadratus QuadraCompta
 Modelcsv_ebp=Export towards EBP
 Modelcsv_cogilog=Export towards Cogilog
+ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
 InitAccountancy=Inicijalizacija računovodstva
diff --git a/htdocs/langs/hr_HR/admin.lang b/htdocs/langs/hr_HR/admin.lang
index ed5c811f129..52018da6572 100644
--- a/htdocs/langs/hr_HR/admin.lang
+++ b/htdocs/langs/hr_HR/admin.lang
@@ -9,17 +9,20 @@ VersionDevelopment=Razvoj
 VersionUnknown=Nepoznato
 VersionRecommanded=Preporučeno
 FileCheck=Files integrity checker
-FileCheckDesc=This tool allows you to check the integrity of files of your application, comparing each files with the official ones. You can use this tool to detect if some files were modified by a hacker for example.
+FileCheckDesc=This tool allows you to check the integrity of files and setup of your application, comparing each files with the official ones. 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.
 FileIntegrityIsStrictlyConformedWithReference=Files integrity is strictly conformed with the reference.
-FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified of removed.
+FileIntegrityIsOkButFilesWereAdded=Files integrity check has passed, however some new files were added.
+FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified, removed or added.
 GlobalChecksum=Global checksum
 MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
 LocalSignature=Embedded local signature (less reliable)
 RemoteSignature=Remote distant signature (more reliable)
 FilesMissing=Nedostaju datoteke
 FilesUpdated=Nadograđene datoteke
+FilesModified=Modified Files
+FilesAdded=Added Files
 FileCheckDolibarr=Check integrity of application files
-AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from a certified package
+AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from an official package
 XmlNotFound=Xml Integrity File of application not found
 SessionId=ID Sesije
 SessionSaveHandler=Rukovatelj za spremanje sesije
@@ -188,7 +191,9 @@ BoxesDesc=Widgets are components showing some information that you can add to pe
 OnlyActiveElementsAreShown=Prikazani su samo elementi sa  <a href="%s">omogučenih modula</a>
 ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
 ModulesMarketPlaceDesc=Možete pronaći više modula za download na vanjskim internet web lokacijama 
-ModulesMarketPlaces=Više modula...
+ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
+ModulesMarketPlaces=Find external modules...
+GoModuleSetupArea=To deploy/install a new module, go onto the Module setup area at <a href="%s">%s</a>.
 DoliStoreDesc=DoliStorel, ovlaštena trgovina za Dolibarr ERP/CRM dodatne module
 DoliPartnersDesc=List of companies providing custom developed modules or features (Note: anyone experienced in PHP programming can provide custom development for an open source project)
 WebSiteDesc=Referentne web lokacije za pronalazak više modula
@@ -280,20 +285,21 @@ MenuHandlers=Nosioci izbornka
 MenuAdmin=Uređivač izbornika
 DoNotUseInProduction=Nemojte koristiti u stvarnom okruženju
 ThisIsProcessToFollow=This is steps to process:
-ThisIsAlternativeProcessToFollow=Ovo je alternativno podešavanje za obradu:
+ThisIsAlternativeProcessToFollow=This is an alternative setup to process manually:
 StepNb=Korak %s
 FindPackageFromWebSite=Pronađite paket koji pruža željenu mogučnost ( npr. ovlaštena web lokacija %s).
 DownloadPackageFromWebSite=Download paketa (npr. sa ovlaštene web lokacije %s)
-UnpackPackageInDolibarrRoot=Raspakirajte paket u Dolibarr serversku mapu za vanjske module:
-SetupIsReadyForUse=Instalacija je završena i Dolibarr je spreman za korištenje nove komponente.
-NotExistsDirect=Alternativna root mapa nije definirana. <br>
-InfDirAlt=Since version 3 it is possible to define an alternative root directory.This allows you to store, same place, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
-InfDirExample=<br>Then declare it in the file conf.php<br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>*These lines are commented with "#", to uncomment only remove the character.
+UnpackPackageInDolibarrRoot=Unpack the packaged files into server directory dedicated to Dolibarr: <b>%s</b>
+UnpackPackageInModulesRoot=To deploy/install an external module, unpack the packaged files into the server directory dedicated to modules: <b>%s</b>
+SetupIsReadyForUse=Module deployment is finished. You must however enable and setup the module in your application by going on the page to setup modules: <a href="%s">%s</a>.
+NotExistsDirect=The alternative root directory is not defined to an existing directory.<br>
+InfDirAlt=Since version 3, it is possible to define an alternative root directory. This allows you to store, into a dedicated directory, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
+InfDirExample=<br>Then declare it in the file <strong>conf.php</strong><br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>If these lines are commented with "#", to enable them, just uncomment by removing the "#" character.
 YouCanSubmitFile=Ovo je prvi korak, možete poslati paket koristeći ovaj alat: Odaberite datoteke modula
 CurrentVersion=Trenutna verzija Dolibarr-a
 CallUpdatePage=Idite na stranicu koja nadograđuje strukturu baze i podatke: %s
 LastStableVersion=Zadnja stabilna verzija
-LastActivationDate=Last activation date
+LastActivationDate=Latest activation date
 UpdateServerOffline=Nadogradi server offline
 GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s. <br><b>{000000@x}</b> same as previous but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
 GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
@@ -376,11 +382,11 @@ ExtrafieldCheckBox=Checkbox
 ExtrafieldRadio=Radio button
 ExtrafieldCheckBoxFromList= Checkbox from table
 ExtrafieldLink=Poveži s objektom
-ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>In order to have the list depending on another :<br>1,value1|parent_list_code:parent_key<br>2,value2|parent_list_code:parent_key
+ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list :<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list :<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
-ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
+ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Example : Societe:societe/class/societe.class.php
 LibraryToBuildPDF=Biblioteka korištena za kreiranje PDF-a
 WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
@@ -415,10 +421,10 @@ ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The cod
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Koristi 3 koraka odobravanja kada je iznos (bez poreza) veći od...
 WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<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).
-
+ClickToShowDescription=Click to show description
 # Modules
 Module0Name=Korisnici i grupe
-Module0Desc=Upravljanje korisnicima i grupama
+Module0Desc=Users / Employees and Groups management
 Module1Name=Komitenti
 Module1Desc=Upravljanje tvrtkama i kontaktima (kupci, potencijalni kupci, ...)
 Module2Name=Komercijala
@@ -689,7 +695,7 @@ PermissionAdvanced253=Kreiraj/izmjeni interne/vanjske korisnike i dozvole
 Permission254=Kreiraj/izmjeni samo vanjske korisnike
 Permission255=Izmjeni lozinku ostalih korisnika
 Permission256=Obriši ili isključi ostale korisnike
-Permission262=Extend access to all third parties (not only third parties that user is a sale representative). Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc). Not effective for projects (only rules on project permissions, visibility and assignement matters).
+Permission262=Extend access to all third parties (not only third parties that user is a sale representative).<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 assignement matters).
 Permission271=Čitaj CA
 Permission272=Čitaj račune
 Permission273=Izdaj račun
@@ -891,7 +897,7 @@ Offset=Offset
 AlwaysActive=Uvjek aktivno
 Upgrade=Nadogradnja
 MenuUpgrade=Nadogradnja / Proširivanje
-AddExtensionThemeModuleOrOther=Dodaj proširenje (tema, modul, ...)
+AddExtensionThemeModuleOrOther=Deploy/install external module
 WebServer=Web server
 DocumentRootServer=Web server korjenska mapa
 DataRootServer=Mapa datoteka
@@ -1165,10 +1171,6 @@ FreeLegalTextOnOrders=Slobodan unos teksta na narudžbama
 WatermarkOnDraftOrders=Vodeni žig na narudžbama (ništa ako se ostavi prazno)
 ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable
 BANK_ASK_PAYMENT_BANK_DURING_ORDER=Traži odredišni bankovni račun narudžbe
-##### Clicktodial #####
-ClickToDialSetup=Podešavanje modula ClickToDial
-ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with your clicktodial login (defined on your user card)<br><b>__PASS__</b> that will be replaced with your clicktodial password (defined on your user card).
-##### Bookmark4u #####
 ##### Interventions #####
 InterventionsSetup=Podešavanje modula intervencija
 FreeLegalTextOnInterventions=Slobodan unos teksta na dokumentima intervencija
@@ -1395,7 +1397,7 @@ SendingsSetup=Podešavanje modula slanja
 SendingsReceiptModel=Model primke slanja
 SendingsNumberingModules=Način označavanja slanja
 SendingsAbility=Podrži liste isporuke za dostave kupcima
-NoNeedForDeliveryReceipts=In most cases, sendings receipts are used both as sheets for customer deliveries (list of products to send) and sheets that is recevied and signed by customer. So product deliveries receipts is a duplicated feature and is rarely activated.
+NoNeedForDeliveryReceipts=In most cases, shipping sheets are used both as sheets for customer deliveries (list of products to send) and sheets that is received and signed by customer. So product deliveries receipts is a duplicated feature and is rarely activated.
 FreeLegalTextOnShippings=Slobodan unos teksta kod isporuka
 ##### Deliveries #####
 DeliveryOrderNumberingModules=Način označavanja primke proizvoda
@@ -1477,7 +1479,9 @@ AGENDA_DEFAULT_FILTER_STATUS=Postavi automatski ovaj status u filter pretraživa
 AGENDA_DEFAULT_VIEW=Koji tab želite da se otvori kod odabira izbornika Agenda
 AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
 AGENDA_NOTIFICATION_SOUND=Enable sound notification
-##### ClickToDial #####
+##### Clicktodial #####
+ClickToDialSetup=Podešavanje modula ClickToDial
+ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with your clicktodial login (defined on your user card)<br><b>__PASS__</b> that will be replaced with your clicktodial password (defined on your user card).
 ClickToDialDesc=This module allows to make phone numbers clickable. A click on this icon will call make your phone to 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.
 ClickToDialUseTelLink=Koristi samo "tel:" kod telefona
 ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on same computer than the browser, and called when you click on a link in your browser that start 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.
@@ -1505,10 +1509,11 @@ EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint availa
 ##### API ####
 ApiSetup=Podešavanje API modula
 ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
-ApiProductionMode=Enable production mode (this will activate use of a caches for services management)
+ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
 ApiExporerIs=Možete istražiti API na URL
 OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
 ApiKey=API Key
+WarningAPIExplorerDisabled=The API explorer has been disabled. API explorer is not required to provide API services. It is a tool for developer to find/test REST APIs. If you need this tool, go into setup of module API REST to activate it.
 ##### Bank #####
 BankSetupModule=Podešavanje modula banka
 FreeLegalTextOnChequeReceipts=Slobodan unos teksta na čekovnim primkama
@@ -1577,7 +1582,7 @@ BackupDumpWizard=Čarobnjak za izradu backup-a baze podataka
 SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
 SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is only manual steps a privileged user can do.
 InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
-ConfFileMuseContainCustom=Installing an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to have option<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
+ConfFileMuseContainCustom=Installing an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
 HighlightLinesColor=Highlight color of the line when the mouse passes over (keep empty for no highlight)
 TextTitleColor=Boja naslova stranice
@@ -1607,6 +1612,7 @@ FixTZ=Ispravak vremenske zone
 FillFixTZOnlyIfRequired=Example: +2 (fill only if problem experienced)
 ExpectedChecksum=Očekivani checksum
 CurrentChecksum=Trenutni checksum
+ForcedConstants=Required constant values
 MailToSendProposal=To send customer proposal
 MailToSendOrder=To send customer order
 MailToSendInvoice=To send customer invoice
@@ -1615,9 +1621,10 @@ MailToSendIntervention=To send intervention
 MailToSendSupplierRequestForQuotation=To send quotation request to supplier
 MailToSendSupplierOrder=To send supplier order
 MailToSendSupplierInvoice=To send supplier invoice
+MailToSendContract=To send a contract
 MailToThirdparty=To send email from third party page
 ByDefaultInList=Prikaži kao zadano na popisu
-YouUseLastStableVersion=Koristite zadnju stabilnu verziju
+YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
 TitleExampleForMaintenanceRelease=Example of message you can use to announce this maintenance release (feel free to use it on your web sites)
 ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. 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.
diff --git a/htdocs/langs/hr_HR/banks.lang b/htdocs/langs/hr_HR/banks.lang
index 65981efb1d7..c598ac33b84 100644
--- a/htdocs/langs/hr_HR/banks.lang
+++ b/htdocs/langs/hr_HR/banks.lang
@@ -74,13 +74,13 @@ Conciliate=Uskladi
 Conciliation=Usklađivanje
 ReconciliationLate=Reconciliation late
 IncludeClosedAccount=Uključujući i zatvorene račune
-OnlyOpenedAccount=Samo otvoreni računi
+OnlyOpenedAccount=Only opened accounts
 AccountToCredit=Račun za kreditiranje
 AccountToDebit=Račun za terećenje
 DisableConciliation=Onemogući usklađivanje za ovaj račun
 ConciliationDisabled=Mogučnost usklađivanja je onemogućena
 LinkedToAConciliatedTransaction=Linked to a conciliated entry
-StatusAccountOpened=Otvoren
+StatusAccountOpened=Otvorena
 StatusAccountClosed=Zatvoren
 AccountIdShort=Broj
 LineRecord=Transakcija
diff --git a/htdocs/langs/hr_HR/bills.lang b/htdocs/langs/hr_HR/bills.lang
index eb396f289e8..9f1b5c89abb 100644
--- a/htdocs/langs/hr_HR/bills.lang
+++ b/htdocs/langs/hr_HR/bills.lang
@@ -2,12 +2,12 @@
 Bill=Račun
 Bills=Računi
 BillsCustomers=Računi za kupce
-BillsCustomer=Računi kupaca
-BillsSuppliers=Računi dobavljača
-BillsCustomersUnpaid=Neplaćeni računi za kupce
-BillsCustomersUnpaidForCompany=Neplaćeni računi kupca za %s
+BillsCustomer=Račun za kupca
+BillsSuppliers=Račun dobavljača
+BillsCustomersUnpaid=Neplaćeni računi kupca
+BillsCustomersUnpaidForCompany=Unpaid customer invoices for %s
 BillsSuppliersUnpaid=Neplaćeni računi dobavljača
-BillsSuppliersUnpaidForCompany=Neplaćeni računi dobavljača za %s
+BillsSuppliersUnpaidForCompany=Unpaid supplier invoices for %s
 BillsLate=Zakašnjela plaćanja
 BillsStatistics=Statistika računa kupaca
 BillsStatisticsSuppliers=Statistika računa dobavljača
@@ -62,8 +62,8 @@ PaymentsBack=Povratna plaćanja
 paymentInInvoiceCurrency=po 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 credit note or deposit 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.
+ConfirmDeletePayment=Jeste li sigurni da želite izbrisati ovo plaćanje?
+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.
 SupplierPayments=Plaćanja dobavljačima
 ReceivedPayments=Primljene uplate
 ReceivedCustomersPayments=Primljene uplate od kupaca
@@ -78,6 +78,7 @@ PaymentMode=Oblik plaćanja
 PaymentTypeDC=Debit/Credit Card
 PaymentTypePP=PayPal
 IdPaymentMode=Oblik plaćanja (ID)
+CodePaymentMode=Payment type (code)
 LabelPaymentMode=Oblik plaćanja (oznaka)
 PaymentModeShort=Oblik plaćanja
 PaymentTerm=Uvjeti plaćanja
@@ -102,9 +103,10 @@ SearchACustomerInvoice=Traži račun za kupca
 SearchASupplierInvoice=Traži račun dobavljača
 CancelBill=Poništi račun
 SendRemindByMail=Pošalji podsjetnik putem e-pošte
-DoPayment=Izvrši plaćanje
-DoPaymentBack=Izvrši povrat plaćanja
+DoPayment=Enter payment
+DoPaymentBack=Enter refund
 ConvertToReduc=Pretvori u budući popust
+ConvertExcessReceivedToReduc=Convert excess received into future discount
 EnterPaymentReceivedFromCustomer=Upiši zaprimljeno plaćanje kupca
 EnterPaymentDueToCustomer=Napravi 
 DisabledBecauseRemainderToPayIsZero=Isključeno jer preostalo dugovanje je nula.
@@ -151,14 +153,14 @@ NoQualifiedRecurringInvoiceTemplateFound=Ne postoji predložak pretplatničkog r
 FoundXQualifiedRecurringInvoiceTemplate=Pronađeno %s predložaka pretplatničkih računa za generiranje.
 NotARecurringInvoiceTemplate=Ne postoji predložak za pretplatnički račun
 NewBill=Novi račun
-LastBills=Zadnjih %s računa
-LastCustomersBills=Zadnjih %s računa kupaca
-LastSuppliersBills=Zadnjih %s računa dobavljača
+LastBills=Latest %s invoices
+LastCustomersBills=Latest %s customer invoices
+LastSuppliersBills=Latest %s supplier invoices
 AllBills=Svi računi
 OtherBills=Ostali računi
 DraftBills=Skice računa
-CustomersDraftInvoices=Skice računa za kupce
-SuppliersDraftInvoices=Skice računa dobavljača
+CustomersDraftInvoices=Customer draft invoices
+SuppliersDraftInvoices=Supplier draft invoices
 Unpaid=Neplaćeno
 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>?
@@ -272,6 +274,7 @@ Deposit=Polog
 Deposits=Polozi
 DiscountFromCreditNote=Popust iz bonifikacije %s
 DiscountFromDeposit=Plaćanja s računa za predujam %s
+DiscountFromExcessReceived=Payments from excess received of invoice %s
 AbsoluteDiscountUse=Ovaj kredit se može koristit na računu prije ovjere
 CreditNoteDepositUse=Invoice must be validated to use this kind of credits
 NewGlobalDiscount=Novi apsolutni popust
@@ -279,8 +282,8 @@ NewRelativeDiscount=Novi relativni popust
 NoteReason=Bilješka/Razlog
 ReasonDiscount=Razlog
 DiscountOfferedBy=Odobrio
-DiscountStillRemaining=Preostali popusti
-DiscountAlreadyCounted=Uračunati popusti
+DiscountStillRemaining=Discounts available
+DiscountAlreadyCounted=Discounts already consumed
 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.
@@ -333,6 +336,8 @@ InvoiceAutoValidate=Automatska ovjera računa
 GeneratedFromRecurringInvoice=Pretplatnički račun generiran iz predloška %s
 DateIsNotEnough=Datum nije još dosegnut
 InvoiceGeneratedFromTemplate=Račun %s generiran iz predloška pretplatničkog računa %s
+WarningInvoiceDateInFuture=Warning, the invoice date is higher than current date
+WarningInvoiceDateTooFarInFuture=Warning, the invoice date is too far from current date
 # PaymentConditions
 Statut=Status
 PaymentConditionShortRECEP=Due Upon Receipt
@@ -351,6 +356,14 @@ PaymentConditionShortPT_ORDER=Narudžba
 PaymentConditionPT_ORDER=Po nalogu
 PaymentConditionShortPT_5050=50-50
 PaymentConditionPT_5050=50%% unaprijed, 50%% nakon isporuke
+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
 FixAmount=Utvrđeni iznos
 VarAmount=Promjenjivi iznos (%% tot.)
 # PaymentType
@@ -420,7 +433,7 @@ ChequeDeposits=Depoziti čekova
 Cheques=Čekovi
 DepositId=ID depozita
 NbCheque=Broj čekova
-CreditNoteConvertedIntoDiscount=Ova bonifikacija ili račun za predujam su pretvoreni u %s
+CreditNoteConvertedIntoDiscount=This %s has been converted into %s
 UsBillingContactAsIncoiveRecipientIfExist=Koristi adresu naplate kupca umjesto adrese komitenta kao primatelja računa
 ShowUnpaidAll=Prikaži sve neplaćene račune
 ShowUnpaidLateOnly=Prikaži samo račune kojima kasni plaćanje
diff --git a/htdocs/langs/hr_HR/boxes.lang b/htdocs/langs/hr_HR/boxes.lang
index 52cba7e67dd..c5b82fe268d 100644
--- a/htdocs/langs/hr_HR/boxes.lang
+++ b/htdocs/langs/hr_HR/boxes.lang
@@ -25,8 +25,8 @@ BoxTitleLastSuppliers=Zadnjih %s zabilježenih dobavljača
 BoxTitleLastModifiedSuppliers=Zadnjih %s izmjenjenih dobavljača
 BoxTitleLastModifiedCustomers=Zadnjih %s izmjenjenih kupaca
 BoxTitleLastCustomersOrProspects=Zadnjih %s kupaca ili potencijalnih kupaca
-BoxTitleLastCustomerBills=Zadnjih %s računa kupaca
-BoxTitleLastSupplierBills=Zadnjih %s računa dobavljača
+BoxTitleLastCustomerBills=Latest %s customer invoices
+BoxTitleLastSupplierBills=Latest %s supplier invoices
 BoxTitleLastModifiedProspects=Zadnjih %s izmjenjenih potencijalnih kupaca
 BoxTitleLastModifiedMembers=Zadnjih %s članova
 BoxTitleLastFicheInter=Zadnjih %s izmjenjenih intervencija
@@ -51,12 +51,12 @@ ClickToAdd=Kliknite ovdje za dodavanje.
 NoRecordedCustomers=Nema pohranjenih kupaca
 NoRecordedContacts=Nema pohranjenih kontakata
 NoActionsToDo=Nema akcija za napraviti
-NoRecordedOrders=Nema pohranjene narudžbe kupca
+NoRecordedOrders=No recorded customer orders
 NoRecordedProposals=Nema pohranjenih prijedloga
-NoRecordedInvoices=Nema pohranjenih računa kupca
-NoUnpaidCustomerBills=Nema neplačenih računa kupca
-NoUnpaidSupplierBills=Nema neplačenih računa dobavljača
-NoModifiedSupplierBills=Nema pohranjenih računa dobavljača
+NoRecordedInvoices=No recorded customer invoices
+NoUnpaidCustomerBills=No unpaid customer invoices
+NoUnpaidSupplierBills=No unpaid supplier invoices
+NoModifiedSupplierBills=No recorded supplier invoices
 NoRecordedProducts=Nema pohranjenih proizvoda/usluga
 NoRecordedProspects=Nema pohranjenih potencijalnih kupaca
 NoContractedProducts=Nema ugovorenih proizvoda/usluga
diff --git a/htdocs/langs/hr_HR/companies.lang b/htdocs/langs/hr_HR/companies.lang
index 55a8f2d7b9b..6d7da90553f 100644
--- a/htdocs/langs/hr_HR/companies.lang
+++ b/htdocs/langs/hr_HR/companies.lang
@@ -81,6 +81,7 @@ PaymentBankAccount=Payment bank account
 OverAllProposals=Total proposals
 OverAllOrders=Total orders
 OverAllInvoices=Total invoices
+OverAllSupplierProposals=Total price requests
 ##### Local Taxes #####
 LocalTax1IsUsed=Koristi drugi dodatni porez
 LocalTax1IsUsedES= RE je korišten
@@ -389,7 +390,7 @@ ListCustomersShort=Lista kupaca
 ThirdPartiesArea=Sučelje komitenata i kontakata
 LastModifiedThirdParties=Zadnjih %s izmjenjenih komitenata
 UniqueThirdParties=Ukupno jedinstvenih komitenata
-InActivity=Otvoren
+InActivity=Otvorena
 ActivityCeased=Zatvoren
 ThirdPartyIsClosed=Third party is closed
 ProductsIntoElements=Popis proizvoda/usluga u %s
@@ -404,7 +405,7 @@ MergeThirdparties=Spoji komitente
 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 so you will be able to delete the duplicate one.
 ThirdpartiesMergeSuccess=Komitenti su spojeni
 SaleRepresentativeLogin=Korisničko ime predstavnika
-SaleRepresentativeFirstname=Ime predstavnika
-SaleRepresentativeLastname=Prezime predstavnika
+SaleRepresentativeFirstname=First name of sales representative
+SaleRepresentativeLastname=Last name of sales representative
 ErrorThirdpartiesMerge=Dogodila se greška kod brisanja komitenta. Provjerite zapise. Promjene su poništene.
 NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/hr_HR/compta.lang b/htdocs/langs/hr_HR/compta.lang
index e043bb3f95d..8db21d04355 100644
--- a/htdocs/langs/hr_HR/compta.lang
+++ b/htdocs/langs/hr_HR/compta.lang
@@ -65,6 +65,7 @@ PaymentSocialContribution=Plaćanje društveni/fiskalni porez
 PaymentVat=PDV plaćanje
 ListPayment=Popis plaćanja
 ListOfCustomerPayments=Popis uplata kupca
+ListOfSupplierPayments=List of supplier payments
 DateStartPeriod=Datum početka perioda
 DateEndPeriod=Datum završetka perioda
 newLT1Payment=Novo plaćanje poreza 2
@@ -81,7 +82,7 @@ LT2PaymentES=IRPF plaćanje
 LT2PaymentsES=IRPF plaćanja
 VATPayment=Plaćanje poreza prodaje
 VATPayments=Plaćanja poreza kod prodaje
-VATRefund=Povrat povrata poreza
+VATRefund=Sales tax refund
 Refund=Povrat
 SocialContributionsPayments=Plaćanja društveni/fiskalni porez
 ShowVatPayment=Prikaži PDV plaćanja
diff --git a/htdocs/langs/hr_HR/cron.lang b/htdocs/langs/hr_HR/cron.lang
index 09fbbbe19c6..a6bfed3c88b 100644
--- a/htdocs/langs/hr_HR/cron.lang
+++ b/htdocs/langs/hr_HR/cron.lang
@@ -17,14 +17,14 @@ CronMethodDoesNotExists=Klasa %s ne sadrži niti jednu %s metodu
 # Menu
 EnabledAndDisabled=Omogući i onemogući
 # Page list
-CronLastOutput=Zadnji put pokrenuti izlaz
-CronLastResult=Zadnji kod rezultata
+CronLastOutput=Latest run output
+CronLastResult=Latest result code
 CronCommand=Komanda
 CronList=Planirani poslovi
 CronDelete=Obriši planirane zadatke
-CronConfirmDelete=Jeste li sigurni da želite izbrisati ove planirane poslove?
+CronConfirmDelete=Are you sure you want to delete these scheduled jobs?
 CronExecute=Pokreni planirani posao
-CronConfirmExecute=Jeste li sigurni da želite pokrenuti ove planirane poslove sada ?
+CronConfirmExecute=Are you sure you want to execute these scheduled jobs now?
 CronInfo=Modul planiranih poslova omogućuje izvrsavanje poslova koji su planirani
 CronTask=Posao
 CronNone=Nijedan
diff --git a/htdocs/langs/hr_HR/errors.lang b/htdocs/langs/hr_HR/errors.lang
index fb779e2cb84..a7722d97d3c 100644
--- a/htdocs/langs/hr_HR/errors.lang
+++ b/htdocs/langs/hr_HR/errors.lang
@@ -11,6 +11,7 @@ ErrorLoginAlreadyExists=Login %s already exists.
 ErrorGroupAlreadyExists=Group %s already exists.
 ErrorRecordNotFound=Record not found.
 ErrorFailToCopyFile=Failed to copy file '<b>%s</b>' into '<b>%s</b>'.
+ErrorFailToCopyDir=Failed to copy directory '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToRenameFile=Failed to rename file '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToDeleteFile=Failed to remove file '<b>%s</b>'.
 ErrorFailToCreateFile=Failed to create file '<b>%s</b>'.
@@ -115,7 +116,7 @@ ErrorNoActivatedBarcode=No barcode type activated
 ErrUnzipFails=Failed to unzip %s with ZipArchive
 ErrNoZipEngine=No engine to unzip %s file in this PHP
 ErrorFileMustBeADolibarrPackage=The file %s must be a Dolibarr zip package
-ErrorFileRequired=It takes a package Dolibarr file
+ErrorModuleFileRequired=You must select a Dolibarr module package file
 ErrorPhpCurlNotInstalled=The PHP CURL is not installed, this is essential to talk with 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
@@ -181,6 +182,8 @@ ErrorBankStatementNameMustFollowRegex=Error, bank statement name must follow the
 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>
 
 # 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.
diff --git a/htdocs/langs/hr_HR/holiday.lang b/htdocs/langs/hr_HR/holiday.lang
index 1bc947ff4d4..3a648d2f48f 100644
--- a/htdocs/langs/hr_HR/holiday.lang
+++ b/htdocs/langs/hr_HR/holiday.lang
@@ -76,8 +76,8 @@ BoxTitleLastLeaveRequests=Zadnjih %s izmjenjenih zahtjeva za odlaskom
 HolidaysMonthlyUpdate=Mjesečna promjena
 ManualUpdate=Ručna promjena
 HolidaysCancelation=Odbijanje zahtjeva
-EmployeeLastname=Prezime zaposlenika
-EmployeeFirstname=Ime zaposlenika
+EmployeeLastname=Employee last name
+EmployeeFirstname=Employee first name
 TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
 
 ## Configuration du Module ##
diff --git a/htdocs/langs/hr_HR/ldap.lang b/htdocs/langs/hr_HR/ldap.lang
index f07dd33e336..94a50723497 100644
--- a/htdocs/langs/hr_HR/ldap.lang
+++ b/htdocs/langs/hr_HR/ldap.lang
@@ -13,8 +13,8 @@ LDAPUsers=Korisnici u LDAP bazi
 LDAPFieldStatus=Status
 LDAPFieldFirstSubscriptionDate=Datum prve pretplate
 LDAPFieldFirstSubscriptionAmount=Iznos prve pretplate
-LDAPFieldLastSubscriptionDate=Datum zadnje pretplate
-LDAPFieldLastSubscriptionAmount=Iznos zadnnje pretplate
+LDAPFieldLastSubscriptionDate=Latest subscription date
+LDAPFieldLastSubscriptionAmount=Latest subscription amount
 LDAPFieldSkype=Skype ID
 LDAPFieldSkypeExample=Primjer: skypeIme
 UserSynchronized=Korisnik sinhroniziran
diff --git a/htdocs/langs/hr_HR/mails.lang b/htdocs/langs/hr_HR/mails.lang
index ee35a781584..85410cde9b0 100644
--- a/htdocs/langs/hr_HR/mails.lang
+++ b/htdocs/langs/hr_HR/mails.lang
@@ -74,14 +74,18 @@ ResultOfMailSending=Result of mass EMail sending
 NbSelected=Nb selected
 NbIgnored=Nb ignored
 NbSent=Nb sent
-ContactsWithThirdpartyFilter=Contact with customer filters
+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
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Line %s in file
 RecipientSelectionModules=Defined requests for recipient's selection
 MailSelectedRecipients=Selected recipients
 MailingArea=EMailings area
-LastMailings=Zadnjih %s slanja e-pošte
+LastMailings=Latest %s emailings
 TargetsStatistics=Targets statistics
 NbOfCompaniesContacts=Unique contacts/addresses
 MailNoChangePossible=Recipients for validated emailing can't be changed
@@ -146,3 +150,6 @@ AdvTgtCreateFilter=Create filter
 AdvTgtOrCreateNewFilter=Name of new filter
 NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
+OutGoingEmailSetup=Outgoing email setup
+InGoingEmailSetup=Incoming email setup
+
diff --git a/htdocs/langs/hr_HR/main.lang b/htdocs/langs/hr_HR/main.lang
index a3f24445800..fe61672a10d 100644
--- a/htdocs/langs/hr_HR/main.lang
+++ b/htdocs/langs/hr_HR/main.lang
@@ -69,6 +69,7 @@ SetDate=Postavi datum
 SelectDate=Izaberi datum
 SeeAlso=Vidi također %s
 SeeHere=Vidi ovdje
+Apply=Primjeni
 BackgroundColorByDefault=Zadana boja pozadine
 FileRenamed=Ime datoteke uspješno promijenjeno
 FileUploaded=Datoteka je uspješno učitana
@@ -87,7 +88,7 @@ Undefined=Nedefinirano
 PasswordForgotten=Password forgotten?
 SeeAbove=Vidi iznad
 HomeArea=Naslovna
-LastConnexion=Zadnje spajanje
+LastConnexion=Latest connection
 PreviousConnexion=Prijašnje spajanje
 PreviousValue=Prijašnja vrijednost
 ConnectedOnMultiCompany=Spojeno na okolinu
@@ -237,7 +238,7 @@ DateCreation=Datum kreiranja
 DateCreationShort=Datum kreiranja
 DateModification=Datum izmjene
 DateModificationShort=Datum izmj.
-DateLastModification=Datum zadnje promjene
+DateLastModification=Latest modification date
 DateValidation=Datum ovjere
 DateClosing=Datum zatvaranja
 DateDue=Datum dospjeća
@@ -433,7 +434,7 @@ Reportings=Izvještavanje
 Draft=Skica
 Drafts=Skice
 Validated=Ovjereno
-Opened=Otvori
+Opened=Otvorena
 New=Novo
 Discount=Rabat
 Unknown=Nepoznat
@@ -599,6 +600,8 @@ SessionName=Naziv sesije
 Method=Metoda
 Receive=Primi
 CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
+ExpectedValue=Expected Value
+CurrentValue=Trenutna vrijednost
 PartialWoman=Parcijalno
 TotalWoman=Ukupno
 NeverReceived=Nikad primljeno
@@ -756,6 +759,7 @@ SomeTranslationAreUncomplete=Some languages may be partially translated or may c
 DirectDownloadLink=Direct download link
 Download=Download
 ActualizeCurrency=Update currency rate
+Fiscalyear=Fiscal year
 # Week day
 Monday=Ponedjeljak
 Tuesday=Utorak
@@ -812,3 +816,5 @@ SearchIntoContracts=Ugovori
 SearchIntoCustomerShipments=Pošiljke kupcu
 SearchIntoExpenseReports=Izvještaji troška
 SearchIntoLeaves=Odsustva
+
+BulkActions=Bulk actions
diff --git a/htdocs/langs/hr_HR/members.lang b/htdocs/langs/hr_HR/members.lang
index 714e7dfaee6..a2146a7b007 100644
--- a/htdocs/langs/hr_HR/members.lang
+++ b/htdocs/langs/hr_HR/members.lang
@@ -136,8 +136,8 @@ DocForAllMembersCards=Generiraj vizit karte za sve članove
 DocForOneMemberCards=Generiraj vizit kartu za određenog člana
 DocForLabels=Generiraj listu adresa
 SubscriptionPayment=Plaćanje pretplate
-LastSubscriptionDate=Zadnji datum pretplate
-LastSubscriptionAmount=Zadnji iznos pretplate
+LastSubscriptionDate=Latest subscription date
+LastSubscriptionAmount=Latest subscription amount
 MembersStatisticsByCountries=Statistika članova po zemlji
 MembersStatisticsByState=Statistika članova po regiji/provinciji
 MembersStatisticsByTown=Statistika članova po gradu
@@ -149,7 +149,7 @@ MembersByStateDesc=This screen show you statistics on members by state/provinces
 MembersByTownDesc=This screen show you statistics on members by town.
 MembersStatisticsDesc=Odaberite statistiku koju želite vidjeti...
 MenuMembersStats=Statistika
-LastMemberDate=Zadnji datum člana
+LastMemberDate=Latest member date
 Nature=Vrsta
 Public=Informacije su javne
 NewMemberbyWeb=Novi član je dodan. Čeka odobrenje
diff --git a/htdocs/langs/hr_HR/orders.lang b/htdocs/langs/hr_HR/orders.lang
index 2b9b404f0f2..914f9795a6d 100644
--- a/htdocs/langs/hr_HR/orders.lang
+++ b/htdocs/langs/hr_HR/orders.lang
@@ -39,7 +39,7 @@ StatusOrderRefusedShort=Odbijeno
 StatusOrderBilledShort=Naplaćeno
 StatusOrderToProcessShort=Za obradu
 StatusOrderReceivedPartiallyShort=Djelomično isporučeno
-StatusOrderReceivedAllShort=Kompletno isporučeno
+StatusOrderReceivedAllShort=Products received
 StatusOrderCanceled=Poništeno
 StatusOrderDraft=Skica (potrebno potvrditi)
 StatusOrderValidated=Ovjereno
@@ -51,7 +51,7 @@ StatusOrderApproved=Odobreno
 StatusOrderRefused=Odbijeno
 StatusOrderBilled=Naplaćeno
 StatusOrderReceivedPartially=Djelomično primljeno
-StatusOrderReceivedAll=Primljena cijela pošiljka
+StatusOrderReceivedAll=All products received
 ShippingExist=Isporuka postoji
 QtyOrdered=Količina naručena
 ProductQtyInDraft=Količina robe u skicama narudžbi
diff --git a/htdocs/langs/hr_HR/other.lang b/htdocs/langs/hr_HR/other.lang
index 270bc168cff..db195747ddf 100644
--- a/htdocs/langs/hr_HR/other.lang
+++ b/htdocs/langs/hr_HR/other.lang
@@ -68,14 +68,15 @@ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find her
 PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nYou will find here the shipping __SHIPPINGREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nYou will find here the intervention __FICHINTERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n__PERSONALIZED__\n\n__SIGNATURE__
-DemoDesc=Dolibarr is a compact ERP/CRM supporting several functional modules. A demo showcasing all modules makes no sense as this scenario never occurs. So, several demo profiles are available.
+DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
+ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
 DemoFundation=Upravljanje članovima zaklade
 DemoFundation2=Upravljanje članovima i bankovnim računom zaklade
-DemoCompanyServiceOnly=Manage a freelance activity selling service only
+DemoCompanyServiceOnly=Company or freelance selling service only
 DemoCompanyShopWithCashDesk=Manage a shop with a cash desk
-DemoCompanyProductAndStocks=Manage a small or medium company selling products
-DemoCompanyAll=Manage a small or medium company with multiple activities (all main modules)
+DemoCompanyProductAndStocks=Company selling products with a shop
+DemoCompanyAll=Company with multiple activities (all main modules)
 CreatedBy=Created by %s
 ModifiedBy=Modified by %s
 ValidatedBy=Validated by %s
diff --git a/htdocs/langs/hr_HR/products.lang b/htdocs/langs/hr_HR/products.lang
index eae54f2f5d2..4b43159a881 100644
--- a/htdocs/langs/hr_HR/products.lang
+++ b/htdocs/langs/hr_HR/products.lang
@@ -60,7 +60,7 @@ SellingPrice=Prodajna cijena
 SellingPriceHT=Prodajna cijena (bez PDV-a)
 SellingPriceTTC=Prodajna cijena (sa PDV-om)
 CostPriceDescription=Cijena (bez poreza) može se koristiti za pohranu prosječnog iznosa troškova proizvoda u vašoj tvrtci. To može biti bilo koja cijana koju sami izračunate, npr. iz prosječne nabavne cijene plus prosječni trošak proizvodnje i distribucije.
-CostPriceUsage=U narednim verzijama, ova vrijednost će biti korištena za izračun marže.
+CostPriceUsage=This value could be used for margin calculation.
 SoldAmount=Prodani iznos
 PurchasedAmount=Nabavni iznos
 NewPrice=Nova cijena
@@ -142,6 +142,7 @@ ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b>?
 CloneContentProduct=Kloniraj sve glavne informacije o proizvodu/usluzi
 ClonePricesProduct=Kloniraj glavne informacije i cijene
 CloneCompositionProduct=Kloniraj grupirani proizvod/uslugu
+CloneCombinationsProduct=Clone product variants
 ProductIsUsed=Ovaj proizvod je korišten
 NewRefForClone=Ref. novog proizvoda/usluge
 SellingPrices=Prodajne cijene
@@ -238,7 +239,7 @@ GlobalVariables=Globalne varijable
 VariableToUpdate=Variabla za promjeniti
 GlobalVariableUpdaters=Globalne varijable promjene
 UpdateInterval=Interval promjene (minute)
-LastUpdated=Zadnja promjena
+LastUpdated=Latest update
 CorrectlyUpdated=Ispravno promjenjeno
 PropalMergePdfProductActualFile=Datoteke za dodati u PDF Azur su/je
 PropalMergePdfProductChooseFile=Odaberite PDF datoteke
@@ -258,4 +259,41 @@ VolumeUnits=Jedinica volumena
 SizeUnits=Jedinica veličine
 DeleteProductBuyPrice=Obriši nabavnu cijenu
 ConfirmDeleteProductBuyPrice=Jeste li sigurni da želite obrisati ovu nabavnu cijenu ?
+SubProduct=Sub product
 
+#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
+ProductCombinations=Variants
+HideProductCombinations=Hide products variant in the products selector
+ProductCombination=Variant
+NewProductCombination=New variant
+EditProductCombination=Editing variant
+ProductCombinationGenerator=Variants generator
+Features=Features
+PriceImpact=Price impact
+WeightImpact=Weight impact
+NewProductAttribute=Novi atribut
+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
+PercentageVariation=Percentage variation
+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 child products
+ConfirmCloneProductCombinations=Would you like to copy all the product variant to the 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
diff --git a/htdocs/langs/hr_HR/projects.lang b/htdocs/langs/hr_HR/projects.lang
index 2b4e08309a7..e5a8ce39356 100644
--- a/htdocs/langs/hr_HR/projects.lang
+++ b/htdocs/langs/hr_HR/projects.lang
@@ -29,9 +29,9 @@ DeleteAProject=Izbriši projekt
 DeleteATask=Izbriši zadatak
 ConfirmDeleteAProject=Are you sure you want to delete this project?
 ConfirmDeleteATask=Are you sure you want to delete this task?
-OpenedProjects=Otvoreni projekti
-OpenedTasks=Otvoreni zadaci
-OpportunitiesStatusForOpenedProjects=Mogući iznos otvorenih projekata po statusu
+OpenedProjects=Opened projects
+OpenedTasks=Opened tasks
+OpportunitiesStatusForOpenedProjects=Opportunities amount of opened projects by status
 OpportunitiesStatusForProjects=Iznos šanse za projekte po statusu
 ShowProject=Prikaži projekt
 SetProject=Postavi projekt
@@ -47,7 +47,7 @@ TaskTimeSpent=Utrošeno vrijeme zadataka
 TaskTimeUser=Korisnik
 TaskTimeNote=Bilješka
 TaskTimeDate=Date
-TasksOnOpenedProject=Zadaci u otvorenim projektima
+TasksOnOpenedProject=Tasks on opened projects
 WorkloadNotDefined=Opterećenje nije definirano
 NewTimeSpent=Novo utrošeno vrijeme
 MyTimeSpent=Moje utrošeno vrijeme
@@ -96,6 +96,7 @@ ValidateProject=Ovjeri projekt
 ConfirmValidateProject=Are you sure you want to validate this project?
 CloseAProject=Zatvori projekt
 ConfirmCloseAProject=Are you sure you want to close this project?
+AlsoCloseAProject=Also close project (keep it open if you still need to follow production tasks on it)
 ReOpenAProject=Otvori projekti
 ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=Kontakti projekta
@@ -121,7 +122,7 @@ CloneProjectFiles=Kloniraj projektne datoteke
 CloneTaskFiles=Kloniraj datoteke(u) zadatka ( ako su zadatak(ci) klonirani)
 CloneMoveDate=Update project/tasks dates from now?
 ConfirmCloneProject=Are you sure to clone this project?
-ProjectReportDate=Promjeni datum zadatka suklado početnom datumu projekta
+ProjectReportDate=Change task dates according to new project start date
 ErrorShiftTaskDate=Nemoguće pomaknuti datum zadatka sukladno novom početnom datumu projekta
 ProjectsAndTasksLines=Projekti i zadaci 
 ProjectCreatedInDolibarr=Projekt %s je kreiran
@@ -178,9 +179,9 @@ ProjectsStatistics=Statistika po projektima/prednostima
 TaskAssignedToEnterTime=Zadatak dodjeljen. Unos vremena za zadatak je moguće.
 IdTaskTime=ID vre. zad.
 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.
-OpenedProjectsByThirdparties=Otvoreni projekti za komitente
+OpenedProjectsByThirdparties=Opened projects by thirdparties
 OnlyOpportunitiesShort=Samo šanse
-OpenedOpportunitiesShort=Otvorene šanse
+OpenedOpportunitiesShort=Opened opportunities
 NotAnOpportunityShort=Nije šansa
 OpportunityTotalAmount=Ukupan iznos šansi
 OpportunityPonderatedAmount=Opportunities weighted amount
diff --git a/htdocs/langs/hr_HR/propal.lang b/htdocs/langs/hr_HR/propal.lang
index 0a5c7895836..f89b6109e7d 100644
--- a/htdocs/langs/hr_HR/propal.lang
+++ b/htdocs/langs/hr_HR/propal.lang
@@ -3,7 +3,7 @@ Proposals=Ponude
 Proposal=Ponuda
 ProposalShort=Ponuda
 ProposalsDraft=Skice ponuda
-ProposalsOpened=Otvori ponude
+ProposalsOpened=Otvorene trgovačke ponude
 Prop=Ponude
 CommercialProposal=Ponuda
 ProposalCard=Kartica ponude
@@ -13,8 +13,8 @@ Prospect=Mogući kupac
 DeleteProp=Izbriši ponudu
 ValidateProp=Ovjeri ponudu
 AddProp=Izradi ponudu
-ConfirmDeleteProp=Jeste li sigurni da želite izbrisati ovu ponudu?
-ConfirmValidateProp=Jeste li sigurni da želite ovjeriti ovu ponudu pod imenom <b>%s</b>?
+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=Zadnjih %s ponuda
 LastModifiedProposals=Zadnjih %s izmjenjenih ponuda
 AllPropals=Sve ponude
@@ -26,9 +26,9 @@ AmountOfProposalsByMonthHT=Iznos po mjesecu (netto bez PDV-a)
 NbOfProposals=Broj ponuda
 ShowPropal=Prikaži ponudu
 PropalsDraft=Skice
-PropalsOpened=Otvori
+PropalsOpened=Otvorena
 PropalStatusDraft=Skica (potrebno ovjeriti)
-PropalStatusValidated=Ovjerena (otvorena ponuda)
+PropalStatusValidated=Validated (proposal is opened)
 PropalStatusSigned=Potpisana (za naplatu)
 PropalStatusNotSigned=Nije potpisana (zatvorena)
 PropalStatusBilled=Naplaćena
@@ -56,8 +56,8 @@ CreateEmptyPropal=Izradi prazan predložak ponude ili popis proizvoda i usluga
 DefaultProposalDurationValidity=Osnovni rok valjanosti ponude (u danima)
 UseCustomerContactAsPropalRecipientIfExist=Ako je navedena, za ponudu upotrijebi adresu kontakta pri kupcu umjesto adrese tvrtke
 ClonePropal=Kloniraj ponudu
-ConfirmClonePropal=Jeste li sigurni da želite klonirati ponudu <b>%s</b> ?
-ConfirmReOpenProp=Jeste li sigurni da želite ponovo otvoriti ponudu <b>%s</b> ?
+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
diff --git a/htdocs/langs/hr_HR/stocks.lang b/htdocs/langs/hr_HR/stocks.lang
index 9ae9f2f68df..c8c8d6580e4 100644
--- a/htdocs/langs/hr_HR/stocks.lang
+++ b/htdocs/langs/hr_HR/stocks.lang
@@ -22,13 +22,15 @@ Movements=Kretanja
 ErrorWarehouseRefRequired=Referenca skladišta je obavezna
 ListOfWarehouses=Popis skladišta
 ListOfStockMovements=Popis kretanja zaliha
+StockMovementForId=Movement ID %d
+ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Sučelje skladišta
 Location=Lokacija
 LocationSummary=Kratki naziv lokacije
 NumberOfDifferentProducts=Broj različitih proizvoda
 NumberOfProducts=Ukupan broj proizvoda
-LastMovement=Posljednja kretnja
-LastMovements=Posljednje kretnje
+LastMovement=Latest movement
+LastMovements=Latest movements
 Units=Jedinica
 Unit=Jedinica
 StockCorrection=Ispravi zalihu
diff --git a/htdocs/langs/hr_HR/supplier_proposal.lang b/htdocs/langs/hr_HR/supplier_proposal.lang
index c19a795160e..9e7c99bdb5d 100644
--- a/htdocs/langs/hr_HR/supplier_proposal.lang
+++ b/htdocs/langs/hr_HR/supplier_proposal.lang
@@ -8,7 +8,7 @@ SearchRequest=Pronađi zahtjev
 DraftRequests=Skica zahtjeva
 SupplierProposalsDraft=Skice ponuda dobavljača
 LastModifiedRequests=Zadnjih %s promjenjenih zahtjeva za cijenom
-RequestsOpened=Otvoreni zahtjevi
+RequestsOpened=Opened price requests
 SupplierProposalArea=Sučelje ponuda dobavljača
 SupplierProposalShort=Ponuda dobavljača
 SupplierProposals=Ponude dobavljača
@@ -23,7 +23,7 @@ ConfirmValidateAsk=Are you sure you want to validate this price request under na
 DeleteAsk=Obriši zahtjev
 ValidateAsk=Ovjeri zahtjev
 SupplierProposalStatusDraft=Skica (potrebna ovjera)
-SupplierProposalStatusValidated=Ovjereno (zahtjev je otvoren)
+SupplierProposalStatusValidated=Validated (request is opened)
 SupplierProposalStatusClosed=Zatvoreno
 SupplierProposalStatusSigned=Prihvačeno
 SupplierProposalStatusNotSigned=Odbijeno
diff --git a/htdocs/langs/hr_HR/suppliers.lang b/htdocs/langs/hr_HR/suppliers.lang
index 84ac50d1c58..b1bb4c6e7af 100644
--- a/htdocs/langs/hr_HR/suppliers.lang
+++ b/htdocs/langs/hr_HR/suppliers.lang
@@ -24,10 +24,10 @@ ExportDataset_fournisseur_1=Računi dobavljača i stavke računa
 ExportDataset_fournisseur_2=Računi dobavljača i plaćanja
 ExportDataset_fournisseur_3=Narudžbe dobavljača i stavke narudžbe
 ApproveThisOrder=Odobri narudžbu
-ConfirmApproveThisOrder=Jeste li sigurni da želite odobriti narudžbu <b>%s</b> ?
+ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b>?
 DenyingThisOrder=Zabrani narudžbu
-ConfirmDenyingThisOrder=Jeste li sigurni da želite zabraniti ovu narudžbu <b>%s</b> ?
-ConfirmCancelThisOrder=Jeste li sigurni da želite poništiti ovu narudžbu <b>%s</b> ?
+ConfirmDenyingThisOrder=Are you sure you want to deny this order <b>%s</b>?
+ConfirmCancelThisOrder=Are you sure you want to cancel this order <b>%s</b>?
 AddSupplierOrder=Kreiraj narudžbu dobavljaču
 AddSupplierInvoice=Kreiraj račun dobavljača
 ListOfSupplierProductForSupplier=Popis proizvoda i cijena za dobavljača <b>%s</b>
@@ -41,3 +41,4 @@ DoNotOrderThisProductToThisSupplier=Nemoj naručiti
 NotTheGoodQualitySupplier=Loša kvaliteta
 ReputationForThisProduct=Reputacija
 BuyerName=Naziv kupca
+AllProductServicePrices=All product / service prices
diff --git a/htdocs/langs/hr_HR/withdrawals.lang b/htdocs/langs/hr_HR/withdrawals.lang
index 6f3731956c0..d124bdf89c1 100644
--- a/htdocs/langs/hr_HR/withdrawals.lang
+++ b/htdocs/langs/hr_HR/withdrawals.lang
@@ -24,6 +24,7 @@ WithdrawStatistics=Direct debit payment statistics
 WithdrawRejectStatistics=Direct debit payment reject statistics
 LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
+WithdrawRequestsDone=%s direct debit payment requests recorded
 ThirdPartyBankCode=Kod banke komitenta
 NoInvoiceCouldBeWithdrawed=Račun nije uspješno isplačen. Provjerite da li račun glasi na tvrtku s valjanim BAN-om.
 ClassCredited=Označi kao kreditirano
@@ -76,8 +77,8 @@ RUM=UMR
 RUMLong=Unique Mandate Reference
 RUMWillBeGenerated=UMR number will be generated once bank account information are saved
 WithdrawMode=Direct debit mode (FRST or RECUR)
-WithdrawRequestAmount=Zahtjevan iznos isplate:
-WithdrawRequestErrorNilAmount=Nemoguće kreirati isplatni zahtjev za prazan iznos.
+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
diff --git a/htdocs/langs/hu_HU/accountancy.lang b/htdocs/langs/hu_HU/accountancy.lang
index a5bccba9ab0..b602f003d38 100644
--- a/htdocs/langs/hu_HU/accountancy.lang
+++ b/htdocs/langs/hu_HU/accountancy.lang
@@ -194,6 +194,8 @@ ChangeBinding=Change the binding
 
 ## Admin
 ApplyMassCategories=Apply mass categories
+AddAccountFromBookKeepingWithNoCategories=Add acccount already used with no categories
+CategoryDeleted=Category for the accounting account has been removed
 
 ## Export
 Exports=Export
@@ -209,6 +211,7 @@ Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution
 Modelcsv_quadratus=Export towards Quadratus QuadraCompta
 Modelcsv_ebp=Export towards EBP
 Modelcsv_cogilog=Export towards Cogilog
+ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
 InitAccountancy=Init accountancy
diff --git a/htdocs/langs/hu_HU/admin.lang b/htdocs/langs/hu_HU/admin.lang
index 0dbdb6ad55f..4d911feac45 100644
--- a/htdocs/langs/hu_HU/admin.lang
+++ b/htdocs/langs/hu_HU/admin.lang
@@ -9,17 +9,20 @@ VersionDevelopment=Fejlesztői
 VersionUnknown=Ismeretlen
 VersionRecommanded=Ajánlott
 FileCheck=Files integrity checker
-FileCheckDesc=This tool allows you to check the integrity of files of your application, comparing each files with the official ones. You can use this tool to detect if some files were modified by a hacker for example.
+FileCheckDesc=This tool allows you to check the integrity of files and setup of your application, comparing each files with the official ones. 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.
 FileIntegrityIsStrictlyConformedWithReference=Files integrity is strictly conformed with the reference.
-FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified of removed.
+FileIntegrityIsOkButFilesWereAdded=Files integrity check has passed, however some new files were added.
+FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified, removed or added.
 GlobalChecksum=Global checksum
 MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
 LocalSignature=Embedded local signature (less reliable)
 RemoteSignature=Remote distant signature (more reliable)
 FilesMissing=Hiányzó fájlok
 FilesUpdated=Frissített fájlok
+FilesModified=Modified Files
+FilesAdded=Added Files
 FileCheckDolibarr=Check integrity of application files
-AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from a certified package
+AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from an official package
 XmlNotFound=Xml Integrity File of application not found
 SessionId=Munkamenet-azonosító
 SessionSaveHandler=Munkamenet mentésének kezelője
@@ -188,7 +191,9 @@ BoxesDesc=A widgetek olyan elemek melyek segítségével egyes oldalak testresza
 OnlyActiveElementsAreShown=Csak a <a href="%s"> bekapcsolt modulok</a> elemei jelennek meg.
 ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
 ModulesMarketPlaceDesc=Az interneten további modulokat találhat...
-ModulesMarketPlaces=További modulok ...
+ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
+ModulesMarketPlaces=Find external modules...
+GoModuleSetupArea=To deploy/install a new module, go onto the Module setup area at <a href="%s">%s</a>.
 DoliStoreDesc=DoliStore, a hivatalos Dolibarr ERP / CRM piactér külső modulok számára
 DoliPartnersDesc=List of companies providing custom developed modules or features (Note: anyone experienced in PHP programming can provide custom development for an open source project)
 WebSiteDesc=Referencia oldalak további modulok beszerzéséhez...
@@ -226,14 +231,14 @@ HelpCenterDesc1=Ebben a részben a Dolibarral kapcsolatos segítségnyújtási s
 HelpCenterDesc2=A szolgáltatás néhány eleme <b>csak angolul érhető el.</b>
 CurrentMenuHandler=Aktuális menü kezelő
 MeasuringUnit=Mértékegység
-LeftMargin=Left margin
-TopMargin=Top margin
-PaperSize=Paper type
-Orientation=Orientation
+LeftMargin=Bal margó
+TopMargin=Felső margó
+PaperSize=Papír típusa
+Orientation=Álló/fekvő
 SpaceX=Space X
 SpaceY=Space Y
-FontSize=Font size
-Content=Content
+FontSize=Betűméret
+Content=Tartalom
 NoticePeriod=Notice period
 NewByMonth=New by month
 Emails=E-mailek
@@ -255,9 +260,9 @@ MAIN_MAIL_EMAIL_STARTTLS= Use TLS (STARTTLS) encrypt
 MAIN_DISABLE_ALL_SMS=Tiltsa le minden SMS-küldését (hibakeresési vagy demó célokra)
 MAIN_SMS_SENDMODE=SMS küldésére használt metódus
 MAIN_MAIL_SMS_FROM=Alapértelmezett küldő telefonszám az SMS-küldés során
-MAIN_MAIL_DEFAULT_FROMTYPE=Sender e-mail by default for manual sendings (User email or Company email)
-UserEmail=User email
-CompanyEmail=Company email
+MAIN_MAIL_DEFAULT_FROMTYPE=A nem automatikusan küldött emailek feladója (felhasználó email címe vagy a cég címe)
+UserEmail=Felhasználó email címe
+CompanyEmail=Cég email címe
 FeatureNotAvailableOnLinux=A szolgáltatás nem elérhető Unix szerű rendszereken. Teszteld a sendmail programot helyben.
 SubmitTranslation=Ha a fordítás nem teljes vagy hibákat talál, kijavíthatja a <b>langs/%s</b> könyvtárban található fájlokban és elküldheti a javítást a www.transifex.com/dolibarr-association/dolibarr/ címre
 SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or for developers on github.com/Dolibarr/dolibarr.
@@ -280,20 +285,21 @@ MenuHandlers=Menü kezelők
 MenuAdmin=Menüszerkesztő
 DoNotUseInProduction=Ne használd élesben
 ThisIsProcessToFollow=This is steps to process:
-ThisIsAlternativeProcessToFollow=This is an alternative setup to process:
+ThisIsAlternativeProcessToFollow=This is an alternative setup to process manually:
 StepNb=%s lépés
 FindPackageFromWebSite=Keressen olyan csomag, amely biztosítja a kívánt funkciót (például a hivatalos honlapján %s).
 DownloadPackageFromWebSite=Csomag letöltése (pl. a havatalos oldalról %s)
-UnpackPackageInDolibarrRoot=A tömörített fájlt a Dolibarr külső modulok számára fenntartott könyvtárába csomagolja ki: <b>%s</b>
-SetupIsReadyForUse=A telepítés befejeződött, a Dolibarr új komponense használatra kész.
-NotExistsDirect=Nincs megadva az alternatív gyökérkönyvtár. <br>
-InfDirAlt=Since version 3 it is possible to define an alternative root directory.This allows you to store, same place, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
-InfDirExample=<br>Then declare it in the file conf.php<br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>*These lines are commented with "#", to uncomment only remove the character.
+UnpackPackageInDolibarrRoot=Unpack the packaged files into server directory dedicated to Dolibarr: <b>%s</b>
+UnpackPackageInModulesRoot=To deploy/install an external module, unpack the packaged files into the server directory dedicated to modules: <b>%s</b>
+SetupIsReadyForUse=Module deployment is finished. You must however enable and setup the module in your application by going on the page to setup modules: <a href="%s">%s</a>.
+NotExistsDirect=The alternative root directory is not defined to an existing directory.<br>
+InfDirAlt=Since version 3, it is possible to define an alternative root directory. This allows you to store, into a dedicated directory, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
+InfDirExample=<br>Then declare it in the file <strong>conf.php</strong><br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>If these lines are commented with "#", to enable them, just uncomment by removing the "#" character.
 YouCanSubmitFile=For this step, you can send package using this tool: Select module file
 CurrentVersion=Dolibarr jelenlegi verziója
 CallUpdatePage=Lépjen az oldalra amiben az adatbázis struktúrát és adatokat frissíti: %s
 LastStableVersion=Utolsó stabil verzió
-LastActivationDate=Last activation date
+LastActivationDate=Latest activation date
 UpdateServerOffline=A szerver offline frissítése
 GenericMaskCodes=Megadhat bármilyen számozás maszk. Ebben a maszk, az alábbi címkék is használhatók: <br> <b>{000000}</b> felel meg egy számot, amelyet fogja megnövelni minden %s. Adja meg a nullákat, mint annyi a kívánt méretre a számláló. A számláló tölti nullákkal balról annak érdekében, hogy minél több nullák, mint a maszk. <br> <b>{000000} 000</b> ugyanaz, mint korábban, hanem ellensúlyozza számának megfelelő jobbra a + jel alkalmazzák kezdve az első %s. <br> <b>{000000} @ x</b> ugyanaz, mint korábban, de a számláló lenullázódik, ha havi x-ért (x 1 és 12 között, vagy 0 használni a korai hónapokban a pénzügyi év van megadva a konfiguráció). Ha ezt az opciót használjuk, és az x 2 vagy magasabb, akkor a sorozat nn {} {} vagy {mm yyyy}} {mm is szükség van. <br> <b>{} Dd</b> nap (01 31). <br> <b>{} Mm</b> hónap (01-12). <br> <b>Yy {}, {ÉÉÉÉ}</b> vagy <b>{} y</b> évben több mint 2, 4 vagy 1 számokat. <br>
 GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
@@ -357,17 +363,17 @@ OldVATRates=Régi ÁFA-kulcs
 NewVATRates=Új ÁFA-kulcs
 PriceBaseTypeToChange=Modify on prices with base reference value defined on
 MassConvert=Tömeges konvertálás indítása
-String=Húr
+String=Szöveg
 TextLong=Hosszú szöveg
 Int=Egész
-Float=Float
+Float=Lebegőpontos
 DateAndTime=Dátum és idő
 Unique=Egyedi
 Boolean=Logikai (jelölőnégyzet)
 ExtrafieldPhone = Telefon
 ExtrafieldPrice = Ár
 ExtrafieldMail = E-mail
-ExtrafieldUrl = Url
+ExtrafieldUrl = Cím
 ExtrafieldSelect = Kiválasztó lista
 ExtrafieldSelectList = Válassz a táblából
 ExtrafieldSeparator=Elválasztó
@@ -376,11 +382,11 @@ ExtrafieldCheckBox=Jelölőnégyzet
 ExtrafieldRadio=Választógomb
 ExtrafieldCheckBoxFromList= Checkbox from table
 ExtrafieldLink=Link to an object
-ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>In order to have the list depending on another :<br>1,value1|parent_list_code:parent_key<br>2,value2|parent_list_code:parent_key
+ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list :<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list :<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
-ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
+ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Example : Societe:societe/class/societe.class.php
 LibraryToBuildPDF=Library used for PDF generation
 WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
@@ -406,7 +412,7 @@ EnableFileCache=Enable file cache
 ShowDetailsInPDFPageFoot=Add more details into footer of PDF files, like your company address, or manager names (to complete professional ids, company capital and VAT number).
 NoDetails=No more details in footer
 DisplayCompanyInfo=Display company address
-DisplayCompanyManagers=Display manager names
+DisplayCompanyManagers=Mutassa a menedzserek nevét
 DisplayCompanyInfoAndManagers=Display company address and manager names
 EnableAndSetupModuleCron=If you want to have this recurring invoice beeing generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template with button *Create*. Note that even if you enabled automatic generation, you can still safely launch manual generation. Duplicates generation for same period are not possible.
 ModuleCompanyCodeAquarium=Vissza 1 számviteli kódot építette: <br> %s követ harmadik fél szolgáltató kódját a szállító számviteli kódot, <br> %s követ harmadik fél ügyfél kódja, ha az ügyfél számviteli kódot.
@@ -415,10 +421,10 @@ ModuleCompanyCodeDigitaria=Számviteli kód attól függ, hogy harmadik fél kó
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
 WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<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).
-
+ClickToShowDescription=Click to show description
 # Modules
 Module0Name=Felhasználók és csoportok
-Module0Desc=A felhasználók és csoportok kezelése
+Module0Desc=Users / Employees and Groups management
 Module1Name=Harmadik fél
 Module1Desc=A vállalatok vezetése és a kapcsolattartó
 Module2Name=Kereskedelmi
@@ -519,7 +525,7 @@ Module2200Name=Dinamikus árak
 Module2200Desc=Matematikai kifejezések engedélyezése az árak meghatározásához
 Module2300Name=Cron
 Module2300Desc=Scheduled job management
-Module2400Name=Events/Agenda
+Module2400Name=Események/Naptár
 Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous.
 Module2500Name=Elektronikus Tartalom Kezelő
 Module2500Desc=Mentés és dokumentumok megosztása
@@ -560,7 +566,7 @@ Module54000Name=PrintIPP
 Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
 Module55000Name=Poll, Survey or Vote
 Module55000Desc=Module to make online polls, surveys or votes (like Doodle, Studs, Rdvz, ...)
-Module59000Name=Margins
+Module59000Name=Margók
 Module59000Desc=Module to manage margins
 Module60000Name=Jutalékok
 Module60000Desc=Module to manage commissions
@@ -596,8 +602,8 @@ Permission67=Export beavatkozások
 Permission71=Olvassa tagjai
 Permission72=Létrehozza / módosítja tagjai
 Permission74=Törlés tagjai
-Permission75=Setup types of membership
-Permission76=Export data
+Permission75=Tagsági típusok létrehozása
+Permission76=Adat exportálása
 Permission78=Olvassa előfizetések
 Permission79=Létrehozza / módosítja előfizetések
 Permission81=Olvassa el az ügyfelek megrendelések
@@ -689,7 +695,7 @@ PermissionAdvanced253=Létrehozza / módosítja belső / külső felhasználók
 Permission254=Létrehozása / módosítása csak a külső felhasználók számára
 Permission255=Módosíthat más felhasználó jelszavát
 Permission256=Törlése vagy tiltsa le más felhasználók
-Permission262=Extend access to all third parties (not only third parties that user is a sale representative). Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc). Not effective for projects (only rules on project permissions, visibility and assignement matters).
+Permission262=Extend access to all third parties (not only third parties that user is a sale representative).<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 assignement matters).
 Permission271=Olvassa CA
 Permission272=Olvassa számlák
 Permission273=Számlák kibocsátása
@@ -891,7 +897,7 @@ Offset=Offset
 AlwaysActive=Mindig aktív
 Upgrade=Upgrade
 MenuUpgrade=Frissítés / kiterjesztése
-AddExtensionThemeModuleOrOther=Add kiterjesztés (téma, modul, ...)
+AddExtensionThemeModuleOrOther=Deploy/install external module
 WebServer=Web szerver
 DocumentRootServer=Web szerver gyökérkönyvtárába
 DataRootServer=Adatfájlok könyvtár
@@ -988,7 +994,7 @@ CompanyFundationDesc=Edit on this page all known information of the company or f
 DisplayDesc=Választhat minden paramétert kapcsolatos Dolibarr kinézetét itt
 AvailableModules=Elérhető modulok
 ToActivateModule=Ha aktiválni modulok, menjen a Setup Terület (Home-> Beállítások-> Modulok).
-SessionTimeOut=Időtúllépés a munkamenet
+SessionTimeOut=A munkamenet lejárt
 SessionExplanation=Ez a szám garancia arra, hogy session soha nem jár le, mielőtt ez a késlekedés. De a PHP session kezelése nem garantálja, hogy mindig session után lejár ez a késedelem: Ez akkor fordul elő, ha a rendszer tisztítása cache munkamenet fut. <br> Megjegyzés: nem adott rendszer belső folyamat PHP session tiszta minden a <b>%s / %s</b> hozzáférés, de csak a hozzáférést más kapcsolatok által.
 TriggersAvailable=Elérhető triggerek
 TriggersDesc=A triggerek olyan fájlok, amely módosítja a viselkedését Dolibarr munkafolyamat után másolja abba a könyvtárba <b>htdocs / core / ravaszt.</b> Rájöttek, új akciókkal aktiválva Dolibarr események (új cég létrehozása, számla érvényesítését, ...).
@@ -1002,8 +1008,8 @@ ConstDesc=This page allows you to edit all other parameters not available in pre
 MiscellaneousDesc=All other security related parameters are defined here.
 LimitsSetup=Korlátok / Precision beállítás
 LimitsDesc=Megadhatjuk, korlátok, pontosítást és optimalizálás által használt Dolibarr itt
-MAIN_MAX_DECIMALS_UNIT=Max a tizedes egységár
-MAIN_MAX_DECIMALS_TOT=Max tizedes teljes áron
+MAIN_MAX_DECIMALS_UNIT=Az egységár tizedesjegyeinek száma
+MAIN_MAX_DECIMALS_TOT=A végösszeg tizedesjegyeinek száma
 MAIN_MAX_DECIMALS_SHOWN=Max tizedes az árak a képernyőn látható (Új <b>...</b> miután ezt a számot, ha meg akarja nézni <b>...</b> amikor számot csonkolni a képernyőn látható)
 MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is done on something else than base 10. For example, put 0.05 if rounding is done by 0.05 steps)
 UnitPriceOfProduct=Nettó egységár egy termék
@@ -1034,12 +1040,12 @@ ShowProfIdInAddress=Mutasd hivatásos id címekkel dokumentumok
 ShowVATIntaInAddress=Hide VAT Intra num with addresses on documents
 TranslationUncomplete=Részleges fordítás
 MAIN_DISABLE_METEO=Meteo nézet letiltása
-TestLoginToAPI=Tesztelje be az API
-ProxyDesc=Egyes funkciói Dolibarr kell egy internetes hozzáférési dolgozni. Határozza meg itt paramétereit. Ha a Dolibarr szerver egy proxy szerver mögött, ezek a paraméterek Dolibarr elmondja, hogyan érhető el interneten keresztül is.
+TestLoginToAPI=Az API belépéshez teszt
+ProxyDesc=A Dolibarr egyes funkcióinak működéséhez kell egy internetes kapcsolat. Határozza meg itt paramétereit. Ha a Dolibarr szerver egy proxy szerver mögött van, ezek a paraméterek Dolibarr elmondja, hogyan érhető el interneten keresztül is.
 ExternalAccess=Külső hozzáférés
 MAIN_PROXY_USE=Használjon proxy szerver (egyébként közvetlen internet-hozzáféréssel)
-MAIN_PROXY_HOST=Neve / címe proxy szerver
-MAIN_PROXY_PORT=Port of proxy szerver
+MAIN_PROXY_HOST=Proxy szerver neve / címe
+MAIN_PROXY_PORT=Proxy szerver port
 MAIN_PROXY_USER=Jelentkezz be, hogy használja a proxy szerver
 MAIN_PROXY_PASS=Jelszó a proxy szerver használata
 DefineHereComplementaryAttributes=Adjuk meg itt minden atributes, még nem álltak rendelkezésre az alapból, hogy azt szeretné, hogy támogatja %s.
@@ -1059,9 +1065,9 @@ ExtraFieldsProjectTask=Complementary attributes (tasks)
 ExtraFieldHasWrongValue=Attribute %s has a wrong value.
 AlphaNumOnlyLowerCharsAndNoSpace=only alphanumericals and lower case characters without space
 SendmailOptionNotComplete=Figyelem, egyes Linux rendszereken, hogy küldjön e-mailt az e-mail, sendmail beállítás végrehajtása lehetőséget kell conatins-ba (paraméter mail.force_extra_parameters be a php.ini fájl). Ha néhány címzett nem fogadja az üzeneteket, próbáld meg szerkeszteni ezt a PHP paraméter = mail.force_extra_parameters-ba).
-PathToDocuments=Út a dokumentumok
-PathDirectory=Directory
-SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail direct" will generate a mail message that might be not correctly parsed by some receiving mail servers. Result is that some mails can't be read by people hosted by those bugged platforms. It's case for some Internet providers (Ex: Orange in France). This is not a problem into Dolibarr nor into PHP but onto receiving mail server. You can however add option MAIN_FIX_FOR_BUGGED_MTA to 1 into setup - other to modify Dolibarr to avoid this. However, you may experience problem with other servers that respect strictly the SMTP standard. The other solution (recommended) is to use the method "SMTP socket library" that has no disadvantages.
+PathToDocuments=A dokumentumok elérési útvonala
+PathDirectory=Könyvtár
+SendmailOptionMayHurtBuggedMTA=A "PHP mail direct" metódus választása esetén olyan emailt küldhet a rendszer melyet nem minden levelező szerver tud megfelelően értelmezni. Ennek eredményeképpen néhány címzett nem fog tudni levelet kapni ezeken a levelező platformokon (pl. a francia Orange esetén) A probléma orvoslására a beállításoknál használhatja a MAIN_FIX_FOR_BUGGED_MTA opciót 1-re állítva. Ez azonban más szervereknél jelenthet gondot melyek szigorúan követik az SMTP szabványt. Egy másik ajánlott metódus az "SMTP socket library" kiválasztása, amelynek nincs hátránya.
 TranslationSetup=Setup of translation
 TranslationKeySearch=Search a translation key or string
 TranslationOverwriteKey=Overwrite a translation string
@@ -1165,10 +1171,6 @@ FreeLegalTextOnOrders=Szabad szöveg rendelés
 WatermarkOnDraftOrders=Watermark on draft orders (none if empty)
 ShippableOrderIconInList=Megrendelés szállíthatóságát jelző ikon hozzáadása a megrendelések listájához
 BANK_ASK_PAYMENT_BANK_DURING_ORDER=Ask for bank account destination of order
-##### Clicktodial #####
-ClickToDialSetup=Kattintson a Tárcsázás modul beállítása
-ClickToDialUrlDesc=Url meghívásra, ha egy kattintás a telefonon Picto történik. Az URL, akkor a tag <br> <b>__PHONETO__</b> Hogy fogja helyettesíteni a telefonszámot hívott személynek <br> <b>__PHONEFROM__</b> Hogy váltják fel a hívó telefonszámát személy (a tiéd) <br> <b>__LOGIN__</b> Hogy váltják fel clicktodial login (azaz a felhasználói kártya) <br> <b>__PASS__</b> Hogy váltják a clicktodial jelszót (amelyeket a felhasználói kártya).
-##### Bookmark4u #####
 ##### Interventions #####
 InterventionsSetup=Beavatkozások modul beállítása
 FreeLegalTextOnInterventions=Szabad az intervenciós szöveges dokumentumok
@@ -1395,7 +1397,7 @@ SendingsSetup=Küldő modul beállítása
 SendingsReceiptModel=Küldése modell átvételét
 SendingsNumberingModules=Küldések számozási modulok
 SendingsAbility=Support shipping sheets for customer deliveries
-NoNeedForDeliveryReceipts=A legtöbb esetben a küldések bevételek egyaránt felhasználják lapok átadások (termékek listája küldeni), és a lapok recevied és aláírja ügyfél. Tehát a termék szállítás bevételek egy kettős funkció aktiválódik, és ritkán.
+NoNeedForDeliveryReceipts=In most cases, shipping sheets are used both as sheets for customer deliveries (list of products to send) and sheets that is received and signed by customer. So product deliveries receipts is a duplicated feature and is rarely activated.
 FreeLegalTextOnShippings=Free text on shipments
 ##### Deliveries #####
 DeliveryOrderNumberingModules=Termékek szállítások kézhezvételét számozás modul
@@ -1477,7 +1479,9 @@ AGENDA_DEFAULT_FILTER_STATUS=Set automatically this status for events into searc
 AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
 AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
 AGENDA_NOTIFICATION_SOUND=Enable sound notification
-##### ClickToDial #####
+##### Clicktodial #####
+ClickToDialSetup=Kattintson a Tárcsázás modul beállítása
+ClickToDialUrlDesc=Url meghívásra, ha egy kattintás a telefonon Picto történik. Az URL, akkor a tag <br> <b>__PHONETO__</b> Hogy fogja helyettesíteni a telefonszámot hívott személynek <br> <b>__PHONEFROM__</b> Hogy váltják fel a hívó telefonszámát személy (a tiéd) <br> <b>__LOGIN__</b> Hogy váltják fel clicktodial login (azaz a felhasználói kártya) <br> <b>__PASS__</b> Hogy váltják a clicktodial jelszót (amelyeket a felhasználói kártya).
 ClickToDialDesc=This module allows to make phone numbers clickable. A click on this icon will call make your phone to 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.
 ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
 ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on same computer than the browser, and called when you click on a link in your browser that start 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.
@@ -1505,10 +1509,11 @@ EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint availa
 ##### API ####
 ApiSetup=API module setup
 ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
-ApiProductionMode=Enable production mode (this will activate use of a caches for services management)
+ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
 ApiExporerIs=You can explore the APIs at url
 OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
 ApiKey=Key for API
+WarningAPIExplorerDisabled=The API explorer has been disabled. API explorer is not required to provide API services. It is a tool for developer to find/test REST APIs. If you need this tool, go into setup of module API REST to activate it.
 ##### Bank #####
 BankSetupModule=Bank modul beállítása
 FreeLegalTextOnChequeReceipts=Szabad szöveg ellenőrzés bevételek
@@ -1544,7 +1549,7 @@ UseSearchToSelectProject=Use autocompletion fields to choose project (instead of
 ##### ECM (GED) #####
 ##### Fiscal Year #####
 AccountingPeriods=Accounting periods
-AccountingPeriodCard=Accounting period
+AccountingPeriodCard=Könyvelési periódus
 NewFiscalYear=New accounting period
 OpenFiscalYear=Open accounting period
 CloseFiscalYear=Close accounting period
@@ -1577,7 +1582,7 @@ BackupDumpWizard=Wizard to build database backup dump file
 SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
 SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is only manual steps a privileged user can do.
 InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
-ConfFileMuseContainCustom=Installing an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to have option<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
+ConfFileMuseContainCustom=Installing an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
 HighlightLinesColor=Highlight color of the line when the mouse passes over (keep empty for no highlight)
 TextTitleColor=Color of page title
@@ -1607,6 +1612,7 @@ FixTZ=TimeZone fix
 FillFixTZOnlyIfRequired=Example: +2 (fill only if problem experienced)
 ExpectedChecksum=Expected Checksum
 CurrentChecksum=Current Checksum
+ForcedConstants=Required constant values
 MailToSendProposal=To send customer proposal
 MailToSendOrder=To send customer order
 MailToSendInvoice=To send customer invoice
@@ -1615,9 +1621,10 @@ MailToSendIntervention=To send intervention
 MailToSendSupplierRequestForQuotation=To send quotation request to supplier
 MailToSendSupplierOrder=To send supplier order
 MailToSendSupplierInvoice=To send supplier invoice
+MailToSendContract=To send a contract
 MailToThirdparty=To send email from third party page
 ByDefaultInList=Show by default on list view
-YouUseLastStableVersion=Ön a legújabb stabil verziót használja!
+YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
 TitleExampleForMaintenanceRelease=Example of message you can use to announce this maintenance release (feel free to use it on your web sites)
 ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. 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.
diff --git a/htdocs/langs/hu_HU/banks.lang b/htdocs/langs/hu_HU/banks.lang
index 9334c104dae..c3c7c1bb4be 100644
--- a/htdocs/langs/hu_HU/banks.lang
+++ b/htdocs/langs/hu_HU/banks.lang
@@ -74,13 +74,13 @@ Conciliate=Összeegyeztetni
 Conciliation=Egyeztetés
 ReconciliationLate=Reconciliation late
 IncludeClosedAccount=Közé zárt fiókok
-OnlyOpenedAccount=Csak nyitott számla egyenlegeket
+OnlyOpenedAccount=Csak számlát nyitott
 AccountToCredit=Jóváirandó számla
 AccountToDebit=Terhelendő számla
 DisableConciliation=Letiltása összehangolási funkció erre a számlára
 ConciliationDisabled=Megbékélés funkció tiltva
 LinkedToAConciliatedTransaction=Linked to a conciliated entry
-StatusAccountOpened=Nyitott
+StatusAccountOpened=Megnyitva
 StatusAccountClosed=Lezárt
 AccountIdShort=Szám
 LineRecord=Tranzakció
diff --git a/htdocs/langs/hu_HU/bills.lang b/htdocs/langs/hu_HU/bills.lang
index cd45c4d8580..02b38b87984 100644
--- a/htdocs/langs/hu_HU/bills.lang
+++ b/htdocs/langs/hu_HU/bills.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - bills
 Bill=Számla
 Bills=Számlák
-BillsCustomers=Vevőszámlák
-BillsCustomer=Vevőszámlák
-BillsSuppliers=Szállítói számlák
-BillsCustomersUnpaid=Nyitott vevőszámlák
-BillsCustomersUnpaidForCompany=Nyitott vevői számlák: %s
+BillsCustomers=Ügyfél számlák
+BillsCustomer=Vásárlói számla
+BillsSuppliers=Beszállítói számlák
+BillsCustomersUnpaid=Nyiott vevőszámlák
+BillsCustomersUnpaidForCompany=Unpaid customer invoices for %s
 BillsSuppliersUnpaid=Nyitott beszállítói számlák
-BillsSuppliersUnpaidForCompany=Nyitott számlák szállító: %s
+BillsSuppliersUnpaidForCompany=Unpaid supplier invoices for %s
 BillsLate=Késedelmes fizetések
 BillsStatistics=Vevőszámla statisztika
 BillsStatisticsSuppliers=Beszállítói számlák statisztikája
@@ -62,8 +62,8 @@ PaymentsBack=Kifizetések vissza
 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 credit note or deposit 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.
+ConfirmDeletePayment=Biztosan törölni kívánja ezt a fizetést?
+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.
 SupplierPayments=Beszállítók kifizetések
 ReceivedPayments=Fogadott befizetések
 ReceivedCustomersPayments=Vásárlóktól kapott befizetések
@@ -78,6 +78,7 @@ PaymentMode=Fizetési típus
 PaymentTypeDC=Debit/Credit Card
 PaymentTypePP=PayPal
 IdPaymentMode=Fizetési mód (id)
+CodePaymentMode=Payment type (code)
 LabelPaymentMode=Fizetési mód (címke)
 PaymentModeShort=Fizetési mód
 PaymentTerm=Fizetési feltétel
@@ -102,9 +103,10 @@ SearchACustomerInvoice=Keressen egy vásárlói számlát
 SearchASupplierInvoice=Beszállítói számla keresése
 CancelBill=Visszavon egy számlát
 SendRemindByMail=Emlékeztető küldése e-mailben 
-DoPayment=Esedékes  kiegyenlítés
-DoPaymentBack=Esedékes kigyenlítés visszavonása
+DoPayment=Enter payment
+DoPaymentBack=Enter refund
 ConvertToReduc=Átalakít jövőbeni kedvezménnyé
+ConvertExcessReceivedToReduc=Convert excess received into future discount
 EnterPaymentReceivedFromCustomer=Írja be a vásárlótól kapott a fizetést
 EnterPaymentDueToCustomer=Legyen esedékes a vásárló fizetése
 DisabledBecauseRemainderToPayIsZero=Letiltva, mivel a maradék egyenleg 0.
@@ -151,14 +153,14 @@ NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified
 FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
 NotARecurringInvoiceTemplate=Not a recurring template invoice
 NewBill=Új számla
-LastBills=Utolsó %s számlák
-LastCustomersBills=Utolsó %s vásárlói számlák
-LastSuppliersBills=Utolsó %s beszállítói számlák
+LastBills=Latest %s invoices
+LastCustomersBills=Latest %s customer invoices
+LastSuppliersBills=Latest %s supplier invoices
 AllBills=Minden számla
 OtherBills=Más számlák
 DraftBills=Tervezet számlák
-CustomersDraftInvoices=A vásárlói tervezet számlák
-SuppliersDraftInvoices=Beszállítók tervezet számlák
+CustomersDraftInvoices=Customer draft invoices
+SuppliersDraftInvoices=Supplier draft invoices
 Unpaid=Kifizetetlen
 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>?
@@ -272,6 +274,7 @@ Deposit=Betét
 Deposits=Betétek
 DiscountFromCreditNote=Kedvezmény a jóváírásból %s
 DiscountFromDeposit=Kifizetések a letéti számláról %s
+DiscountFromExcessReceived=Payments from excess received of invoice %s
 AbsoluteDiscountUse=Ez a fajta hitel felhasználható a számlán, mielőtt azok jóváhagyásra kerülnek
 CreditNoteDepositUse=Invoice must be validated to use this kind of credits
 NewGlobalDiscount=Új abszolút kedvezmény
@@ -279,8 +282,8 @@ NewRelativeDiscount=Új relatív kedvezmény
 NoteReason=Megjegyzés / Ok
 ReasonDiscount=Ok
 DiscountOfferedBy=Által nyújtott
-DiscountStillRemaining=Még fennmaradó kedvezmények
-DiscountAlreadyCounted=Már beszámított kedvezmények
+DiscountStillRemaining=Discounts available
+DiscountAlreadyCounted=Discounts already consumed
 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.
@@ -333,6 +336,8 @@ 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
 # PaymentConditions
 Statut=Státusz
 PaymentConditionShortRECEP=Due Upon Receipt
@@ -351,6 +356,14 @@ PaymentConditionShortPT_ORDER=Megrendelés
 PaymentConditionPT_ORDER=Megrendeléskor
 PaymentConditionShortPT_5050=50-50
 PaymentConditionPT_5050=50%% azonnal, 50%% átvételkor
+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
 FixAmount=Fix összeg
 VarAmount=Változó összeg (%% össz.)
 # PaymentType
@@ -420,7 +433,7 @@ ChequeDeposits=Csekk betétek
 Cheques=Csekkek
 DepositId=Id deposit
 NbCheque=Number of checks
-CreditNoteConvertedIntoDiscount=Ez a hitel-vagy betéti számla át lett alakítva erre %s
+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
 ShowUnpaidAll=Összes ki nem fizetett számlák mutatása
 ShowUnpaidLateOnly=Csak a későn fizetett számlák mutatása
diff --git a/htdocs/langs/hu_HU/boxes.lang b/htdocs/langs/hu_HU/boxes.lang
index a8380188628..50020bf8ddf 100644
--- a/htdocs/langs/hu_HU/boxes.lang
+++ b/htdocs/langs/hu_HU/boxes.lang
@@ -25,8 +25,8 @@ BoxTitleLastSuppliers=Latest %s recorded suppliers
 BoxTitleLastModifiedSuppliers=Latest %s modified suppliers
 BoxTitleLastModifiedCustomers=Latest %s modified customers
 BoxTitleLastCustomersOrProspects=Latest %s customers or prospects
-BoxTitleLastCustomerBills=Latest %s customer's invoices
-BoxTitleLastSupplierBills=Latest %s supplier's invoices
+BoxTitleLastCustomerBills=Latest %s customer invoices
+BoxTitleLastSupplierBills=Latest %s supplier invoices
 BoxTitleLastModifiedProspects=Latest %s modified prospects
 BoxTitleLastModifiedMembers=Latest %s members
 BoxTitleLastFicheInter=Latest %s modified interventions
@@ -51,12 +51,12 @@ ClickToAdd=Klikkelj ide.
 NoRecordedCustomers=Nincs bejegyzett ügyfél
 NoRecordedContacts=Nincs rögzített kapcsolatok
 NoActionsToDo=Nincs végrehatjtásra váró cselekvés
-NoRecordedOrders=Nincs bejegyzett ügyfél megrendelés
+NoRecordedOrders=No recorded customer orders
 NoRecordedProposals=Nincs bejegyzett ajánlat
-NoRecordedInvoices=Nincs bejegyzett ügyfél számla
-NoUnpaidCustomerBills=Nincs kifizetetlen ügyfél számla
-NoUnpaidSupplierBills=Nincs kifizetetlen beszállító számla
-NoModifiedSupplierBills=Nincs bejegyzett beszállító számla
+NoRecordedInvoices=No recorded customer invoices
+NoUnpaidCustomerBills=No unpaid customer invoices
+NoUnpaidSupplierBills=No unpaid supplier invoices
+NoModifiedSupplierBills=No recorded supplier invoices
 NoRecordedProducts=Nincs bejegyzett termék / szolgáltatás
 NoRecordedProspects=Nincs bejegyzett kilátás
 NoContractedProducts=Nincs szerződött termék / szolgáltatás
diff --git a/htdocs/langs/hu_HU/cashdesk.lang b/htdocs/langs/hu_HU/cashdesk.lang
index 8efa8b5cd79..1a3b46496fb 100644
--- a/htdocs/langs/hu_HU/cashdesk.lang
+++ b/htdocs/langs/hu_HU/cashdesk.lang
@@ -14,7 +14,7 @@ ShoppingCart=Bevásárlókocsi
 NewSell=Új eladni
 AddThisArticle=Add hozzá ezt a cikket
 RestartSelling=Menj vissza eladni
-SellFinished=Sale complete
+SellFinished=Értékesítés befejezte
 PrintTicket=Nyomtatás jegy
 NoProductFound=Nem találtam cikket
 ProductFound=termék található
diff --git a/htdocs/langs/hu_HU/commercial.lang b/htdocs/langs/hu_HU/commercial.lang
index 144901d1206..ca33686526e 100644
--- a/htdocs/langs/hu_HU/commercial.lang
+++ b/htdocs/langs/hu_HU/commercial.lang
@@ -31,12 +31,12 @@ ListOfCustomers=Ügyfelek listája
 LastDoneTasks=Latest %s completed actions
 LastActionsToDo=Oldest %s not completed actions
 DoneAndToDoActions=Végrehajtott és végrehajtásra váró feladatok
-DoneActions=Befejezett cselekvések
-ToDoActions=Befejezetlen cselekvések
+DoneActions=Befejezett események
+ToDoActions=Befejezetlen események
 SendPropalRef=Submission of commercial proposal %s
 SendOrderRef=Submission of order %s
 StatusNotApplicable=Nem alkalmazható
-StatusActionToDo=Végrehajtani
+StatusActionToDo=Tennivaló
 StatusActionDone=Kész
 StatusActionInProcess=Folyamatban
 TasksHistoryForThisContact=Cselekvések ehhez a kapcsolathoz
@@ -45,13 +45,13 @@ LastProspectNeverContacted=Soha nem volt kapcsolatfölvétel
 LastProspectToContact=Kapcsolatba lépés
 LastProspectContactInProcess=Kapcsolatba lépés folyamatban
 LastProspectContactDone=Kapcsolatba lépés megtörtént
-ActionAffectedTo=Cselekvés hatással van rá
-ActionDoneBy=Cselekvést végrehatja
+ActionAffectedTo=Hozzárendelve
+ActionDoneBy=Végrehajtotta
 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_RDV=Találkozó
+ActionAC_RDV=Találkozók
 ActionAC_INT=Helyszíni beavatkozás
 ActionAC_FAC=Számla küldése ügyfélnek levélben
 ActionAC_REL=Számla küldése ügyfélnek levélben (emlékeztető)
diff --git a/htdocs/langs/hu_HU/companies.lang b/htdocs/langs/hu_HU/companies.lang
index 0a9770e29ed..541e44320c3 100644
--- a/htdocs/langs/hu_HU/companies.lang
+++ b/htdocs/langs/hu_HU/companies.lang
@@ -2,9 +2,9 @@
 ErrorCompanyNameAlreadyExists=Cégnév %s már létezik. Válasszon egy másikat.
 ErrorSetACountryFirst=Először állítsa be az országot
 SelectThirdParty=Válasszon egy partnert
-ConfirmDeleteCompany=Are you sure you want to delete this company and all inherited information?
+ConfirmDeleteCompany=Biztos benne, hogy törli a vállalatot és az összes öröklött információt?
 DeleteContact=Kapcsolat/címek törlése
-ConfirmDeleteContact=Are you sure you want to delete this contact and all inherited information?
+ConfirmDeleteContact=Biztosan törölni akarja ezt a kapcsolatot és az összes örökölt információt?
 MenuNewThirdParty=Új partner
 MenuNewCustomer=Új vevő
 MenuNewProspect=Új jelentkező
@@ -13,8 +13,8 @@ MenuNewPrivateIndividual=Új magánszemély
 NewCompany=Új cég (jelentkező, vevő, szállító)
 NewThirdParty=Új partner (jelentkező, vevő, szállító)
 CreateDolibarrThirdPartySupplier=Parnter (szállító) létrehozása
-CreateThirdPartyOnly=Create thirdpary
-CreateThirdPartyAndContact=Create a third party + a child contact
+CreateThirdPartyOnly=Harmadik fél létrehozása
+CreateThirdPartyAndContact=Harmadik fél létrehozása + szülő kapcsolat
 ProspectionArea=Potenciális ​​terület
 IdThirdParty=Partner ID
 IdCompany=Cég ID
@@ -75,12 +75,13 @@ Poste= Pozíció
 DefaultLang=Nyelv alapértelmezés szerint
 VATIsUsed=ÁFÁ-t használandó
 VATIsNotUsed=ÁFÁ-t nem használandó
-CopyAddressFromSoc=Fill address with third party address
+CopyAddressFromSoc=Cím kitöltése a harmadik férl címével
 ThirdpartyNotCustomerNotSupplierSoNoRef=A harmadik fél nem vevő sem szállító, nincs elérhető hivatkozási objektum
-PaymentBankAccount=Payment bank account
-OverAllProposals=Total proposals
-OverAllOrders=Total orders
-OverAllInvoices=Total invoices
+PaymentBankAccount=Fizetési bank számla
+OverAllProposals=Kiajánlott összesen
+OverAllOrders=Rendelés összesen
+OverAllInvoices=Számlák összesen
+OverAllSupplierProposals=Total price requests
 ##### Local Taxes #####
 LocalTax1IsUsed=Másodlagos adó használata
 LocalTax1IsUsedES= RE használandó
@@ -204,7 +205,7 @@ ProfId1MA=Szakma id 1 (RC)
 ProfId2MA=Szakma id 2 (Patente)
 ProfId3MA=Szakma id 3 (IF)
 ProfId4MA=Szakma id 4 (CNSS)
-ProfId5MA=Id. prof. 5 (I.C.E.)
+ProfId5MA=Szakma id  5 (C.I.C.E.)
 ProfId6MA=-
 ProfId1MX=Szakma ID 1 (RFC).
 ProfId2MX=Szakma ID 2 (R.. P. IMSS)
@@ -272,7 +273,7 @@ EditContactAddress=Kapcsolat/cím szerkesztése
 Contact=Kapcsolat
 ContactId=Kapcsolat id azonosító
 ContactsAddresses=Kapcsolatok / címek
-FromContactName=Name:
+FromContactName=Név:
 NoContactDefinedForThirdParty=Nincs szerződés ehhez a partnerhez
 NoContactDefined=Nincs kapcsolat megadva
 DefaultContact=Alapértelmezett kapcsolat
@@ -295,7 +296,7 @@ CompanyDeleted="%s" cég törölve az adatbázisból.
 ListOfContacts=Névjegyek / címek
 ListOfContactsAddresses=Kapcsolatok listája
 ListOfThirdParties=Partnerek listája
-ShowCompany=Show third party
+ShowCompany=Harmadik fél mutatása
 ShowContact=Kapcsolat mutatása
 ContactsAllShort=Minden (nincs szűrő)
 ContactType=Kapcsolat típusa
@@ -364,9 +365,9 @@ ExportCardToFormat=Kártya exportálása formázással
 ContactNotLinkedToCompany=Kapcsolat nincs partnerhez csatolva
 DolibarrLogin=Dolibarr bejelentkezés
 NoDolibarrAccess=Nem Dolibarr hozzáférés
-ExportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
+ExportDataset_company_1=Harmadik fél (cégek / alapítványok / személyek) és tulajdonságai
 ExportDataset_company_2=Kapcsolatok és tulajdonságai
-ImportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
+ImportDataset_company_1=Harmadik fél (cégek / alapítványok / személyek) és tulajdonságai
 ImportDataset_company_2=Kapcsolatok/címek (partner vagy nem) és attribútumok
 ImportDataset_company_3=Banki adatok
 ImportDataset_company_4=Harmadik fél/Kereskedelmi képviselők (Hatással van a vaállalatokhoz tartozó  kereskedelmi képviselő felhasználókra)
@@ -389,9 +390,9 @@ ListCustomersShort=Vevők listája
 ThirdPartiesArea=Partner és a szerződés helye
 LastModifiedThirdParties=Legutóbb %s változtatott harmadik felet
 UniqueThirdParties=Összes egyedi parnter
-InActivity=Nyitott
+InActivity=Megnyitva
 ActivityCeased=Lezárt
-ThirdPartyIsClosed=Third party is closed
+ThirdPartyIsClosed=Harmadik fél lezárva
 ProductsIntoElements=Termékek / szolgáltatások listálya ide %s
 CurrentOutstandingBill=Jelenlegi kintlévőség
 OutstandingBill=Maximális kintlévőség
@@ -401,10 +402,10 @@ LeopardNumRefModelDesc=A kód szabad. Ez a kód bármikor módosítható.
 ManagingDirectors=Vezető(k) neve (ügyvezető, elnök, igazgató)
 MergeOriginThirdparty=Duplikált partner (a partnert törlésre kerül)
 MergeThirdparties=Partnerek egyesítése
-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 so you will be able to delete the duplicate one.
+ConfirmMergeThirdparties=Biztos hogy egyesíteni szeretnéd ezt a harmadik félt az aktuális partnerrel? Minden kapcsolt objektum (számlák, megrendelések, ...) átkerülnek a jelenlegi harmadik félhez, így a másik törölhetővé válik.
 ThirdpartiesMergeSuccess=Partnerek egyesítése megtörtént
 SaleRepresentativeLogin=Kereskedelmi képviselő bejelentkezés
-SaleRepresentativeFirstname=Kereskedelmi képviselő keresztneve
-SaleRepresentativeLastname=Kereskedelmi képviselő családi neve
+SaleRepresentativeFirstname=First name of sales representative
+SaleRepresentativeLastname=Last name of sales representative
 ErrorThirdpartiesMerge=Hiba történt a partner törlésekor. Ellenőrizd a log-ban. A változtatás visszavonva.
-NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
+NewCustomerSupplierCodeProposed=Új vásárló vagy beszállító javasolt a megkettőzött kóddal
diff --git a/htdocs/langs/hu_HU/compta.lang b/htdocs/langs/hu_HU/compta.lang
index 6b0383fc2c3..4225e7501cc 100644
--- a/htdocs/langs/hu_HU/compta.lang
+++ b/htdocs/langs/hu_HU/compta.lang
@@ -65,6 +65,7 @@ PaymentSocialContribution=Szociális/költségvetési adó fizetés
 PaymentVat=ÁFA-fizetés
 ListPayment=A fizetési lista
 ListOfCustomerPayments=Ügyfelek fizetési listája
+ListOfSupplierPayments=Listája szállítói kifizetések
 DateStartPeriod=Date start period
 DateEndPeriod=Date end period
 newLT1Payment=New tax 2 payment
@@ -81,7 +82,7 @@ LT2PaymentES=Fizetési IRPF
 LT2PaymentsES=IRPF kifizetések
 VATPayment=Sales tax payment
 VATPayments=Sales tax payments
-VATRefund=Sales tax refund Refund
+VATRefund=Sales tax refund
 Refund=Visszatérítés
 SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Mutasd ÁFA fizetési
@@ -203,4 +204,4 @@ LinkedFichinter=Link to an intervention
 ImportDataset_tax_contrib=Social/fiscal taxes
 ImportDataset_tax_vat=Vat payments
 ErrorBankAccountNotFound=Error: Bank account not found
-FiscalPeriod=Accounting period
+FiscalPeriod=Könyvelési periódus
diff --git a/htdocs/langs/hu_HU/contracts.lang b/htdocs/langs/hu_HU/contracts.lang
index 04be6bc79c0..7b462446a64 100644
--- a/htdocs/langs/hu_HU/contracts.lang
+++ b/htdocs/langs/hu_HU/contracts.lang
@@ -32,13 +32,13 @@ NewContractSubscription=Új szerződés / előfizetés
 AddContract=Szerződés hozzáadása
 DeleteAContract=Szerződés törlése
 CloseAContract=Szerződés lezárása
-ConfirmDeleteAContract=Are you sure you want to delete this contract and all its services?
-ConfirmValidateContract=Are you sure you want to validate this contract under name <b>%s</b>?
-ConfirmCloseContract=This will close all services (active or not). Are you sure you want to close this contract?
-ConfirmCloseService=Are you sure you want to close this service with date <b>%s</b>?
+ConfirmDeleteAContract=Biztos törölni akarja a szerződést és minden hozzá tartozó szolgáltatást?
+ConfirmValidateContract=Biztos hitelesíteni akarja a szerződést ezen a név alatt<b>%s</b>?
+ConfirmCloseContract=Lezár minden szolgáltatást (aktív vagy nem). Biztos le akarja zárni a szerződést?
+ConfirmCloseService=Biztos le akarja zárni a <b>%s</b> dátummal ellátott szolgáltatást?
 ValidateAContract=Szerződés hitelesítése
 ActivateService=Aktív szolgáltatás
-ConfirmActivateService=Are you sure you want to activate this service with date <b>%s</b>?
+ConfirmActivateService=Biztos aktiválni akarja a <b>%s</b> dátummal ellátott szolgáltatást?
 RefContract=Szerződés azonosító
 DateContract=Szerződés dátuma
 DateServiceActivate=Szolgáltatás aktiválásának dátuma
@@ -69,10 +69,10 @@ DraftContracts=Szerződés tervezetek
 CloseRefusedBecauseOneServiceActive=A szerződés addig nem zárható le amig legalább 1 nyitott szolgáltatás van még
 CloseAllContracts=Minden szerződés sor lezárása
 DeleteContractLine=Szerződés sor törlése
-ConfirmDeleteContractLine=Are you sure you want to delete this contract line?
+ConfirmDeleteContractLine=Biztos törölni akarja a szerződés sort?
 MoveToAnotherContract=Szolgáltatás átmozgatása másik szerződéshez.
 ConfirmMoveToAnotherContract=Új cél szerződést választottam a szolgáltatásnak, és át akarok helyezni a szolgáltatást.
-ConfirmMoveToAnotherContractQuestion=Choose in which existing contract (of same third party), you want to move this service to?
+ConfirmMoveToAnotherContractQuestion=Melyik létező szerződéshez (ugyan azon harmadik fél) szeretné átmozgatni a szolgáltatást?
 PaymentRenewContractId=Szerződés sor megújítása (%s)
 ExpiredSince=Lejárati dátum
 NoExpiredServices=Nincs lejárt aktív szolgáltatások
diff --git a/htdocs/langs/hu_HU/cron.lang b/htdocs/langs/hu_HU/cron.lang
index fca83550932..4ceeeda9fda 100644
--- a/htdocs/langs/hu_HU/cron.lang
+++ b/htdocs/langs/hu_HU/cron.lang
@@ -17,14 +17,14 @@ CronMethodDoesNotExists=Class %s does not contains any method %s
 # Menu
 EnabledAndDisabled=Enabled and disabled
 # Page list
-CronLastOutput=Last run output
-CronLastResult=Last result code
+CronLastOutput=Latest run output
+CronLastResult=Latest result code
 CronCommand=Command
 CronList=Scheduled jobs
 CronDelete=Delete scheduled jobs
-CronConfirmDelete=Are you sure you want to delete these scheduled jobs ?
+CronConfirmDelete=Are you sure you want to delete these scheduled jobs?
 CronExecute=Launch scheduled job
-CronConfirmExecute=Are you sure you want to execute these scheduled jobs now ?
+CronConfirmExecute=Are you sure you want to execute these scheduled jobs now?
 CronInfo=Scheduled job module allow to execute job that have been planned
 CronTask=Job
 CronNone=Nincs
@@ -33,13 +33,13 @@ CronDtEnd=Not after
 CronDtNextLaunch=Next execution
 CronDtLastLaunch=Start date of latest execution
 CronDtLastResult=End date of latest execution
-CronFrequency=Frequency
+CronFrequency=Gyakoriság
 CronClass=Class
 CronMethod=Módszer
 CronModule=Modul
 CronNoJobs=No jobs registered
 CronPriority=Prioritás
-CronLabel=Label
+CronLabel=Felirat
 CronNbRun=Nb. launch
 CronMaxRun=Max nb. launch
 CronEach=Every
diff --git a/htdocs/langs/hu_HU/ecm.lang b/htdocs/langs/hu_HU/ecm.lang
index 33b782a19f4..273cf4a9559 100644
--- a/htdocs/langs/hu_HU/ecm.lang
+++ b/htdocs/langs/hu_HU/ecm.lang
@@ -2,7 +2,7 @@
 ECMNbOfDocs=Dokumentumok száma a könyvtárban
 ECMSection=Könyvtár
 ECMSectionManual=Kézi könyvtár
-ECMSectionAuto=Automata könyvtár
+ECMSectionAuto=Automatikus könyvtár
 ECMSectionsManual=Kézi fa
 ECMSectionsAuto=Automata fa
 ECMSections=Könyvtárak
@@ -12,33 +12,33 @@ ECMAddSection=Könyvtár hozzáadása
 ECMCreationDate=Létrehozás dátuma
 ECMNbOfFilesInDir=Fájlok száma a könyvtárban
 ECMNbOfSubDir=Alkönyvtárok száma
-ECMNbOfFilesInSubDir=Number of files in sub-directories
+ECMNbOfFilesInSubDir=Fájlok száma az alkönyvtárakban
 ECMCreationUser=Létrehozó
-ECMArea=EDM area
-ECMAreaDesc=The EDM (Electronic Document Management) area allows you to save, share and search quickly all kind of documents in Dolibarr.
+ECMArea=EDM felület
+ECMAreaDesc=Az EDM (Electronic Document Management) felületén gyorsan tud keresni, elmenteni és megosztani mindenféle Dolibarr dokumentumot.
 ECMAreaDesc2=* Az automatikus könyvtárak önmagukat töltik föl amikor dokumentumot adunk valamilyen elem kártyájához.<br>* A kézi könyvtárakban elmenthetünk dokumentumokat amik nincsenek csatolva egyetlen elemhez sem.
 ECMSectionWasRemoved=<b>%s</b> könyvtár törölve lett.
-ECMSearchByKeywords=Kulcs szavak alapjáni keresés
-ECMSearchByEntity=Objektum alapjáni keresés
+ECMSearchByKeywords=Kulcsszavak szerinti keresés
+ECMSearchByEntity=Objektum szerinti keresés
 ECMSectionOfDocuments=Dokumentumok könyvtárai
 ECMTypeAuto=Automatikus
-ECMDocsBySocialContributions=Documents linked to social or fiscal taxes
-ECMDocsByThirdParties=Harmadik féllel kapcsolatban álló dokumentumok
-ECMDocsByProposals=Ajánlatokkat kapcsolatban álló dokumentumok
-ECMDocsByOrders=Megrendelésekkel kapcsolatban álló dokumentumok
-ECMDocsByContracts=Szerződésekkel kapcsolatban álló dokumentumok
-ECMDocsByInvoices=Ügyfél számlákkal kapcsolatban álló dokumentumok
-ECMDocsByProducts=Termékekkel kapcsolatban álló dokumentumok
-ECMDocsByProjects=Documents linked to projects
-ECMDocsByUsers=Documents linked to users
-ECMDocsByInterventions=Documents linked to interventions
-ECMDocsByExpenseReports=Documents linked to expense reports
+ECMDocsBySocialContributions=Adókhoz, járulékokhoz kapcsolódó dokumentumok 
+ECMDocsByThirdParties=Harmadik félhez kapcsolódó dokumentumok
+ECMDocsByProposals=Ajánlatokkal kapcsolatos dokumentumok
+ECMDocsByOrders=Megrendelésekkel kapcsolatos dokumentumok
+ECMDocsByContracts=Szerződésekkel kapcsolatos dokumentumok
+ECMDocsByInvoices=Ügyfélszámlákkal kapcsolatos dokumentumok
+ECMDocsByProducts=Termékekkel kapcsolatos dokumentumok
+ECMDocsByProjects=Projektekkel kapcsolatos dokumentumok
+ECMDocsByUsers=Felhasználókkal kapcsolatos dokumentumok
+ECMDocsByInterventions=Beavatkozásokkal kapcsolatos dokumentumok
+ECMDocsByExpenseReports=Költség-kimutatásokhoz kapcsolódó dokumentumok
 ECMNoDirectoryYet=Nem lett könyvtár létrehozva
 ShowECMSection=Könyvtár mutatása
-DeleteSection=Könyvátr eltávolítása
-ConfirmDeleteSection=Can you confirm you want to delete the directory <b>%s</b>?
+DeleteSection=Könyvtár eltávolítása
+ConfirmDeleteSection=Kérem erősítse meg, valóban törli a <b>%s</b> könyvtárat ?
 ECMDirectoryForFiles=Relatív könyvtár a fájlokhoz
 CannotRemoveDirectoryContainsFiles=Az eltvolítás nem lehetséges amig tartalmaz fájlokat
 ECMFileManager=Fájl kezelő
 ECMSelectASection=Válasszon könyvtárat a bal oldali fából...
-DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Refresh" button first to synchronize disk and database to get content of this directory.
+DirNotSynchronizedSyncFirst=Ezt a könyvtárat az ECM modulon kívül hozták létre vagy módosították. Kattintson a "Frissítés" gombra a lemez tartalmának és az adatbázis szinkronizálásához !
diff --git a/htdocs/langs/hu_HU/errors.lang b/htdocs/langs/hu_HU/errors.lang
index 8f1a7c0896c..2635aacb539 100644
--- a/htdocs/langs/hu_HU/errors.lang
+++ b/htdocs/langs/hu_HU/errors.lang
@@ -7,43 +7,44 @@ ErrorButCommitIsDone=Errors found but we validate despite this
 ErrorBadEMail=E-mail %s rossz
 ErrorBadUrl=Url %s rossz
 ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
-ErrorLoginAlreadyExists=Bejelentkezés %s már létezik.
-ErrorGroupAlreadyExists=Csoport %s már létezik.
-ErrorRecordNotFound=Jegyezze fel nem található.
-ErrorFailToCopyFile=Fájl másolása sikertelen <b>&quot;%s&quot;</b> a <b>&quot;%s&quot;.</b>
-ErrorFailToRenameFile=Nem sikerült átnevezni file <b>&quot;%s&quot;</b> a <b>&quot;%s&quot;.</b>
-ErrorFailToDeleteFile=Nem sikerült eltávolítani fájl <b>&quot;%s&quot;.</b>
-ErrorFailToCreateFile=Nem sikerült létrehozni a fájlt <b>&quot;%s&quot;.</b>
-ErrorFailToRenameDir=Nem sikerült átnevezni könyvtár <b>&quot;%s&quot;</b> a <b>&quot;%s&quot;.</b>
-ErrorFailToCreateDir=Nem sikerült létrehozni a könyvtárat <b>&quot;%s&quot;.</b>
-ErrorFailToDeleteDir=Nem sikerült törölni a könyvtárat <b>&quot;%s&quot;.</b>
+ErrorLoginAlreadyExists=A %s felhasználói név már létezik.
+ErrorGroupAlreadyExists=A %s csoport már létezik.
+ErrorRecordNotFound=A rekord nem található
+ErrorFailToCopyFile=A '<b>%s</b>' fájl másolása sikertelen '<b>%s</b>' -ba.
+ErrorFailToCopyDir=Failed to copy directory '<b>%s</b>' into '<b>%s</b>'.
+ErrorFailToRenameFile=Nem sikerült átnevezni a '<b>%s</b>' fájlt '<b>%s</b>' -ra.
+ErrorFailToDeleteFile=Nem sikerült eltávolítani a '<b>%s</b>' fájlt.
+ErrorFailToCreateFile=Nem sikerült létrehozni a '<b>%s</b>' fájlt.
+ErrorFailToRenameDir=Nem sikerült átnevezni a '<b>%s</b>' könyvtárat '<b>%s</b>' -ra.
+ErrorFailToCreateDir=Nem sikerült létrehozni a '<b>%s</b>' könyvtárat.
+ErrorFailToDeleteDir=Nem sikerült törölni a '<b>%s</b>' könyvtárat.
 ErrorThisContactIsAlreadyDefinedAsThisType=Ez a kapcsolat már definiálva van, mint az ilyen típusú kapcsolatot.
-ErrorCashAccountAcceptsOnlyCashMoney=Ez egy bankszámlán pénzszámlájának, ezért fizetést elfogadó típus csak készpénzes.
-ErrorFromToAccountsMustDiffers=Forrás és célok bankszámlák különbözőnek kell lennie.
+ErrorCashAccountAcceptsOnlyCashMoney=Ez egy folyószámla, ezért csak készpénzes fizetési módot fogad el.
+ErrorFromToAccountsMustDiffers=A forrás és cél bankszámláknak különbözőeknek kell lenniük.
 ErrorBadThirdPartyName=Rossz érték a harmadik fél nevében
-ErrorProdIdIsMandatory=The %s is mandatory
-ErrorBadCustomerCodeSyntax=Rossz a szintaxisa az ügyfél kód
+ErrorProdIdIsMandatory=A %s kötelezően megadandó
+ErrorBadCustomerCodeSyntax=Az ügyfélkód szintaxisa rossz
 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.
-ErrorCustomerCodeRequired=Ügyfél kód szükséges
+ErrorCustomerCodeRequired=Ügyfélkód szükséges
 ErrorBarCodeRequired=Bar code required
-ErrorCustomerCodeAlreadyUsed=Ügyfél kód már használatban
+ErrorCustomerCodeAlreadyUsed=Ügyfélkód már használatban
 ErrorBarCodeAlreadyUsed=Bar code already used
 ErrorPrefixRequired=Előtag szükséges
-ErrorBadSupplierCodeSyntax=Rossz szintaxisa szállító kód
-ErrorSupplierCodeRequired=Szállító kód szükséges
-ErrorSupplierCodeAlreadyUsed=Szállító kód már használatban
+ErrorBadSupplierCodeSyntax=A beszállító kód szintaxisa rossz
+ErrorSupplierCodeRequired=Beszállító kód szükséges
+ErrorSupplierCodeAlreadyUsed=Beszállító kód már használatban
 ErrorBadParameters=Hibás paraméterek
-ErrorBadValueForParameter=Wrong value '%s' for parameter '%s'
-ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
-ErrorBadDateFormat=Érték &quot;%s&quot; rossz a dátum formátumát
+ErrorBadValueForParameter=A '%s' érték nem megfelelő a '%s' paraméter számára
+ErrorBadImageFormat=A képfájl formátuma nem támogatott (A PHP nem támogatja ilyen formátumú képek konverzióját)
+ErrorBadDateFormat=A '%s' értéke nem megfelelő dátum formátum
 ErrorWrongDate=Date is not correct!
-ErrorFailedToWriteInDir=Nem sikerült írni a könyvtárban %s
+ErrorFailedToWriteInDir=Nem sikerült írni a %s könyvtárba
 ErrorFoundBadEmailInFile=Talált rossz e-mail szintaxisa %s sorok fájlt (például az e-mail vonal %s %s =)
 ErrorUserCannotBeDelete=User cannot be deleted. May be it is associated to Dolibarr entities.
-ErrorFieldsRequired=Néhány jelölt mezők kitöltése kötelező nem töltött.
+ErrorFieldsRequired=Néhány kötelezően kitöltendő mező még üres.
 ErrorFailedToCreateDir=Nem sikerült létrehozni egy könyvtárat. Ellenőrizze, hogy a Web szerver felhasználó engedélyekkel rendelkezik, hogy ültesse át Dolibarr dokumentumok könyvtárba. Ha a paraméter <b>safe_mode</b> engedélyezve van ez a PHP-t, ellenőrizze, hogy Dolibarr PHP fájlok tulajdonosa a webszerver felhasználó (vagy csoport).
-ErrorNoMailDefinedForThisUser=Nincs definiálva mail felhasználó
-ErrorFeatureNeedJavascript=Ez a funkció JavaScript aktiválni kell dolgozni. Változtassa meg ezt a setup - kijelző.
+ErrorNoMailDefinedForThisUser=Nincs megadva a felhasználó email címe
+ErrorFeatureNeedJavascript=A funkcó működéséhez Javascript aktiválására van szükség. A beállítások - képernyő részben beállíthatja.
 ErrorTopMenuMustHaveAParentWithId0=Egy menü típusú &quot;fent&quot; nem lehet egy szülő menüben. Tedd 0 szülő menüből, vagy válasszon egy menüt típusú &quot;baloldal&quot;.
 ErrorLeftMenuMustHaveAParentId=Egy menü típusú &quot;Bal&quot; kell egy szülő id.
 ErrorFileNotFound=<b>%s</b> fájl nem található (Rossz út, rossz engedélyek vagy a hozzáférés megtagadva a PHP safe_mode openbasedir vagy paraméter)
@@ -51,12 +52,12 @@ ErrorDirNotFound=<b>%s</b> könyvtár nem található (Rossz út, rossz engedél
 ErrorFunctionNotAvailableInPHP=Funkció <b>%s</b> van szükség, de ez a funkció nem érhető el ez a verzió / beállítását PHP.
 ErrorDirAlreadyExists=A könyvtár ezzel a névvel már létezik.
 ErrorFileAlreadyExists=Egy ugyanilyen nevű fájl már létezik.
-ErrorPartialFile=A fájl nem kapott teljesen szerver.
-ErrorNoTmpDir=Ideiglenes directy %s nem létezik.
-ErrorUploadBlockedByAddon=Töltsd blokkolja PHP / Apache plugin.
+ErrorPartialFile=A fájlt nem sikerült teljesen feltölteni.
+ErrorNoTmpDir=A %s ideiglenes könyvtár nem létezik.
+ErrorUploadBlockedByAddon=A feltöltést akadályozza valamilyen PHP / Apache plugin.
 ErrorFileSizeTooLarge=A fájl mérete túl nagy.
-ErrorSizeTooLongForIntType=Méret túl hosszú int típusú (maximum %s számjegy)
-ErrorSizeTooLongForVarcharType=Méret túl hosszú a string típusú (%s karakter maximum)
+ErrorSizeTooLongForIntType=Túl nagy szám az int típushoz (maximum %s számjegy)
+ErrorSizeTooLongForVarcharType=Túl hosszú szöveg a string típushoz (%s karakter maximum)
 ErrorNoValueForSelectType=Please fill value for select list
 ErrorNoValueForCheckBoxType=Please fill value for checkbox list
 ErrorNoValueForRadioType=Please fill value for radio list
@@ -115,7 +116,7 @@ ErrorNoActivatedBarcode=Nem vonalkód típus aktivált
 ErrUnzipFails=Failed to unzip %s with ZipArchive
 ErrNoZipEngine=No engine to unzip %s file in this PHP
 ErrorFileMustBeADolibarrPackage=The file %s must be a Dolibarr zip package
-ErrorFileRequired=It takes a package Dolibarr file
+ErrorModuleFileRequired=You must select a Dolibarr module package file
 ErrorPhpCurlNotInstalled=The PHP CURL is not installed, this is essential to talk with 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
@@ -181,6 +182,8 @@ ErrorBankStatementNameMustFollowRegex=Error, bank statement name must follow the
 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>
 
 # 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.
diff --git a/htdocs/langs/hu_HU/holiday.lang b/htdocs/langs/hu_HU/holiday.lang
index dfdbb927bdf..fef078aba48 100644
--- a/htdocs/langs/hu_HU/holiday.lang
+++ b/htdocs/langs/hu_HU/holiday.lang
@@ -76,8 +76,8 @@ BoxTitleLastLeaveRequests=Latest %s modified leave requests
 HolidaysMonthlyUpdate=Monthly update
 ManualUpdate=Manual update
 HolidaysCancelation=Leave request cancelation
-EmployeeLastname=Employee lastname
-EmployeeFirstname=Employee firstname
+EmployeeLastname=Employee last name
+EmployeeFirstname=Employee first name
 TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
 
 ## Configuration du Module ##
diff --git a/htdocs/langs/hu_HU/install.lang b/htdocs/langs/hu_HU/install.lang
index 68509429436..25f2da00126 100644
--- a/htdocs/langs/hu_HU/install.lang
+++ b/htdocs/langs/hu_HU/install.lang
@@ -11,14 +11,14 @@ 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=This PHP support Curl.
+PHPSupportCurl=Ennek a PHP-nak a támogató Curl-ja.
 PHPSupportUTF8=Ez a PHP verzió támogatja az UTF8 funkciókat.
 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.
-ErrorPHPDoesNotSupportCurl=Your PHP installation does not support Curl.
+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.
 ErrorDirDoesNotExists=%s könyvtár nem létezik.
 ErrorGoBackAndCorrectParameters=Menjen vissza és javítsa ki a rossz paramétereket.
@@ -77,7 +77,7 @@ SetupEnd=Telepítés vége
 SystemIsInstalled=A telepítés készen van.
 SystemIsUpgraded=Dolibarr frissítése sikeres.
 YouNeedToPersonalizeSetup=Most már konfiguálhatja a Dolibarr-t az igényei szerint (megjelenés, funkciók, ...). Ehhez kérjük kövesse az alábbi linket:
-AdminLoginCreatedSuccessfuly=Dolibarr administrator login '<b>%s</b>' created successfully.
+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.
@@ -87,7 +87,7 @@ DirectoryRecommendation=Ajánlatos a weblap könyvtárán kívüli könyvtárat
 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.
-FailedToCreateAdminLogin=Failed to create Dolibarr administrator account.
+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
 ChoosedMigrateScript=Migrációs szkript választása
@@ -132,7 +132,7 @@ 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.
 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=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...
+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.
@@ -147,7 +147,7 @@ MigrationSupplierOrder=Beszállítói rendelések migrációja
 MigrationProposal=Üzleti ajánlatok migrációja
 MigrationInvoice=Ügyfél számlák migrációja
 MigrationContract=Szerzõdések migrációja
-MigrationSuccessfullUpdate=Upgrade successfull
+MigrationSuccessfullUpdate=Frissítés sikeres
 MigrationUpdateFailed=Sikeretelen frissítés
 MigrationRelationshipTables=Kapcsolati táblák migrációja (%s)
 MigrationPaymentsUpdate=Fizetési adatok korrekciója
@@ -161,7 +161,7 @@ MigrationContractsLineCreation=%s számú szerzõdés számára új sorok létre
 MigrationContractsNothingToUpdate=Nincs több tenni való
 MigrationContractsFieldDontExist=fk_facture mezõ nem létezik többé. Nincs több tenni való.
 MigrationContractsEmptyDatesUpdate=Szerzõdés üres dátumának korrekciója
-MigrationContractsEmptyDatesUpdateSuccess=Contract emtpy date correction done successfully
+MigrationContractsEmptyDatesUpdateSuccess=Szerzõdés üres dátumának korrekciója sikeresen lezajlott
 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
@@ -169,13 +169,13 @@ MigrationContractsInvalidDateFix=%s szerzõdés korrekciója (Szerzõdés dátum
 MigrationContractsInvalidDatesNumber=%s szerzõdés módosítva
 MigrationContractsInvalidDatesNothingToUpdate=Nincs korrekcióra szoruló dátum
 MigrationContractsIncoherentCreationDateUpdate=Szerzõdés rossz létrehztási dátum korrekció
-MigrationContractsIncoherentCreationDateUpdateSuccess=Bad value contract creation date correction done successfully
+MigrationContractsIncoherentCreationDateUpdateSuccess=Szerzõdés rossz létrehztási dátum korrekció sikeresen lezajlott
 MigrationContractsIncoherentCreationDateNothingToUpdate=Nincs korrekcióra szoruló szerzõdés
 MigrationReopeningContracts=Hiba miatt véletlenül lezárt szerzõdések újranyitása
 MigrationReopenThisContract=%s szerzõdés újranyitása
 MigrationReopenedContractsNumber=%s szerzõdés módosítva
 MigrationReopeningContractsNothingToUpdate=Nincs újranyitásra szoruló szerzõdés
-MigrationBankTransfertsUpdate=Update links between bank entry and a bank transfer
+MigrationBankTransfertsUpdate=Linkek frissítése banki tranzakciók és banki átutalások között
 MigrationBankTransfertsNothingToUpdate=Minden link friss
 MigrationShipmentOrderMatching=Küldött bizonylatok frissítése
 MigrationDeliveryOrderMatching=Szállítási bizonylatok frissítése
@@ -190,9 +190,9 @@ 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
-MigrationRemiseEntity=Update entity field value of llx_societe_remise
-MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
+MigrationRemiseEntity=Üres mező érték frissítése: llx_societe_remise
+MigrationRemiseExceptEntity=Üres mező érték frissítése: llx_societe_remise_except
 MigrationReloadModule=Modul újratöltése %s
 ShowNotAvailableOptions=Nem elérhető opciók mutatása
 HideNotAvailableOptions=Nem elérhető opciók elrejtése
-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.
+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.
diff --git a/htdocs/langs/hu_HU/ldap.lang b/htdocs/langs/hu_HU/ldap.lang
index d9fff1b2b1c..0ce69a04805 100644
--- a/htdocs/langs/hu_HU/ldap.lang
+++ b/htdocs/langs/hu_HU/ldap.lang
@@ -13,10 +13,10 @@ LDAPUsers=Felhasználók az LDAP adatbázisban
 LDAPFieldStatus=Állapot
 LDAPFieldFirstSubscriptionDate=Első feliratkozási dátum
 LDAPFieldFirstSubscriptionAmount=Első feliratkozási mennyiség
-LDAPFieldLastSubscriptionDate=Utolsó feliratkozási dátum
-LDAPFieldLastSubscriptionAmount=Utolsó feliratkozási mennyiség
-LDAPFieldSkype=Skype id
-LDAPFieldSkypeExample=Example : skypeName
+LDAPFieldLastSubscriptionDate=Latest subscription date
+LDAPFieldLastSubscriptionAmount=Latest subscription amount
+LDAPFieldSkype=Skype név
+LDAPFieldSkypeExample=Például: Skype név
 UserSynchronized=Felhasználó szinkronizálva
 GroupSynchronized=Csoport szinkronizálva
 MemberSynchronized=Tag szinkronizálva
diff --git a/htdocs/langs/hu_HU/link.lang b/htdocs/langs/hu_HU/link.lang
index 42c7555d469..32e8792ef16 100644
--- a/htdocs/langs/hu_HU/link.lang
+++ b/htdocs/langs/hu_HU/link.lang
@@ -1,9 +1,10 @@
-LinkANewFile=Link a new file/document
-LinkedFiles=Linked files and documents
-NoLinkFound=No registered links
-LinkComplete=The file has been linked successfully
-ErrorFileNotLinked=The file could not be linked
-LinkRemoved=The link %s has been removed
-ErrorFailedToDeleteLink= Failed to remove link '<b>%s</b>'
-ErrorFailedToUpdateLink= Failed to update link '<b>%s</b>'
-URLToLink=URL to link
+# Dolibarr language file - Source file is en_US - languages
+LinkANewFile=Új fájl/dokumentum hivatkozása
+LinkedFiles=Hivatkozott fájlok és dokumentumok
+NoLinkFound=Nincs mentett hivatkozás
+LinkComplete=A fájlra történt hivatkozás sikerült
+ErrorFileNotLinked=A fájlra nem lehet hivatkozni
+LinkRemoved=A %s hivatkozás törölve
+ErrorFailedToDeleteLink= A '<b>%s</b>' hivakozás törlése sikertelen
+ErrorFailedToUpdateLink= A '<b>%s</b>' hivakozás frissítése sikertelen
+URLToLink=A hivatkozás címe
diff --git a/htdocs/langs/hu_HU/mails.lang b/htdocs/langs/hu_HU/mails.lang
index 1bec8bb9886..530fb843029 100644
--- a/htdocs/langs/hu_HU/mails.lang
+++ b/htdocs/langs/hu_HU/mails.lang
@@ -74,14 +74,18 @@ ResultOfMailSending=Result of mass EMail sending
 NbSelected=Nb selected
 NbIgnored=Nb ignored
 NbSent=Nb sent
-ContactsWithThirdpartyFilter=Contact with customer filters
+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
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Vonal %s fájlban
 RecipientSelectionModules=Meghatározott kérelmek címzett kiválasztása
 MailSelectedRecipients=Kiválasztott címzettek
 MailingArea=EMailings terület
-LastMailings=Utolsó %s emailings
+LastMailings=Latest %s emailings
 TargetsStatistics=Célok statisztikák
 NbOfCompaniesContacts=Egyedi kapcsolatok a vállalatok
 MailNoChangePossible=A címzettek validált emailing nem lehet megváltoztatni
@@ -146,3 +150,6 @@ AdvTgtCreateFilter=Create filter
 AdvTgtOrCreateNewFilter=Name of new filter
 NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
+OutGoingEmailSetup=Outgoing email setup
+InGoingEmailSetup=Incoming email setup
+
diff --git a/htdocs/langs/hu_HU/main.lang b/htdocs/langs/hu_HU/main.lang
index 8835ece7cdc..af4831c877f 100644
--- a/htdocs/langs/hu_HU/main.lang
+++ b/htdocs/langs/hu_HU/main.lang
@@ -24,7 +24,7 @@ FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p
 FormatDateHourTextShort=%b %d, %Y, %I:%M %p
 FormatDateHourText=%B %d, %Y, %I:%M %p
 DatabaseConnection=Adatbási Kapcsolat
-NoTemplateDefined=No template defined for this email type
+NoTemplateDefined=Nincs sablon meghatározva ehhez az email típushoz
 AvailableVariables=Available substitution variables
 NoTranslation=Nincs fordítás
 NoRecordFound=Rekord nem található
@@ -63,12 +63,13 @@ ErrorNoVATRateDefinedForSellerCountry=Hiba '%s' számára nincs Áfa meghatároz
 ErrorNoSocialContributionForSellerCountry=Hiba, nincsenek meghatározva társadalombiztosítási és adóügyi adattípusok a '%s' ország részére.
 ErrorFailedToSaveFile=Hiba, nem sikerült a fájl mentése.
 ErrorCannotAddThisParentWarehouse=You are trying to add a parent warehouse which is already a child of current one
-MaxNbOfRecordPerPage=Max nb of record per page
+MaxNbOfRecordPerPage=Oldalankénti rekordok száma
 NotAuthorized=Nincs jogosultsága ehhez a tevékenységhez
 SetDate=Dátum beállítása
 SelectDate=Válasszon egy dátumot
 SeeAlso=Lásd még a %s
 SeeHere=Lásd itt
+Apply=Alkalmaz
 BackgroundColorByDefault=Alapértelmezett háttérszin
 FileRenamed=The file was successfully renamed
 FileUploaded=A fájl sikeresen fel lett töltve
@@ -81,25 +82,25 @@ RecordSaved=Rekord elmentve
 RecordDeleted=Rekord törölve
 LevelOfFeature=Funkciók szintje
 NotDefined=Nem meghatározott
-DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr authentication mode is set to <b>%s</b> in configuration file <b>conf.php</b>.<br>This means that the password database is external to Dolibarr, so changing this field may have no effect.
+DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr hitelesítési mód beélítva ehhez <b>%s</b> a <b>conf.php</b> beállító fájlban.<br>Ez azt jelenti, hogy ez a jelszó adatbázis Dolibarr rendszertől független, így ennek a mezönek a megváltoztatása nem befolyásoló.
 Administrator=Rendszergazda
 Undefined=Nincs definiálva
-PasswordForgotten=Password forgotten?
+PasswordForgotten=Elfelejtett jelszó ?
 SeeAbove=Lásd feljebb
 HomeArea=Nyitólap
-LastConnexion=Utolsó kapocslódás
+LastConnexion=Latest connection
 PreviousConnexion=Előző kapcsolódás
 PreviousValue=Előző érték
 ConnectedOnMultiCompany=Entitáson kapcsolódva
 ConnectedSince=Kapcslódás kezdete
-AuthenticationMode=Authentication mode
-RequestedUrl=Requested URL
+AuthenticationMode=Jelszóellenőrzési metódus
+RequestedUrl=A kért URL
 DatabaseTypeManager=Adatbázis tipus kezelő
 RequestLastAccessInError=Az utolsó adatbázis hozzáférés hibaüzenete
 ReturnCodeLastAccessInError=Az utolsó adatbázis hozzáférés hibakódja
 InformationLastAccessInError=Az utolsó adatbázis hozzáférési hiba leírása
 DolibarrHasDetectedError=A Dolibarr technikai hibát észlelt
-InformationToHelpDiagnose=This information can be useful for diagnostic purposes
+InformationToHelpDiagnose=Ez az információ diagnosztikai célra használható
 MoreInformation=További információ
 TechnicalInformation=Technikai információk
 TechnicalID=Technikai azon.
@@ -136,16 +137,16 @@ Disable=Letilt
 Disabled=Kikapcsolva
 Add=Hozzáadás
 AddLink=Link hozzáadása
-RemoveLink=Remove link
+RemoveLink=Hivatkozás megszüntetése
 AddToDraft=Adja a vázlathoz
 Update=Frissítés
 Close=Zár
 CloseBox=A widget eltávolítása a vezérlőpultról
 Confirm=Megerősít
-ConfirmSendCardByMail=Do you really want to send content of this card by mail to <b>%s</b>?
+ConfirmSendCardByMail=Valóban el akarja küldeni emailben a kártya tartalmát <b>%s</b> részére ?
 Delete=Törlés
 Remove=Eltávolitás
-Resiliate=Terminate
+Resiliate=Befejezés
 Cancel=Mégse
 Modify=Módosítás
 Edit=Szerkesztés
@@ -163,7 +164,7 @@ Go=Indít
 Run=Futtatás
 CopyOf=Másloata
 Show=Mutat
-Hide=Hide
+Hide=Elrejt
 ShowCardHere=Kártyát mutat
 Search=Keres
 SearchOf=Keres
@@ -206,8 +207,8 @@ Info=Napló
 Family=Család
 Description=Leírás
 Designation=Megnevezés
-Model=Doc template
-DefaultModel=Default doc template
+Model=Dokumentum sablon
+DefaultModel=Alapértelmezett dokumentum sablon
 Action=Cselekvés
 About=Névjegy
 Number=Szám
@@ -237,7 +238,7 @@ DateCreation=Létrehozás dátuma
 DateCreationShort=Létreh. dátuma
 DateModification=Szerkesztés dátuma
 DateModificationShort=Szerk. dátuma
-DateLastModification=Utolsó szerkesztés dátuma
+DateLastModification=Latest modification date
 DateValidation=Hitelesítés dátuma
 DateClosing=Lezárás dátuma
 DateDue=Határidő
@@ -250,8 +251,8 @@ DateRequest=Kérés dátuma
 DateProcess=Feldolgozás dátuma
 DateBuild=Jelentés készítés dátuma
 DatePayment=Fizetés időpontja
-DateApprove=Approving date
-DateApprove2=Approving date (second approval)
+DateApprove=Jóváhagyás dátuma
+DateApprove2=Jóváhagyás dátuma (megerősítés)
 UserCreation=Creation user
 UserModification=Modification user
 UserCreationShort=Creat. user
@@ -340,7 +341,7 @@ Percentage=Százalék
 Total=Végösszeg
 SubTotal=Részösszeg
 TotalHTShort=Végösszeg (nettó)
-TotalHTShortCurrency=Total (net in currency)
+TotalHTShortCurrency=Végösszeg (nettó pénznem)
 TotalTTCShort=Végösszeg (bruttó)
 TotalHT=Végösszeg (nettó)
 TotalHTforthispage=Ezen oldal végösszege (nettó)
@@ -383,7 +384,7 @@ ActionsToDoShort=Végrehajtandó
 ActionsDoneShort=Kész
 ActionNotApplicable=Nem alkalmazható
 ActionRunningNotStarted=Nincs elkezdve
-ActionRunningShort=In progress
+ActionRunningShort=Folyamatban
 ActionDoneShort=Befejezett
 ActionUncomplete=Befejezetlen
 CompanyFoundation=Cég/Alapítvány
@@ -422,8 +423,8 @@ OtherInformations=Egyéb információk
 Quantity=Mennyiség
 Qty=Menny.
 ChangedBy=Módosította
-ApprovedBy=Approved by
-ApprovedBy2=Approved by (second approval)
+ApprovedBy=Jóváhagyva
+ApprovedBy2=Jóváhagyva (megerősítette)
 Approved=Jóváhagyott
 Refused=Visszautasított
 ReCalculate=Számolja újra
@@ -585,10 +586,10 @@ GoBack=Vissza
 CanBeModifiedIfOk=Módosítható ha hitelesített
 CanBeModifiedIfKo=Módosítható ha nem hitelesített
 ValueIsValid=Az érték érvényes
-ValueIsNotValid=Value is not valid
+ValueIsNotValid=Hibás érték
 RecordCreatedSuccessfully=Record created successfully
 RecordModifiedSuccessfully=A rekord sikeresen módosítva lett
-RecordsModified=%s record modified
+RecordsModified=%s rekord módosítva
 RecordsDeleted=%s record deleted
 AutomaticCode=Automatikus kód
 FeatureDisabled=Tiltott funkció
@@ -599,6 +600,8 @@ SessionName=Munkamenet neve
 Method=Módszer
 Receive=Kap
 CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
+ExpectedValue=Expected Value
+CurrentValue=Jelenlegi Érték
 PartialWoman=Részleges
 TotalWoman=Összes
 NeverReceived=Soha nem került átvételre
@@ -617,15 +620,15 @@ ThisLimitIsDefinedInSetup=Dolibarr limit (Menu home-setup-security): %s Kb, PHP
 NoFileFound=Nincs mentett dokumentum ebben a könyvtárban
 CurrentUserLanguage=Jelenlegi nyelv
 CurrentTheme=Jelenlegi téma
-CurrentMenuManager=Current menu manager
+CurrentMenuManager=Jelenlegi menü-menedzser
 Browser=Böngésző
-Layout=Layout
-Screen=Screen
+Layout=Elrendezés
+Screen=Képernyő
 DisabledModules=Kikapcsolt modulok
 For=For
 ForCustomer=Ügyfél részére
 Signature=Aláírás
-DateOfSignature=Date of signature
+DateOfSignature=Kelt
 HidePassword=Parancs mutatása rejtett jelszóval
 UnHidePassword=Igazi parancs mutatása üres jelszóval
 Root=Gyökér
@@ -634,16 +637,16 @@ Page=Oldal
 Notes=Megjegyzés
 AddNewLine=Új sor hozzáadása
 AddFile=Fájl hozzáadása
-FreeZone=Free entry
+FreeZone=Szabad szöveg
 FreeLineOfType=Free entry of type
 CloneMainAttributes=Objektum klónozása a főbb jellemzőivel
 PDFMerge=PDF összeolvasztás
 Merge=Összeolvasztás
 PrintContentArea=Show page to print main content area
-MenuManager=Menu manager
+MenuManager=Menü-menedzser
 WarningYouAreInMaintenanceMode=Figyelem, karbantartási mód, csak <b>%s</b> jelentkezhet be.
 CoreErrorTitle=Rendszerhiba
-CoreErrorMessage=Sorry, an error occurred. Contact your system administrator to check the logs or disable $dolibarr_main_prod=1 to get more information.
+CoreErrorMessage=Sajnálatos hiba történt. Lépjen kapcsolatba a rendszergazdával a naplófájlok megtekintéséhez vagy állítsa 0-ra a $dolibarr_main_prod=1 paramétert részletesebb információkért !
 CreditCard=Hitelkártya
 FieldsWithAreMandatory=<b>%s</b>-al jelölt mezők kötelezőek
 FieldsWithIsForPublic=<b>%s</b>-al jelölt mezők publikusak. Ha ezt nem akarja jelölje be a "Publikus" dobozt.
@@ -690,7 +693,7 @@ ByYear=Az év
 ByMonth=Havi
 ByDay=Nappal
 BySalesRepresentative=Az értékesítési képviselő
-LinkedToSpecificUsers=Linked to a particular user contact
+LinkedToSpecificUsers=Hozzárendelve egy adott felhasználói kapcsolathoz
 NoResults=Nincs eredmény
 AdminTools=Admin tools
 SystemTools=Rendszereszközök
@@ -699,7 +702,7 @@ Test=Teszt
 Element=Elem
 NoPhotoYet=Nem érhető el még fénykép
 Dashboard=Vezérlőpult
-MyDashboard=My dashboard
+MyDashboard=Munkafelület
 Deductible=Levonható
 from=tól
 toward=felé
@@ -719,8 +722,8 @@ SelectElementAndClickRefresh=Select an element and click Refresh
 PrintFile=%s fájl nyomtatása
 ShowTransaction=Show entry on bank account
 GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
-Deny=Deny
-Denied=Denied
+Deny=Elutasít
+Denied=Elutasítva
 ListOfTemplates=List of templates
 Gender=Nem
 Genderman=Férfi
@@ -730,7 +733,7 @@ Mandatory=Kötelező kitölteni
 Hello=Hello
 Sincerely=Tisztelettel
 DeleteLine=Sor törlése
-ConfirmDeleteLine=Are you sure you want to delete this line?
+ConfirmDeleteLine=Biztos, hogy törölni akarja ezt a sort ?
 NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
 TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s records.
 NoRecordSelected=No record selected
@@ -741,7 +744,7 @@ ClassifyBilled=Minősítse kiszámlázottként
 Progress=Előrehaladás
 ClickHere=Kattintson ide
 FrontOffice=Front office
-BackOffice=Back-office
+BackOffice=Támogató iroda
 View=View
 Export=Export
 Exports=Export
@@ -753,9 +756,10 @@ GroupBy=Group by...
 ViewFlatList=View flat list
 RemoveString=Remove string '%s'
 SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
-DirectDownloadLink=Direct download link
-Download=Download
-ActualizeCurrency=Update currency rate
+DirectDownloadLink=Közvetlen letöltés címe
+Download=Letöltés
+ActualizeCurrency=Árfolyam frissítése
+Fiscalyear=Fiscal year
 # Week day
 Monday=Hétfő
 Tuesday=Kedd
@@ -812,3 +816,5 @@ SearchIntoContracts=Szerződések
 SearchIntoCustomerShipments=Vásárlói kiszállítások
 SearchIntoExpenseReports=Költség kimutatások
 SearchIntoLeaves=Leaves
+
+BulkActions=Bulk actions
diff --git a/htdocs/langs/hu_HU/margins.lang b/htdocs/langs/hu_HU/margins.lang
index ad55c18405b..73d6ab6763f 100644
--- a/htdocs/langs/hu_HU/margins.lang
+++ b/htdocs/langs/hu_HU/margins.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - marges
 
 Margin=Margin
-Margins=Margins
+Margins=Margók
 TotalMargin=Total Margin
 MarginOnProducts=Margin / Products
 MarginOnServices=Margin / Services
diff --git a/htdocs/langs/hu_HU/members.lang b/htdocs/langs/hu_HU/members.lang
index 1af0aa0fa9f..da9d3392176 100644
--- a/htdocs/langs/hu_HU/members.lang
+++ b/htdocs/langs/hu_HU/members.lang
@@ -136,8 +136,8 @@ DocForAllMembersCards=Generálása névjegykártyák minden tagja számára (a k
 DocForOneMemberCards=Generálása névjegykártyák egy adott tag (kimeneti formátum tulajdonképpen setup: <b>%s)</b>
 DocForLabels=Létrehoz cím lap (a kimeneti formátum tulajdonképpen setup: <b>%s)</b>
 SubscriptionPayment=Előfizetés fizetés
-LastSubscriptionDate=Utolsó dátum előfizetés
-LastSubscriptionAmount=Utolsó előfizetés összege
+LastSubscriptionDate=Latest subscription date
+LastSubscriptionAmount=Latest subscription amount
 MembersStatisticsByCountries=Tagok statisztikája ország
 MembersStatisticsByState=Tagok statisztikája állam / tartomány
 MembersStatisticsByTown=Tagok statisztikája város
@@ -149,7 +149,7 @@ MembersByStateDesc=Ez a képernyő megmutatja statisztikát tagok állam / tarto
 MembersByTownDesc=Ez a képernyő megmutatja statisztikát tagok városban.
 MembersStatisticsDesc=Válassza ki a kívánt statisztikákat olvasni ...
 MenuMembersStats=Statisztika
-LastMemberDate=Utolsó tagja dátum
+LastMemberDate=Latest member date
 Nature=Természet
 Public=Információ nyilvánosak
 NewMemberbyWeb=Új tag hozzá. Jóváhagyásra váró
diff --git a/htdocs/langs/hu_HU/orders.lang b/htdocs/langs/hu_HU/orders.lang
index 01b9a40e774..f3d46e783c7 100644
--- a/htdocs/langs/hu_HU/orders.lang
+++ b/htdocs/langs/hu_HU/orders.lang
@@ -39,7 +39,7 @@ StatusOrderRefusedShort=Visszautasított
 StatusOrderBilledShort=Kiszámlázott
 StatusOrderToProcessShort=Feldolgozni
 StatusOrderReceivedPartiallyShort=Részben kiszállított
-StatusOrderReceivedAllShort=Teljesen kiszállított
+StatusOrderReceivedAllShort=Products received
 StatusOrderCanceled=Visszavonva
 StatusOrderDraft=Tervezet (hitelesítés szükséges)
 StatusOrderValidated=Hitelesítetve
@@ -51,7 +51,7 @@ StatusOrderApproved=Jóváhagyott
 StatusOrderRefused=Visszautasított
 StatusOrderBilled=Kiszámlázott
 StatusOrderReceivedPartially=Részben kiszállított
-StatusOrderReceivedAll=Teljesen kiszállított
+StatusOrderReceivedAll=All products received
 ShippingExist=A szállítmány létezik
 QtyOrdered=Megrendelt mennyiség
 ProductQtyInDraft=Product quantity into draft orders
diff --git a/htdocs/langs/hu_HU/other.lang b/htdocs/langs/hu_HU/other.lang
index 1910c94be5b..681fd608a8e 100644
--- a/htdocs/langs/hu_HU/other.lang
+++ b/htdocs/langs/hu_HU/other.lang
@@ -68,14 +68,15 @@ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find her
 PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nYou will find here the shipping __SHIPPINGREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nYou will find here the intervention __FICHINTERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n__PERSONALIZED__\n\n__SIGNATURE__
-DemoDesc=Dolibarr is a compact ERP/CRM supporting several functional modules. A demo showcasing all modules makes no sense as this scenario never occurs. So, several demo profiles are available.
+DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
+ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
 DemoFundation=Tagok kezelése egy alapítvány
 DemoFundation2=Tagok kezelése és bankszámla egy alapítvány
-DemoCompanyServiceOnly=Készítsen egy szabadúszó értékesítési tevékenység csak a szolgáltató
+DemoCompanyServiceOnly=Company or freelance selling service only
 DemoCompanyShopWithCashDesk=Készítsen egy bolt a pénztári
-DemoCompanyProductAndStocks=Készítsen egy kis-vagy közepes vállalat eladási termékek
-DemoCompanyAll=Készítsen egy kis-vagy közepes vállalkozás több tevékenységet (összes fő modul)
+DemoCompanyProductAndStocks=Company selling products with a shop
+DemoCompanyAll=Company with multiple activities (all main modules)
 CreatedBy=Készítette %s
 ModifiedBy=Módosította %s
 ValidatedBy=Érvényesíti %s
diff --git a/htdocs/langs/hu_HU/products.lang b/htdocs/langs/hu_HU/products.lang
index c47d573aa72..b39f23cfc4c 100644
--- a/htdocs/langs/hu_HU/products.lang
+++ b/htdocs/langs/hu_HU/products.lang
@@ -60,7 +60,7 @@ SellingPrice=Eladási ár
 SellingPriceHT=Eladási ár (nettó)
 SellingPriceTTC=Eladási ár (bruttó)
 CostPriceDescription=This price (net of tax) can be used to store the average amount this product cost to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
-CostPriceUsage=In a future version, this value could be used for margin calculation.
+CostPriceUsage=This value could be used for margin calculation.
 SoldAmount=Sold amount
 PurchasedAmount=Purchased amount
 NewPrice=Új ár
@@ -91,7 +91,7 @@ NoteNotVisibleOnBill=Megjegyzés (nem látszik a számlákon, ajánlatokon...)
 ServiceLimitedDuration=Ha a termék vagy szolgáltatás időkorlátos:
 MultiPricesAbility=Several segment of prices per product/service (each customer is in one segment)
 MultiPricesNumPrices=Árak száma
-AssociatedProductsAbility=Activate the feature to manage virtual products
+AssociatedProductsAbility=Aktiválja a modult a virtuális termékek kezeléséhez
 AssociatedProducts=Kapcsolódó termékek
 AssociatedProductsNumber=Kapcsolódó termékek száma
 ParentProductsNumber=Number of parent packaging product
@@ -142,6 +142,7 @@ ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b>?
 CloneContentProduct=A termék/szolgáltatás minden fő információjának a klónozása
 ClonePricesProduct=Fő információk és árak klónozása
 CloneCompositionProduct=Előre csomagolt termék/szolgáltatás duplikálása
+CloneCombinationsProduct=Clone product variants
 ProductIsUsed=Ez a termék használatban van
 NewRefForClone=Új termék/szolgáltatás ref#.
 SellingPrices=Eladási árak
@@ -238,7 +239,7 @@ GlobalVariables=Globális változók
 VariableToUpdate=Variable to update
 GlobalVariableUpdaters=Globális változók frissítése
 UpdateInterval=Frissítési periódus (perc)
-LastUpdated=Utoljára frissítve
+LastUpdated=Latest update
 CorrectlyUpdated=Rendben frissítve
 PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
 PropalMergePdfProductChooseFile=Select PDF files
@@ -258,4 +259,41 @@ VolumeUnits=Térfogat egység
 SizeUnits=Méret egység
 DeleteProductBuyPrice=Delete buying price
 ConfirmDeleteProductBuyPrice=Are you sure you want to delete this buying price?
+SubProduct=Sub product
 
+#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
+ProductCombinations=Variants
+HideProductCombinations=Hide products variant in the products selector
+ProductCombination=Variant
+NewProductCombination=New variant
+EditProductCombination=Editing variant
+ProductCombinationGenerator=Variants generator
+Features=Features
+PriceImpact=Price impact
+WeightImpact=Weight impact
+NewProductAttribute=Új attribútum
+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
+PercentageVariation=Percentage variation
+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 child products
+ConfirmCloneProductCombinations=Would you like to copy all the product variant to the 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
diff --git a/htdocs/langs/hu_HU/projects.lang b/htdocs/langs/hu_HU/projects.lang
index 6d238bf589b..200f09562ea 100644
--- a/htdocs/langs/hu_HU/projects.lang
+++ b/htdocs/langs/hu_HU/projects.lang
@@ -29,9 +29,9 @@ DeleteAProject=Projekt törlése
 DeleteATask=Feladat törlése
 ConfirmDeleteAProject=Are you sure you want to delete this project?
 ConfirmDeleteATask=Are you sure you want to delete this task?
-OpenedProjects=Open projects
-OpenedTasks=Open tasks
-OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
+OpenedProjects=Opened projects
+OpenedTasks=Opened tasks
+OpportunitiesStatusForOpenedProjects=Opportunities amount of opened projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=Projektek mutatása
 SetProject=Projekt beállítása
@@ -47,7 +47,7 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=Felhasználó
 TaskTimeNote=Megjegyzés
 TaskTimeDate=Dátum
-TasksOnOpenedProject=Tasks on open projects
+TasksOnOpenedProject=Tasks on opened projects
 WorkloadNotDefined=Workload not defined
 NewTimeSpent=Új eltöltött idő
 MyTimeSpent=Az én eltöltött időm
@@ -96,6 +96,7 @@ ValidateProject=Projekt hitelesítése
 ConfirmValidateProject=Are you sure you want to validate this project?
 CloseAProject=Projekt lezárása
 ConfirmCloseAProject=Are you sure you want to close this project?
+AlsoCloseAProject=Also close project (keep it open if you still need to follow production tasks on it)
 ReOpenAProject=Projekt nyitása
 ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=Projekt kapcsolatok
@@ -121,7 +122,7 @@ CloneProjectFiles=Clone project joined files
 CloneTaskFiles=Clone task(s) joined files (if task(s) cloned)
 CloneMoveDate=Update project/tasks dates from now?
 ConfirmCloneProject=Are you sure to clone this project?
-ProjectReportDate=Change task date according project start date
+ProjectReportDate=Change task dates according to new project start date
 ErrorShiftTaskDate=Impossible to shift task date according to new project start date
 ProjectsAndTasksLines=Projects and tasks
 ProjectCreatedInDolibarr=Project %s created
@@ -178,9 +179,9 @@ ProjectsStatistics=Statistics on projects/leads
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 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.
-OpenedProjectsByThirdparties=Open projects by thirdparties
+OpenedProjectsByThirdparties=Opened projects by thirdparties
 OnlyOpportunitiesShort=Only opportunities
-OpenedOpportunitiesShort=Open opportunities
+OpenedOpportunitiesShort=Opened opportunities
 NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount
diff --git a/htdocs/langs/hu_HU/propal.lang b/htdocs/langs/hu_HU/propal.lang
index 05308dc33c6..60e23ea3af3 100644
--- a/htdocs/langs/hu_HU/propal.lang
+++ b/htdocs/langs/hu_HU/propal.lang
@@ -3,7 +3,7 @@ Proposals=Üzleti ajánlatok
 Proposal=Üzleti ajánlat
 ProposalShort=Javaslat
 ProposalsDraft=Készítsen üzleti ajánlatot
-ProposalsOpened=Open commercial proposals
+ProposalsOpened=Megnyitotta a kereskedelmi javaslatok
 Prop=Üzleti ajánlatok
 CommercialProposal=Üzleti ajánlat
 ProposalCard=Javaslat kártya
@@ -28,7 +28,7 @@ ShowPropal=Mutasd javaslat
 PropalsDraft=Piszkozatok
 PropalsOpened=Megnyitva
 PropalStatusDraft=Tervezet (kell érvényesíteni)
-PropalStatusValidated=Jóváhagyott (javaslat nyitott)
+PropalStatusValidated=Validated (proposal is opened)
 PropalStatusSigned=Aláírt (szükséges számlázási)
 PropalStatusNotSigned=Nem írta alá (zárt)
 PropalStatusBilled=Kiszámlázott
diff --git a/htdocs/langs/hu_HU/stocks.lang b/htdocs/langs/hu_HU/stocks.lang
index c5698d4ba2a..8467b90a7e0 100644
--- a/htdocs/langs/hu_HU/stocks.lang
+++ b/htdocs/langs/hu_HU/stocks.lang
@@ -22,13 +22,15 @@ Movements=Mozgások
 ErrorWarehouseRefRequired=Raktár referencia név szükséges
 ListOfWarehouses=Raktárak listája
 ListOfStockMovements=Készlet mozgatások listája
+StockMovementForId=Movement ID %d
+ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Raktárak
 Location=Hely
 LocationSummary=Hely rövid neve
 NumberOfDifferentProducts=Termékek száma összesen
 NumberOfProducts=Termékek összesen
-LastMovement=Utolsó mozgás
-LastMovements=Utolsó mozgások
+LastMovement=Latest movement
+LastMovements=Latest movements
 Units=Egységek
 Unit=Egység
 StockCorrection=Jelenlegi készlet
diff --git a/htdocs/langs/hu_HU/supplier_proposal.lang b/htdocs/langs/hu_HU/supplier_proposal.lang
index c7639eb0127..1759a4b7819 100644
--- a/htdocs/langs/hu_HU/supplier_proposal.lang
+++ b/htdocs/langs/hu_HU/supplier_proposal.lang
@@ -8,7 +8,7 @@ SearchRequest=Find a request
 DraftRequests=Draft requests
 SupplierProposalsDraft=Draft supplier proposals
 LastModifiedRequests=Latest %s modified price requests
-RequestsOpened=Open price requests
+RequestsOpened=Opened price requests
 SupplierProposalArea=Supplier proposals area
 SupplierProposalShort=Supplier proposal
 SupplierProposals=Beszállítói ajánlatok
@@ -23,7 +23,7 @@ ConfirmValidateAsk=Are you sure you want to validate this price request under na
 DeleteAsk=Delete request
 ValidateAsk=Validate request
 SupplierProposalStatusDraft=Tervezet (érvényesítés szükséges)
-SupplierProposalStatusValidated=Validated (request is open)
+SupplierProposalStatusValidated=Validated (request is opened)
 SupplierProposalStatusClosed=Lezárt
 SupplierProposalStatusSigned=Accepted
 SupplierProposalStatusNotSigned=Visszautasított
diff --git a/htdocs/langs/hu_HU/suppliers.lang b/htdocs/langs/hu_HU/suppliers.lang
index 6dcf6d633da..59725da83eb 100644
--- a/htdocs/langs/hu_HU/suppliers.lang
+++ b/htdocs/langs/hu_HU/suppliers.lang
@@ -9,7 +9,7 @@ ShowSupplier=Bzállító mutatása
 OrderDate=Megrendelés dátuma
 BuyingPriceMin=Best buying price
 BuyingPriceMinShort=Best buying price
-TotalBuyingPriceMinShort=Total of subproducts buying prices
+TotalBuyingPriceMinShort=Az altermékek vételára összesen
 TotalSellingPriceMinShort=Total of subproducts selling prices
 SomeSubProductHaveNoPrices=Néhány altermékhez nincs ár megadva
 AddSupplierPrice=Add buying price
@@ -24,10 +24,10 @@ ExportDataset_fournisseur_1=Beszállítói számla lista és számla sorok
 ExportDataset_fournisseur_2=Beszállítói számlák és kifizetések
 ExportDataset_fournisseur_3=Beszállítói rendelések és beszerzési tételsorok
 ApproveThisOrder=Beszerzési megrendelés jóváhagyása
-ConfirmApproveThisOrder=Biztos jóvá akarja hagyni a beszerzési megrendelést <b>%s</b> ?
+ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b>?
 DenyingThisOrder=Megrendelés elutasítása
-ConfirmDenyingThisOrder=Biztos el akarja utasítani a beszerzési megrendelést  <b>%s</b> ?
-ConfirmCancelThisOrder=Biztos meg akarja szakítani a beszerzési megrendelést <b>%s</b> ?
+ConfirmDenyingThisOrder=Are you sure you want to deny this order <b>%s</b>?
+ConfirmCancelThisOrder=Are you sure you want to cancel this order <b>%s</b>?
 AddSupplierOrder=Beszállítói megrendelés létrehozása
 AddSupplierInvoice=Beszállítói számla létrehozása
 ListOfSupplierProductForSupplier=<b>%s</b> beszállító termékeinek és árainak listái
@@ -41,3 +41,4 @@ DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Wrong quality
 ReputationForThisProduct=Reputation
 BuyerName=Buyer name
+AllProductServicePrices=All product / service prices
diff --git a/htdocs/langs/hu_HU/trips.lang b/htdocs/langs/hu_HU/trips.lang
index e8f9abe2d6c..b31cebc831b 100644
--- a/htdocs/langs/hu_HU/trips.lang
+++ b/htdocs/langs/hu_HU/trips.lang
@@ -38,25 +38,25 @@ TripSociete=Information company
 TripNDF=Informations expense report
 PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
 ExpenseReportLine=Expense report line
-TF_OTHER=Other
+TF_OTHER=Egyéb
 TF_TRIP=Transportation
-TF_LUNCH=Lunch
-TF_METRO=Metro
-TF_TRAIN=Train
-TF_BUS=Bus
-TF_CAR=Car
-TF_PEAGE=Toll
-TF_ESSENCE=Fuel
-TF_HOTEL=Hotel
+TF_LUNCH=Ebéd
+TF_METRO=Metró
+TF_TRAIN=Vonat
+TF_BUS=Busz
+TF_CAR=Autó
+TF_PEAGE=Autópályadíj
+TF_ESSENCE=Üzemanyag
+TF_HOTEL=Szálloda
 TF_TAXI=Taxi
 
 ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
 AucuneLigne=There is no expense report declared yet
 
-ModePaiement=Payment mode
+ModePaiement=Fizetés módja
 
 VALIDATOR=User responsible for approval
-VALIDOR=Approved by
+VALIDOR=Jóváhagyva
 AUTHOR=Recorded by
 AUTHORPAIEMENT=Paid by
 REFUSEUR=Denied by
diff --git a/htdocs/langs/hu_HU/website.lang b/htdocs/langs/hu_HU/website.lang
index 90a8200d57f..0c3e24b6be7 100644
--- a/htdocs/langs/hu_HU/website.lang
+++ b/htdocs/langs/hu_HU/website.lang
@@ -2,7 +2,7 @@
 Shortname=Kód
 WebsiteSetupDesc=Create here as much entry as number of different websites you need. 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? A z összes oldal és tartalom el fog veszni!
+ConfirmDeleteWebsite=Biztos benne, hogy le akarja törölni a honlapot? Az összes oldal és tartalom el fog veszni!
 WEBSITE_PAGENAME=Page name/alias
 WEBSITE_CSS_URL=URL of external CSS file
 WEBSITE_CSS_INLINE=CSS content
diff --git a/htdocs/langs/hu_HU/withdrawals.lang b/htdocs/langs/hu_HU/withdrawals.lang
index 08111c42f54..39366440f6d 100644
--- a/htdocs/langs/hu_HU/withdrawals.lang
+++ b/htdocs/langs/hu_HU/withdrawals.lang
@@ -24,6 +24,7 @@ WithdrawStatistics=Direct debit payment statistics
 WithdrawRejectStatistics=Direct debit payment reject statistics
 LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
+WithdrawRequestsDone=%s direct debit payment requests recorded
 ThirdPartyBankCode=Harmadik fél Bank kód
 NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoice are on companies with a valid BAN.
 ClassCredited=Jóváírtan osztályozva
@@ -76,8 +77,8 @@ RUM=UMR
 RUMLong=Unique Mandate Reference
 RUMWillBeGenerated=UMR number will be generated once bank account information are saved
 WithdrawMode=Direct debit mode (FRST or RECUR)
-WithdrawRequestAmount=Withdraw request amount:
-WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil amount.
+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
diff --git a/htdocs/langs/id_ID/accountancy.lang b/htdocs/langs/id_ID/accountancy.lang
index 43b7d7c83df..9d4337e6803 100644
--- a/htdocs/langs/id_ID/accountancy.lang
+++ b/htdocs/langs/id_ID/accountancy.lang
@@ -194,6 +194,8 @@ ChangeBinding=Change the binding
 
 ## Admin
 ApplyMassCategories=Terapkan kategori secara massal
+AddAccountFromBookKeepingWithNoCategories=Add acccount already used with no categories
+CategoryDeleted=Category for the accounting account has been removed
 
 ## Export
 Exports=Ekspor
@@ -209,6 +211,7 @@ Modelcsv_ciel=Ekspor terhadap Sage Ceil Compta atau Compta Evolution
 Modelcsv_quadratus=Ekspor terhadap Quadratus QuadraCompta
 Modelcsv_ebp=Ekspor terhadap EBP
 Modelcsv_cogilog=Export towards Cogilog
+ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
 InitAccountancy=init akuntansi
diff --git a/htdocs/langs/id_ID/admin.lang b/htdocs/langs/id_ID/admin.lang
index dbb9f733120..1bdfb5d45aa 100644
--- a/htdocs/langs/id_ID/admin.lang
+++ b/htdocs/langs/id_ID/admin.lang
@@ -9,17 +9,20 @@ VersionDevelopment=Pengembangan
 VersionUnknown=Tidak diketahui
 VersionRecommanded=Direkomendasikan
 FileCheck=Files integrity checker
-FileCheckDesc=This tool allows you to check the integrity of files of your application, comparing each files with the official ones. You can use this tool to detect if some files were modified by a hacker for example.
+FileCheckDesc=This tool allows you to check the integrity of files and setup of your application, comparing each files with the official ones. 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.
 FileIntegrityIsStrictlyConformedWithReference=Files integrity is strictly conformed with the reference.
-FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified of removed.
+FileIntegrityIsOkButFilesWereAdded=Files integrity check has passed, however some new files were added.
+FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified, removed or added.
 GlobalChecksum=Global checksum
 MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
 LocalSignature=Embedded local signature (less reliable)
 RemoteSignature=Remote distant signature (more reliable)
 FilesMissing=Missing Files
 FilesUpdated=Updated Files
+FilesModified=Modified Files
+FilesAdded=Added Files
 FileCheckDolibarr=Check integrity of application files
-AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from a certified package
+AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from an official package
 XmlNotFound=Xml Integrity File of application not found
 SessionId=Sesi ID
 SessionSaveHandler=Handler untuk menyimpan sesi
@@ -188,7 +191,9 @@ BoxesDesc=Widgets are components showing some information that you can add to pe
 OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
 ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
-ModulesMarketPlaces=More modules...
+ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
+ModulesMarketPlaces=Find external modules...
+GoModuleSetupArea=To deploy/install a new module, go onto the Module setup area at <a href="%s">%s</a>.
 DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules
 DoliPartnersDesc=List of companies providing custom developed modules or features (Note: anyone experienced in PHP programming can provide custom development for an open source project)
 WebSiteDesc=Reference websites to find more modules...
@@ -280,20 +285,21 @@ MenuHandlers=Menu handlers
 MenuAdmin=Menu editor
 DoNotUseInProduction=Do not use in production
 ThisIsProcessToFollow=This is steps to process:
-ThisIsAlternativeProcessToFollow=This is an alternative setup to process:
+ThisIsAlternativeProcessToFollow=This is an alternative setup to process manually:
 StepNb=Step %s
 FindPackageFromWebSite=Find a package that provides feature you want (for example on official web site %s).
 DownloadPackageFromWebSite=Download package (for example from official web site %s).
-UnpackPackageInDolibarrRoot=Unpack package file into Dolibarr server directory dedicated to external modules: <b>%s</b>
-SetupIsReadyForUse=Install is finished and Dolibarr is ready to use with this new component.
-NotExistsDirect=The alternative root directory is not defined.<br>
-InfDirAlt=Since version 3 it is possible to define an alternative root directory.This allows you to store, same place, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
-InfDirExample=<br>Then declare it in the file conf.php<br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>*These lines are commented with "#", to uncomment only remove the character.
+UnpackPackageInDolibarrRoot=Unpack the packaged files into server directory dedicated to Dolibarr: <b>%s</b>
+UnpackPackageInModulesRoot=To deploy/install an external module, unpack the packaged files into the server directory dedicated to modules: <b>%s</b>
+SetupIsReadyForUse=Module deployment is finished. You must however enable and setup the module in your application by going on the page to setup modules: <a href="%s">%s</a>.
+NotExistsDirect=The alternative root directory is not defined to an existing directory.<br>
+InfDirAlt=Since version 3, it is possible to define an alternative root directory. This allows you to store, into a dedicated directory, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
+InfDirExample=<br>Then declare it in the file <strong>conf.php</strong><br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>If these lines are commented with "#", to enable them, just uncomment by removing the "#" character.
 YouCanSubmitFile=For this step, you can send package using this tool: Select module file
 CurrentVersion=Versi Dolibarr saat ini
 CallUpdatePage=Go to the page that updates the database structure and data: %s.
 LastStableVersion=Latest stable version
-LastActivationDate=Last activation date
+LastActivationDate=Latest activation date
 UpdateServerOffline=Update server offline
 GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s. <br><b>{000000@x}</b> same as previous but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
 GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
@@ -376,11 +382,11 @@ ExtrafieldCheckBox=Checkbox
 ExtrafieldRadio=Radio button
 ExtrafieldCheckBoxFromList= Checkbox from table
 ExtrafieldLink=Link to an object
-ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>In order to have the list depending on another :<br>1,value1|parent_list_code:parent_key<br>2,value2|parent_list_code:parent_key
+ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list :<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list :<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
-ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
+ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Example : Societe:societe/class/societe.class.php
 LibraryToBuildPDF=Library used for PDF generation
 WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
@@ -415,10 +421,10 @@ ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The cod
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
 WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<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).
-
+ClickToShowDescription=Click to show description
 # Modules
 Module0Name=Pengguna & Grup
-Module0Desc=Users and groups management
+Module0Desc=Users / Employees and Groups management
 Module1Name=Pihak Ketiga
 Module1Desc=Companies and contact management (customers, prospects...)
 Module2Name=Komersil
@@ -689,7 +695,7 @@ PermissionAdvanced253=Create/modify internal/external users and permissions
 Permission254=Create/modify external users only
 Permission255=Merubah Kata Sandi Pengguna Lain
 Permission256=Delete or disable other users
-Permission262=Extend access to all third parties (not only third parties that user is a sale representative). Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc). Not effective for projects (only rules on project permissions, visibility and assignement matters).
+Permission262=Extend access to all third parties (not only third parties that user is a sale representative).<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 assignement matters).
 Permission271=Read CA
 Permission272=Membaca Nota
 Permission273=Mengeluarkan Nota
@@ -891,7 +897,7 @@ Offset=Offset
 AlwaysActive=Selalu Aktif
 Upgrade=Pemutakhiran
 MenuUpgrade=Upgrade / Extend
-AddExtensionThemeModuleOrOther=Add extension (theme, module, ...)
+AddExtensionThemeModuleOrOther=Deploy/install external module
 WebServer=Web server
 DocumentRootServer=Web server's root directory
 DataRootServer=Data files directory
@@ -1165,10 +1171,6 @@ FreeLegalTextOnOrders=Free text on orders
 WatermarkOnDraftOrders=Watermark on draft orders (none if empty)
 ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable
 BANK_ASK_PAYMENT_BANK_DURING_ORDER=Ask for bank account destination of order
-##### Clicktodial #####
-ClickToDialSetup=Click To Dial module setup
-ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with your clicktodial login (defined on your user card)<br><b>__PASS__</b> that will be replaced with your clicktodial password (defined on your user card).
-##### Bookmark4u #####
 ##### Interventions #####
 InterventionsSetup=Interventions module setup
 FreeLegalTextOnInterventions=Free text on intervention documents
@@ -1395,7 +1397,7 @@ SendingsSetup=Sending module setup
 SendingsReceiptModel=Sending receipt model
 SendingsNumberingModules=Sendings numbering modules
 SendingsAbility=Support shipping sheets for customer deliveries
-NoNeedForDeliveryReceipts=In most cases, sendings receipts are used both as sheets for customer deliveries (list of products to send) and sheets that is recevied and signed by customer. So product deliveries receipts is a duplicated feature and is rarely activated.
+NoNeedForDeliveryReceipts=In most cases, shipping sheets are used both as sheets for customer deliveries (list of products to send) and sheets that is received and signed by customer. So product deliveries receipts is a duplicated feature and is rarely activated.
 FreeLegalTextOnShippings=Free text on shipments
 ##### Deliveries #####
 DeliveryOrderNumberingModules=Products deliveries receipt numbering module
@@ -1477,7 +1479,9 @@ AGENDA_DEFAULT_FILTER_STATUS=Set automatically this status for events into searc
 AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
 AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
 AGENDA_NOTIFICATION_SOUND=Enable sound notification
-##### ClickToDial #####
+##### Clicktodial #####
+ClickToDialSetup=Click To Dial module setup
+ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with your clicktodial login (defined on your user card)<br><b>__PASS__</b> that will be replaced with your clicktodial password (defined on your user card).
 ClickToDialDesc=This module allows to make phone numbers clickable. A click on this icon will call make your phone to 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.
 ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
 ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on same computer than the browser, and called when you click on a link in your browser that start 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.
@@ -1505,10 +1509,11 @@ EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint availa
 ##### API ####
 ApiSetup=API module setup
 ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
-ApiProductionMode=Enable production mode (this will activate use of a caches for services management)
+ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
 ApiExporerIs=You can explore the APIs at url
 OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
 ApiKey=Key for API
+WarningAPIExplorerDisabled=The API explorer has been disabled. API explorer is not required to provide API services. It is a tool for developer to find/test REST APIs. If you need this tool, go into setup of module API REST to activate it.
 ##### Bank #####
 BankSetupModule=Bank module setup
 FreeLegalTextOnChequeReceipts=Free text on cheque receipts
@@ -1577,7 +1582,7 @@ BackupDumpWizard=Wizard to build database backup dump file
 SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
 SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is only manual steps a privileged user can do.
 InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
-ConfFileMuseContainCustom=Installing an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to have option<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
+ConfFileMuseContainCustom=Installing an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
 HighlightLinesColor=Highlight color of the line when the mouse passes over (keep empty for no highlight)
 TextTitleColor=Color of page title
@@ -1607,6 +1612,7 @@ FixTZ=TimeZone fix
 FillFixTZOnlyIfRequired=Example: +2 (fill only if problem experienced)
 ExpectedChecksum=Expected Checksum
 CurrentChecksum=Current Checksum
+ForcedConstants=Required constant values
 MailToSendProposal=To send customer proposal
 MailToSendOrder=To send customer order
 MailToSendInvoice=To send customer invoice
@@ -1615,9 +1621,10 @@ MailToSendIntervention=To send intervention
 MailToSendSupplierRequestForQuotation=To send quotation request to supplier
 MailToSendSupplierOrder=To send supplier order
 MailToSendSupplierInvoice=To send supplier invoice
+MailToSendContract=To send a contract
 MailToThirdparty=To send email from third party page
 ByDefaultInList=Show by default on list view
-YouUseLastStableVersion=You use the last stable version
+YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
 TitleExampleForMaintenanceRelease=Example of message you can use to announce this maintenance release (feel free to use it on your web sites)
 ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. 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.
diff --git a/htdocs/langs/id_ID/banks.lang b/htdocs/langs/id_ID/banks.lang
index 97b4ae37a28..248362c6636 100644
--- a/htdocs/langs/id_ID/banks.lang
+++ b/htdocs/langs/id_ID/banks.lang
@@ -74,13 +74,13 @@ Conciliate=Reconcile
 Conciliation=Reconciliation
 ReconciliationLate=Reconciliation late
 IncludeClosedAccount=Include closed accounts
-OnlyOpenedAccount=Only open accounts
+OnlyOpenedAccount=Only opened accounts
 AccountToCredit=Account to credit
 AccountToDebit=Account to debit
 DisableConciliation=Disable reconciliation feature for this account
 ConciliationDisabled=Reconciliation feature disabled
 LinkedToAConciliatedTransaction=Linked to a conciliated entry
-StatusAccountOpened=Open
+StatusAccountOpened=Opened
 StatusAccountClosed=Ditutup
 AccountIdShort=Number
 LineRecord=Transaction
diff --git a/htdocs/langs/id_ID/bills.lang b/htdocs/langs/id_ID/bills.lang
index 66c9b499b64..98c2c4cb43f 100644
--- a/htdocs/langs/id_ID/bills.lang
+++ b/htdocs/langs/id_ID/bills.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - bills
 Bill=Tagihan
 Bills=Tagihan - tagihan
-BillsCustomers=Semua tagihan pelanggan
-BillsCustomer=Customers invoice
-BillsSuppliers=Semua tagihan semua pemasok / supplier
-BillsCustomersUnpaid=Unpaid customers invoices
-BillsCustomersUnpaidForCompany=Semua tagihan pelanggan yang dibayar untuk %s
-BillsSuppliersUnpaid=Semua tagihan untuk pemasok  / supplier yang belum dibayar
-BillsSuppliersUnpaidForCompany=Semua tagihan untuk pemasok / supplier yang belum dibayar untuk %s
+BillsCustomers=Customer invoices
+BillsCustomer=Tagihan pelanggan
+BillsSuppliers=Supplier invoices
+BillsCustomersUnpaid=Unpaid customer invoices
+BillsCustomersUnpaidForCompany=Unpaid customer invoices for %s
+BillsSuppliersUnpaid=Unpaid supplier invoices
+BillsSuppliersUnpaidForCompany=Unpaid supplier invoices for %s
 BillsLate=Pembayaran - pembayaran yang terlambat
 BillsStatistics=Customers invoices statistics
 BillsStatisticsSuppliers=Suppliers invoices statistics
@@ -62,8 +62,8 @@ PaymentsBack=Pembayaran kembali
 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 credit note or deposit 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.
+ConfirmDeletePayment=Anda yakin untuk menghapus pembayaran ini?
+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.
 SupplierPayments=Semua pembayaran untuk semua pemasok / supplier
 ReceivedPayments=Semua pembayaran yang diterima
 ReceivedCustomersPayments=Semua pembayaran yang diterima dari semua pelanggan
@@ -78,6 +78,7 @@ PaymentMode=Jenis pembayaran
 PaymentTypeDC=Debit/Credit Card
 PaymentTypePP=PayPal
 IdPaymentMode=Payment type (id)
+CodePaymentMode=Payment type (code)
 LabelPaymentMode=Payment type (label)
 PaymentModeShort=Jenis pembayaran
 PaymentTerm=Ketentuan pembayaran
@@ -102,9 +103,10 @@ SearchACustomerInvoice=Cari tagihan pelanggan
 SearchASupplierInvoice=Cari tagihan pemasok / supplier
 CancelBill=Batalkan tagihan
 SendRemindByMail=Kirim pengingat ke surel / email
-DoPayment=Lakukan pembayaran
-DoPaymentBack=Lakukan pembayaran kembali
+DoPayment=Enter payment
+DoPaymentBack=Enter refund
 ConvertToReduc=Ubah kedalam diskon untuk selanjutnya
+ConvertExcessReceivedToReduc=Convert excess received into future discount
 EnterPaymentReceivedFromCustomer=Masukkan pembayaran yang diterima dari pelanggan
 EnterPaymentDueToCustomer=Buat tempo pembayaran ke pelanggan
 DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
@@ -151,14 +153,14 @@ NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified
 FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
 NotARecurringInvoiceTemplate=Not a recurring template invoice
 NewBill=Tagihan baru
-LastBills=Tagihan %s terakhir
-LastCustomersBills=Tagihan - tagihan %s terakhir para pelanggan
-LastSuppliersBills=Tagihan - tagihan %s terakhir para pemasok / suplier
+LastBills=Latest %s invoices
+LastCustomersBills=Latest %s customer invoices
+LastSuppliersBills=Latest %s supplier invoices
 AllBills=Semua tagihan
 OtherBills=Tagihan - tagihan lainnya
 DraftBills=Konsep tagihan - tagihan
-CustomersDraftInvoices=Konsep tagihan - tagihan untuk para pelanggan
-SuppliersDraftInvoices=Konsep tagihan - tagihan untuk para pemasok / supplier
+CustomersDraftInvoices=Customer draft invoices
+SuppliersDraftInvoices=Supplier draft invoices
 Unpaid=Tidak dibayar
 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>?
@@ -272,6 +274,7 @@ Deposit=Deposit
 Deposits=Deposits
 DiscountFromCreditNote=Discount from credit note %s
 DiscountFromDeposit=Payments from deposit invoice %s
+DiscountFromExcessReceived=Payments from excess received of invoice %s
 AbsoluteDiscountUse=This kind of credit can be used on invoice before its validation
 CreditNoteDepositUse=Invoice must be validated to use this kind of credits
 NewGlobalDiscount=New absolute discount
@@ -279,8 +282,8 @@ NewRelativeDiscount=New relative discount
 NoteReason=Note/Reason
 ReasonDiscount=Reason
 DiscountOfferedBy=Granted by
-DiscountStillRemaining=Discounts still remaining
-DiscountAlreadyCounted=Discounts already counted
+DiscountStillRemaining=Discounts available
+DiscountAlreadyCounted=Discounts already consumed
 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.
@@ -333,6 +336,8 @@ 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
 # PaymentConditions
 Statut=Status
 PaymentConditionShortRECEP=Due Upon Receipt
@@ -351,6 +356,14 @@ PaymentConditionShortPT_ORDER=Order
 PaymentConditionPT_ORDER=On order
 PaymentConditionShortPT_5050=50-50
 PaymentConditionPT_5050=50%% in advance, 50%% on delivery
+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
 FixAmount=Fix amount
 VarAmount=Variable amount (%% tot.)
 # PaymentType
@@ -420,7 +433,7 @@ ChequeDeposits=Checks deposits
 Cheques=Checks
 DepositId=Id deposit
 NbCheque=Number of checks
-CreditNoteConvertedIntoDiscount=This credit note or deposit invoice has been converted into %s
+CreditNoteConvertedIntoDiscount=This %s has been converted into %s
 UsBillingContactAsIncoiveRecipientIfExist=Use customer billing contact address instead of third party address as recipient for invoices
 ShowUnpaidAll=Show all unpaid invoices
 ShowUnpaidLateOnly=Show late unpaid invoices only
diff --git a/htdocs/langs/id_ID/boxes.lang b/htdocs/langs/id_ID/boxes.lang
index 98970318e85..910bdf2f215 100644
--- a/htdocs/langs/id_ID/boxes.lang
+++ b/htdocs/langs/id_ID/boxes.lang
@@ -25,8 +25,8 @@ BoxTitleLastSuppliers=Latest %s recorded suppliers
 BoxTitleLastModifiedSuppliers=Latest %s modified suppliers
 BoxTitleLastModifiedCustomers=Latest %s modified customers
 BoxTitleLastCustomersOrProspects=Latest %s customers or prospects
-BoxTitleLastCustomerBills=Latest %s customer's invoices
-BoxTitleLastSupplierBills=Latest %s supplier's invoices
+BoxTitleLastCustomerBills=Latest %s customer invoices
+BoxTitleLastSupplierBills=Latest %s supplier invoices
 BoxTitleLastModifiedProspects=Latest %s modified prospects
 BoxTitleLastModifiedMembers=Latest %s members
 BoxTitleLastFicheInter=Latest %s modified interventions
@@ -51,12 +51,12 @@ ClickToAdd=Click here to add.
 NoRecordedCustomers=No recorded customers
 NoRecordedContacts=No recorded contacts
 NoActionsToDo=No actions to do
-NoRecordedOrders=No recorded customer's orders
+NoRecordedOrders=No recorded customer orders
 NoRecordedProposals=No recorded proposals
-NoRecordedInvoices=No recorded customer's invoices
-NoUnpaidCustomerBills=No unpaid customer's invoices
-NoUnpaidSupplierBills=No unpaid supplier's invoices
-NoModifiedSupplierBills=No recorded supplier's invoices
+NoRecordedInvoices=No recorded customer invoices
+NoUnpaidCustomerBills=No unpaid customer invoices
+NoUnpaidSupplierBills=No unpaid supplier invoices
+NoModifiedSupplierBills=No recorded supplier invoices
 NoRecordedProducts=No recorded products/services
 NoRecordedProspects=No recorded prospects
 NoContractedProducts=No products/services contracted
@@ -77,8 +77,8 @@ BoxTitleLatestModifiedSupplierOrders=Latest %s modified supplier orders
 BoxTitleLastModifiedCustomerBills=Latest %s modified customer bills
 BoxTitleLastModifiedCustomerOrders=Latest %s modified customer orders
 BoxTitleLastModifiedPropals=Latest %s modified propals
-ForCustomersInvoices=Customers invoices
+ForCustomersInvoices=Semua tagihan pelanggan
 ForCustomersOrders=Customers orders
-ForProposals=Proposals
+ForProposals=Proposal
 LastXMonthRolling=The latest %s month rolling
 ChooseBoxToAdd=Add widget to your dashboard
diff --git a/htdocs/langs/id_ID/companies.lang b/htdocs/langs/id_ID/companies.lang
index e136fa41a61..1d759fba8f6 100644
--- a/htdocs/langs/id_ID/companies.lang
+++ b/htdocs/langs/id_ID/companies.lang
@@ -81,6 +81,7 @@ PaymentBankAccount=Payment bank account
 OverAllProposals=Total proposals
 OverAllOrders=Total orders
 OverAllInvoices=Total invoices
+OverAllSupplierProposals=Total price requests
 ##### Local Taxes #####
 LocalTax1IsUsed=Use second tax
 LocalTax1IsUsedES= RE is used
@@ -389,7 +390,7 @@ ListCustomersShort=List of customers
 ThirdPartiesArea=Third parties and contact area
 LastModifiedThirdParties=Latest %s modified third parties
 UniqueThirdParties=Total of unique third parties
-InActivity=Open
+InActivity=Opened
 ActivityCeased=Ditutup
 ThirdPartyIsClosed=Third party is closed
 ProductsIntoElements=List of products/services into %s
@@ -404,7 +405,7 @@ MergeThirdparties=Merge third parties
 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 so you will be able to delete the duplicate one.
 ThirdpartiesMergeSuccess=Thirdparties have been merged
 SaleRepresentativeLogin=Login of sales representative
-SaleRepresentativeFirstname=Firstname of sales representative
-SaleRepresentativeLastname=Lastname of sales representative
+SaleRepresentativeFirstname=First name of sales representative
+SaleRepresentativeLastname=Last name of sales representative
 ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
 NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/id_ID/compta.lang b/htdocs/langs/id_ID/compta.lang
index d1094a4c391..6dfee813bf9 100644
--- a/htdocs/langs/id_ID/compta.lang
+++ b/htdocs/langs/id_ID/compta.lang
@@ -65,6 +65,7 @@ PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=VAT payment
 ListPayment=List of payments
 ListOfCustomerPayments=List of customer payments
+ListOfSupplierPayments=List of supplier payments
 DateStartPeriod=Date start period
 DateEndPeriod=Date end period
 newLT1Payment=New tax 2 payment
@@ -81,7 +82,7 @@ LT2PaymentES=IRPF Payment
 LT2PaymentsES=IRPF Payments
 VATPayment=Sales tax payment
 VATPayments=Sales tax payments
-VATRefund=Sales tax refund Refund
+VATRefund=Sales tax refund
 Refund=Refund
 SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Show VAT payment
diff --git a/htdocs/langs/id_ID/cron.lang b/htdocs/langs/id_ID/cron.lang
index cb68b31c80f..40543fd4f96 100644
--- a/htdocs/langs/id_ID/cron.lang
+++ b/htdocs/langs/id_ID/cron.lang
@@ -17,14 +17,14 @@ CronMethodDoesNotExists=Class %s does not contains any method %s
 # Menu
 EnabledAndDisabled=Enabled and disabled
 # Page list
-CronLastOutput=Last run output
-CronLastResult=Last result code
+CronLastOutput=Latest run output
+CronLastResult=Latest result code
 CronCommand=Command
 CronList=Scheduled jobs
 CronDelete=Delete scheduled jobs
-CronConfirmDelete=Are you sure you want to delete these scheduled jobs ?
+CronConfirmDelete=Are you sure you want to delete these scheduled jobs?
 CronExecute=Launch scheduled job
-CronConfirmExecute=Are you sure you want to execute these scheduled jobs now ?
+CronConfirmExecute=Are you sure you want to execute these scheduled jobs now?
 CronInfo=Scheduled job module allow to execute job that have been planned
 CronTask=Job
 CronNone=None
@@ -65,7 +65,7 @@ CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of
 CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
 CronCommandHelp=The system command line to execute.
 CronCreateJob=Create new Scheduled Job
-CronFrom=From
+CronFrom=Dari
 # Info
 # Common
 CronType=Job type
diff --git a/htdocs/langs/id_ID/errors.lang b/htdocs/langs/id_ID/errors.lang
index 629f063be37..9e2eb6817ef 100644
--- a/htdocs/langs/id_ID/errors.lang
+++ b/htdocs/langs/id_ID/errors.lang
@@ -11,6 +11,7 @@ ErrorLoginAlreadyExists=Login %s already exists.
 ErrorGroupAlreadyExists=Group %s already exists.
 ErrorRecordNotFound=Record not found.
 ErrorFailToCopyFile=Failed to copy file '<b>%s</b>' into '<b>%s</b>'.
+ErrorFailToCopyDir=Failed to copy directory '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToRenameFile=Failed to rename file '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToDeleteFile=Failed to remove file '<b>%s</b>'.
 ErrorFailToCreateFile=Failed to create file '<b>%s</b>'.
@@ -115,7 +116,7 @@ ErrorNoActivatedBarcode=No barcode type activated
 ErrUnzipFails=Failed to unzip %s with ZipArchive
 ErrNoZipEngine=No engine to unzip %s file in this PHP
 ErrorFileMustBeADolibarrPackage=The file %s must be a Dolibarr zip package
-ErrorFileRequired=It takes a package Dolibarr file
+ErrorModuleFileRequired=You must select a Dolibarr module package file
 ErrorPhpCurlNotInstalled=The PHP CURL is not installed, this is essential to talk with 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
@@ -181,6 +182,8 @@ ErrorBankStatementNameMustFollowRegex=Error, bank statement name must follow the
 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>
 
 # 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.
diff --git a/htdocs/langs/id_ID/holiday.lang b/htdocs/langs/id_ID/holiday.lang
index 39e193c3843..0dc3aca1ad5 100644
--- a/htdocs/langs/id_ID/holiday.lang
+++ b/htdocs/langs/id_ID/holiday.lang
@@ -76,8 +76,8 @@ BoxTitleLastLeaveRequests=Latest %s modified leave requests
 HolidaysMonthlyUpdate=Monthly update
 ManualUpdate=Manual update
 HolidaysCancelation=Leave request cancelation
-EmployeeLastname=Employee lastname
-EmployeeFirstname=Employee firstname
+EmployeeLastname=Employee last name
+EmployeeFirstname=Employee first name
 TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
 
 ## Configuration du Module ##
diff --git a/htdocs/langs/id_ID/ldap.lang b/htdocs/langs/id_ID/ldap.lang
index a17019d00fb..42e699de311 100644
--- a/htdocs/langs/id_ID/ldap.lang
+++ b/htdocs/langs/id_ID/ldap.lang
@@ -13,8 +13,8 @@ LDAPUsers=Users in LDAP database
 LDAPFieldStatus=Status
 LDAPFieldFirstSubscriptionDate=First subscription date
 LDAPFieldFirstSubscriptionAmount=First subscription amount
-LDAPFieldLastSubscriptionDate=Last subscription date
-LDAPFieldLastSubscriptionAmount=Last subscription amount
+LDAPFieldLastSubscriptionDate=Latest subscription date
+LDAPFieldLastSubscriptionAmount=Latest subscription amount
 LDAPFieldSkype=Skype id
 LDAPFieldSkypeExample=Example : skypeName
 UserSynchronized=User synchronized
diff --git a/htdocs/langs/id_ID/mails.lang b/htdocs/langs/id_ID/mails.lang
index c9a5b534923..96622403e37 100644
--- a/htdocs/langs/id_ID/mails.lang
+++ b/htdocs/langs/id_ID/mails.lang
@@ -74,14 +74,18 @@ ResultOfMailSending=Result of mass EMail sending
 NbSelected=Nb selected
 NbIgnored=Nb ignored
 NbSent=Nb sent
-ContactsWithThirdpartyFilter=Contact with customer filters
+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
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Line %s in file
 RecipientSelectionModules=Defined requests for recipient's selection
 MailSelectedRecipients=Selected recipients
 MailingArea=EMailings area
-LastMailings=Last %s emailings
+LastMailings=Latest %s emailings
 TargetsStatistics=Targets statistics
 NbOfCompaniesContacts=Unique contacts/addresses
 MailNoChangePossible=Recipients for validated emailing can't be changed
@@ -146,3 +150,6 @@ AdvTgtCreateFilter=Create filter
 AdvTgtOrCreateNewFilter=Name of new filter
 NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
+OutGoingEmailSetup=Outgoing email setup
+InGoingEmailSetup=Incoming email setup
+
diff --git a/htdocs/langs/id_ID/main.lang b/htdocs/langs/id_ID/main.lang
index 00d9b2b4d89..5f3fa81e39a 100644
--- a/htdocs/langs/id_ID/main.lang
+++ b/htdocs/langs/id_ID/main.lang
@@ -69,6 +69,7 @@ SetDate=Set date
 SelectDate=Select a date
 SeeAlso=See also %s
 SeeHere=See here
+Apply=Apply
 BackgroundColorByDefault=Default background color
 FileRenamed=The file was successfully renamed
 FileUploaded=The file was successfully uploaded
@@ -87,7 +88,7 @@ Undefined=Undefined
 PasswordForgotten=Password forgotten?
 SeeAbove=See above
 HomeArea=Home area
-LastConnexion=Last connection
+LastConnexion=Latest connection
 PreviousConnexion=Previous connection
 PreviousValue=Previous value
 ConnectedOnMultiCompany=Connected on environment
@@ -237,7 +238,7 @@ DateCreation=Tangga dibuat
 DateCreationShort=Creat. date
 DateModification=Modification date
 DateModificationShort=Modif. date
-DateLastModification=Last modification date
+DateLastModification=Latest modification date
 DateValidation=Validation date
 DateClosing=Closing date
 DateDue=Due date
@@ -433,7 +434,7 @@ Reportings=Reporting
 Draft=Konsep
 Drafts=Drafts
 Validated=Divalidasi
-Opened=Open
+Opened=Opened
 New=New
 Discount=Discount
 Unknown=Tidak diketahui
@@ -599,6 +600,8 @@ SessionName=Session name
 Method=Method
 Receive=Receive
 CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
+ExpectedValue=Expected Value
+CurrentValue=Current value
 PartialWoman=Partial
 TotalWoman=Total
 NeverReceived=Never received
@@ -756,6 +759,7 @@ SomeTranslationAreUncomplete=Some languages may be partially translated or may c
 DirectDownloadLink=Direct download link
 Download=Download
 ActualizeCurrency=Update currency rate
+Fiscalyear=Fiscal year
 # Week day
 Monday=Monday
 Tuesday=Tuesday
@@ -812,3 +816,5 @@ SearchIntoContracts=Contracts
 SearchIntoCustomerShipments=Customer shipments
 SearchIntoExpenseReports=Expense reports
 SearchIntoLeaves=Cuti
+
+BulkActions=Bulk actions
diff --git a/htdocs/langs/id_ID/members.lang b/htdocs/langs/id_ID/members.lang
index ab776555dc9..52ad0c996a0 100644
--- a/htdocs/langs/id_ID/members.lang
+++ b/htdocs/langs/id_ID/members.lang
@@ -136,8 +136,8 @@ DocForAllMembersCards=Generate business cards for all members
 DocForOneMemberCards=Generate business cards for a particular member
 DocForLabels=Generate address sheets
 SubscriptionPayment=Subscription payment
-LastSubscriptionDate=Last subscription date
-LastSubscriptionAmount=Last subscription amount
+LastSubscriptionDate=Latest subscription date
+LastSubscriptionAmount=Latest subscription amount
 MembersStatisticsByCountries=Members statistics by country
 MembersStatisticsByState=Members statistics by state/province
 MembersStatisticsByTown=Members statistics by town
@@ -149,7 +149,7 @@ MembersByStateDesc=This screen show you statistics on members by state/provinces
 MembersByTownDesc=This screen show you statistics on members by town.
 MembersStatisticsDesc=Choose statistics you want to read...
 MenuMembersStats=Statistics
-LastMemberDate=Last member date
+LastMemberDate=Latest member date
 Nature=Nature
 Public=Information are public
 NewMemberbyWeb=New member added. Awaiting approval
diff --git a/htdocs/langs/id_ID/orders.lang b/htdocs/langs/id_ID/orders.lang
index 322201451e8..2e3c8444a35 100644
--- a/htdocs/langs/id_ID/orders.lang
+++ b/htdocs/langs/id_ID/orders.lang
@@ -39,7 +39,7 @@ StatusOrderRefusedShort=Ditolak
 StatusOrderBilledShort=Billed
 StatusOrderToProcessShort=To process
 StatusOrderReceivedPartiallyShort=Partially received
-StatusOrderReceivedAllShort=Everything received
+StatusOrderReceivedAllShort=Products received
 StatusOrderCanceled=Dibatalkan
 StatusOrderDraft=Konsep (harus di validasi)
 StatusOrderValidated=Divalidasi
@@ -51,7 +51,7 @@ StatusOrderApproved=Disetujui
 StatusOrderRefused=Ditolak
 StatusOrderBilled=Billed
 StatusOrderReceivedPartially=Partially received
-StatusOrderReceivedAll=Everything received
+StatusOrderReceivedAll=All products received
 ShippingExist=A shipment exists
 QtyOrdered=Qty ordered
 ProductQtyInDraft=Product quantity into draft orders
diff --git a/htdocs/langs/id_ID/other.lang b/htdocs/langs/id_ID/other.lang
index d0724208eda..bed72a95198 100644
--- a/htdocs/langs/id_ID/other.lang
+++ b/htdocs/langs/id_ID/other.lang
@@ -68,14 +68,15 @@ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find her
 PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nYou will find here the shipping __SHIPPINGREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nYou will find here the intervention __FICHINTERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n__PERSONALIZED__\n\n__SIGNATURE__
-DemoDesc=Dolibarr is a compact ERP/CRM supporting several functional modules. A demo showcasing all modules makes no sense as this scenario never occurs. So, several demo profiles are available.
+DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
+ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
 DemoFundation=Manage members of a foundation
 DemoFundation2=Manage members and bank account of a foundation
-DemoCompanyServiceOnly=Manage a freelance activity selling service only
+DemoCompanyServiceOnly=Company or freelance selling service only
 DemoCompanyShopWithCashDesk=Manage a shop with a cash desk
-DemoCompanyProductAndStocks=Manage a small or medium company selling products
-DemoCompanyAll=Manage a small or medium company with multiple activities (all main modules)
+DemoCompanyProductAndStocks=Company selling products with a shop
+DemoCompanyAll=Company with multiple activities (all main modules)
 CreatedBy=Created by %s
 ModifiedBy=Modified by %s
 ValidatedBy=Validated by %s
diff --git a/htdocs/langs/id_ID/products.lang b/htdocs/langs/id_ID/products.lang
index ea5cd648eb9..902663038fa 100644
--- a/htdocs/langs/id_ID/products.lang
+++ b/htdocs/langs/id_ID/products.lang
@@ -60,7 +60,7 @@ SellingPrice=Selling price
 SellingPriceHT=Selling price (net of tax)
 SellingPriceTTC=Selling price (inc. tax)
 CostPriceDescription=This price (net of tax) can be used to store the average amount this product cost to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
-CostPriceUsage=In a future version, this value could be used for margin calculation.
+CostPriceUsage=This value could be used for margin calculation.
 SoldAmount=Sold amount
 PurchasedAmount=Purchased amount
 NewPrice=New price
@@ -142,6 +142,7 @@ ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b>?
 CloneContentProduct=Clone all main informations of product/service
 ClonePricesProduct=Clone main informations and prices
 CloneCompositionProduct=Clone packaged product/service
+CloneCombinationsProduct=Clone product variants
 ProductIsUsed=This product is used
 NewRefForClone=Ref. of new product/service
 SellingPrices=Selling prices
@@ -238,7 +239,7 @@ GlobalVariables=Global variables
 VariableToUpdate=Variable to update
 GlobalVariableUpdaters=Global variable updaters
 UpdateInterval=Update interval (minutes)
-LastUpdated=Last updated
+LastUpdated=Latest update
 CorrectlyUpdated=Correctly updated
 PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
 PropalMergePdfProductChooseFile=Select PDF files
@@ -258,4 +259,41 @@ VolumeUnits=Volume unit
 SizeUnits=Size unit
 DeleteProductBuyPrice=Delete buying price
 ConfirmDeleteProductBuyPrice=Are you sure you want to delete this buying price?
+SubProduct=Sub product
 
+#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
+ProductCombinations=Variants
+HideProductCombinations=Hide products variant in the products selector
+ProductCombination=Variant
+NewProductCombination=New variant
+EditProductCombination=Editing variant
+ProductCombinationGenerator=Variants generator
+Features=Features
+PriceImpact=Price impact
+WeightImpact=Weight impact
+NewProductAttribute=New attribute
+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
+PercentageVariation=Percentage variation
+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 child products
+ConfirmCloneProductCombinations=Would you like to copy all the product variant to the 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
diff --git a/htdocs/langs/id_ID/projects.lang b/htdocs/langs/id_ID/projects.lang
index 9bd2ebfce44..72821fbdf8a 100644
--- a/htdocs/langs/id_ID/projects.lang
+++ b/htdocs/langs/id_ID/projects.lang
@@ -29,9 +29,9 @@ DeleteAProject=Delete a project
 DeleteATask=Delete a task
 ConfirmDeleteAProject=Are you sure you want to delete this project?
 ConfirmDeleteATask=Are you sure you want to delete this task?
-OpenedProjects=Open projects
-OpenedTasks=Open tasks
-OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
+OpenedProjects=Opened projects
+OpenedTasks=Opened tasks
+OpportunitiesStatusForOpenedProjects=Opportunities amount of opened projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=Show project
 SetProject=Set project
@@ -47,7 +47,7 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
 TaskTimeDate=Tanggal
-TasksOnOpenedProject=Tasks on open projects
+TasksOnOpenedProject=Tasks on opened projects
 WorkloadNotDefined=Workload not defined
 NewTimeSpent=New time spent
 MyTimeSpent=My time spent
@@ -96,6 +96,7 @@ ValidateProject=Validate projet
 ConfirmValidateProject=Are you sure you want to validate this project?
 CloseAProject=Close project
 ConfirmCloseAProject=Are you sure you want to close this project?
+AlsoCloseAProject=Also close project (keep it open if you still need to follow production tasks on it)
 ReOpenAProject=Open project
 ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=Project contacts
@@ -121,7 +122,7 @@ CloneProjectFiles=Clone project joined files
 CloneTaskFiles=Clone task(s) joined files (if task(s) cloned)
 CloneMoveDate=Update project/tasks dates from now?
 ConfirmCloneProject=Are you sure to clone this project?
-ProjectReportDate=Change task date according project start date
+ProjectReportDate=Change task dates according to new project start date
 ErrorShiftTaskDate=Impossible to shift task date according to new project start date
 ProjectsAndTasksLines=Projects and tasks
 ProjectCreatedInDolibarr=Project %s created
@@ -178,9 +179,9 @@ ProjectsStatistics=Statistics on projects/leads
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 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.
-OpenedProjectsByThirdparties=Open projects by thirdparties
+OpenedProjectsByThirdparties=Opened projects by thirdparties
 OnlyOpportunitiesShort=Only opportunities
-OpenedOpportunitiesShort=Open opportunities
+OpenedOpportunitiesShort=Opened opportunities
 NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount
diff --git a/htdocs/langs/id_ID/propal.lang b/htdocs/langs/id_ID/propal.lang
index fb14e1b9815..fe0d0b0fafc 100644
--- a/htdocs/langs/id_ID/propal.lang
+++ b/htdocs/langs/id_ID/propal.lang
@@ -3,7 +3,7 @@ Proposals=Commercial proposals
 Proposal=Commercial proposal
 ProposalShort=Proposal
 ProposalsDraft=Draft commercial proposals
-ProposalsOpened=Open commercial proposals
+ProposalsOpened=Opened commercial proposals
 Prop=Commercial proposals
 CommercialProposal=Commercial proposal
 ProposalCard=Proposal card
@@ -26,9 +26,9 @@ AmountOfProposalsByMonthHT=Amount by month (net of tax)
 NbOfProposals=Number of commercial proposals
 ShowPropal=Show proposal
 PropalsDraft=Drafts
-PropalsOpened=Open
+PropalsOpened=Opened
 PropalStatusDraft=Konsep (harus di validasi)
-PropalStatusValidated=Validated (proposal is open)
+PropalStatusValidated=Validated (proposal is opened)
 PropalStatusSigned=Signed (needs billing)
 PropalStatusNotSigned=Not signed (closed)
 PropalStatusBilled=Billed
diff --git a/htdocs/langs/id_ID/stocks.lang b/htdocs/langs/id_ID/stocks.lang
index 625128a22bd..868b4583cd6 100644
--- a/htdocs/langs/id_ID/stocks.lang
+++ b/htdocs/langs/id_ID/stocks.lang
@@ -22,13 +22,15 @@ Movements=Movements
 ErrorWarehouseRefRequired=Warehouse reference name is required
 ListOfWarehouses=List of warehouses
 ListOfStockMovements=List of stock movements
+StockMovementForId=Movement ID %d
+ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Warehouses area
 Location=Tempat
 LocationSummary=Short name location
 NumberOfDifferentProducts=Number of different products
 NumberOfProducts=Total number of products
-LastMovement=Last movement
-LastMovements=Last movements
+LastMovement=Latest movement
+LastMovements=Latest movements
 Units=Units
 Unit=Unit
 StockCorrection=Correct stock
diff --git a/htdocs/langs/id_ID/supplier_proposal.lang b/htdocs/langs/id_ID/supplier_proposal.lang
index bafa63c39dd..aec117056e8 100644
--- a/htdocs/langs/id_ID/supplier_proposal.lang
+++ b/htdocs/langs/id_ID/supplier_proposal.lang
@@ -8,7 +8,7 @@ SearchRequest=Find a request
 DraftRequests=Draft requests
 SupplierProposalsDraft=Draft supplier proposals
 LastModifiedRequests=Latest %s modified price requests
-RequestsOpened=Open price requests
+RequestsOpened=Opened price requests
 SupplierProposalArea=Supplier proposals area
 SupplierProposalShort=Supplier proposal
 SupplierProposals=Supplier proposals
@@ -23,7 +23,7 @@ ConfirmValidateAsk=Are you sure you want to validate this price request under na
 DeleteAsk=Delete request
 ValidateAsk=Validate request
 SupplierProposalStatusDraft=Konsep (harus di validasi)
-SupplierProposalStatusValidated=Validated (request is open)
+SupplierProposalStatusValidated=Validated (request is opened)
 SupplierProposalStatusClosed=Ditutup
 SupplierProposalStatusSigned=Accepted
 SupplierProposalStatusNotSigned=Ditolak
diff --git a/htdocs/langs/id_ID/suppliers.lang b/htdocs/langs/id_ID/suppliers.lang
index 5ce8241edfe..8d726b487b8 100644
--- a/htdocs/langs/id_ID/suppliers.lang
+++ b/htdocs/langs/id_ID/suppliers.lang
@@ -24,10 +24,10 @@ ExportDataset_fournisseur_1=Supplier invoices list and invoice lines
 ExportDataset_fournisseur_2=Supplier invoices and payments
 ExportDataset_fournisseur_3=Supplier orders and order lines
 ApproveThisOrder=Setujui pesanan
-ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b> ?
+ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b>?
 DenyingThisOrder=Deny this order
-ConfirmDenyingThisOrder=Are you sure you want to deny this order <b>%s</b> ?
-ConfirmCancelThisOrder=Are you sure you want to cancel this order <b>%s</b> ?
+ConfirmDenyingThisOrder=Are you sure you want to deny this order <b>%s</b>?
+ConfirmCancelThisOrder=Are you sure you want to cancel this order <b>%s</b>?
 AddSupplierOrder=Buat pesanan suplier
 AddSupplierInvoice=Buat invoice suplier
 ListOfSupplierProductForSupplier=List of products and prices for supplier <b>%s</b>
@@ -41,3 +41,4 @@ DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Wrong quality
 ReputationForThisProduct=Reputation
 BuyerName=Buyer name
+AllProductServicePrices=All product / service prices
diff --git a/htdocs/langs/id_ID/users.lang b/htdocs/langs/id_ID/users.lang
index cb5e91cb339..0be0c9f3401 100644
--- a/htdocs/langs/id_ID/users.lang
+++ b/htdocs/langs/id_ID/users.lang
@@ -36,7 +36,7 @@ AdministratorDesc=Administrator
 DefaultRights=Default permissions
 DefaultRightsDesc=Define here <u>default</u> permissions that are automatically granted to a <u>new created</u> user (Go on user card to change permission of an existing user).
 DolibarrUsers=Dolibarr users
-LastName=Last Name
+LastName=Last name
 FirstName=First name
 ListOfGroups=List of groups
 NewGroup=New group
diff --git a/htdocs/langs/id_ID/withdrawals.lang b/htdocs/langs/id_ID/withdrawals.lang
index ad2d7eb170f..3c4f1a53af9 100644
--- a/htdocs/langs/id_ID/withdrawals.lang
+++ b/htdocs/langs/id_ID/withdrawals.lang
@@ -24,6 +24,7 @@ WithdrawStatistics=Direct debit payment statistics
 WithdrawRejectStatistics=Direct debit payment reject statistics
 LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
+WithdrawRequestsDone=%s direct debit payment requests recorded
 ThirdPartyBankCode=Third party bank code
 NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoice are on companies with a valid BAN.
 ClassCredited=Classify credited
@@ -76,8 +77,8 @@ RUM=UMR
 RUMLong=Unique Mandate Reference
 RUMWillBeGenerated=UMR number will be generated once bank account information are saved
 WithdrawMode=Direct debit mode (FRST or RECUR)
-WithdrawRequestAmount=Withdraw request amount:
-WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil amount.
+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
diff --git a/htdocs/langs/is_IS/accountancy.lang b/htdocs/langs/is_IS/accountancy.lang
index c3ded0e52a2..f1254652032 100644
--- a/htdocs/langs/is_IS/accountancy.lang
+++ b/htdocs/langs/is_IS/accountancy.lang
@@ -194,6 +194,8 @@ ChangeBinding=Change the binding
 
 ## Admin
 ApplyMassCategories=Apply mass categories
+AddAccountFromBookKeepingWithNoCategories=Add acccount already used with no categories
+CategoryDeleted=Category for the accounting account has been removed
 
 ## Export
 Exports=Exports
@@ -209,6 +211,7 @@ Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution
 Modelcsv_quadratus=Export towards Quadratus QuadraCompta
 Modelcsv_ebp=Export towards EBP
 Modelcsv_cogilog=Export towards Cogilog
+ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
 InitAccountancy=Init accountancy
diff --git a/htdocs/langs/is_IS/admin.lang b/htdocs/langs/is_IS/admin.lang
index 903773d9b52..3c90c53bd8f 100644
--- a/htdocs/langs/is_IS/admin.lang
+++ b/htdocs/langs/is_IS/admin.lang
@@ -9,17 +9,20 @@ VersionDevelopment=Þróun
 VersionUnknown=Óþekkt
 VersionRecommanded=Mælt
 FileCheck=Files integrity checker
-FileCheckDesc=This tool allows you to check the integrity of files of your application, comparing each files with the official ones. You can use this tool to detect if some files were modified by a hacker for example.
+FileCheckDesc=This tool allows you to check the integrity of files and setup of your application, comparing each files with the official ones. 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.
 FileIntegrityIsStrictlyConformedWithReference=Files integrity is strictly conformed with the reference.
-FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified of removed.
+FileIntegrityIsOkButFilesWereAdded=Files integrity check has passed, however some new files were added.
+FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified, removed or added.
 GlobalChecksum=Global checksum
 MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
 LocalSignature=Embedded local signature (less reliable)
 RemoteSignature=Remote distant signature (more reliable)
 FilesMissing=Missing Files
 FilesUpdated=Updated Files
+FilesModified=Modified Files
+FilesAdded=Added Files
 FileCheckDolibarr=Check integrity of application files
-AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from a certified package
+AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from an official package
 XmlNotFound=Xml Integrity File of application not found
 SessionId=Session ID
 SessionSaveHandler=Handler að vista fundur
@@ -188,7 +191,9 @@ BoxesDesc=Widgets are components showing some information that you can add to pe
 OnlyActiveElementsAreShown=Aðeins atriði frá <a href="%s">virkt einingar</a> eru birtar.
 ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
-ModulesMarketPlaces=Meira mát ...
+ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
+ModulesMarketPlaces=Find external modules...
+GoModuleSetupArea=To deploy/install a new module, go onto the Module setup area at <a href="%s">%s</a>.
 DoliStoreDesc=DoliStore, opinber markaður staður fyrir Dolibarr ERP / CRM ytri mát
 DoliPartnersDesc=List of companies providing custom developed modules or features (Note: anyone experienced in PHP programming can provide custom development for an open source project)
 WebSiteDesc=Reference websites to find more modules...
@@ -280,20 +285,21 @@ MenuHandlers=Valmynd dýraþjálfari
 MenuAdmin=Valmynd ritstjóri
 DoNotUseInProduction=Do not use in production
 ThisIsProcessToFollow=This is steps to process:
-ThisIsAlternativeProcessToFollow=This is an alternative setup to process:
+ThisIsAlternativeProcessToFollow=This is an alternative setup to process manually:
 StepNb=Skref %s
 FindPackageFromWebSite=Finna pakki sem veitir lögun þú vilt (td á heimasíðu %s ).
 DownloadPackageFromWebSite=Download package (for example from official web site %s).
-UnpackPackageInDolibarrRoot=Unpack package file into Dolibarr server directory dedicated to external modules: <b>%s</b>
-SetupIsReadyForUse=Setja er lokið og Dolibarr er tilbúinn til notkunar með þessu nýja hluti.
-NotExistsDirect=The alternative root directory is not defined.<br>
-InfDirAlt=Since version 3 it is possible to define an alternative root directory.This allows you to store, same place, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
-InfDirExample=<br>Then declare it in the file conf.php<br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>*These lines are commented with "#", to uncomment only remove the character.
+UnpackPackageInDolibarrRoot=Unpack the packaged files into server directory dedicated to Dolibarr: <b>%s</b>
+UnpackPackageInModulesRoot=To deploy/install an external module, unpack the packaged files into the server directory dedicated to modules: <b>%s</b>
+SetupIsReadyForUse=Module deployment is finished. You must however enable and setup the module in your application by going on the page to setup modules: <a href="%s">%s</a>.
+NotExistsDirect=The alternative root directory is not defined to an existing directory.<br>
+InfDirAlt=Since version 3, it is possible to define an alternative root directory. This allows you to store, into a dedicated directory, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
+InfDirExample=<br>Then declare it in the file <strong>conf.php</strong><br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>If these lines are commented with "#", to enable them, just uncomment by removing the "#" character.
 YouCanSubmitFile=For this step, you can send package using this tool: Select module file
 CurrentVersion=Dolibarr núverandi útgáfa
 CallUpdatePage=Go to the page that updates the database structure and data: %s.
 LastStableVersion=Latest stable version
-LastActivationDate=Last activation date
+LastActivationDate=Latest activation date
 UpdateServerOffline=Update server offline
 GenericMaskCodes=Þú getur fært inn hvaða tala lagsins. Í þessu maska gæti eftirfarandi tög að nota: <br> <b>(000000)</b> samsvarar fjölda sem verður incremented á hverjum %s . Sláðu inn eins mörg núll og löngun lengd borðið. Teljarinn verður lokið við núllum frá vinstri til að fá eins mörg núll og lagsins. <br> <b>(000000 000)</b> sami eins og fyrri en að vega upp á móti sem svarar til fjölda til hægri á + merki er notað sem hófst á fyrsta %s . <br> <b>(000000 @ x)</b> sami eins og fyrri en borðið er endurstilla á núll þegar mánaðar x er náð (x á milli 1 og 12). Ef þessi möguleiki er notaður og x er 2 eða hærra, þá röð (YY) (mm) eða (áááá) (mm) er einnig nauðsynleg. <br> <b>(Dd)</b> dag (01-31). <br> <b>(Mm)</b> mánuði (01-12). <br> <b>(YY), (áááá)</b> eða <b>(y)</b> ár yfir 2, 4 eða 1 númer. <br>
 GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
@@ -376,11 +382,11 @@ ExtrafieldCheckBox=Checkbox
 ExtrafieldRadio=Radio button
 ExtrafieldCheckBoxFromList= Checkbox from table
 ExtrafieldLink=Link to an object
-ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>In order to have the list depending on another :<br>1,value1|parent_list_code:parent_key<br>2,value2|parent_list_code:parent_key
+ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list :<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list :<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
-ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
+ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Example : Societe:societe/class/societe.class.php
 LibraryToBuildPDF=Library used for PDF generation
 WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
@@ -415,10 +421,10 @@ ModuleCompanyCodeDigitaria=Bókhalds kóða ráðast á þriðja aðila kóða.
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
 WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<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).
-
+ClickToShowDescription=Click to show description
 # Modules
 Module0Name=Notendur & hópar
-Module0Desc=Notendur og hópar stjórnun
+Module0Desc=Users / Employees and Groups management
 Module1Name=Í þriðja aðila
 Module1Desc=Fyrirtæki og stjórnun tengiliðs
 Module2Name=Auglýsing
@@ -689,7 +695,7 @@ PermissionAdvanced253=Búa til / breyta innri / ytri notendur og leyfi
 Permission254=Eyða eða gera öðrum notendum
 Permission255=Búa til / breyta eigin upplýsingar um notandann sinn
 Permission256=Breyta eigin lykilorð hans
-Permission262=Extend access to all third parties (not only third parties that user is a sale representative). Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc). Not effective for projects (only rules on project permissions, visibility and assignement matters).
+Permission262=Extend access to all third parties (not only third parties that user is a sale representative).<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 assignement matters).
 Permission271=Lesa CA
 Permission272=Lesa reikningum
 Permission273=Útgáfudagur reikningum
@@ -891,7 +897,7 @@ Offset=Offset
 AlwaysActive=Alltaf virkar
 Upgrade=Uppfærsla
 MenuUpgrade=Uppfærsla / Extend
-AddExtensionThemeModuleOrOther=Bæta við eftirnafn (þema mát, ...)
+AddExtensionThemeModuleOrOther=Deploy/install external module
 WebServer=Vefþjóni
 DocumentRootServer=rót vefþjóninn er skrá
 DataRootServer=Gagnaskrár skrá
@@ -1165,10 +1171,6 @@ FreeLegalTextOnOrders=Frjáls texti á pantanir
 WatermarkOnDraftOrders=Watermark on draft orders (none if empty)
 ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable
 BANK_ASK_PAYMENT_BANK_DURING_ORDER=Ask for bank account destination of order
-##### Clicktodial #####
-ClickToDialSetup=Smelltu til að hringja mát skipulag
-ClickToDialUrlDesc=Url kallað þegar smellur á picto síminn er lokið. Dans l'url, énumérés pouvez utiliser les balises <br> <b>%% 1 $ s</b> Qui Sera remplacé jöfnuður æ Sími de l'appelé <br> <b>%% 2 $ s</b> Qui Sera remplacé jöfnuður æ Sími de l'appelant (æ votre) <br> <b>%% 3 $ s</b> Qui Sera remplacé jöfnuður votre innskráningu clicktodial (skilgreining sur votre fiche utilisateur) <br> <b>%% 4 $ s</b> Qui Sera remplacé jöfnuður votre mot de passe clicktodial (skilgreining sur votre fiche utilisateur).
-##### Bookmark4u #####
 ##### Interventions #####
 InterventionsSetup=Íhlutun mát skipulag
 FreeLegalTextOnInterventions=Frjáls texti á skjölum inngrip
@@ -1395,7 +1397,7 @@ SendingsSetup=Sendi mát skipulag
 SendingsReceiptModel=Sending kvittun líkan
 SendingsNumberingModules=Sendings númera einingar
 SendingsAbility=Support shipping sheets for customer deliveries
-NoNeedForDeliveryReceipts=Í flestum tilfellum er sendings kvittunum notað bæði sem lak fyrir afgreiðsla viðskiptavina (listi af vörum til að senda) og lak sem er recevied og undirrituð af viðskiptavini. Svo vara afgreiðsla greiðslukvittun er afrit lögun og er sjaldnast virkur.
+NoNeedForDeliveryReceipts=In most cases, shipping sheets are used both as sheets for customer deliveries (list of products to send) and sheets that is received and signed by customer. So product deliveries receipts is a duplicated feature and is rarely activated.
 FreeLegalTextOnShippings=Free text on shipments
 ##### Deliveries #####
 DeliveryOrderNumberingModules=Vörur afgreiðsla barst tala mát
@@ -1477,7 +1479,9 @@ AGENDA_DEFAULT_FILTER_STATUS=Set automatically this status for events into searc
 AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
 AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
 AGENDA_NOTIFICATION_SOUND=Enable sound notification
-##### ClickToDial #####
+##### Clicktodial #####
+ClickToDialSetup=Smelltu til að hringja mát skipulag
+ClickToDialUrlDesc=Url kallað þegar smellur á picto síminn er lokið. Dans l'url, énumérés pouvez utiliser les balises <br> <b>%% 1 $ s</b> Qui Sera remplacé jöfnuður æ Sími de l'appelé <br> <b>%% 2 $ s</b> Qui Sera remplacé jöfnuður æ Sími de l'appelant (æ votre) <br> <b>%% 3 $ s</b> Qui Sera remplacé jöfnuður votre innskráningu clicktodial (skilgreining sur votre fiche utilisateur) <br> <b>%% 4 $ s</b> Qui Sera remplacé jöfnuður votre mot de passe clicktodial (skilgreining sur votre fiche utilisateur).
 ClickToDialDesc=This module allows to make phone numbers clickable. A click on this icon will call make your phone to 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.
 ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
 ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on same computer than the browser, and called when you click on a link in your browser that start 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.
@@ -1505,10 +1509,11 @@ EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint availa
 ##### API ####
 ApiSetup=API module setup
 ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
-ApiProductionMode=Enable production mode (this will activate use of a caches for services management)
+ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
 ApiExporerIs=You can explore the APIs at url
 OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
 ApiKey=Key for API
+WarningAPIExplorerDisabled=The API explorer has been disabled. API explorer is not required to provide API services. It is a tool for developer to find/test REST APIs. If you need this tool, go into setup of module API REST to activate it.
 ##### Bank #####
 BankSetupModule=Bank einingu skipulag
 FreeLegalTextOnChequeReceipts=Frjáls texti á kvittunum athuga
@@ -1577,7 +1582,7 @@ BackupDumpWizard=Wizard to build database backup dump file
 SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
 SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is only manual steps a privileged user can do.
 InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
-ConfFileMuseContainCustom=Installing an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to have option<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
+ConfFileMuseContainCustom=Installing an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
 HighlightLinesColor=Highlight color of the line when the mouse passes over (keep empty for no highlight)
 TextTitleColor=Color of page title
@@ -1607,6 +1612,7 @@ FixTZ=TimeZone fix
 FillFixTZOnlyIfRequired=Example: +2 (fill only if problem experienced)
 ExpectedChecksum=Expected Checksum
 CurrentChecksum=Current Checksum
+ForcedConstants=Required constant values
 MailToSendProposal=To send customer proposal
 MailToSendOrder=To send customer order
 MailToSendInvoice=To send customer invoice
@@ -1615,9 +1621,10 @@ MailToSendIntervention=To send intervention
 MailToSendSupplierRequestForQuotation=To send quotation request to supplier
 MailToSendSupplierOrder=To send supplier order
 MailToSendSupplierInvoice=To send supplier invoice
+MailToSendContract=To send a contract
 MailToThirdparty=To send email from third party page
 ByDefaultInList=Show by default on list view
-YouUseLastStableVersion=You use the last stable version
+YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
 TitleExampleForMaintenanceRelease=Example of message you can use to announce this maintenance release (feel free to use it on your web sites)
 ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. 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.
diff --git a/htdocs/langs/is_IS/banks.lang b/htdocs/langs/is_IS/banks.lang
index ae048e3b154..355b1f6a172 100644
--- a/htdocs/langs/is_IS/banks.lang
+++ b/htdocs/langs/is_IS/banks.lang
@@ -74,13 +74,13 @@ Conciliate=Samræmdu
 Conciliation=Sættir
 ReconciliationLate=Reconciliation late
 IncludeClosedAccount=Hafa loka reikningum
-OnlyOpenedAccount=Only open accounts
+OnlyOpenedAccount=Aðeins opnað reikninga
 AccountToCredit=Reikningur til að lána
 AccountToDebit=Reikning til skuldfærslu
 DisableConciliation=Slökkva á sáttum lögun fyrir þennan reikning
 ConciliationDisabled=Sættir lögun fatlaðra
 LinkedToAConciliatedTransaction=Linked to a conciliated entry
-StatusAccountOpened=Opnaðu
+StatusAccountOpened=Opnaður
 StatusAccountClosed=Loka
 AccountIdShort=Fjöldi
 LineRecord=Færsla
diff --git a/htdocs/langs/is_IS/bills.lang b/htdocs/langs/is_IS/bills.lang
index d5988a415e6..2e8c458085b 100644
--- a/htdocs/langs/is_IS/bills.lang
+++ b/htdocs/langs/is_IS/bills.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - bills
 Bill=Invoice
 Bills=Kvittanir
-BillsCustomers=reikninga viðskiptavinar
-BillsCustomer=Customers invoice
-BillsSuppliers=reikningum birgis
-BillsCustomersUnpaid=Ógreiddum viðskiptavinum reikninga
-BillsCustomersUnpaidForCompany=reikningum ógreidd viðskiptavinar fyrir %s
-BillsSuppliersUnpaid=reikningum ógreidd birgis
-BillsSuppliersUnpaidForCompany=Reikninga ógreidda birgis til %s
+BillsCustomers=Customer invoices
+BillsCustomer=Viðskiptavinur Reikningar
+BillsSuppliers=Supplier invoices
+BillsCustomersUnpaid=Unpaid customer invoices
+BillsCustomersUnpaidForCompany=Unpaid customer invoices for %s
+BillsSuppliersUnpaid=Unpaid supplier invoices
+BillsSuppliersUnpaidForCompany=Unpaid supplier invoices for %s
 BillsLate=Vanskil
 BillsStatistics=Customers invoices statistics
 BillsStatisticsSuppliers=Suppliers invoices statistics
@@ -62,8 +62,8 @@ PaymentsBack=Greiðslur til baka
 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 credit note or deposit 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.
+ConfirmDeletePayment=Ertu viss um að þú viljir eyða þessari greiðslu?
+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.
 SupplierPayments=Birgjar greiðslur
 ReceivedPayments=Móttekin greiðslur
 ReceivedCustomersPayments=Greiðslur sem berast frá viðskiptavinum
@@ -78,6 +78,7 @@ PaymentMode=Greiðslumáti
 PaymentTypeDC=Debit/Credit Card
 PaymentTypePP=PayPal
 IdPaymentMode=Payment type (id)
+CodePaymentMode=Payment type (code)
 LabelPaymentMode=Payment type (label)
 PaymentModeShort=Greiðslumáti
 PaymentTerm=Greiðsla orð
@@ -102,9 +103,10 @@ SearchACustomerInvoice=Leita að viðskiptavinur reikning
 SearchASupplierInvoice=Leit birgir Reikningar
 CancelBill=Hætta við reikning
 SendRemindByMail=Senda áminningu í tölvupósti
-DoPayment=Ekki greiðslu
-DoPaymentBack=Ekki greiðslu baka
+DoPayment=Enter payment
+DoPaymentBack=Enter refund
 ConvertToReduc=Umbreyta inn í framtíðina afsláttur
+ConvertExcessReceivedToReduc=Convert excess received into future discount
 EnterPaymentReceivedFromCustomer=Sláðu inn greiðslu frá viðskiptavini
 EnterPaymentDueToCustomer=Greiða vegna viðskiptavina
 DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
@@ -151,14 +153,14 @@ NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified
 FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
 NotARecurringInvoiceTemplate=Not a recurring template invoice
 NewBill=Nýr reikningur
-LastBills=Last %s  reikningum
-LastCustomersBills=Last %s  viðskiptavinum reikninga
-LastSuppliersBills=Last %s  birgjum reikninga
+LastBills=Latest %s invoices
+LastCustomersBills=Latest %s customer invoices
+LastSuppliersBills=Latest %s supplier invoices
 AllBills=Allir reikningar
 OtherBills=Aðrar nótur
 DraftBills=Drög að reikningum
-CustomersDraftInvoices=Viðskiptavinir drög reikninga
-SuppliersDraftInvoices=Birgjar drög reikninga
+CustomersDraftInvoices=Customer draft invoices
+SuppliersDraftInvoices=Supplier draft invoices
 Unpaid=Ógreiddum
 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>?
@@ -272,6 +274,7 @@ Deposit=Innborgun
 Deposits=Innlán
 DiscountFromCreditNote=Afslátt af lánsfé athugið %s
 DiscountFromDeposit=Greiðslur frá innborgun Reikningar %s
+DiscountFromExcessReceived=Payments from excess received of invoice %s
 AbsoluteDiscountUse=Þess konar trúnaður er hægt að nota reikning fyrir staðfestingu þess
 CreditNoteDepositUse=Invoice must be validated to use this kind of credits
 NewGlobalDiscount=New festa afsláttur
@@ -279,8 +282,8 @@ NewRelativeDiscount=Nýr ættingi afsláttur
 NoteReason=Ath / Reason
 ReasonDiscount=Ástæða
 DiscountOfferedBy=Veitt
-DiscountStillRemaining=Afsláttur eftir enn
-DiscountAlreadyCounted=Afsláttur taldir þegar
+DiscountStillRemaining=Discounts available
+DiscountAlreadyCounted=Discounts already consumed
 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.
@@ -333,6 +336,8 @@ 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
 # PaymentConditions
 Statut=Status
 PaymentConditionShortRECEP=Due Upon Receipt
@@ -351,6 +356,14 @@ PaymentConditionShortPT_ORDER=Panta
 PaymentConditionPT_ORDER=On order
 PaymentConditionShortPT_5050=50-50
 PaymentConditionPT_5050=50%% in advance, 50%% on delivery
+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
 FixAmount=Fix amount
 VarAmount=Variable amount (%% tot.)
 # PaymentType
@@ -420,7 +433,7 @@ ChequeDeposits=Eftirlit innlán
 Cheques=Eftirlit
 DepositId=Id deposit
 NbCheque=Number of checks
-CreditNoteConvertedIntoDiscount=Þessi inneign huga eða afhendingu Reikningar hefur verið umbreytt í %s
+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
 ShowUnpaidAll=Sýna alla ógreiddra reikninga
 ShowUnpaidLateOnly=Sýna seint ógreiddum reikningi aðeins
diff --git a/htdocs/langs/is_IS/boxes.lang b/htdocs/langs/is_IS/boxes.lang
index 7736dade4ec..418d764be1b 100644
--- a/htdocs/langs/is_IS/boxes.lang
+++ b/htdocs/langs/is_IS/boxes.lang
@@ -25,8 +25,8 @@ BoxTitleLastSuppliers=Latest %s recorded suppliers
 BoxTitleLastModifiedSuppliers=Latest %s modified suppliers
 BoxTitleLastModifiedCustomers=Latest %s modified customers
 BoxTitleLastCustomersOrProspects=Latest %s customers or prospects
-BoxTitleLastCustomerBills=Latest %s customer's invoices
-BoxTitleLastSupplierBills=Latest %s supplier's invoices
+BoxTitleLastCustomerBills=Latest %s customer invoices
+BoxTitleLastSupplierBills=Latest %s supplier invoices
 BoxTitleLastModifiedProspects=Latest %s modified prospects
 BoxTitleLastModifiedMembers=Latest %s members
 BoxTitleLastFicheInter=Latest %s modified interventions
@@ -51,12 +51,12 @@ ClickToAdd=Smelltu hér til að bæta við.
 NoRecordedCustomers=Engin skráð viðskiptavini
 NoRecordedContacts=Engar skráðar tengiliðir
 NoActionsToDo=Engar aðgerðir til að gera
-NoRecordedOrders=pantanir No skráð viðskiptavinar
+NoRecordedOrders=No recorded customer orders
 NoRecordedProposals=Engin skráð tillögur
-NoRecordedInvoices=reikningum No skráð viðskiptavinar
-NoUnpaidCustomerBills=reikningum No launalaust viðskiptavinar
-NoUnpaidSupplierBills=reikningum No launalaust birgis
-NoModifiedSupplierBills=reikningum No skráð birgis
+NoRecordedInvoices=No recorded customer invoices
+NoUnpaidCustomerBills=No unpaid customer invoices
+NoUnpaidSupplierBills=No unpaid supplier invoices
+NoModifiedSupplierBills=No recorded supplier invoices
 NoRecordedProducts=Engin skrá vörur / þjónustu
 NoRecordedProspects=Engin skráð horfur
 NoContractedProducts=Engar vörur / þjónustu dróst
diff --git a/htdocs/langs/is_IS/companies.lang b/htdocs/langs/is_IS/companies.lang
index 03d34e176de..8d88a603039 100644
--- a/htdocs/langs/is_IS/companies.lang
+++ b/htdocs/langs/is_IS/companies.lang
@@ -81,6 +81,7 @@ PaymentBankAccount=Payment bank account
 OverAllProposals=Total proposals
 OverAllOrders=Total orders
 OverAllInvoices=Total invoices
+OverAllSupplierProposals=Total price requests
 ##### Local Taxes #####
 LocalTax1IsUsed=Use second tax
 LocalTax1IsUsedES= OR er notað
@@ -389,7 +390,7 @@ ListCustomersShort=Listi yfir viðskiptavini
 ThirdPartiesArea=Third parties and contact area
 LastModifiedThirdParties=Latest %s modified third parties
 UniqueThirdParties=Samtals einstaka þriðja aðila
-InActivity=Opnaðu
+InActivity=Opnaður
 ActivityCeased=Lokað
 ThirdPartyIsClosed=Third party is closed
 ProductsIntoElements=List of products/services into %s
@@ -404,7 +405,7 @@ MergeThirdparties=Merge third parties
 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 so you will be able to delete the duplicate one.
 ThirdpartiesMergeSuccess=Thirdparties have been merged
 SaleRepresentativeLogin=Login of sales representative
-SaleRepresentativeFirstname=Firstname of sales representative
-SaleRepresentativeLastname=Lastname of sales representative
+SaleRepresentativeFirstname=First name of sales representative
+SaleRepresentativeLastname=Last name of sales representative
 ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
 NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/is_IS/compta.lang b/htdocs/langs/is_IS/compta.lang
index 52be2e6863d..240fba50459 100644
--- a/htdocs/langs/is_IS/compta.lang
+++ b/htdocs/langs/is_IS/compta.lang
@@ -65,6 +65,7 @@ PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=VSK-greiðslu
 ListPayment=Listi yfir greiðslur
 ListOfCustomerPayments=Listi yfir greiðslur viðskiptavina
+ListOfSupplierPayments=Listi yfir greiðslur birgir
 DateStartPeriod=Date start period
 DateEndPeriod=Date end period
 newLT1Payment=New tax 2 payment
@@ -81,7 +82,7 @@ LT2PaymentES=IRPF Greiðsla
 LT2PaymentsES=IRPF Greiðslur
 VATPayment=Sales tax payment
 VATPayments=Sales tax payments
-VATRefund=Sales tax refund Refund
+VATRefund=Sales tax refund
 Refund=Refund
 SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Sýna VSK greiðslu
diff --git a/htdocs/langs/is_IS/cron.lang b/htdocs/langs/is_IS/cron.lang
index 68f0808fe4b..28d4e811598 100644
--- a/htdocs/langs/is_IS/cron.lang
+++ b/htdocs/langs/is_IS/cron.lang
@@ -17,14 +17,14 @@ CronMethodDoesNotExists=Class %s does not contains any method %s
 # Menu
 EnabledAndDisabled=Enabled and disabled
 # Page list
-CronLastOutput=Last run output
-CronLastResult=Last result code
+CronLastOutput=Latest run output
+CronLastResult=Latest result code
 CronCommand=Command
 CronList=Scheduled jobs
 CronDelete=Delete scheduled jobs
-CronConfirmDelete=Are you sure you want to delete these scheduled jobs ?
+CronConfirmDelete=Are you sure you want to delete these scheduled jobs?
 CronExecute=Launch scheduled job
-CronConfirmExecute=Are you sure you want to execute these scheduled jobs now ?
+CronConfirmExecute=Are you sure you want to execute these scheduled jobs now?
 CronInfo=Scheduled job module allow to execute job that have been planned
 CronTask=Job
 CronNone=None
@@ -33,13 +33,13 @@ CronDtEnd=Not after
 CronDtNextLaunch=Next execution
 CronDtLastLaunch=Start date of latest execution
 CronDtLastResult=End date of latest execution
-CronFrequency=Frequency
+CronFrequency=Tíðni
 CronClass=Class
 CronMethod=Aðferð
 CronModule=Module
 CronNoJobs=No jobs registered
 CronPriority=Forgangur
-CronLabel=Label
+CronLabel=Merki
 CronNbRun=Nb. launch
 CronMaxRun=Max nb. launch
 CronEach=Every
@@ -65,7 +65,7 @@ CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of
 CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
 CronCommandHelp=The system command line to execute.
 CronCreateJob=Create new Scheduled Job
-CronFrom=From
+CronFrom=Frá
 # Info
 # Common
 CronType=Job type
diff --git a/htdocs/langs/is_IS/errors.lang b/htdocs/langs/is_IS/errors.lang
index 3a0a45ffb3a..e15208488af 100644
--- a/htdocs/langs/is_IS/errors.lang
+++ b/htdocs/langs/is_IS/errors.lang
@@ -11,6 +11,7 @@ ErrorLoginAlreadyExists=Innskráning %s  er þegar til.
 ErrorGroupAlreadyExists=Group %s  er þegar til.
 ErrorRecordNotFound=Upptaka fannst ekki.
 ErrorFailToCopyFile=Mistókst að afrita skrá <b>'%s'</b> í 'á <b>%s</b> &quot;.
+ErrorFailToCopyDir=Failed to copy directory '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToRenameFile=Ekki tókst að endurnefna skrána 'á <b>%s'</b> í 'á <b>%s</b> &quot;.
 ErrorFailToDeleteFile=Ekki tókst að fjarlægja skrána <b>' %s '.</b>
 ErrorFailToCreateFile=Ekki tókst að búa til skrána <b>' %s '.</b>
@@ -115,7 +116,7 @@ ErrorNoActivatedBarcode=Nei barcode gerð virk
 ErrUnzipFails=Failed to unzip %s with ZipArchive
 ErrNoZipEngine=No engine to unzip %s file in this PHP
 ErrorFileMustBeADolibarrPackage=The file %s must be a Dolibarr zip package
-ErrorFileRequired=It takes a package Dolibarr file
+ErrorModuleFileRequired=You must select a Dolibarr module package file
 ErrorPhpCurlNotInstalled=The PHP CURL is not installed, this is essential to talk with 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
@@ -181,6 +182,8 @@ ErrorBankStatementNameMustFollowRegex=Error, bank statement name must follow the
 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>
 
 # 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.
diff --git a/htdocs/langs/is_IS/holiday.lang b/htdocs/langs/is_IS/holiday.lang
index 47d542c511f..123a5fec4d8 100644
--- a/htdocs/langs/is_IS/holiday.lang
+++ b/htdocs/langs/is_IS/holiday.lang
@@ -76,8 +76,8 @@ BoxTitleLastLeaveRequests=Latest %s modified leave requests
 HolidaysMonthlyUpdate=Monthly update
 ManualUpdate=Manual update
 HolidaysCancelation=Leave request cancelation
-EmployeeLastname=Employee lastname
-EmployeeFirstname=Employee firstname
+EmployeeLastname=Employee last name
+EmployeeFirstname=Employee first name
 TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
 
 ## Configuration du Module ##
diff --git a/htdocs/langs/is_IS/ldap.lang b/htdocs/langs/is_IS/ldap.lang
index baee4bf50cb..b4acc32776f 100644
--- a/htdocs/langs/is_IS/ldap.lang
+++ b/htdocs/langs/is_IS/ldap.lang
@@ -13,8 +13,8 @@ LDAPUsers=Notendur í LDAP gagnagrunninn
 LDAPFieldStatus=Status
 LDAPFieldFirstSubscriptionDate=First áskrift dagsetningu
 LDAPFieldFirstSubscriptionAmount=Fist áskrift upphæð
-LDAPFieldLastSubscriptionDate=Síðasta áskrift dagsetningu
-LDAPFieldLastSubscriptionAmount=Síðasta áskrift upphæð
+LDAPFieldLastSubscriptionDate=Latest subscription date
+LDAPFieldLastSubscriptionAmount=Latest subscription amount
 LDAPFieldSkype=Skype id
 LDAPFieldSkypeExample=Example : skypeName
 UserSynchronized=Notandi samstilla
diff --git a/htdocs/langs/is_IS/mails.lang b/htdocs/langs/is_IS/mails.lang
index 19b4c41f905..ef9e96c2fbe 100644
--- a/htdocs/langs/is_IS/mails.lang
+++ b/htdocs/langs/is_IS/mails.lang
@@ -74,14 +74,18 @@ ResultOfMailSending=Result of mass EMail sending
 NbSelected=Nb selected
 NbIgnored=Nb ignored
 NbSent=Nb sent
-ContactsWithThirdpartyFilter=Contact with customer filters
+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
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Lína %s  í skrá
 RecipientSelectionModules=Skilgreint beiðnir um val viðtakanda
 MailSelectedRecipients=Valdar viðtakendur
 MailingArea=EMailings area
-LastMailings=Last %s  emailings
+LastMailings=Latest %s emailings
 TargetsStatistics=Markmið tölfræði
 NbOfCompaniesContacts=Einstök tengiliðum fyrirtækja
 MailNoChangePossible=Viðtakendur fyrir staðfestar póst getur ekki breytt
@@ -146,3 +150,6 @@ AdvTgtCreateFilter=Create filter
 AdvTgtOrCreateNewFilter=Name of new filter
 NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
+OutGoingEmailSetup=Outgoing email setup
+InGoingEmailSetup=Incoming email setup
+
diff --git a/htdocs/langs/is_IS/main.lang b/htdocs/langs/is_IS/main.lang
index df94777be43..4e6e7e64e14 100644
--- a/htdocs/langs/is_IS/main.lang
+++ b/htdocs/langs/is_IS/main.lang
@@ -69,6 +69,7 @@ SetDate=Setja dagsetningu
 SelectDate=Select a date
 SeeAlso=See also %s
 SeeHere=See here
+Apply=Apply
 BackgroundColorByDefault=Default bakgrunnslit
 FileRenamed=The file was successfully renamed
 FileUploaded=Skráin tókst að hlaða inn
@@ -87,7 +88,7 @@ Undefined=Óskilgreint
 PasswordForgotten=Password forgotten?
 SeeAbove=Sjá ofar
 HomeArea=Home area
-LastConnexion=Síðasta tenging
+LastConnexion=Latest connection
 PreviousConnexion=Fyrri tengingu
 PreviousValue=Previous value
 ConnectedOnMultiCompany=Tengdur á einingu
@@ -237,7 +238,7 @@ DateCreation=Creation dagsetning
 DateCreationShort=Creat. date
 DateModification=Breytingadagsetningu
 DateModificationShort=Modif. dagsetning
-DateLastModification=Síðasta breyting dagsetningu
+DateLastModification=Latest modification date
 DateValidation=Löggilding dagur
 DateClosing=Lokadegi
 DateDue=Gjalddagi
@@ -433,7 +434,7 @@ Reportings=Skýrslur
 Draft=Víxill
 Drafts=Drög
 Validated=Staðfestar
-Opened=Opnaðu
+Opened=Opnaður
 New=New
 Discount=Afsláttur
 Unknown=Óþekkt
@@ -599,6 +600,8 @@ SessionName=Session nafn
 Method=Aðferð
 Receive=Fá
 CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
+ExpectedValue=Expected Value
+CurrentValue=Núverandi gildi
 PartialWoman=Partial
 TotalWoman=Samtals
 NeverReceived=Aldrei fengið
@@ -756,6 +759,7 @@ SomeTranslationAreUncomplete=Some languages may be partially translated or may c
 DirectDownloadLink=Direct download link
 Download=Download
 ActualizeCurrency=Update currency rate
+Fiscalyear=Fiscal year
 # Week day
 Monday=Mánudagur
 Tuesday=Þriðjudagur
@@ -812,3 +816,5 @@ SearchIntoContracts=Samningar
 SearchIntoCustomerShipments=Customer shipments
 SearchIntoExpenseReports=Expense reports
 SearchIntoLeaves=Leaves
+
+BulkActions=Bulk actions
diff --git a/htdocs/langs/is_IS/members.lang b/htdocs/langs/is_IS/members.lang
index 1611a0a90cc..35f56f7f9e9 100644
--- a/htdocs/langs/is_IS/members.lang
+++ b/htdocs/langs/is_IS/members.lang
@@ -136,8 +136,8 @@ DocForAllMembersCards=Búa til nafnspjöld fyrir alla meðlimi (Format fyrir fra
 DocForOneMemberCards=Búa til nafnspjöld fyrir tiltekinn aðili (Format fyrir framleiðsla raunverulega skipulag: <b>%s)</b>
 DocForLabels=Mynda lak heimilisfang (Format fyrir framleiðsla raunverulega skipulag: <b>%s)</b>
 SubscriptionPayment=Áskrift greiðslu
-LastSubscriptionDate=Síðast áskrift dagsetning
-LastSubscriptionAmount=Síðast áskrift upphæð
+LastSubscriptionDate=Latest subscription date
+LastSubscriptionAmount=Latest subscription amount
 MembersStatisticsByCountries=Notendur tölfræði eftir landi
 MembersStatisticsByState=Notendur tölfræði eftir fylki / hérað
 MembersStatisticsByTown=Notendur tölfræði eftir bænum
@@ -149,7 +149,7 @@ MembersByStateDesc=Þessi skjár sýnir þér tölfræði á meðlimum ríkis /
 MembersByTownDesc=Þessi skjár sýnir þér tölfræði á meðlimum með bænum.
 MembersStatisticsDesc=Veldu tölfræði sem þú vilt lesa ...
 MenuMembersStats=Tölfræði
-LastMemberDate=Síðasta meðlimur dagsetning
+LastMemberDate=Latest member date
 Nature=Náttúra
 Public=Upplýsingar eru almenningi
 NewMemberbyWeb=Nýr meðlimur bætt. Beðið eftir samþykki
diff --git a/htdocs/langs/is_IS/orders.lang b/htdocs/langs/is_IS/orders.lang
index 402a687cd17..50ce943e5e1 100644
--- a/htdocs/langs/is_IS/orders.lang
+++ b/htdocs/langs/is_IS/orders.lang
@@ -39,7 +39,7 @@ StatusOrderRefusedShort=Neitaði
 StatusOrderBilledShort=Billed
 StatusOrderToProcessShort=Til að ganga frá
 StatusOrderReceivedPartiallyShort=Að hluta til fékk
-StatusOrderReceivedAllShort=Allt hlaut
+StatusOrderReceivedAllShort=Products received
 StatusOrderCanceled=Hætt við
 StatusOrderDraft=Víxill (þarf að vera staðfest)
 StatusOrderValidated=Staðfestar
@@ -51,7 +51,7 @@ StatusOrderApproved=Samþykkt
 StatusOrderRefused=Neitaði
 StatusOrderBilled=Billed
 StatusOrderReceivedPartially=Að hluta til fékk
-StatusOrderReceivedAll=Allt hlaut
+StatusOrderReceivedAll=All products received
 ShippingExist=A sendingunni til
 QtyOrdered=Magn röð
 ProductQtyInDraft=Product quantity into draft orders
diff --git a/htdocs/langs/is_IS/other.lang b/htdocs/langs/is_IS/other.lang
index 01105cde045..e0affdb2cc9 100644
--- a/htdocs/langs/is_IS/other.lang
+++ b/htdocs/langs/is_IS/other.lang
@@ -68,14 +68,15 @@ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find her
 PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nYou will find here the shipping __SHIPPINGREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nYou will find here the intervention __FICHINTERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n__PERSONALIZED__\n\n__SIGNATURE__
-DemoDesc=Dolibarr is a compact ERP/CRM supporting several functional modules. A demo showcasing all modules makes no sense as this scenario never occurs. So, several demo profiles are available.
+DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
+ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
 DemoFundation=Manage meðlimum úr grunni
 DemoFundation2=Manage Aðilar og bankareikning sem grunn
-DemoCompanyServiceOnly=Manage sjálfstæður starfsemi selja þjónustu aðeins
+DemoCompanyServiceOnly=Company or freelance selling service only
 DemoCompanyShopWithCashDesk=Manage búð með reiðufé skrifborðið
-DemoCompanyProductAndStocks=Stjórna litlum eða miðlungs fyrirtæki selja vörur
-DemoCompanyAll=Stjórna litlum eða miðlungs fyrirtæki með marga starfsemi (helstu einingar)
+DemoCompanyProductAndStocks=Company selling products with a shop
+DemoCompanyAll=Company with multiple activities (all main modules)
 CreatedBy=Búið til af %s
 ModifiedBy=Breytt af %s
 ValidatedBy=Staðfestar af %s
diff --git a/htdocs/langs/is_IS/products.lang b/htdocs/langs/is_IS/products.lang
index 904b8f08c3d..9370400696b 100644
--- a/htdocs/langs/is_IS/products.lang
+++ b/htdocs/langs/is_IS/products.lang
@@ -60,7 +60,7 @@ SellingPrice=Söluverð
 SellingPriceHT=Selja verð (að frádregnum skatti)
 SellingPriceTTC=Söluverð (Inc skatt)
 CostPriceDescription=This price (net of tax) can be used to store the average amount this product cost to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
-CostPriceUsage=In a future version, this value could be used for margin calculation.
+CostPriceUsage=This value could be used for margin calculation.
 SoldAmount=Sold amount
 PurchasedAmount=Purchased amount
 NewPrice=Ný verð
@@ -142,6 +142,7 @@ ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b>?
 CloneContentProduct=Klóna allar helstu upplýsingar um vöru / þjónustu
 ClonePricesProduct=Klóna helstu upplýsingar og verð
 CloneCompositionProduct=Clone packaged product/service
+CloneCombinationsProduct=Clone product variants
 ProductIsUsed=Þessi vara er notuð
 NewRefForClone=Tilv. nýrra vara / þjónusta
 SellingPrices=Selling prices
@@ -238,7 +239,7 @@ GlobalVariables=Global variables
 VariableToUpdate=Variable to update
 GlobalVariableUpdaters=Global variable updaters
 UpdateInterval=Update interval (minutes)
-LastUpdated=Last updated
+LastUpdated=Latest update
 CorrectlyUpdated=Correctly updated
 PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
 PropalMergePdfProductChooseFile=Select PDF files
@@ -258,4 +259,41 @@ VolumeUnits=Volume unit
 SizeUnits=Size unit
 DeleteProductBuyPrice=Delete buying price
 ConfirmDeleteProductBuyPrice=Are you sure you want to delete this buying price?
+SubProduct=Sub product
 
+#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
+ProductCombinations=Variants
+HideProductCombinations=Hide products variant in the products selector
+ProductCombination=Variant
+NewProductCombination=New variant
+EditProductCombination=Editing variant
+ProductCombinationGenerator=Variants generator
+Features=Features
+PriceImpact=Price impact
+WeightImpact=Weight impact
+NewProductAttribute=Nýtt eiginleiki
+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
+PercentageVariation=Percentage variation
+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 child products
+ConfirmCloneProductCombinations=Would you like to copy all the product variant to the 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
diff --git a/htdocs/langs/is_IS/projects.lang b/htdocs/langs/is_IS/projects.lang
index c1fbe872c97..40b006ff906 100644
--- a/htdocs/langs/is_IS/projects.lang
+++ b/htdocs/langs/is_IS/projects.lang
@@ -29,9 +29,9 @@ DeleteAProject=Eyða verkefni
 DeleteATask=Eyða verkefni
 ConfirmDeleteAProject=Are you sure you want to delete this project?
 ConfirmDeleteATask=Are you sure you want to delete this task?
-OpenedProjects=Open projects
-OpenedTasks=Open tasks
-OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
+OpenedProjects=Opened projects
+OpenedTasks=Opened tasks
+OpportunitiesStatusForOpenedProjects=Opportunities amount of opened projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=Sýna verkefni
 SetProject=Setja verkefni
@@ -47,7 +47,7 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=Notandi
 TaskTimeNote=Ath
 TaskTimeDate=Date
-TasksOnOpenedProject=Tasks on open projects
+TasksOnOpenedProject=Tasks on opened projects
 WorkloadNotDefined=Workload not defined
 NewTimeSpent=Nýr tími
 MyTimeSpent=Minn tími var
@@ -96,6 +96,7 @@ ValidateProject=Staðfesta projet
 ConfirmValidateProject=Are you sure you want to validate this project?
 CloseAProject=Loka verkefni
 ConfirmCloseAProject=Are you sure you want to close this project?
+AlsoCloseAProject=Also close project (keep it open if you still need to follow production tasks on it)
 ReOpenAProject=Opna verkefni
 ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=Project tengiliðir
@@ -121,7 +122,7 @@ CloneProjectFiles=Clone project joined files
 CloneTaskFiles=Clone task(s) joined files (if task(s) cloned)
 CloneMoveDate=Update project/tasks dates from now?
 ConfirmCloneProject=Are you sure to clone this project?
-ProjectReportDate=Change task date according project start date
+ProjectReportDate=Change task dates according to new project start date
 ErrorShiftTaskDate=Impossible to shift task date according to new project start date
 ProjectsAndTasksLines=Projects and tasks
 ProjectCreatedInDolibarr=Project %s created
@@ -178,9 +179,9 @@ ProjectsStatistics=Statistics on projects/leads
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 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.
-OpenedProjectsByThirdparties=Open projects by thirdparties
+OpenedProjectsByThirdparties=Opened projects by thirdparties
 OnlyOpportunitiesShort=Only opportunities
-OpenedOpportunitiesShort=Open opportunities
+OpenedOpportunitiesShort=Opened opportunities
 NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount
diff --git a/htdocs/langs/is_IS/propal.lang b/htdocs/langs/is_IS/propal.lang
index ad8ccd55b4f..5eaaa23a7c7 100644
--- a/htdocs/langs/is_IS/propal.lang
+++ b/htdocs/langs/is_IS/propal.lang
@@ -3,7 +3,7 @@ Proposals=Auglýsing tillögur
 Proposal=Auglýsing tillögu
 ProposalShort=Tillaga
 ProposalsDraft=Drög að auglýsing tillögur
-ProposalsOpened=Open commercial proposals
+ProposalsOpened=Opnaður auglýsing tillögur
 Prop=Auglýsing tillögur
 CommercialProposal=Auglýsing tillögu
 ProposalCard=Tillaga kort
@@ -26,9 +26,9 @@ AmountOfProposalsByMonthHT=Upphæð eftir mánuði (að frádregnum skatti)
 NbOfProposals=Fjöldi viðskipta tillögur
 ShowPropal=Sýna tillögu
 PropalsDraft=Drög
-PropalsOpened=Opnaðu
+PropalsOpened=Opnaður
 PropalStatusDraft=Víxill (þarf að vera staðfest)
-PropalStatusValidated=Staðfestar (Tillagan er opið)
+PropalStatusValidated=Validated (proposal is opened)
 PropalStatusSigned=Undirritað (þarf greiðanda)
 PropalStatusNotSigned=Ekki skráð (lokað)
 PropalStatusBilled=Billed
diff --git a/htdocs/langs/is_IS/stocks.lang b/htdocs/langs/is_IS/stocks.lang
index 1790bf9a411..c0f4d3b6f99 100644
--- a/htdocs/langs/is_IS/stocks.lang
+++ b/htdocs/langs/is_IS/stocks.lang
@@ -22,13 +22,15 @@ Movements=Hreyfing
 ErrorWarehouseRefRequired=Lager tilvísun nafn er krafist
 ListOfWarehouses=Listi yfir vöruhús
 ListOfStockMovements=Listi yfir hreyfingar lager
+StockMovementForId=Movement ID %d
+ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Warehouses area
 Location=Staðsetning
 LocationSummary=Stutt nafn staðsetning
 NumberOfDifferentProducts=Number of different products
 NumberOfProducts=Heildarfjöldi vörur
-LastMovement=Síðasta hreyfing
-LastMovements=Síðasta hreyfing
+LastMovement=Latest movement
+LastMovements=Latest movements
 Units=Einingar
 Unit=Unit
 StockCorrection=Rétt lager
diff --git a/htdocs/langs/is_IS/supplier_proposal.lang b/htdocs/langs/is_IS/supplier_proposal.lang
index 77256bbe882..226ea38d44e 100644
--- a/htdocs/langs/is_IS/supplier_proposal.lang
+++ b/htdocs/langs/is_IS/supplier_proposal.lang
@@ -8,7 +8,7 @@ SearchRequest=Find a request
 DraftRequests=Draft requests
 SupplierProposalsDraft=Draft supplier proposals
 LastModifiedRequests=Latest %s modified price requests
-RequestsOpened=Open price requests
+RequestsOpened=Opened price requests
 SupplierProposalArea=Supplier proposals area
 SupplierProposalShort=Supplier proposal
 SupplierProposals=Supplier proposals
@@ -23,7 +23,7 @@ ConfirmValidateAsk=Are you sure you want to validate this price request under na
 DeleteAsk=Delete request
 ValidateAsk=Validate request
 SupplierProposalStatusDraft=Víxill (þarf að vera staðfest)
-SupplierProposalStatusValidated=Validated (request is open)
+SupplierProposalStatusValidated=Validated (request is opened)
 SupplierProposalStatusClosed=Loka
 SupplierProposalStatusSigned=Accepted
 SupplierProposalStatusNotSigned=Neitaði
diff --git a/htdocs/langs/is_IS/suppliers.lang b/htdocs/langs/is_IS/suppliers.lang
index 4db1a22cb7f..2f07434a8b9 100644
--- a/htdocs/langs/is_IS/suppliers.lang
+++ b/htdocs/langs/is_IS/suppliers.lang
@@ -24,10 +24,10 @@ ExportDataset_fournisseur_1=Birgir reikningum lista og línur reiknings er
 ExportDataset_fournisseur_2=Birgir reikninga og greiðslur
 ExportDataset_fournisseur_3=Supplier orders and order lines
 ApproveThisOrder=Samþykkja þessari röð
-ConfirmApproveThisOrder=Ertu viss um að þú viljir samþykkja þessari röð?
+ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b>?
 DenyingThisOrder=Deny this order
-ConfirmDenyingThisOrder=Ertu viss um að þú viljir afneita þessari röð?
-ConfirmCancelThisOrder=Ertu viss um að þú viljir hætta í þessari röð?
+ConfirmDenyingThisOrder=Are you sure you want to deny this order <b>%s</b>?
+ConfirmCancelThisOrder=Are you sure you want to cancel this order <b>%s</b>?
 AddSupplierOrder=Búa til birgja þess
 AddSupplierInvoice=Búa til birgja Reikningar
 ListOfSupplierProductForSupplier=Listi yfir vörur og verð <b>fyrir%</b> söluaðila <b>s</b>
@@ -41,3 +41,4 @@ DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Wrong quality
 ReputationForThisProduct=Reputation
 BuyerName=Buyer name
+AllProductServicePrices=All product / service prices
diff --git a/htdocs/langs/is_IS/users.lang b/htdocs/langs/is_IS/users.lang
index 0124498088b..f6f65e57cd9 100644
--- a/htdocs/langs/is_IS/users.lang
+++ b/htdocs/langs/is_IS/users.lang
@@ -36,7 +36,7 @@ AdministratorDesc=Stjórnandi
 DefaultRights=Default heimildir
 DefaultRightsDesc=Veldu hér <u>sjálfgefið</u> leyfi sem eru sjálfkrafa veitt <u>ný búin</u> notandi (Fara á kortið notandi til breytinga á leyfi núverandi notenda).
 DolibarrUsers=Dolibarr notendur
-LastName=Last Name
+LastName=Lastname
 FirstName=Fornafn
 ListOfGroups=Listi yfir alla hópa
 NewGroup=Nýr hópur
diff --git a/htdocs/langs/is_IS/withdrawals.lang b/htdocs/langs/is_IS/withdrawals.lang
index 1108f571e6c..4ea40f154c5 100644
--- a/htdocs/langs/is_IS/withdrawals.lang
+++ b/htdocs/langs/is_IS/withdrawals.lang
@@ -24,6 +24,7 @@ WithdrawStatistics=Direct debit payment statistics
 WithdrawRejectStatistics=Direct debit payment reject statistics
 LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
+WithdrawRequestsDone=%s direct debit payment requests recorded
 ThirdPartyBankCode=Í þriðja aðila bankakóði
 NoInvoiceCouldBeWithdrawed=Engin reikningur withdrawed með góðum árangri. Athugaðu að Reikningar eru fyrirtæki með gilt bann.
 ClassCredited=Flokka fært
@@ -76,8 +77,8 @@ RUM=UMR
 RUMLong=Unique Mandate Reference
 RUMWillBeGenerated=UMR number will be generated once bank account information are saved
 WithdrawMode=Direct debit mode (FRST or RECUR)
-WithdrawRequestAmount=Withdraw request amount:
-WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil amount.
+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
diff --git a/htdocs/langs/it_IT/accountancy.lang b/htdocs/langs/it_IT/accountancy.lang
index 7fdbeaed8e7..e144c03ffff 100644
--- a/htdocs/langs/it_IT/accountancy.lang
+++ b/htdocs/langs/it_IT/accountancy.lang
@@ -194,6 +194,8 @@ ChangeBinding=Change the binding
 
 ## Admin
 ApplyMassCategories=Apply mass categories
+AddAccountFromBookKeepingWithNoCategories=Add acccount already used with no categories
+CategoryDeleted=Category for the accounting account has been removed
 
 ## Export
 Exports=Esportazioni
@@ -209,6 +211,7 @@ Modelcsv_ciel=Esportazione per Sage Ciel Compta o Compta Evolution
 Modelcsv_quadratus=Esportazione per Quadratus QuadraCompta
 Modelcsv_ebp=Esportazione per EBP
 Modelcsv_cogilog=Export towards Cogilog
+ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
 InitAccountancy=Inizializza contabilità
diff --git a/htdocs/langs/it_IT/admin.lang b/htdocs/langs/it_IT/admin.lang
index 1f361a7c8ad..cddf806bb6f 100644
--- a/htdocs/langs/it_IT/admin.lang
+++ b/htdocs/langs/it_IT/admin.lang
@@ -9,14 +9,20 @@ VersionDevelopment=Sviluppo
 VersionUnknown=Sconosciuta
 VersionRecommanded=Raccomandata
 FileCheck=Files integrity checker
-FileCheckDesc=This tool allows you to check the integrity of files of your application, comparing each files with the official ones. You can use this tool to detect if some files were modified by a hacker for example.
+FileCheckDesc=This tool allows you to check the integrity of files and setup of your application, comparing each files with the official ones. 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.
+FileIntegrityIsStrictlyConformedWithReference=Files integrity is strictly conformed with the reference.
+FileIntegrityIsOkButFilesWereAdded=Files integrity check has passed, however some new files were added.
+FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified, removed or added.
+GlobalChecksum=Global checksum
 MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
 LocalSignature=Embedded local signature (less reliable)
 RemoteSignature=Remote distant signature (more reliable)
 FilesMissing=File mancanti
 FilesUpdated=File aggiornati
+FilesModified=Modified Files
+FilesAdded=Added Files
 FileCheckDolibarr=Check integrity of application files
-AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from a certified package
+AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from an official package
 XmlNotFound=Xml Integrity File of application not found
 SessionId=ID di sessione
 SessionSaveHandler=Handler per il salvataggio dell sessioni
@@ -185,7 +191,9 @@ BoxesDesc=I Widgets sono componenti che personalizzano le pagine aggiungendo del
 OnlyActiveElementsAreShown=Vengono mostrati solo gli elementi relativi ai <a href="%s">moduli attivi</a> .
 ModulesDesc=I moduli di Dolibarr definiscono quale funzionalità è abilitata. Alcuni moduli richiedono permessi da abilitare agli utenti, dopo la loro abilitazione. Clicca su on/off per l'abilitazione del modulo.
 ModulesMarketPlaceDesc=Potete trovare altri moduli da scaricare su siti web esterni...
-ModulesMarketPlaces=Più moduli ...
+ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
+ModulesMarketPlaces=Find external modules...
+GoModuleSetupArea=To deploy/install a new module, go onto the Module setup area at <a href="%s">%s</a>.
 DoliStoreDesc=DoliStore, il mercato ufficiale dei moduli esterni per Dolibarr ERP/CRM
 DoliPartnersDesc=List of companies providing custom developed modules or features (Note: anyone experienced in PHP programming can provide custom development for an open source project)
 WebSiteDesc=Siti Web in cui è possibile cercare altri moduli ...
@@ -276,21 +284,22 @@ ModuleFamilyInterface=Interfacce con sistemi esterni
 MenuHandlers=Gestori menu
 MenuAdmin=Editor menu
 DoNotUseInProduction=Da non usare in produzione
-ThisIsProcessToFollow=Il procedimento da seguire è:
-ThisIsAlternativeProcessToFollow=This is an alternative setup to process:
+ThisIsProcessToFollow=This is steps to process:
+ThisIsAlternativeProcessToFollow=This is an alternative setup to process manually:
 StepNb=Passo %s
 FindPackageFromWebSite=Trova un pacchetto che fornisca la funzionalità desiderata (per esempio su %s).
 DownloadPackageFromWebSite=Scarica il pacchetto (per esempio dal sito ufficiale %s).
-UnpackPackageInDolibarrRoot=Scompatta il pacchetto sul server nella directory dedicata ai moduli esterni: <b>%s</b>
-SetupIsReadyForUse=Installazione completata. Dolibarr è pronto ad utilizzare questo nuovo componente.
-NotExistsDirect=La directory root alternativa non è stata definita.<br>
-InfDirAlt=A partire dalla versione 3 è possibile definire una directory root alternativa. Ciò permette di archiviare plugin e template personalizzati nello stesso posto.<br>Basta creare una directory nella root di Dolibarr ( per esempio custom).<br>
-InfDirExample=<br>Poi dichiaralo nel file conf.php<br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>*Queste righe sono commentate con il "#", per levare il commento basta rimuovere il cancelletto.
+UnpackPackageInDolibarrRoot=Unpack the packaged files into server directory dedicated to Dolibarr: <b>%s</b>
+UnpackPackageInModulesRoot=To deploy/install an external module, unpack the packaged files into the server directory dedicated to modules: <b>%s</b>
+SetupIsReadyForUse=Module deployment is finished. You must however enable and setup the module in your application by going on the page to setup modules: <a href="%s">%s</a>.
+NotExistsDirect=The alternative root directory is not defined to an existing directory.<br>
+InfDirAlt=Since version 3, it is possible to define an alternative root directory. This allows you to store, into a dedicated directory, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
+InfDirExample=<br>Then declare it in the file <strong>conf.php</strong><br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>If these lines are commented with "#", to enable them, just uncomment by removing the "#" character.
 YouCanSubmitFile=For this step, you can send package using this tool: Select module file
 CurrentVersion=Versione attuale di Dolibarr
 CallUpdatePage=Vai alla pagina che aggiorna la struttura del database e dati su %s.
 LastStableVersion=Ultima versione stabile
-LastActivationDate=Last activation date
+LastActivationDate=Latest activation date
 UpdateServerOffline=Update server offline
 GenericMaskCodes=Puoi inserire uno schema di numerazione. In questo schema, possono essere utilizzati i seguenti tag : <br><b> {000000} </b> Corrisponde a un numero che sarà incrementato ad ogni aggiunta di %s. Inserisci il numero di zeri equivalente alla lunghezza desiderata per il contatore. Verranno aggiunti zeri a sinistra fino alla lunghezza impostata per il contatore. <br><b> {000000+000} </b> Come il precedente, ma con un offset corrispondente al numero a destra del segno + che viene applicato al primo inserimento %s. <br> <b> {000000@x} </b> Come sopra, ma il contatore viene reimpostato a zero quando si raggiunge il mese x (x compreso tra 1 e 12). Se viene utilizzata questa opzione e x è maggiore o uguale a 2, diventa obbligatorio inserire anche la sequenza {yy}{mm} o {yyyy}{mm}. <br> <b> {dd} </b> giorno (da 01 a 31). <br> <b> {mm} </b> mese (da 01 a 12). <br> <b> {yy} </b>, <b> {yyyy} </b> o <b> {y}  </b> anno con 2, 4 o 1 cifra.<br>
 GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
@@ -373,11 +382,11 @@ ExtrafieldCheckBox=Checkbox
 ExtrafieldRadio=Bottone Radio
 ExtrafieldCheckBoxFromList= Checkbox from table
 ExtrafieldLink=Link to an object
-ExtrafieldParamHelpselect=I parametri della lista deveono avere una sintassi tipo chiave,valore<br><br> ad esempio: <br>1,valore1<br>2,valore2<br>3,valore3<br>...<br><br> In modo da avere una lista madre che dipenda da un altra:<br>1,value1|parent_list_code:parent_key<br>2,value2|parent_list_code:parent_key
+ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list :<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list :<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=La lista dei parametri deve contenere chiave univoca e valore.<br><br>Per esempio:<br>1, valore1<br>2, valore2<br>3, valore3<br>...
 ExtrafieldParamHelpradio=La lista dei parametri deve rispettare il formato chiave,valore<br /><br /> per esempio: <br />1,valore1<br />2,valore2<br />3,valore3<br />...
-ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
-ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
+ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Example : Societe:societe/class/societe.class.php
 LibraryToBuildPDF=Libreria utilizzata per generare PDF
 WarningUsingFPDF=Avviso: Il tuo <b>conf.php</b> contiene la direttiva <b>dolibarr_pdf_force_fpdf = 1.</b> Questo significa che si utilizza la libreria FPDF per generare file PDF. Questa libreria è obsoleta e non supporta un molte funzioni (Unicode, trasparenza dell'immagine, lingue cirillico, arabo e asiatico, ...), quindi potrebbero verificarsi errori durante la generazione di file PDF. <br> Per risolvere questo problema ed avere un supporto completo di generazione di file PDF, scarica <a href="http://www.tcpdf.org/" target="_blank">biblioteca TCPDF</a> , quindi commentare o rimuovere la riga <b>$ dolibarr_pdf_force_fpdf = 1,</b> e aggiungere invece <b>$ dolibarr_lib_TCPDF_PATH = 'path_to_TCPDF_dir'</b>
@@ -411,10 +420,11 @@ ModuleCompanyCodePanicum=Restituisce un codice contabile vuoto.
 ModuleCompanyCodeDigitaria=Codice contabile dipendente dal codice di terze parti. Il codice è composto dal carattere "C" nella prima posizione seguito da i primi 5 caratteri del codice cliente/fornitore.
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
-
+WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<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).
+ClickToShowDescription=Click to show description
 # Modules
 Module0Name=Utenti e gruppi
-Module0Desc=Gestione utenti e gruppi
+Module0Desc=Users / Employees and Groups management
 Module1Name=Terzi
 Module1Desc=Gestione aziende e contatti
 Module2Name=Commerciale
@@ -515,8 +525,8 @@ Module2200Name=Prezzi dinamici
 Module2200Desc=Abilita l'utilizzo di espressioni matematiche per i prezzi
 Module2300Name=Cron
 Module2300Desc=Gestione delle operazioni pianificate
-Module2400Name=Agenda/Eventi
-Module2400Desc=Follow events or rendez-vous. Record manual events into Agendas or let application logs automatic events for tracking purposes.
+Module2400Name=Events/Agenda
+Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous.
 Module2500Name=Gestione dei contenuti digitali
 Module2500Desc=Salvare e condividere documenti
 Module2600Name=API/Web services (SOAP server)
@@ -582,7 +592,7 @@ Permission34=Eliminare prodotti
 Permission36=Vedere/gestire prodotti nascosti
 Permission38=Esportare prodotti
 Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
-Permission42=Creare/modificare progetti
+Permission42=Create/modify projects (shared project and projects i'm contact for). Can also create tasks and assign users to project and tasks
 Permission44=Eliminare progetti
 Permission45=Esporta progetti
 Permission61=Vedere gli interventi
@@ -685,7 +695,7 @@ PermissionAdvanced253=Creare/modificare utenti interni/esterni e permessi
 Permission254=Eliminare o disattivare altri utenti
 Permission255=Cambiare le password di altri utenti
 Permission256=Eliminare o disabilitare altri utenti
-Permission262=Estendere accesso a tutte le terze parti (non solo quelle legate all'utente). Non funziona per gli utenti esterni.
+Permission262=Extend access to all third parties (not only third parties that user is a sale representative).<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 assignement matters).
 Permission271=Vedere CA
 Permission272=Vedere fatture
 Permission273=Emettere fatture
@@ -887,7 +897,7 @@ Offset=Scostamento
 AlwaysActive=Sempre attivo
 Upgrade=Aggiornamento
 MenuUpgrade=Migliora/Estendi
-AddExtensionThemeModuleOrOther=Aggiungi estensione (tema, modulo, ...)
+AddExtensionThemeModuleOrOther=Deploy/install external module
 WebServer=Server Web
 DocumentRootServer=Cartella principale del Server Web
 DataRootServer=Cartella dei file di dati
@@ -994,7 +1004,7 @@ TriggerAlwaysActive=I trigger in questo file sono sempre attivi, indipendentemen
 TriggerActiveAsModuleActive=I trigger in questo file sono attivi se il modulo <b>%s</b> è attivo.
 GeneratedPasswordDesc=Regola per la generazione di nuove password generate automaticamente
 DictionaryDesc=Insert all reference data. You can add your values to the default.
-ConstDesc=Questa pagina ti permette di modificare tutti i parametri non disponibili nelle pagine precedenti. Si tratta di parametri riservati per lo sviluppo o il troubleshooting.
+ConstDesc=This page allows you to edit all other parameters not available in previous pages. These are mostly reserved parameters for developers or advanced troubleshooting. For a list of options <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">check here</a>.
 MiscellaneousDesc=Definire qui tutti gli altri parametri relativi alla sicurezza.
 LimitsSetup=Limiti/impostazioni di precisione
 LimitsDesc=Da qui è possibile definire i limiti e la precisione utilizzati da Dolibarr.
@@ -1116,9 +1126,9 @@ DocumentModelOdt=Generare documenti da modelli OpenDocuments (file .ODT o .ODS p
 WatermarkOnDraft=Filigrana sulle bozze
 JSOnPaimentBill=Activate feature to autofill payment lines on payment form
 CompanyIdProfChecker=Unicità dell'identità
-MustBeUnique=Must be unique?
-MustBeMandatory=Mandatory to create third parties?
-MustBeInvoiceMandatory=Mandatory to validate invoices?
+MustBeUnique=Deve essere unico?
+MustBeMandatory=Obbligatorio per creare il soggetto terzo?
+MustBeInvoiceMandatory=Obbligatorio per convalidare le fatture?
 ##### Webcal setup #####
 WebCalUrlForVCalExport=Un link per esportare <b>%s</b> è disponibile al seguente link: %s
 ##### Invoices #####
@@ -1161,10 +1171,6 @@ FreeLegalTextOnOrders=Testo libero sugli ordini
 WatermarkOnDraftOrders=Bozze degli ordini filigranate (nessuna filigrana se vuoto)
 ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable
 BANK_ASK_PAYMENT_BANK_DURING_ORDER=Ask for bank account destination of order
-##### Clicktodial #####
-ClickToDialSetup=Impostazioni modulo ClickToDial (telefonate con un clic)
-ClickToDialUrlDesc=Indirizzo da raggiungere quando si clicca sull'icona del telefono. L'indirizzo può contenere i codici <br/><b>__PHONETO__</b> che verrà sostituito con il numero telefonico a cui collegarsi, <br/><b>__PHONEFROM__</b> che verrà sostituito con il numero chiamante (il vostro), <br/><b>__LOGIN__</b> che verrà sostituito con il nome utente usato per il servizio e <br/><b>__PASS__</b> che verrà sostituito con la password del servizio ClickToDial.
-##### Bookmark4u #####
 ##### Interventions #####
 InterventionsSetup=Impostazioni modulo interventi
 FreeLegalTextOnInterventions=Testo libero sui documenti d'intervento
@@ -1391,7 +1397,7 @@ SendingsSetup=Impostazione del modulo di consegna
 SendingsReceiptModel=Modello di ricevuta consegna (D.D.T.)
 SendingsNumberingModules=Moduli per la numerazione delle spedizioni
 SendingsAbility=Support shipping sheets for customer deliveries
-NoNeedForDeliveryReceipts=Nella maggior parte dei casi, i moduli possono essere utilizzati sia come documenti di trasporto (elenco dei prodotti per l'invio) che come ricevute. Le ricevute di consegna risultano quindi una funzione duplicata che raramente viene attivata.
+NoNeedForDeliveryReceipts=In most cases, shipping sheets are used both as sheets for customer deliveries (list of products to send) and sheets that is received and signed by customer. So product deliveries receipts is a duplicated feature and is rarely activated.
 FreeLegalTextOnShippings=Testo libero per le spedizioni
 ##### Deliveries #####
 DeliveryOrderNumberingModules=Numerazione dei moduli di consegna prodotti
@@ -1471,7 +1477,11 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Set automatically this default value for type of e
 AGENDA_DEFAULT_FILTER_TYPE=Set automatically this type of event into search filter of agenda view
 AGENDA_DEFAULT_FILTER_STATUS=Set automatically this status for events into search filter of agenda view
 AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
-##### ClickToDial #####
+AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
+AGENDA_NOTIFICATION_SOUND=Enable sound notification
+##### Clicktodial #####
+ClickToDialSetup=Impostazioni modulo ClickToDial (telefonate con un clic)
+ClickToDialUrlDesc=Indirizzo da raggiungere quando si clicca sull'icona del telefono. L'indirizzo può contenere i codici <br/><b>__PHONETO__</b> che verrà sostituito con il numero telefonico a cui collegarsi, <br/><b>__PHONEFROM__</b> che verrà sostituito con il numero chiamante (il vostro), <br/><b>__LOGIN__</b> che verrà sostituito con il nome utente usato per il servizio e <br/><b>__PASS__</b> che verrà sostituito con la password del servizio ClickToDial.
 ClickToDialDesc=This module allows to make phone numbers clickable. A click on this icon will call make your phone to 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.
 ClickToDialUseTelLink=Peri numeri di telefono basta usare un link di tipo "tel:"
 ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on same computer than the browser, and called when you click on a link in your browser that start 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.
@@ -1499,10 +1509,11 @@ EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint availa
 ##### API ####
 ApiSetup=API module setup
 ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
-ApiProductionMode=Enable production mode (this will activate use of a caches for services management)
+ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
 ApiExporerIs=You can explore the APIs at url
 OnlyActiveElementsAreExposed=Vengono esposti solo elementi correlati ai moduli abilitati
 ApiKey=Key for API
+WarningAPIExplorerDisabled=The API explorer has been disabled. API explorer is not required to provide API services. It is a tool for developer to find/test REST APIs. If you need this tool, go into setup of module API REST to activate it.
 ##### Bank #####
 BankSetupModule=Impostazioni modulo banca/cassa
 FreeLegalTextOnChequeReceipts=Testo libero sulle ricevute assegni
@@ -1571,7 +1582,7 @@ 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:
 SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is only manual steps a privileged user can do.
 InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
-ConfFileMuseContainCustom=Installing an external module from application save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to have option<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
+ConfFileMuseContainCustom=Installing an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
 HighlightLinesColor=Highlight color of the line when the mouse passes over (keep empty for no highlight)
 TextTitleColor=Colore del titolo di pagina
@@ -1601,6 +1612,7 @@ FixTZ=Correzione del fuso orario
 FillFixTZOnlyIfRequired=Example: +2 (fill only if problem experienced)
 ExpectedChecksum=Expected Checksum
 CurrentChecksum=Current Checksum
+ForcedConstants=Required constant values
 MailToSendProposal=Inviare proposta cliente
 MailToSendOrder=Inviare ordine cliente
 MailToSendInvoice=Inviare fattura cliente
@@ -1609,13 +1621,14 @@ MailToSendIntervention=Inviare intervento
 MailToSendSupplierRequestForQuotation=Inviare richiesta di preventivo a fornitore
 MailToSendSupplierOrder=Inviare ordine fornitore
 MailToSendSupplierInvoice=Inviare fattura fornitore
+MailToSendContract=To send a contract
 MailToThirdparty=To send email from third party page
 ByDefaultInList=Show by default on list view
-YouUseLastStableVersion=Stai usando l'utima versione stabile
+YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
 TitleExampleForMaintenanceRelease=Example of message you can use to announce this maintenance release (feel free to use it on your web sites)
-ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. You can download it from the download area of http://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.
-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, nor data structure change is present into this version. You can download it from the download area of http://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.
+ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. 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.
+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, nor data structure change is present into 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, you can enter here rule to have price for each level autocalculated according to price of first level, so you will have to enter only price for first level on each product. This page is here to save you time and can be usefull only if your prices for each leve are relative to first level. You can ignore this page in most cases.
 ModelModulesProduct=Modelli per documenti prodotto
 ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
diff --git a/htdocs/langs/it_IT/bills.lang b/htdocs/langs/it_IT/bills.lang
index 2e8e4e4c35f..092c6ced017 100644
--- a/htdocs/langs/it_IT/bills.lang
+++ b/htdocs/langs/it_IT/bills.lang
@@ -3,11 +3,11 @@ Bill=Fattura
 Bills=Fatture
 BillsCustomers=Fatture attive
 BillsCustomer=Fattura attive
-BillsSuppliers=Fatture passive
+BillsSuppliers=Fatture fornitori
 BillsCustomersUnpaid=Fatture attive non pagate
-BillsCustomersUnpaidForCompany=Fatture attive non pagate per %s
+BillsCustomersUnpaidForCompany=Unpaid customer invoices for %s
 BillsSuppliersUnpaid=Fatture passive non pagate
-BillsSuppliersUnpaidForCompany=Fatture passive non pagate per %s
+BillsSuppliersUnpaidForCompany=Unpaid supplier invoices for %s
 BillsLate=Ritardi nei pagamenti
 BillsStatistics=Statistiche fatture attive
 BillsStatisticsSuppliers=Statistiche fatture passive
@@ -63,7 +63,7 @@ paymentInInvoiceCurrency=in invoices currency
 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.
+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.
 SupplierPayments=Pagamenti fornitori
 ReceivedPayments=Pagamenti ricevuti
 ReceivedCustomersPayments=Pagamenti ricevuti dai clienti
@@ -78,6 +78,7 @@ PaymentMode=Tipo di pagamento
 PaymentTypeDC=Debit/Credit Card
 PaymentTypePP=PayPal
 IdPaymentMode=Tipo di pagamento (id)
+CodePaymentMode=Payment type (code)
 LabelPaymentMode=Tipo di pagamento (etichetta)
 PaymentModeShort=Tipo di pagamento
 PaymentTerm=Termine di pagamento
@@ -102,33 +103,36 @@ SearchACustomerInvoice=Cerca una fattura attiva
 SearchASupplierInvoice=Cerca una fattura passiva
 CancelBill=Annulla una fattura
 SendRemindByMail=Promemoria tramite email
-DoPayment=Registra pagamento
-DoPaymentBack=Emetti rimborso
+DoPayment=Enter payment
+DoPaymentBack=Enter refund
 ConvertToReduc=Converti in futuro sconto
+ConvertExcessReceivedToReduc=Convert excess received into future discount
 EnterPaymentReceivedFromCustomer=Inserisci il pagamento ricevuto dal cliente
 EnterPaymentDueToCustomer=Emettere il pagamento dovuto al cliente
 DisabledBecauseRemainderToPayIsZero=Disabilitato perché il restante da pagare vale zero
 PriceBase=Prezzo base
 BillStatus=Stato fattura
-StatusOfGeneratedInvoices=Status of generated invoices
+StatusOfGeneratedInvoices=Stato delle fatture generate
 BillStatusDraft=Bozza (deve essere convalidata)
 BillStatusPaid=Pagata
-BillStatusPaidBackOrConverted=Rimborsata o convertita in sconto
+BillStatusPaidBackOrConverted=Refund or converted into discount
 BillStatusConverted=Conv. in sconto
 BillStatusCanceled=Annullata
 BillStatusValidated=Convalidata (deve essere pagata)
 BillStatusStarted=Iniziata
 BillStatusNotPaid=Non pagata
+BillStatusNotRefunded=Not refunded
 BillStatusClosedUnpaid=Chiusa (non pagata)
 BillStatusClosedPaidPartially=Pagata (in parte)
 BillShortStatusDraft=Bozza
 BillShortStatusPaid=Pagata
-BillShortStatusPaidBackOrConverted=Processata
+BillShortStatusPaidBackOrConverted=Refund or converted
 BillShortStatusConverted=Conv. in sconto
 BillShortStatusCanceled=Abbandonata
 BillShortStatusValidated=Convalidata
 BillShortStatusStarted=Iniziata
 BillShortStatusNotPaid=Non pagata
+BillShortStatusNotRefunded=Not refunded
 BillShortStatusClosedUnpaid=Chiusa
 BillShortStatusClosedPaidPartially=Pagata (in parte)
 PaymentStatusToValidShort=Da convalidare
@@ -149,23 +153,23 @@ NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified
 FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
 NotARecurringInvoiceTemplate=Not a recurring template invoice
 NewBill=Nuova fattura
-LastBills=Ultime %s fatture
-LastCustomersBills=Ultime %s fatture attive
-LastSuppliersBills=Ultime %s fatture passive
+LastBills=Latest %s invoices
+LastCustomersBills=Latest %s customer invoices
+LastSuppliersBills=Latest %s supplier invoices
 AllBills=Tutte le fatture
 OtherBills=Altre fatture
 DraftBills=Fatture in bozza
-CustomersDraftInvoices=Bozze di fatture attive
-SuppliersDraftInvoices=Bozze di fatture passive
+CustomersDraftInvoices=Customer draft invoices
+SuppliersDraftInvoices=Supplier draft invoices
 Unpaid=Non pagato
 ConfirmDeleteBill=Vuoi davvero cancellare questa fattura?
-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?
+ConfirmValidateBill=Vuoi davvero convalidare questa fattura con riferimento <b>%s</b>?
+ConfirmUnvalidateBill=Sei sicuro di voler convertire la fattura <b>%s</b> in bozza?
+ConfirmClassifyPaidBill=Vuoi davvero cambiare lo stato della fattura <b>%s</b> in "pagato"?
+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.
 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.
@@ -182,7 +186,7 @@ ConfirmClassifyAbandonReasonOther=Altro
 ConfirmClassifyAbandonReasonOtherDesc=Questa scelta sarà utilizzata in tutti gli altri casi. Perché, ad esempio, si prevede di creare una fattura sostitutiva.
 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.
+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
@@ -203,7 +207,7 @@ AlreadyPaidNoCreditNotesNoDeposits=Già pagato (senza note di credito o depositi
 Abandoned=Abbandonata
 RemainderToPay=Restante da pagare
 RemainderToTake=Restante da incassare
-RemainderToPayBack=Restante da rimborsare
+RemainderToPayBack=Remaining amount to refund
 Rest=In attesa
 AmountExpected=Importo atteso
 ExcessReceived=Ricevuto in eccesso
@@ -270,6 +274,7 @@ Deposit=Acconto
 Deposits=Depositi
 DiscountFromCreditNote=Sconto da nota di credito per %s
 DiscountFromDeposit=Pagamenti dalla fattura d'acconto %s
+DiscountFromExcessReceived=Payments from excess received of invoice %s
 AbsoluteDiscountUse=Questo tipo di credito può essere utilizzato su fattura prima della sua convalida
 CreditNoteDepositUse=Invoice must be validated to use this kind of credits
 NewGlobalDiscount=Nuovo sconto globale
@@ -277,8 +282,8 @@ NewRelativeDiscount=Nuovo sconto relativo
 NoteReason=Note/Motivo
 ReasonDiscount=Motivo dello sconto
 DiscountOfferedBy=Sconto concesso da
-DiscountStillRemaining=Sconto ancora disponibile
-DiscountAlreadyCounted=Sconto già applicato
+DiscountStillRemaining=Discounts available
+DiscountAlreadyCounted=Discounts already consumed
 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.
@@ -322,19 +327,21 @@ FrequencyPer_d=Ogni %s giorni
 FrequencyPer_m=Ogni %s mesi
 FrequencyPer_y=Ogni %s anni
 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
+NextDateToExecution=Data per la prossima generazione di fattura
 DateLastGeneration=Data dell'ultima generazione
-MaxPeriodNumber=Max nb of invoice generation
-NbOfGenerationDone=Nb of invoice generation already done
-MaxGenerationReached=Maximum nb of generations reached
+MaxPeriodNumber=Numero massimo di generazione fatture
+NbOfGenerationDone=Numero di fatture generate già create
+MaxGenerationReached=Numero massimo di generazioni raggiunto
 InvoiceAutoValidate=Convalida le fatture automaticamente
 GeneratedFromRecurringInvoice=Fattura ricorrente %s generata dal modello
 DateIsNotEnough=Data non ancora raggiunta
 InvoiceGeneratedFromTemplate=Fattura %s generata da modello ricorrente %s
+WarningInvoiceDateInFuture=Warning, the invoice date is higher than current date
+WarningInvoiceDateTooFarInFuture=Warning, the invoice date is too far from current date
 # PaymentConditions
 Statut=Stato
-PaymentConditionShortRECEP=Ricevimento fattura
-PaymentConditionRECEP=Pagamento al ricevimento della fattura
+PaymentConditionShortRECEP=Due Upon Receipt
+PaymentConditionRECEP=Due Upon Receipt
 PaymentConditionShort30D=a 30 giorni
 PaymentCondition30D=Pagamento a 30 giorni
 PaymentConditionShort30DENDMONTH=30 giorni fine mese
@@ -349,6 +356,14 @@ PaymentConditionShortPT_ORDER=Ordine
 PaymentConditionPT_ORDER=Ordinato
 PaymentConditionShortPT_5050=50-50
 PaymentConditionPT_5050=50%% all'ordine, 50%% alla consegna*
+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
 FixAmount=Correggi importo
 VarAmount=Importo variabile (%% tot.)
 # PaymentType
@@ -418,19 +433,19 @@ ChequeDeposits=Depositi assegni
 Cheques=Assegni
 DepositId=Id deposit
 NbCheque=Numero di assegni
-CreditNoteConvertedIntoDiscount=Questa nota di credito è stata convertita in uno sconto di %s
+CreditNoteConvertedIntoDiscount=This %s has been converted into %s
 UsBillingContactAsIncoiveRecipientIfExist=Utilizza l'indirizzo del contatto associato alla fattura come indirizzo di fatturazione invece di quello impostato per l'azienda
 ShowUnpaidAll=Mostra tutte le fatture non pagate
 ShowUnpaidLateOnly=Visualizza solo fatture con pagamento in ritardo
 PaymentInvoiceRef=Pagamento fattura %s
 ValidateInvoice=Convalida fattura
-ValidateInvoices=Validate invoices
+ValidateInvoices=Fatture convalidate
 Cash=Contanti
 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=Can't remove conciliated payment
+CantRemoveConciliatedPayment=Impossibile eliminare il pagamento conciliato
 PayedByThisPayment=Pagato con questo pagamento
 ClosePaidInvoicesAutomatically=Classifica come "pagate" tutte le fatture standard, ad avanzamento lavori e le note di credito e di debito interamente saldate.
 ClosePaidCreditNotesAutomatically=Classifica come "Pagata" tutte le note di credito interamente rimborsate
@@ -481,11 +496,11 @@ PDFCrevetteSituationInvoiceTitle=Fattura di avanzamento lavori
 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=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=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
+DeleteRepeatableInvoice=Elimina template di fattura
 ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice?
-CreateOneBillByThird=Create one invoice per third party (otherwise, one invoice per order)
+CreateOneBillByThird=Crea una fattura per soggetto terzo (altrimenti, una fatture per ordine)
 BillCreated=%s bill(s) created
diff --git a/htdocs/langs/it_IT/boxes.lang b/htdocs/langs/it_IT/boxes.lang
index fc7d9a8ceb9..6faa2f9f1ee 100644
--- a/htdocs/langs/it_IT/boxes.lang
+++ b/htdocs/langs/it_IT/boxes.lang
@@ -25,8 +25,8 @@ BoxTitleLastSuppliers=Ultimi %s ordini fornitore
 BoxTitleLastModifiedSuppliers=Ultimi %s fornitori modificati
 BoxTitleLastModifiedCustomers=Ultimi %s clienti modificati
 BoxTitleLastCustomersOrProspects=Ultimi %s clienti o potenziali clienti
-BoxTitleLastCustomerBills=Ultime %s fatture attive
-BoxTitleLastSupplierBills=Ultime %s fatture passive
+BoxTitleLastCustomerBills=Latest %s customer invoices
+BoxTitleLastSupplierBills=Latest %s supplier invoices
 BoxTitleLastModifiedProspects=Ultimi %s clienti potenziali modificati
 BoxTitleLastModifiedMembers=Ultimi %s membri
 BoxTitleLastFicheInter=Ultimi %s interventi modificati
@@ -38,7 +38,7 @@ BoxMyLastBookmarks=I miei ultimi %s segnalibri
 BoxOldestExpiredServices=Servizi scaduti da più tempo ancora attivi
 BoxLastExpiredServices=Ultimi %s contatti con servizi scaduti ancora attivi
 BoxTitleLastActionsToDo=Ultime %s azioni da fare
-BoxTitleLastContracts=Latest %s modified contracts
+BoxTitleLastContracts=Ultimi %s contratti modificati
 BoxTitleLastModifiedDonations=Ultime %s donazioni modificate
 BoxTitleLastModifiedExpenses=Ultime %s note spese modificate
 BoxGlobalActivity=Attività generale (fatture, proposte, ordini)
@@ -51,12 +51,12 @@ ClickToAdd=Clicca qui per aggiungere
 NoRecordedCustomers=Nessun cliente registrato
 NoRecordedContacts=Nessun contatto registrato
 NoActionsToDo=Nessuna azione da fare
-NoRecordedOrders=Nessun ordine cliente registrato
+NoRecordedOrders=No recorded customer orders
 NoRecordedProposals=Nessuna proposta registrata
-NoRecordedInvoices=Nessuna fattura attiva registrata
-NoUnpaidCustomerBills=Nessuna fattura attiva non pagata
-NoUnpaidSupplierBills=Nessuna fattura passiva non pagata
-NoModifiedSupplierBills=Nessuna fattura fornitore registrata
+NoRecordedInvoices=No recorded customer invoices
+NoUnpaidCustomerBills=No unpaid customer invoices
+NoUnpaidSupplierBills=No unpaid supplier invoices
+NoModifiedSupplierBills=No recorded supplier invoices
 NoRecordedProducts=Nessun prodotto/servizio registrato
 NoRecordedProspects=Nessun potenziale cliente registrato
 NoContractedProducts=Nessun prodotto/servizio a contratto
@@ -72,13 +72,13 @@ BoxProposalsPerMonth=proposte per mese
 NoTooLowStockProducts=Nessun prodotto sotto la soglia minima di scorte
 BoxProductDistribution=Distribuzione prodotti/servizi
 BoxProductDistributionFor=Distribuzione di %s per %s
-BoxTitleLastModifiedSupplierBills=Latest %s modified supplier bills
-BoxTitleLatestModifiedSupplierOrders=Latest %s modified supplier orders
-BoxTitleLastModifiedCustomerBills=Latest %s modified customer bills
-BoxTitleLastModifiedCustomerOrders=Latest %s modified customer orders
-BoxTitleLastModifiedPropals=Latest %s modified propals
+BoxTitleLastModifiedSupplierBills=Ultime %s fatture fornitore modificate
+BoxTitleLatestModifiedSupplierOrders=Ultimi %s ordini fornitore modificati
+BoxTitleLastModifiedCustomerBills=Ultime %s fatture clienti modificate
+BoxTitleLastModifiedCustomerOrders=ultimi %s ordini cliente modificati
+BoxTitleLastModifiedPropals=Ultime %s proposte commerciali modificate
 ForCustomersInvoices=Fatture attive
 ForCustomersOrders=Ordini dei clienti
 ForProposals=Proposte
 LastXMonthRolling=Ultimi %s mesi
-ChooseBoxToAdd=Add widget to your dashboard
+ChooseBoxToAdd=Aggiungi widget alla dashboard
diff --git a/htdocs/langs/it_IT/companies.lang b/htdocs/langs/it_IT/companies.lang
index 123c2a5c3a0..b462d79b6cd 100644
--- a/htdocs/langs/it_IT/companies.lang
+++ b/htdocs/langs/it_IT/companies.lang
@@ -66,7 +66,7 @@ Chat=Chat
 PhonePro=Telefono uff.
 PhonePerso=Telefono pers.
 PhoneMobile=Cellulare
-No_Email=Refuse mass e-mailings
+No_Email=Rifiuta email massive
 Fax=Fax
 Zip=CAP
 Town=Città
@@ -78,6 +78,10 @@ VATIsNotUsed=L'IVA non viene utilizzata
 CopyAddressFromSoc=Fill address with third party address
 ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
 PaymentBankAccount=Payment bank account
+OverAllProposals=Total proposals
+OverAllOrders=Total orders
+OverAllInvoices=Total invoices
+OverAllSupplierProposals=Total price requests
 ##### Local Taxes #####
 LocalTax1IsUsed=Usa la seconda tassa
 LocalTax1IsUsedES= RE previsto
@@ -239,6 +243,10 @@ ProfId3RU=KPP
 ProfId4RU=Okpo
 ProfId5RU=-
 ProfId6RU=-
+ProfId1DZ=RC
+ProfId2DZ=Art.
+ProfId3DZ=NIF
+ProfId4DZ=NIS
 VATIntra=N° Partita IVA
 VATIntraShort=P. IVA
 VATIntraSyntaxIsValid=La sintassi è valida
@@ -263,9 +271,9 @@ AddContactAddress=Crea contatto/indirizzo
 EditContact=Modifica contatto/indirizzo
 EditContactAddress=Modifica contatto/indirizzo
 Contact=Contatto
-ContactId=Contact id
+ContactId=Id contatto
 ContactsAddresses=Contatti/Indirizzi
-FromContactName=Name:
+FromContactName=Nome:
 NoContactDefinedForThirdParty=Nessun contatto per questo soggetto terzo
 NoContactDefined=Nessun contatto definito
 DefaultContact=Contatto predefinito
@@ -288,7 +296,7 @@ CompanyDeleted=Società %s cancellata dal database.
 ListOfContacts=Elenco dei contatti
 ListOfContactsAddresses=Elenco di contatti/indirizzi
 ListOfThirdParties=Elenco dei soggetti terzi
-ShowCompany=Show third party
+ShowCompany=Mostra soggetto terzo
 ShowContact=Mostra contatti
 ContactsAllShort=Tutti (Nessun filtro)
 ContactType=Tipo di contatto
@@ -382,8 +390,9 @@ ListCustomersShort=Elenco clienti
 ThirdPartiesArea=Area soggetti terzi e contatti
 LastModifiedThirdParties=Ultimi %s soggetti terzi modificati
 UniqueThirdParties=Totale soggetti terzi
-InActivity=In attività
+InActivity=Aperto
 ActivityCeased=Cessata attività
+ThirdPartyIsClosed=Third party is closed
 ProductsIntoElements=Elenco dei prodotti/servizi in %s
 CurrentOutstandingBill=Fatture scadute
 OutstandingBill=Max. fattura in sospeso
@@ -395,8 +404,8 @@ MergeOriginThirdparty=Duplica soggetto terzo (soggetto terzo che stai eliminando
 MergeThirdparties=Unisci soggetti terzi
 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 so you will be able to delete the duplicate one.
 ThirdpartiesMergeSuccess=I soggetti terzi sono stati uniti
-SaleRepresentativeLogin=Login of sales representative
-SaleRepresentativeFirstname=Firstname of sales representative
-SaleRepresentativeLastname=Lastname of sales representative
+SaleRepresentativeLogin=Login del rappresentante commerciale
+SaleRepresentativeFirstname=First name of sales representative
+SaleRepresentativeLastname=Last name of sales representative
 ErrorThirdpartiesMerge=Si è verificato un errore durante l'eliminazione dei soggetti terzi. Per ulteriori dettagli controlla il log. Le modifiche sono state annullate.
 NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/it_IT/compta.lang b/htdocs/langs/it_IT/compta.lang
index df8d2005347..abb92ffa2b0 100644
--- a/htdocs/langs/it_IT/compta.lang
+++ b/htdocs/langs/it_IT/compta.lang
@@ -65,6 +65,7 @@ PaymentSocialContribution=Pagamento delle imposte sociali/fiscali
 PaymentVat=Pagamento IVA
 ListPayment=Elenco dei pagamenti
 ListOfCustomerPayments=Elenco dei pagamenti dei clienti
+ListOfSupplierPayments=Elenco dei pagamenti fornitore
 DateStartPeriod=Data di inzio
 DateEndPeriod=Data di fine
 newLT1Payment=New tax 2 payment
@@ -81,7 +82,7 @@ LT2PaymentES=Pagamento IRPF (Spagna)
 LT2PaymentsES=Pagamenti IRPF (Spagna)
 VATPayment=Sales tax payment
 VATPayments=Sales tax payments
-VATRefund=Sales tax refund Refund
+VATRefund=Sales tax refund
 Refund=Rimborso
 SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Visualizza pagamento IVA
@@ -176,7 +177,7 @@ Pcg_subtype=Sottotipo Pcg
 InvoiceLinesToDispatch=Riga di fattura da spedire *consegnare
 ByProductsAndServices=Per prodotti e servizi
 RefExt=Referente esterno
-ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click onto button "%s".
+ToCreateAPredefinedInvoice=Per creare un modello di fattura, crea una fattura standard e poi, senza convalidarla, clicca sul pulsante "%s".
 LinkedOrder=Collega a ordine
 Mode1=Metodo 1
 Mode2=Metodo 2
@@ -194,7 +195,7 @@ CloneTax=Clone a social/fiscal tax
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
 CloneTaxForNextMonth=Clona nel mese successivo
 SimpleReport=Simple report
-AddExtraReport=Extra reports
+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
diff --git a/htdocs/langs/it_IT/cron.lang b/htdocs/langs/it_IT/cron.lang
index 024fb44e60b..2ade1b8efb9 100644
--- a/htdocs/langs/it_IT/cron.lang
+++ b/htdocs/langs/it_IT/cron.lang
@@ -7,41 +7,41 @@ Permission23103 = Elimina processo pianificato
 Permission23104 = Esegui processo pianificato
 # Admin
 CronSetup= Impostazione delle azioni pianificate
-URLToLaunchCronJobs=URL to check and launch qualified cron jobs
+URLToLaunchCronJobs=URL per controllare ed eseguire i cron job
 OrToLaunchASpecificJob=O per lanciare un job specifico
 KeyForCronAccess=Chiave di sicurezza per l'URL che lancia i job di cron
 FileToLaunchCronJobs=Comando per lanciare i job di cron
 CronExplainHowToRunUnix=In ambienti Unix per lanciare il comando ogni 5 minuti dovresti usare la seguente riga di crontab
 CronExplainHowToRunWin=In ambienti Microsoft(tm) Windows per lanciare il comando ogni 5 minuti dovresti usare le operazioni pianificate
-CronMethodDoesNotExists=Class %s does not contains any method %s
+CronMethodDoesNotExists=La classe %s non contiene alcune metodo %s
 # Menu
-EnabledAndDisabled=Enabled and disabled
+EnabledAndDisabled=Attivato e disattivato
 # Page list
-CronLastOutput=Output dell'ultimo avvio
-CronLastResult=Codice del risultato dell'ultima esecuzione
+CronLastOutput=Latest run output
+CronLastResult=Latest result code
 CronCommand=Comando
 CronList=Processi pianificati
 CronDelete=Cancella i job programmati
-CronConfirmDelete=Sei sicuro di voler cancellare questi processi pianificati?
-CronExecute=Launch scheduled job
-CronConfirmExecute=Sei sicuro di voler eseguire questi processi pianificati ora?
+CronConfirmDelete=Vuoi davvero eliminare questi job schedulati?
+CronExecute=Esegui i job schedulati
+CronConfirmExecute=Vuoi davvero eseguire i job schedulati ora?
 CronInfo=Il modulo per i job programmati permette di eseguire operazioni definite in anticipoi 
 CronTask=Azione
 CronNone=Nessuno
-CronDtStart=Not before
-CronDtEnd=Not after
+CronDtStart=Non prima
+CronDtEnd=Non dopo
 CronDtNextLaunch=Prossima esecuzione
-CronDtLastLaunch=Start date of latest execution
-CronDtLastResult=End date of latest execution
+CronDtLastLaunch=Data di inizio dell'ultima esecuzione
+CronDtLastResult=Data di termine ultima esecuzione
 CronFrequency=Frequenza
 CronClass=Classe
 CronMethod=Metodo
 CronModule=Modulo
 CronNoJobs=Nessun job registrato
 CronPriority=Priorità
-CronLabel=Label
+CronLabel=Titolo
 CronNbRun=Num. lancio
-CronMaxRun=Max nb. launch
+CronMaxRun=Massimo numero di esecuzioni
 CronEach=Ogni
 JobFinished=Azione eseguita e completata
 #Page card
@@ -49,7 +49,7 @@ CronAdd= Aggiungi job
 CronEvery=Esegui ogni lavoro
 CronObject=Istanza/Oggetto da creare
 CronArgs=Parametri
-CronSaveSucess=Save successfully
+CronSaveSucess=Salvataggio corretto
 CronNote=Commento
 CronFieldMandatory=Il campo %s è obbligatorio
 CronErrEndDateStartDt=La data di fine non può essere precedente a quella di inizio
@@ -73,7 +73,7 @@ CronType_method=Metodo di chiamata di una classe Dolibarr
 CronType_command=Comando da shell
 CronCannotLoadClass=Non posso caricare la classe %s o l'oggetto %s
 UseMenuModuleToolsToAddCronJobs=Vai nel menu "Home - Strumenti di amministrazione - Processi pianificati" per visualizzare e modificare i processi pianificati.
-JobDisabled=Job disabled
-MakeLocalDatabaseDumpShort=Local database backup
-MakeLocalDatabaseDump=Create a local database dump
-WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of active jobs, your jobs may be delayed to a maximum of %s hours before being run.
+JobDisabled=Lavoro disabilitato
+MakeLocalDatabaseDumpShort=Backup del database locale
+MakeLocalDatabaseDump=Crea un backup del database locale
+WarningCronDelayed=Attenzione, per motivi di performance, qualunque sia la data della prossima esecuzione dei job attivi, i job possono essere ritardati di un massimo di %s ore prima di essere eseguiti
diff --git a/htdocs/langs/it_IT/errors.lang b/htdocs/langs/it_IT/errors.lang
index 388cbba589d..a38dd576f4b 100644
--- a/htdocs/langs/it_IT/errors.lang
+++ b/htdocs/langs/it_IT/errors.lang
@@ -11,6 +11,7 @@ ErrorLoginAlreadyExists=L'utente %s esiste già.
 ErrorGroupAlreadyExists=Il gruppo %s esiste già
 ErrorRecordNotFound=Record non trovato
 ErrorFailToCopyFile=Impossibile copiare il file '<b>%s</b>' in '<b>%s</b>'
+ErrorFailToCopyDir=Failed to copy directory '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToRenameFile=Impossibile rinominare il file '<b>%s</b>' in '<b>%s</b>'.
 ErrorFailToDeleteFile=Impossibile rimuovere il file '<b>%s</b>'.
 ErrorFailToCreateFile=Impossibile creare il file '<b>%s</b>'.
@@ -115,7 +116,7 @@ ErrorNoActivatedBarcode=Nessun tipo di codice a barre attivato
 ErrUnzipFails=Estrazione dell'archivio %s con ZipArchive fallita
 ErrNoZipEngine=Non c'è modo di spacchettare i file %s in questo PHP
 ErrorFileMustBeADolibarrPackage=Il file %s deve essere un archivio zip Dolibarr
-ErrorFileRequired=Ci vuole un file del pacchetto Dolibarr
+ErrorModuleFileRequired=You must select a Dolibarr module package file
 ErrorPhpCurlNotInstalled=PHP CURL non risulta installato, ma è necessario per comunicare con Paypal
 ErrorFailedToAddToMailmanList=Impossibile aggiungere il dato %s alla Mailman lista %s o SPIP base
 ErrorFailedToRemoveToMailmanList=Impossibile rimuovere il dato %s alla Mailman lista %s o SPIP base
@@ -170,14 +171,19 @@ ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
 ErrorFileMustHaveFormat=File must have format %s
 ErrorSupplierCountryIsNotDefined=Nazione fornitore non definita. Correggere per proseguire.
 ErrorsThirdpartyMerge=Failed to merge the two records. Request canceled.
-ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enougth for product %s to add it into a new order.
-ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enougth for product %s to add it into a new invoice.
-ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enougth for product %s to add it into a new shipment.
-ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enougth for product %s to add it into a new proposal.
-ErrorFailedToLoadLoginFileForMode=Failed to get the login file for mode '%s'.
+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 bank 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>
 
 # 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.
diff --git a/htdocs/langs/it_IT/holiday.lang b/htdocs/langs/it_IT/holiday.lang
index abd99a0dd2b..724097b216e 100644
--- a/htdocs/langs/it_IT/holiday.lang
+++ b/htdocs/langs/it_IT/holiday.lang
@@ -76,8 +76,9 @@ BoxTitleLastLeaveRequests=Ultime %s richieste di assenza modificate
 HolidaysMonthlyUpdate=Aggiornamento mensile
 ManualUpdate=Aggiornamento manuale
 HolidaysCancelation=Cancellazione ferie
-EmployeeLastname=Cognome dipendente
-EmployeeFirstname=Nome dipendente
+EmployeeLastname=Employee last name
+EmployeeFirstname=Employee first name
+TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
 
 ## Configuration du Module ##
 LastUpdateCP=Ultimo aggiornamento automatico dell'assegnazione ferie
diff --git a/htdocs/langs/it_IT/languages.lang b/htdocs/langs/it_IT/languages.lang
index 46c4e932b14..6391db35f84 100644
--- a/htdocs/langs/it_IT/languages.lang
+++ b/htdocs/langs/it_IT/languages.lang
@@ -12,6 +12,7 @@ Language_de_DE=Tedesco
 Language_de_AT=Tedesco (Austria)
 Language_de_CH=Tedesco (Svizzera)
 Language_el_GR=Greco
+Language_el_CY=Greco (Cipro)
 Language_en_AU=Inglese (Australia)
 Language_en_CA=Inglese (Canada)
 Language_en_GB=English (Gran Bretagna)
@@ -26,8 +27,10 @@ Language_es_BO=Spagnolo (Bolivia)
 Language_es_CL=Spagnolo (Cile)
 Language_es_CO=Spagnolo (Colombia)
 Language_es_DO=Spagnolo ( Repubblica Dominicana)
+Language_es_EC=Spagnolo (Ecuador)
 Language_es_HN=Spagnolo (Honduras)
 Language_es_MX=Spagnolo (Messico)
+Language_es_PA=Spagnolo (Panama)
 Language_es_PY=Spagnolo (Paraguay)
 Language_es_PE=Spagnolo (Perù)
 Language_es_PR=Spagnolo (Portorico)
@@ -50,12 +53,14 @@ Language_is_IS=Islandese
 Language_it_IT=Italiano
 Language_ja_JP=Giapponese
 Language_ka_GE=Georgiano
+Language_km_KH=Khmer
 Language_kn_IN=Kannada
 Language_ko_KR=Coreano
 Language_lo_LA=Laotiano
 Language_lt_LT=Lituano
 Language_lv_LV=Lettone
 Language_mk_MK=Macedone
+Language_mn_MN=Mongolo
 Language_nb_NO=Norvegese (Bokmål)
 Language_nl_BE=Olandese (Belgio)
 Language_nl_NL=Olandese (Paesi Bassi)
diff --git a/htdocs/langs/it_IT/ldap.lang b/htdocs/langs/it_IT/ldap.lang
index fad7e12668a..ae28e2d5f06 100644
--- a/htdocs/langs/it_IT/ldap.lang
+++ b/htdocs/langs/it_IT/ldap.lang
@@ -13,10 +13,10 @@ LDAPUsers=Utenti nel database LDAP
 LDAPFieldStatus=Stato
 LDAPFieldFirstSubscriptionDate=Prima data di sottoscrizione
 LDAPFieldFirstSubscriptionAmount=Importo della prima sottoscrizione
-LDAPFieldLastSubscriptionDate=Data ultima sottoscrizione
-LDAPFieldLastSubscriptionAmount=Importo ultima sottoscrizione
-LDAPFieldSkype=Skype id
-LDAPFieldSkypeExample=Example : skypeName
+LDAPFieldLastSubscriptionDate=Latest subscription date
+LDAPFieldLastSubscriptionAmount=Latest subscription amount
+LDAPFieldSkype=Identificativo Skype
+LDAPFieldSkypeExample=Esempio: nomeSkype
 UserSynchronized=Utente sincronizzato
 GroupSynchronized=Gruppo sincronizzato
 MemberSynchronized=Membro sincronizzato
diff --git a/htdocs/langs/it_IT/mailmanspip.lang b/htdocs/langs/it_IT/mailmanspip.lang
index a614cf0f7dd..4de2bbf89d0 100644
--- a/htdocs/langs/it_IT/mailmanspip.lang
+++ b/htdocs/langs/it_IT/mailmanspip.lang
@@ -1,10 +1,10 @@
 # Dolibarr language file - Source file is en_US - mailmanspip
 MailmanSpipSetup=Configurazione per Mailman e SPIP
-MailmanTitle=Mailman mailing list system
-TestSubscribe=Test di iscrizione alle liste Mailman
-TestUnSubscribe=Test di disiscrizione dalle liste Mailman
-MailmanCreationSuccess=Subscription test was executed successfully
-MailmanDeletionSuccess=Unsubscription test was executed successfully
+MailmanTitle=Sistema di mailing list Mailman
+TestSubscribe=Per testare l'iscrizione alle liste Mailman
+TestUnSubscribe=Per testare la disiscrizione dalle liste Mailman
+MailmanCreationSuccess=Test di iscrizione eseguito con successo
+MailmanDeletionSuccess=Test di disiscrizione eseguito con successo
 SynchroMailManEnabled=mailman verrà aggiornato
 SynchroSpipEnabled=SPIP verrà aggiornato
 DescADHERENT_MAILMAN_ADMINPW=Password di amministrazione di Mailman
@@ -23,5 +23,5 @@ DeleteIntoSpip=Elimina da SPIP
 DeleteIntoSpipConfirmation=Vuoi davvero rimuovere questo utente da SPIP?
 DeleteIntoSpipError=Eliminazione dell'utenza da SPIP non riuscita
 SPIPConnectionFailed=Connessione a SPIP fallita
-SuccessToAddToMailmanList=%s successfully added to mailman list %s or SPIP database
-SuccessToRemoveToMailmanList=%s successfully removed from mailman list %s or SPIP database
+SuccessToAddToMailmanList=%s aggiunto con successo alla lista mailman %s o al database SPIP
+SuccessToRemoveToMailmanList=%s eliminato con successo dalla lista mailman %s o dal database SPIP
diff --git a/htdocs/langs/it_IT/mails.lang b/htdocs/langs/it_IT/mails.lang
index 08e646ce405..e7d0d918ffc 100644
--- a/htdocs/langs/it_IT/mails.lang
+++ b/htdocs/langs/it_IT/mails.lang
@@ -1,8 +1,8 @@
 # Dolibarr language file - Source file is en_US - mails
-Mailing=Invio di massa
+Mailing=Mailing, invio massivo
 EMailing=Invio email
 EMailings=Invii email
-AllEMailings=Tutti i eMailings
+AllEMailings=Tutti i Mailings
 MailCard=Scheda email
 MailRecipients=Destinatari
 MailRecipient=Destinatario
@@ -17,7 +17,7 @@ MailTopic=Titolo
 MailText=Testo
 MailFile=Allegati
 MailMessage=Corpo del messaggio
-ShowEMailing=Visualizza invii di massa
+ShowEMailing=Mostra invii massivi
 ListOfEMailings=Elenco degli invii
 NewMailing=Nuovo invio di massa
 EditMailing=Modifica invio
@@ -35,16 +35,16 @@ MailingStatusSentPartialy=Inviato parzialmente
 MailingStatusSentCompletely=Inviato completamente
 MailingStatusError=Errore
 MailingStatusNotSent=Non inviato
-MailSuccessfulySent=Email inviata con successo (da %s a %s)
+MailSuccessfulySent=Email accettata con successo per la consegna (da %s a %s)
 MailingSuccessfullyValidated=EMailing validata con successo
 MailUnsubcribe=Cancella sottoscrizione
 MailingStatusNotContact=Non contattare più
 MailingStatusReadAndUnsubscribe=Read and unsubscribe
 ErrorMailRecipientIsEmpty=L'indirizzo del destinatario è vuoto
 WarningNoEMailsAdded=Non sono state aggiunte email da inviare.
-ConfirmValidMailing=Are you sure you want to validate this emailing?
+ConfirmValidMailing=Intendi veramente validare questo invio?
 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?
+ConfirmDeleteMailing=Intendi veramente eliminare questo invio?
 NbOfUniqueEMails=Numero email uniche
 NbOfEMails=Numero di email
 TotalNbOfDistinctRecipients=Numero di singoli destinatari
@@ -56,7 +56,7 @@ MailingAddFile=Allega questo file
 NoAttachedFiles=Nessun file allegato
 BadEMail=Valore non valido
 CloneEMailing=Clona invio
-ConfirmCloneEMailing=Are you sure you want to clone this emailing?
+ConfirmCloneEMailing=Intendi veramente clonare questo invio?
 CloneContent=Clona messaggio
 CloneReceivers=Clona destinatari
 DateLastSend=Data dell'ultimo invio
@@ -74,22 +74,28 @@ ResultOfMailSending=Result of mass EMail sending
 NbSelected=Num. selezionati
 NbIgnored=Num. ignorati
 NbSent=Num. inviati
+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
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Riga %s nel file
 RecipientSelectionModules=Modulo di selezione destinatari
 MailSelectedRecipients=Destinatari selezionati
 MailingArea=Sezione Invii di massa
-LastMailings=Ultimi %s invii
+LastMailings=Latest %s emailings
 TargetsStatistics=Statische obiettivi
 NbOfCompaniesContacts=Numero contatti di società
 MailNoChangePossible=I destinatari convalidati non possono essere modificati
 SearchAMailing=Cerca invio
 SendMailing=Invia email massiva
 SendMail=Invia una email
-MailingNeedCommand=Per motivi di sicurezza è preferibile inviare mail di massa da linea di comando. Se possibile chiedi all amministratore del server di eseguire il seguente comando per inivare le mail a tutti i destinatari:
+SentBy=Inviato da
+MailingNeedCommand=L'invio di un mailing si può fare da linea di comando. Chiedi all'amministratore del server di eseguire il seguente comando per inviare il mailing a tutti i destinatari:
 MailingNeedCommand2=Puoi inviare comunque online aggiungendo il parametro MAILING_LIMIT_SENDBYWEB impostato al valore massimo corrispondente al numero di email che si desidera inviare durante una sessione.
-ConfirmSendingEmailing=If you can't or prefer sending them with your www browser, please confirm you are sure you want to send emailing now from your browser?
+ConfirmSendingEmailing=Se vuoi eseguire l'invio direttamente da questa schermata sei pregato di confermare. Intendi veramente eseguire l'invio adesso da questo browser?
 LimitSendingEmailing=Nota: L'invio di email è soggetto a limitazioni per ragioni di sicurezza e di timeout a <b>%s</b> destinatari per ogni sessione di invio
 TargetsReset=Cancella elenco
 ToClearAllRecipientsClickHere=Per cancellare l'elenco destinatari per questa email, cliccare sul pulsante
@@ -97,7 +103,7 @@ ToAddRecipientsChooseHere=Per aggiungere i destinatari, scegliere da questi elen
 NbOfEMailingsReceived=Numero di invii ricevuti
 NbOfEMailingsSend=Emailing di massa inviato
 IdRecord=ID record
-DeliveryReceipt=Delivery Ack.
+DeliveryReceipt=Ricevuta di consegna.
 YouCanUseCommaSeparatorForSeveralRecipients=Utilizzare il separatore <b>virgola</b>(,) per specificare più destinatari.
 TagCheckMail=Traccia apertura mail
 TagUnsubscribe=Link di cancellazione alla mailing list
@@ -127,15 +133,15 @@ AdvTgtSearchIntHelp=Use interval to select int or float value
 AdvTgtMinVal=Valore minimo
 AdvTgtMaxVal=Valore massimo
 AdvTgtSearchDtHelp=Usa intervallo per selezionare la data
-AdvTgtStartDt=Start dt.
-AdvTgtEndDt=End dt.
+AdvTgtStartDt=Data inizio
+AdvTgtEndDt=Data fine
 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
+AdvTgtTypeOfIncude=Tipo di email mirata
 AdvTgtContactHelp=Use only if you target contact into "Type of targeted email"
 AddAll=Aggiungi tutti
 RemoveAll=Rimuovi tutti
 ItemsCount=Oggetti
-AdvTgtNameTemplate=Filter name
+AdvTgtNameTemplate=Filtro nome
 AdvTgtAddContact=Add emails according to criterias
 AdvTgtLoadFilter=Carica filtro
 AdvTgtDeleteFilter=Elimina filtro
@@ -144,3 +150,6 @@ AdvTgtCreateFilter=Crea filtro
 AdvTgtOrCreateNewFilter=Titolo del nuovo 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
+
diff --git a/htdocs/langs/it_IT/main.lang b/htdocs/langs/it_IT/main.lang
index f8571e3cc6d..1fb72c5ae8f 100644
--- a/htdocs/langs/it_IT/main.lang
+++ b/htdocs/langs/it_IT/main.lang
@@ -63,11 +63,13 @@ ErrorNoVATRateDefinedForSellerCountry=Errore, non sono state definite le aliquot
 ErrorNoSocialContributionForSellerCountry=Errore, non sono stati definiti i tipi di contributi per: '%s'.
 ErrorFailedToSaveFile=Errore, file non salvato.
 ErrorCannotAddThisParentWarehouse=You are trying to add a parent warehouse which is already a child of current one
+MaxNbOfRecordPerPage=Max nb of record per page
 NotAuthorized=Non sei autorizzato.
 SetDate=Imposta data
 SelectDate=Seleziona una data
 SeeAlso=Vedi anche %s
 SeeHere=Vedi qui
+Apply=Applica
 BackgroundColorByDefault=Colore di sfondo predefinito
 FileRenamed=The file was successfully renamed
 FileUploaded=Il file è stato caricato con successo
@@ -86,7 +88,7 @@ Undefined=Indefinito
 PasswordForgotten=Password forgotten?
 SeeAbove=Vedi sopra
 HomeArea=Area home
-LastConnexion=Ultima connessione
+LastConnexion=Latest connection
 PreviousConnexion=Connessione precedente
 PreviousValue=Previous value
 ConnectedOnMultiCompany=Collegato all'ambiente
@@ -236,7 +238,7 @@ DateCreation=Data di creazione
 DateCreationShort=Data di creazione
 DateModification=Data di modifica
 DateModificationShort=Data modif.
-DateLastModification=Data ultima modifica
+DateLastModification=Latest modification date
 DateValidation=Data di convalida
 DateClosing=Data di chiusura
 DateDue=Data di scadenza
@@ -460,6 +462,7 @@ DeletePicture=Foto cancellata
 ConfirmDeletePicture=Confermi l'eliminazione della foto?
 Login=Login
 CurrentLogin=Accesso attuale
+EnterLoginDetail=Enter login details
 January=Gennaio
 February=Febbraio
 March=Marzo
@@ -597,6 +600,8 @@ SessionName=Nome sessione
 Method=Metodo
 Receive=Ricevi
 CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
+ExpectedValue=Expected Value
+CurrentValue=Valore attuale
 PartialWoman=Parziale
 TotalWoman=Totale
 NeverReceived=Mai ricevuto
@@ -753,6 +758,8 @@ RemoveString=Remove string '%s'
 SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
 DirectDownloadLink=Direct download link
 Download=Download
+ActualizeCurrency=Update currency rate
+Fiscalyear=Anno fiscale
 # Week day
 Monday=Lunedì
 Tuesday=Martedì
@@ -787,8 +794,8 @@ SetRef=Set ref
 Select2ResultFoundUseArrows=Some results found. Use arrows to select.
 Select2NotFound=Nessun risultato trovato
 Select2Enter=Immetti
-Select2MoreCharacter=or more character
-Select2MoreCharacters=o più caratteri
+Select2MoreCharacter=or more characters<br /><br /><strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
+Select2MoreCharacters=or more characters<br /><br /><strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
 Select2LoadingMoreResults=Caricamento di altri risultati ...
 Select2SearchInProgress=Ricerca in corso ...
 SearchIntoThirdparties=Terze parti
@@ -809,3 +816,5 @@ SearchIntoContracts=Contratti
 SearchIntoCustomerShipments=Spedizioni cliente
 SearchIntoExpenseReports=Nota spese
 SearchIntoLeaves=Assenze
+
+BulkActions=Bulk actions
diff --git a/htdocs/langs/it_IT/members.lang b/htdocs/langs/it_IT/members.lang
index 3783edb5a8d..856e93d8947 100644
--- a/htdocs/langs/it_IT/members.lang
+++ b/htdocs/langs/it_IT/members.lang
@@ -45,7 +45,7 @@ MemberStatusDraft=Candidato (da convalidare)
 MemberStatusDraftShort=Candidato
 MemberStatusActive=Convalidato (in attesa del pagamento)
 MemberStatusActiveShort=Convalidato
-MemberStatusActiveLate=Adesione scaduta
+MemberStatusActiveLate=Subscription expired
 MemberStatusActiveLateShort=Scaduta
 MemberStatusPaid=Adesione aggiornata
 MemberStatusPaidShort=Aggiornata
@@ -136,8 +136,8 @@ DocForAllMembersCards=Genera schede per tutti i membri (formato di output impost
 DocForOneMemberCards=Genera scheda per un membro (formato di output impostato: <b>%s</b>)
 DocForLabels=Genera etichette con indirizzi (formato di output impostato: <b>%s</b>)
 SubscriptionPayment=Pagamento adesione
-LastSubscriptionDate=Data ultima adesione
-LastSubscriptionAmount=Ultimo importo adesione
+LastSubscriptionDate=Latest subscription date
+LastSubscriptionAmount=Latest subscription amount
 MembersStatisticsByCountries=Statistiche per paese
 MembersStatisticsByState=Statistiche per stato/provincia
 MembersStatisticsByTown=Statistiche per città
@@ -149,7 +149,7 @@ MembersByStateDesc=Questa schermata mostra le statistiche sui membri per stato/p
 MembersByTownDesc=Questa schermata mostra le statistiche sui membri per città.
 MembersStatisticsDesc=Scegli quali statistiche visualizzare...
 MenuMembersStats=Statistiche
-LastMemberDate=Ultima data membro
+LastMemberDate=Latest member date
 Nature=Natura
 Public=Pubblico
 NewMemberbyWeb=Nuovo membro aggiunto. In attesa di approvazione
diff --git a/htdocs/langs/it_IT/orders.lang b/htdocs/langs/it_IT/orders.lang
index 37056ff29a3..11f8ff53aff 100644
--- a/htdocs/langs/it_IT/orders.lang
+++ b/htdocs/langs/it_IT/orders.lang
@@ -39,7 +39,7 @@ StatusOrderRefusedShort=Rifiutato
 StatusOrderBilledShort=Pagato
 StatusOrderToProcessShort=Da lavorare
 StatusOrderReceivedPartiallyShort=Ricevuto parz.
-StatusOrderReceivedAllShort=Ricevuto compl.
+StatusOrderReceivedAllShort=Products received
 StatusOrderCanceled=Annullato
 StatusOrderDraft=Bozza (deve essere convalidata)
 StatusOrderValidated=Convalidato
@@ -51,7 +51,7 @@ StatusOrderApproved=Approvato
 StatusOrderRefused=Rifiutato
 StatusOrderBilled=Pagato
 StatusOrderReceivedPartially=Ricevuto parzialmente
-StatusOrderReceivedAll=Ricevuto completamente
+StatusOrderReceivedAll=All products received
 ShippingExist=Esiste una spedizione
 QtyOrdered=Quantità ordinata
 ProductQtyInDraft=Quantità di prodotto in bozza di ordini
diff --git a/htdocs/langs/it_IT/other.lang b/htdocs/langs/it_IT/other.lang
index ec80beca0fc..30e09599bb2 100644
--- a/htdocs/langs/it_IT/other.lang
+++ b/htdocs/langs/it_IT/other.lang
@@ -2,6 +2,7 @@
 SecurityCode=Codice di sicurezza
 NumberingShort=N°
 Tools=Strumenti
+TMenuTools=Strumenti
 ToolsDesc=All miscellaneous tools not included in other menu entries are collected here.<br /><br />All the tools can be reached in the left menu.
 Birthday=Compleanno
 BirthdayDate=Data di nascita
@@ -42,7 +43,7 @@ Notify_SHIPPING_SENTBYMAIL=Spedizione inviata per email
 Notify_MEMBER_VALIDATE=Membro convalidato
 Notify_MEMBER_MODIFY=Membro modificato
 Notify_MEMBER_SUBSCRIPTION=Membro aggiunto
-Notify_MEMBER_RESILIATE=Member terminated
+Notify_MEMBER_RESILIATE=Membro terminato
 Notify_MEMBER_DELETE=Membro eliminato
 Notify_PROJECT_CREATE=Creazione del progetto
 Notify_TASK_CREATE=Attività creata
@@ -67,14 +68,15 @@ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__ Qui troverete la fat
 PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nAlleghiamo il documento di trasporto __SHIPPINGREF__\n\n__PERSONALIZED__Cordiali Saluti\n\n__SIGNATURE__
 PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nAlleghiamo l'intervento __FICHINTERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n__PERSONALIZED__\n\n__SIGNATURE__
-DemoDesc=Dolibarr is a compact ERP/CRM supporting several functional modules. A demo showcasing all modules makes no sense as this scenario never occurs. So, several demo profiles are available.
+DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
+ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
 DemoFundation=Gestisci i membri di una Fondazione
 DemoFundation2=Gestisci i membri e un conto bancario di una Fondazione
-DemoCompanyServiceOnly=Gestire un'attività freelance di vendita di soli servizi
+DemoCompanyServiceOnly=Company or freelance selling service only
 DemoCompanyShopWithCashDesk=Gestire un negozio con una cassa
-DemoCompanyProductAndStocks=Gestire una piccola o media azienda che vende prodotti
-DemoCompanyAll=Gestire una piccola o media azienda con più attività (tutti i moduli principali)
+DemoCompanyProductAndStocks=Company selling products with a shop
+DemoCompanyAll=Company with multiple activities (all main modules)
 CreatedBy=Creato da %s
 ModifiedBy=Modificato da %s
 ValidatedBy=Convalidato da %s
diff --git a/htdocs/langs/it_IT/products.lang b/htdocs/langs/it_IT/products.lang
index 3db2ab4f4f2..bb9cd4f3252 100644
--- a/htdocs/langs/it_IT/products.lang
+++ b/htdocs/langs/it_IT/products.lang
@@ -5,6 +5,8 @@ ProductLabelTranslated=Etichetta del prodotto tradotto
 ProductDescriptionTranslated=Descrizione del prodotto tradotto
 ProductNoteTranslated=Tradotto nota prodotto
 ProductServiceCard=Scheda Prodotti/servizi
+TMenuProducts=Prodotti
+TMenuServices=Servizi
 Products=Prodotti
 Services=Servizi
 Product=Prodotto
@@ -18,17 +20,17 @@ ProductVatMassChange=Modifica di massa dell'IVA
 ProductVatMassChangeDesc=Questa pagina è utile a modificare le tariffe delle tasse definite nei prodotti o servizi da un valore ad un altro. Attenzione: questa modifica influenza l'intero database
 MassBarcodeInit=Inizializzazione di massa dei codici a barre
 MassBarcodeInitDesc=Questa pagina può essere usata per inizializzare un codice a barre di un oggetto che non ha ancora un codice a barre definito. Controlla prima che il setup del modulo Codici a barre sia completo. 
-ProductAccountancyBuyCode=Accountancy code (purchase)
-ProductAccountancySellCode=Accountancy code (sale)
+ProductAccountancyBuyCode=Codice contabile (acquisto)
+ProductAccountancySellCode=Codice contabile (vendita)
 ProductOrService=Prodotto o servizio
 ProductsAndServices=Prodotti e Servizi
 ProductsOrServices=Prodotti o servizi
 ProductsOnSell=Prodotto per la vendita o per l'acquisto
 ProductsNotOnSell=Prodotto non in vendita e non per l'acquisto
-ProductsOnSellAndOnBuy=Prodotti in vendit
-ServicesOnSell=Servizi in vendit
-ServicesNotOnSell=Servizi non in vendita
-ServicesOnSellAndOnBuy=Servizi in vendita
+ProductsOnSellAndOnBuy=Prodotti in vendita e acquistabili
+ServicesOnSell=Servizi in vendita o acquistabili
+ServicesNotOnSell=Servizi non in vendita e non acquistabili
+ServicesOnSellAndOnBuy=Servizi in vendita e acquistabili
 LastModifiedProductsAndServices=Ultimi %s prodotti/servizi modificati
 LastRecordedProducts=Ultimi %s prodotti registrati
 LastRecordedServices=Ultimi %s servizi registrati
@@ -58,9 +60,9 @@ SellingPrice=Prezzo di vendita
 SellingPriceHT=Prezzo di vendita (al netto delle imposte)
 SellingPriceTTC=Prezzo di vendita (inclusa IVA)
 CostPriceDescription=This price (net of tax) can be used to store the average amount this product cost to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
-CostPriceUsage=In una versione futura, questo valore può essere utilizzato per il calcolo del margine.
-SoldAmount=Sold amount
-PurchasedAmount=Purchased amount
+CostPriceUsage=This value could be used for margin calculation.
+SoldAmount=Quantità venduta
+PurchasedAmount=Quantità acquistata
 NewPrice=Nuovo prezzo
 MinPrice=Min. prezzo di vendita
 CantBeLessThanMinPrice=Il prezzo di vendita non può essere inferiore al minimo consentito per questo prodotto ( %s IVA esclusa)
@@ -89,11 +91,11 @@ NoteNotVisibleOnBill=Nota (non visibile su fatture, proposte ...)
 ServiceLimitedDuration=Se il prodotto è un servizio di durata limitata:
 MultiPricesAbility=Several segment of prices per product/service (each customer is in one segment)
 MultiPricesNumPrices=Numero di prezzi per il multi-prezzi
-AssociatedProductsAbility=Activate the feature to manage virtual products
+AssociatedProductsAbility=Attiva la funzione per gestire i prodotti virtuali
 AssociatedProducts=Prodotti associati
 AssociatedProductsNumber=Numero di prodotti associati
 ParentProductsNumber=Numero di prodotti associati che includono questo sottoprodotto
-ParentProducts=Parent products
+ParentProducts=Prodotti genitore
 IfZeroItIsNotAVirtualProduct=Se 0, questo non è un prodotto virtuale
 IfZeroItIsNotUsedByVirtualProduct=Se 0, questo prodotto non è usata da alcun prodotto virtuale
 Translation=Traduzione
@@ -101,7 +103,7 @@ KeywordFilter=Filtro per parola chiave
 CategoryFilter=Filtro categoria
 ProductToAddSearch=Cerca prodotto da aggiungere
 NoMatchFound=Nessun risultato trovato
-ListOfProductsServices=List of products/services
+ListOfProductsServices=Elenco prodotti/servizi
 ProductAssociationList=Elenco dei prodotti / servizi che sono componente di questo prodotto / pacchetto virtuale
 ProductParentList=Elenco dei prodotti/servizi comprendenti questo prodotto
 ErrorAssociationIsFatherOfThis=Uno dei prodotti selezionati è padre dell'attuale prodotto
@@ -127,7 +129,7 @@ PredefinedProductsAndServicesToSell=Prodotti/servizi predefiniti per la vendita
 PredefinedProductsToPurchase=Prodotti predefiniti per l'acquisto
 PredefinedServicesToPurchase=Servizi predefiniti per l'acquisto
 PredefinedProductsAndServicesToPurchase=Prodotti/servizi predefiniti per l'acquisto
-NotPredefinedProducts=Not predefined products/services
+NotPredefinedProducts=Nessun prodotto/servizio predefinito
 GenerateThumb=Genera miniatura
 ServiceNb=Servizio non %s
 ListProductServiceByPopularity=Elenco dei prodotti/servizi per popolarità
@@ -136,10 +138,11 @@ ListServiceByPopularity=Elenco dei servizi per popolarità
 Finished=Prodotto creato
 RowMaterial=Materia prima
 CloneProduct=Clona prodotto/servizio
-ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b>?
+ConfirmCloneProduct=Vuoi davvero clonare il prodotto / servizio <b> %s </b>?
 CloneContentProduct=Clona tutte le principali informazioni del prodotto/servizio
 ClonePricesProduct=Clona principali informazioni e prezzi
 CloneCompositionProduct=Clona prodotto / servizio pacchetto
+CloneCombinationsProduct=Clone product variants
 ProductIsUsed=Questo prodotto è in uso
 NewRefForClone=Rif. del nuovo prodotto/servizio
 SellingPrices=Prezzi di vendita
@@ -207,7 +210,7 @@ BarCodeDataForProduct=Informazioni codice a barre del prodotto %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=Prezzi diversi in base al cliente
-PriceCatalogue=A single sell price per product/service
+PriceCatalogue=Prezzo singolo di vendita per prodotto/servizio
 PricingRule=Reogle dei prezzi di vendita
 AddCustomerPrice=Aggiungere prezzo dal cliente
 ForceUpdateChildPriceSoc=Imposta lo stesso prezzo per i clienti sussidiari
@@ -227,7 +230,7 @@ DefaultPrice=Prezzo predefinito
 ComposedProductIncDecStock=Aumenta e Diminuisci le scorte alla modifica del prodotto padre
 ComposedProduct=Sottoprodotto
 MinSupplierPrice=Prezzo fornitore minimo
-MinCustomerPrice=Minimum customer price
+MinCustomerPrice=Minimo prezzo di vendita
 DynamicPriceConfiguration=Configurazione dinamica dei prezzi
 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 and if the variable need an automatic update, the external URL to use to ask Dolibarr to update automaticaly the value.
 AddVariable=Add Variable
@@ -236,7 +239,7 @@ GlobalVariables=Variabili globali
 VariableToUpdate=Variable to update
 GlobalVariableUpdaters=Aggiornamento variabili globali
 UpdateInterval=Frequenza di aggiornamento (in minuti)
-LastUpdated=Ultimo aggiornamento
+LastUpdated=Latest update
 CorrectlyUpdated=Aggiornato correttamente
 PropalMergePdfProductActualFile=I file utilizzano per aggiungere in PDF Azzurra sono / è
 PropalMergePdfProductChooseFile=Selezionare i file PDF
@@ -244,16 +247,53 @@ IncludingProductWithTag=Compreso prodotto/servizio con tag
 DefaultPriceRealPriceMayDependOnCustomer=Prezzo predefinito, prezzo reale può dipendere cliente
 WarningSelectOneDocument=Seleziona almeno un documento
 DefaultUnitToShow=Unità
-NbOfQtyInProposals=Qty in proposals
+NbOfQtyInProposals=Q.ta in proposte
 ClinkOnALinkOfColumn=Click on a link of column %s to get a detailed view...
-TranslatedLabel=Translated label
-TranslatedDescription=Translated description
-TranslatedNote=Translated notes
-ProductWeight=Weight for 1 product
-ProductVolume=Volume for 1 product
+TranslatedLabel=Etichetta tradotta
+TranslatedDescription=Descrizione tradotta
+TranslatedNote=Note tradotte
+ProductWeight=Peso per 1 prodotto
+ProductVolume=Volume per 1 prodotto
 WeightUnits=Unità di peso
 VolumeUnits=Unità di volume
 SizeUnits=Unità di misura
 DeleteProductBuyPrice=Cancella prezzo di acquisto
 ConfirmDeleteProductBuyPrice=Vuoi davvero eliminare questo prezzo di acquisto? 
+SubProduct=Sub product
 
+#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
+ProductCombinations=Variants
+HideProductCombinations=Hide products variant in the products selector
+ProductCombination=Variant
+NewProductCombination=New variant
+EditProductCombination=Editing variant
+ProductCombinationGenerator=Variants generator
+Features=Features
+PriceImpact=Price impact
+WeightImpact=Weight impact
+NewProductAttribute=Nuovo attributo
+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
+PercentageVariation=Percentage variation
+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 child products
+ConfirmCloneProductCombinations=Would you like to copy all the product variant to the 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
diff --git a/htdocs/langs/it_IT/projects.lang b/htdocs/langs/it_IT/projects.lang
index 1413a43eae7..c94a449c4c4 100644
--- a/htdocs/langs/it_IT/projects.lang
+++ b/htdocs/langs/it_IT/projects.lang
@@ -30,8 +30,8 @@ DeleteATask=Cancella un compito
 ConfirmDeleteAProject=Are you sure you want to delete this project?
 ConfirmDeleteATask=Are you sure you want to delete this task?
 OpenedProjects=Progetti aperti
-OpenedTasks=Open tasks
-OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
+OpenedTasks=Compiti aperti
+OpportunitiesStatusForOpenedProjects=Opportunità numero di progetti aperti per stato
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=Visualizza progetto
 SetProject=Imposta progetto
@@ -58,6 +58,7 @@ TaskDateEnd=Data fine attività
 TaskDescription=Descrizione attività
 NewTask=Nuovo compito
 AddTask=Crea attività
+AddTimeSpent=Create time spent
 Activity=Operatività
 Activities=Compiti/operatività
 MyActivities=I miei compiti / operatività
@@ -95,6 +96,7 @@ ValidateProject=Convalida progetto
 ConfirmValidateProject=Are you sure you want to validate this project?
 CloseAProject=Chiudi il progetto
 ConfirmCloseAProject=Are you sure you want to close this project?
+AlsoCloseAProject=Also close project (keep it open if you still need to follow production tasks on it)
 ReOpenAProject=Apri progetto
 ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=Contatti del progetto
@@ -120,7 +122,7 @@ CloneProjectFiles=Clona progetto con file collegati
 CloneTaskFiles=Clona i file collegati alle(a) attività (se le(a) attività sono clonate)
 CloneMoveDate=Update project/tasks dates from now?
 ConfirmCloneProject=Are you sure to clone this project?
-ProjectReportDate=Cambia la data del compito a seconda della data di inizio progetto
+ProjectReportDate=Change task dates according to new project start date
 ErrorShiftTaskDate=Impossibile cambiare la data del compito a seconda della data di inizio del progetto
 ProjectsAndTasksLines=Progetti e compiti
 ProjectCreatedInDolibarr=Progetto %s creato
@@ -179,7 +181,7 @@ IdTaskTime=Tempo compito id
 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.
 OpenedProjectsByThirdparties=Progetti aperti da terze parti
 OnlyOpportunitiesShort=Only opportunities
-OpenedOpportunitiesShort=Open opportunities
+OpenedOpportunitiesShort=Opened opportunities
 NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Opportunità importo totale
 OpportunityPonderatedAmount=Opportunità importo ponderato
diff --git a/htdocs/langs/it_IT/propal.lang b/htdocs/langs/it_IT/propal.lang
index 1d03ea3502b..e94794c1ec8 100644
--- a/htdocs/langs/it_IT/propal.lang
+++ b/htdocs/langs/it_IT/propal.lang
@@ -13,8 +13,8 @@ Prospect=Potenziale cliente
 DeleteProp=Elimina proposta commerciale
 ValidateProp=Convalida proposta commerciale
 AddProp=Crea proposta
-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=Vuoi davvero eliminare questa proposta commerciale?
+ConfirmValidateProp=Vuoi davvero convalidare questa proposta commerciale con il riferimento <b>%s</b>?
 LastPropals=Ultime %s proposte
 LastModifiedProposals=Ultime %s proposte modificate
 AllPropals=Tutte le proposte
@@ -28,7 +28,7 @@ ShowPropal=Visualizza proposta
 PropalsDraft=Bozze
 PropalsOpened=Aperto
 PropalStatusDraft=Bozza (deve essere convalidata)
-PropalStatusValidated=Convalidato (proposta è aperta)
+PropalStatusValidated=Validated (proposal is opened)
 PropalStatusSigned=Firmata (da fatturare)
 PropalStatusNotSigned=Non firmata (chiuso)
 PropalStatusBilled=Fatturata
@@ -56,8 +56,8 @@ CreateEmptyPropal=Crea proposta commerciale vuota o dalla lista dei prodotti / s
 DefaultProposalDurationValidity=Durata di validità predefinita per proposta commerciale (in giorni)
 UseCustomerContactAsPropalRecipientIfExist=Utilizzare l'indirizzo del contatto cliente se definito al posto dell'indirizzo del destinatario
 ClonePropal=Clona proposta commerciale
-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=Vuoi davvero clonare la proposta commerciale <b>%s</b>?
+ConfirmReOpenProp=Vuoi davvero riaprire la proposta commerciale <b>%s</b>?
 ProposalsAndProposalsLines=Proposta commerciale e le linee
 ProposalLine=Linea della proposta
 AvailabilityPeriod=Tempi di consegna
diff --git a/htdocs/langs/it_IT/stocks.lang b/htdocs/langs/it_IT/stocks.lang
index 18b4af6ff45..f0fa48ccc0f 100644
--- a/htdocs/langs/it_IT/stocks.lang
+++ b/htdocs/langs/it_IT/stocks.lang
@@ -22,13 +22,15 @@ Movements=Movimenti
 ErrorWarehouseRefRequired=Riferimento magazzino mancante
 ListOfWarehouses=Elenco magazzini
 ListOfStockMovements=Elenco movimenti delle scorte
+StockMovementForId=Movement ID %d
+ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Area magazzino e scorte
 Location=Ubicazione
 LocationSummary=Ubicazione abbreviata
 NumberOfDifferentProducts=Numero di differenti prodotti
 NumberOfProducts=Numero totale prodotti
-LastMovement=Ultimo movimento
-LastMovements=Ultimi movimenti
+LastMovement=Latest movement
+LastMovements=Latest movements
 Units=Unità
 Unit=Unità
 StockCorrection=Variazione manuale scorte
@@ -140,3 +142,4 @@ ProductStockWarehouseCreated=Stock limit for alert and desired optimal stock cor
 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
diff --git a/htdocs/langs/it_IT/supplier_proposal.lang b/htdocs/langs/it_IT/supplier_proposal.lang
index c321a7698eb..39c753e7919 100644
--- a/htdocs/langs/it_IT/supplier_proposal.lang
+++ b/htdocs/langs/it_IT/supplier_proposal.lang
@@ -8,7 +8,7 @@ SearchRequest=Cerca quotazione
 DraftRequests=Quotazioni in bozza
 SupplierProposalsDraft=Bozza di proposta fornitore
 LastModifiedRequests=Ultime %s richieste di quotazione modificate
-RequestsOpened=Apri richieste di quotazione
+RequestsOpened=Opened price requests
 SupplierProposalArea=Area proposte commerciali fornitori
 SupplierProposalShort=Proposta fornitore
 SupplierProposals=Proposte Fornitore
@@ -23,7 +23,7 @@ ConfirmValidateAsk=Vuoi davvero convalidare la richiesta di quotazione con il no
 DeleteAsk=Elimina richiesta
 ValidateAsk=Convalida richiesta
 SupplierProposalStatusDraft=Bozza (deve essere convalidata)
-SupplierProposalStatusValidated=Convalidata (quotazione aperta)
+SupplierProposalStatusValidated=Validated (request is opened)
 SupplierProposalStatusClosed=Chiusa
 SupplierProposalStatusSigned=Accettata
 SupplierProposalStatusNotSigned=Rifiutata
diff --git a/htdocs/langs/it_IT/suppliers.lang b/htdocs/langs/it_IT/suppliers.lang
index 0bb5014f60b..682d735afa4 100644
--- a/htdocs/langs/it_IT/suppliers.lang
+++ b/htdocs/langs/it_IT/suppliers.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - suppliers
 Suppliers=Fornitori
 SuppliersInvoice=Fattura Fornitore
-ShowSupplierInvoice=Show Supplier Invoice
+ShowSupplierInvoice=Mostra fatture fornitore
 NewSupplier=Nuovo fornitore
 History=Storico
 ListOfSuppliers=Elenco fornitori
@@ -10,10 +10,10 @@ OrderDate=Data ordine
 BuyingPriceMin=Miglior prezzo di acquisto
 BuyingPriceMinShort=Miglior prezzo di acquisto
 TotalBuyingPriceMinShort=Prezzi di acquisto dei sottoprodotti
-TotalSellingPriceMinShort=Total of subproducts selling prices
+TotalSellingPriceMinShort=Totale dei prezzi di vendita dei sotto-prodotti
 SomeSubProductHaveNoPrices=Per alcuni sottoprodotti non è stato definito un prezzo
 AddSupplierPrice=Aggiungi prezzo di acquisto
-ChangeSupplierPrice=Change buying price
+ChangeSupplierPrice=Cambia prezzo di acquisto
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=Il fornitore di riferimento è già associato a un prodotto: %s
 NoRecordedSuppliers=Non ci sono fornitori registrati
 SupplierPayment=Pagamento fornitore
@@ -24,10 +24,10 @@ ExportDataset_fournisseur_1=Fatture fornitore e linee di fattura
 ExportDataset_fournisseur_2=Fatture fornitore e pagamenti
 ExportDataset_fournisseur_3=Ordini fornitore e righe degli ordini
 ApproveThisOrder=Approva l'ordine
-ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b>?
-DenyingThisOrder=Deny this order
-ConfirmDenyingThisOrder=Are you sure you want to deny this order <b>%s</b>?
-ConfirmCancelThisOrder=Are you sure you want to cancel this order <b>%s</b>?
+ConfirmApproveThisOrder=Sei sicuro di voler approvare l'ordine <b>%s</b>?
+DenyingThisOrder=Nega questo ordine
+ConfirmDenyingThisOrder=Sei sicuro di voler negare l'ordine <b>%s</b>?
+ConfirmCancelThisOrder=Sei sicuro di voler eliminare l'ordine <b>%s</b>?
 AddSupplierOrder=Crea ordine fornitore
 AddSupplierInvoice=Crea fattura fornitore
 ListOfSupplierProductForSupplier=Elenco prodotti e prezzi per il fornitore <b>%s</b>
@@ -35,9 +35,10 @@ SentToSuppliers=Inviato ai fornitori
 ListOfSupplierOrders=Elenco ordini fornitori
 MenuOrdersSupplierToBill=Ordini fornitori in fatture
 NbDaysToDelivery=Tempi di consegna in giorni
-DescNbDaysToDelivery=The biggest deliver delay of the products from this order
+DescNbDaysToDelivery=Il maggior ritardo nella consegna dei prodotti da questo ordine
 SupplierReputation=Reputazione fornitore
 DoNotOrderThisProductToThisSupplier=Non ordinare
 NotTheGoodQualitySupplier=Cattiva qualità
 ReputationForThisProduct=Reputazione
-BuyerName=Buyer name
+BuyerName=Nome acquirente
+AllProductServicePrices=All product / service prices
diff --git a/htdocs/langs/it_IT/withdrawals.lang b/htdocs/langs/it_IT/withdrawals.lang
index 5927f505ceb..3137c31fafd 100644
--- a/htdocs/langs/it_IT/withdrawals.lang
+++ b/htdocs/langs/it_IT/withdrawals.lang
@@ -24,6 +24,7 @@ WithdrawStatistics=Direct debit payment statistics
 WithdrawRejectStatistics=Direct debit payment reject statistics
 LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
+WithdrawRequestsDone=%s direct debit payment requests recorded
 ThirdPartyBankCode=Codice bancario di soggetti terzi
 NoInvoiceCouldBeWithdrawed=Non ci sono fatture riscuotibili con domiciliazione. Verificare che sulle fatture sia riportato il corretto codice IBAN.
 ClassCredited=Classifica come accreditata
@@ -76,8 +77,8 @@ RUM=UMR
 RUMLong=Unique Mandate Reference
 RUMWillBeGenerated=UMR number will be generated once bank account information are saved
 WithdrawMode=Direct debit mode (FRST or RECUR)
-WithdrawRequestAmount=Withdraw request amount:
-WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil amount.
+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
diff --git a/htdocs/langs/ja_JP/accountancy.lang b/htdocs/langs/ja_JP/accountancy.lang
index 3c01ff7c644..2db54463087 100644
--- a/htdocs/langs/ja_JP/accountancy.lang
+++ b/htdocs/langs/ja_JP/accountancy.lang
@@ -14,7 +14,7 @@ DefaultForService=Default for service
 DefaultForProduct=Default for product
 CantSuggest=Can't suggest
 AccountancySetupDoneFromAccountancyMenu=Most setup of the accountancy is done from the menu %s
-ConfigAccountingExpert=Configuration of the module accounting expert
+ConfigAccountingExpert=モジュール会計専門家の構成
 Journalization=Journalization
 Journaux=Journals
 JournalFinancial=Financial journals
@@ -194,6 +194,8 @@ ChangeBinding=Change the binding
 
 ## Admin
 ApplyMassCategories=Apply mass categories
+AddAccountFromBookKeepingWithNoCategories=Add acccount already used with no categories
+CategoryDeleted=Category for the accounting account has been removed
 
 ## Export
 Exports=Exports
@@ -209,6 +211,7 @@ Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution
 Modelcsv_quadratus=Export towards Quadratus QuadraCompta
 Modelcsv_ebp=Export towards EBP
 Modelcsv_cogilog=Export towards Cogilog
+ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
 InitAccountancy=Init accountancy
diff --git a/htdocs/langs/ja_JP/admin.lang b/htdocs/langs/ja_JP/admin.lang
index 418b6add6b0..c638d42a68b 100644
--- a/htdocs/langs/ja_JP/admin.lang
+++ b/htdocs/langs/ja_JP/admin.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - admin
-Foundation=Foundation
+Foundation=財団
 Version=バージョン
 VersionProgram=バージョンのプログラム
 VersionLastInstall=Initial install version
@@ -9,14 +9,20 @@ VersionDevelopment=開発
 VersionUnknown=未知の
 VersionRecommanded=推奨される
 FileCheck=Files integrity checker
-FileCheckDesc=This tool allows you to check the integrity of files of your application, comparing each files with the official ones. You can use this tool to detect if some files were modified by a hacker for example.
+FileCheckDesc=This tool allows you to check the integrity of files and setup of your application, comparing each files with the official ones. 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.
+FileIntegrityIsStrictlyConformedWithReference=Files integrity is strictly conformed with the reference.
+FileIntegrityIsOkButFilesWereAdded=Files integrity check has passed, however some new files were added.
+FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified, removed or added.
+GlobalChecksum=Global checksum
 MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
 LocalSignature=Embedded local signature (less reliable)
 RemoteSignature=Remote distant signature (more reliable)
 FilesMissing=Missing Files
 FilesUpdated=Updated Files
+FilesModified=Modified Files
+FilesAdded=Added Files
 FileCheckDolibarr=Check integrity of application files
-AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from a certified package
+AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from an official package
 XmlNotFound=Xml Integrity File of application not found
 SessionId=セッションID
 SessionSaveHandler=セッションを保存するためのハンドラ
@@ -185,7 +191,9 @@ BoxesDesc=Widgets are components showing some information that you can add to pe
 OnlyActiveElementsAreShown=から要素のみ<a href="%s">対応のモジュールが</a>表示されます。
 ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
-ModulesMarketPlaces=複数のモジュール...
+ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
+ModulesMarketPlaces=Find external modules...
+GoModuleSetupArea=To deploy/install a new module, go onto the Module setup area at <a href="%s">%s</a>.
 DoliStoreDesc=DoliStore、Dolibarr ERP / CRM外部モジュールのための公式の市場の場所
 DoliPartnersDesc=List of companies providing custom developed modules or features (Note: anyone experienced in PHP programming can provide custom development for an open source project)
 WebSiteDesc=Reference websites to find more modules...
@@ -276,21 +284,22 @@ ModuleFamilyInterface=Interfaces with external systems
 MenuHandlers=メニューハンドラ
 MenuAdmin=メニューエディタ
 DoNotUseInProduction=Do not use in production
-ThisIsProcessToFollow=これは、プロセスのセットアップです。
-ThisIsAlternativeProcessToFollow=This is an alternative setup to process:
+ThisIsProcessToFollow=This is steps to process:
+ThisIsAlternativeProcessToFollow=This is an alternative setup to process manually:
 StepNb=ステップ%s
 FindPackageFromWebSite=（公式ウェブサイト%sの例の場合）必要な機能を提供するパッケージを検索します。
 DownloadPackageFromWebSite=Download package (for example from official web site %s).
-UnpackPackageInDolibarrRoot=Unpack package file into Dolibarr server directory dedicated to external modules: <b>%s</b>
-SetupIsReadyForUse=インストールが終了しDolibarrは、この新しいコンポーネントで使用できる状態になっています。
-NotExistsDirect=The alternative root directory is not defined.<br>
-InfDirAlt=Since version 3 it is possible to define an alternative root directory.This allows you to store, same place, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
-InfDirExample=<br>Then declare it in the file conf.php<br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>*These lines are commented with "#", to uncomment only remove the character.
+UnpackPackageInDolibarrRoot=Unpack the packaged files into server directory dedicated to Dolibarr: <b>%s</b>
+UnpackPackageInModulesRoot=To deploy/install an external module, unpack the packaged files into the server directory dedicated to modules: <b>%s</b>
+SetupIsReadyForUse=Module deployment is finished. You must however enable and setup the module in your application by going on the page to setup modules: <a href="%s">%s</a>.
+NotExistsDirect=The alternative root directory is not defined to an existing directory.<br>
+InfDirAlt=Since version 3, it is possible to define an alternative root directory. This allows you to store, into a dedicated directory, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
+InfDirExample=<br>Then declare it in the file <strong>conf.php</strong><br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>If these lines are commented with "#", to enable them, just uncomment by removing the "#" character.
 YouCanSubmitFile=For this step, you can send package using this tool: Select module file
 CurrentVersion=Dolibarr現在のバージョン
 CallUpdatePage=Go to the page that updates the database structure and data: %s.
 LastStableVersion=Latest stable version
-LastActivationDate=Last activation date
+LastActivationDate=Latest activation date
 UpdateServerOffline=Update server offline
 GenericMaskCodes=任意の番号マスクを入力することができます。このマスクには、以下のタグを使用することができます。 <br> <b>{00万}</b>各%sにインクリメントされる番号に対応しています。カウンタの希望の長さなどの多くのゼロとして入力します。カウンタは、マスクとして多くのゼロとして持たせるために、左からゼロで完了する予定です。 <br> <b>{00万000}</b>以前のが、最初の%sから始まる適用されている+記号の右にある数字に対応するオフセットと同じです。 <br> <b>{00万@ x}の</b>前のと同じですが、カウンタが月、xは（1〜12、または0の間でXコンフィギュレーションで定義された会計年度の初めに数ヶ月を使用する）に達したときにゼロにリセットされます。このオプションを使用すると、xが2以上ある場合、その列{YY} {ミリメートル}または{yyyyは} {}ミリメートルも要求されます。 <br> <b>{DD}</b>日（01〜31）。 <br> <b>{}ミリメートル</b>月（01〜12）。 <br> 2、4、または1の数値以上<b>{YY}、{探す}</b>または<b>{Y}</b>年。 <br>
 GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
@@ -373,11 +382,11 @@ ExtrafieldCheckBox=Checkbox
 ExtrafieldRadio=Radio button
 ExtrafieldCheckBoxFromList= Checkbox from table
 ExtrafieldLink=Link to an object
-ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>In order to have the list depending on another :<br>1,value1|parent_list_code:parent_key<br>2,value2|parent_list_code:parent_key
+ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list :<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list :<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
-ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
+ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Example : Societe:societe/class/societe.class.php
 LibraryToBuildPDF=Library used for PDF generation
 WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
@@ -411,10 +420,11 @@ ModuleCompanyCodePanicum=空の会計コードを返します。
 ModuleCompanyCodeDigitaria=会計コードがサードパーティのコードに依存しています。コー​​ドは、文字サードパーティのコードの最初の5文字が続く最初の位置に &quot;C&quot;で構成されています。
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
-
+WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<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).
+ClickToShowDescription=Click to show description
 # Modules
 Module0Name=ユーザーとグループ
-Module0Desc=ユーザーおよびグループの管理
+Module0Desc=Users / Employees and Groups management
 Module1Name=サードパーティ
 Module1Desc=会社と連絡先の管理
 Module2Name=コマーシャル
@@ -478,7 +488,7 @@ Module240Desc=Tool to export Dolibarr data (with assistants)
 Module250Name=データのインポート
 Module250Desc=Tool to import data in Dolibarr  (with assistants)
 Module310Name=メンバー
-Module310Desc=Foundationのメンバーの管理
+Module310Desc=財団のメンバーの管理
 Module320Name=RSSフィード
 Module320Desc=Dolibarr画面のページ内でRSSフィードを追加
 Module330Name=ブックマーク
@@ -515,8 +525,8 @@ Module2200Name=Dynamic Prices
 Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
 Module2300Desc=Scheduled job management
-Module2400Name=Agenda/Events
-Module2400Desc=Follow events or rendez-vous. Record manual events into Agendas or let application logs automatic events for tracking purposes.
+Module2400Name=Events/Agenda
+Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous.
 Module2500Name=電子コンテンツ管理
 Module2500Desc=ドキュメントを保存および共有
 Module2600Name=API/Web services (SOAP server)
@@ -582,7 +592,7 @@ Permission34=製品を削除します。
 Permission36=隠された製品を参照してください/管理
 Permission38=輸出製品
 Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
-Permission42=プロジェクトを（私が連絡している共有プロジェクトとプロジェクト）を作成/変更
+Permission42=Create/modify projects (shared project and projects i'm contact for). Can also create tasks and assign users to project and tasks
 Permission44=（私が連絡している共有プロジェクトとプロジェクト）のプロジェクトを削除します。
 Permission45=Export projects
 Permission61=介入を読む
@@ -685,7 +695,7 @@ PermissionAdvanced253=内部/外部ユーザーおよびアクセス許可を作
 Permission254=変更の作成/外部ユーザーのみ
 Permission255=他のユーザーのパスワードを変更する
 Permission256=他のユーザーを削除するか、または無効にする
-Permission262=すべての第三者（だけでなく、ユーザーにリンクされているもの）へのアクセスを拡張します。外部ユーザー（常に自分自身に限る。）のために有効ではありません。
+Permission262=Extend access to all third parties (not only third parties that user is a sale representative).<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 assignement matters).
 Permission271=CAを読む
 Permission272=請求書をお読みください
 Permission273=問題の請求書
@@ -887,7 +897,7 @@ Offset=オフセット
 AlwaysActive=常にアクティブ
 Upgrade=アップグレード
 MenuUpgrade=拡張/アップグレード
-AddExtensionThemeModuleOrOther=拡張子を追加します（テーマ、モジュール、...）
+AddExtensionThemeModuleOrOther=Deploy/install external module
 WebServer=ウェブサーバー
 DocumentRootServer=Webサーバーのルートディレクトリ
 DataRootServer=データファイルのディレクトリ
@@ -925,8 +935,8 @@ PermanentLeftSearchForm=左側のメニューの恒久的な検索フォーム
 DefaultLanguage=使用する既定の言語（言語コード）
 EnableMultilangInterface=多言語のインターフェイスをイネーブルにします。
 EnableShowLogo=左メニューのロゴを表示する
-CompanyInfo=会社概要/基礎情報
-CompanyIds=会社概要/基礎アイデンティティ
+CompanyInfo=会社/財団情報
+CompanyIds=会社/財団ID
 CompanyName=名
 CompanyAddress=アドレス
 CompanyZip=ZIP
@@ -994,7 +1004,7 @@ TriggerAlwaysActive=このファイル内のトリガーがアクティブにDol
 TriggerActiveAsModuleActive=モジュール<b>%sが</b>有効<b>になっ</b>ているとして、このファイル内のトリガーがアクティブになります。
 GeneratedPasswordDesc=あなたが自動生成されたパスワードを持つように要求した場合、新しいパスワードを生成するために使用するルールがここで定義
 DictionaryDesc=Insert all reference data. You can add your values to the default.
-ConstDesc=This page allows you to edit all other parameters not available in previous pages. These are mostly reserved parameters for developers or advanced troubleshooting.
+ConstDesc=This page allows you to edit all other parameters not available in previous pages. These are mostly reserved parameters for developers or advanced troubleshooting. For a list of options <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">check here</a>.
 MiscellaneousDesc=All other security related parameters are defined here.
 LimitsSetup=制限/精密セットアップ
 LimitsDesc=ここDolibarrで使用される限界、精度と最適化を定義することができます。
@@ -1161,10 +1171,6 @@ FreeLegalTextOnOrders=受注上のフリーテキスト
 WatermarkOnDraftOrders=Watermark on draft orders (none if empty)
 ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable
 BANK_ASK_PAYMENT_BANK_DURING_ORDER=Ask for bank account destination of order
-##### Clicktodial #####
-ClickToDialSetup=モジュールのセットアップをダイヤルする]をクリックします
-ClickToDialUrlDesc=電話ピクトをクリックしが行われるときに、URLと呼ばれる。 URLでは、タグを使用することができます<br>呼び出すために人の電話番号に置き換えられます<b>__PHONETO__</b> <br>呼び出し人の電話番号（あなた）に置き換えられます<b>__PHONEFROM__</b> <br>あなたのclicktodialログイン（ユーザーカードに定義されています）に置き換えられます<b>__LOGIN__</b> <br>あなたのclicktodialパスワード（ユーザーカードに定義されています）に置き換えられます<b>__PASS__。</b>
-##### Bookmark4u #####
 ##### Interventions #####
 InterventionsSetup=介入モジュールのセットアップ
 FreeLegalTextOnInterventions=介入のドキュメント上でフリーテキスト
@@ -1198,7 +1204,7 @@ LDAPNamingAttribute=LDAP内のキー
 LDAPSynchronizeUsers=LDAP内のユーザーの組織
 LDAPSynchronizeGroups=LDAPのグループの組織
 LDAPSynchronizeContacts=LDAPの連絡組織
-LDAPSynchronizeMembers=LDAPの基礎のメンバーの組織
+LDAPSynchronizeMembers=LDAPの財団のメンバーの組織
 LDAPPrimaryServer=プライマリサーバ
 LDAPSecondaryServer=セカンダリサーバ
 LDAPServerPort=サーバポート
@@ -1391,7 +1397,7 @@ SendingsSetup=送信モジュールのセットアップ
 SendingsReceiptModel=領収書のモデルを送信する
 SendingsNumberingModules=モジュールの番号Sendings
 SendingsAbility=Support shipping sheets for customer deliveries
-NoNeedForDeliveryReceipts=ほとんどの場合、sendingsの領収書は、お客様の納品（送信する製品のリスト）とreceviedと顧客によって署名されたシートのシートの両方に使用されます。したがって、製品の納入の領収書は複製機能であり、まれに活性化されていません。
+NoNeedForDeliveryReceipts=In most cases, shipping sheets are used both as sheets for customer deliveries (list of products to send) and sheets that is received and signed by customer. So product deliveries receipts is a duplicated feature and is rarely activated.
 FreeLegalTextOnShippings=Free text on shipments
 ##### Deliveries #####
 DeliveryOrderNumberingModules=製品の納入領収書ナンバリングモジュール
@@ -1471,7 +1477,11 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Set automatically this default value for type of e
 AGENDA_DEFAULT_FILTER_TYPE=Set automatically this type of event into search filter of agenda view
 AGENDA_DEFAULT_FILTER_STATUS=Set automatically this status for events into search filter of agenda view
 AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
-##### ClickToDial #####
+AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
+AGENDA_NOTIFICATION_SOUND=Enable sound notification
+##### Clicktodial #####
+ClickToDialSetup=モジュールのセットアップをダイヤルする]をクリックします
+ClickToDialUrlDesc=電話ピクトをクリックしが行われるときに、URLと呼ばれる。 URLでは、タグを使用することができます<br>呼び出すために人の電話番号に置き換えられます<b>__PHONETO__</b> <br>呼び出し人の電話番号（あなた）に置き換えられます<b>__PHONEFROM__</b> <br>あなたのclicktodialログイン（ユーザーカードに定義されています）に置き換えられます<b>__LOGIN__</b> <br>あなたのclicktodialパスワード（ユーザーカードに定義されています）に置き換えられます<b>__PASS__。</b>
 ClickToDialDesc=This module allows to make phone numbers clickable. A click on this icon will call make your phone to 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.
 ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
 ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on same computer than the browser, and called when you click on a link in your browser that start 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.
@@ -1499,10 +1509,11 @@ EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint availa
 ##### API ####
 ApiSetup=API module setup
 ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
-ApiProductionMode=Enable production mode (this will activate use of a caches for services management)
+ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
 ApiExporerIs=You can explore the APIs at url
 OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
 ApiKey=Key for API
+WarningAPIExplorerDisabled=The API explorer has been disabled. API explorer is not required to provide API services. It is a tool for developer to find/test REST APIs. If you need this tool, go into setup of module API REST to activate it.
 ##### Bank #####
 BankSetupModule=銀行のモジュールのセットアップ
 FreeLegalTextOnChequeReceipts=チェック領収書上のフリーテキスト
@@ -1571,7 +1582,7 @@ BackupDumpWizard=Wizard to build database backup dump file
 SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
 SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is only manual steps a privileged user can do.
 InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
-ConfFileMuseContainCustom=Installing an external module from application save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to have option<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
+ConfFileMuseContainCustom=Installing an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
 HighlightLinesColor=Highlight color of the line when the mouse passes over (keep empty for no highlight)
 TextTitleColor=Color of page title
@@ -1601,6 +1612,7 @@ FixTZ=TimeZone fix
 FillFixTZOnlyIfRequired=Example: +2 (fill only if problem experienced)
 ExpectedChecksum=Expected Checksum
 CurrentChecksum=Current Checksum
+ForcedConstants=Required constant values
 MailToSendProposal=To send customer proposal
 MailToSendOrder=To send customer order
 MailToSendInvoice=To send customer invoice
@@ -1609,13 +1621,14 @@ MailToSendIntervention=To send intervention
 MailToSendSupplierRequestForQuotation=To send quotation request to supplier
 MailToSendSupplierOrder=To send supplier order
 MailToSendSupplierInvoice=To send supplier invoice
+MailToSendContract=To send a contract
 MailToThirdparty=To send email from third party page
 ByDefaultInList=Show by default on list view
-YouUseLastStableVersion=You use the last stable version
+YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
 TitleExampleForMaintenanceRelease=Example of message you can use to announce this maintenance release (feel free to use it on your web sites)
-ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. You can download it from the download area of http://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.
-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, nor data structure change is present into this version. You can download it from the download area of http://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.
+ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. 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.
+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, nor data structure change is present into 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, you can enter here rule to have price for each level autocalculated according to price of first level, so you will have to enter only price for first level on each product. This page is here to save you time and can be usefull only if your prices for each leve are relative to first level. You can ignore this page in most cases.
 ModelModulesProduct=Templates for product documents
 ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
diff --git a/htdocs/langs/ja_JP/banks.lang b/htdocs/langs/ja_JP/banks.lang
index ca4390753ed..77d477b49e5 100644
--- a/htdocs/langs/ja_JP/banks.lang
+++ b/htdocs/langs/ja_JP/banks.lang
@@ -74,13 +74,13 @@ Conciliate=調整する
 Conciliation=和解
 ReconciliationLate=Reconciliation late
 IncludeClosedAccount=閉じたアカウントを含める
-OnlyOpenedAccount=Only open accounts
+OnlyOpenedAccount=唯一開かれたアカウント
 AccountToCredit=クレジットのアカウント
 AccountToDebit=振替にアカウント
 DisableConciliation=このアカウントのための調整機能を無効にする
 ConciliationDisabled=和解の機能が無効になって
 LinkedToAConciliatedTransaction=Linked to a conciliated entry
-StatusAccountOpened=開く
+StatusAccountOpened=開かれた
 StatusAccountClosed=閉じ
 AccountIdShort=数
 LineRecord=トランザクション
diff --git a/htdocs/langs/ja_JP/bills.lang b/htdocs/langs/ja_JP/bills.lang
index 79002ffcc57..7a066164acb 100644
--- a/htdocs/langs/ja_JP/bills.lang
+++ b/htdocs/langs/ja_JP/bills.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - bills
 Bill=請求書
 Bills=請求書
-BillsCustomers=顧客の請求書
-BillsCustomer=Customers invoice
-BillsSuppliers=仕入先の請求書
-BillsCustomersUnpaid=未払いの顧客の請求書
-BillsCustomersUnpaidForCompany=%sのために未払いの顧客の請求書
-BillsSuppliersUnpaid=未払いの仕入先の請求書
-BillsSuppliersUnpaidForCompany=%sのために未払いの仕入先の請求書
+BillsCustomers=Customer invoices
+BillsCustomer=得意先請求書
+BillsSuppliers=Supplier invoices
+BillsCustomersUnpaid=Unpaid customer invoices
+BillsCustomersUnpaidForCompany=Unpaid customer invoices for %s
+BillsSuppliersUnpaid=Unpaid supplier invoices
+BillsSuppliersUnpaidForCompany=Unpaid supplier invoices for %s
 BillsLate=支払い遅延
 BillsStatistics=Customers invoices statistics
 BillsStatisticsSuppliers=Suppliers invoices statistics
@@ -62,8 +62,8 @@ PaymentsBack=背中の支払い
 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 credit note or deposit 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.
+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.
 SupplierPayments=仕入先の支払
 ReceivedPayments=受け取った支払い
 ReceivedCustomersPayments=顧客から受け取った支払
@@ -78,6 +78,7 @@ PaymentMode=お支払い方法の種類
 PaymentTypeDC=Debit/Credit Card
 PaymentTypePP=PayPal
 IdPaymentMode=Payment type (id)
+CodePaymentMode=Payment type (code)
 LabelPaymentMode=Payment type (label)
 PaymentModeShort=お支払い方法の種類
 PaymentTerm=支払期間
@@ -102,9 +103,10 @@ SearchACustomerInvoice=顧客の請求書の検索
 SearchASupplierInvoice=仕入先請求書の検索
 CancelBill=請求書を取り消す
 SendRemindByMail=電子メールでリマインダを送信
-DoPayment=支払いを行う
-DoPaymentBack=戻って支払いを行う
+DoPayment=Enter payment
+DoPaymentBack=Enter refund
 ConvertToReduc=将来の割引に変換
+ConvertExcessReceivedToReduc=Convert excess received into future discount
 EnterPaymentReceivedFromCustomer=顧客から受け取った支払を入力します。
 EnterPaymentDueToCustomer=顧客のために支払いをする
 DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
@@ -113,22 +115,24 @@ BillStatus=請求書の状況
 StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=ドラフト（検証する必要があります）
 BillStatusPaid=有料
-BillStatusPaidBackOrConverted=有料または割引に変換
+BillStatusPaidBackOrConverted=Refund or converted into discount
 BillStatusConverted=（最終的な請求書の準備ができて）支払わ
 BillStatusCanceled=放棄された
 BillStatusValidated=（お支払いする必要があります）を検証
 BillStatusStarted=開始
 BillStatusNotPaid=支払われない
+BillStatusNotRefunded=Not refunded
 BillStatusClosedUnpaid=クローズ（無給）
 BillStatusClosedPaidPartially=有料（一部）
 BillShortStatusDraft=ドラフト
 BillShortStatusPaid=有料
-BillShortStatusPaidBackOrConverted=処理
+BillShortStatusPaidBackOrConverted=Refund or converted
 BillShortStatusConverted=処理
 BillShortStatusCanceled=放棄された
 BillShortStatusValidated=検証
 BillShortStatusStarted=開始
 BillShortStatusNotPaid=支払われない
+BillShortStatusNotRefunded=Not refunded
 BillShortStatusClosedUnpaid=閉じた
 BillShortStatusClosedPaidPartially=有料（一部）
 PaymentStatusToValidShort=検証するには
@@ -149,14 +153,14 @@ NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified
 FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
 NotARecurringInvoiceTemplate=Not a recurring template invoice
 NewBill=新しい請求書
-LastBills=最後%sの請求書
-LastCustomersBills=最後%sのお客様の請求書
-LastSuppliersBills=最後%sサプライヤーの請求書
+LastBills=Latest %s invoices
+LastCustomersBills=Latest %s customer invoices
+LastSuppliersBills=Latest %s supplier invoices
 AllBills=すべての請求書
 OtherBills=他の請求書
 DraftBills=ドラフトの請求書
-CustomersDraftInvoices=お客様のドラフトの請求書
-SuppliersDraftInvoices=サプライヤードラフトの請求書
+CustomersDraftInvoices=Customer draft invoices
+SuppliersDraftInvoices=Supplier draft invoices
 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>?
@@ -203,7 +207,7 @@ AlreadyPaidNoCreditNotesNoDeposits=すでに支払った（クレジットメモ
 Abandoned=放棄された
 RemainderToPay=Remaining unpaid
 RemainderToTake=Remaining amount to take
-RemainderToPayBack=Remaining amount to pay back
+RemainderToPayBack=Remaining amount to refund
 Rest=Pending
 AmountExpected=量が主張
 ExcessReceived=過剰は、受信した
@@ -270,6 +274,7 @@ Deposit=預金
 Deposits=預金
 DiscountFromCreditNote=クレジットノート%sから割引
 DiscountFromDeposit=預金請求書%sからの支払い
+DiscountFromExcessReceived=Payments from excess received of invoice %s
 AbsoluteDiscountUse=クレジットこの種のは、その検証の前に請求書に使用することができます
 CreditNoteDepositUse=Invoice must be validated to use this kind of credits
 NewGlobalDiscount=新しい絶対割引
@@ -277,8 +282,8 @@ NewRelativeDiscount=新しい相対的な割引
 NoteReason=（注）/理由
 ReasonDiscount=理由
 DiscountOfferedBy=によって付与された
-DiscountStillRemaining=まだ残っている割引
-DiscountAlreadyCounted=割引はすでにカウント
+DiscountStillRemaining=Discounts available
+DiscountAlreadyCounted=Discounts already consumed
 BillAddress=ビル·アドレス
 HelpEscompte=この割引は、その支払いが長期前に行われたため、顧客に付与された割引です。
 HelpAbandonBadCustomer=この金額は、放棄されている（顧客が悪い顧客であると）と卓越した緩いとみなされます。
@@ -331,10 +336,12 @@ 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
 # PaymentConditions
 Statut=ステータス
-PaymentConditionShortRECEP=即時の
-PaymentConditionRECEP=即時の
+PaymentConditionShortRECEP=Due Upon Receipt
+PaymentConditionRECEP=Due Upon Receipt
 PaymentConditionShort30D=30日
 PaymentCondition30D=30日
 PaymentConditionShort30DENDMONTH=30 days of month-end
@@ -349,6 +356,14 @@ PaymentConditionShortPT_ORDER=オーダー
 PaymentConditionPT_ORDER=On order
 PaymentConditionShortPT_5050=50-50
 PaymentConditionPT_5050=50%% in advance, 50%% on delivery
+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
 FixAmount=Fix amount
 VarAmount=Variable amount (%% tot.)
 # PaymentType
@@ -418,7 +433,7 @@ ChequeDeposits=チェックの預金
 Cheques=かどうかをチェック
 DepositId=Id deposit
 NbCheque=Number of checks
-CreditNoteConvertedIntoDiscount=このクレジットメモまたは入金請求書は%sに変換された
+CreditNoteConvertedIntoDiscount=This %s has been converted into %s
 UsBillingContactAsIncoiveRecipientIfExist=請求書の受信者として顧客の請求の連絡先アドレスの代わりにサードパーティのアドレスを使用する
 ShowUnpaidAll=すべての未払いの請求書を表示する
 ShowUnpaidLateOnly=後半未払いの請求書のみを表示
diff --git a/htdocs/langs/ja_JP/boxes.lang b/htdocs/langs/ja_JP/boxes.lang
index e521293028a..be819d394ae 100644
--- a/htdocs/langs/ja_JP/boxes.lang
+++ b/htdocs/langs/ja_JP/boxes.lang
@@ -25,8 +25,8 @@ BoxTitleLastSuppliers=Latest %s recorded suppliers
 BoxTitleLastModifiedSuppliers=Latest %s modified suppliers
 BoxTitleLastModifiedCustomers=Latest %s modified customers
 BoxTitleLastCustomersOrProspects=Latest %s customers or prospects
-BoxTitleLastCustomerBills=Latest %s customer's invoices
-BoxTitleLastSupplierBills=Latest %s supplier's invoices
+BoxTitleLastCustomerBills=Latest %s customer invoices
+BoxTitleLastSupplierBills=Latest %s supplier invoices
 BoxTitleLastModifiedProspects=Latest %s modified prospects
 BoxTitleLastModifiedMembers=Latest %s members
 BoxTitleLastFicheInter=Latest %s modified interventions
@@ -51,12 +51,12 @@ ClickToAdd=追加するにはここをクリックしてください。
 NoRecordedCustomers=記録された顧客がありません
 NoRecordedContacts=全く記録されたコンタクトません
 NoActionsToDo=そうするアクションはありません
-NoRecordedOrders=無記録された顧客の注文
+NoRecordedOrders=No recorded customer orders
 NoRecordedProposals=全く記録された提案はありません
-NoRecordedInvoices=無記録された顧客の請求書
-NoUnpaidCustomerBills=ない未払いの顧客の請求書
-NoUnpaidSupplierBills=ない未払いのサプライヤーの請求書
-NoModifiedSupplierBills=無記録されたサプライヤーの請求書
+NoRecordedInvoices=No recorded customer invoices
+NoUnpaidCustomerBills=No unpaid customer invoices
+NoUnpaidSupplierBills=No unpaid supplier invoices
+NoModifiedSupplierBills=No recorded supplier invoices
 NoRecordedProducts=記録された商品はありません/サービスなし
 NoRecordedProspects=全く記録された見通しなし
 NoContractedProducts=ない製品/サービスは、契約しない
diff --git a/htdocs/langs/ja_JP/cashdesk.lang b/htdocs/langs/ja_JP/cashdesk.lang
index d7bdb4fb5cf..ba860789feb 100644
--- a/htdocs/langs/ja_JP/cashdesk.lang
+++ b/htdocs/langs/ja_JP/cashdesk.lang
@@ -14,7 +14,7 @@ ShoppingCart=ショッピングカート
 NewSell=新しい販売
 AddThisArticle=この記事を追加します。
 RestartSelling=販売に戻る
-SellFinished=Sale complete
+SellFinished=販売完了
 PrintTicket=印刷チケット
 NoProductFound=記事見つかりません
 ProductFound=製品が見つかりました
@@ -25,10 +25,10 @@ Difference=違い
 TotalTicket=合計チケット
 NoVAT=この売却のための付加価値税なし
 Change=過剰は、受信した
-BankToPay=掛売口座
+BankToPay=支払の口座
 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.
-DolibarrReceiptPrinter=Dolibarr Receipt Printer
+FilterRefOrLabelOrBC=検索 (参照/ラベル)
+UserNeedPermissionToEditStockToUsePos=請求書作成時に在庫を減らすことを依頼するため、POSを使用するユーザーは在庫を編集する権限が必要です。
+DolibarrReceiptPrinter=Dolibarr領収書プリンター
diff --git a/htdocs/langs/ja_JP/companies.lang b/htdocs/langs/ja_JP/companies.lang
index bc3c19409c4..415ccd56d8e 100644
--- a/htdocs/langs/ja_JP/companies.lang
+++ b/htdocs/langs/ja_JP/companies.lang
@@ -78,6 +78,10 @@ VATIsNotUsed=付加価値税（VAT）は使用されていません
 CopyAddressFromSoc=Fill address with third party address
 ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
 PaymentBankAccount=Payment bank account
+OverAllProposals=Total proposals
+OverAllOrders=Total orders
+OverAllInvoices=Total invoices
+OverAllSupplierProposals=Total price requests
 ##### Local Taxes #####
 LocalTax1IsUsed=Use second tax
 LocalTax1IsUsedES= REが使用されます
@@ -239,6 +243,10 @@ ProfId3RU=教授はID 3（KPP）
 ProfId4RU=教授はID 4（玉浦）
 ProfId5RU=-
 ProfId6RU=-
+ProfId1DZ=RC
+ProfId2DZ=Art.
+ProfId3DZ=NIF
+ProfId4DZ=NIS
 VATIntra=VAT番号
 VATIntraShort=VAT番号
 VATIntraSyntaxIsValid=構文は有効です。
@@ -382,8 +390,9 @@ ListCustomersShort=顧客リスト
 ThirdPartiesArea=Third parties and contact area
 LastModifiedThirdParties=Latest %s modified third parties
 UniqueThirdParties=ユニークな第三者の合計
-InActivity=開く
+InActivity=開かれた
 ActivityCeased=閉じた
+ThirdPartyIsClosed=Third party is closed
 ProductsIntoElements=List of products/services into %s
 CurrentOutstandingBill=Current outstanding bill
 OutstandingBill=Max. for outstanding bill
@@ -396,7 +405,7 @@ MergeThirdparties=Merge third parties
 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 so you will be able to delete the duplicate one.
 ThirdpartiesMergeSuccess=Thirdparties have been merged
 SaleRepresentativeLogin=Login of sales representative
-SaleRepresentativeFirstname=Firstname of sales representative
-SaleRepresentativeLastname=Lastname of sales representative
+SaleRepresentativeFirstname=First name of sales representative
+SaleRepresentativeLastname=Last name of sales representative
 ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
 NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/ja_JP/compta.lang b/htdocs/langs/ja_JP/compta.lang
index 0f12660cec9..5aa7c6c110f 100644
--- a/htdocs/langs/ja_JP/compta.lang
+++ b/htdocs/langs/ja_JP/compta.lang
@@ -65,6 +65,7 @@ PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=付加価値税の支払い
 ListPayment=支払いのリスト
 ListOfCustomerPayments=顧客の支払のリスト
+ListOfSupplierPayments=サプライヤーの支払のリスト
 DateStartPeriod=Date start period
 DateEndPeriod=Date end period
 newLT1Payment=New tax 2 payment
@@ -81,7 +82,7 @@ LT2PaymentES=IRPF支払い
 LT2PaymentsES=IRPF支払い
 VATPayment=Sales tax payment
 VATPayments=Sales tax payments
-VATRefund=Sales tax refund Refund
+VATRefund=Sales tax refund
 Refund=Refund
 SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=付加価値税の支払いを表示する
@@ -194,7 +195,7 @@ CloneTax=Clone a social/fiscal tax
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
 CloneTaxForNextMonth=Clone it for next month
 SimpleReport=Simple report
-AddExtraReport=Extra reports
+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
diff --git a/htdocs/langs/ja_JP/cron.lang b/htdocs/langs/ja_JP/cron.lang
index 93eef0cc97b..3647d5769de 100644
--- a/htdocs/langs/ja_JP/cron.lang
+++ b/htdocs/langs/ja_JP/cron.lang
@@ -17,14 +17,14 @@ CronMethodDoesNotExists=Class %s does not contains any method %s
 # Menu
 EnabledAndDisabled=Enabled and disabled
 # Page list
-CronLastOutput=Last run output
-CronLastResult=Last result code
+CronLastOutput=Latest run output
+CronLastResult=Latest result code
 CronCommand=Command
 CronList=Scheduled jobs
 CronDelete=Delete scheduled jobs
-CronConfirmDelete=Are you sure you want to delete these scheduled jobs ?
+CronConfirmDelete=Are you sure you want to delete these scheduled jobs?
 CronExecute=Launch scheduled job
-CronConfirmExecute=Are you sure you want to execute these scheduled jobs now ?
+CronConfirmExecute=Are you sure you want to execute these scheduled jobs now?
 CronInfo=Scheduled job module allow to execute job that have been planned
 CronTask=Job
 CronNone=なし
@@ -33,13 +33,13 @@ CronDtEnd=Not after
 CronDtNextLaunch=Next execution
 CronDtLastLaunch=Start date of latest execution
 CronDtLastResult=End date of latest execution
-CronFrequency=Frequency
+CronFrequency=周波数
 CronClass=Class
 CronMethod=方法
 CronModule=モジュール
 CronNoJobs=No jobs registered
 CronPriority=優先順位
-CronLabel=Label
+CronLabel=ラベル
 CronNbRun=Nb. launch
 CronMaxRun=Max nb. launch
 CronEach=Every
@@ -65,7 +65,7 @@ CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of
 CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
 CronCommandHelp=The system command line to execute.
 CronCreateJob=Create new Scheduled Job
-CronFrom=From
+CronFrom=から
 # Info
 # Common
 CronType=Job type
diff --git a/htdocs/langs/ja_JP/errors.lang b/htdocs/langs/ja_JP/errors.lang
index 7997f9aefc2..28da4e16c77 100644
--- a/htdocs/langs/ja_JP/errors.lang
+++ b/htdocs/langs/ja_JP/errors.lang
@@ -11,6 +11,7 @@ ErrorLoginAlreadyExists=ログイン%sはすでに存在しています。
 ErrorGroupAlreadyExists=グループ%sはすでに存在しています。
 ErrorRecordNotFound=レコードが見つかりませんでした。
 ErrorFailToCopyFile=<b>&quot;%s&quot;</b>にファイル<b>&quot;%s&quot;を</b>コピーに失敗しました。
+ErrorFailToCopyDir=Failed to copy directory '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToRenameFile=<b>&quot;%s&quot;</b>にファイル<b>&quot;%s&quot;を</b>リネームに失敗しました。
 ErrorFailToDeleteFile=ファイル<b>'%s'を</b>削除できませんでした。
 ErrorFailToCreateFile=ファイル<b>'%s'を</b>作成できませんでした。
@@ -115,7 +116,7 @@ ErrorNoActivatedBarcode=活性化バーコード·タイプません
 ErrUnzipFails=Failed to unzip %s with ZipArchive
 ErrNoZipEngine=No engine to unzip %s file in this PHP
 ErrorFileMustBeADolibarrPackage=The file %s must be a Dolibarr zip package
-ErrorFileRequired=It takes a package Dolibarr file
+ErrorModuleFileRequired=You must select a Dolibarr module package file
 ErrorPhpCurlNotInstalled=The PHP CURL is not installed, this is essential to talk with 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
@@ -170,14 +171,19 @@ ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
 ErrorFileMustHaveFormat=File must have format %s
 ErrorSupplierCountryIsNotDefined=このサプライヤーのために国が定義されていません。最初にこれを修正します。
 ErrorsThirdpartyMerge=Failed to merge the two records. Request canceled.
-ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enougth for product %s to add it into a new order.
-ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enougth for product %s to add it into a new invoice.
-ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enougth for product %s to add it into a new shipment.
-ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enougth for product %s to add it into a new proposal.
-ErrorFailedToLoadLoginFileForMode=Failed to get the login file for mode '%s'.
+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 bank 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>
 
 # 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.
diff --git a/htdocs/langs/ja_JP/holiday.lang b/htdocs/langs/ja_JP/holiday.lang
index 408d9866e5c..41964b5ee9a 100644
--- a/htdocs/langs/ja_JP/holiday.lang
+++ b/htdocs/langs/ja_JP/holiday.lang
@@ -76,8 +76,9 @@ BoxTitleLastLeaveRequests=Latest %s modified leave requests
 HolidaysMonthlyUpdate=Monthly update
 ManualUpdate=Manual update
 HolidaysCancelation=Leave request cancelation
-EmployeeLastname=Employee lastname
-EmployeeFirstname=Employee firstname
+EmployeeLastname=Employee last name
+EmployeeFirstname=Employee first name
+TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
 
 ## Configuration du Module ##
 LastUpdateCP=Latest automatic update of leaves allocation
diff --git a/htdocs/langs/ja_JP/install.lang b/htdocs/langs/ja_JP/install.lang
index 9bfa252345d..a92cf96be36 100644
--- a/htdocs/langs/ja_JP/install.lang
+++ b/htdocs/langs/ja_JP/install.lang
@@ -11,27 +11,27 @@ PHPSupportSessions=このPHPは、セッションをサポートしています
 PHPSupportPOSTGETOk=このPHPは、変数はPOSTとGETをサポートしています。
 PHPSupportPOSTGETKo=それはあなたのPHPの設定は変数のPOSTおよび/をサポートしたり、取得していない可能性があります。 php.iniのパラメータ<b>に、variables_orderを</b>確認<b>して</b>ください。
 PHPSupportGD=このPHPのサポートGDグラフィック機能。
-PHPSupportCurl=This PHP support Curl.
+PHPSupportCurl=このPHPはCurlをサポートしています。
 PHPSupportUTF8=このPHPは、UTF8の機能をサポートしています。
 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をサポートしていません。ないグラフは利用できません。
-ErrorPHPDoesNotSupportCurl=Your PHP installation does not support Curl.
+ErrorPHPDoesNotSupportCurl=お使いのPHPインストールはCurlをサポートしていません。
 ErrorPHPDoesNotSupportUTF8=PHPのインストールは、UTF8の機能をサポートしていません。 Dolibarrが正しく動作することはできません。 Dolibarrをインストールする前にこの問題を解決する。
 ErrorDirDoesNotExists=ディレクトリの%sが存在しません。
 ErrorGoBackAndCorrectParameters=後方に移動して、不正なパラメータを修正してください。
 ErrorWrongValueForParameter=あなたは、パラメータ  %s 間違った値を入力した可能性があります。
 ErrorFailedToCreateDatabase=データベース %s を作成できませんでした。
 ErrorFailedToConnectToDatabase=データベース %s への接続に失敗しました。
-ErrorDatabaseVersionTooLow=Database version (%s) too old. Version %s or higher is required.
+ErrorDatabaseVersionTooLow=データベースのバージョン (%s) が古すぎます。 バージョン %s 以降が必要です。
 ErrorPHPVersionTooLow=あまりにも古いPHPバージョン。バージョン%sが必要です。
 ErrorConnectedButDatabaseNotFound=しかしデータベース %s 成功したサーバーへの接続を見つけていない。
 ErrorDatabaseAlreadyExists=データベース %s は既に存在します。
 IfDatabaseNotExistsGoBackAndUncheckCreate=データベースが存在しない場合は、戻ってオプション&quot;データベースを作成します&quot;をチェック。
 IfDatabaseExistsGoBackAndCheckCreate=データベースが既に存在する場合は、戻ってチェックを外してオプションの &quot;データベースの作成&quot;を参照してください。
-WarningBrowserTooOld=Too old version of browser. Upgrading your browser to a recent version of Firefox, Chrome or Opera is highly recommanded.
+WarningBrowserTooOld=ブラウザのバージョンが古すぎます。 ブラウザを、Firefox、Chrome、またはOperaの最新バージョンにアップグレードすることを強くお勧めします。
 PHPVersion=PHPのバージョン
 License=ライセンスを使用して
 ConfigurationFile=設定ファイル
@@ -77,7 +77,7 @@ SetupEnd=セットアップの終了
 SystemIsInstalled=このインストールは完了です。
 SystemIsUpgraded=Dolibarrが正常にアップグレードされています。
 YouNeedToPersonalizeSetup=あなたのニーズに合わせてDolibarrを設定する必要があります（外観、機能、...).これを行うには、下記のリンクをクリックしてください。
-AdminLoginCreatedSuccessfuly=Dolibarr administrator login '<b>%s</b>' created successfully.
+AdminLoginCreatedSuccessfuly=Dolibarr 管理者ログイン '<b>%s</b>' の作成が成功しました。
 GoToDolibarr=Dolibarrに行く
 GoToSetupArea=Dolibarr（セットアップの領域）に移動します
 MigrationNotFinished=データベースのバージョンが完全に最新ではありませんので、再度アップグレードプロセスを実行する必要があります。
@@ -87,7 +87,7 @@ DirectoryRecommendation=それは、あなたのWeb​​ページのディレ
 LoginAlreadyExists=すでに存在しています
 DolibarrAdminLogin=Dolibarr adminログイン
 AdminLoginAlreadyExists=Dolibarr管理者アカウント<b>&quot;%s</b> ' <b>は</b>既に存在します。あなたが別のパーティションを作成する場合は、戻ってください。
-FailedToCreateAdminLogin=Failed to create Dolibarr administrator account.
+FailedToCreateAdminLogin=Dolibarr管理者アカウントの作成に失敗しました。
 WarningRemoveInstallDir=警告、セキュリティ上の理由から、一度インストールまたはアップグレードが完了すると、あなた<b>は</b>それ<b>の悪意のある使用を避けるために、インストールディレクトリを</b>削除<b>するか、Dolibarrのドキュメントディレクトリにinstall.lockと呼ばれるファイルを追加</b>する必要があります<b>。</b>
 FunctionNotAvailableInThisPHP=このPHPは利用できません
 ChoosedMigrateScript=移行スクリプトを選択します。
@@ -131,9 +131,9 @@ MigrationShippingDelivery2=海運2の容量をアップグレード
 MigrationFinished=マイグレーションが終了しました
 LastStepDesc=<strong>最後のステップ</strong> ：ここにあなたがソフトウェアへの接続に使用する予定のログインとパスワードを定義します。それは他のすべてを管理するアカウントであるとしてこれを紛失しないでください。
 ActivateModule=モジュール%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)
+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のセットアップウィザードを使用して、ここで提案するので、値がすでに最適化されています。あなたは何をすべきか分かっている場合にのみ、それらを変更してください。
@@ -147,7 +147,7 @@ MigrationSupplierOrder=サプライヤーの受注のためのデータ移行
 MigrationProposal=商用の提案のためのデータ移行
 MigrationInvoice=顧客の請求書のデータ移行
 MigrationContract=契約のためのデータ移行
-MigrationSuccessfullUpdate=Upgrade successfull
+MigrationSuccessfullUpdate=アップグレードに成功しました
 MigrationUpdateFailed=失敗したアップグレード·プロセス
 MigrationRelationshipTables=関係テーブルのデータ移行（%s）
 MigrationPaymentsUpdate=支払データ補正
@@ -161,7 +161,7 @@ MigrationContractsLineCreation=契約のref %sの契約回線を作成します
 MigrationContractsNothingToUpdate=行うにこれ以上のもの
 MigrationContractsFieldDontExist=フィールドのfk_factureはもはや存在しません。は何の関係もない。
 MigrationContractsEmptyDatesUpdate=契約空の日付の訂正
-MigrationContractsEmptyDatesUpdateSuccess=Contract emtpy date correction done successfully
+MigrationContractsEmptyDatesUpdateSuccess=契約の空の日付修正を正常に完了しました
 MigrationContractsEmptyDatesNothingToUpdate=修正する契約空の日ない
 MigrationContractsEmptyCreationDatesNothingToUpdate=修正するためには契約の作成日付ません
 MigrationContractsInvalidDatesUpdate=不正な値の日付の契約補正
@@ -169,13 +169,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=Sendings領収書の更新
 MigrationDeliveryOrderMatching=配信確認メッセージの更新
@@ -188,11 +188,11 @@ MigrationProjectUserResp=llx_projetのデータマイグレーション分野fk_
 MigrationProjectTaskTime=更新時間は秒単位で過ごした
 MigrationActioncommElement=アクション上でデータを更新する
 MigrationPaymentMode=支払い·モードのデータ移行
-MigrationCategorieAssociation=Migration of categories
-MigrationEvents=Migration of events to add event owner into assignement table
-MigrationRemiseEntity=Update entity field value of llx_societe_remise
-MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
-MigrationReloadModule=Reload module %s
-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.
+MigrationCategorieAssociation=カテゴリの移行
+MigrationEvents=イベントを移行して、イベントの所有者を割当て表に追加します
+MigrationRemiseEntity=llx_societe_remise のエンティティフィールド値を更新
+MigrationRemiseExceptEntity=llx_societe_remise_except のエンティティフィールド値を更新
+MigrationReloadModule=モジュール %s を再読み込み
+ShowNotAvailableOptions=利用できないオプションを表示しない
+HideNotAvailableOptions=利用できないオプションを非表示
+ErrorFoundDuringMigration=移行プロセス中にエラーが報告されたので、次のステップは利用できません。 エラーを無視するには、<a href="%s">ここをクリック</a> してください。ただし、修正されるまでアプリケーションまたは一部の機能が正しく動作しない場合があります。
diff --git a/htdocs/langs/ja_JP/languages.lang b/htdocs/langs/ja_JP/languages.lang
index e419ecb1dbb..93e5dbd100d 100644
--- a/htdocs/langs/ja_JP/languages.lang
+++ b/htdocs/langs/ja_JP/languages.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - languages
 Language_ar_AR=アラビア語
 Language_ar_SA=アラビア語
-Language_bn_BD=Bengali
+Language_bn_BD=ベンガル語
 Language_bg_BG=ブルガリア語
 Language_bs_BA=ボスニア
 Language_ca_ES=カタルにゃ語
@@ -10,10 +10,11 @@ Language_da_DA=デンマーク語
 Language_da_DK=デンマーク語
 Language_de_DE=ドイツ語
 Language_de_AT=ドイツ語 (オーストリア)
-Language_de_CH=German (Switzerland)
+Language_de_CH=ドイツ語 (スイス)
 Language_el_GR=ギリシャ語
+Language_el_CY=ギリシャ語 (キプロス)
 Language_en_AU=英語 (オーストラリア)
-Language_en_CA=English (Canada)
+Language_en_CA=英語 (カナダ)
 Language_en_GB=英語 (イギリス)
 Language_en_IN=英語 (インド)
 Language_en_NZ=英語（ニュージーランド）
@@ -22,40 +23,44 @@ Language_en_US=英語 (アメリカ)
 Language_en_ZA=英語（南アフリカ）
 Language_es_ES=スペイン語
 Language_es_AR=スペイン語 (アルゼンチン)
-Language_es_BO=Spanish (Bolivia)
-Language_es_CL=Spanish (Chile)
-Language_es_CO=Spanish (Colombia)
-Language_es_DO=Spanish (Dominican Republic)
+Language_es_BO=スペイン語 (ボリビア)
+Language_es_CL=スペイン語 (チリ)
+Language_es_CO=スペイン語 (コロンビア)
+Language_es_DO=スペイン語 (ドミニカ共和国)
+Language_es_EC=スペイン語 (エクアドル)
 Language_es_HN=スペイン語（ホンジュラス）
 Language_es_MX=スペイン語（メキシコ）
+Language_es_PA=スペイン語 (パナマ)
 Language_es_PY=スペイン語（パラグアイ）
 Language_es_PE=スペイン語（ペルー）
 Language_es_PR=スペイン語（プエルトリコ）
-Language_es_VE=Spanish (Venezuela)
+Language_es_VE=スペイン語 (ベネズエラ)
 Language_et_EE=エストニア語
 Language_eu_ES=バスク
 Language_fa_IR=ペルシア語
-Language_fi_FI=Finnish
+Language_fi_FI=フィンランド語
 Language_fr_BE=フランス語 (ベルギー)
 Language_fr_CA=フランス語 (カナダ)
 Language_fr_CH=フランス語 (スイス)
 Language_fr_FR=フランス語
 Language_fr_NC=フランス（ニューカレドニア）
-Language_fy_NL=Frisian
+Language_fy_NL=フリジア語
 Language_he_IL=ヘブライ語の
 Language_hr_HR=クロアチア語
 Language_hu_HU=ハンガリー語
-Language_id_ID=Indonesian
+Language_id_ID=インドネシア語
 Language_is_IS=アイスランド語
 Language_it_IT=イタリア語
 Language_ja_JP=日本語
-Language_ka_GE=Georgian
-Language_kn_IN=Kannada
+Language_ka_GE=ジョージア語
+Language_km_KH=クメール語
+Language_kn_IN=カンナダ語
 Language_ko_KR=韓国語
 Language_lo_LA=ラオ語
 Language_lt_LT=リトアニア語
 Language_lv_LV=ラトビアの
 Language_mk_MK=マケドニア語
+Language_mn_MN=モンゴル語
 Language_nb_NO=ノルウエー語 (ブーケモール)
 Language_nl_BE=オランダ語 (ベルギー)
 Language_nl_NL=オランダ語 (オランダ)
@@ -69,10 +74,10 @@ Language_tr_TR=トルコ語
 Language_sl_SI=スロベニア語
 Language_sv_SV=スウエーデん語
 Language_sv_SE=スウェーデン語
-Language_sq_AL=Albanian
+Language_sq_AL=アルバニア語
 Language_sk_SK=スロバキア
-Language_sr_RS=Serbian
-Language_sw_SW=Kiswahili
+Language_sr_RS=セルビア語
+Language_sw_SW=スワヒリ語
 Language_th_TH=タイの
 Language_uk_UA=ウクライナ語
 Language_uz_UZ=ウズベク語
diff --git a/htdocs/langs/ja_JP/ldap.lang b/htdocs/langs/ja_JP/ldap.lang
index 02f67f68b15..bda9efac197 100644
--- a/htdocs/langs/ja_JP/ldap.lang
+++ b/htdocs/langs/ja_JP/ldap.lang
@@ -12,14 +12,14 @@ LDAPRecordNotFound=レコードは、LDAPデータベースに見つかりませ
 LDAPUsers=LDAPデータベース内のユーザー
 LDAPFieldStatus=ステータス
 LDAPFieldFirstSubscriptionDate=最初のサブスクリプションの日付
-LDAPFieldFirstSubscriptionAmount=最初のサブスクリプションの量
+LDAPFieldFirstSubscriptionAmount=最初のサブスクリプションの金額
 LDAPFieldLastSubscriptionDate=最後のサブスクリプションの日付
-LDAPFieldLastSubscriptionAmount=最後のサブスクリプションの量
-LDAPFieldSkype=Skype id
-LDAPFieldSkypeExample=Example : skypeName
-UserSynchronized=ユーザーの同期
-GroupSynchronized=グループは、同期
-MemberSynchronized=メンバーは、同期
-ContactSynchronized=同期に連絡
-ForceSynchronize=Dolibarrを同期させる力 - &gt; LDAP
+LDAPFieldLastSubscriptionAmount=最後のサブスクリプションの金額
+LDAPFieldSkype=Skype ID
+LDAPFieldSkypeExample=例：Skype名
+UserSynchronized=ユーザーを同期しました
+GroupSynchronized=グループを同期しました
+MemberSynchronized=メンバーを同期しました
+ContactSynchronized=連絡先を同期しました
+ForceSynchronize=強制的に同期 Dolibarr -> LDAP
 ErrorFailedToReadLDAP=LDAPデータベースの読み込みに失敗しました。 LDAPモジュールの設定とデータベースのアクセシビリティをチェックします。
diff --git a/htdocs/langs/ja_JP/link.lang b/htdocs/langs/ja_JP/link.lang
index 42c7555d469..40197062a5f 100644
--- a/htdocs/langs/ja_JP/link.lang
+++ b/htdocs/langs/ja_JP/link.lang
@@ -1,9 +1,10 @@
-LinkANewFile=Link a new file/document
-LinkedFiles=Linked files and documents
-NoLinkFound=No registered links
-LinkComplete=The file has been linked successfully
-ErrorFileNotLinked=The file could not be linked
-LinkRemoved=The link %s has been removed
-ErrorFailedToDeleteLink= Failed to remove link '<b>%s</b>'
-ErrorFailedToUpdateLink= Failed to update link '<b>%s</b>'
+# Dolibarr language file - Source file is en_US - languages
+LinkANewFile=新しいファイル/ドキュメントをリンクする
+LinkedFiles=ファイルとドキュメントをリンクしました
+NoLinkFound=リンクは登録されていません
+LinkComplete=ファイルを正常にリンクしました
+ErrorFileNotLinked=ファイルをリンクできませんでした
+LinkRemoved=リンク %s が削除されました
+ErrorFailedToDeleteLink= リンク '<b>%s</b>' を削除できませんでした
+ErrorFailedToUpdateLink= リンク '<b>%s</b>' を更新できませんでした
 URLToLink=URL to link
diff --git a/htdocs/langs/ja_JP/mails.lang b/htdocs/langs/ja_JP/mails.lang
index 7525b408ef6..fb874f940fa 100644
--- a/htdocs/langs/ja_JP/mails.lang
+++ b/htdocs/langs/ja_JP/mails.lang
@@ -35,7 +35,7 @@ MailingStatusSentPartialy=partialy送信
 MailingStatusSentCompletely=完全に送信
 MailingStatusError=エラーが発生
 MailingStatusNotSent=送信されません
-MailSuccessfulySent=正常に送信メール（%sへ%sから）
+MailSuccessfulySent=Email successfully accepted for delivery (from %s to %s)
 MailingSuccessfullyValidated=EMailing successfully validated
 MailUnsubcribe=Unsubscribe
 MailingStatusNotContact=Don't contact anymore
@@ -74,22 +74,28 @@ ResultOfMailSending=Result of mass EMail sending
 NbSelected=Nb selected
 NbIgnored=Nb ignored
 NbSent=Nb 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
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=ファイル内の行%s
 RecipientSelectionModules=受信者の選択のために定義された要求
 MailSelectedRecipients=選択した受信者
 MailingArea=EMailingsエリア
-LastMailings=最後%sのemailings
+LastMailings=Latest %s emailings
 TargetsStatistics=ターゲットの統計情報
 NbOfCompaniesContacts=企業のユニークなコンタクト
 MailNoChangePossible=検証メール送信の受信者を変更することはできません
 SearchAMailing=Searchメーリング
 SendMailing=メール送信送信
 SendMail=メールを送る
-MailingNeedCommand=For security reason, sending an emailing is better when performed from command line. If you have one, ask your server administrator to launch the following command to send the emailing to all recipients:
+SentBy=によって送信され、
+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=ただし、セッションで送信するメールの最大数の値を持つパラメータのMAILING_LIMIT_SENDBYWEBを追加することによってそれらをオンラインで送信することができます。このため、ホームに行く - セットアップ - その他を。
-ConfirmSendingEmailing=If you can't or prefer sending them with your www browser, please confirm you are sure you want to send emailing now from your browser?
+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.
 TargetsReset=一覧をクリアする
 ToClearAllRecipientsClickHere=このメール送信の受信者リストをクリアするにはここをクリック
@@ -144,3 +150,6 @@ AdvTgtCreateFilter=Create filter
 AdvTgtOrCreateNewFilter=Name of new filter
 NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
+OutGoingEmailSetup=Outgoing email setup
+InGoingEmailSetup=Incoming email setup
+
diff --git a/htdocs/langs/ja_JP/main.lang b/htdocs/langs/ja_JP/main.lang
index fc20cca1759..a45a44f8b7e 100644
--- a/htdocs/langs/ja_JP/main.lang
+++ b/htdocs/langs/ja_JP/main.lang
@@ -63,11 +63,13 @@ ErrorNoVATRateDefinedForSellerCountry=エラー、国%s 'に対して定義さ
 ErrorNoSocialContributionForSellerCountry=Error, no social/fiscal taxes type defined for country '%s'.
 ErrorFailedToSaveFile=エラーは、ファイルを保存に失敗しました。
 ErrorCannotAddThisParentWarehouse=You are trying to add a parent warehouse which is already a child of current one
+MaxNbOfRecordPerPage=Max nb of record per page
 NotAuthorized=You are not authorized to do that.
 SetDate=日付を設定する
 SelectDate=Select a date
 SeeAlso=See also %s
 SeeHere=See here
+Apply=Apply
 BackgroundColorByDefault=デフォルトの背景色
 FileRenamed=The file was successfully renamed
 FileUploaded=ファイルが正常にアップロードされました
@@ -86,7 +88,7 @@ Undefined=未定義
 PasswordForgotten=Password forgotten?
 SeeAbove=上記参照
 HomeArea=ホームエリア
-LastConnexion=最後の接続
+LastConnexion=Latest connection
 PreviousConnexion=以前の接続
 PreviousValue=Previous value
 ConnectedOnMultiCompany=環境に接続
@@ -236,7 +238,7 @@ DateCreation=作成日
 DateCreationShort=Creat. date
 DateModification=変更日
 DateModificationShort=MODIF。日付
-DateLastModification=最終更新日
+DateLastModification=Latest modification date
 DateValidation=検証日
 DateClosing=日付を閉じる
 DateDue=期日
@@ -432,7 +434,7 @@ Reportings=報告
 Draft=ドラフト
 Drafts=ドラフト
 Validated=検証
-Opened=開く
+Opened=開かれた
 New=新しい
 Discount=割引
 Unknown=未知の
@@ -460,6 +462,7 @@ DeletePicture=Picture delete
 ConfirmDeletePicture=Confirm picture deletion?
 Login=ログイン
 CurrentLogin=現在のログイン
+EnterLoginDetail=Enter login details
 January=1月
 February=2月
 March=3月
@@ -597,6 +600,8 @@ SessionName=セッション名
 Method=方法
 Receive=受け取る
 CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
+ExpectedValue=Expected Value
+CurrentValue=電流値
 PartialWoman=部分的な
 TotalWoman=合計
 NeverReceived=受信しませんでした
@@ -753,6 +758,8 @@ RemoveString=Remove string '%s'
 SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
 DirectDownloadLink=Direct download link
 Download=Download
+ActualizeCurrency=Update currency rate
+Fiscalyear=Fiscal year
 # Week day
 Monday=月曜日
 Tuesday=火曜日
@@ -787,8 +794,8 @@ SetRef=Set ref
 Select2ResultFoundUseArrows=Some results found. Use arrows to select.
 Select2NotFound=No result found
 Select2Enter=Enter
-Select2MoreCharacter=or more character
-Select2MoreCharacters=or more characters
+Select2MoreCharacter=or more characters<br /><br /><strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
+Select2MoreCharacters=or more characters<br /><br /><strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
 Select2LoadingMoreResults=Loading more results...
 Select2SearchInProgress=Search in progress...
 SearchIntoThirdparties=Thirdparties
@@ -809,3 +816,5 @@ SearchIntoContracts=契約
 SearchIntoCustomerShipments=Customer shipments
 SearchIntoExpenseReports=Expense reports
 SearchIntoLeaves=Leaves
+
+BulkActions=Bulk actions
diff --git a/htdocs/langs/ja_JP/members.lang b/htdocs/langs/ja_JP/members.lang
index a9df270b202..52d764e9289 100644
--- a/htdocs/langs/ja_JP/members.lang
+++ b/htdocs/langs/ja_JP/members.lang
@@ -45,7 +45,7 @@ MemberStatusDraft=ドラフト（検証する必要があります）
 MemberStatusDraftShort=ドラフト
 MemberStatusActive=検証（サブスクリプションを待っている）
 MemberStatusActiveShort=検証
-MemberStatusActiveLate=サブスクリプションの有効期限が切れ
+MemberStatusActiveLate=Subscription expired
 MemberStatusActiveLateShort=期限切れの
 MemberStatusPaid=最新のサブスクリプション
 MemberStatusPaidShort=最新の
@@ -137,7 +137,7 @@ DocForOneMemberCards=特定のメンバーの名刺を<b>（：%s</b>出力実
 DocForLabels=アドレスシート<b>（：%s</b>出力の形式は実際のセットアップ）を生成
 SubscriptionPayment=サブスクリプション費用の支払い
 LastSubscriptionDate=最後のサブスクリプションの日付
-LastSubscriptionAmount=最後のサブスクリプションの量
+LastSubscriptionAmount=最後のサブスクリプションの金額
 MembersStatisticsByCountries=国別メンバー統計
 MembersStatisticsByState=都道府県/州によってメンバーの統計
 MembersStatisticsByTown=町によってメンバーの統計
@@ -149,7 +149,7 @@ MembersByStateDesc=この画面では、州/地方/州によってメンバー
 MembersByTownDesc=この画面には、町でメンバーの統計情報を表示します。
 MembersStatisticsDesc=読みたい統計を選択...
 MenuMembersStats=統計
-LastMemberDate=最後のメンバー日付
+LastMemberDate=Latest member date
 Nature=自然
 Public=情報が公開されている
 NewMemberbyWeb=新しいメンバーが追加されました。承認を待っている
diff --git a/htdocs/langs/ja_JP/oauth.lang b/htdocs/langs/ja_JP/oauth.lang
index a338ab4d5df..e5669a9c76c 100644
--- a/htdocs/langs/ja_JP/oauth.lang
+++ b/htdocs/langs/ja_JP/oauth.lang
@@ -1,26 +1,30 @@
 # Dolibarr language file - Source file is en_US - oauth
-ConfigOAuth=Oauth Configuration
-OAuthServices=OAuth services
-ManualTokenGeneration=Manual token generation
-NoAccessToken=No access token saved into local database
-HasAccessToken=A token was generated and saved into local database
-NewTokenStored=Token received ans saved
-ToCheckDeleteTokenOnProvider=To check/delete authorization saved by %s OAuth provider
-TokenDeleted=Token deleted
-RequestAccess=Click here to request/renew access and receive a new token to save
-DeleteAccess=Click here to delete token
-UseTheFollowingUrlAsRedirectURI=Use the following URL as the Redirect URI when creating your credential on your OAuth provider:
-ListOfSupportedOauthProviders=Enter here credential provided by your OAuth2 provider. Only supported OAuth2 providers are visible here. This setup may be used by other modules that need OAuth2 authentication.
-TOKEN_ACCESS=
-TOKEN_REFRESH=Token Refresh Present
-TOKEN_EXPIRED=Token expired
-TOKEN_EXPIRE_AT=Token expire at
-TOKEN_DELETE=Delete saved token
-OAUTH_GOOGLE_NAME=Oauth Google service
-OAUTH_GOOGLE_ID=Oauth Google Id
-OAUTH_GOOGLE_SECRET=Oauth Google Secret
-OAUTH_GOOGLE_DESC=Go on <a class="notasortlink" href="https://console.developers.google.com/" target="_blank">this page</a> then "Credentials" to create Oauth credentials
-OAUTH_GITHUB_NAME=Oauth GitHub service
-OAUTH_GITHUB_ID=Oauth GitHub Id
-OAUTH_GITHUB_SECRET=Oauth GitHub Secret
-OAUTH_GITHUB_DESC=Go on <a class="notasortlink" href="https://github.com/settings/developers" target="_blank">this page</a> then "Register a new application" to create Oauth credentials
+ConfigOAuth=Oauth 設定
+OAuthServices=OAuth サービス
+ManualTokenGeneration=手動トークン生成
+TokenManager=トークンマネージャー
+IsTokenGenerated=トークンは生成されましたか？
+NoAccessToken=アクセストークンはローカルデータベースに保存されていません
+HasAccessToken=トークンを生成し、ローカルデータベースに保存されました
+NewTokenStored=トークンを受け取り、保存しました
+ToCheckDeleteTokenOnProvider=ここをクリックすると %s OAuth プロバイダによって保存された承認を確認/削除します
+TokenDeleted=トークンを削除しました
+RequestAccess=ここをクリックすると、アクセスをリクエスト/更新し、新しいトークンを受け取って保存します
+DeleteAccess=ここをクリックするとトークンを削除します
+UseTheFollowingUrlAsRedirectURI=OAuth プロバイダで資格情報を作成するときに、次の URL をリダイレクト URI として使用します:
+ListOfSupportedOauthProviders=ここにOAuth2プロバイダが提供する資格情報を入力してください。 サポートされているOAuth2プロバイダのみがここに表示されます。 この設定は、OAuth2認証を必要とする他のモジュールで使用されることがあります。
+OAuthSetupForLogin=OAuth トークンを生成するページ
+SeePreviousTab=前のタブを表示
+OAuthIDSecret=OAuth ID とシークレット
+TOKEN_REFRESH=現在のトークンを更新
+TOKEN_EXPIRED=トークンの有効期限切れ
+TOKEN_EXPIRE_AT=トークンの有効期限
+TOKEN_DELETE=保存されたトークンを削除
+OAUTH_GOOGLE_NAME=OAuth Google サービス
+OAUTH_GOOGLE_ID=OAuth Google ID
+OAUTH_GOOGLE_SECRET=OAuth Google シークレット
+OAUTH_GOOGLE_DESC=<a class="notasortlink" href="https://console.developers.google.com/" target="_blank">このページ</a> に移動して、"資格情報" で、OAuth 資格情報を作成します
+OAUTH_GITHUB_NAME=OAuth GitHub サービス
+OAUTH_GITHUB_ID=OAuth GitHub ID
+OAUTH_GITHUB_SECRET=OAuth GitHub シークレット
+OAUTH_GITHUB_DESC=<a class="notasortlink" href="https://github.com/settings/developers" target="_blank">このページ</a> に移動して、"新しいアプリケーションを登録" で、OAuth 資格情報を作成します
diff --git a/htdocs/langs/ja_JP/orders.lang b/htdocs/langs/ja_JP/orders.lang
index d4668119079..2f94e595440 100644
--- a/htdocs/langs/ja_JP/orders.lang
+++ b/htdocs/langs/ja_JP/orders.lang
@@ -39,7 +39,7 @@ StatusOrderRefusedShort=拒否
 StatusOrderBilledShort=請求
 StatusOrderToProcessShort=処理するには
 StatusOrderReceivedPartiallyShort=部分的に受け
-StatusOrderReceivedAllShort=すべてが受信された
+StatusOrderReceivedAllShort=Products received
 StatusOrderCanceled=キャンセル
 StatusOrderDraft=ドラフト（検証する必要があります）
 StatusOrderValidated=検証
@@ -51,7 +51,7 @@ StatusOrderApproved=承認された
 StatusOrderRefused=拒否
 StatusOrderBilled=請求
 StatusOrderReceivedPartially=部分的に受け
-StatusOrderReceivedAll=すべてが受信された
+StatusOrderReceivedAll=All products received
 ShippingExist=出荷が存在する
 QtyOrdered=数量は、注文された
 ProductQtyInDraft=Product quantity into draft orders
diff --git a/htdocs/langs/ja_JP/other.lang b/htdocs/langs/ja_JP/other.lang
index 99c9a7eb112..5f5b3009f47 100644
--- a/htdocs/langs/ja_JP/other.lang
+++ b/htdocs/langs/ja_JP/other.lang
@@ -2,6 +2,7 @@
 SecurityCode=セキュリティコード
 NumberingShort=N°
 Tools=ツール
+TMenuTools=Tools
 ToolsDesc=All miscellaneous tools not included in other menu entries are collected here.<br /><br />All the tools can be reached in the left menu.
 Birthday=誕生日
 BirthdayDate=Birthday date
@@ -67,14 +68,15 @@ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find her
 PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nYou will find here the shipping __SHIPPINGREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nYou will find here the intervention __FICHINTERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n__PERSONALIZED__\n\n__SIGNATURE__
-DemoDesc=Dolibarr is a compact ERP/CRM supporting several functional modules. A demo showcasing all modules makes no sense as this scenario never occurs. So, several demo profiles are available.
+DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
+ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
 DemoFundation=基礎のメンバーを管理する
 DemoFundation2=基礎のメンバーとの銀行口座を管理する
-DemoCompanyServiceOnly=のみサービスを販売するフリーランスの活動を管理する
+DemoCompanyServiceOnly=Company or freelance selling service only
 DemoCompanyShopWithCashDesk=現金デスクでお店を管理する
-DemoCompanyProductAndStocks=製品を販売する小規模または中規模の企業を管理する
-DemoCompanyAll=複数のアクティビティ（すべてのメイン·モジュール）を持つ中小企業を管理する
+DemoCompanyProductAndStocks=Company selling products with a shop
+DemoCompanyAll=Company with multiple activities (all main modules)
 CreatedBy=%sによって作成された
 ModifiedBy=%sによって変更された
 ValidatedBy=%sによって検証
diff --git a/htdocs/langs/ja_JP/products.lang b/htdocs/langs/ja_JP/products.lang
index 0e1947c4b54..7ca23dc64d6 100644
--- a/htdocs/langs/ja_JP/products.lang
+++ b/htdocs/langs/ja_JP/products.lang
@@ -5,6 +5,8 @@ ProductLabelTranslated=Translated product label
 ProductDescriptionTranslated=Translated product description
 ProductNoteTranslated=Translated product note
 ProductServiceCard=製品/サービスカード
+TMenuProducts=製品
+TMenuServices=サービス
 Products=製品
 Services=サービス
 Product=製品
@@ -58,7 +60,7 @@ SellingPrice=販売価格
 SellingPriceHT=（税引後）販売価格
 SellingPriceTTC=販売価格（税込）
 CostPriceDescription=This price (net of tax) can be used to store the average amount this product cost to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
-CostPriceUsage=In a future version, this value could be used for margin calculation.
+CostPriceUsage=This value could be used for margin calculation.
 SoldAmount=Sold amount
 PurchasedAmount=Purchased amount
 NewPrice=新価格
@@ -140,6 +142,7 @@ ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b>?
 CloneContentProduct=製品/サービスのすべての主要な情報のクローンを作成する
 ClonePricesProduct=主な情報と価格のクローンを作成する
 CloneCompositionProduct=Clone packaged product/service
+CloneCombinationsProduct=Clone product variants
 ProductIsUsed=本製品が使用されます
 NewRefForClone=REF。新製品/サービスの
 SellingPrices=Selling prices
@@ -236,7 +239,7 @@ GlobalVariables=Global variables
 VariableToUpdate=Variable to update
 GlobalVariableUpdaters=Global variable updaters
 UpdateInterval=Update interval (minutes)
-LastUpdated=Last updated
+LastUpdated=Latest update
 CorrectlyUpdated=Correctly updated
 PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
 PropalMergePdfProductChooseFile=Select PDF files
@@ -256,4 +259,41 @@ VolumeUnits=Volume unit
 SizeUnits=Size unit
 DeleteProductBuyPrice=Delete buying price
 ConfirmDeleteProductBuyPrice=Are you sure you want to delete this buying price?
+SubProduct=Sub product
 
+#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
+ProductCombinations=Variants
+HideProductCombinations=Hide products variant in the products selector
+ProductCombination=Variant
+NewProductCombination=New variant
+EditProductCombination=Editing variant
+ProductCombinationGenerator=Variants generator
+Features=Features
+PriceImpact=Price impact
+WeightImpact=Weight impact
+NewProductAttribute=新しい属性
+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
+PercentageVariation=Percentage variation
+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 child products
+ConfirmCloneProductCombinations=Would you like to copy all the product variant to the 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
diff --git a/htdocs/langs/ja_JP/projects.lang b/htdocs/langs/ja_JP/projects.lang
index 53ef6f00ea3..47da6022410 100644
--- a/htdocs/langs/ja_JP/projects.lang
+++ b/htdocs/langs/ja_JP/projects.lang
@@ -29,9 +29,9 @@ DeleteAProject=プロジェクトを削除します。
 DeleteATask=タスクを削除する
 ConfirmDeleteAProject=Are you sure you want to delete this project?
 ConfirmDeleteATask=Are you sure you want to delete this task?
-OpenedProjects=Open projects
-OpenedTasks=Open tasks
-OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
+OpenedProjects=Opened projects
+OpenedTasks=Opened tasks
+OpportunitiesStatusForOpenedProjects=Opportunities amount of opened projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=プロジェクトを表示する
 SetProject=プロジェクトを設定します。
@@ -47,7 +47,7 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=ユーザー
 TaskTimeNote=注意
 TaskTimeDate=Date
-TasksOnOpenedProject=Tasks on open projects
+TasksOnOpenedProject=Tasks on opened projects
 WorkloadNotDefined=Workload not defined
 NewTimeSpent=新たに費やされた時間は
 MyTimeSpent=私の時間を費やし
@@ -58,6 +58,7 @@ TaskDateEnd=Task end date
 TaskDescription=Task description
 NewTask=新しいタスク
 AddTask=Create task
+AddTimeSpent=Create time spent
 Activity=アクティビティ
 Activities=タスク/活動
 MyActivities=私の仕事/活動
@@ -95,6 +96,7 @@ ValidateProject=挙を検証する
 ConfirmValidateProject=Are you sure you want to validate this project?
 CloseAProject=プロジェクトを閉じる
 ConfirmCloseAProject=Are you sure you want to close this project?
+AlsoCloseAProject=Also close project (keep it open if you still need to follow production tasks on it)
 ReOpenAProject=開いているプロジェクト
 ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=プロジェクトの連絡先
@@ -120,7 +122,7 @@ CloneProjectFiles=Clone project joined files
 CloneTaskFiles=Clone task(s) joined files (if task(s) cloned)
 CloneMoveDate=Update project/tasks dates from now?
 ConfirmCloneProject=Are you sure to clone this project?
-ProjectReportDate=Change task date according project start date
+ProjectReportDate=Change task dates according to new project start date
 ErrorShiftTaskDate=Impossible to shift task date according to new project start date
 ProjectsAndTasksLines=Projects and tasks
 ProjectCreatedInDolibarr=Project %s created
@@ -177,9 +179,9 @@ ProjectsStatistics=Statistics on projects/leads
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 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.
-OpenedProjectsByThirdparties=Open projects by thirdparties
+OpenedProjectsByThirdparties=Opened projects by thirdparties
 OnlyOpportunitiesShort=Only opportunities
-OpenedOpportunitiesShort=Open opportunities
+OpenedOpportunitiesShort=Opened opportunities
 NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount
diff --git a/htdocs/langs/ja_JP/propal.lang b/htdocs/langs/ja_JP/propal.lang
index cc9bfdcf39d..c676a08333d 100644
--- a/htdocs/langs/ja_JP/propal.lang
+++ b/htdocs/langs/ja_JP/propal.lang
@@ -3,7 +3,7 @@ Proposals=商用の提案
 Proposal=商業的提案
 ProposalShort=提案
 ProposalsDraft=ドラフト商業の提案
-ProposalsOpened=Open commercial proposals
+ProposalsOpened=オープンした商業提案
 Prop=商用の提案
 CommercialProposal=商業的提案
 ProposalCard=提案カード
@@ -26,9 +26,9 @@ AmountOfProposalsByMonthHT=月別額（税引後）
 NbOfProposals=商業的提案の数
 ShowPropal=提案を示す
 PropalsDraft=ドラフト
-PropalsOpened=開く
+PropalsOpened=開かれた
 PropalStatusDraft=ドラフト（検証する必要があります）
-PropalStatusValidated=（提案が開いている）を検証
+PropalStatusValidated=Validated (proposal is opened)
 PropalStatusSigned=（要請求）署名
 PropalStatusNotSigned=（クローズ）署名されていません
 PropalStatusBilled=請求
diff --git a/htdocs/langs/ja_JP/stocks.lang b/htdocs/langs/ja_JP/stocks.lang
index 18aa856cb5e..512c886bb7d 100644
--- a/htdocs/langs/ja_JP/stocks.lang
+++ b/htdocs/langs/ja_JP/stocks.lang
@@ -22,13 +22,15 @@ Movements=動作
 ErrorWarehouseRefRequired=ウェアハウスの参照名を指定する必要があります
 ListOfWarehouses=倉庫のリスト
 ListOfStockMovements=在庫変動のリスト
+StockMovementForId=Movement ID %d
+ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Warehouses area
 Location=場所
 LocationSummary=短い名前の場所
 NumberOfDifferentProducts=Number of different products
 NumberOfProducts=商品の合計数
-LastMovement=最後の動き
-LastMovements=最後の動き
+LastMovement=Latest movement
+LastMovements=Latest movements
 Units=ユニット
 Unit=ユニット
 StockCorrection=正しい株式
@@ -67,9 +69,9 @@ NoPredefinedProductToDispatch=このオブジェクト用に事前定義され
 DispatchVerb=派遣
 StockLimitShort=Limit for alert
 StockLimit=Stock limit for alert
-PhysicalStock=物理的な株式
-RealStock=リアルタイム株価
-VirtualStock=バーチャル株式
+PhysicalStock=物理的な在庫
+RealStock=実在庫
+VirtualStock=仮想在庫
 IdWarehouse=イド倉庫
 DescWareHouse=説明倉庫
 LieuWareHouse=ローカリゼーション倉庫
@@ -99,8 +101,8 @@ UseVirtualStockByDefault=Use virtual stock by default, instead of physical stock
 UseVirtualStock=Use virtual stock
 UsePhysicalStock=Use physical stock
 CurentSelectionMode=Current selection mode
-CurentlyUsingVirtualStock=バーチャル株式
-CurentlyUsingPhysicalStock=物理的な株式
+CurentlyUsingVirtualStock=仮想在庫
+CurentlyUsingPhysicalStock=物理的な在庫
 RuleForStockReplenishment=Rule for stocks replenishment
 SelectProductWithNotNullQty=Select at least one product with a qty not null and a supplier
 AlertOnly= Alerts only
@@ -140,3 +142,4 @@ ProductStockWarehouseCreated=Stock limit for alert and desired optimal stock cor
 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
diff --git a/htdocs/langs/ja_JP/supplier_proposal.lang b/htdocs/langs/ja_JP/supplier_proposal.lang
index 1dd2e985f2e..a29800152a7 100644
--- a/htdocs/langs/ja_JP/supplier_proposal.lang
+++ b/htdocs/langs/ja_JP/supplier_proposal.lang
@@ -8,7 +8,7 @@ SearchRequest=Find a request
 DraftRequests=Draft requests
 SupplierProposalsDraft=Draft supplier proposals
 LastModifiedRequests=Latest %s modified price requests
-RequestsOpened=Open price requests
+RequestsOpened=Opened price requests
 SupplierProposalArea=Supplier proposals area
 SupplierProposalShort=Supplier proposal
 SupplierProposals=Supplier proposals
@@ -23,7 +23,7 @@ ConfirmValidateAsk=Are you sure you want to validate this price request under na
 DeleteAsk=Delete request
 ValidateAsk=Validate request
 SupplierProposalStatusDraft=ドラフト（検証する必要があります）
-SupplierProposalStatusValidated=Validated (request is open)
+SupplierProposalStatusValidated=Validated (request is opened)
 SupplierProposalStatusClosed=閉じた
 SupplierProposalStatusSigned=Accepted
 SupplierProposalStatusNotSigned=拒否
diff --git a/htdocs/langs/ja_JP/suppliers.lang b/htdocs/langs/ja_JP/suppliers.lang
index bf4c0e4da14..8637a8c890d 100644
--- a/htdocs/langs/ja_JP/suppliers.lang
+++ b/htdocs/langs/ja_JP/suppliers.lang
@@ -24,10 +24,10 @@ ExportDataset_fournisseur_1=サプライヤの請求書のリストと請求書
 ExportDataset_fournisseur_2=サプライヤーの請求書と支払い
 ExportDataset_fournisseur_3=Supplier orders and order lines
 ApproveThisOrder=この注文を承認
-ConfirmApproveThisOrder=あなたは、注文<b>%sを</b>承認してもよろしいですか？
+ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b>?
 DenyingThisOrder=Deny this order
-ConfirmDenyingThisOrder=あなたは、この順序<b>%sを</b>拒否してもよろしいですか？
-ConfirmCancelThisOrder=あなたは、この順序<b>%sを</b>キャンセルしてもよろしいですか？
+ConfirmDenyingThisOrder=Are you sure you want to deny this order <b>%s</b>?
+ConfirmCancelThisOrder=Are you sure you want to cancel this order <b>%s</b>?
 AddSupplierOrder=サプライヤーの順序を作成します。
 AddSupplierInvoice=サプライヤの請求書を作成します。
 ListOfSupplierProductForSupplier=サプライヤー<b>%s</b>の製品と価格の一覧
@@ -41,3 +41,4 @@ DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Wrong quality
 ReputationForThisProduct=Reputation
 BuyerName=Buyer name
+AllProductServicePrices=All product / service prices
diff --git a/htdocs/langs/ja_JP/users.lang b/htdocs/langs/ja_JP/users.lang
index bf67a7b25b7..1b44581bb4d 100644
--- a/htdocs/langs/ja_JP/users.lang
+++ b/htdocs/langs/ja_JP/users.lang
@@ -36,7 +36,7 @@ AdministratorDesc=管理者
 DefaultRights=既定のアクセス許可
 DefaultRightsDesc=ここで自動的に<u>新規作成した</u>ユーザー（既存のユーザーのアクセス許可を変更するには、ユーザカードに移動）に付与されている<u>既定の</u>アクセス許可を定義します。
 DolibarrUsers=Dolibarrユーザー
-LastName=Last Name
+LastName=姓
 FirstName=最初の名前
 ListOfGroups=グループのリスト
 NewGroup=新グループ
diff --git a/htdocs/langs/ja_JP/withdrawals.lang b/htdocs/langs/ja_JP/withdrawals.lang
index 69bc7c33c38..1c4dccb2103 100644
--- a/htdocs/langs/ja_JP/withdrawals.lang
+++ b/htdocs/langs/ja_JP/withdrawals.lang
@@ -24,6 +24,7 @@ WithdrawStatistics=Direct debit payment statistics
 WithdrawRejectStatistics=Direct debit payment reject statistics
 LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
+WithdrawRequestsDone=%s direct debit payment requests recorded
 ThirdPartyBankCode=サードパーティの銀行コード
 NoInvoiceCouldBeWithdrawed=ない請求書には成功してwithdrawedはありません。有効なBANしている企業であること請求書を確認してください。
 ClassCredited=入金分類
@@ -76,8 +77,8 @@ RUM=UMR
 RUMLong=Unique Mandate Reference
 RUMWillBeGenerated=UMR number will be generated once bank account information are saved
 WithdrawMode=Direct debit mode (FRST or RECUR)
-WithdrawRequestAmount=Withdraw request amount:
-WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil amount.
+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
diff --git a/htdocs/langs/ka_GE/accountancy.lang b/htdocs/langs/ka_GE/accountancy.lang
index 5de95948fbf..4c2336b97b0 100644
--- a/htdocs/langs/ka_GE/accountancy.lang
+++ b/htdocs/langs/ka_GE/accountancy.lang
@@ -194,6 +194,8 @@ ChangeBinding=Change the binding
 
 ## Admin
 ApplyMassCategories=Apply mass categories
+AddAccountFromBookKeepingWithNoCategories=Add acccount already used with no categories
+CategoryDeleted=Category for the accounting account has been removed
 
 ## Export
 Exports=Exports
@@ -209,6 +211,7 @@ Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution
 Modelcsv_quadratus=Export towards Quadratus QuadraCompta
 Modelcsv_ebp=Export towards EBP
 Modelcsv_cogilog=Export towards Cogilog
+ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
 InitAccountancy=Init accountancy
diff --git a/htdocs/langs/ka_GE/admin.lang b/htdocs/langs/ka_GE/admin.lang
index 23c8998e615..7282d9a21db 100644
--- a/htdocs/langs/ka_GE/admin.lang
+++ b/htdocs/langs/ka_GE/admin.lang
@@ -9,14 +9,20 @@ VersionDevelopment=Development
 VersionUnknown=Unknown
 VersionRecommanded=Recommended
 FileCheck=Files integrity checker
-FileCheckDesc=This tool allows you to check the integrity of files of your application, comparing each files with the official ones. You can use this tool to detect if some files were modified by a hacker for example.
+FileCheckDesc=This tool allows you to check the integrity of files and setup of your application, comparing each files with the official ones. 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.
+FileIntegrityIsStrictlyConformedWithReference=Files integrity is strictly conformed with the reference.
+FileIntegrityIsOkButFilesWereAdded=Files integrity check has passed, however some new files were added.
+FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified, removed or added.
+GlobalChecksum=Global checksum
 MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
 LocalSignature=Embedded local signature (less reliable)
 RemoteSignature=Remote distant signature (more reliable)
 FilesMissing=Missing Files
 FilesUpdated=Updated Files
+FilesModified=Modified Files
+FilesAdded=Added Files
 FileCheckDolibarr=Check integrity of application files
-AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from a certified package
+AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from an official package
 XmlNotFound=Xml Integrity File of application not found
 SessionId=Session ID
 SessionSaveHandler=Handler to save sessions
@@ -185,7 +191,9 @@ BoxesDesc=Widgets are components showing some information that you can add to pe
 OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
 ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
-ModulesMarketPlaces=More modules...
+ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
+ModulesMarketPlaces=Find external modules...
+GoModuleSetupArea=To deploy/install a new module, go onto the Module setup area at <a href="%s">%s</a>.
 DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules
 DoliPartnersDesc=List of companies providing custom developed modules or features (Note: anyone experienced in PHP programming can provide custom development for an open source project)
 WebSiteDesc=Reference websites to find more modules...
@@ -276,21 +284,22 @@ ModuleFamilyInterface=Interfaces with external systems
 MenuHandlers=Menu handlers
 MenuAdmin=Menu editor
 DoNotUseInProduction=Do not use in production
-ThisIsProcessToFollow=This is setup to process:
-ThisIsAlternativeProcessToFollow=This is an alternative setup to process:
+ThisIsProcessToFollow=This is steps to process:
+ThisIsAlternativeProcessToFollow=This is an alternative setup to process manually:
 StepNb=Step %s
 FindPackageFromWebSite=Find a package that provides feature you want (for example on official web site %s).
 DownloadPackageFromWebSite=Download package (for example from official web site %s).
-UnpackPackageInDolibarrRoot=Unpack package file into Dolibarr server directory dedicated to external modules: <b>%s</b>
-SetupIsReadyForUse=Install is finished and Dolibarr is ready to use with this new component.
-NotExistsDirect=The alternative root directory is not defined.<br>
-InfDirAlt=Since version 3 it is possible to define an alternative root directory.This allows you to store, same place, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
-InfDirExample=<br>Then declare it in the file conf.php<br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>*These lines are commented with "#", to uncomment only remove the character.
+UnpackPackageInDolibarrRoot=Unpack the packaged files into server directory dedicated to Dolibarr: <b>%s</b>
+UnpackPackageInModulesRoot=To deploy/install an external module, unpack the packaged files into the server directory dedicated to modules: <b>%s</b>
+SetupIsReadyForUse=Module deployment is finished. You must however enable and setup the module in your application by going on the page to setup modules: <a href="%s">%s</a>.
+NotExistsDirect=The alternative root directory is not defined to an existing directory.<br>
+InfDirAlt=Since version 3, it is possible to define an alternative root directory. This allows you to store, into a dedicated directory, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
+InfDirExample=<br>Then declare it in the file <strong>conf.php</strong><br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>If these lines are commented with "#", to enable them, just uncomment by removing the "#" character.
 YouCanSubmitFile=For this step, you can send package using this tool: Select module file
 CurrentVersion=Dolibarr current version
 CallUpdatePage=Go to the page that updates the database structure and data: %s.
 LastStableVersion=Latest stable version
-LastActivationDate=Last activation date
+LastActivationDate=Latest activation date
 UpdateServerOffline=Update server offline
 GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s. <br><b>{000000@x}</b> same as previous but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
 GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
@@ -373,11 +382,11 @@ ExtrafieldCheckBox=Checkbox
 ExtrafieldRadio=Radio button
 ExtrafieldCheckBoxFromList= Checkbox from table
 ExtrafieldLink=Link to an object
-ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>In order to have the list depending on another :<br>1,value1|parent_list_code:parent_key<br>2,value2|parent_list_code:parent_key
+ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list :<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list :<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
-ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
+ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Example : Societe:societe/class/societe.class.php
 LibraryToBuildPDF=Library used for PDF generation
 WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
@@ -411,10 +420,11 @@ ModuleCompanyCodePanicum=Return an empty accountancy code.
 ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party code.
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
-
+WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<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).
+ClickToShowDescription=Click to show description
 # Modules
 Module0Name=Users & groups
-Module0Desc=Users and groups management
+Module0Desc=Users / Employees and Groups management
 Module1Name=Third parties
 Module1Desc=Companies and contact management (customers, prospects...)
 Module2Name=Commercial
@@ -515,8 +525,8 @@ Module2200Name=Dynamic Prices
 Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
 Module2300Desc=Scheduled job management
-Module2400Name=Agenda/Events
-Module2400Desc=Follow events or rendez-vous. Record manual events into Agendas or let application logs automatic events for tracking purposes.
+Module2400Name=Events/Agenda
+Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous.
 Module2500Name=Electronic Content Management
 Module2500Desc=Save and share documents
 Module2600Name=API/Web services (SOAP server)
@@ -582,7 +592,7 @@ Permission34=Delete products
 Permission36=See/manage hidden products
 Permission38=Export products
 Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
-Permission42=Create/modify projects (shared project and projects i'm contact for)
+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)
 Permission45=Export projects
 Permission61=Read interventions
@@ -685,7 +695,7 @@ PermissionAdvanced253=Create/modify internal/external users and permissions
 Permission254=Create/modify external users only
 Permission255=Modify other users password
 Permission256=Delete or disable other users
-Permission262=Extend access to all third parties (not only those linked to user). Not effective for external users (always limited to themselves).
+Permission262=Extend access to all third parties (not only third parties that user is a sale representative).<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 assignement matters).
 Permission271=Read CA
 Permission272=Read invoices
 Permission273=Issue invoices
@@ -887,7 +897,7 @@ Offset=Offset
 AlwaysActive=Always active
 Upgrade=Upgrade
 MenuUpgrade=Upgrade / Extend
-AddExtensionThemeModuleOrOther=Add extension (theme, module, ...)
+AddExtensionThemeModuleOrOther=Deploy/install external module
 WebServer=Web server
 DocumentRootServer=Web server's root directory
 DataRootServer=Data files directory
@@ -994,7 +1004,7 @@ TriggerAlwaysActive=Triggers in this file are always active, whatever are the ac
 TriggerActiveAsModuleActive=Triggers in this file are active as module <b>%s</b> is enabled.
 GeneratedPasswordDesc=Define here which rule you want to use to generate new password if you ask to have auto generated password
 DictionaryDesc=Insert all reference data. You can add your values to the default.
-ConstDesc=This page allows you to edit all other parameters not available in previous pages. These are mostly reserved parameters for developers or advanced troubleshooting.
+ConstDesc=This page allows you to edit all other parameters not available in previous pages. These are mostly reserved parameters for developers or advanced troubleshooting. For a list of options <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">check here</a>.
 MiscellaneousDesc=All other security related parameters are defined here.
 LimitsSetup=Limits/Precision setup
 LimitsDesc=You can define limits, precisions and optimisations used by Dolibarr here
@@ -1161,10 +1171,6 @@ FreeLegalTextOnOrders=Free text on orders
 WatermarkOnDraftOrders=Watermark on draft orders (none if empty)
 ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable
 BANK_ASK_PAYMENT_BANK_DURING_ORDER=Ask for bank account destination of order
-##### Clicktodial #####
-ClickToDialSetup=Click To Dial module setup
-ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with your clicktodial login (defined on your user card)<br><b>__PASS__</b> that will be replaced with your clicktodial password (defined on your user card).
-##### Bookmark4u #####
 ##### Interventions #####
 InterventionsSetup=Interventions module setup
 FreeLegalTextOnInterventions=Free text on intervention documents
@@ -1391,7 +1397,7 @@ SendingsSetup=Sending module setup
 SendingsReceiptModel=Sending receipt model
 SendingsNumberingModules=Sendings numbering modules
 SendingsAbility=Support shipping sheets for customer deliveries
-NoNeedForDeliveryReceipts=In most cases, sendings receipts are used both as sheets for customer deliveries (list of products to send) and sheets that is recevied and signed by customer. So product deliveries receipts is a duplicated feature and is rarely activated.
+NoNeedForDeliveryReceipts=In most cases, shipping sheets are used both as sheets for customer deliveries (list of products to send) and sheets that is received and signed by customer. So product deliveries receipts is a duplicated feature and is rarely activated.
 FreeLegalTextOnShippings=Free text on shipments
 ##### Deliveries #####
 DeliveryOrderNumberingModules=Products deliveries receipt numbering module
@@ -1471,7 +1477,11 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Set automatically this default value for type of e
 AGENDA_DEFAULT_FILTER_TYPE=Set automatically this type of event into search filter of agenda view
 AGENDA_DEFAULT_FILTER_STATUS=Set automatically this status for events into search filter of agenda view
 AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
-##### ClickToDial #####
+AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
+AGENDA_NOTIFICATION_SOUND=Enable sound notification
+##### Clicktodial #####
+ClickToDialSetup=Click To Dial module setup
+ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with your clicktodial login (defined on your user card)<br><b>__PASS__</b> that will be replaced with your clicktodial password (defined on your user card).
 ClickToDialDesc=This module allows to make phone numbers clickable. A click on this icon will call make your phone to 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.
 ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
 ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on same computer than the browser, and called when you click on a link in your browser that start 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.
@@ -1499,10 +1509,11 @@ EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint availa
 ##### API ####
 ApiSetup=API module setup
 ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
-ApiProductionMode=Enable production mode (this will activate use of a caches for services management)
+ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
 ApiExporerIs=You can explore the APIs at url
 OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
 ApiKey=Key for API
+WarningAPIExplorerDisabled=The API explorer has been disabled. API explorer is not required to provide API services. It is a tool for developer to find/test REST APIs. If you need this tool, go into setup of module API REST to activate it.
 ##### Bank #####
 BankSetupModule=Bank module setup
 FreeLegalTextOnChequeReceipts=Free text on cheque receipts
@@ -1571,7 +1582,7 @@ BackupDumpWizard=Wizard to build database backup dump file
 SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
 SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is only manual steps a privileged user can do.
 InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
-ConfFileMuseContainCustom=Installing an external module from application save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to have option<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
+ConfFileMuseContainCustom=Installing an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
 HighlightLinesColor=Highlight color of the line when the mouse passes over (keep empty for no highlight)
 TextTitleColor=Color of page title
@@ -1601,6 +1612,7 @@ FixTZ=TimeZone fix
 FillFixTZOnlyIfRequired=Example: +2 (fill only if problem experienced)
 ExpectedChecksum=Expected Checksum
 CurrentChecksum=Current Checksum
+ForcedConstants=Required constant values
 MailToSendProposal=To send customer proposal
 MailToSendOrder=To send customer order
 MailToSendInvoice=To send customer invoice
@@ -1609,13 +1621,14 @@ MailToSendIntervention=To send intervention
 MailToSendSupplierRequestForQuotation=To send quotation request to supplier
 MailToSendSupplierOrder=To send supplier order
 MailToSendSupplierInvoice=To send supplier invoice
+MailToSendContract=To send a contract
 MailToThirdparty=To send email from third party page
 ByDefaultInList=Show by default on list view
-YouUseLastStableVersion=You use the last stable version
+YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
 TitleExampleForMaintenanceRelease=Example of message you can use to announce this maintenance release (feel free to use it on your web sites)
-ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. You can download it from the download area of http://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.
-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, nor data structure change is present into this version. You can download it from the download area of http://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.
+ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. 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.
+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, nor data structure change is present into 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, you can enter here rule to have price for each level autocalculated according to price of first level, so you will have to enter only price for first level on each product. This page is here to save you time and can be usefull only if your prices for each leve are relative to first level. You can ignore this page in most cases.
 ModelModulesProduct=Templates for product documents
 ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
diff --git a/htdocs/langs/ka_GE/banks.lang b/htdocs/langs/ka_GE/banks.lang
index 7ae841cf0f3..f0c41d5d5bf 100644
--- a/htdocs/langs/ka_GE/banks.lang
+++ b/htdocs/langs/ka_GE/banks.lang
@@ -74,13 +74,13 @@ Conciliate=Reconcile
 Conciliation=Reconciliation
 ReconciliationLate=Reconciliation late
 IncludeClosedAccount=Include closed accounts
-OnlyOpenedAccount=Only open accounts
+OnlyOpenedAccount=Only opened accounts
 AccountToCredit=Account to credit
 AccountToDebit=Account to debit
 DisableConciliation=Disable reconciliation feature for this account
 ConciliationDisabled=Reconciliation feature disabled
 LinkedToAConciliatedTransaction=Linked to a conciliated entry
-StatusAccountOpened=Open
+StatusAccountOpened=Opened
 StatusAccountClosed=Closed
 AccountIdShort=Number
 LineRecord=Transaction
diff --git a/htdocs/langs/ka_GE/bills.lang b/htdocs/langs/ka_GE/bills.lang
index bf3b48a37e9..5fb3b6169da 100644
--- a/htdocs/langs/ka_GE/bills.lang
+++ b/htdocs/langs/ka_GE/bills.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - bills
 Bill=Invoice
 Bills=Invoices
-BillsCustomers=Customers invoices
-BillsCustomer=Customers invoice
-BillsSuppliers=Suppliers invoices
-BillsCustomersUnpaid=Unpaid customers invoices
-BillsCustomersUnpaidForCompany=Unpaid customer's invoices for %s
-BillsSuppliersUnpaid=Unpaid supplier's invoices
-BillsSuppliersUnpaidForCompany=Unpaid supplier's invoices for %s
+BillsCustomers=Customer invoices
+BillsCustomer=Customer invoice
+BillsSuppliers=Supplier invoices
+BillsCustomersUnpaid=Unpaid customer invoices
+BillsCustomersUnpaidForCompany=Unpaid customer invoices for %s
+BillsSuppliersUnpaid=Unpaid supplier invoices
+BillsSuppliersUnpaidForCompany=Unpaid supplier invoices for %s
 BillsLate=Late payments
 BillsStatistics=Customers invoices statistics
 BillsStatisticsSuppliers=Suppliers invoices statistics
@@ -62,8 +62,8 @@ PaymentsBack=Payments back
 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 credit note or deposit 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.
+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.
 SupplierPayments=Suppliers payments
 ReceivedPayments=Received payments
 ReceivedCustomersPayments=Payments received from customers
@@ -78,6 +78,7 @@ PaymentMode=Payment type
 PaymentTypeDC=Debit/Credit Card
 PaymentTypePP=PayPal
 IdPaymentMode=Payment type (id)
+CodePaymentMode=Payment type (code)
 LabelPaymentMode=Payment type (label)
 PaymentModeShort=Payment type
 PaymentTerm=Payment term
@@ -102,9 +103,10 @@ SearchACustomerInvoice=Search for a customer invoice
 SearchASupplierInvoice=Search for a supplier invoice
 CancelBill=Cancel an invoice
 SendRemindByMail=Send reminder by EMail
-DoPayment=Do payment
-DoPaymentBack=Do payment back
+DoPayment=Enter payment
+DoPaymentBack=Enter refund
 ConvertToReduc=Convert into future discount
+ConvertExcessReceivedToReduc=Convert excess received into future discount
 EnterPaymentReceivedFromCustomer=Enter payment received from customer
 EnterPaymentDueToCustomer=Make payment due to customer
 DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
@@ -113,22 +115,24 @@ BillStatus=Invoice status
 StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Draft (needs to be validated)
 BillStatusPaid=Paid
-BillStatusPaidBackOrConverted=Paid or converted into discount
+BillStatusPaidBackOrConverted=Refund or converted into discount
 BillStatusConverted=Paid (ready for final invoice)
 BillStatusCanceled=Abandoned
 BillStatusValidated=Validated (needs to be paid)
 BillStatusStarted=Started
 BillStatusNotPaid=Not paid
+BillStatusNotRefunded=Not refunded
 BillStatusClosedUnpaid=Closed (unpaid)
 BillStatusClosedPaidPartially=Paid (partially)
 BillShortStatusDraft=Draft
 BillShortStatusPaid=Paid
-BillShortStatusPaidBackOrConverted=Processed
+BillShortStatusPaidBackOrConverted=Refund or converted
 BillShortStatusConverted=Processed
 BillShortStatusCanceled=Abandoned
 BillShortStatusValidated=Validated
 BillShortStatusStarted=Started
 BillShortStatusNotPaid=Not paid
+BillShortStatusNotRefunded=Not refunded
 BillShortStatusClosedUnpaid=Closed
 BillShortStatusClosedPaidPartially=Paid (partially)
 PaymentStatusToValidShort=To validate
@@ -149,14 +153,14 @@ NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified
 FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
 NotARecurringInvoiceTemplate=Not a recurring template invoice
 NewBill=New invoice
-LastBills=Last %s invoices
-LastCustomersBills=Last %s customers invoices
-LastSuppliersBills=Last %s suppliers invoices
+LastBills=Latest %s invoices
+LastCustomersBills=Latest %s customer invoices
+LastSuppliersBills=Latest %s supplier invoices
 AllBills=All invoices
 OtherBills=Other invoices
 DraftBills=Draft invoices
-CustomersDraftInvoices=Customers draft invoices
-SuppliersDraftInvoices=Suppliers draft invoices
+CustomersDraftInvoices=Customer draft invoices
+SuppliersDraftInvoices=Supplier draft invoices
 Unpaid=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>?
@@ -203,7 +207,7 @@ AlreadyPaidNoCreditNotesNoDeposits=Already paid (without credit notes and deposi
 Abandoned=Abandoned
 RemainderToPay=Remaining unpaid
 RemainderToTake=Remaining amount to take
-RemainderToPayBack=Remaining amount to pay back
+RemainderToPayBack=Remaining amount to refund
 Rest=Pending
 AmountExpected=Amount claimed
 ExcessReceived=Excess received
@@ -270,6 +274,7 @@ Deposit=Deposit
 Deposits=Deposits
 DiscountFromCreditNote=Discount from credit note %s
 DiscountFromDeposit=Payments from deposit invoice %s
+DiscountFromExcessReceived=Payments from excess received of invoice %s
 AbsoluteDiscountUse=This kind of credit can be used on invoice before its validation
 CreditNoteDepositUse=Invoice must be validated to use this kind of credits
 NewGlobalDiscount=New absolute discount
@@ -277,8 +282,8 @@ NewRelativeDiscount=New relative discount
 NoteReason=Note/Reason
 ReasonDiscount=Reason
 DiscountOfferedBy=Granted by
-DiscountStillRemaining=Discounts still remaining
-DiscountAlreadyCounted=Discounts already counted
+DiscountStillRemaining=Discounts available
+DiscountAlreadyCounted=Discounts already consumed
 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.
@@ -331,10 +336,12 @@ 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
 # PaymentConditions
 Statut=Status
-PaymentConditionShortRECEP=Immediate
-PaymentConditionRECEP=Immediate
+PaymentConditionShortRECEP=Due Upon Receipt
+PaymentConditionRECEP=Due Upon Receipt
 PaymentConditionShort30D=30 days
 PaymentCondition30D=30 days
 PaymentConditionShort30DENDMONTH=30 days of month-end
@@ -349,6 +356,14 @@ PaymentConditionShortPT_ORDER=Order
 PaymentConditionPT_ORDER=On order
 PaymentConditionShortPT_5050=50-50
 PaymentConditionPT_5050=50%% in advance, 50%% on delivery
+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
 FixAmount=Fix amount
 VarAmount=Variable amount (%% tot.)
 # PaymentType
@@ -418,7 +433,7 @@ ChequeDeposits=Checks deposits
 Cheques=Checks
 DepositId=Id deposit
 NbCheque=Number of checks
-CreditNoteConvertedIntoDiscount=This credit note or deposit invoice has been converted into %s
+CreditNoteConvertedIntoDiscount=This %s has been converted into %s
 UsBillingContactAsIncoiveRecipientIfExist=Use customer billing contact address instead of third party address as recipient for invoices
 ShowUnpaidAll=Show all unpaid invoices
 ShowUnpaidLateOnly=Show late unpaid invoices only
diff --git a/htdocs/langs/ka_GE/boxes.lang b/htdocs/langs/ka_GE/boxes.lang
index 98970318e85..38b03b4268d 100644
--- a/htdocs/langs/ka_GE/boxes.lang
+++ b/htdocs/langs/ka_GE/boxes.lang
@@ -25,8 +25,8 @@ BoxTitleLastSuppliers=Latest %s recorded suppliers
 BoxTitleLastModifiedSuppliers=Latest %s modified suppliers
 BoxTitleLastModifiedCustomers=Latest %s modified customers
 BoxTitleLastCustomersOrProspects=Latest %s customers or prospects
-BoxTitleLastCustomerBills=Latest %s customer's invoices
-BoxTitleLastSupplierBills=Latest %s supplier's invoices
+BoxTitleLastCustomerBills=Latest %s customer invoices
+BoxTitleLastSupplierBills=Latest %s supplier invoices
 BoxTitleLastModifiedProspects=Latest %s modified prospects
 BoxTitleLastModifiedMembers=Latest %s members
 BoxTitleLastFicheInter=Latest %s modified interventions
@@ -51,12 +51,12 @@ ClickToAdd=Click here to add.
 NoRecordedCustomers=No recorded customers
 NoRecordedContacts=No recorded contacts
 NoActionsToDo=No actions to do
-NoRecordedOrders=No recorded customer's orders
+NoRecordedOrders=No recorded customer orders
 NoRecordedProposals=No recorded proposals
-NoRecordedInvoices=No recorded customer's invoices
-NoUnpaidCustomerBills=No unpaid customer's invoices
-NoUnpaidSupplierBills=No unpaid supplier's invoices
-NoModifiedSupplierBills=No recorded supplier's invoices
+NoRecordedInvoices=No recorded customer invoices
+NoUnpaidCustomerBills=No unpaid customer invoices
+NoUnpaidSupplierBills=No unpaid supplier invoices
+NoModifiedSupplierBills=No recorded supplier invoices
 NoRecordedProducts=No recorded products/services
 NoRecordedProspects=No recorded prospects
 NoContractedProducts=No products/services contracted
diff --git a/htdocs/langs/ka_GE/companies.lang b/htdocs/langs/ka_GE/companies.lang
index 4a631b092cf..1b7efa3c14e 100644
--- a/htdocs/langs/ka_GE/companies.lang
+++ b/htdocs/langs/ka_GE/companies.lang
@@ -78,6 +78,10 @@ VATIsNotUsed=VAT is not used
 CopyAddressFromSoc=Fill address with third party address
 ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
 PaymentBankAccount=Payment bank account
+OverAllProposals=Total proposals
+OverAllOrders=Total orders
+OverAllInvoices=Total invoices
+OverAllSupplierProposals=Total price requests
 ##### Local Taxes #####
 LocalTax1IsUsed=Use second tax
 LocalTax1IsUsedES= RE is used
@@ -239,6 +243,10 @@ ProfId3RU=Prof Id 3 (KPP)
 ProfId4RU=Prof Id 4 (OKPO)
 ProfId5RU=-
 ProfId6RU=-
+ProfId1DZ=RC
+ProfId2DZ=Art.
+ProfId3DZ=NIF
+ProfId4DZ=NIS
 VATIntra=VAT number
 VATIntraShort=VAT number
 VATIntraSyntaxIsValid=Syntax is valid
@@ -382,8 +390,9 @@ ListCustomersShort=List of customers
 ThirdPartiesArea=Third parties and contact area
 LastModifiedThirdParties=Latest %s modified third parties
 UniqueThirdParties=Total of unique third parties
-InActivity=Open
+InActivity=Opened
 ActivityCeased=Closed
+ThirdPartyIsClosed=Third party is closed
 ProductsIntoElements=List of products/services into %s
 CurrentOutstandingBill=Current outstanding bill
 OutstandingBill=Max. for outstanding bill
@@ -396,7 +405,7 @@ MergeThirdparties=Merge third parties
 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 so you will be able to delete the duplicate one.
 ThirdpartiesMergeSuccess=Thirdparties have been merged
 SaleRepresentativeLogin=Login of sales representative
-SaleRepresentativeFirstname=Firstname of sales representative
-SaleRepresentativeLastname=Lastname of sales representative
+SaleRepresentativeFirstname=First name of sales representative
+SaleRepresentativeLastname=Last name of sales representative
 ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
 NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/ka_GE/compta.lang b/htdocs/langs/ka_GE/compta.lang
index 17f2bb4e98f..5e9814369ec 100644
--- a/htdocs/langs/ka_GE/compta.lang
+++ b/htdocs/langs/ka_GE/compta.lang
@@ -65,6 +65,7 @@ PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=VAT payment
 ListPayment=List of payments
 ListOfCustomerPayments=List of customer payments
+ListOfSupplierPayments=List of supplier payments
 DateStartPeriod=Date start period
 DateEndPeriod=Date end period
 newLT1Payment=New tax 2 payment
@@ -81,7 +82,7 @@ LT2PaymentES=IRPF Payment
 LT2PaymentsES=IRPF Payments
 VATPayment=Sales tax payment
 VATPayments=Sales tax payments
-VATRefund=Sales tax refund Refund
+VATRefund=Sales tax refund
 Refund=Refund
 SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Show VAT payment
@@ -194,7 +195,7 @@ CloneTax=Clone a social/fiscal tax
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
 CloneTaxForNextMonth=Clone it for next month
 SimpleReport=Simple report
-AddExtraReport=Extra reports
+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
diff --git a/htdocs/langs/ka_GE/cron.lang b/htdocs/langs/ka_GE/cron.lang
index cb68b31c80f..b1e8bcb36d2 100644
--- a/htdocs/langs/ka_GE/cron.lang
+++ b/htdocs/langs/ka_GE/cron.lang
@@ -17,14 +17,14 @@ CronMethodDoesNotExists=Class %s does not contains any method %s
 # Menu
 EnabledAndDisabled=Enabled and disabled
 # Page list
-CronLastOutput=Last run output
-CronLastResult=Last result code
+CronLastOutput=Latest run output
+CronLastResult=Latest result code
 CronCommand=Command
 CronList=Scheduled jobs
 CronDelete=Delete scheduled jobs
-CronConfirmDelete=Are you sure you want to delete these scheduled jobs ?
+CronConfirmDelete=Are you sure you want to delete these scheduled jobs?
 CronExecute=Launch scheduled job
-CronConfirmExecute=Are you sure you want to execute these scheduled jobs now ?
+CronConfirmExecute=Are you sure you want to execute these scheduled jobs now?
 CronInfo=Scheduled job module allow to execute job that have been planned
 CronTask=Job
 CronNone=None
diff --git a/htdocs/langs/ka_GE/errors.lang b/htdocs/langs/ka_GE/errors.lang
index f935ce72d41..9e2eb6817ef 100644
--- a/htdocs/langs/ka_GE/errors.lang
+++ b/htdocs/langs/ka_GE/errors.lang
@@ -11,6 +11,7 @@ ErrorLoginAlreadyExists=Login %s already exists.
 ErrorGroupAlreadyExists=Group %s already exists.
 ErrorRecordNotFound=Record not found.
 ErrorFailToCopyFile=Failed to copy file '<b>%s</b>' into '<b>%s</b>'.
+ErrorFailToCopyDir=Failed to copy directory '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToRenameFile=Failed to rename file '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToDeleteFile=Failed to remove file '<b>%s</b>'.
 ErrorFailToCreateFile=Failed to create file '<b>%s</b>'.
@@ -115,7 +116,7 @@ ErrorNoActivatedBarcode=No barcode type activated
 ErrUnzipFails=Failed to unzip %s with ZipArchive
 ErrNoZipEngine=No engine to unzip %s file in this PHP
 ErrorFileMustBeADolibarrPackage=The file %s must be a Dolibarr zip package
-ErrorFileRequired=It takes a package Dolibarr file
+ErrorModuleFileRequired=You must select a Dolibarr module package file
 ErrorPhpCurlNotInstalled=The PHP CURL is not installed, this is essential to talk with 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
@@ -170,14 +171,19 @@ ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
 ErrorFileMustHaveFormat=File must have format %s
 ErrorSupplierCountryIsNotDefined=Country for this supplier is not defined. Correct this first.
 ErrorsThirdpartyMerge=Failed to merge the two records. Request canceled.
-ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enougth for product %s to add it into a new order.
-ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enougth for product %s to add it into a new invoice.
-ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enougth for product %s to add it into a new shipment.
-ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enougth for product %s to add it into a new proposal.
-ErrorFailedToLoadLoginFileForMode=Failed to get the login file for mode '%s'.
+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 bank 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>
 
 # 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.
diff --git a/htdocs/langs/ka_GE/holiday.lang b/htdocs/langs/ka_GE/holiday.lang
index a95da81eaaa..50d97c0d8cc 100644
--- a/htdocs/langs/ka_GE/holiday.lang
+++ b/htdocs/langs/ka_GE/holiday.lang
@@ -76,8 +76,9 @@ BoxTitleLastLeaveRequests=Latest %s modified leave requests
 HolidaysMonthlyUpdate=Monthly update
 ManualUpdate=Manual update
 HolidaysCancelation=Leave request cancelation
-EmployeeLastname=Employee lastname
-EmployeeFirstname=Employee firstname
+EmployeeLastname=Employee last name
+EmployeeFirstname=Employee first name
+TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
 
 ## Configuration du Module ##
 LastUpdateCP=Latest automatic update of leaves allocation
diff --git a/htdocs/langs/ka_GE/ldap.lang b/htdocs/langs/ka_GE/ldap.lang
index a17019d00fb..42e699de311 100644
--- a/htdocs/langs/ka_GE/ldap.lang
+++ b/htdocs/langs/ka_GE/ldap.lang
@@ -13,8 +13,8 @@ LDAPUsers=Users in LDAP database
 LDAPFieldStatus=Status
 LDAPFieldFirstSubscriptionDate=First subscription date
 LDAPFieldFirstSubscriptionAmount=First subscription amount
-LDAPFieldLastSubscriptionDate=Last subscription date
-LDAPFieldLastSubscriptionAmount=Last subscription amount
+LDAPFieldLastSubscriptionDate=Latest subscription date
+LDAPFieldLastSubscriptionAmount=Latest subscription amount
 LDAPFieldSkype=Skype id
 LDAPFieldSkypeExample=Example : skypeName
 UserSynchronized=User synchronized
diff --git a/htdocs/langs/ka_GE/mails.lang b/htdocs/langs/ka_GE/mails.lang
index ab18dcdca25..c830b551a67 100644
--- a/htdocs/langs/ka_GE/mails.lang
+++ b/htdocs/langs/ka_GE/mails.lang
@@ -35,7 +35,7 @@ MailingStatusSentPartialy=Sent partialy
 MailingStatusSentCompletely=Sent completely
 MailingStatusError=Error
 MailingStatusNotSent=Not sent
-MailSuccessfulySent=Email successfully sent (from %s to %s)
+MailSuccessfulySent=Email successfully accepted for delivery (from %s to %s)
 MailingSuccessfullyValidated=EMailing successfully validated
 MailUnsubcribe=Unsubscribe
 MailingStatusNotContact=Don't contact anymore
@@ -74,22 +74,28 @@ ResultOfMailSending=Result of mass EMail sending
 NbSelected=Nb selected
 NbIgnored=Nb ignored
 NbSent=Nb 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
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Line %s in file
 RecipientSelectionModules=Defined requests for recipient's selection
 MailSelectedRecipients=Selected recipients
 MailingArea=EMailings area
-LastMailings=Last %s emailings
+LastMailings=Latest %s emailings
 TargetsStatistics=Targets statistics
 NbOfCompaniesContacts=Unique contacts/addresses
 MailNoChangePossible=Recipients for validated emailing can't be changed
 SearchAMailing=Search mailing
 SendMailing=Send emailing
 SendMail=Send email
-MailingNeedCommand=For security reason, sending an emailing is better when performed from command line. If you have one, ask your server administrator to launch the following command to send the emailing to all recipients:
+SentBy=Sent by
+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=You can however send them online by adding parameter MAILING_LIMIT_SENDBYWEB with value of max number of emails you want to send by session. For this, go on Home - Setup - Other.
-ConfirmSendingEmailing=If you can't or prefer sending them with your www browser, please confirm you are sure you want to send emailing now from your browser?
+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.
 TargetsReset=Clear list
 ToClearAllRecipientsClickHere=Click here to clear the recipient list for this emailing
@@ -144,3 +150,6 @@ AdvTgtCreateFilter=Create filter
 AdvTgtOrCreateNewFilter=Name of new filter
 NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
+OutGoingEmailSetup=Outgoing email setup
+InGoingEmailSetup=Incoming email setup
+
diff --git a/htdocs/langs/ka_GE/main.lang b/htdocs/langs/ka_GE/main.lang
index 5dae5edf440..1d4c9c416be 100644
--- a/htdocs/langs/ka_GE/main.lang
+++ b/htdocs/langs/ka_GE/main.lang
@@ -63,11 +63,13 @@ ErrorNoVATRateDefinedForSellerCountry=Error, no vat rates defined for country '%
 ErrorNoSocialContributionForSellerCountry=Error, no social/fiscal taxes type defined for country '%s'.
 ErrorFailedToSaveFile=Error, failed to save file.
 ErrorCannotAddThisParentWarehouse=You are trying to add a parent warehouse which is already a child of current one
+MaxNbOfRecordPerPage=Max nb of record per page
 NotAuthorized=You are not authorized to do that.
 SetDate=Set date
 SelectDate=Select a date
 SeeAlso=See also %s
 SeeHere=See here
+Apply=Apply
 BackgroundColorByDefault=Default background color
 FileRenamed=The file was successfully renamed
 FileUploaded=The file was successfully uploaded
@@ -86,7 +88,7 @@ Undefined=Undefined
 PasswordForgotten=Password forgotten?
 SeeAbove=See above
 HomeArea=Home area
-LastConnexion=Last connection
+LastConnexion=Latest connection
 PreviousConnexion=Previous connection
 PreviousValue=Previous value
 ConnectedOnMultiCompany=Connected on environment
@@ -236,7 +238,7 @@ DateCreation=Creation date
 DateCreationShort=Creat. date
 DateModification=Modification date
 DateModificationShort=Modif. date
-DateLastModification=Last modification date
+DateLastModification=Latest modification date
 DateValidation=Validation date
 DateClosing=Closing date
 DateDue=Due date
@@ -432,7 +434,7 @@ Reportings=Reporting
 Draft=Draft
 Drafts=Drafts
 Validated=Validated
-Opened=Open
+Opened=Opened
 New=New
 Discount=Discount
 Unknown=Unknown
@@ -460,6 +462,7 @@ DeletePicture=Picture delete
 ConfirmDeletePicture=Confirm picture deletion?
 Login=Login
 CurrentLogin=Current login
+EnterLoginDetail=Enter login details
 January=January
 February=February
 March=March
@@ -597,6 +600,8 @@ SessionName=Session name
 Method=Method
 Receive=Receive
 CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
+ExpectedValue=Expected Value
+CurrentValue=Current value
 PartialWoman=Partial
 TotalWoman=Total
 NeverReceived=Never received
@@ -753,6 +758,8 @@ RemoveString=Remove string '%s'
 SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
 DirectDownloadLink=Direct download link
 Download=Download
+ActualizeCurrency=Update currency rate
+Fiscalyear=Fiscal year
 # Week day
 Monday=Monday
 Tuesday=Tuesday
@@ -787,8 +794,8 @@ SetRef=Set ref
 Select2ResultFoundUseArrows=Some results found. Use arrows to select.
 Select2NotFound=No result found
 Select2Enter=Enter
-Select2MoreCharacter=or more character
-Select2MoreCharacters=or more characters
+Select2MoreCharacter=or more characters<br /><br /><strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
+Select2MoreCharacters=or more characters<br /><br /><strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
 Select2LoadingMoreResults=Loading more results...
 Select2SearchInProgress=Search in progress...
 SearchIntoThirdparties=Thirdparties
@@ -809,3 +816,5 @@ SearchIntoContracts=Contracts
 SearchIntoCustomerShipments=Customer shipments
 SearchIntoExpenseReports=Expense reports
 SearchIntoLeaves=Leaves
+
+BulkActions=Bulk actions
diff --git a/htdocs/langs/ka_GE/members.lang b/htdocs/langs/ka_GE/members.lang
index df911af6f71..8f6f76ba48f 100644
--- a/htdocs/langs/ka_GE/members.lang
+++ b/htdocs/langs/ka_GE/members.lang
@@ -45,7 +45,7 @@ MemberStatusDraft=Draft (needs to be validated)
 MemberStatusDraftShort=Draft
 MemberStatusActive=Validated (waiting subscription)
 MemberStatusActiveShort=Validated
-MemberStatusActiveLate=subscription expired
+MemberStatusActiveLate=Subscription expired
 MemberStatusActiveLateShort=Expired
 MemberStatusPaid=Subscription up to date
 MemberStatusPaidShort=Up to date
@@ -136,8 +136,8 @@ DocForAllMembersCards=Generate business cards for all members
 DocForOneMemberCards=Generate business cards for a particular member
 DocForLabels=Generate address sheets
 SubscriptionPayment=Subscription payment
-LastSubscriptionDate=Last subscription date
-LastSubscriptionAmount=Last subscription amount
+LastSubscriptionDate=Latest subscription date
+LastSubscriptionAmount=Latest subscription amount
 MembersStatisticsByCountries=Members statistics by country
 MembersStatisticsByState=Members statistics by state/province
 MembersStatisticsByTown=Members statistics by town
@@ -149,7 +149,7 @@ MembersByStateDesc=This screen show you statistics on members by state/provinces
 MembersByTownDesc=This screen show you statistics on members by town.
 MembersStatisticsDesc=Choose statistics you want to read...
 MenuMembersStats=Statistics
-LastMemberDate=Last member date
+LastMemberDate=Latest member date
 Nature=Nature
 Public=Information are public
 NewMemberbyWeb=New member added. Awaiting approval
diff --git a/htdocs/langs/ka_GE/orders.lang b/htdocs/langs/ka_GE/orders.lang
index 9d2e53e4fe2..331e3b49d3e 100644
--- a/htdocs/langs/ka_GE/orders.lang
+++ b/htdocs/langs/ka_GE/orders.lang
@@ -39,7 +39,7 @@ StatusOrderRefusedShort=Refused
 StatusOrderBilledShort=Billed
 StatusOrderToProcessShort=To process
 StatusOrderReceivedPartiallyShort=Partially received
-StatusOrderReceivedAllShort=Everything received
+StatusOrderReceivedAllShort=Products received
 StatusOrderCanceled=Canceled
 StatusOrderDraft=Draft (needs to be validated)
 StatusOrderValidated=Validated
@@ -51,7 +51,7 @@ StatusOrderApproved=Approved
 StatusOrderRefused=Refused
 StatusOrderBilled=Billed
 StatusOrderReceivedPartially=Partially received
-StatusOrderReceivedAll=Everything received
+StatusOrderReceivedAll=All products received
 ShippingExist=A shipment exists
 QtyOrdered=Qty ordered
 ProductQtyInDraft=Product quantity into draft orders
diff --git a/htdocs/langs/ka_GE/other.lang b/htdocs/langs/ka_GE/other.lang
index 1ea1f9da1db..ab937ff3bab 100644
--- a/htdocs/langs/ka_GE/other.lang
+++ b/htdocs/langs/ka_GE/other.lang
@@ -2,6 +2,7 @@
 SecurityCode=Security code
 NumberingShort=N°
 Tools=Tools
+TMenuTools=Tools
 ToolsDesc=All miscellaneous tools not included in other menu entries are collected here.<br /><br />All the tools can be reached in the left menu.
 Birthday=Birthday
 BirthdayDate=Birthday date
@@ -67,14 +68,15 @@ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find her
 PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nYou will find here the shipping __SHIPPINGREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nYou will find here the intervention __FICHINTERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n__PERSONALIZED__\n\n__SIGNATURE__
-DemoDesc=Dolibarr is a compact ERP/CRM supporting several functional modules. A demo showcasing all modules makes no sense as this scenario never occurs. So, several demo profiles are available.
+DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
+ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
 DemoFundation=Manage members of a foundation
 DemoFundation2=Manage members and bank account of a foundation
-DemoCompanyServiceOnly=Manage a freelance activity selling service only
+DemoCompanyServiceOnly=Company or freelance selling service only
 DemoCompanyShopWithCashDesk=Manage a shop with a cash desk
-DemoCompanyProductAndStocks=Manage a small or medium company selling products
-DemoCompanyAll=Manage a small or medium company with multiple activities (all main modules)
+DemoCompanyProductAndStocks=Company selling products with a shop
+DemoCompanyAll=Company with multiple activities (all main modules)
 CreatedBy=Created by %s
 ModifiedBy=Modified by %s
 ValidatedBy=Validated by %s
diff --git a/htdocs/langs/ka_GE/products.lang b/htdocs/langs/ka_GE/products.lang
index 20440eb611b..3a412a5789c 100644
--- a/htdocs/langs/ka_GE/products.lang
+++ b/htdocs/langs/ka_GE/products.lang
@@ -5,6 +5,8 @@ ProductLabelTranslated=Translated product label
 ProductDescriptionTranslated=Translated product description
 ProductNoteTranslated=Translated product note
 ProductServiceCard=Products/Services card
+TMenuProducts=Products
+TMenuServices=Services
 Products=Products
 Services=Services
 Product=Product
@@ -58,7 +60,7 @@ SellingPrice=Selling price
 SellingPriceHT=Selling price (net of tax)
 SellingPriceTTC=Selling price (inc. tax)
 CostPriceDescription=This price (net of tax) can be used to store the average amount this product cost to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
-CostPriceUsage=In a future version, this value could be used for margin calculation.
+CostPriceUsage=This value could be used for margin calculation.
 SoldAmount=Sold amount
 PurchasedAmount=Purchased amount
 NewPrice=New price
@@ -140,6 +142,7 @@ ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b>?
 CloneContentProduct=Clone all main informations of product/service
 ClonePricesProduct=Clone main informations and prices
 CloneCompositionProduct=Clone packaged product/service
+CloneCombinationsProduct=Clone product variants
 ProductIsUsed=This product is used
 NewRefForClone=Ref. of new product/service
 SellingPrices=Selling prices
@@ -236,7 +239,7 @@ GlobalVariables=Global variables
 VariableToUpdate=Variable to update
 GlobalVariableUpdaters=Global variable updaters
 UpdateInterval=Update interval (minutes)
-LastUpdated=Last updated
+LastUpdated=Latest update
 CorrectlyUpdated=Correctly updated
 PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
 PropalMergePdfProductChooseFile=Select PDF files
@@ -256,4 +259,41 @@ VolumeUnits=Volume unit
 SizeUnits=Size unit
 DeleteProductBuyPrice=Delete buying price
 ConfirmDeleteProductBuyPrice=Are you sure you want to delete this buying price?
+SubProduct=Sub product
 
+#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
+ProductCombinations=Variants
+HideProductCombinations=Hide products variant in the products selector
+ProductCombination=Variant
+NewProductCombination=New variant
+EditProductCombination=Editing variant
+ProductCombinationGenerator=Variants generator
+Features=Features
+PriceImpact=Price impact
+WeightImpact=Weight impact
+NewProductAttribute=New attribute
+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
+PercentageVariation=Percentage variation
+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 child products
+ConfirmCloneProductCombinations=Would you like to copy all the product variant to the 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
diff --git a/htdocs/langs/ka_GE/projects.lang b/htdocs/langs/ka_GE/projects.lang
index ecf61d17d36..f9c603ce113 100644
--- a/htdocs/langs/ka_GE/projects.lang
+++ b/htdocs/langs/ka_GE/projects.lang
@@ -29,9 +29,9 @@ DeleteAProject=Delete a project
 DeleteATask=Delete a task
 ConfirmDeleteAProject=Are you sure you want to delete this project?
 ConfirmDeleteATask=Are you sure you want to delete this task?
-OpenedProjects=Open projects
-OpenedTasks=Open tasks
-OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
+OpenedProjects=Opened projects
+OpenedTasks=Opened tasks
+OpportunitiesStatusForOpenedProjects=Opportunities amount of opened projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=Show project
 SetProject=Set project
@@ -47,7 +47,7 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
 TaskTimeDate=Date
-TasksOnOpenedProject=Tasks on open projects
+TasksOnOpenedProject=Tasks on opened projects
 WorkloadNotDefined=Workload not defined
 NewTimeSpent=New time spent
 MyTimeSpent=My time spent
@@ -58,6 +58,7 @@ TaskDateEnd=Task end date
 TaskDescription=Task description
 NewTask=New task
 AddTask=Create task
+AddTimeSpent=Create time spent
 Activity=Activity
 Activities=Tasks/activities
 MyActivities=My tasks/activities
@@ -95,6 +96,7 @@ ValidateProject=Validate projet
 ConfirmValidateProject=Are you sure you want to validate this project?
 CloseAProject=Close project
 ConfirmCloseAProject=Are you sure you want to close this project?
+AlsoCloseAProject=Also close project (keep it open if you still need to follow production tasks on it)
 ReOpenAProject=Open project
 ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=Project contacts
@@ -120,7 +122,7 @@ CloneProjectFiles=Clone project joined files
 CloneTaskFiles=Clone task(s) joined files (if task(s) cloned)
 CloneMoveDate=Update project/tasks dates from now?
 ConfirmCloneProject=Are you sure to clone this project?
-ProjectReportDate=Change task date according project start date
+ProjectReportDate=Change task dates according to new project start date
 ErrorShiftTaskDate=Impossible to shift task date according to new project start date
 ProjectsAndTasksLines=Projects and tasks
 ProjectCreatedInDolibarr=Project %s created
@@ -177,9 +179,9 @@ ProjectsStatistics=Statistics on projects/leads
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 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.
-OpenedProjectsByThirdparties=Open projects by thirdparties
+OpenedProjectsByThirdparties=Opened projects by thirdparties
 OnlyOpportunitiesShort=Only opportunities
-OpenedOpportunitiesShort=Open opportunities
+OpenedOpportunitiesShort=Opened opportunities
 NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount
diff --git a/htdocs/langs/ka_GE/propal.lang b/htdocs/langs/ka_GE/propal.lang
index 52260fe2b4e..a14d25ce779 100644
--- a/htdocs/langs/ka_GE/propal.lang
+++ b/htdocs/langs/ka_GE/propal.lang
@@ -3,7 +3,7 @@ Proposals=Commercial proposals
 Proposal=Commercial proposal
 ProposalShort=Proposal
 ProposalsDraft=Draft commercial proposals
-ProposalsOpened=Open commercial proposals
+ProposalsOpened=Opened commercial proposals
 Prop=Commercial proposals
 CommercialProposal=Commercial proposal
 ProposalCard=Proposal card
@@ -26,9 +26,9 @@ AmountOfProposalsByMonthHT=Amount by month (net of tax)
 NbOfProposals=Number of commercial proposals
 ShowPropal=Show proposal
 PropalsDraft=Drafts
-PropalsOpened=Open
+PropalsOpened=Opened
 PropalStatusDraft=Draft (needs to be validated)
-PropalStatusValidated=Validated (proposal is open)
+PropalStatusValidated=Validated (proposal is opened)
 PropalStatusSigned=Signed (needs billing)
 PropalStatusNotSigned=Not signed (closed)
 PropalStatusBilled=Billed
diff --git a/htdocs/langs/ka_GE/stocks.lang b/htdocs/langs/ka_GE/stocks.lang
index 834fa104098..1db49b8d8dd 100644
--- a/htdocs/langs/ka_GE/stocks.lang
+++ b/htdocs/langs/ka_GE/stocks.lang
@@ -22,13 +22,15 @@ Movements=Movements
 ErrorWarehouseRefRequired=Warehouse reference name is required
 ListOfWarehouses=List of warehouses
 ListOfStockMovements=List of stock movements
+StockMovementForId=Movement ID %d
+ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Warehouses area
 Location=Location
 LocationSummary=Short name location
 NumberOfDifferentProducts=Number of different products
 NumberOfProducts=Total number of products
-LastMovement=Last movement
-LastMovements=Last movements
+LastMovement=Latest movement
+LastMovements=Latest movements
 Units=Units
 Unit=Unit
 StockCorrection=Correct stock
@@ -140,3 +142,4 @@ ProductStockWarehouseCreated=Stock limit for alert and desired optimal stock cor
 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
diff --git a/htdocs/langs/ka_GE/supplier_proposal.lang b/htdocs/langs/ka_GE/supplier_proposal.lang
index 621d7784e35..61b031459b0 100644
--- a/htdocs/langs/ka_GE/supplier_proposal.lang
+++ b/htdocs/langs/ka_GE/supplier_proposal.lang
@@ -8,7 +8,7 @@ SearchRequest=Find a request
 DraftRequests=Draft requests
 SupplierProposalsDraft=Draft supplier proposals
 LastModifiedRequests=Latest %s modified price requests
-RequestsOpened=Open price requests
+RequestsOpened=Opened price requests
 SupplierProposalArea=Supplier proposals area
 SupplierProposalShort=Supplier proposal
 SupplierProposals=Supplier proposals
@@ -23,7 +23,7 @@ ConfirmValidateAsk=Are you sure you want to validate this price request under na
 DeleteAsk=Delete request
 ValidateAsk=Validate request
 SupplierProposalStatusDraft=Draft (needs to be validated)
-SupplierProposalStatusValidated=Validated (request is open)
+SupplierProposalStatusValidated=Validated (request is opened)
 SupplierProposalStatusClosed=Closed
 SupplierProposalStatusSigned=Accepted
 SupplierProposalStatusNotSigned=Refused
diff --git a/htdocs/langs/ka_GE/suppliers.lang b/htdocs/langs/ka_GE/suppliers.lang
index 766e4a9bfe9..b890919ace5 100644
--- a/htdocs/langs/ka_GE/suppliers.lang
+++ b/htdocs/langs/ka_GE/suppliers.lang
@@ -24,10 +24,10 @@ ExportDataset_fournisseur_1=Supplier invoices list and invoice lines
 ExportDataset_fournisseur_2=Supplier invoices and payments
 ExportDataset_fournisseur_3=Supplier orders and order lines
 ApproveThisOrder=Approve this order
-ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b> ?
+ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b>?
 DenyingThisOrder=Deny this order
-ConfirmDenyingThisOrder=Are you sure you want to deny this order <b>%s</b> ?
-ConfirmCancelThisOrder=Are you sure you want to cancel this order <b>%s</b> ?
+ConfirmDenyingThisOrder=Are you sure you want to deny this order <b>%s</b>?
+ConfirmCancelThisOrder=Are you sure you want to cancel this order <b>%s</b>?
 AddSupplierOrder=Create supplier order
 AddSupplierInvoice=Create supplier invoice
 ListOfSupplierProductForSupplier=List of products and prices for supplier <b>%s</b>
@@ -41,3 +41,4 @@ DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Wrong quality
 ReputationForThisProduct=Reputation
 BuyerName=Buyer name
+AllProductServicePrices=All product / service prices
diff --git a/htdocs/langs/ka_GE/users.lang b/htdocs/langs/ka_GE/users.lang
index b836db8eb42..a0a1eae8697 100644
--- a/htdocs/langs/ka_GE/users.lang
+++ b/htdocs/langs/ka_GE/users.lang
@@ -36,7 +36,7 @@ AdministratorDesc=Administrator
 DefaultRights=Default permissions
 DefaultRightsDesc=Define here <u>default</u> permissions that are automatically granted to a <u>new created</u> user (Go on user card to change permission of an existing user).
 DolibarrUsers=Dolibarr users
-LastName=Last Name
+LastName=Last name
 FirstName=First name
 ListOfGroups=List of groups
 NewGroup=New group
diff --git a/htdocs/langs/ka_GE/withdrawals.lang b/htdocs/langs/ka_GE/withdrawals.lang
index 6e560a1abb1..a99d890e5f9 100644
--- a/htdocs/langs/ka_GE/withdrawals.lang
+++ b/htdocs/langs/ka_GE/withdrawals.lang
@@ -24,6 +24,7 @@ WithdrawStatistics=Direct debit payment statistics
 WithdrawRejectStatistics=Direct debit payment reject statistics
 LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
+WithdrawRequestsDone=%s direct debit payment requests recorded
 ThirdPartyBankCode=Third party bank code
 NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoice are on companies with a valid BAN.
 ClassCredited=Classify credited
@@ -76,8 +77,8 @@ RUM=UMR
 RUMLong=Unique Mandate Reference
 RUMWillBeGenerated=UMR number will be generated once bank account information are saved
 WithdrawMode=Direct debit mode (FRST or RECUR)
-WithdrawRequestAmount=Withdraw request amount:
-WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil amount.
+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
diff --git a/htdocs/langs/km_KH/accountancy.lang b/htdocs/langs/km_KH/accountancy.lang
index 5de95948fbf..4c2336b97b0 100644
--- a/htdocs/langs/km_KH/accountancy.lang
+++ b/htdocs/langs/km_KH/accountancy.lang
@@ -194,6 +194,8 @@ ChangeBinding=Change the binding
 
 ## Admin
 ApplyMassCategories=Apply mass categories
+AddAccountFromBookKeepingWithNoCategories=Add acccount already used with no categories
+CategoryDeleted=Category for the accounting account has been removed
 
 ## Export
 Exports=Exports
@@ -209,6 +211,7 @@ Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution
 Modelcsv_quadratus=Export towards Quadratus QuadraCompta
 Modelcsv_ebp=Export towards EBP
 Modelcsv_cogilog=Export towards Cogilog
+ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
 InitAccountancy=Init accountancy
diff --git a/htdocs/langs/km_KH/admin.lang b/htdocs/langs/km_KH/admin.lang
index 23c8998e615..7282d9a21db 100644
--- a/htdocs/langs/km_KH/admin.lang
+++ b/htdocs/langs/km_KH/admin.lang
@@ -9,14 +9,20 @@ VersionDevelopment=Development
 VersionUnknown=Unknown
 VersionRecommanded=Recommended
 FileCheck=Files integrity checker
-FileCheckDesc=This tool allows you to check the integrity of files of your application, comparing each files with the official ones. You can use this tool to detect if some files were modified by a hacker for example.
+FileCheckDesc=This tool allows you to check the integrity of files and setup of your application, comparing each files with the official ones. 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.
+FileIntegrityIsStrictlyConformedWithReference=Files integrity is strictly conformed with the reference.
+FileIntegrityIsOkButFilesWereAdded=Files integrity check has passed, however some new files were added.
+FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified, removed or added.
+GlobalChecksum=Global checksum
 MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
 LocalSignature=Embedded local signature (less reliable)
 RemoteSignature=Remote distant signature (more reliable)
 FilesMissing=Missing Files
 FilesUpdated=Updated Files
+FilesModified=Modified Files
+FilesAdded=Added Files
 FileCheckDolibarr=Check integrity of application files
-AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from a certified package
+AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from an official package
 XmlNotFound=Xml Integrity File of application not found
 SessionId=Session ID
 SessionSaveHandler=Handler to save sessions
@@ -185,7 +191,9 @@ BoxesDesc=Widgets are components showing some information that you can add to pe
 OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
 ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
-ModulesMarketPlaces=More modules...
+ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
+ModulesMarketPlaces=Find external modules...
+GoModuleSetupArea=To deploy/install a new module, go onto the Module setup area at <a href="%s">%s</a>.
 DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules
 DoliPartnersDesc=List of companies providing custom developed modules or features (Note: anyone experienced in PHP programming can provide custom development for an open source project)
 WebSiteDesc=Reference websites to find more modules...
@@ -276,21 +284,22 @@ ModuleFamilyInterface=Interfaces with external systems
 MenuHandlers=Menu handlers
 MenuAdmin=Menu editor
 DoNotUseInProduction=Do not use in production
-ThisIsProcessToFollow=This is setup to process:
-ThisIsAlternativeProcessToFollow=This is an alternative setup to process:
+ThisIsProcessToFollow=This is steps to process:
+ThisIsAlternativeProcessToFollow=This is an alternative setup to process manually:
 StepNb=Step %s
 FindPackageFromWebSite=Find a package that provides feature you want (for example on official web site %s).
 DownloadPackageFromWebSite=Download package (for example from official web site %s).
-UnpackPackageInDolibarrRoot=Unpack package file into Dolibarr server directory dedicated to external modules: <b>%s</b>
-SetupIsReadyForUse=Install is finished and Dolibarr is ready to use with this new component.
-NotExistsDirect=The alternative root directory is not defined.<br>
-InfDirAlt=Since version 3 it is possible to define an alternative root directory.This allows you to store, same place, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
-InfDirExample=<br>Then declare it in the file conf.php<br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>*These lines are commented with "#", to uncomment only remove the character.
+UnpackPackageInDolibarrRoot=Unpack the packaged files into server directory dedicated to Dolibarr: <b>%s</b>
+UnpackPackageInModulesRoot=To deploy/install an external module, unpack the packaged files into the server directory dedicated to modules: <b>%s</b>
+SetupIsReadyForUse=Module deployment is finished. You must however enable and setup the module in your application by going on the page to setup modules: <a href="%s">%s</a>.
+NotExistsDirect=The alternative root directory is not defined to an existing directory.<br>
+InfDirAlt=Since version 3, it is possible to define an alternative root directory. This allows you to store, into a dedicated directory, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
+InfDirExample=<br>Then declare it in the file <strong>conf.php</strong><br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>If these lines are commented with "#", to enable them, just uncomment by removing the "#" character.
 YouCanSubmitFile=For this step, you can send package using this tool: Select module file
 CurrentVersion=Dolibarr current version
 CallUpdatePage=Go to the page that updates the database structure and data: %s.
 LastStableVersion=Latest stable version
-LastActivationDate=Last activation date
+LastActivationDate=Latest activation date
 UpdateServerOffline=Update server offline
 GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s. <br><b>{000000@x}</b> same as previous but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
 GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
@@ -373,11 +382,11 @@ ExtrafieldCheckBox=Checkbox
 ExtrafieldRadio=Radio button
 ExtrafieldCheckBoxFromList= Checkbox from table
 ExtrafieldLink=Link to an object
-ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>In order to have the list depending on another :<br>1,value1|parent_list_code:parent_key<br>2,value2|parent_list_code:parent_key
+ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list :<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list :<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
-ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
+ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Example : Societe:societe/class/societe.class.php
 LibraryToBuildPDF=Library used for PDF generation
 WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
@@ -411,10 +420,11 @@ ModuleCompanyCodePanicum=Return an empty accountancy code.
 ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party code.
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
-
+WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<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).
+ClickToShowDescription=Click to show description
 # Modules
 Module0Name=Users & groups
-Module0Desc=Users and groups management
+Module0Desc=Users / Employees and Groups management
 Module1Name=Third parties
 Module1Desc=Companies and contact management (customers, prospects...)
 Module2Name=Commercial
@@ -515,8 +525,8 @@ Module2200Name=Dynamic Prices
 Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
 Module2300Desc=Scheduled job management
-Module2400Name=Agenda/Events
-Module2400Desc=Follow events or rendez-vous. Record manual events into Agendas or let application logs automatic events for tracking purposes.
+Module2400Name=Events/Agenda
+Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous.
 Module2500Name=Electronic Content Management
 Module2500Desc=Save and share documents
 Module2600Name=API/Web services (SOAP server)
@@ -582,7 +592,7 @@ Permission34=Delete products
 Permission36=See/manage hidden products
 Permission38=Export products
 Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
-Permission42=Create/modify projects (shared project and projects i'm contact for)
+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)
 Permission45=Export projects
 Permission61=Read interventions
@@ -685,7 +695,7 @@ PermissionAdvanced253=Create/modify internal/external users and permissions
 Permission254=Create/modify external users only
 Permission255=Modify other users password
 Permission256=Delete or disable other users
-Permission262=Extend access to all third parties (not only those linked to user). Not effective for external users (always limited to themselves).
+Permission262=Extend access to all third parties (not only third parties that user is a sale representative).<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 assignement matters).
 Permission271=Read CA
 Permission272=Read invoices
 Permission273=Issue invoices
@@ -887,7 +897,7 @@ Offset=Offset
 AlwaysActive=Always active
 Upgrade=Upgrade
 MenuUpgrade=Upgrade / Extend
-AddExtensionThemeModuleOrOther=Add extension (theme, module, ...)
+AddExtensionThemeModuleOrOther=Deploy/install external module
 WebServer=Web server
 DocumentRootServer=Web server's root directory
 DataRootServer=Data files directory
@@ -994,7 +1004,7 @@ TriggerAlwaysActive=Triggers in this file are always active, whatever are the ac
 TriggerActiveAsModuleActive=Triggers in this file are active as module <b>%s</b> is enabled.
 GeneratedPasswordDesc=Define here which rule you want to use to generate new password if you ask to have auto generated password
 DictionaryDesc=Insert all reference data. You can add your values to the default.
-ConstDesc=This page allows you to edit all other parameters not available in previous pages. These are mostly reserved parameters for developers or advanced troubleshooting.
+ConstDesc=This page allows you to edit all other parameters not available in previous pages. These are mostly reserved parameters for developers or advanced troubleshooting. For a list of options <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">check here</a>.
 MiscellaneousDesc=All other security related parameters are defined here.
 LimitsSetup=Limits/Precision setup
 LimitsDesc=You can define limits, precisions and optimisations used by Dolibarr here
@@ -1161,10 +1171,6 @@ FreeLegalTextOnOrders=Free text on orders
 WatermarkOnDraftOrders=Watermark on draft orders (none if empty)
 ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable
 BANK_ASK_PAYMENT_BANK_DURING_ORDER=Ask for bank account destination of order
-##### Clicktodial #####
-ClickToDialSetup=Click To Dial module setup
-ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with your clicktodial login (defined on your user card)<br><b>__PASS__</b> that will be replaced with your clicktodial password (defined on your user card).
-##### Bookmark4u #####
 ##### Interventions #####
 InterventionsSetup=Interventions module setup
 FreeLegalTextOnInterventions=Free text on intervention documents
@@ -1391,7 +1397,7 @@ SendingsSetup=Sending module setup
 SendingsReceiptModel=Sending receipt model
 SendingsNumberingModules=Sendings numbering modules
 SendingsAbility=Support shipping sheets for customer deliveries
-NoNeedForDeliveryReceipts=In most cases, sendings receipts are used both as sheets for customer deliveries (list of products to send) and sheets that is recevied and signed by customer. So product deliveries receipts is a duplicated feature and is rarely activated.
+NoNeedForDeliveryReceipts=In most cases, shipping sheets are used both as sheets for customer deliveries (list of products to send) and sheets that is received and signed by customer. So product deliveries receipts is a duplicated feature and is rarely activated.
 FreeLegalTextOnShippings=Free text on shipments
 ##### Deliveries #####
 DeliveryOrderNumberingModules=Products deliveries receipt numbering module
@@ -1471,7 +1477,11 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Set automatically this default value for type of e
 AGENDA_DEFAULT_FILTER_TYPE=Set automatically this type of event into search filter of agenda view
 AGENDA_DEFAULT_FILTER_STATUS=Set automatically this status for events into search filter of agenda view
 AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
-##### ClickToDial #####
+AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
+AGENDA_NOTIFICATION_SOUND=Enable sound notification
+##### Clicktodial #####
+ClickToDialSetup=Click To Dial module setup
+ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with your clicktodial login (defined on your user card)<br><b>__PASS__</b> that will be replaced with your clicktodial password (defined on your user card).
 ClickToDialDesc=This module allows to make phone numbers clickable. A click on this icon will call make your phone to 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.
 ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
 ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on same computer than the browser, and called when you click on a link in your browser that start 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.
@@ -1499,10 +1509,11 @@ EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint availa
 ##### API ####
 ApiSetup=API module setup
 ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
-ApiProductionMode=Enable production mode (this will activate use of a caches for services management)
+ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
 ApiExporerIs=You can explore the APIs at url
 OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
 ApiKey=Key for API
+WarningAPIExplorerDisabled=The API explorer has been disabled. API explorer is not required to provide API services. It is a tool for developer to find/test REST APIs. If you need this tool, go into setup of module API REST to activate it.
 ##### Bank #####
 BankSetupModule=Bank module setup
 FreeLegalTextOnChequeReceipts=Free text on cheque receipts
@@ -1571,7 +1582,7 @@ BackupDumpWizard=Wizard to build database backup dump file
 SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
 SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is only manual steps a privileged user can do.
 InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
-ConfFileMuseContainCustom=Installing an external module from application save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to have option<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
+ConfFileMuseContainCustom=Installing an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
 HighlightLinesColor=Highlight color of the line when the mouse passes over (keep empty for no highlight)
 TextTitleColor=Color of page title
@@ -1601,6 +1612,7 @@ FixTZ=TimeZone fix
 FillFixTZOnlyIfRequired=Example: +2 (fill only if problem experienced)
 ExpectedChecksum=Expected Checksum
 CurrentChecksum=Current Checksum
+ForcedConstants=Required constant values
 MailToSendProposal=To send customer proposal
 MailToSendOrder=To send customer order
 MailToSendInvoice=To send customer invoice
@@ -1609,13 +1621,14 @@ MailToSendIntervention=To send intervention
 MailToSendSupplierRequestForQuotation=To send quotation request to supplier
 MailToSendSupplierOrder=To send supplier order
 MailToSendSupplierInvoice=To send supplier invoice
+MailToSendContract=To send a contract
 MailToThirdparty=To send email from third party page
 ByDefaultInList=Show by default on list view
-YouUseLastStableVersion=You use the last stable version
+YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
 TitleExampleForMaintenanceRelease=Example of message you can use to announce this maintenance release (feel free to use it on your web sites)
-ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. You can download it from the download area of http://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.
-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, nor data structure change is present into this version. You can download it from the download area of http://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.
+ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. 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.
+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, nor data structure change is present into 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, you can enter here rule to have price for each level autocalculated according to price of first level, so you will have to enter only price for first level on each product. This page is here to save you time and can be usefull only if your prices for each leve are relative to first level. You can ignore this page in most cases.
 ModelModulesProduct=Templates for product documents
 ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
diff --git a/htdocs/langs/km_KH/banks.lang b/htdocs/langs/km_KH/banks.lang
index 7ae841cf0f3..f0c41d5d5bf 100644
--- a/htdocs/langs/km_KH/banks.lang
+++ b/htdocs/langs/km_KH/banks.lang
@@ -74,13 +74,13 @@ Conciliate=Reconcile
 Conciliation=Reconciliation
 ReconciliationLate=Reconciliation late
 IncludeClosedAccount=Include closed accounts
-OnlyOpenedAccount=Only open accounts
+OnlyOpenedAccount=Only opened accounts
 AccountToCredit=Account to credit
 AccountToDebit=Account to debit
 DisableConciliation=Disable reconciliation feature for this account
 ConciliationDisabled=Reconciliation feature disabled
 LinkedToAConciliatedTransaction=Linked to a conciliated entry
-StatusAccountOpened=Open
+StatusAccountOpened=Opened
 StatusAccountClosed=Closed
 AccountIdShort=Number
 LineRecord=Transaction
diff --git a/htdocs/langs/km_KH/bills.lang b/htdocs/langs/km_KH/bills.lang
index bf3b48a37e9..5fb3b6169da 100644
--- a/htdocs/langs/km_KH/bills.lang
+++ b/htdocs/langs/km_KH/bills.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - bills
 Bill=Invoice
 Bills=Invoices
-BillsCustomers=Customers invoices
-BillsCustomer=Customers invoice
-BillsSuppliers=Suppliers invoices
-BillsCustomersUnpaid=Unpaid customers invoices
-BillsCustomersUnpaidForCompany=Unpaid customer's invoices for %s
-BillsSuppliersUnpaid=Unpaid supplier's invoices
-BillsSuppliersUnpaidForCompany=Unpaid supplier's invoices for %s
+BillsCustomers=Customer invoices
+BillsCustomer=Customer invoice
+BillsSuppliers=Supplier invoices
+BillsCustomersUnpaid=Unpaid customer invoices
+BillsCustomersUnpaidForCompany=Unpaid customer invoices for %s
+BillsSuppliersUnpaid=Unpaid supplier invoices
+BillsSuppliersUnpaidForCompany=Unpaid supplier invoices for %s
 BillsLate=Late payments
 BillsStatistics=Customers invoices statistics
 BillsStatisticsSuppliers=Suppliers invoices statistics
@@ -62,8 +62,8 @@ PaymentsBack=Payments back
 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 credit note or deposit 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.
+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.
 SupplierPayments=Suppliers payments
 ReceivedPayments=Received payments
 ReceivedCustomersPayments=Payments received from customers
@@ -78,6 +78,7 @@ PaymentMode=Payment type
 PaymentTypeDC=Debit/Credit Card
 PaymentTypePP=PayPal
 IdPaymentMode=Payment type (id)
+CodePaymentMode=Payment type (code)
 LabelPaymentMode=Payment type (label)
 PaymentModeShort=Payment type
 PaymentTerm=Payment term
@@ -102,9 +103,10 @@ SearchACustomerInvoice=Search for a customer invoice
 SearchASupplierInvoice=Search for a supplier invoice
 CancelBill=Cancel an invoice
 SendRemindByMail=Send reminder by EMail
-DoPayment=Do payment
-DoPaymentBack=Do payment back
+DoPayment=Enter payment
+DoPaymentBack=Enter refund
 ConvertToReduc=Convert into future discount
+ConvertExcessReceivedToReduc=Convert excess received into future discount
 EnterPaymentReceivedFromCustomer=Enter payment received from customer
 EnterPaymentDueToCustomer=Make payment due to customer
 DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
@@ -113,22 +115,24 @@ BillStatus=Invoice status
 StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Draft (needs to be validated)
 BillStatusPaid=Paid
-BillStatusPaidBackOrConverted=Paid or converted into discount
+BillStatusPaidBackOrConverted=Refund or converted into discount
 BillStatusConverted=Paid (ready for final invoice)
 BillStatusCanceled=Abandoned
 BillStatusValidated=Validated (needs to be paid)
 BillStatusStarted=Started
 BillStatusNotPaid=Not paid
+BillStatusNotRefunded=Not refunded
 BillStatusClosedUnpaid=Closed (unpaid)
 BillStatusClosedPaidPartially=Paid (partially)
 BillShortStatusDraft=Draft
 BillShortStatusPaid=Paid
-BillShortStatusPaidBackOrConverted=Processed
+BillShortStatusPaidBackOrConverted=Refund or converted
 BillShortStatusConverted=Processed
 BillShortStatusCanceled=Abandoned
 BillShortStatusValidated=Validated
 BillShortStatusStarted=Started
 BillShortStatusNotPaid=Not paid
+BillShortStatusNotRefunded=Not refunded
 BillShortStatusClosedUnpaid=Closed
 BillShortStatusClosedPaidPartially=Paid (partially)
 PaymentStatusToValidShort=To validate
@@ -149,14 +153,14 @@ NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified
 FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
 NotARecurringInvoiceTemplate=Not a recurring template invoice
 NewBill=New invoice
-LastBills=Last %s invoices
-LastCustomersBills=Last %s customers invoices
-LastSuppliersBills=Last %s suppliers invoices
+LastBills=Latest %s invoices
+LastCustomersBills=Latest %s customer invoices
+LastSuppliersBills=Latest %s supplier invoices
 AllBills=All invoices
 OtherBills=Other invoices
 DraftBills=Draft invoices
-CustomersDraftInvoices=Customers draft invoices
-SuppliersDraftInvoices=Suppliers draft invoices
+CustomersDraftInvoices=Customer draft invoices
+SuppliersDraftInvoices=Supplier draft invoices
 Unpaid=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>?
@@ -203,7 +207,7 @@ AlreadyPaidNoCreditNotesNoDeposits=Already paid (without credit notes and deposi
 Abandoned=Abandoned
 RemainderToPay=Remaining unpaid
 RemainderToTake=Remaining amount to take
-RemainderToPayBack=Remaining amount to pay back
+RemainderToPayBack=Remaining amount to refund
 Rest=Pending
 AmountExpected=Amount claimed
 ExcessReceived=Excess received
@@ -270,6 +274,7 @@ Deposit=Deposit
 Deposits=Deposits
 DiscountFromCreditNote=Discount from credit note %s
 DiscountFromDeposit=Payments from deposit invoice %s
+DiscountFromExcessReceived=Payments from excess received of invoice %s
 AbsoluteDiscountUse=This kind of credit can be used on invoice before its validation
 CreditNoteDepositUse=Invoice must be validated to use this kind of credits
 NewGlobalDiscount=New absolute discount
@@ -277,8 +282,8 @@ NewRelativeDiscount=New relative discount
 NoteReason=Note/Reason
 ReasonDiscount=Reason
 DiscountOfferedBy=Granted by
-DiscountStillRemaining=Discounts still remaining
-DiscountAlreadyCounted=Discounts already counted
+DiscountStillRemaining=Discounts available
+DiscountAlreadyCounted=Discounts already consumed
 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.
@@ -331,10 +336,12 @@ 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
 # PaymentConditions
 Statut=Status
-PaymentConditionShortRECEP=Immediate
-PaymentConditionRECEP=Immediate
+PaymentConditionShortRECEP=Due Upon Receipt
+PaymentConditionRECEP=Due Upon Receipt
 PaymentConditionShort30D=30 days
 PaymentCondition30D=30 days
 PaymentConditionShort30DENDMONTH=30 days of month-end
@@ -349,6 +356,14 @@ PaymentConditionShortPT_ORDER=Order
 PaymentConditionPT_ORDER=On order
 PaymentConditionShortPT_5050=50-50
 PaymentConditionPT_5050=50%% in advance, 50%% on delivery
+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
 FixAmount=Fix amount
 VarAmount=Variable amount (%% tot.)
 # PaymentType
@@ -418,7 +433,7 @@ ChequeDeposits=Checks deposits
 Cheques=Checks
 DepositId=Id deposit
 NbCheque=Number of checks
-CreditNoteConvertedIntoDiscount=This credit note or deposit invoice has been converted into %s
+CreditNoteConvertedIntoDiscount=This %s has been converted into %s
 UsBillingContactAsIncoiveRecipientIfExist=Use customer billing contact address instead of third party address as recipient for invoices
 ShowUnpaidAll=Show all unpaid invoices
 ShowUnpaidLateOnly=Show late unpaid invoices only
diff --git a/htdocs/langs/km_KH/boxes.lang b/htdocs/langs/km_KH/boxes.lang
index 98970318e85..38b03b4268d 100644
--- a/htdocs/langs/km_KH/boxes.lang
+++ b/htdocs/langs/km_KH/boxes.lang
@@ -25,8 +25,8 @@ BoxTitleLastSuppliers=Latest %s recorded suppliers
 BoxTitleLastModifiedSuppliers=Latest %s modified suppliers
 BoxTitleLastModifiedCustomers=Latest %s modified customers
 BoxTitleLastCustomersOrProspects=Latest %s customers or prospects
-BoxTitleLastCustomerBills=Latest %s customer's invoices
-BoxTitleLastSupplierBills=Latest %s supplier's invoices
+BoxTitleLastCustomerBills=Latest %s customer invoices
+BoxTitleLastSupplierBills=Latest %s supplier invoices
 BoxTitleLastModifiedProspects=Latest %s modified prospects
 BoxTitleLastModifiedMembers=Latest %s members
 BoxTitleLastFicheInter=Latest %s modified interventions
@@ -51,12 +51,12 @@ ClickToAdd=Click here to add.
 NoRecordedCustomers=No recorded customers
 NoRecordedContacts=No recorded contacts
 NoActionsToDo=No actions to do
-NoRecordedOrders=No recorded customer's orders
+NoRecordedOrders=No recorded customer orders
 NoRecordedProposals=No recorded proposals
-NoRecordedInvoices=No recorded customer's invoices
-NoUnpaidCustomerBills=No unpaid customer's invoices
-NoUnpaidSupplierBills=No unpaid supplier's invoices
-NoModifiedSupplierBills=No recorded supplier's invoices
+NoRecordedInvoices=No recorded customer invoices
+NoUnpaidCustomerBills=No unpaid customer invoices
+NoUnpaidSupplierBills=No unpaid supplier invoices
+NoModifiedSupplierBills=No recorded supplier invoices
 NoRecordedProducts=No recorded products/services
 NoRecordedProspects=No recorded prospects
 NoContractedProducts=No products/services contracted
diff --git a/htdocs/langs/km_KH/companies.lang b/htdocs/langs/km_KH/companies.lang
index 4a631b092cf..1b7efa3c14e 100644
--- a/htdocs/langs/km_KH/companies.lang
+++ b/htdocs/langs/km_KH/companies.lang
@@ -78,6 +78,10 @@ VATIsNotUsed=VAT is not used
 CopyAddressFromSoc=Fill address with third party address
 ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
 PaymentBankAccount=Payment bank account
+OverAllProposals=Total proposals
+OverAllOrders=Total orders
+OverAllInvoices=Total invoices
+OverAllSupplierProposals=Total price requests
 ##### Local Taxes #####
 LocalTax1IsUsed=Use second tax
 LocalTax1IsUsedES= RE is used
@@ -239,6 +243,10 @@ ProfId3RU=Prof Id 3 (KPP)
 ProfId4RU=Prof Id 4 (OKPO)
 ProfId5RU=-
 ProfId6RU=-
+ProfId1DZ=RC
+ProfId2DZ=Art.
+ProfId3DZ=NIF
+ProfId4DZ=NIS
 VATIntra=VAT number
 VATIntraShort=VAT number
 VATIntraSyntaxIsValid=Syntax is valid
@@ -382,8 +390,9 @@ ListCustomersShort=List of customers
 ThirdPartiesArea=Third parties and contact area
 LastModifiedThirdParties=Latest %s modified third parties
 UniqueThirdParties=Total of unique third parties
-InActivity=Open
+InActivity=Opened
 ActivityCeased=Closed
+ThirdPartyIsClosed=Third party is closed
 ProductsIntoElements=List of products/services into %s
 CurrentOutstandingBill=Current outstanding bill
 OutstandingBill=Max. for outstanding bill
@@ -396,7 +405,7 @@ MergeThirdparties=Merge third parties
 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 so you will be able to delete the duplicate one.
 ThirdpartiesMergeSuccess=Thirdparties have been merged
 SaleRepresentativeLogin=Login of sales representative
-SaleRepresentativeFirstname=Firstname of sales representative
-SaleRepresentativeLastname=Lastname of sales representative
+SaleRepresentativeFirstname=First name of sales representative
+SaleRepresentativeLastname=Last name of sales representative
 ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
 NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/km_KH/compta.lang b/htdocs/langs/km_KH/compta.lang
index 17f2bb4e98f..5e9814369ec 100644
--- a/htdocs/langs/km_KH/compta.lang
+++ b/htdocs/langs/km_KH/compta.lang
@@ -65,6 +65,7 @@ PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=VAT payment
 ListPayment=List of payments
 ListOfCustomerPayments=List of customer payments
+ListOfSupplierPayments=List of supplier payments
 DateStartPeriod=Date start period
 DateEndPeriod=Date end period
 newLT1Payment=New tax 2 payment
@@ -81,7 +82,7 @@ LT2PaymentES=IRPF Payment
 LT2PaymentsES=IRPF Payments
 VATPayment=Sales tax payment
 VATPayments=Sales tax payments
-VATRefund=Sales tax refund Refund
+VATRefund=Sales tax refund
 Refund=Refund
 SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Show VAT payment
@@ -194,7 +195,7 @@ CloneTax=Clone a social/fiscal tax
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
 CloneTaxForNextMonth=Clone it for next month
 SimpleReport=Simple report
-AddExtraReport=Extra reports
+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
diff --git a/htdocs/langs/km_KH/cron.lang b/htdocs/langs/km_KH/cron.lang
index 53c38910f0f..b1e8bcb36d2 100644
--- a/htdocs/langs/km_KH/cron.lang
+++ b/htdocs/langs/km_KH/cron.lang
@@ -17,8 +17,8 @@ CronMethodDoesNotExists=Class %s does not contains any method %s
 # Menu
 EnabledAndDisabled=Enabled and disabled
 # Page list
-CronLastOutput=Last run output
-CronLastResult=Last result code
+CronLastOutput=Latest run output
+CronLastResult=Latest result code
 CronCommand=Command
 CronList=Scheduled jobs
 CronDelete=Delete scheduled jobs
diff --git a/htdocs/langs/km_KH/errors.lang b/htdocs/langs/km_KH/errors.lang
index f935ce72d41..9e2eb6817ef 100644
--- a/htdocs/langs/km_KH/errors.lang
+++ b/htdocs/langs/km_KH/errors.lang
@@ -11,6 +11,7 @@ ErrorLoginAlreadyExists=Login %s already exists.
 ErrorGroupAlreadyExists=Group %s already exists.
 ErrorRecordNotFound=Record not found.
 ErrorFailToCopyFile=Failed to copy file '<b>%s</b>' into '<b>%s</b>'.
+ErrorFailToCopyDir=Failed to copy directory '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToRenameFile=Failed to rename file '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToDeleteFile=Failed to remove file '<b>%s</b>'.
 ErrorFailToCreateFile=Failed to create file '<b>%s</b>'.
@@ -115,7 +116,7 @@ ErrorNoActivatedBarcode=No barcode type activated
 ErrUnzipFails=Failed to unzip %s with ZipArchive
 ErrNoZipEngine=No engine to unzip %s file in this PHP
 ErrorFileMustBeADolibarrPackage=The file %s must be a Dolibarr zip package
-ErrorFileRequired=It takes a package Dolibarr file
+ErrorModuleFileRequired=You must select a Dolibarr module package file
 ErrorPhpCurlNotInstalled=The PHP CURL is not installed, this is essential to talk with 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
@@ -170,14 +171,19 @@ ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
 ErrorFileMustHaveFormat=File must have format %s
 ErrorSupplierCountryIsNotDefined=Country for this supplier is not defined. Correct this first.
 ErrorsThirdpartyMerge=Failed to merge the two records. Request canceled.
-ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enougth for product %s to add it into a new order.
-ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enougth for product %s to add it into a new invoice.
-ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enougth for product %s to add it into a new shipment.
-ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enougth for product %s to add it into a new proposal.
-ErrorFailedToLoadLoginFileForMode=Failed to get the login file for mode '%s'.
+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 bank 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>
 
 # 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.
diff --git a/htdocs/langs/km_KH/holiday.lang b/htdocs/langs/km_KH/holiday.lang
index a95da81eaaa..50d97c0d8cc 100644
--- a/htdocs/langs/km_KH/holiday.lang
+++ b/htdocs/langs/km_KH/holiday.lang
@@ -76,8 +76,9 @@ BoxTitleLastLeaveRequests=Latest %s modified leave requests
 HolidaysMonthlyUpdate=Monthly update
 ManualUpdate=Manual update
 HolidaysCancelation=Leave request cancelation
-EmployeeLastname=Employee lastname
-EmployeeFirstname=Employee firstname
+EmployeeLastname=Employee last name
+EmployeeFirstname=Employee first name
+TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
 
 ## Configuration du Module ##
 LastUpdateCP=Latest automatic update of leaves allocation
diff --git a/htdocs/langs/km_KH/ldap.lang b/htdocs/langs/km_KH/ldap.lang
index a17019d00fb..42e699de311 100644
--- a/htdocs/langs/km_KH/ldap.lang
+++ b/htdocs/langs/km_KH/ldap.lang
@@ -13,8 +13,8 @@ LDAPUsers=Users in LDAP database
 LDAPFieldStatus=Status
 LDAPFieldFirstSubscriptionDate=First subscription date
 LDAPFieldFirstSubscriptionAmount=First subscription amount
-LDAPFieldLastSubscriptionDate=Last subscription date
-LDAPFieldLastSubscriptionAmount=Last subscription amount
+LDAPFieldLastSubscriptionDate=Latest subscription date
+LDAPFieldLastSubscriptionAmount=Latest subscription amount
 LDAPFieldSkype=Skype id
 LDAPFieldSkypeExample=Example : skypeName
 UserSynchronized=User synchronized
diff --git a/htdocs/langs/km_KH/mails.lang b/htdocs/langs/km_KH/mails.lang
index ab18dcdca25..c830b551a67 100644
--- a/htdocs/langs/km_KH/mails.lang
+++ b/htdocs/langs/km_KH/mails.lang
@@ -35,7 +35,7 @@ MailingStatusSentPartialy=Sent partialy
 MailingStatusSentCompletely=Sent completely
 MailingStatusError=Error
 MailingStatusNotSent=Not sent
-MailSuccessfulySent=Email successfully sent (from %s to %s)
+MailSuccessfulySent=Email successfully accepted for delivery (from %s to %s)
 MailingSuccessfullyValidated=EMailing successfully validated
 MailUnsubcribe=Unsubscribe
 MailingStatusNotContact=Don't contact anymore
@@ -74,22 +74,28 @@ ResultOfMailSending=Result of mass EMail sending
 NbSelected=Nb selected
 NbIgnored=Nb ignored
 NbSent=Nb 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
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Line %s in file
 RecipientSelectionModules=Defined requests for recipient's selection
 MailSelectedRecipients=Selected recipients
 MailingArea=EMailings area
-LastMailings=Last %s emailings
+LastMailings=Latest %s emailings
 TargetsStatistics=Targets statistics
 NbOfCompaniesContacts=Unique contacts/addresses
 MailNoChangePossible=Recipients for validated emailing can't be changed
 SearchAMailing=Search mailing
 SendMailing=Send emailing
 SendMail=Send email
-MailingNeedCommand=For security reason, sending an emailing is better when performed from command line. If you have one, ask your server administrator to launch the following command to send the emailing to all recipients:
+SentBy=Sent by
+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=You can however send them online by adding parameter MAILING_LIMIT_SENDBYWEB with value of max number of emails you want to send by session. For this, go on Home - Setup - Other.
-ConfirmSendingEmailing=If you can't or prefer sending them with your www browser, please confirm you are sure you want to send emailing now from your browser?
+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.
 TargetsReset=Clear list
 ToClearAllRecipientsClickHere=Click here to clear the recipient list for this emailing
@@ -144,3 +150,6 @@ AdvTgtCreateFilter=Create filter
 AdvTgtOrCreateNewFilter=Name of new filter
 NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
+OutGoingEmailSetup=Outgoing email setup
+InGoingEmailSetup=Incoming email setup
+
diff --git a/htdocs/langs/km_KH/main.lang b/htdocs/langs/km_KH/main.lang
index 96a09e81e08..e5a462f384a 100644
--- a/htdocs/langs/km_KH/main.lang
+++ b/htdocs/langs/km_KH/main.lang
@@ -63,11 +63,13 @@ ErrorNoVATRateDefinedForSellerCountry=Error, no vat rates defined for country '%
 ErrorNoSocialContributionForSellerCountry=Error, no social/fiscal taxes type defined for country '%s'.
 ErrorFailedToSaveFile=Error, failed to save file.
 ErrorCannotAddThisParentWarehouse=You are trying to add a parent warehouse which is already a child of current one
+MaxNbOfRecordPerPage=Max nb of record per page
 NotAuthorized=You are not authorized to do that.
 SetDate=Set date
 SelectDate=Select a date
 SeeAlso=See also %s
 SeeHere=See here
+Apply=Apply
 BackgroundColorByDefault=Default background color
 FileRenamed=The file was successfully renamed
 FileUploaded=The file was successfully uploaded
@@ -86,7 +88,7 @@ Undefined=Undefined
 PasswordForgotten=Password forgotten?
 SeeAbove=See above
 HomeArea=Home area
-LastConnexion=Last connection
+LastConnexion=Latest connection
 PreviousConnexion=Previous connection
 PreviousValue=Previous value
 ConnectedOnMultiCompany=Connected on environment
@@ -236,7 +238,7 @@ DateCreation=Creation date
 DateCreationShort=Creat. date
 DateModification=Modification date
 DateModificationShort=Modif. date
-DateLastModification=Last modification date
+DateLastModification=Latest modification date
 DateValidation=Validation date
 DateClosing=Closing date
 DateDue=Due date
@@ -432,7 +434,7 @@ Reportings=Reporting
 Draft=Draft
 Drafts=Drafts
 Validated=Validated
-Opened=Open
+Opened=Opened
 New=New
 Discount=Discount
 Unknown=Unknown
@@ -460,6 +462,7 @@ DeletePicture=Picture delete
 ConfirmDeletePicture=Confirm picture deletion?
 Login=Login
 CurrentLogin=Current login
+EnterLoginDetail=Enter login details
 January=January
 February=February
 March=March
@@ -597,6 +600,8 @@ SessionName=Session name
 Method=Method
 Receive=Receive
 CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
+ExpectedValue=Expected Value
+CurrentValue=Current value
 PartialWoman=Partial
 TotalWoman=Total
 NeverReceived=Never received
@@ -753,6 +758,8 @@ RemoveString=Remove string '%s'
 SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
 DirectDownloadLink=Direct download link
 Download=Download
+ActualizeCurrency=Update currency rate
+Fiscalyear=Fiscal year
 # Week day
 Monday=Monday
 Tuesday=Tuesday
@@ -787,8 +794,8 @@ SetRef=Set ref
 Select2ResultFoundUseArrows=Some results found. Use arrows to select.
 Select2NotFound=No result found
 Select2Enter=Enter
-Select2MoreCharacter=or more character
-Select2MoreCharacters=or more characters
+Select2MoreCharacter=or more characters<br /><br /><strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
+Select2MoreCharacters=or more characters<br /><br /><strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
 Select2LoadingMoreResults=Loading more results...
 Select2SearchInProgress=Search in progress...
 SearchIntoThirdparties=Thirdparties
@@ -809,3 +816,5 @@ SearchIntoContracts=Contracts
 SearchIntoCustomerShipments=Customer shipments
 SearchIntoExpenseReports=Expense reports
 SearchIntoLeaves=Leaves
+
+BulkActions=Bulk actions
diff --git a/htdocs/langs/km_KH/members.lang b/htdocs/langs/km_KH/members.lang
index df911af6f71..8f6f76ba48f 100644
--- a/htdocs/langs/km_KH/members.lang
+++ b/htdocs/langs/km_KH/members.lang
@@ -45,7 +45,7 @@ MemberStatusDraft=Draft (needs to be validated)
 MemberStatusDraftShort=Draft
 MemberStatusActive=Validated (waiting subscription)
 MemberStatusActiveShort=Validated
-MemberStatusActiveLate=subscription expired
+MemberStatusActiveLate=Subscription expired
 MemberStatusActiveLateShort=Expired
 MemberStatusPaid=Subscription up to date
 MemberStatusPaidShort=Up to date
@@ -136,8 +136,8 @@ DocForAllMembersCards=Generate business cards for all members
 DocForOneMemberCards=Generate business cards for a particular member
 DocForLabels=Generate address sheets
 SubscriptionPayment=Subscription payment
-LastSubscriptionDate=Last subscription date
-LastSubscriptionAmount=Last subscription amount
+LastSubscriptionDate=Latest subscription date
+LastSubscriptionAmount=Latest subscription amount
 MembersStatisticsByCountries=Members statistics by country
 MembersStatisticsByState=Members statistics by state/province
 MembersStatisticsByTown=Members statistics by town
@@ -149,7 +149,7 @@ MembersByStateDesc=This screen show you statistics on members by state/provinces
 MembersByTownDesc=This screen show you statistics on members by town.
 MembersStatisticsDesc=Choose statistics you want to read...
 MenuMembersStats=Statistics
-LastMemberDate=Last member date
+LastMemberDate=Latest member date
 Nature=Nature
 Public=Information are public
 NewMemberbyWeb=New member added. Awaiting approval
diff --git a/htdocs/langs/km_KH/orders.lang b/htdocs/langs/km_KH/orders.lang
index 9d2e53e4fe2..331e3b49d3e 100644
--- a/htdocs/langs/km_KH/orders.lang
+++ b/htdocs/langs/km_KH/orders.lang
@@ -39,7 +39,7 @@ StatusOrderRefusedShort=Refused
 StatusOrderBilledShort=Billed
 StatusOrderToProcessShort=To process
 StatusOrderReceivedPartiallyShort=Partially received
-StatusOrderReceivedAllShort=Everything received
+StatusOrderReceivedAllShort=Products received
 StatusOrderCanceled=Canceled
 StatusOrderDraft=Draft (needs to be validated)
 StatusOrderValidated=Validated
@@ -51,7 +51,7 @@ StatusOrderApproved=Approved
 StatusOrderRefused=Refused
 StatusOrderBilled=Billed
 StatusOrderReceivedPartially=Partially received
-StatusOrderReceivedAll=Everything received
+StatusOrderReceivedAll=All products received
 ShippingExist=A shipment exists
 QtyOrdered=Qty ordered
 ProductQtyInDraft=Product quantity into draft orders
diff --git a/htdocs/langs/km_KH/other.lang b/htdocs/langs/km_KH/other.lang
index 1ea1f9da1db..ab937ff3bab 100644
--- a/htdocs/langs/km_KH/other.lang
+++ b/htdocs/langs/km_KH/other.lang
@@ -2,6 +2,7 @@
 SecurityCode=Security code
 NumberingShort=N°
 Tools=Tools
+TMenuTools=Tools
 ToolsDesc=All miscellaneous tools not included in other menu entries are collected here.<br /><br />All the tools can be reached in the left menu.
 Birthday=Birthday
 BirthdayDate=Birthday date
@@ -67,14 +68,15 @@ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find her
 PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nYou will find here the shipping __SHIPPINGREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nYou will find here the intervention __FICHINTERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n__PERSONALIZED__\n\n__SIGNATURE__
-DemoDesc=Dolibarr is a compact ERP/CRM supporting several functional modules. A demo showcasing all modules makes no sense as this scenario never occurs. So, several demo profiles are available.
+DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
+ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
 DemoFundation=Manage members of a foundation
 DemoFundation2=Manage members and bank account of a foundation
-DemoCompanyServiceOnly=Manage a freelance activity selling service only
+DemoCompanyServiceOnly=Company or freelance selling service only
 DemoCompanyShopWithCashDesk=Manage a shop with a cash desk
-DemoCompanyProductAndStocks=Manage a small or medium company selling products
-DemoCompanyAll=Manage a small or medium company with multiple activities (all main modules)
+DemoCompanyProductAndStocks=Company selling products with a shop
+DemoCompanyAll=Company with multiple activities (all main modules)
 CreatedBy=Created by %s
 ModifiedBy=Modified by %s
 ValidatedBy=Validated by %s
diff --git a/htdocs/langs/km_KH/products.lang b/htdocs/langs/km_KH/products.lang
index 20440eb611b..3a412a5789c 100644
--- a/htdocs/langs/km_KH/products.lang
+++ b/htdocs/langs/km_KH/products.lang
@@ -5,6 +5,8 @@ ProductLabelTranslated=Translated product label
 ProductDescriptionTranslated=Translated product description
 ProductNoteTranslated=Translated product note
 ProductServiceCard=Products/Services card
+TMenuProducts=Products
+TMenuServices=Services
 Products=Products
 Services=Services
 Product=Product
@@ -58,7 +60,7 @@ SellingPrice=Selling price
 SellingPriceHT=Selling price (net of tax)
 SellingPriceTTC=Selling price (inc. tax)
 CostPriceDescription=This price (net of tax) can be used to store the average amount this product cost to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
-CostPriceUsage=In a future version, this value could be used for margin calculation.
+CostPriceUsage=This value could be used for margin calculation.
 SoldAmount=Sold amount
 PurchasedAmount=Purchased amount
 NewPrice=New price
@@ -140,6 +142,7 @@ ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b>?
 CloneContentProduct=Clone all main informations of product/service
 ClonePricesProduct=Clone main informations and prices
 CloneCompositionProduct=Clone packaged product/service
+CloneCombinationsProduct=Clone product variants
 ProductIsUsed=This product is used
 NewRefForClone=Ref. of new product/service
 SellingPrices=Selling prices
@@ -236,7 +239,7 @@ GlobalVariables=Global variables
 VariableToUpdate=Variable to update
 GlobalVariableUpdaters=Global variable updaters
 UpdateInterval=Update interval (minutes)
-LastUpdated=Last updated
+LastUpdated=Latest update
 CorrectlyUpdated=Correctly updated
 PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
 PropalMergePdfProductChooseFile=Select PDF files
@@ -256,4 +259,41 @@ VolumeUnits=Volume unit
 SizeUnits=Size unit
 DeleteProductBuyPrice=Delete buying price
 ConfirmDeleteProductBuyPrice=Are you sure you want to delete this buying price?
+SubProduct=Sub product
 
+#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
+ProductCombinations=Variants
+HideProductCombinations=Hide products variant in the products selector
+ProductCombination=Variant
+NewProductCombination=New variant
+EditProductCombination=Editing variant
+ProductCombinationGenerator=Variants generator
+Features=Features
+PriceImpact=Price impact
+WeightImpact=Weight impact
+NewProductAttribute=New attribute
+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
+PercentageVariation=Percentage variation
+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 child products
+ConfirmCloneProductCombinations=Would you like to copy all the product variant to the 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
diff --git a/htdocs/langs/km_KH/projects.lang b/htdocs/langs/km_KH/projects.lang
index ecf61d17d36..f9c603ce113 100644
--- a/htdocs/langs/km_KH/projects.lang
+++ b/htdocs/langs/km_KH/projects.lang
@@ -29,9 +29,9 @@ DeleteAProject=Delete a project
 DeleteATask=Delete a task
 ConfirmDeleteAProject=Are you sure you want to delete this project?
 ConfirmDeleteATask=Are you sure you want to delete this task?
-OpenedProjects=Open projects
-OpenedTasks=Open tasks
-OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
+OpenedProjects=Opened projects
+OpenedTasks=Opened tasks
+OpportunitiesStatusForOpenedProjects=Opportunities amount of opened projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=Show project
 SetProject=Set project
@@ -47,7 +47,7 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
 TaskTimeDate=Date
-TasksOnOpenedProject=Tasks on open projects
+TasksOnOpenedProject=Tasks on opened projects
 WorkloadNotDefined=Workload not defined
 NewTimeSpent=New time spent
 MyTimeSpent=My time spent
@@ -58,6 +58,7 @@ TaskDateEnd=Task end date
 TaskDescription=Task description
 NewTask=New task
 AddTask=Create task
+AddTimeSpent=Create time spent
 Activity=Activity
 Activities=Tasks/activities
 MyActivities=My tasks/activities
@@ -95,6 +96,7 @@ ValidateProject=Validate projet
 ConfirmValidateProject=Are you sure you want to validate this project?
 CloseAProject=Close project
 ConfirmCloseAProject=Are you sure you want to close this project?
+AlsoCloseAProject=Also close project (keep it open if you still need to follow production tasks on it)
 ReOpenAProject=Open project
 ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=Project contacts
@@ -120,7 +122,7 @@ CloneProjectFiles=Clone project joined files
 CloneTaskFiles=Clone task(s) joined files (if task(s) cloned)
 CloneMoveDate=Update project/tasks dates from now?
 ConfirmCloneProject=Are you sure to clone this project?
-ProjectReportDate=Change task date according project start date
+ProjectReportDate=Change task dates according to new project start date
 ErrorShiftTaskDate=Impossible to shift task date according to new project start date
 ProjectsAndTasksLines=Projects and tasks
 ProjectCreatedInDolibarr=Project %s created
@@ -177,9 +179,9 @@ ProjectsStatistics=Statistics on projects/leads
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 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.
-OpenedProjectsByThirdparties=Open projects by thirdparties
+OpenedProjectsByThirdparties=Opened projects by thirdparties
 OnlyOpportunitiesShort=Only opportunities
-OpenedOpportunitiesShort=Open opportunities
+OpenedOpportunitiesShort=Opened opportunities
 NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount
diff --git a/htdocs/langs/km_KH/propal.lang b/htdocs/langs/km_KH/propal.lang
index 52260fe2b4e..a14d25ce779 100644
--- a/htdocs/langs/km_KH/propal.lang
+++ b/htdocs/langs/km_KH/propal.lang
@@ -3,7 +3,7 @@ Proposals=Commercial proposals
 Proposal=Commercial proposal
 ProposalShort=Proposal
 ProposalsDraft=Draft commercial proposals
-ProposalsOpened=Open commercial proposals
+ProposalsOpened=Opened commercial proposals
 Prop=Commercial proposals
 CommercialProposal=Commercial proposal
 ProposalCard=Proposal card
@@ -26,9 +26,9 @@ AmountOfProposalsByMonthHT=Amount by month (net of tax)
 NbOfProposals=Number of commercial proposals
 ShowPropal=Show proposal
 PropalsDraft=Drafts
-PropalsOpened=Open
+PropalsOpened=Opened
 PropalStatusDraft=Draft (needs to be validated)
-PropalStatusValidated=Validated (proposal is open)
+PropalStatusValidated=Validated (proposal is opened)
 PropalStatusSigned=Signed (needs billing)
 PropalStatusNotSigned=Not signed (closed)
 PropalStatusBilled=Billed
diff --git a/htdocs/langs/km_KH/stocks.lang b/htdocs/langs/km_KH/stocks.lang
index 834fa104098..1db49b8d8dd 100644
--- a/htdocs/langs/km_KH/stocks.lang
+++ b/htdocs/langs/km_KH/stocks.lang
@@ -22,13 +22,15 @@ Movements=Movements
 ErrorWarehouseRefRequired=Warehouse reference name is required
 ListOfWarehouses=List of warehouses
 ListOfStockMovements=List of stock movements
+StockMovementForId=Movement ID %d
+ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Warehouses area
 Location=Location
 LocationSummary=Short name location
 NumberOfDifferentProducts=Number of different products
 NumberOfProducts=Total number of products
-LastMovement=Last movement
-LastMovements=Last movements
+LastMovement=Latest movement
+LastMovements=Latest movements
 Units=Units
 Unit=Unit
 StockCorrection=Correct stock
@@ -140,3 +142,4 @@ ProductStockWarehouseCreated=Stock limit for alert and desired optimal stock cor
 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
diff --git a/htdocs/langs/km_KH/supplier_proposal.lang b/htdocs/langs/km_KH/supplier_proposal.lang
index 621d7784e35..61b031459b0 100644
--- a/htdocs/langs/km_KH/supplier_proposal.lang
+++ b/htdocs/langs/km_KH/supplier_proposal.lang
@@ -8,7 +8,7 @@ SearchRequest=Find a request
 DraftRequests=Draft requests
 SupplierProposalsDraft=Draft supplier proposals
 LastModifiedRequests=Latest %s modified price requests
-RequestsOpened=Open price requests
+RequestsOpened=Opened price requests
 SupplierProposalArea=Supplier proposals area
 SupplierProposalShort=Supplier proposal
 SupplierProposals=Supplier proposals
@@ -23,7 +23,7 @@ ConfirmValidateAsk=Are you sure you want to validate this price request under na
 DeleteAsk=Delete request
 ValidateAsk=Validate request
 SupplierProposalStatusDraft=Draft (needs to be validated)
-SupplierProposalStatusValidated=Validated (request is open)
+SupplierProposalStatusValidated=Validated (request is opened)
 SupplierProposalStatusClosed=Closed
 SupplierProposalStatusSigned=Accepted
 SupplierProposalStatusNotSigned=Refused
diff --git a/htdocs/langs/km_KH/suppliers.lang b/htdocs/langs/km_KH/suppliers.lang
index 8e1a8bd0e22..b890919ace5 100644
--- a/htdocs/langs/km_KH/suppliers.lang
+++ b/htdocs/langs/km_KH/suppliers.lang
@@ -41,3 +41,4 @@ DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Wrong quality
 ReputationForThisProduct=Reputation
 BuyerName=Buyer name
+AllProductServicePrices=All product / service prices
diff --git a/htdocs/langs/km_KH/users.lang b/htdocs/langs/km_KH/users.lang
index b836db8eb42..a0a1eae8697 100644
--- a/htdocs/langs/km_KH/users.lang
+++ b/htdocs/langs/km_KH/users.lang
@@ -36,7 +36,7 @@ AdministratorDesc=Administrator
 DefaultRights=Default permissions
 DefaultRightsDesc=Define here <u>default</u> permissions that are automatically granted to a <u>new created</u> user (Go on user card to change permission of an existing user).
 DolibarrUsers=Dolibarr users
-LastName=Last Name
+LastName=Last name
 FirstName=First name
 ListOfGroups=List of groups
 NewGroup=New group
diff --git a/htdocs/langs/km_KH/withdrawals.lang b/htdocs/langs/km_KH/withdrawals.lang
index 6e560a1abb1..a99d890e5f9 100644
--- a/htdocs/langs/km_KH/withdrawals.lang
+++ b/htdocs/langs/km_KH/withdrawals.lang
@@ -24,6 +24,7 @@ WithdrawStatistics=Direct debit payment statistics
 WithdrawRejectStatistics=Direct debit payment reject statistics
 LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
+WithdrawRequestsDone=%s direct debit payment requests recorded
 ThirdPartyBankCode=Third party bank code
 NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoice are on companies with a valid BAN.
 ClassCredited=Classify credited
@@ -76,8 +77,8 @@ RUM=UMR
 RUMLong=Unique Mandate Reference
 RUMWillBeGenerated=UMR number will be generated once bank account information are saved
 WithdrawMode=Direct debit mode (FRST or RECUR)
-WithdrawRequestAmount=Withdraw request amount:
-WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil amount.
+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
diff --git a/htdocs/langs/kn_IN/accountancy.lang b/htdocs/langs/kn_IN/accountancy.lang
index 5de95948fbf..4c2336b97b0 100644
--- a/htdocs/langs/kn_IN/accountancy.lang
+++ b/htdocs/langs/kn_IN/accountancy.lang
@@ -194,6 +194,8 @@ ChangeBinding=Change the binding
 
 ## Admin
 ApplyMassCategories=Apply mass categories
+AddAccountFromBookKeepingWithNoCategories=Add acccount already used with no categories
+CategoryDeleted=Category for the accounting account has been removed
 
 ## Export
 Exports=Exports
@@ -209,6 +211,7 @@ Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution
 Modelcsv_quadratus=Export towards Quadratus QuadraCompta
 Modelcsv_ebp=Export towards EBP
 Modelcsv_cogilog=Export towards Cogilog
+ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
 InitAccountancy=Init accountancy
diff --git a/htdocs/langs/kn_IN/admin.lang b/htdocs/langs/kn_IN/admin.lang
index 7d82a134158..36d4b1b66da 100644
--- a/htdocs/langs/kn_IN/admin.lang
+++ b/htdocs/langs/kn_IN/admin.lang
@@ -9,14 +9,20 @@ VersionDevelopment=Development
 VersionUnknown=ತಿಳಿದಿಲ್ಲ
 VersionRecommanded=Recommended
 FileCheck=Files integrity checker
-FileCheckDesc=This tool allows you to check the integrity of files of your application, comparing each files with the official ones. You can use this tool to detect if some files were modified by a hacker for example.
+FileCheckDesc=This tool allows you to check the integrity of files and setup of your application, comparing each files with the official ones. 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.
+FileIntegrityIsStrictlyConformedWithReference=Files integrity is strictly conformed with the reference.
+FileIntegrityIsOkButFilesWereAdded=Files integrity check has passed, however some new files were added.
+FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified, removed or added.
+GlobalChecksum=Global checksum
 MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
 LocalSignature=Embedded local signature (less reliable)
 RemoteSignature=Remote distant signature (more reliable)
 FilesMissing=Missing Files
 FilesUpdated=Updated Files
+FilesModified=Modified Files
+FilesAdded=Added Files
 FileCheckDolibarr=Check integrity of application files
-AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from a certified package
+AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from an official package
 XmlNotFound=Xml Integrity File of application not found
 SessionId=Session ID
 SessionSaveHandler=Handler to save sessions
@@ -185,7 +191,9 @@ BoxesDesc=Widgets are components showing some information that you can add to pe
 OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
 ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
-ModulesMarketPlaces=More modules...
+ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
+ModulesMarketPlaces=Find external modules...
+GoModuleSetupArea=To deploy/install a new module, go onto the Module setup area at <a href="%s">%s</a>.
 DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules
 DoliPartnersDesc=List of companies providing custom developed modules or features (Note: anyone experienced in PHP programming can provide custom development for an open source project)
 WebSiteDesc=Reference websites to find more modules...
@@ -276,21 +284,22 @@ ModuleFamilyInterface=Interfaces with external systems
 MenuHandlers=Menu handlers
 MenuAdmin=Menu editor
 DoNotUseInProduction=Do not use in production
-ThisIsProcessToFollow=This is setup to process:
-ThisIsAlternativeProcessToFollow=This is an alternative setup to process:
+ThisIsProcessToFollow=This is steps to process:
+ThisIsAlternativeProcessToFollow=This is an alternative setup to process manually:
 StepNb=Step %s
 FindPackageFromWebSite=Find a package that provides feature you want (for example on official web site %s).
 DownloadPackageFromWebSite=Download package (for example from official web site %s).
-UnpackPackageInDolibarrRoot=Unpack package file into Dolibarr server directory dedicated to external modules: <b>%s</b>
-SetupIsReadyForUse=Install is finished and Dolibarr is ready to use with this new component.
-NotExistsDirect=The alternative root directory is not defined.<br>
-InfDirAlt=Since version 3 it is possible to define an alternative root directory.This allows you to store, same place, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
-InfDirExample=<br>Then declare it in the file conf.php<br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>*These lines are commented with "#", to uncomment only remove the character.
+UnpackPackageInDolibarrRoot=Unpack the packaged files into server directory dedicated to Dolibarr: <b>%s</b>
+UnpackPackageInModulesRoot=To deploy/install an external module, unpack the packaged files into the server directory dedicated to modules: <b>%s</b>
+SetupIsReadyForUse=Module deployment is finished. You must however enable and setup the module in your application by going on the page to setup modules: <a href="%s">%s</a>.
+NotExistsDirect=The alternative root directory is not defined to an existing directory.<br>
+InfDirAlt=Since version 3, it is possible to define an alternative root directory. This allows you to store, into a dedicated directory, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
+InfDirExample=<br>Then declare it in the file <strong>conf.php</strong><br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>If these lines are commented with "#", to enable them, just uncomment by removing the "#" character.
 YouCanSubmitFile=For this step, you can send package using this tool: Select module file
 CurrentVersion=Dolibarr current version
 CallUpdatePage=Go to the page that updates the database structure and data: %s.
 LastStableVersion=Latest stable version
-LastActivationDate=Last activation date
+LastActivationDate=Latest activation date
 UpdateServerOffline=Update server offline
 GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s. <br><b>{000000@x}</b> same as previous but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
 GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
@@ -373,11 +382,11 @@ ExtrafieldCheckBox=Checkbox
 ExtrafieldRadio=Radio button
 ExtrafieldCheckBoxFromList= Checkbox from table
 ExtrafieldLink=Link to an object
-ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>In order to have the list depending on another :<br>1,value1|parent_list_code:parent_key<br>2,value2|parent_list_code:parent_key
+ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list :<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list :<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
-ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
+ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Example : Societe:societe/class/societe.class.php
 LibraryToBuildPDF=Library used for PDF generation
 WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
@@ -411,10 +420,11 @@ ModuleCompanyCodePanicum=Return an empty accountancy code.
 ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party code.
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
-
+WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<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).
+ClickToShowDescription=Click to show description
 # Modules
 Module0Name=Users & groups
-Module0Desc=Users and groups management
+Module0Desc=Users / Employees and Groups management
 Module1Name=ಮೂರನೇ ಪಕ್ಷಗಳು
 Module1Desc=Companies and contact management (customers, prospects...)
 Module2Name=Commercial
@@ -515,8 +525,8 @@ Module2200Name=Dynamic Prices
 Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
 Module2300Desc=Scheduled job management
-Module2400Name=Agenda/Events
-Module2400Desc=Follow events or rendez-vous. Record manual events into Agendas or let application logs automatic events for tracking purposes.
+Module2400Name=Events/Agenda
+Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous.
 Module2500Name=Electronic Content Management
 Module2500Desc=Save and share documents
 Module2600Name=API/Web services (SOAP server)
@@ -582,7 +592,7 @@ Permission34=Delete products
 Permission36=See/manage hidden products
 Permission38=Export products
 Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
-Permission42=Create/modify projects (shared project and projects i'm contact for)
+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)
 Permission45=Export projects
 Permission61=Read interventions
@@ -685,7 +695,7 @@ PermissionAdvanced253=Create/modify internal/external users and permissions
 Permission254=Create/modify external users only
 Permission255=Modify other users password
 Permission256=Delete or disable other users
-Permission262=Extend access to all third parties (not only those linked to user). Not effective for external users (always limited to themselves).
+Permission262=Extend access to all third parties (not only third parties that user is a sale representative).<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 assignement matters).
 Permission271=Read CA
 Permission272=Read invoices
 Permission273=Issue invoices
@@ -887,7 +897,7 @@ Offset=Offset
 AlwaysActive=Always active
 Upgrade=Upgrade
 MenuUpgrade=Upgrade / Extend
-AddExtensionThemeModuleOrOther=Add extension (theme, module, ...)
+AddExtensionThemeModuleOrOther=Deploy/install external module
 WebServer=Web server
 DocumentRootServer=Web server's root directory
 DataRootServer=Data files directory
@@ -994,7 +1004,7 @@ TriggerAlwaysActive=Triggers in this file are always active, whatever are the ac
 TriggerActiveAsModuleActive=Triggers in this file are active as module <b>%s</b> is enabled.
 GeneratedPasswordDesc=Define here which rule you want to use to generate new password if you ask to have auto generated password
 DictionaryDesc=Insert all reference data. You can add your values to the default.
-ConstDesc=This page allows you to edit all other parameters not available in previous pages. These are mostly reserved parameters for developers or advanced troubleshooting.
+ConstDesc=This page allows you to edit all other parameters not available in previous pages. These are mostly reserved parameters for developers or advanced troubleshooting. For a list of options <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">check here</a>.
 MiscellaneousDesc=All other security related parameters are defined here.
 LimitsSetup=Limits/Precision setup
 LimitsDesc=You can define limits, precisions and optimisations used by Dolibarr here
@@ -1161,10 +1171,6 @@ FreeLegalTextOnOrders=Free text on orders
 WatermarkOnDraftOrders=Watermark on draft orders (none if empty)
 ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable
 BANK_ASK_PAYMENT_BANK_DURING_ORDER=Ask for bank account destination of order
-##### Clicktodial #####
-ClickToDialSetup=Click To Dial module setup
-ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with your clicktodial login (defined on your user card)<br><b>__PASS__</b> that will be replaced with your clicktodial password (defined on your user card).
-##### Bookmark4u #####
 ##### Interventions #####
 InterventionsSetup=Interventions module setup
 FreeLegalTextOnInterventions=Free text on intervention documents
@@ -1391,7 +1397,7 @@ SendingsSetup=Sending module setup
 SendingsReceiptModel=Sending receipt model
 SendingsNumberingModules=Sendings numbering modules
 SendingsAbility=Support shipping sheets for customer deliveries
-NoNeedForDeliveryReceipts=In most cases, sendings receipts are used both as sheets for customer deliveries (list of products to send) and sheets that is recevied and signed by customer. So product deliveries receipts is a duplicated feature and is rarely activated.
+NoNeedForDeliveryReceipts=In most cases, shipping sheets are used both as sheets for customer deliveries (list of products to send) and sheets that is received and signed by customer. So product deliveries receipts is a duplicated feature and is rarely activated.
 FreeLegalTextOnShippings=Free text on shipments
 ##### Deliveries #####
 DeliveryOrderNumberingModules=Products deliveries receipt numbering module
@@ -1471,7 +1477,11 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Set automatically this default value for type of e
 AGENDA_DEFAULT_FILTER_TYPE=Set automatically this type of event into search filter of agenda view
 AGENDA_DEFAULT_FILTER_STATUS=Set automatically this status for events into search filter of agenda view
 AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
-##### ClickToDial #####
+AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
+AGENDA_NOTIFICATION_SOUND=Enable sound notification
+##### Clicktodial #####
+ClickToDialSetup=Click To Dial module setup
+ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with your clicktodial login (defined on your user card)<br><b>__PASS__</b> that will be replaced with your clicktodial password (defined on your user card).
 ClickToDialDesc=This module allows to make phone numbers clickable. A click on this icon will call make your phone to 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.
 ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
 ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on same computer than the browser, and called when you click on a link in your browser that start 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.
@@ -1499,10 +1509,11 @@ EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint availa
 ##### API ####
 ApiSetup=API module setup
 ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
-ApiProductionMode=Enable production mode (this will activate use of a caches for services management)
+ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
 ApiExporerIs=You can explore the APIs at url
 OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
 ApiKey=Key for API
+WarningAPIExplorerDisabled=The API explorer has been disabled. API explorer is not required to provide API services. It is a tool for developer to find/test REST APIs. If you need this tool, go into setup of module API REST to activate it.
 ##### Bank #####
 BankSetupModule=Bank module setup
 FreeLegalTextOnChequeReceipts=Free text on cheque receipts
@@ -1571,7 +1582,7 @@ BackupDumpWizard=Wizard to build database backup dump file
 SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
 SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is only manual steps a privileged user can do.
 InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
-ConfFileMuseContainCustom=Installing an external module from application save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to have option<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
+ConfFileMuseContainCustom=Installing an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
 HighlightLinesColor=Highlight color of the line when the mouse passes over (keep empty for no highlight)
 TextTitleColor=Color of page title
@@ -1601,6 +1612,7 @@ FixTZ=TimeZone fix
 FillFixTZOnlyIfRequired=Example: +2 (fill only if problem experienced)
 ExpectedChecksum=Expected Checksum
 CurrentChecksum=Current Checksum
+ForcedConstants=Required constant values
 MailToSendProposal=To send customer proposal
 MailToSendOrder=To send customer order
 MailToSendInvoice=To send customer invoice
@@ -1609,13 +1621,14 @@ MailToSendIntervention=To send intervention
 MailToSendSupplierRequestForQuotation=To send quotation request to supplier
 MailToSendSupplierOrder=To send supplier order
 MailToSendSupplierInvoice=To send supplier invoice
+MailToSendContract=To send a contract
 MailToThirdparty=To send email from third party page
 ByDefaultInList=Show by default on list view
-YouUseLastStableVersion=You use the last stable version
+YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
 TitleExampleForMaintenanceRelease=Example of message you can use to announce this maintenance release (feel free to use it on your web sites)
-ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. You can download it from the download area of http://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.
-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, nor data structure change is present into this version. You can download it from the download area of http://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.
+ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. 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.
+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, nor data structure change is present into 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, you can enter here rule to have price for each level autocalculated according to price of first level, so you will have to enter only price for first level on each product. This page is here to save you time and can be usefull only if your prices for each leve are relative to first level. You can ignore this page in most cases.
 ModelModulesProduct=Templates for product documents
 ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
diff --git a/htdocs/langs/kn_IN/banks.lang b/htdocs/langs/kn_IN/banks.lang
index cdf6a711cfe..e59f652700c 100644
--- a/htdocs/langs/kn_IN/banks.lang
+++ b/htdocs/langs/kn_IN/banks.lang
@@ -74,13 +74,13 @@ Conciliate=Reconcile
 Conciliation=Reconciliation
 ReconciliationLate=Reconciliation late
 IncludeClosedAccount=Include closed accounts
-OnlyOpenedAccount=Only open accounts
+OnlyOpenedAccount=Only opened accounts
 AccountToCredit=Account to credit
 AccountToDebit=Account to debit
 DisableConciliation=Disable reconciliation feature for this account
 ConciliationDisabled=Reconciliation feature disabled
 LinkedToAConciliatedTransaction=Linked to a conciliated entry
-StatusAccountOpened=ತೆರೆಯಲಾಗಿದೆ
+StatusAccountOpened=Opened
 StatusAccountClosed=ಮುಚ್ಚಲಾಗಿದೆ
 AccountIdShort=Number
 LineRecord=Transaction
diff --git a/htdocs/langs/kn_IN/bills.lang b/htdocs/langs/kn_IN/bills.lang
index ab062511599..47c950e211a 100644
--- a/htdocs/langs/kn_IN/bills.lang
+++ b/htdocs/langs/kn_IN/bills.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - bills
 Bill=Invoice
 Bills=Invoices
-BillsCustomers=Customers invoices
-BillsCustomer=Customers invoice
-BillsSuppliers=Suppliers invoices
-BillsCustomersUnpaid=Unpaid customers invoices
-BillsCustomersUnpaidForCompany=Unpaid customer's invoices for %s
-BillsSuppliersUnpaid=Unpaid supplier's invoices
-BillsSuppliersUnpaidForCompany=Unpaid supplier's invoices for %s
+BillsCustomers=Customer invoices
+BillsCustomer=Customer invoice
+BillsSuppliers=Supplier invoices
+BillsCustomersUnpaid=Unpaid customer invoices
+BillsCustomersUnpaidForCompany=Unpaid customer invoices for %s
+BillsSuppliersUnpaid=Unpaid supplier invoices
+BillsSuppliersUnpaidForCompany=Unpaid supplier invoices for %s
 BillsLate=Late payments
 BillsStatistics=Customers invoices statistics
 BillsStatisticsSuppliers=Suppliers invoices statistics
@@ -62,8 +62,8 @@ PaymentsBack=Payments back
 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 credit note or deposit 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.
+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.
 SupplierPayments=Suppliers payments
 ReceivedPayments=Received payments
 ReceivedCustomersPayments=Payments received from customers
@@ -78,6 +78,7 @@ PaymentMode=Payment type
 PaymentTypeDC=Debit/Credit Card
 PaymentTypePP=PayPal
 IdPaymentMode=Payment type (id)
+CodePaymentMode=Payment type (code)
 LabelPaymentMode=Payment type (label)
 PaymentModeShort=Payment type
 PaymentTerm=Payment term
@@ -102,9 +103,10 @@ SearchACustomerInvoice=Search for a customer invoice
 SearchASupplierInvoice=Search for a supplier invoice
 CancelBill=Cancel an invoice
 SendRemindByMail=Send reminder by EMail
-DoPayment=Do payment
-DoPaymentBack=Do payment back
+DoPayment=Enter payment
+DoPaymentBack=Enter refund
 ConvertToReduc=Convert into future discount
+ConvertExcessReceivedToReduc=Convert excess received into future discount
 EnterPaymentReceivedFromCustomer=Enter payment received from customer
 EnterPaymentDueToCustomer=Make payment due to customer
 DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
@@ -113,22 +115,24 @@ BillStatus=Invoice status
 StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Draft (needs to be validated)
 BillStatusPaid=Paid
-BillStatusPaidBackOrConverted=Paid or converted into discount
+BillStatusPaidBackOrConverted=Refund or converted into discount
 BillStatusConverted=Paid (ready for final invoice)
 BillStatusCanceled=Abandoned
 BillStatusValidated=Validated (needs to be paid)
 BillStatusStarted=Started
 BillStatusNotPaid=Not paid
+BillStatusNotRefunded=Not refunded
 BillStatusClosedUnpaid=Closed (unpaid)
 BillStatusClosedPaidPartially=Paid (partially)
 BillShortStatusDraft=Draft
 BillShortStatusPaid=Paid
-BillShortStatusPaidBackOrConverted=Processed
+BillShortStatusPaidBackOrConverted=Refund or converted
 BillShortStatusConverted=Processed
 BillShortStatusCanceled=Abandoned
 BillShortStatusValidated=Validated
 BillShortStatusStarted=Started
 BillShortStatusNotPaid=Not paid
+BillShortStatusNotRefunded=Not refunded
 BillShortStatusClosedUnpaid=ಮುಚ್ಚಲಾಗಿದೆ
 BillShortStatusClosedPaidPartially=Paid (partially)
 PaymentStatusToValidShort=To validate
@@ -149,14 +153,14 @@ NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified
 FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
 NotARecurringInvoiceTemplate=Not a recurring template invoice
 NewBill=New invoice
-LastBills=Last %s invoices
-LastCustomersBills=Last %s customers invoices
-LastSuppliersBills=Last %s suppliers invoices
+LastBills=Latest %s invoices
+LastCustomersBills=Latest %s customer invoices
+LastSuppliersBills=Latest %s supplier invoices
 AllBills=All invoices
 OtherBills=Other invoices
 DraftBills=Draft invoices
-CustomersDraftInvoices=Customers draft invoices
-SuppliersDraftInvoices=Suppliers draft invoices
+CustomersDraftInvoices=Customer draft invoices
+SuppliersDraftInvoices=Supplier draft invoices
 Unpaid=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>?
@@ -203,7 +207,7 @@ AlreadyPaidNoCreditNotesNoDeposits=Already paid (without credit notes and deposi
 Abandoned=Abandoned
 RemainderToPay=Remaining unpaid
 RemainderToTake=Remaining amount to take
-RemainderToPayBack=Remaining amount to pay back
+RemainderToPayBack=Remaining amount to refund
 Rest=Pending
 AmountExpected=Amount claimed
 ExcessReceived=Excess received
@@ -270,6 +274,7 @@ Deposit=Deposit
 Deposits=Deposits
 DiscountFromCreditNote=Discount from credit note %s
 DiscountFromDeposit=Payments from deposit invoice %s
+DiscountFromExcessReceived=Payments from excess received of invoice %s
 AbsoluteDiscountUse=This kind of credit can be used on invoice before its validation
 CreditNoteDepositUse=Invoice must be validated to use this kind of credits
 NewGlobalDiscount=New absolute discount
@@ -277,8 +282,8 @@ NewRelativeDiscount=New relative discount
 NoteReason=Note/Reason
 ReasonDiscount=Reason
 DiscountOfferedBy=Granted by
-DiscountStillRemaining=Discounts still remaining
-DiscountAlreadyCounted=Discounts already counted
+DiscountStillRemaining=Discounts available
+DiscountAlreadyCounted=Discounts already consumed
 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.
@@ -331,10 +336,12 @@ 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
 # PaymentConditions
 Statut=Status
-PaymentConditionShortRECEP=Immediate
-PaymentConditionRECEP=Immediate
+PaymentConditionShortRECEP=Due Upon Receipt
+PaymentConditionRECEP=Due Upon Receipt
 PaymentConditionShort30D=30 days
 PaymentCondition30D=30 days
 PaymentConditionShort30DENDMONTH=30 days of month-end
@@ -349,6 +356,14 @@ PaymentConditionShortPT_ORDER=Order
 PaymentConditionPT_ORDER=On order
 PaymentConditionShortPT_5050=50-50
 PaymentConditionPT_5050=50%% in advance, 50%% on delivery
+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
 FixAmount=Fix amount
 VarAmount=Variable amount (%% tot.)
 # PaymentType
@@ -418,7 +433,7 @@ ChequeDeposits=Checks deposits
 Cheques=Checks
 DepositId=Id deposit
 NbCheque=Number of checks
-CreditNoteConvertedIntoDiscount=This credit note or deposit invoice has been converted into %s
+CreditNoteConvertedIntoDiscount=This %s has been converted into %s
 UsBillingContactAsIncoiveRecipientIfExist=Use customer billing contact address instead of third party address as recipient for invoices
 ShowUnpaidAll=Show all unpaid invoices
 ShowUnpaidLateOnly=Show late unpaid invoices only
diff --git a/htdocs/langs/kn_IN/boxes.lang b/htdocs/langs/kn_IN/boxes.lang
index 98970318e85..38b03b4268d 100644
--- a/htdocs/langs/kn_IN/boxes.lang
+++ b/htdocs/langs/kn_IN/boxes.lang
@@ -25,8 +25,8 @@ BoxTitleLastSuppliers=Latest %s recorded suppliers
 BoxTitleLastModifiedSuppliers=Latest %s modified suppliers
 BoxTitleLastModifiedCustomers=Latest %s modified customers
 BoxTitleLastCustomersOrProspects=Latest %s customers or prospects
-BoxTitleLastCustomerBills=Latest %s customer's invoices
-BoxTitleLastSupplierBills=Latest %s supplier's invoices
+BoxTitleLastCustomerBills=Latest %s customer invoices
+BoxTitleLastSupplierBills=Latest %s supplier invoices
 BoxTitleLastModifiedProspects=Latest %s modified prospects
 BoxTitleLastModifiedMembers=Latest %s members
 BoxTitleLastFicheInter=Latest %s modified interventions
@@ -51,12 +51,12 @@ ClickToAdd=Click here to add.
 NoRecordedCustomers=No recorded customers
 NoRecordedContacts=No recorded contacts
 NoActionsToDo=No actions to do
-NoRecordedOrders=No recorded customer's orders
+NoRecordedOrders=No recorded customer orders
 NoRecordedProposals=No recorded proposals
-NoRecordedInvoices=No recorded customer's invoices
-NoUnpaidCustomerBills=No unpaid customer's invoices
-NoUnpaidSupplierBills=No unpaid supplier's invoices
-NoModifiedSupplierBills=No recorded supplier's invoices
+NoRecordedInvoices=No recorded customer invoices
+NoUnpaidCustomerBills=No unpaid customer invoices
+NoUnpaidSupplierBills=No unpaid supplier invoices
+NoModifiedSupplierBills=No recorded supplier invoices
 NoRecordedProducts=No recorded products/services
 NoRecordedProspects=No recorded prospects
 NoContractedProducts=No products/services contracted
diff --git a/htdocs/langs/kn_IN/companies.lang b/htdocs/langs/kn_IN/companies.lang
index cc4d0ef8f31..1a61011e726 100644
--- a/htdocs/langs/kn_IN/companies.lang
+++ b/htdocs/langs/kn_IN/companies.lang
@@ -78,6 +78,10 @@ VATIsNotUsed=ವ್ಯಾಟ್ ಬಳಸಲಾಗುವುದಿಲ್ಲ
 CopyAddressFromSoc=Fill address with third party address
 ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
 PaymentBankAccount=Payment bank account
+OverAllProposals=Total proposals
+OverAllOrders=Total orders
+OverAllInvoices=Total invoices
+OverAllSupplierProposals=Total price requests
 ##### Local Taxes #####
 LocalTax1IsUsed=Use second tax
 LocalTax1IsUsedES= RE ಬಳಸಲಾಗುತ್ತದೆ
@@ -239,6 +243,10 @@ ProfId3RU=Prof Id 3 (KPP)
 ProfId4RU=Prof Id 4 (OKPO)
 ProfId5RU=-
 ProfId6RU=-
+ProfId1DZ=RC
+ProfId2DZ=Art.
+ProfId3DZ=NIF
+ProfId4DZ=NIS
 VATIntra=ಮೌಲ್ಯ ವರ್ಧಿತ ತೆರಿಗೆ (VAT) ಸಂಖ್ಯೆ
 VATIntraShort=ಮೌಲ್ಯ ವರ್ಧಿತ ತೆರಿಗೆ (VAT) ಸಂಖ್ಯೆ
 VATIntraSyntaxIsValid=ಸಿಂಟ್ಯಾಕ್ಸ್ ಸರಿಯಿದ್ದಂತಿದೆ
@@ -382,8 +390,9 @@ ListCustomersShort=ಗ್ರಾಹಕರ ಪಟ್ಟಿ
 ThirdPartiesArea=Third parties and contact area
 LastModifiedThirdParties=Latest %s modified third parties
 UniqueThirdParties=ಒಟ್ಟು ಅನನ್ಯ ಮೂರನೇ ಪಾರ್ಟಿಗಳು
-InActivity=ತೆರೆಯಲಾಗಿದೆ
+InActivity=Opened
 ActivityCeased=ಮುಚ್ಚಲಾಗಿದೆ
+ThirdPartyIsClosed=Third party is closed
 ProductsIntoElements=List of products/services into %s
 CurrentOutstandingBill=ಪ್ರಸ್ತುತ ಬಾಕಿ ಉಳಿದಿರುವ ಬಿಲ್
 OutstandingBill=ಗರಿಷ್ಟ ಬಾಕಿ ಉಳಿದಿರುವ ಬಿಲ್ ಮೊತ್ತ
@@ -396,7 +405,7 @@ MergeThirdparties=Merge third parties
 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 so you will be able to delete the duplicate one.
 ThirdpartiesMergeSuccess=Thirdparties have been merged
 SaleRepresentativeLogin=Login of sales representative
-SaleRepresentativeFirstname=Firstname of sales representative
-SaleRepresentativeLastname=Lastname of sales representative
+SaleRepresentativeFirstname=First name of sales representative
+SaleRepresentativeLastname=Last name of sales representative
 ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
 NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/kn_IN/compta.lang b/htdocs/langs/kn_IN/compta.lang
index 17f2bb4e98f..5e9814369ec 100644
--- a/htdocs/langs/kn_IN/compta.lang
+++ b/htdocs/langs/kn_IN/compta.lang
@@ -65,6 +65,7 @@ PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=VAT payment
 ListPayment=List of payments
 ListOfCustomerPayments=List of customer payments
+ListOfSupplierPayments=List of supplier payments
 DateStartPeriod=Date start period
 DateEndPeriod=Date end period
 newLT1Payment=New tax 2 payment
@@ -81,7 +82,7 @@ LT2PaymentES=IRPF Payment
 LT2PaymentsES=IRPF Payments
 VATPayment=Sales tax payment
 VATPayments=Sales tax payments
-VATRefund=Sales tax refund Refund
+VATRefund=Sales tax refund
 Refund=Refund
 SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Show VAT payment
@@ -194,7 +195,7 @@ CloneTax=Clone a social/fiscal tax
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
 CloneTaxForNextMonth=Clone it for next month
 SimpleReport=Simple report
-AddExtraReport=Extra reports
+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
diff --git a/htdocs/langs/kn_IN/cron.lang b/htdocs/langs/kn_IN/cron.lang
index cb68b31c80f..0535c4b32d4 100644
--- a/htdocs/langs/kn_IN/cron.lang
+++ b/htdocs/langs/kn_IN/cron.lang
@@ -17,17 +17,17 @@ CronMethodDoesNotExists=Class %s does not contains any method %s
 # Menu
 EnabledAndDisabled=Enabled and disabled
 # Page list
-CronLastOutput=Last run output
-CronLastResult=Last result code
+CronLastOutput=Latest run output
+CronLastResult=Latest result code
 CronCommand=Command
 CronList=Scheduled jobs
 CronDelete=Delete scheduled jobs
-CronConfirmDelete=Are you sure you want to delete these scheduled jobs ?
+CronConfirmDelete=Are you sure you want to delete these scheduled jobs?
 CronExecute=Launch scheduled job
-CronConfirmExecute=Are you sure you want to execute these scheduled jobs now ?
+CronConfirmExecute=Are you sure you want to execute these scheduled jobs now?
 CronInfo=Scheduled job module allow to execute job that have been planned
 CronTask=Job
-CronNone=None
+CronNone=ಯಾವುದೂ ಇಲ್ಲ
 CronDtStart=Not before
 CronDtEnd=Not after
 CronDtNextLaunch=Next execution
diff --git a/htdocs/langs/kn_IN/errors.lang b/htdocs/langs/kn_IN/errors.lang
index f935ce72d41..9e2eb6817ef 100644
--- a/htdocs/langs/kn_IN/errors.lang
+++ b/htdocs/langs/kn_IN/errors.lang
@@ -11,6 +11,7 @@ ErrorLoginAlreadyExists=Login %s already exists.
 ErrorGroupAlreadyExists=Group %s already exists.
 ErrorRecordNotFound=Record not found.
 ErrorFailToCopyFile=Failed to copy file '<b>%s</b>' into '<b>%s</b>'.
+ErrorFailToCopyDir=Failed to copy directory '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToRenameFile=Failed to rename file '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToDeleteFile=Failed to remove file '<b>%s</b>'.
 ErrorFailToCreateFile=Failed to create file '<b>%s</b>'.
@@ -115,7 +116,7 @@ ErrorNoActivatedBarcode=No barcode type activated
 ErrUnzipFails=Failed to unzip %s with ZipArchive
 ErrNoZipEngine=No engine to unzip %s file in this PHP
 ErrorFileMustBeADolibarrPackage=The file %s must be a Dolibarr zip package
-ErrorFileRequired=It takes a package Dolibarr file
+ErrorModuleFileRequired=You must select a Dolibarr module package file
 ErrorPhpCurlNotInstalled=The PHP CURL is not installed, this is essential to talk with 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
@@ -170,14 +171,19 @@ ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
 ErrorFileMustHaveFormat=File must have format %s
 ErrorSupplierCountryIsNotDefined=Country for this supplier is not defined. Correct this first.
 ErrorsThirdpartyMerge=Failed to merge the two records. Request canceled.
-ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enougth for product %s to add it into a new order.
-ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enougth for product %s to add it into a new invoice.
-ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enougth for product %s to add it into a new shipment.
-ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enougth for product %s to add it into a new proposal.
-ErrorFailedToLoadLoginFileForMode=Failed to get the login file for mode '%s'.
+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 bank 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>
 
 # 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.
diff --git a/htdocs/langs/kn_IN/holiday.lang b/htdocs/langs/kn_IN/holiday.lang
index a95da81eaaa..50d97c0d8cc 100644
--- a/htdocs/langs/kn_IN/holiday.lang
+++ b/htdocs/langs/kn_IN/holiday.lang
@@ -76,8 +76,9 @@ BoxTitleLastLeaveRequests=Latest %s modified leave requests
 HolidaysMonthlyUpdate=Monthly update
 ManualUpdate=Manual update
 HolidaysCancelation=Leave request cancelation
-EmployeeLastname=Employee lastname
-EmployeeFirstname=Employee firstname
+EmployeeLastname=Employee last name
+EmployeeFirstname=Employee first name
+TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
 
 ## Configuration du Module ##
 LastUpdateCP=Latest automatic update of leaves allocation
diff --git a/htdocs/langs/kn_IN/ldap.lang b/htdocs/langs/kn_IN/ldap.lang
index a17019d00fb..42e699de311 100644
--- a/htdocs/langs/kn_IN/ldap.lang
+++ b/htdocs/langs/kn_IN/ldap.lang
@@ -13,8 +13,8 @@ LDAPUsers=Users in LDAP database
 LDAPFieldStatus=Status
 LDAPFieldFirstSubscriptionDate=First subscription date
 LDAPFieldFirstSubscriptionAmount=First subscription amount
-LDAPFieldLastSubscriptionDate=Last subscription date
-LDAPFieldLastSubscriptionAmount=Last subscription amount
+LDAPFieldLastSubscriptionDate=Latest subscription date
+LDAPFieldLastSubscriptionAmount=Latest subscription amount
 LDAPFieldSkype=Skype id
 LDAPFieldSkypeExample=Example : skypeName
 UserSynchronized=User synchronized
diff --git a/htdocs/langs/kn_IN/mails.lang b/htdocs/langs/kn_IN/mails.lang
index ab18dcdca25..c830b551a67 100644
--- a/htdocs/langs/kn_IN/mails.lang
+++ b/htdocs/langs/kn_IN/mails.lang
@@ -35,7 +35,7 @@ MailingStatusSentPartialy=Sent partialy
 MailingStatusSentCompletely=Sent completely
 MailingStatusError=Error
 MailingStatusNotSent=Not sent
-MailSuccessfulySent=Email successfully sent (from %s to %s)
+MailSuccessfulySent=Email successfully accepted for delivery (from %s to %s)
 MailingSuccessfullyValidated=EMailing successfully validated
 MailUnsubcribe=Unsubscribe
 MailingStatusNotContact=Don't contact anymore
@@ -74,22 +74,28 @@ ResultOfMailSending=Result of mass EMail sending
 NbSelected=Nb selected
 NbIgnored=Nb ignored
 NbSent=Nb 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
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Line %s in file
 RecipientSelectionModules=Defined requests for recipient's selection
 MailSelectedRecipients=Selected recipients
 MailingArea=EMailings area
-LastMailings=Last %s emailings
+LastMailings=Latest %s emailings
 TargetsStatistics=Targets statistics
 NbOfCompaniesContacts=Unique contacts/addresses
 MailNoChangePossible=Recipients for validated emailing can't be changed
 SearchAMailing=Search mailing
 SendMailing=Send emailing
 SendMail=Send email
-MailingNeedCommand=For security reason, sending an emailing is better when performed from command line. If you have one, ask your server administrator to launch the following command to send the emailing to all recipients:
+SentBy=Sent by
+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=You can however send them online by adding parameter MAILING_LIMIT_SENDBYWEB with value of max number of emails you want to send by session. For this, go on Home - Setup - Other.
-ConfirmSendingEmailing=If you can't or prefer sending them with your www browser, please confirm you are sure you want to send emailing now from your browser?
+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.
 TargetsReset=Clear list
 ToClearAllRecipientsClickHere=Click here to clear the recipient list for this emailing
@@ -144,3 +150,6 @@ AdvTgtCreateFilter=Create filter
 AdvTgtOrCreateNewFilter=Name of new filter
 NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
+OutGoingEmailSetup=Outgoing email setup
+InGoingEmailSetup=Incoming email setup
+
diff --git a/htdocs/langs/kn_IN/main.lang b/htdocs/langs/kn_IN/main.lang
index c79a82666ab..ca645fd7593 100644
--- a/htdocs/langs/kn_IN/main.lang
+++ b/htdocs/langs/kn_IN/main.lang
@@ -63,11 +63,13 @@ ErrorNoVATRateDefinedForSellerCountry=Error, no vat rates defined for country '%
 ErrorNoSocialContributionForSellerCountry=Error, no social/fiscal taxes type defined for country '%s'.
 ErrorFailedToSaveFile=Error, failed to save file.
 ErrorCannotAddThisParentWarehouse=You are trying to add a parent warehouse which is already a child of current one
+MaxNbOfRecordPerPage=Max nb of record per page
 NotAuthorized=You are not authorized to do that.
 SetDate=Set date
 SelectDate=Select a date
 SeeAlso=See also %s
 SeeHere=See here
+Apply=Apply
 BackgroundColorByDefault=Default background color
 FileRenamed=The file was successfully renamed
 FileUploaded=The file was successfully uploaded
@@ -86,7 +88,7 @@ Undefined=Undefined
 PasswordForgotten=Password forgotten?
 SeeAbove=See above
 HomeArea=Home area
-LastConnexion=Last connection
+LastConnexion=Latest connection
 PreviousConnexion=Previous connection
 PreviousValue=Previous value
 ConnectedOnMultiCompany=Connected on environment
@@ -236,7 +238,7 @@ DateCreation=Creation date
 DateCreationShort=Creat. date
 DateModification=Modification date
 DateModificationShort=Modif. date
-DateLastModification=Last modification date
+DateLastModification=Latest modification date
 DateValidation=Validation date
 DateClosing=Closing date
 DateDue=Due date
@@ -432,7 +434,7 @@ Reportings=Reporting
 Draft=Draft
 Drafts=Drafts
 Validated=Validated
-Opened=ತೆರೆಯಲಾಗಿದೆ
+Opened=Opened
 New=New
 Discount=Discount
 Unknown=ತಿಳಿದಿಲ್ಲ
@@ -460,6 +462,7 @@ DeletePicture=Picture delete
 ConfirmDeletePicture=Confirm picture deletion?
 Login=Login
 CurrentLogin=Current login
+EnterLoginDetail=Enter login details
 January=January
 February=February
 March=March
@@ -597,6 +600,8 @@ SessionName=Session name
 Method=Method
 Receive=Receive
 CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
+ExpectedValue=Expected Value
+CurrentValue=Current value
 PartialWoman=Partial
 TotalWoman=Total
 NeverReceived=Never received
@@ -753,6 +758,8 @@ RemoveString=Remove string '%s'
 SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
 DirectDownloadLink=Direct download link
 Download=Download
+ActualizeCurrency=Update currency rate
+Fiscalyear=Fiscal year
 # Week day
 Monday=Monday
 Tuesday=Tuesday
@@ -787,8 +794,8 @@ SetRef=Set ref
 Select2ResultFoundUseArrows=Some results found. Use arrows to select.
 Select2NotFound=No result found
 Select2Enter=Enter
-Select2MoreCharacter=or more character
-Select2MoreCharacters=or more characters
+Select2MoreCharacter=or more characters<br /><br /><strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
+Select2MoreCharacters=or more characters<br /><br /><strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
 Select2LoadingMoreResults=Loading more results...
 Select2SearchInProgress=Search in progress...
 SearchIntoThirdparties=Thirdparties
@@ -809,3 +816,5 @@ SearchIntoContracts=Contracts
 SearchIntoCustomerShipments=Customer shipments
 SearchIntoExpenseReports=Expense reports
 SearchIntoLeaves=Leaves
+
+BulkActions=Bulk actions
diff --git a/htdocs/langs/kn_IN/members.lang b/htdocs/langs/kn_IN/members.lang
index df911af6f71..8f6f76ba48f 100644
--- a/htdocs/langs/kn_IN/members.lang
+++ b/htdocs/langs/kn_IN/members.lang
@@ -45,7 +45,7 @@ MemberStatusDraft=Draft (needs to be validated)
 MemberStatusDraftShort=Draft
 MemberStatusActive=Validated (waiting subscription)
 MemberStatusActiveShort=Validated
-MemberStatusActiveLate=subscription expired
+MemberStatusActiveLate=Subscription expired
 MemberStatusActiveLateShort=Expired
 MemberStatusPaid=Subscription up to date
 MemberStatusPaidShort=Up to date
@@ -136,8 +136,8 @@ DocForAllMembersCards=Generate business cards for all members
 DocForOneMemberCards=Generate business cards for a particular member
 DocForLabels=Generate address sheets
 SubscriptionPayment=Subscription payment
-LastSubscriptionDate=Last subscription date
-LastSubscriptionAmount=Last subscription amount
+LastSubscriptionDate=Latest subscription date
+LastSubscriptionAmount=Latest subscription amount
 MembersStatisticsByCountries=Members statistics by country
 MembersStatisticsByState=Members statistics by state/province
 MembersStatisticsByTown=Members statistics by town
@@ -149,7 +149,7 @@ MembersByStateDesc=This screen show you statistics on members by state/provinces
 MembersByTownDesc=This screen show you statistics on members by town.
 MembersStatisticsDesc=Choose statistics you want to read...
 MenuMembersStats=Statistics
-LastMemberDate=Last member date
+LastMemberDate=Latest member date
 Nature=Nature
 Public=Information are public
 NewMemberbyWeb=New member added. Awaiting approval
diff --git a/htdocs/langs/kn_IN/orders.lang b/htdocs/langs/kn_IN/orders.lang
index e789eda542a..835e0041229 100644
--- a/htdocs/langs/kn_IN/orders.lang
+++ b/htdocs/langs/kn_IN/orders.lang
@@ -39,7 +39,7 @@ StatusOrderRefusedShort=Refused
 StatusOrderBilledShort=Billed
 StatusOrderToProcessShort=To process
 StatusOrderReceivedPartiallyShort=Partially received
-StatusOrderReceivedAllShort=Everything received
+StatusOrderReceivedAllShort=Products received
 StatusOrderCanceled=Canceled
 StatusOrderDraft=Draft (needs to be validated)
 StatusOrderValidated=Validated
@@ -51,7 +51,7 @@ StatusOrderApproved=Approved
 StatusOrderRefused=Refused
 StatusOrderBilled=Billed
 StatusOrderReceivedPartially=Partially received
-StatusOrderReceivedAll=Everything received
+StatusOrderReceivedAll=All products received
 ShippingExist=A shipment exists
 QtyOrdered=Qty ordered
 ProductQtyInDraft=Product quantity into draft orders
diff --git a/htdocs/langs/kn_IN/other.lang b/htdocs/langs/kn_IN/other.lang
index 14973f4945e..0c86b423cb0 100644
--- a/htdocs/langs/kn_IN/other.lang
+++ b/htdocs/langs/kn_IN/other.lang
@@ -2,6 +2,7 @@
 SecurityCode=Security code
 NumberingShort=N°
 Tools=Tools
+TMenuTools=Tools
 ToolsDesc=All miscellaneous tools not included in other menu entries are collected here.<br /><br />All the tools can be reached in the left menu.
 Birthday=Birthday
 BirthdayDate=Birthday date
@@ -67,14 +68,15 @@ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find her
 PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nYou will find here the shipping __SHIPPINGREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nYou will find here the intervention __FICHINTERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n__PERSONALIZED__\n\n__SIGNATURE__
-DemoDesc=Dolibarr is a compact ERP/CRM supporting several functional modules. A demo showcasing all modules makes no sense as this scenario never occurs. So, several demo profiles are available.
+DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
+ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
 DemoFundation=Manage members of a foundation
 DemoFundation2=Manage members and bank account of a foundation
-DemoCompanyServiceOnly=Manage a freelance activity selling service only
+DemoCompanyServiceOnly=Company or freelance selling service only
 DemoCompanyShopWithCashDesk=Manage a shop with a cash desk
-DemoCompanyProductAndStocks=Manage a small or medium company selling products
-DemoCompanyAll=Manage a small or medium company with multiple activities (all main modules)
+DemoCompanyProductAndStocks=Company selling products with a shop
+DemoCompanyAll=Company with multiple activities (all main modules)
 CreatedBy=Created by %s
 ModifiedBy=Modified by %s
 ValidatedBy=Validated by %s
diff --git a/htdocs/langs/kn_IN/products.lang b/htdocs/langs/kn_IN/products.lang
index 13ad3356a60..3b55100096f 100644
--- a/htdocs/langs/kn_IN/products.lang
+++ b/htdocs/langs/kn_IN/products.lang
@@ -5,6 +5,8 @@ ProductLabelTranslated=Translated product label
 ProductDescriptionTranslated=Translated product description
 ProductNoteTranslated=Translated product note
 ProductServiceCard=Products/Services card
+TMenuProducts=Products
+TMenuServices=Services
 Products=Products
 Services=Services
 Product=Product
@@ -58,7 +60,7 @@ SellingPrice=Selling price
 SellingPriceHT=Selling price (net of tax)
 SellingPriceTTC=Selling price (inc. tax)
 CostPriceDescription=This price (net of tax) can be used to store the average amount this product cost to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
-CostPriceUsage=In a future version, this value could be used for margin calculation.
+CostPriceUsage=This value could be used for margin calculation.
 SoldAmount=Sold amount
 PurchasedAmount=Purchased amount
 NewPrice=New price
@@ -140,6 +142,7 @@ ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b>?
 CloneContentProduct=Clone all main informations of product/service
 ClonePricesProduct=Clone main informations and prices
 CloneCompositionProduct=Clone packaged product/service
+CloneCombinationsProduct=Clone product variants
 ProductIsUsed=This product is used
 NewRefForClone=Ref. of new product/service
 SellingPrices=Selling prices
@@ -236,7 +239,7 @@ GlobalVariables=Global variables
 VariableToUpdate=Variable to update
 GlobalVariableUpdaters=Global variable updaters
 UpdateInterval=Update interval (minutes)
-LastUpdated=Last updated
+LastUpdated=Latest update
 CorrectlyUpdated=Correctly updated
 PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
 PropalMergePdfProductChooseFile=Select PDF files
@@ -256,4 +259,41 @@ VolumeUnits=Volume unit
 SizeUnits=Size unit
 DeleteProductBuyPrice=Delete buying price
 ConfirmDeleteProductBuyPrice=Are you sure you want to delete this buying price?
+SubProduct=Sub product
 
+#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
+ProductCombinations=Variants
+HideProductCombinations=Hide products variant in the products selector
+ProductCombination=Variant
+NewProductCombination=New variant
+EditProductCombination=Editing variant
+ProductCombinationGenerator=Variants generator
+Features=Features
+PriceImpact=Price impact
+WeightImpact=Weight impact
+NewProductAttribute=New attribute
+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
+PercentageVariation=Percentage variation
+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 child products
+ConfirmCloneProductCombinations=Would you like to copy all the product variant to the 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
diff --git a/htdocs/langs/kn_IN/projects.lang b/htdocs/langs/kn_IN/projects.lang
index ecf61d17d36..f9c603ce113 100644
--- a/htdocs/langs/kn_IN/projects.lang
+++ b/htdocs/langs/kn_IN/projects.lang
@@ -29,9 +29,9 @@ DeleteAProject=Delete a project
 DeleteATask=Delete a task
 ConfirmDeleteAProject=Are you sure you want to delete this project?
 ConfirmDeleteATask=Are you sure you want to delete this task?
-OpenedProjects=Open projects
-OpenedTasks=Open tasks
-OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
+OpenedProjects=Opened projects
+OpenedTasks=Opened tasks
+OpportunitiesStatusForOpenedProjects=Opportunities amount of opened projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=Show project
 SetProject=Set project
@@ -47,7 +47,7 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
 TaskTimeDate=Date
-TasksOnOpenedProject=Tasks on open projects
+TasksOnOpenedProject=Tasks on opened projects
 WorkloadNotDefined=Workload not defined
 NewTimeSpent=New time spent
 MyTimeSpent=My time spent
@@ -58,6 +58,7 @@ TaskDateEnd=Task end date
 TaskDescription=Task description
 NewTask=New task
 AddTask=Create task
+AddTimeSpent=Create time spent
 Activity=Activity
 Activities=Tasks/activities
 MyActivities=My tasks/activities
@@ -95,6 +96,7 @@ ValidateProject=Validate projet
 ConfirmValidateProject=Are you sure you want to validate this project?
 CloseAProject=Close project
 ConfirmCloseAProject=Are you sure you want to close this project?
+AlsoCloseAProject=Also close project (keep it open if you still need to follow production tasks on it)
 ReOpenAProject=Open project
 ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=Project contacts
@@ -120,7 +122,7 @@ CloneProjectFiles=Clone project joined files
 CloneTaskFiles=Clone task(s) joined files (if task(s) cloned)
 CloneMoveDate=Update project/tasks dates from now?
 ConfirmCloneProject=Are you sure to clone this project?
-ProjectReportDate=Change task date according project start date
+ProjectReportDate=Change task dates according to new project start date
 ErrorShiftTaskDate=Impossible to shift task date according to new project start date
 ProjectsAndTasksLines=Projects and tasks
 ProjectCreatedInDolibarr=Project %s created
@@ -177,9 +179,9 @@ ProjectsStatistics=Statistics on projects/leads
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 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.
-OpenedProjectsByThirdparties=Open projects by thirdparties
+OpenedProjectsByThirdparties=Opened projects by thirdparties
 OnlyOpportunitiesShort=Only opportunities
-OpenedOpportunitiesShort=Open opportunities
+OpenedOpportunitiesShort=Opened opportunities
 NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount
diff --git a/htdocs/langs/kn_IN/propal.lang b/htdocs/langs/kn_IN/propal.lang
index 01c1bf37490..f3f43108b0e 100644
--- a/htdocs/langs/kn_IN/propal.lang
+++ b/htdocs/langs/kn_IN/propal.lang
@@ -3,7 +3,7 @@ Proposals=Commercial proposals
 Proposal=Commercial proposal
 ProposalShort=Proposal
 ProposalsDraft=Draft commercial proposals
-ProposalsOpened=Open commercial proposals
+ProposalsOpened=Opened commercial proposals
 Prop=Commercial proposals
 CommercialProposal=Commercial proposal
 ProposalCard=Proposal card
@@ -26,9 +26,9 @@ AmountOfProposalsByMonthHT=Amount by month (net of tax)
 NbOfProposals=Number of commercial proposals
 ShowPropal=Show proposal
 PropalsDraft=Drafts
-PropalsOpened=ತೆರೆಯಲಾಗಿದೆ
+PropalsOpened=Opened
 PropalStatusDraft=Draft (needs to be validated)
-PropalStatusValidated=Validated (proposal is open)
+PropalStatusValidated=Validated (proposal is opened)
 PropalStatusSigned=Signed (needs billing)
 PropalStatusNotSigned=Not signed (closed)
 PropalStatusBilled=Billed
diff --git a/htdocs/langs/kn_IN/stocks.lang b/htdocs/langs/kn_IN/stocks.lang
index 834fa104098..1db49b8d8dd 100644
--- a/htdocs/langs/kn_IN/stocks.lang
+++ b/htdocs/langs/kn_IN/stocks.lang
@@ -22,13 +22,15 @@ Movements=Movements
 ErrorWarehouseRefRequired=Warehouse reference name is required
 ListOfWarehouses=List of warehouses
 ListOfStockMovements=List of stock movements
+StockMovementForId=Movement ID %d
+ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Warehouses area
 Location=Location
 LocationSummary=Short name location
 NumberOfDifferentProducts=Number of different products
 NumberOfProducts=Total number of products
-LastMovement=Last movement
-LastMovements=Last movements
+LastMovement=Latest movement
+LastMovements=Latest movements
 Units=Units
 Unit=Unit
 StockCorrection=Correct stock
@@ -140,3 +142,4 @@ ProductStockWarehouseCreated=Stock limit for alert and desired optimal stock cor
 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
diff --git a/htdocs/langs/kn_IN/supplier_proposal.lang b/htdocs/langs/kn_IN/supplier_proposal.lang
index 675984e8250..946d35deb47 100644
--- a/htdocs/langs/kn_IN/supplier_proposal.lang
+++ b/htdocs/langs/kn_IN/supplier_proposal.lang
@@ -8,7 +8,7 @@ SearchRequest=Find a request
 DraftRequests=Draft requests
 SupplierProposalsDraft=Draft supplier proposals
 LastModifiedRequests=Latest %s modified price requests
-RequestsOpened=Open price requests
+RequestsOpened=Opened price requests
 SupplierProposalArea=Supplier proposals area
 SupplierProposalShort=Supplier proposal
 SupplierProposals=Supplier proposals
@@ -23,7 +23,7 @@ ConfirmValidateAsk=Are you sure you want to validate this price request under na
 DeleteAsk=Delete request
 ValidateAsk=Validate request
 SupplierProposalStatusDraft=Draft (needs to be validated)
-SupplierProposalStatusValidated=Validated (request is open)
+SupplierProposalStatusValidated=Validated (request is opened)
 SupplierProposalStatusClosed=ಮುಚ್ಚಲಾಗಿದೆ
 SupplierProposalStatusSigned=Accepted
 SupplierProposalStatusNotSigned=Refused
diff --git a/htdocs/langs/kn_IN/suppliers.lang b/htdocs/langs/kn_IN/suppliers.lang
index 766e4a9bfe9..5048602b038 100644
--- a/htdocs/langs/kn_IN/suppliers.lang
+++ b/htdocs/langs/kn_IN/suppliers.lang
@@ -1,10 +1,10 @@
 # Dolibarr language file - Source file is en_US - suppliers
-Suppliers=Suppliers
+Suppliers=ಪೂರೈಕೆದಾರರು
 SuppliersInvoice=Suppliers invoice
 ShowSupplierInvoice=Show Supplier Invoice
-NewSupplier=New supplier
+NewSupplier=ಹೊಸ ಪೂರೈಕೆದಾರ
 History=History
-ListOfSuppliers=List of suppliers
+ListOfSuppliers=ಪೂರೈಕೆದಾರರ ಪಟ್ಟಿ
 ShowSupplier=Show supplier
 OrderDate=Order date
 BuyingPriceMin=Best buying price
@@ -24,10 +24,10 @@ ExportDataset_fournisseur_1=Supplier invoices list and invoice lines
 ExportDataset_fournisseur_2=Supplier invoices and payments
 ExportDataset_fournisseur_3=Supplier orders and order lines
 ApproveThisOrder=Approve this order
-ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b> ?
+ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b>?
 DenyingThisOrder=Deny this order
-ConfirmDenyingThisOrder=Are you sure you want to deny this order <b>%s</b> ?
-ConfirmCancelThisOrder=Are you sure you want to cancel this order <b>%s</b> ?
+ConfirmDenyingThisOrder=Are you sure you want to deny this order <b>%s</b>?
+ConfirmCancelThisOrder=Are you sure you want to cancel this order <b>%s</b>?
 AddSupplierOrder=Create supplier order
 AddSupplierInvoice=Create supplier invoice
 ListOfSupplierProductForSupplier=List of products and prices for supplier <b>%s</b>
@@ -41,3 +41,4 @@ DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Wrong quality
 ReputationForThisProduct=Reputation
 BuyerName=Buyer name
+AllProductServicePrices=All product / service prices
diff --git a/htdocs/langs/kn_IN/users.lang b/htdocs/langs/kn_IN/users.lang
index b9a7660fec3..845a673b97d 100644
--- a/htdocs/langs/kn_IN/users.lang
+++ b/htdocs/langs/kn_IN/users.lang
@@ -36,7 +36,7 @@ AdministratorDesc=Administrator
 DefaultRights=Default permissions
 DefaultRightsDesc=Define here <u>default</u> permissions that are automatically granted to a <u>new created</u> user (Go on user card to change permission of an existing user).
 DolibarrUsers=Dolibarr users
-LastName=Last Name
+LastName=ಕೊನೆಯ ಹೆಸರು
 FirstName=ಮೊದಲ ಹೆಸರು
 ListOfGroups=List of groups
 NewGroup=New group
diff --git a/htdocs/langs/kn_IN/withdrawals.lang b/htdocs/langs/kn_IN/withdrawals.lang
index 6e560a1abb1..a99d890e5f9 100644
--- a/htdocs/langs/kn_IN/withdrawals.lang
+++ b/htdocs/langs/kn_IN/withdrawals.lang
@@ -24,6 +24,7 @@ WithdrawStatistics=Direct debit payment statistics
 WithdrawRejectStatistics=Direct debit payment reject statistics
 LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
+WithdrawRequestsDone=%s direct debit payment requests recorded
 ThirdPartyBankCode=Third party bank code
 NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoice are on companies with a valid BAN.
 ClassCredited=Classify credited
@@ -76,8 +77,8 @@ RUM=UMR
 RUMLong=Unique Mandate Reference
 RUMWillBeGenerated=UMR number will be generated once bank account information are saved
 WithdrawMode=Direct debit mode (FRST or RECUR)
-WithdrawRequestAmount=Withdraw request amount:
-WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil amount.
+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
diff --git a/htdocs/langs/ko_KR/accountancy.lang b/htdocs/langs/ko_KR/accountancy.lang
index 5de95948fbf..4c2336b97b0 100644
--- a/htdocs/langs/ko_KR/accountancy.lang
+++ b/htdocs/langs/ko_KR/accountancy.lang
@@ -194,6 +194,8 @@ ChangeBinding=Change the binding
 
 ## Admin
 ApplyMassCategories=Apply mass categories
+AddAccountFromBookKeepingWithNoCategories=Add acccount already used with no categories
+CategoryDeleted=Category for the accounting account has been removed
 
 ## Export
 Exports=Exports
@@ -209,6 +211,7 @@ Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution
 Modelcsv_quadratus=Export towards Quadratus QuadraCompta
 Modelcsv_ebp=Export towards EBP
 Modelcsv_cogilog=Export towards Cogilog
+ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
 InitAccountancy=Init accountancy
diff --git a/htdocs/langs/ko_KR/admin.lang b/htdocs/langs/ko_KR/admin.lang
index 85a5e253534..81179ff2ab6 100644
--- a/htdocs/langs/ko_KR/admin.lang
+++ b/htdocs/langs/ko_KR/admin.lang
@@ -9,14 +9,20 @@ VersionDevelopment=Development
 VersionUnknown=알 수 없음
 VersionRecommanded=Recommended
 FileCheck=Files integrity checker
-FileCheckDesc=This tool allows you to check the integrity of files of your application, comparing each files with the official ones. You can use this tool to detect if some files were modified by a hacker for example.
+FileCheckDesc=This tool allows you to check the integrity of files and setup of your application, comparing each files with the official ones. 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.
+FileIntegrityIsStrictlyConformedWithReference=Files integrity is strictly conformed with the reference.
+FileIntegrityIsOkButFilesWereAdded=Files integrity check has passed, however some new files were added.
+FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified, removed or added.
+GlobalChecksum=Global checksum
 MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
 LocalSignature=Embedded local signature (less reliable)
 RemoteSignature=Remote distant signature (more reliable)
 FilesMissing=Missing Files
 FilesUpdated=Updated Files
+FilesModified=Modified Files
+FilesAdded=Added Files
 FileCheckDolibarr=Check integrity of application files
-AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from a certified package
+AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from an official package
 XmlNotFound=Xml Integrity File of application not found
 SessionId=Session ID
 SessionSaveHandler=Handler to save sessions
@@ -185,7 +191,9 @@ BoxesDesc=Widgets are components showing some information that you can add to pe
 OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
 ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
-ModulesMarketPlaces=More modules...
+ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
+ModulesMarketPlaces=Find external modules...
+GoModuleSetupArea=To deploy/install a new module, go onto the Module setup area at <a href="%s">%s</a>.
 DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules
 DoliPartnersDesc=List of companies providing custom developed modules or features (Note: anyone experienced in PHP programming can provide custom development for an open source project)
 WebSiteDesc=Reference websites to find more modules...
@@ -276,21 +284,22 @@ ModuleFamilyInterface=Interfaces with external systems
 MenuHandlers=Menu handlers
 MenuAdmin=Menu editor
 DoNotUseInProduction=Do not use in production
-ThisIsProcessToFollow=This is setup to process:
-ThisIsAlternativeProcessToFollow=This is an alternative setup to process:
+ThisIsProcessToFollow=This is steps to process:
+ThisIsAlternativeProcessToFollow=This is an alternative setup to process manually:
 StepNb=Step %s
 FindPackageFromWebSite=Find a package that provides feature you want (for example on official web site %s).
 DownloadPackageFromWebSite=Download package (for example from official web site %s).
-UnpackPackageInDolibarrRoot=Unpack package file into Dolibarr server directory dedicated to external modules: <b>%s</b>
-SetupIsReadyForUse=Install is finished and Dolibarr is ready to use with this new component.
-NotExistsDirect=The alternative root directory is not defined.<br>
-InfDirAlt=Since version 3 it is possible to define an alternative root directory.This allows you to store, same place, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
-InfDirExample=<br>Then declare it in the file conf.php<br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>*These lines are commented with "#", to uncomment only remove the character.
+UnpackPackageInDolibarrRoot=Unpack the packaged files into server directory dedicated to Dolibarr: <b>%s</b>
+UnpackPackageInModulesRoot=To deploy/install an external module, unpack the packaged files into the server directory dedicated to modules: <b>%s</b>
+SetupIsReadyForUse=Module deployment is finished. You must however enable and setup the module in your application by going on the page to setup modules: <a href="%s">%s</a>.
+NotExistsDirect=The alternative root directory is not defined to an existing directory.<br>
+InfDirAlt=Since version 3, it is possible to define an alternative root directory. This allows you to store, into a dedicated directory, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
+InfDirExample=<br>Then declare it in the file <strong>conf.php</strong><br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>If these lines are commented with "#", to enable them, just uncomment by removing the "#" character.
 YouCanSubmitFile=For this step, you can send package using this tool: Select module file
 CurrentVersion=Dolibarr current version
 CallUpdatePage=Go to the page that updates the database structure and data: %s.
 LastStableVersion=Latest stable version
-LastActivationDate=Last activation date
+LastActivationDate=Latest activation date
 UpdateServerOffline=Update server offline
 GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s. <br><b>{000000@x}</b> same as previous but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
 GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
@@ -373,11 +382,11 @@ ExtrafieldCheckBox=Checkbox
 ExtrafieldRadio=Radio button
 ExtrafieldCheckBoxFromList= Checkbox from table
 ExtrafieldLink=Link to an object
-ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>In order to have the list depending on another :<br>1,value1|parent_list_code:parent_key<br>2,value2|parent_list_code:parent_key
+ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list :<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list :<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
-ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
+ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Example : Societe:societe/class/societe.class.php
 LibraryToBuildPDF=Library used for PDF generation
 WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
@@ -411,10 +420,11 @@ ModuleCompanyCodePanicum=Return an empty accountancy code.
 ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party code.
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
-
+WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<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).
+ClickToShowDescription=Click to show description
 # Modules
 Module0Name=Users & groups
-Module0Desc=Users and groups management
+Module0Desc=Users / Employees and Groups management
 Module1Name=Third parties
 Module1Desc=Companies and contact management (customers, prospects...)
 Module2Name=Commercial
@@ -515,8 +525,8 @@ Module2200Name=Dynamic Prices
 Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
 Module2300Desc=Scheduled job management
-Module2400Name=Agenda/Events
-Module2400Desc=Follow events or rendez-vous. Record manual events into Agendas or let application logs automatic events for tracking purposes.
+Module2400Name=Events/Agenda
+Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous.
 Module2500Name=Electronic Content Management
 Module2500Desc=Save and share documents
 Module2600Name=API/Web services (SOAP server)
@@ -582,7 +592,7 @@ Permission34=Delete products
 Permission36=See/manage hidden products
 Permission38=Export products
 Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
-Permission42=Create/modify projects (shared project and projects i'm contact for)
+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)
 Permission45=Export projects
 Permission61=Read interventions
@@ -685,7 +695,7 @@ PermissionAdvanced253=Create/modify internal/external users and permissions
 Permission254=Create/modify external users only
 Permission255=Modify other users password
 Permission256=Delete or disable other users
-Permission262=Extend access to all third parties (not only those linked to user). Not effective for external users (always limited to themselves).
+Permission262=Extend access to all third parties (not only third parties that user is a sale representative).<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 assignement matters).
 Permission271=Read CA
 Permission272=Read invoices
 Permission273=Issue invoices
@@ -887,7 +897,7 @@ Offset=Offset
 AlwaysActive=Always active
 Upgrade=Upgrade
 MenuUpgrade=Upgrade / Extend
-AddExtensionThemeModuleOrOther=Add extension (theme, module, ...)
+AddExtensionThemeModuleOrOther=Deploy/install external module
 WebServer=Web server
 DocumentRootServer=Web server's root directory
 DataRootServer=Data files directory
@@ -994,7 +1004,7 @@ TriggerAlwaysActive=Triggers in this file are always active, whatever are the ac
 TriggerActiveAsModuleActive=Triggers in this file are active as module <b>%s</b> is enabled.
 GeneratedPasswordDesc=Define here which rule you want to use to generate new password if you ask to have auto generated password
 DictionaryDesc=Insert all reference data. You can add your values to the default.
-ConstDesc=This page allows you to edit all other parameters not available in previous pages. These are mostly reserved parameters for developers or advanced troubleshooting.
+ConstDesc=This page allows you to edit all other parameters not available in previous pages. These are mostly reserved parameters for developers or advanced troubleshooting. For a list of options <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">check here</a>.
 MiscellaneousDesc=All other security related parameters are defined here.
 LimitsSetup=Limits/Precision setup
 LimitsDesc=You can define limits, precisions and optimisations used by Dolibarr here
@@ -1161,10 +1171,6 @@ FreeLegalTextOnOrders=Free text on orders
 WatermarkOnDraftOrders=Watermark on draft orders (none if empty)
 ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable
 BANK_ASK_PAYMENT_BANK_DURING_ORDER=Ask for bank account destination of order
-##### Clicktodial #####
-ClickToDialSetup=Click To Dial module setup
-ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with your clicktodial login (defined on your user card)<br><b>__PASS__</b> that will be replaced with your clicktodial password (defined on your user card).
-##### Bookmark4u #####
 ##### Interventions #####
 InterventionsSetup=Interventions module setup
 FreeLegalTextOnInterventions=Free text on intervention documents
@@ -1391,7 +1397,7 @@ SendingsSetup=Sending module setup
 SendingsReceiptModel=Sending receipt model
 SendingsNumberingModules=Sendings numbering modules
 SendingsAbility=Support shipping sheets for customer deliveries
-NoNeedForDeliveryReceipts=In most cases, sendings receipts are used both as sheets for customer deliveries (list of products to send) and sheets that is recevied and signed by customer. So product deliveries receipts is a duplicated feature and is rarely activated.
+NoNeedForDeliveryReceipts=In most cases, shipping sheets are used both as sheets for customer deliveries (list of products to send) and sheets that is received and signed by customer. So product deliveries receipts is a duplicated feature and is rarely activated.
 FreeLegalTextOnShippings=Free text on shipments
 ##### Deliveries #####
 DeliveryOrderNumberingModules=Products deliveries receipt numbering module
@@ -1471,7 +1477,11 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Set automatically this default value for type of e
 AGENDA_DEFAULT_FILTER_TYPE=Set automatically this type of event into search filter of agenda view
 AGENDA_DEFAULT_FILTER_STATUS=Set automatically this status for events into search filter of agenda view
 AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
-##### ClickToDial #####
+AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
+AGENDA_NOTIFICATION_SOUND=Enable sound notification
+##### Clicktodial #####
+ClickToDialSetup=Click To Dial module setup
+ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with your clicktodial login (defined on your user card)<br><b>__PASS__</b> that will be replaced with your clicktodial password (defined on your user card).
 ClickToDialDesc=This module allows to make phone numbers clickable. A click on this icon will call make your phone to 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.
 ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
 ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on same computer than the browser, and called when you click on a link in your browser that start 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.
@@ -1499,10 +1509,11 @@ EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint availa
 ##### API ####
 ApiSetup=API module setup
 ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
-ApiProductionMode=Enable production mode (this will activate use of a caches for services management)
+ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
 ApiExporerIs=You can explore the APIs at url
 OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
 ApiKey=Key for API
+WarningAPIExplorerDisabled=The API explorer has been disabled. API explorer is not required to provide API services. It is a tool for developer to find/test REST APIs. If you need this tool, go into setup of module API REST to activate it.
 ##### Bank #####
 BankSetupModule=Bank module setup
 FreeLegalTextOnChequeReceipts=Free text on cheque receipts
@@ -1571,7 +1582,7 @@ BackupDumpWizard=Wizard to build database backup dump file
 SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
 SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is only manual steps a privileged user can do.
 InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
-ConfFileMuseContainCustom=Installing an external module from application save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to have option<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
+ConfFileMuseContainCustom=Installing an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
 HighlightLinesColor=Highlight color of the line when the mouse passes over (keep empty for no highlight)
 TextTitleColor=Color of page title
@@ -1601,6 +1612,7 @@ FixTZ=TimeZone fix
 FillFixTZOnlyIfRequired=Example: +2 (fill only if problem experienced)
 ExpectedChecksum=Expected Checksum
 CurrentChecksum=Current Checksum
+ForcedConstants=Required constant values
 MailToSendProposal=To send customer proposal
 MailToSendOrder=To send customer order
 MailToSendInvoice=To send customer invoice
@@ -1609,13 +1621,14 @@ MailToSendIntervention=To send intervention
 MailToSendSupplierRequestForQuotation=To send quotation request to supplier
 MailToSendSupplierOrder=To send supplier order
 MailToSendSupplierInvoice=To send supplier invoice
+MailToSendContract=To send a contract
 MailToThirdparty=To send email from third party page
 ByDefaultInList=Show by default on list view
-YouUseLastStableVersion=You use the last stable version
+YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
 TitleExampleForMaintenanceRelease=Example of message you can use to announce this maintenance release (feel free to use it on your web sites)
-ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. You can download it from the download area of http://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.
-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, nor data structure change is present into this version. You can download it from the download area of http://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.
+ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. 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.
+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, nor data structure change is present into 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, you can enter here rule to have price for each level autocalculated according to price of first level, so you will have to enter only price for first level on each product. This page is here to save you time and can be usefull only if your prices for each leve are relative to first level. You can ignore this page in most cases.
 ModelModulesProduct=Templates for product documents
 ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
diff --git a/htdocs/langs/ko_KR/banks.lang b/htdocs/langs/ko_KR/banks.lang
index 7ae841cf0f3..f0c41d5d5bf 100644
--- a/htdocs/langs/ko_KR/banks.lang
+++ b/htdocs/langs/ko_KR/banks.lang
@@ -74,13 +74,13 @@ Conciliate=Reconcile
 Conciliation=Reconciliation
 ReconciliationLate=Reconciliation late
 IncludeClosedAccount=Include closed accounts
-OnlyOpenedAccount=Only open accounts
+OnlyOpenedAccount=Only opened accounts
 AccountToCredit=Account to credit
 AccountToDebit=Account to debit
 DisableConciliation=Disable reconciliation feature for this account
 ConciliationDisabled=Reconciliation feature disabled
 LinkedToAConciliatedTransaction=Linked to a conciliated entry
-StatusAccountOpened=Open
+StatusAccountOpened=Opened
 StatusAccountClosed=Closed
 AccountIdShort=Number
 LineRecord=Transaction
diff --git a/htdocs/langs/ko_KR/bills.lang b/htdocs/langs/ko_KR/bills.lang
index d6f9859fe20..e594f653145 100644
--- a/htdocs/langs/ko_KR/bills.lang
+++ b/htdocs/langs/ko_KR/bills.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - bills
 Bill=Invoice
 Bills=Invoices
-BillsCustomers=Customers invoices
-BillsCustomer=Customers invoice
-BillsSuppliers=Suppliers invoices
-BillsCustomersUnpaid=Unpaid customers invoices
-BillsCustomersUnpaidForCompany=Unpaid customer's invoices for %s
-BillsSuppliersUnpaid=Unpaid supplier's invoices
-BillsSuppliersUnpaidForCompany=Unpaid supplier's invoices for %s
+BillsCustomers=Customer invoices
+BillsCustomer=Customer invoice
+BillsSuppliers=Supplier invoices
+BillsCustomersUnpaid=Unpaid customer invoices
+BillsCustomersUnpaidForCompany=Unpaid customer invoices for %s
+BillsSuppliersUnpaid=Unpaid supplier invoices
+BillsSuppliersUnpaidForCompany=Unpaid supplier invoices for %s
 BillsLate=Late payments
 BillsStatistics=Customers invoices statistics
 BillsStatisticsSuppliers=Suppliers invoices statistics
@@ -62,8 +62,8 @@ PaymentsBack=Payments back
 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 credit note or deposit 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.
+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.
 SupplierPayments=Suppliers payments
 ReceivedPayments=Received payments
 ReceivedCustomersPayments=Payments received from customers
@@ -78,6 +78,7 @@ PaymentMode=Payment type
 PaymentTypeDC=Debit/Credit Card
 PaymentTypePP=PayPal
 IdPaymentMode=Payment type (id)
+CodePaymentMode=Payment type (code)
 LabelPaymentMode=Payment type (label)
 PaymentModeShort=Payment type
 PaymentTerm=Payment term
@@ -102,9 +103,10 @@ SearchACustomerInvoice=Search for a customer invoice
 SearchASupplierInvoice=Search for a supplier invoice
 CancelBill=Cancel an invoice
 SendRemindByMail=Send reminder by EMail
-DoPayment=Do payment
-DoPaymentBack=Do payment back
+DoPayment=Enter payment
+DoPaymentBack=Enter refund
 ConvertToReduc=Convert into future discount
+ConvertExcessReceivedToReduc=Convert excess received into future discount
 EnterPaymentReceivedFromCustomer=Enter payment received from customer
 EnterPaymentDueToCustomer=Make payment due to customer
 DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
@@ -113,22 +115,24 @@ BillStatus=Invoice status
 StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Draft (needs to be validated)
 BillStatusPaid=Paid
-BillStatusPaidBackOrConverted=Paid or converted into discount
+BillStatusPaidBackOrConverted=Refund or converted into discount
 BillStatusConverted=Paid (ready for final invoice)
 BillStatusCanceled=Abandoned
 BillStatusValidated=Validated (needs to be paid)
 BillStatusStarted=Started
 BillStatusNotPaid=Not paid
+BillStatusNotRefunded=Not refunded
 BillStatusClosedUnpaid=Closed (unpaid)
 BillStatusClosedPaidPartially=Paid (partially)
 BillShortStatusDraft=Draft
 BillShortStatusPaid=Paid
-BillShortStatusPaidBackOrConverted=Processed
+BillShortStatusPaidBackOrConverted=Refund or converted
 BillShortStatusConverted=Processed
 BillShortStatusCanceled=Abandoned
 BillShortStatusValidated=Validated
 BillShortStatusStarted=Started
 BillShortStatusNotPaid=Not paid
+BillShortStatusNotRefunded=Not refunded
 BillShortStatusClosedUnpaid=Closed
 BillShortStatusClosedPaidPartially=Paid (partially)
 PaymentStatusToValidShort=To validate
@@ -149,14 +153,14 @@ NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified
 FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
 NotARecurringInvoiceTemplate=Not a recurring template invoice
 NewBill=New invoice
-LastBills=Last %s invoices
-LastCustomersBills=Last %s customers invoices
-LastSuppliersBills=Last %s suppliers invoices
+LastBills=Latest %s invoices
+LastCustomersBills=Latest %s customer invoices
+LastSuppliersBills=Latest %s supplier invoices
 AllBills=All invoices
 OtherBills=Other invoices
 DraftBills=Draft invoices
-CustomersDraftInvoices=Customers draft invoices
-SuppliersDraftInvoices=Suppliers draft invoices
+CustomersDraftInvoices=Customer draft invoices
+SuppliersDraftInvoices=Supplier draft invoices
 Unpaid=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>?
@@ -203,7 +207,7 @@ AlreadyPaidNoCreditNotesNoDeposits=Already paid (without credit notes and deposi
 Abandoned=Abandoned
 RemainderToPay=Remaining unpaid
 RemainderToTake=Remaining amount to take
-RemainderToPayBack=Remaining amount to pay back
+RemainderToPayBack=Remaining amount to refund
 Rest=Pending
 AmountExpected=Amount claimed
 ExcessReceived=Excess received
@@ -270,6 +274,7 @@ Deposit=Deposit
 Deposits=Deposits
 DiscountFromCreditNote=Discount from credit note %s
 DiscountFromDeposit=Payments from deposit invoice %s
+DiscountFromExcessReceived=Payments from excess received of invoice %s
 AbsoluteDiscountUse=This kind of credit can be used on invoice before its validation
 CreditNoteDepositUse=Invoice must be validated to use this kind of credits
 NewGlobalDiscount=New absolute discount
@@ -277,8 +282,8 @@ NewRelativeDiscount=New relative discount
 NoteReason=Note/Reason
 ReasonDiscount=Reason
 DiscountOfferedBy=Granted by
-DiscountStillRemaining=Discounts still remaining
-DiscountAlreadyCounted=Discounts already counted
+DiscountStillRemaining=Discounts available
+DiscountAlreadyCounted=Discounts already consumed
 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.
@@ -331,10 +336,12 @@ 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
 # PaymentConditions
 Statut=Status
-PaymentConditionShortRECEP=Immediate
-PaymentConditionRECEP=Immediate
+PaymentConditionShortRECEP=Due Upon Receipt
+PaymentConditionRECEP=Due Upon Receipt
 PaymentConditionShort30D=30 days
 PaymentCondition30D=30 days
 PaymentConditionShort30DENDMONTH=30 days of month-end
@@ -349,6 +356,14 @@ PaymentConditionShortPT_ORDER=Order
 PaymentConditionPT_ORDER=On order
 PaymentConditionShortPT_5050=50-50
 PaymentConditionPT_5050=50%% in advance, 50%% on delivery
+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
 FixAmount=Fix amount
 VarAmount=Variable amount (%% tot.)
 # PaymentType
@@ -418,7 +433,7 @@ ChequeDeposits=Checks deposits
 Cheques=Checks
 DepositId=Id deposit
 NbCheque=Number of checks
-CreditNoteConvertedIntoDiscount=This credit note or deposit invoice has been converted into %s
+CreditNoteConvertedIntoDiscount=This %s has been converted into %s
 UsBillingContactAsIncoiveRecipientIfExist=Use customer billing contact address instead of third party address as recipient for invoices
 ShowUnpaidAll=Show all unpaid invoices
 ShowUnpaidLateOnly=Show late unpaid invoices only
diff --git a/htdocs/langs/ko_KR/boxes.lang b/htdocs/langs/ko_KR/boxes.lang
index 98970318e85..38b03b4268d 100644
--- a/htdocs/langs/ko_KR/boxes.lang
+++ b/htdocs/langs/ko_KR/boxes.lang
@@ -25,8 +25,8 @@ BoxTitleLastSuppliers=Latest %s recorded suppliers
 BoxTitleLastModifiedSuppliers=Latest %s modified suppliers
 BoxTitleLastModifiedCustomers=Latest %s modified customers
 BoxTitleLastCustomersOrProspects=Latest %s customers or prospects
-BoxTitleLastCustomerBills=Latest %s customer's invoices
-BoxTitleLastSupplierBills=Latest %s supplier's invoices
+BoxTitleLastCustomerBills=Latest %s customer invoices
+BoxTitleLastSupplierBills=Latest %s supplier invoices
 BoxTitleLastModifiedProspects=Latest %s modified prospects
 BoxTitleLastModifiedMembers=Latest %s members
 BoxTitleLastFicheInter=Latest %s modified interventions
@@ -51,12 +51,12 @@ ClickToAdd=Click here to add.
 NoRecordedCustomers=No recorded customers
 NoRecordedContacts=No recorded contacts
 NoActionsToDo=No actions to do
-NoRecordedOrders=No recorded customer's orders
+NoRecordedOrders=No recorded customer orders
 NoRecordedProposals=No recorded proposals
-NoRecordedInvoices=No recorded customer's invoices
-NoUnpaidCustomerBills=No unpaid customer's invoices
-NoUnpaidSupplierBills=No unpaid supplier's invoices
-NoModifiedSupplierBills=No recorded supplier's invoices
+NoRecordedInvoices=No recorded customer invoices
+NoUnpaidCustomerBills=No unpaid customer invoices
+NoUnpaidSupplierBills=No unpaid supplier invoices
+NoModifiedSupplierBills=No recorded supplier invoices
 NoRecordedProducts=No recorded products/services
 NoRecordedProspects=No recorded prospects
 NoContractedProducts=No products/services contracted
diff --git a/htdocs/langs/ko_KR/companies.lang b/htdocs/langs/ko_KR/companies.lang
index b05657af3b2..6d16fa5ae5c 100644
--- a/htdocs/langs/ko_KR/companies.lang
+++ b/htdocs/langs/ko_KR/companies.lang
@@ -78,6 +78,10 @@ VATIsNotUsed=VAT is not used
 CopyAddressFromSoc=Fill address with third party address
 ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
 PaymentBankAccount=Payment bank account
+OverAllProposals=Total proposals
+OverAllOrders=Total orders
+OverAllInvoices=Total invoices
+OverAllSupplierProposals=Total price requests
 ##### Local Taxes #####
 LocalTax1IsUsed=Use second tax
 LocalTax1IsUsedES= RE is used
@@ -239,6 +243,10 @@ ProfId3RU=Prof Id 3 (KPP)
 ProfId4RU=Prof Id 4 (OKPO)
 ProfId5RU=-
 ProfId6RU=-
+ProfId1DZ=RC
+ProfId2DZ=Art.
+ProfId3DZ=NIF
+ProfId4DZ=NIS
 VATIntra=VAT number
 VATIntraShort=VAT number
 VATIntraSyntaxIsValid=Syntax is valid
@@ -382,8 +390,9 @@ ListCustomersShort=List of customers
 ThirdPartiesArea=Third parties and contact area
 LastModifiedThirdParties=Latest %s modified third parties
 UniqueThirdParties=Total of unique third parties
-InActivity=Open
+InActivity=Opened
 ActivityCeased=Closed
+ThirdPartyIsClosed=Third party is closed
 ProductsIntoElements=List of products/services into %s
 CurrentOutstandingBill=Current outstanding bill
 OutstandingBill=Max. for outstanding bill
@@ -396,7 +405,7 @@ MergeThirdparties=Merge third parties
 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 so you will be able to delete the duplicate one.
 ThirdpartiesMergeSuccess=Thirdparties have been merged
 SaleRepresentativeLogin=Login of sales representative
-SaleRepresentativeFirstname=Firstname of sales representative
-SaleRepresentativeLastname=Lastname of sales representative
+SaleRepresentativeFirstname=First name of sales representative
+SaleRepresentativeLastname=Last name of sales representative
 ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
 NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/ko_KR/compta.lang b/htdocs/langs/ko_KR/compta.lang
index 8c1d5ab375d..dd86d8177cc 100644
--- a/htdocs/langs/ko_KR/compta.lang
+++ b/htdocs/langs/ko_KR/compta.lang
@@ -65,6 +65,7 @@ PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=VAT payment
 ListPayment=List of payments
 ListOfCustomerPayments=List of customer payments
+ListOfSupplierPayments=List of supplier payments
 DateStartPeriod=Date start period
 DateEndPeriod=Date end period
 newLT1Payment=New tax 2 payment
@@ -81,7 +82,7 @@ LT2PaymentES=IRPF Payment
 LT2PaymentsES=IRPF Payments
 VATPayment=Sales tax payment
 VATPayments=Sales tax payments
-VATRefund=Sales tax refund Refund
+VATRefund=Sales tax refund
 Refund=Refund
 SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Show VAT payment
@@ -194,7 +195,7 @@ CloneTax=Clone a social/fiscal tax
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
 CloneTaxForNextMonth=Clone it for next month
 SimpleReport=Simple report
-AddExtraReport=Extra reports
+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
diff --git a/htdocs/langs/ko_KR/cron.lang b/htdocs/langs/ko_KR/cron.lang
index cb68b31c80f..b1e8bcb36d2 100644
--- a/htdocs/langs/ko_KR/cron.lang
+++ b/htdocs/langs/ko_KR/cron.lang
@@ -17,14 +17,14 @@ CronMethodDoesNotExists=Class %s does not contains any method %s
 # Menu
 EnabledAndDisabled=Enabled and disabled
 # Page list
-CronLastOutput=Last run output
-CronLastResult=Last result code
+CronLastOutput=Latest run output
+CronLastResult=Latest result code
 CronCommand=Command
 CronList=Scheduled jobs
 CronDelete=Delete scheduled jobs
-CronConfirmDelete=Are you sure you want to delete these scheduled jobs ?
+CronConfirmDelete=Are you sure you want to delete these scheduled jobs?
 CronExecute=Launch scheduled job
-CronConfirmExecute=Are you sure you want to execute these scheduled jobs now ?
+CronConfirmExecute=Are you sure you want to execute these scheduled jobs now?
 CronInfo=Scheduled job module allow to execute job that have been planned
 CronTask=Job
 CronNone=None
diff --git a/htdocs/langs/ko_KR/errors.lang b/htdocs/langs/ko_KR/errors.lang
index f935ce72d41..9e2eb6817ef 100644
--- a/htdocs/langs/ko_KR/errors.lang
+++ b/htdocs/langs/ko_KR/errors.lang
@@ -11,6 +11,7 @@ ErrorLoginAlreadyExists=Login %s already exists.
 ErrorGroupAlreadyExists=Group %s already exists.
 ErrorRecordNotFound=Record not found.
 ErrorFailToCopyFile=Failed to copy file '<b>%s</b>' into '<b>%s</b>'.
+ErrorFailToCopyDir=Failed to copy directory '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToRenameFile=Failed to rename file '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToDeleteFile=Failed to remove file '<b>%s</b>'.
 ErrorFailToCreateFile=Failed to create file '<b>%s</b>'.
@@ -115,7 +116,7 @@ ErrorNoActivatedBarcode=No barcode type activated
 ErrUnzipFails=Failed to unzip %s with ZipArchive
 ErrNoZipEngine=No engine to unzip %s file in this PHP
 ErrorFileMustBeADolibarrPackage=The file %s must be a Dolibarr zip package
-ErrorFileRequired=It takes a package Dolibarr file
+ErrorModuleFileRequired=You must select a Dolibarr module package file
 ErrorPhpCurlNotInstalled=The PHP CURL is not installed, this is essential to talk with 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
@@ -170,14 +171,19 @@ ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
 ErrorFileMustHaveFormat=File must have format %s
 ErrorSupplierCountryIsNotDefined=Country for this supplier is not defined. Correct this first.
 ErrorsThirdpartyMerge=Failed to merge the two records. Request canceled.
-ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enougth for product %s to add it into a new order.
-ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enougth for product %s to add it into a new invoice.
-ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enougth for product %s to add it into a new shipment.
-ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enougth for product %s to add it into a new proposal.
-ErrorFailedToLoadLoginFileForMode=Failed to get the login file for mode '%s'.
+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 bank 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>
 
 # 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.
diff --git a/htdocs/langs/ko_KR/holiday.lang b/htdocs/langs/ko_KR/holiday.lang
index a95da81eaaa..50d97c0d8cc 100644
--- a/htdocs/langs/ko_KR/holiday.lang
+++ b/htdocs/langs/ko_KR/holiday.lang
@@ -76,8 +76,9 @@ BoxTitleLastLeaveRequests=Latest %s modified leave requests
 HolidaysMonthlyUpdate=Monthly update
 ManualUpdate=Manual update
 HolidaysCancelation=Leave request cancelation
-EmployeeLastname=Employee lastname
-EmployeeFirstname=Employee firstname
+EmployeeLastname=Employee last name
+EmployeeFirstname=Employee first name
+TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
 
 ## Configuration du Module ##
 LastUpdateCP=Latest automatic update of leaves allocation
diff --git a/htdocs/langs/ko_KR/ldap.lang b/htdocs/langs/ko_KR/ldap.lang
index a17019d00fb..42e699de311 100644
--- a/htdocs/langs/ko_KR/ldap.lang
+++ b/htdocs/langs/ko_KR/ldap.lang
@@ -13,8 +13,8 @@ LDAPUsers=Users in LDAP database
 LDAPFieldStatus=Status
 LDAPFieldFirstSubscriptionDate=First subscription date
 LDAPFieldFirstSubscriptionAmount=First subscription amount
-LDAPFieldLastSubscriptionDate=Last subscription date
-LDAPFieldLastSubscriptionAmount=Last subscription amount
+LDAPFieldLastSubscriptionDate=Latest subscription date
+LDAPFieldLastSubscriptionAmount=Latest subscription amount
 LDAPFieldSkype=Skype id
 LDAPFieldSkypeExample=Example : skypeName
 UserSynchronized=User synchronized
diff --git a/htdocs/langs/ko_KR/mails.lang b/htdocs/langs/ko_KR/mails.lang
index b7ad0a97ae0..dcb8c0f38fd 100644
--- a/htdocs/langs/ko_KR/mails.lang
+++ b/htdocs/langs/ko_KR/mails.lang
@@ -35,7 +35,7 @@ MailingStatusSentPartialy=Sent partialy
 MailingStatusSentCompletely=Sent completely
 MailingStatusError=오류
 MailingStatusNotSent=Not sent
-MailSuccessfulySent=Email successfully sent (from %s to %s)
+MailSuccessfulySent=Email successfully accepted for delivery (from %s to %s)
 MailingSuccessfullyValidated=EMailing successfully validated
 MailUnsubcribe=Unsubscribe
 MailingStatusNotContact=Don't contact anymore
@@ -74,22 +74,28 @@ ResultOfMailSending=Result of mass EMail sending
 NbSelected=Nb selected
 NbIgnored=Nb ignored
 NbSent=Nb 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
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Line %s in file
 RecipientSelectionModules=Defined requests for recipient's selection
 MailSelectedRecipients=Selected recipients
 MailingArea=EMailings area
-LastMailings=Last %s emailings
+LastMailings=Latest %s emailings
 TargetsStatistics=Targets statistics
 NbOfCompaniesContacts=Unique contacts/addresses
 MailNoChangePossible=Recipients for validated emailing can't be changed
 SearchAMailing=Search mailing
 SendMailing=Send emailing
 SendMail=Send email
-MailingNeedCommand=For security reason, sending an emailing is better when performed from command line. If you have one, ask your server administrator to launch the following command to send the emailing to all recipients:
+SentBy=Sent by
+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=You can however send them online by adding parameter MAILING_LIMIT_SENDBYWEB with value of max number of emails you want to send by session. For this, go on Home - Setup - Other.
-ConfirmSendingEmailing=If you can't or prefer sending them with your www browser, please confirm you are sure you want to send emailing now from your browser?
+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.
 TargetsReset=Clear list
 ToClearAllRecipientsClickHere=Click here to clear the recipient list for this emailing
@@ -144,3 +150,6 @@ AdvTgtCreateFilter=Create filter
 AdvTgtOrCreateNewFilter=Name of new filter
 NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
+OutGoingEmailSetup=Outgoing email setup
+InGoingEmailSetup=Incoming email setup
+
diff --git a/htdocs/langs/ko_KR/main.lang b/htdocs/langs/ko_KR/main.lang
index b021f2c09d9..f0ab5c86072 100644
--- a/htdocs/langs/ko_KR/main.lang
+++ b/htdocs/langs/ko_KR/main.lang
@@ -63,11 +63,13 @@ ErrorNoVATRateDefinedForSellerCountry=오류, '%s' 국가의 부가세율이 정
 ErrorNoSocialContributionForSellerCountry=Error, no social/fiscal taxes type defined for country '%s'.
 ErrorFailedToSaveFile=오류, 파일을 저장할 수 없습니다.
 ErrorCannotAddThisParentWarehouse=You are trying to add a parent warehouse which is already a child of current one
+MaxNbOfRecordPerPage=Max nb of record per page
 NotAuthorized=You are not authorized to do that.
 SetDate=Set date
 SelectDate=Select a date
 SeeAlso=또한 %s
 SeeHere=See here
+Apply=Apply
 BackgroundColorByDefault=기본 배경
 FileRenamed=The file was successfully renamed
 FileUploaded=The file was successfully uploaded
@@ -86,7 +88,7 @@ Undefined=지정되지 않음
 PasswordForgotten=Password forgotten?
 SeeAbove=상위 보기
 HomeArea=Home area
-LastConnexion=Last connection
+LastConnexion=Latest connection
 PreviousConnexion=Previous connection
 PreviousValue=Previous value
 ConnectedOnMultiCompany=Connected on environment
@@ -236,7 +238,7 @@ DateCreation=Creation date
 DateCreationShort=Creat. date
 DateModification=Modification date
 DateModificationShort=Modif. date
-DateLastModification=Last modification date
+DateLastModification=Latest modification date
 DateValidation=Validation date
 DateClosing=Closing date
 DateDue=Due date
@@ -432,7 +434,7 @@ Reportings=Reporting
 Draft=Draft
 Drafts=Drafts
 Validated=Validated
-Opened=Open
+Opened=Opened
 New=New
 Discount=할인
 Unknown=알 수 없음
@@ -460,6 +462,7 @@ DeletePicture=Picture delete
 ConfirmDeletePicture=Confirm picture deletion?
 Login=Login
 CurrentLogin=Current login
+EnterLoginDetail=Enter login details
 January=January
 February=February
 March=March
@@ -597,6 +600,8 @@ SessionName=Session name
 Method=Method
 Receive=Receive
 CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
+ExpectedValue=Expected Value
+CurrentValue=Current value
 PartialWoman=Partial
 TotalWoman=Total
 NeverReceived=Never received
@@ -753,6 +758,8 @@ RemoveString=Remove string '%s'
 SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
 DirectDownloadLink=Direct download link
 Download=Download
+ActualizeCurrency=Update currency rate
+Fiscalyear=Fiscal year
 # Week day
 Monday=월요일
 Tuesday=화요일
@@ -787,8 +794,8 @@ SetRef=Set ref
 Select2ResultFoundUseArrows=Some results found. Use arrows to select.
 Select2NotFound=No result found
 Select2Enter=Enter
-Select2MoreCharacter=or more character
-Select2MoreCharacters=or more characters
+Select2MoreCharacter=or more characters<br /><br /><strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
+Select2MoreCharacters=or more characters<br /><br /><strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
 Select2LoadingMoreResults=Loading more results...
 Select2SearchInProgress=Search in progress...
 SearchIntoThirdparties=Thirdparties
@@ -809,3 +816,5 @@ SearchIntoContracts=Contracts
 SearchIntoCustomerShipments=Customer shipments
 SearchIntoExpenseReports=Expense reports
 SearchIntoLeaves=Leaves
+
+BulkActions=Bulk actions
diff --git a/htdocs/langs/ko_KR/members.lang b/htdocs/langs/ko_KR/members.lang
index df911af6f71..8f6f76ba48f 100644
--- a/htdocs/langs/ko_KR/members.lang
+++ b/htdocs/langs/ko_KR/members.lang
@@ -45,7 +45,7 @@ MemberStatusDraft=Draft (needs to be validated)
 MemberStatusDraftShort=Draft
 MemberStatusActive=Validated (waiting subscription)
 MemberStatusActiveShort=Validated
-MemberStatusActiveLate=subscription expired
+MemberStatusActiveLate=Subscription expired
 MemberStatusActiveLateShort=Expired
 MemberStatusPaid=Subscription up to date
 MemberStatusPaidShort=Up to date
@@ -136,8 +136,8 @@ DocForAllMembersCards=Generate business cards for all members
 DocForOneMemberCards=Generate business cards for a particular member
 DocForLabels=Generate address sheets
 SubscriptionPayment=Subscription payment
-LastSubscriptionDate=Last subscription date
-LastSubscriptionAmount=Last subscription amount
+LastSubscriptionDate=Latest subscription date
+LastSubscriptionAmount=Latest subscription amount
 MembersStatisticsByCountries=Members statistics by country
 MembersStatisticsByState=Members statistics by state/province
 MembersStatisticsByTown=Members statistics by town
@@ -149,7 +149,7 @@ MembersByStateDesc=This screen show you statistics on members by state/provinces
 MembersByTownDesc=This screen show you statistics on members by town.
 MembersStatisticsDesc=Choose statistics you want to read...
 MenuMembersStats=Statistics
-LastMemberDate=Last member date
+LastMemberDate=Latest member date
 Nature=Nature
 Public=Information are public
 NewMemberbyWeb=New member added. Awaiting approval
diff --git a/htdocs/langs/ko_KR/orders.lang b/htdocs/langs/ko_KR/orders.lang
index 9d2e53e4fe2..331e3b49d3e 100644
--- a/htdocs/langs/ko_KR/orders.lang
+++ b/htdocs/langs/ko_KR/orders.lang
@@ -39,7 +39,7 @@ StatusOrderRefusedShort=Refused
 StatusOrderBilledShort=Billed
 StatusOrderToProcessShort=To process
 StatusOrderReceivedPartiallyShort=Partially received
-StatusOrderReceivedAllShort=Everything received
+StatusOrderReceivedAllShort=Products received
 StatusOrderCanceled=Canceled
 StatusOrderDraft=Draft (needs to be validated)
 StatusOrderValidated=Validated
@@ -51,7 +51,7 @@ StatusOrderApproved=Approved
 StatusOrderRefused=Refused
 StatusOrderBilled=Billed
 StatusOrderReceivedPartially=Partially received
-StatusOrderReceivedAll=Everything received
+StatusOrderReceivedAll=All products received
 ShippingExist=A shipment exists
 QtyOrdered=Qty ordered
 ProductQtyInDraft=Product quantity into draft orders
diff --git a/htdocs/langs/ko_KR/other.lang b/htdocs/langs/ko_KR/other.lang
index 1ea1f9da1db..ab937ff3bab 100644
--- a/htdocs/langs/ko_KR/other.lang
+++ b/htdocs/langs/ko_KR/other.lang
@@ -2,6 +2,7 @@
 SecurityCode=Security code
 NumberingShort=N°
 Tools=Tools
+TMenuTools=Tools
 ToolsDesc=All miscellaneous tools not included in other menu entries are collected here.<br /><br />All the tools can be reached in the left menu.
 Birthday=Birthday
 BirthdayDate=Birthday date
@@ -67,14 +68,15 @@ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find her
 PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nYou will find here the shipping __SHIPPINGREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nYou will find here the intervention __FICHINTERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n__PERSONALIZED__\n\n__SIGNATURE__
-DemoDesc=Dolibarr is a compact ERP/CRM supporting several functional modules. A demo showcasing all modules makes no sense as this scenario never occurs. So, several demo profiles are available.
+DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
+ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
 DemoFundation=Manage members of a foundation
 DemoFundation2=Manage members and bank account of a foundation
-DemoCompanyServiceOnly=Manage a freelance activity selling service only
+DemoCompanyServiceOnly=Company or freelance selling service only
 DemoCompanyShopWithCashDesk=Manage a shop with a cash desk
-DemoCompanyProductAndStocks=Manage a small or medium company selling products
-DemoCompanyAll=Manage a small or medium company with multiple activities (all main modules)
+DemoCompanyProductAndStocks=Company selling products with a shop
+DemoCompanyAll=Company with multiple activities (all main modules)
 CreatedBy=Created by %s
 ModifiedBy=Modified by %s
 ValidatedBy=Validated by %s
diff --git a/htdocs/langs/ko_KR/products.lang b/htdocs/langs/ko_KR/products.lang
index 20440eb611b..3a412a5789c 100644
--- a/htdocs/langs/ko_KR/products.lang
+++ b/htdocs/langs/ko_KR/products.lang
@@ -5,6 +5,8 @@ ProductLabelTranslated=Translated product label
 ProductDescriptionTranslated=Translated product description
 ProductNoteTranslated=Translated product note
 ProductServiceCard=Products/Services card
+TMenuProducts=Products
+TMenuServices=Services
 Products=Products
 Services=Services
 Product=Product
@@ -58,7 +60,7 @@ SellingPrice=Selling price
 SellingPriceHT=Selling price (net of tax)
 SellingPriceTTC=Selling price (inc. tax)
 CostPriceDescription=This price (net of tax) can be used to store the average amount this product cost to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
-CostPriceUsage=In a future version, this value could be used for margin calculation.
+CostPriceUsage=This value could be used for margin calculation.
 SoldAmount=Sold amount
 PurchasedAmount=Purchased amount
 NewPrice=New price
@@ -140,6 +142,7 @@ ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b>?
 CloneContentProduct=Clone all main informations of product/service
 ClonePricesProduct=Clone main informations and prices
 CloneCompositionProduct=Clone packaged product/service
+CloneCombinationsProduct=Clone product variants
 ProductIsUsed=This product is used
 NewRefForClone=Ref. of new product/service
 SellingPrices=Selling prices
@@ -236,7 +239,7 @@ GlobalVariables=Global variables
 VariableToUpdate=Variable to update
 GlobalVariableUpdaters=Global variable updaters
 UpdateInterval=Update interval (minutes)
-LastUpdated=Last updated
+LastUpdated=Latest update
 CorrectlyUpdated=Correctly updated
 PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
 PropalMergePdfProductChooseFile=Select PDF files
@@ -256,4 +259,41 @@ VolumeUnits=Volume unit
 SizeUnits=Size unit
 DeleteProductBuyPrice=Delete buying price
 ConfirmDeleteProductBuyPrice=Are you sure you want to delete this buying price?
+SubProduct=Sub product
 
+#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
+ProductCombinations=Variants
+HideProductCombinations=Hide products variant in the products selector
+ProductCombination=Variant
+NewProductCombination=New variant
+EditProductCombination=Editing variant
+ProductCombinationGenerator=Variants generator
+Features=Features
+PriceImpact=Price impact
+WeightImpact=Weight impact
+NewProductAttribute=New attribute
+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
+PercentageVariation=Percentage variation
+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 child products
+ConfirmCloneProductCombinations=Would you like to copy all the product variant to the 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
diff --git a/htdocs/langs/ko_KR/projects.lang b/htdocs/langs/ko_KR/projects.lang
index ecf61d17d36..f9c603ce113 100644
--- a/htdocs/langs/ko_KR/projects.lang
+++ b/htdocs/langs/ko_KR/projects.lang
@@ -29,9 +29,9 @@ DeleteAProject=Delete a project
 DeleteATask=Delete a task
 ConfirmDeleteAProject=Are you sure you want to delete this project?
 ConfirmDeleteATask=Are you sure you want to delete this task?
-OpenedProjects=Open projects
-OpenedTasks=Open tasks
-OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
+OpenedProjects=Opened projects
+OpenedTasks=Opened tasks
+OpportunitiesStatusForOpenedProjects=Opportunities amount of opened projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=Show project
 SetProject=Set project
@@ -47,7 +47,7 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
 TaskTimeDate=Date
-TasksOnOpenedProject=Tasks on open projects
+TasksOnOpenedProject=Tasks on opened projects
 WorkloadNotDefined=Workload not defined
 NewTimeSpent=New time spent
 MyTimeSpent=My time spent
@@ -58,6 +58,7 @@ TaskDateEnd=Task end date
 TaskDescription=Task description
 NewTask=New task
 AddTask=Create task
+AddTimeSpent=Create time spent
 Activity=Activity
 Activities=Tasks/activities
 MyActivities=My tasks/activities
@@ -95,6 +96,7 @@ ValidateProject=Validate projet
 ConfirmValidateProject=Are you sure you want to validate this project?
 CloseAProject=Close project
 ConfirmCloseAProject=Are you sure you want to close this project?
+AlsoCloseAProject=Also close project (keep it open if you still need to follow production tasks on it)
 ReOpenAProject=Open project
 ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=Project contacts
@@ -120,7 +122,7 @@ CloneProjectFiles=Clone project joined files
 CloneTaskFiles=Clone task(s) joined files (if task(s) cloned)
 CloneMoveDate=Update project/tasks dates from now?
 ConfirmCloneProject=Are you sure to clone this project?
-ProjectReportDate=Change task date according project start date
+ProjectReportDate=Change task dates according to new project start date
 ErrorShiftTaskDate=Impossible to shift task date according to new project start date
 ProjectsAndTasksLines=Projects and tasks
 ProjectCreatedInDolibarr=Project %s created
@@ -177,9 +179,9 @@ ProjectsStatistics=Statistics on projects/leads
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 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.
-OpenedProjectsByThirdparties=Open projects by thirdparties
+OpenedProjectsByThirdparties=Opened projects by thirdparties
 OnlyOpportunitiesShort=Only opportunities
-OpenedOpportunitiesShort=Open opportunities
+OpenedOpportunitiesShort=Opened opportunities
 NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount
diff --git a/htdocs/langs/ko_KR/propal.lang b/htdocs/langs/ko_KR/propal.lang
index 52260fe2b4e..a14d25ce779 100644
--- a/htdocs/langs/ko_KR/propal.lang
+++ b/htdocs/langs/ko_KR/propal.lang
@@ -3,7 +3,7 @@ Proposals=Commercial proposals
 Proposal=Commercial proposal
 ProposalShort=Proposal
 ProposalsDraft=Draft commercial proposals
-ProposalsOpened=Open commercial proposals
+ProposalsOpened=Opened commercial proposals
 Prop=Commercial proposals
 CommercialProposal=Commercial proposal
 ProposalCard=Proposal card
@@ -26,9 +26,9 @@ AmountOfProposalsByMonthHT=Amount by month (net of tax)
 NbOfProposals=Number of commercial proposals
 ShowPropal=Show proposal
 PropalsDraft=Drafts
-PropalsOpened=Open
+PropalsOpened=Opened
 PropalStatusDraft=Draft (needs to be validated)
-PropalStatusValidated=Validated (proposal is open)
+PropalStatusValidated=Validated (proposal is opened)
 PropalStatusSigned=Signed (needs billing)
 PropalStatusNotSigned=Not signed (closed)
 PropalStatusBilled=Billed
diff --git a/htdocs/langs/ko_KR/stocks.lang b/htdocs/langs/ko_KR/stocks.lang
index 3a3e8e46e1a..49f97e37bfc 100644
--- a/htdocs/langs/ko_KR/stocks.lang
+++ b/htdocs/langs/ko_KR/stocks.lang
@@ -22,13 +22,15 @@ Movements=Movements
 ErrorWarehouseRefRequired=Warehouse reference name is required
 ListOfWarehouses=List of warehouses
 ListOfStockMovements=List of stock movements
+StockMovementForId=Movement ID %d
+ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Warehouses area
 Location=위치
 LocationSummary=Short name location
 NumberOfDifferentProducts=Number of different products
 NumberOfProducts=Total number of products
-LastMovement=Last movement
-LastMovements=Last movements
+LastMovement=Latest movement
+LastMovements=Latest movements
 Units=Units
 Unit=Unit
 StockCorrection=Correct stock
@@ -140,3 +142,4 @@ ProductStockWarehouseCreated=Stock limit for alert and desired optimal stock cor
 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
diff --git a/htdocs/langs/ko_KR/supplier_proposal.lang b/htdocs/langs/ko_KR/supplier_proposal.lang
index 621d7784e35..61b031459b0 100644
--- a/htdocs/langs/ko_KR/supplier_proposal.lang
+++ b/htdocs/langs/ko_KR/supplier_proposal.lang
@@ -8,7 +8,7 @@ SearchRequest=Find a request
 DraftRequests=Draft requests
 SupplierProposalsDraft=Draft supplier proposals
 LastModifiedRequests=Latest %s modified price requests
-RequestsOpened=Open price requests
+RequestsOpened=Opened price requests
 SupplierProposalArea=Supplier proposals area
 SupplierProposalShort=Supplier proposal
 SupplierProposals=Supplier proposals
@@ -23,7 +23,7 @@ ConfirmValidateAsk=Are you sure you want to validate this price request under na
 DeleteAsk=Delete request
 ValidateAsk=Validate request
 SupplierProposalStatusDraft=Draft (needs to be validated)
-SupplierProposalStatusValidated=Validated (request is open)
+SupplierProposalStatusValidated=Validated (request is opened)
 SupplierProposalStatusClosed=Closed
 SupplierProposalStatusSigned=Accepted
 SupplierProposalStatusNotSigned=Refused
diff --git a/htdocs/langs/ko_KR/suppliers.lang b/htdocs/langs/ko_KR/suppliers.lang
index 766e4a9bfe9..b890919ace5 100644
--- a/htdocs/langs/ko_KR/suppliers.lang
+++ b/htdocs/langs/ko_KR/suppliers.lang
@@ -24,10 +24,10 @@ ExportDataset_fournisseur_1=Supplier invoices list and invoice lines
 ExportDataset_fournisseur_2=Supplier invoices and payments
 ExportDataset_fournisseur_3=Supplier orders and order lines
 ApproveThisOrder=Approve this order
-ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b> ?
+ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b>?
 DenyingThisOrder=Deny this order
-ConfirmDenyingThisOrder=Are you sure you want to deny this order <b>%s</b> ?
-ConfirmCancelThisOrder=Are you sure you want to cancel this order <b>%s</b> ?
+ConfirmDenyingThisOrder=Are you sure you want to deny this order <b>%s</b>?
+ConfirmCancelThisOrder=Are you sure you want to cancel this order <b>%s</b>?
 AddSupplierOrder=Create supplier order
 AddSupplierInvoice=Create supplier invoice
 ListOfSupplierProductForSupplier=List of products and prices for supplier <b>%s</b>
@@ -41,3 +41,4 @@ DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Wrong quality
 ReputationForThisProduct=Reputation
 BuyerName=Buyer name
+AllProductServicePrices=All product / service prices
diff --git a/htdocs/langs/ko_KR/users.lang b/htdocs/langs/ko_KR/users.lang
index 01e43fe9c81..66d1968e905 100644
--- a/htdocs/langs/ko_KR/users.lang
+++ b/htdocs/langs/ko_KR/users.lang
@@ -36,7 +36,7 @@ AdministratorDesc=관리자
 DefaultRights=Default permissions
 DefaultRightsDesc=Define here <u>default</u> permissions that are automatically granted to a <u>new created</u> user (Go on user card to change permission of an existing user).
 DolibarrUsers=Dolibarr users
-LastName=Last Name
+LastName=Last name
 FirstName=First name
 ListOfGroups=List of groups
 NewGroup=New group
diff --git a/htdocs/langs/ko_KR/withdrawals.lang b/htdocs/langs/ko_KR/withdrawals.lang
index 6e560a1abb1..a99d890e5f9 100644
--- a/htdocs/langs/ko_KR/withdrawals.lang
+++ b/htdocs/langs/ko_KR/withdrawals.lang
@@ -24,6 +24,7 @@ WithdrawStatistics=Direct debit payment statistics
 WithdrawRejectStatistics=Direct debit payment reject statistics
 LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
+WithdrawRequestsDone=%s direct debit payment requests recorded
 ThirdPartyBankCode=Third party bank code
 NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoice are on companies with a valid BAN.
 ClassCredited=Classify credited
@@ -76,8 +77,8 @@ RUM=UMR
 RUMLong=Unique Mandate Reference
 RUMWillBeGenerated=UMR number will be generated once bank account information are saved
 WithdrawMode=Direct debit mode (FRST or RECUR)
-WithdrawRequestAmount=Withdraw request amount:
-WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil amount.
+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
diff --git a/htdocs/langs/lo_LA/accountancy.lang b/htdocs/langs/lo_LA/accountancy.lang
index 546b8235155..68f9d424d02 100644
--- a/htdocs/langs/lo_LA/accountancy.lang
+++ b/htdocs/langs/lo_LA/accountancy.lang
@@ -194,6 +194,8 @@ ChangeBinding=Change the binding
 
 ## Admin
 ApplyMassCategories=Apply mass categories
+AddAccountFromBookKeepingWithNoCategories=Add acccount already used with no categories
+CategoryDeleted=Category for the accounting account has been removed
 
 ## Export
 Exports=Exports
@@ -209,6 +211,7 @@ Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution
 Modelcsv_quadratus=Export towards Quadratus QuadraCompta
 Modelcsv_ebp=Export towards EBP
 Modelcsv_cogilog=Export towards Cogilog
+ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
 InitAccountancy=Init accountancy
diff --git a/htdocs/langs/lo_LA/admin.lang b/htdocs/langs/lo_LA/admin.lang
index cce3d5e0da0..9a52908f1c6 100644
--- a/htdocs/langs/lo_LA/admin.lang
+++ b/htdocs/langs/lo_LA/admin.lang
@@ -9,14 +9,20 @@ VersionDevelopment=Development
 VersionUnknown=Unknown
 VersionRecommanded=Recommended
 FileCheck=Files integrity checker
-FileCheckDesc=This tool allows you to check the integrity of files of your application, comparing each files with the official ones. You can use this tool to detect if some files were modified by a hacker for example.
+FileCheckDesc=This tool allows you to check the integrity of files and setup of your application, comparing each files with the official ones. 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.
+FileIntegrityIsStrictlyConformedWithReference=Files integrity is strictly conformed with the reference.
+FileIntegrityIsOkButFilesWereAdded=Files integrity check has passed, however some new files were added.
+FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified, removed or added.
+GlobalChecksum=Global checksum
 MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
 LocalSignature=Embedded local signature (less reliable)
 RemoteSignature=Remote distant signature (more reliable)
 FilesMissing=Missing Files
 FilesUpdated=Updated Files
+FilesModified=Modified Files
+FilesAdded=Added Files
 FileCheckDolibarr=Check integrity of application files
-AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from a certified package
+AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from an official package
 XmlNotFound=Xml Integrity File of application not found
 SessionId=Session ID
 SessionSaveHandler=Handler to save sessions
@@ -185,7 +191,9 @@ BoxesDesc=Widgets are components showing some information that you can add to pe
 OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
 ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
-ModulesMarketPlaces=More modules...
+ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
+ModulesMarketPlaces=Find external modules...
+GoModuleSetupArea=To deploy/install a new module, go onto the Module setup area at <a href="%s">%s</a>.
 DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules
 DoliPartnersDesc=List of companies providing custom developed modules or features (Note: anyone experienced in PHP programming can provide custom development for an open source project)
 WebSiteDesc=Reference websites to find more modules...
@@ -276,21 +284,22 @@ ModuleFamilyInterface=Interfaces with external systems
 MenuHandlers=Menu handlers
 MenuAdmin=Menu editor
 DoNotUseInProduction=Do not use in production
-ThisIsProcessToFollow=This is setup to process:
-ThisIsAlternativeProcessToFollow=This is an alternative setup to process:
+ThisIsProcessToFollow=This is steps to process:
+ThisIsAlternativeProcessToFollow=This is an alternative setup to process manually:
 StepNb=Step %s
 FindPackageFromWebSite=Find a package that provides feature you want (for example on official web site %s).
 DownloadPackageFromWebSite=Download package (for example from official web site %s).
-UnpackPackageInDolibarrRoot=Unpack package file into Dolibarr server directory dedicated to external modules: <b>%s</b>
-SetupIsReadyForUse=Install is finished and Dolibarr is ready to use with this new component.
-NotExistsDirect=The alternative root directory is not defined.<br>
-InfDirAlt=Since version 3 it is possible to define an alternative root directory.This allows you to store, same place, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
-InfDirExample=<br>Then declare it in the file conf.php<br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>*These lines are commented with "#", to uncomment only remove the character.
+UnpackPackageInDolibarrRoot=Unpack the packaged files into server directory dedicated to Dolibarr: <b>%s</b>
+UnpackPackageInModulesRoot=To deploy/install an external module, unpack the packaged files into the server directory dedicated to modules: <b>%s</b>
+SetupIsReadyForUse=Module deployment is finished. You must however enable and setup the module in your application by going on the page to setup modules: <a href="%s">%s</a>.
+NotExistsDirect=The alternative root directory is not defined to an existing directory.<br>
+InfDirAlt=Since version 3, it is possible to define an alternative root directory. This allows you to store, into a dedicated directory, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
+InfDirExample=<br>Then declare it in the file <strong>conf.php</strong><br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>If these lines are commented with "#", to enable them, just uncomment by removing the "#" character.
 YouCanSubmitFile=For this step, you can send package using this tool: Select module file
 CurrentVersion=Dolibarr current version
 CallUpdatePage=Go to the page that updates the database structure and data: %s.
 LastStableVersion=Latest stable version
-LastActivationDate=Last activation date
+LastActivationDate=Latest activation date
 UpdateServerOffline=Update server offline
 GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s. <br><b>{000000@x}</b> same as previous but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
 GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
@@ -373,11 +382,11 @@ ExtrafieldCheckBox=Checkbox
 ExtrafieldRadio=Radio button
 ExtrafieldCheckBoxFromList= Checkbox from table
 ExtrafieldLink=Link to an object
-ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>In order to have the list depending on another :<br>1,value1|parent_list_code:parent_key<br>2,value2|parent_list_code:parent_key
+ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list :<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list :<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
-ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
+ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Example : Societe:societe/class/societe.class.php
 LibraryToBuildPDF=Library used for PDF generation
 WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
@@ -411,10 +420,11 @@ ModuleCompanyCodePanicum=Return an empty accountancy code.
 ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party code.
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
-
+WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<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).
+ClickToShowDescription=Click to show description
 # Modules
 Module0Name=Users & groups
-Module0Desc=Users and groups management
+Module0Desc=Users / Employees and Groups management
 Module1Name=Third parties
 Module1Desc=Companies and contact management (customers, prospects...)
 Module2Name=Commercial
@@ -515,8 +525,8 @@ Module2200Name=Dynamic Prices
 Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
 Module2300Desc=Scheduled job management
-Module2400Name=Agenda/Events
-Module2400Desc=Follow events or rendez-vous. Record manual events into Agendas or let application logs automatic events for tracking purposes.
+Module2400Name=Events/Agenda
+Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous.
 Module2500Name=Electronic Content Management
 Module2500Desc=Save and share documents
 Module2600Name=API/Web services (SOAP server)
@@ -582,7 +592,7 @@ Permission34=Delete products
 Permission36=See/manage hidden products
 Permission38=Export products
 Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
-Permission42=Create/modify projects (shared project and projects i'm contact for)
+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)
 Permission45=Export projects
 Permission61=Read interventions
@@ -685,7 +695,7 @@ PermissionAdvanced253=Create/modify internal/external users and permissions
 Permission254=Create/modify external users only
 Permission255=Modify other users password
 Permission256=Delete or disable other users
-Permission262=Extend access to all third parties (not only those linked to user). Not effective for external users (always limited to themselves).
+Permission262=Extend access to all third parties (not only third parties that user is a sale representative).<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 assignement matters).
 Permission271=Read CA
 Permission272=Read invoices
 Permission273=Issue invoices
@@ -887,7 +897,7 @@ Offset=Offset
 AlwaysActive=Always active
 Upgrade=Upgrade
 MenuUpgrade=Upgrade / Extend
-AddExtensionThemeModuleOrOther=Add extension (theme, module, ...)
+AddExtensionThemeModuleOrOther=Deploy/install external module
 WebServer=Web server
 DocumentRootServer=Web server's root directory
 DataRootServer=Data files directory
@@ -994,7 +1004,7 @@ TriggerAlwaysActive=Triggers in this file are always active, whatever are the ac
 TriggerActiveAsModuleActive=Triggers in this file are active as module <b>%s</b> is enabled.
 GeneratedPasswordDesc=Define here which rule you want to use to generate new password if you ask to have auto generated password
 DictionaryDesc=Insert all reference data. You can add your values to the default.
-ConstDesc=This page allows you to edit all other parameters not available in previous pages. These are mostly reserved parameters for developers or advanced troubleshooting.
+ConstDesc=This page allows you to edit all other parameters not available in previous pages. These are mostly reserved parameters for developers or advanced troubleshooting. For a list of options <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">check here</a>.
 MiscellaneousDesc=All other security related parameters are defined here.
 LimitsSetup=Limits/Precision setup
 LimitsDesc=You can define limits, precisions and optimisations used by Dolibarr here
@@ -1161,10 +1171,6 @@ FreeLegalTextOnOrders=Free text on orders
 WatermarkOnDraftOrders=Watermark on draft orders (none if empty)
 ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable
 BANK_ASK_PAYMENT_BANK_DURING_ORDER=Ask for bank account destination of order
-##### Clicktodial #####
-ClickToDialSetup=Click To Dial module setup
-ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with your clicktodial login (defined on your user card)<br><b>__PASS__</b> that will be replaced with your clicktodial password (defined on your user card).
-##### Bookmark4u #####
 ##### Interventions #####
 InterventionsSetup=Interventions module setup
 FreeLegalTextOnInterventions=Free text on intervention documents
@@ -1391,7 +1397,7 @@ SendingsSetup=Sending module setup
 SendingsReceiptModel=Sending receipt model
 SendingsNumberingModules=Sendings numbering modules
 SendingsAbility=Support shipping sheets for customer deliveries
-NoNeedForDeliveryReceipts=In most cases, sendings receipts are used both as sheets for customer deliveries (list of products to send) and sheets that is recevied and signed by customer. So product deliveries receipts is a duplicated feature and is rarely activated.
+NoNeedForDeliveryReceipts=In most cases, shipping sheets are used both as sheets for customer deliveries (list of products to send) and sheets that is received and signed by customer. So product deliveries receipts is a duplicated feature and is rarely activated.
 FreeLegalTextOnShippings=Free text on shipments
 ##### Deliveries #####
 DeliveryOrderNumberingModules=Products deliveries receipt numbering module
@@ -1471,7 +1477,11 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Set automatically this default value for type of e
 AGENDA_DEFAULT_FILTER_TYPE=Set automatically this type of event into search filter of agenda view
 AGENDA_DEFAULT_FILTER_STATUS=Set automatically this status for events into search filter of agenda view
 AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
-##### ClickToDial #####
+AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
+AGENDA_NOTIFICATION_SOUND=Enable sound notification
+##### Clicktodial #####
+ClickToDialSetup=Click To Dial module setup
+ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with your clicktodial login (defined on your user card)<br><b>__PASS__</b> that will be replaced with your clicktodial password (defined on your user card).
 ClickToDialDesc=This module allows to make phone numbers clickable. A click on this icon will call make your phone to 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.
 ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
 ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on same computer than the browser, and called when you click on a link in your browser that start 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.
@@ -1499,10 +1509,11 @@ EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint availa
 ##### API ####
 ApiSetup=API module setup
 ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
-ApiProductionMode=Enable production mode (this will activate use of a caches for services management)
+ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
 ApiExporerIs=You can explore the APIs at url
 OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
 ApiKey=Key for API
+WarningAPIExplorerDisabled=The API explorer has been disabled. API explorer is not required to provide API services. It is a tool for developer to find/test REST APIs. If you need this tool, go into setup of module API REST to activate it.
 ##### Bank #####
 BankSetupModule=Bank module setup
 FreeLegalTextOnChequeReceipts=Free text on cheque receipts
@@ -1571,7 +1582,7 @@ BackupDumpWizard=Wizard to build database backup dump file
 SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
 SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is only manual steps a privileged user can do.
 InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
-ConfFileMuseContainCustom=Installing an external module from application save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to have option<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
+ConfFileMuseContainCustom=Installing an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
 HighlightLinesColor=Highlight color of the line when the mouse passes over (keep empty for no highlight)
 TextTitleColor=Color of page title
@@ -1601,6 +1612,7 @@ FixTZ=TimeZone fix
 FillFixTZOnlyIfRequired=Example: +2 (fill only if problem experienced)
 ExpectedChecksum=Expected Checksum
 CurrentChecksum=Current Checksum
+ForcedConstants=Required constant values
 MailToSendProposal=To send customer proposal
 MailToSendOrder=To send customer order
 MailToSendInvoice=To send customer invoice
@@ -1609,13 +1621,14 @@ MailToSendIntervention=To send intervention
 MailToSendSupplierRequestForQuotation=To send quotation request to supplier
 MailToSendSupplierOrder=To send supplier order
 MailToSendSupplierInvoice=To send supplier invoice
+MailToSendContract=To send a contract
 MailToThirdparty=To send email from third party page
 ByDefaultInList=Show by default on list view
-YouUseLastStableVersion=You use the last stable version
+YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
 TitleExampleForMaintenanceRelease=Example of message you can use to announce this maintenance release (feel free to use it on your web sites)
-ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. You can download it from the download area of http://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.
-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, nor data structure change is present into this version. You can download it from the download area of http://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.
+ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. 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.
+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, nor data structure change is present into 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, you can enter here rule to have price for each level autocalculated according to price of first level, so you will have to enter only price for first level on each product. This page is here to save you time and can be usefull only if your prices for each leve are relative to first level. You can ignore this page in most cases.
 ModelModulesProduct=Templates for product documents
 ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
diff --git a/htdocs/langs/lo_LA/banks.lang b/htdocs/langs/lo_LA/banks.lang
index 6feb3143bee..78cb6164f2a 100644
--- a/htdocs/langs/lo_LA/banks.lang
+++ b/htdocs/langs/lo_LA/banks.lang
@@ -74,13 +74,13 @@ Conciliate=Reconcile
 Conciliation=Reconciliation
 ReconciliationLate=Reconciliation late
 IncludeClosedAccount=Include closed accounts
-OnlyOpenedAccount=Only open accounts
+OnlyOpenedAccount=Only opened accounts
 AccountToCredit=Account to credit
 AccountToDebit=Account to debit
 DisableConciliation=Disable reconciliation feature for this account
 ConciliationDisabled=Reconciliation feature disabled
 LinkedToAConciliatedTransaction=Linked to a conciliated entry
-StatusAccountOpened=Open
+StatusAccountOpened=Opened
 StatusAccountClosed=Closed
 AccountIdShort=Number
 LineRecord=Transaction
diff --git a/htdocs/langs/lo_LA/bills.lang b/htdocs/langs/lo_LA/bills.lang
index bf3b48a37e9..5fb3b6169da 100644
--- a/htdocs/langs/lo_LA/bills.lang
+++ b/htdocs/langs/lo_LA/bills.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - bills
 Bill=Invoice
 Bills=Invoices
-BillsCustomers=Customers invoices
-BillsCustomer=Customers invoice
-BillsSuppliers=Suppliers invoices
-BillsCustomersUnpaid=Unpaid customers invoices
-BillsCustomersUnpaidForCompany=Unpaid customer's invoices for %s
-BillsSuppliersUnpaid=Unpaid supplier's invoices
-BillsSuppliersUnpaidForCompany=Unpaid supplier's invoices for %s
+BillsCustomers=Customer invoices
+BillsCustomer=Customer invoice
+BillsSuppliers=Supplier invoices
+BillsCustomersUnpaid=Unpaid customer invoices
+BillsCustomersUnpaidForCompany=Unpaid customer invoices for %s
+BillsSuppliersUnpaid=Unpaid supplier invoices
+BillsSuppliersUnpaidForCompany=Unpaid supplier invoices for %s
 BillsLate=Late payments
 BillsStatistics=Customers invoices statistics
 BillsStatisticsSuppliers=Suppliers invoices statistics
@@ -62,8 +62,8 @@ PaymentsBack=Payments back
 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 credit note or deposit 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.
+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.
 SupplierPayments=Suppliers payments
 ReceivedPayments=Received payments
 ReceivedCustomersPayments=Payments received from customers
@@ -78,6 +78,7 @@ PaymentMode=Payment type
 PaymentTypeDC=Debit/Credit Card
 PaymentTypePP=PayPal
 IdPaymentMode=Payment type (id)
+CodePaymentMode=Payment type (code)
 LabelPaymentMode=Payment type (label)
 PaymentModeShort=Payment type
 PaymentTerm=Payment term
@@ -102,9 +103,10 @@ SearchACustomerInvoice=Search for a customer invoice
 SearchASupplierInvoice=Search for a supplier invoice
 CancelBill=Cancel an invoice
 SendRemindByMail=Send reminder by EMail
-DoPayment=Do payment
-DoPaymentBack=Do payment back
+DoPayment=Enter payment
+DoPaymentBack=Enter refund
 ConvertToReduc=Convert into future discount
+ConvertExcessReceivedToReduc=Convert excess received into future discount
 EnterPaymentReceivedFromCustomer=Enter payment received from customer
 EnterPaymentDueToCustomer=Make payment due to customer
 DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
@@ -113,22 +115,24 @@ BillStatus=Invoice status
 StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Draft (needs to be validated)
 BillStatusPaid=Paid
-BillStatusPaidBackOrConverted=Paid or converted into discount
+BillStatusPaidBackOrConverted=Refund or converted into discount
 BillStatusConverted=Paid (ready for final invoice)
 BillStatusCanceled=Abandoned
 BillStatusValidated=Validated (needs to be paid)
 BillStatusStarted=Started
 BillStatusNotPaid=Not paid
+BillStatusNotRefunded=Not refunded
 BillStatusClosedUnpaid=Closed (unpaid)
 BillStatusClosedPaidPartially=Paid (partially)
 BillShortStatusDraft=Draft
 BillShortStatusPaid=Paid
-BillShortStatusPaidBackOrConverted=Processed
+BillShortStatusPaidBackOrConverted=Refund or converted
 BillShortStatusConverted=Processed
 BillShortStatusCanceled=Abandoned
 BillShortStatusValidated=Validated
 BillShortStatusStarted=Started
 BillShortStatusNotPaid=Not paid
+BillShortStatusNotRefunded=Not refunded
 BillShortStatusClosedUnpaid=Closed
 BillShortStatusClosedPaidPartially=Paid (partially)
 PaymentStatusToValidShort=To validate
@@ -149,14 +153,14 @@ NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified
 FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
 NotARecurringInvoiceTemplate=Not a recurring template invoice
 NewBill=New invoice
-LastBills=Last %s invoices
-LastCustomersBills=Last %s customers invoices
-LastSuppliersBills=Last %s suppliers invoices
+LastBills=Latest %s invoices
+LastCustomersBills=Latest %s customer invoices
+LastSuppliersBills=Latest %s supplier invoices
 AllBills=All invoices
 OtherBills=Other invoices
 DraftBills=Draft invoices
-CustomersDraftInvoices=Customers draft invoices
-SuppliersDraftInvoices=Suppliers draft invoices
+CustomersDraftInvoices=Customer draft invoices
+SuppliersDraftInvoices=Supplier draft invoices
 Unpaid=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>?
@@ -203,7 +207,7 @@ AlreadyPaidNoCreditNotesNoDeposits=Already paid (without credit notes and deposi
 Abandoned=Abandoned
 RemainderToPay=Remaining unpaid
 RemainderToTake=Remaining amount to take
-RemainderToPayBack=Remaining amount to pay back
+RemainderToPayBack=Remaining amount to refund
 Rest=Pending
 AmountExpected=Amount claimed
 ExcessReceived=Excess received
@@ -270,6 +274,7 @@ Deposit=Deposit
 Deposits=Deposits
 DiscountFromCreditNote=Discount from credit note %s
 DiscountFromDeposit=Payments from deposit invoice %s
+DiscountFromExcessReceived=Payments from excess received of invoice %s
 AbsoluteDiscountUse=This kind of credit can be used on invoice before its validation
 CreditNoteDepositUse=Invoice must be validated to use this kind of credits
 NewGlobalDiscount=New absolute discount
@@ -277,8 +282,8 @@ NewRelativeDiscount=New relative discount
 NoteReason=Note/Reason
 ReasonDiscount=Reason
 DiscountOfferedBy=Granted by
-DiscountStillRemaining=Discounts still remaining
-DiscountAlreadyCounted=Discounts already counted
+DiscountStillRemaining=Discounts available
+DiscountAlreadyCounted=Discounts already consumed
 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.
@@ -331,10 +336,12 @@ 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
 # PaymentConditions
 Statut=Status
-PaymentConditionShortRECEP=Immediate
-PaymentConditionRECEP=Immediate
+PaymentConditionShortRECEP=Due Upon Receipt
+PaymentConditionRECEP=Due Upon Receipt
 PaymentConditionShort30D=30 days
 PaymentCondition30D=30 days
 PaymentConditionShort30DENDMONTH=30 days of month-end
@@ -349,6 +356,14 @@ PaymentConditionShortPT_ORDER=Order
 PaymentConditionPT_ORDER=On order
 PaymentConditionShortPT_5050=50-50
 PaymentConditionPT_5050=50%% in advance, 50%% on delivery
+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
 FixAmount=Fix amount
 VarAmount=Variable amount (%% tot.)
 # PaymentType
@@ -418,7 +433,7 @@ ChequeDeposits=Checks deposits
 Cheques=Checks
 DepositId=Id deposit
 NbCheque=Number of checks
-CreditNoteConvertedIntoDiscount=This credit note or deposit invoice has been converted into %s
+CreditNoteConvertedIntoDiscount=This %s has been converted into %s
 UsBillingContactAsIncoiveRecipientIfExist=Use customer billing contact address instead of third party address as recipient for invoices
 ShowUnpaidAll=Show all unpaid invoices
 ShowUnpaidLateOnly=Show late unpaid invoices only
diff --git a/htdocs/langs/lo_LA/boxes.lang b/htdocs/langs/lo_LA/boxes.lang
index 98970318e85..38b03b4268d 100644
--- a/htdocs/langs/lo_LA/boxes.lang
+++ b/htdocs/langs/lo_LA/boxes.lang
@@ -25,8 +25,8 @@ BoxTitleLastSuppliers=Latest %s recorded suppliers
 BoxTitleLastModifiedSuppliers=Latest %s modified suppliers
 BoxTitleLastModifiedCustomers=Latest %s modified customers
 BoxTitleLastCustomersOrProspects=Latest %s customers or prospects
-BoxTitleLastCustomerBills=Latest %s customer's invoices
-BoxTitleLastSupplierBills=Latest %s supplier's invoices
+BoxTitleLastCustomerBills=Latest %s customer invoices
+BoxTitleLastSupplierBills=Latest %s supplier invoices
 BoxTitleLastModifiedProspects=Latest %s modified prospects
 BoxTitleLastModifiedMembers=Latest %s members
 BoxTitleLastFicheInter=Latest %s modified interventions
@@ -51,12 +51,12 @@ ClickToAdd=Click here to add.
 NoRecordedCustomers=No recorded customers
 NoRecordedContacts=No recorded contacts
 NoActionsToDo=No actions to do
-NoRecordedOrders=No recorded customer's orders
+NoRecordedOrders=No recorded customer orders
 NoRecordedProposals=No recorded proposals
-NoRecordedInvoices=No recorded customer's invoices
-NoUnpaidCustomerBills=No unpaid customer's invoices
-NoUnpaidSupplierBills=No unpaid supplier's invoices
-NoModifiedSupplierBills=No recorded supplier's invoices
+NoRecordedInvoices=No recorded customer invoices
+NoUnpaidCustomerBills=No unpaid customer invoices
+NoUnpaidSupplierBills=No unpaid supplier invoices
+NoModifiedSupplierBills=No recorded supplier invoices
 NoRecordedProducts=No recorded products/services
 NoRecordedProspects=No recorded prospects
 NoContractedProducts=No products/services contracted
diff --git a/htdocs/langs/lo_LA/companies.lang b/htdocs/langs/lo_LA/companies.lang
index e6d27ee6437..0be3c783cc9 100644
--- a/htdocs/langs/lo_LA/companies.lang
+++ b/htdocs/langs/lo_LA/companies.lang
@@ -78,6 +78,10 @@ VATIsNotUsed=VAT is not used
 CopyAddressFromSoc=Fill address with third party address
 ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
 PaymentBankAccount=Payment bank account
+OverAllProposals=Total proposals
+OverAllOrders=Total orders
+OverAllInvoices=Total invoices
+OverAllSupplierProposals=Total price requests
 ##### Local Taxes #####
 LocalTax1IsUsed=Use second tax
 LocalTax1IsUsedES= RE is used
@@ -239,6 +243,10 @@ ProfId3RU=Prof Id 3 (KPP)
 ProfId4RU=Prof Id 4 (OKPO)
 ProfId5RU=-
 ProfId6RU=-
+ProfId1DZ=RC
+ProfId2DZ=Art.
+ProfId3DZ=NIF
+ProfId4DZ=NIS
 VATIntra=VAT number
 VATIntraShort=VAT number
 VATIntraSyntaxIsValid=Syntax is valid
@@ -382,8 +390,9 @@ ListCustomersShort=List of customers
 ThirdPartiesArea=Third parties and contact area
 LastModifiedThirdParties=Latest %s modified third parties
 UniqueThirdParties=Total of unique third parties
-InActivity=Open
+InActivity=Opened
 ActivityCeased=Closed
+ThirdPartyIsClosed=Third party is closed
 ProductsIntoElements=List of products/services into %s
 CurrentOutstandingBill=Current outstanding bill
 OutstandingBill=Max. for outstanding bill
@@ -396,7 +405,7 @@ MergeThirdparties=Merge third parties
 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 so you will be able to delete the duplicate one.
 ThirdpartiesMergeSuccess=Thirdparties have been merged
 SaleRepresentativeLogin=Login of sales representative
-SaleRepresentativeFirstname=Firstname of sales representative
-SaleRepresentativeLastname=Lastname of sales representative
+SaleRepresentativeFirstname=First name of sales representative
+SaleRepresentativeLastname=Last name of sales representative
 ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
 NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/lo_LA/compta.lang b/htdocs/langs/lo_LA/compta.lang
index bdb28db5c97..a156c99f6d9 100644
--- a/htdocs/langs/lo_LA/compta.lang
+++ b/htdocs/langs/lo_LA/compta.lang
@@ -65,6 +65,7 @@ PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=VAT payment
 ListPayment=List of payments
 ListOfCustomerPayments=List of customer payments
+ListOfSupplierPayments=List of supplier payments
 DateStartPeriod=Date start period
 DateEndPeriod=Date end period
 newLT1Payment=New tax 2 payment
@@ -81,7 +82,7 @@ LT2PaymentES=IRPF Payment
 LT2PaymentsES=IRPF Payments
 VATPayment=Sales tax payment
 VATPayments=Sales tax payments
-VATRefund=Sales tax refund Refund
+VATRefund=Sales tax refund
 Refund=Refund
 SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Show VAT payment
@@ -194,7 +195,7 @@ CloneTax=Clone a social/fiscal tax
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
 CloneTaxForNextMonth=Clone it for next month
 SimpleReport=Simple report
-AddExtraReport=Extra reports
+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
diff --git a/htdocs/langs/lo_LA/cron.lang b/htdocs/langs/lo_LA/cron.lang
index cb68b31c80f..8b4f1c713c3 100644
--- a/htdocs/langs/lo_LA/cron.lang
+++ b/htdocs/langs/lo_LA/cron.lang
@@ -17,14 +17,14 @@ CronMethodDoesNotExists=Class %s does not contains any method %s
 # Menu
 EnabledAndDisabled=Enabled and disabled
 # Page list
-CronLastOutput=Last run output
-CronLastResult=Last result code
+CronLastOutput=Latest run output
+CronLastResult=Latest result code
 CronCommand=Command
 CronList=Scheduled jobs
 CronDelete=Delete scheduled jobs
-CronConfirmDelete=Are you sure you want to delete these scheduled jobs ?
+CronConfirmDelete=Are you sure you want to delete these scheduled jobs?
 CronExecute=Launch scheduled job
-CronConfirmExecute=Are you sure you want to execute these scheduled jobs now ?
+CronConfirmExecute=Are you sure you want to execute these scheduled jobs now?
 CronInfo=Scheduled job module allow to execute job that have been planned
 CronTask=Job
 CronNone=None
@@ -54,7 +54,7 @@ CronNote=Comment
 CronFieldMandatory=Fields %s is mandatory
 CronErrEndDateStartDt=End date cannot be before start date
 CronStatusActiveBtn=Enable
-CronStatusInactiveBtn=Disable
+CronStatusInactiveBtn=ປິດການນຳໃຊ້
 CronTaskInactive=This job is disabled
 CronId=Id
 CronClassFile=Classes (filename.class.php)
diff --git a/htdocs/langs/lo_LA/errors.lang b/htdocs/langs/lo_LA/errors.lang
index f935ce72d41..9e2eb6817ef 100644
--- a/htdocs/langs/lo_LA/errors.lang
+++ b/htdocs/langs/lo_LA/errors.lang
@@ -11,6 +11,7 @@ ErrorLoginAlreadyExists=Login %s already exists.
 ErrorGroupAlreadyExists=Group %s already exists.
 ErrorRecordNotFound=Record not found.
 ErrorFailToCopyFile=Failed to copy file '<b>%s</b>' into '<b>%s</b>'.
+ErrorFailToCopyDir=Failed to copy directory '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToRenameFile=Failed to rename file '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToDeleteFile=Failed to remove file '<b>%s</b>'.
 ErrorFailToCreateFile=Failed to create file '<b>%s</b>'.
@@ -115,7 +116,7 @@ ErrorNoActivatedBarcode=No barcode type activated
 ErrUnzipFails=Failed to unzip %s with ZipArchive
 ErrNoZipEngine=No engine to unzip %s file in this PHP
 ErrorFileMustBeADolibarrPackage=The file %s must be a Dolibarr zip package
-ErrorFileRequired=It takes a package Dolibarr file
+ErrorModuleFileRequired=You must select a Dolibarr module package file
 ErrorPhpCurlNotInstalled=The PHP CURL is not installed, this is essential to talk with 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
@@ -170,14 +171,19 @@ ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
 ErrorFileMustHaveFormat=File must have format %s
 ErrorSupplierCountryIsNotDefined=Country for this supplier is not defined. Correct this first.
 ErrorsThirdpartyMerge=Failed to merge the two records. Request canceled.
-ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enougth for product %s to add it into a new order.
-ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enougth for product %s to add it into a new invoice.
-ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enougth for product %s to add it into a new shipment.
-ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enougth for product %s to add it into a new proposal.
-ErrorFailedToLoadLoginFileForMode=Failed to get the login file for mode '%s'.
+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 bank 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>
 
 # 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.
diff --git a/htdocs/langs/lo_LA/holiday.lang b/htdocs/langs/lo_LA/holiday.lang
index d11bd389a26..6b8fef0b171 100644
--- a/htdocs/langs/lo_LA/holiday.lang
+++ b/htdocs/langs/lo_LA/holiday.lang
@@ -76,8 +76,9 @@ BoxTitleLastLeaveRequests=Latest %s modified leave requests
 HolidaysMonthlyUpdate=Monthly update
 ManualUpdate=Manual update
 HolidaysCancelation=Leave request cancelation
-EmployeeLastname=Employee lastname
-EmployeeFirstname=Employee firstname
+EmployeeLastname=Employee last name
+EmployeeFirstname=Employee first name
+TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
 
 ## Configuration du Module ##
 LastUpdateCP=Latest automatic update of leaves allocation
diff --git a/htdocs/langs/lo_LA/ldap.lang b/htdocs/langs/lo_LA/ldap.lang
index a17019d00fb..42e699de311 100644
--- a/htdocs/langs/lo_LA/ldap.lang
+++ b/htdocs/langs/lo_LA/ldap.lang
@@ -13,8 +13,8 @@ LDAPUsers=Users in LDAP database
 LDAPFieldStatus=Status
 LDAPFieldFirstSubscriptionDate=First subscription date
 LDAPFieldFirstSubscriptionAmount=First subscription amount
-LDAPFieldLastSubscriptionDate=Last subscription date
-LDAPFieldLastSubscriptionAmount=Last subscription amount
+LDAPFieldLastSubscriptionDate=Latest subscription date
+LDAPFieldLastSubscriptionAmount=Latest subscription amount
 LDAPFieldSkype=Skype id
 LDAPFieldSkypeExample=Example : skypeName
 UserSynchronized=User synchronized
diff --git a/htdocs/langs/lo_LA/mails.lang b/htdocs/langs/lo_LA/mails.lang
index ab18dcdca25..c830b551a67 100644
--- a/htdocs/langs/lo_LA/mails.lang
+++ b/htdocs/langs/lo_LA/mails.lang
@@ -35,7 +35,7 @@ MailingStatusSentPartialy=Sent partialy
 MailingStatusSentCompletely=Sent completely
 MailingStatusError=Error
 MailingStatusNotSent=Not sent
-MailSuccessfulySent=Email successfully sent (from %s to %s)
+MailSuccessfulySent=Email successfully accepted for delivery (from %s to %s)
 MailingSuccessfullyValidated=EMailing successfully validated
 MailUnsubcribe=Unsubscribe
 MailingStatusNotContact=Don't contact anymore
@@ -74,22 +74,28 @@ ResultOfMailSending=Result of mass EMail sending
 NbSelected=Nb selected
 NbIgnored=Nb ignored
 NbSent=Nb 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
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Line %s in file
 RecipientSelectionModules=Defined requests for recipient's selection
 MailSelectedRecipients=Selected recipients
 MailingArea=EMailings area
-LastMailings=Last %s emailings
+LastMailings=Latest %s emailings
 TargetsStatistics=Targets statistics
 NbOfCompaniesContacts=Unique contacts/addresses
 MailNoChangePossible=Recipients for validated emailing can't be changed
 SearchAMailing=Search mailing
 SendMailing=Send emailing
 SendMail=Send email
-MailingNeedCommand=For security reason, sending an emailing is better when performed from command line. If you have one, ask your server administrator to launch the following command to send the emailing to all recipients:
+SentBy=Sent by
+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=You can however send them online by adding parameter MAILING_LIMIT_SENDBYWEB with value of max number of emails you want to send by session. For this, go on Home - Setup - Other.
-ConfirmSendingEmailing=If you can't or prefer sending them with your www browser, please confirm you are sure you want to send emailing now from your browser?
+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.
 TargetsReset=Clear list
 ToClearAllRecipientsClickHere=Click here to clear the recipient list for this emailing
@@ -144,3 +150,6 @@ AdvTgtCreateFilter=Create filter
 AdvTgtOrCreateNewFilter=Name of new filter
 NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
+OutGoingEmailSetup=Outgoing email setup
+InGoingEmailSetup=Incoming email setup
+
diff --git a/htdocs/langs/lo_LA/main.lang b/htdocs/langs/lo_LA/main.lang
index eecbdff43f9..da635fb2101 100644
--- a/htdocs/langs/lo_LA/main.lang
+++ b/htdocs/langs/lo_LA/main.lang
@@ -63,11 +63,13 @@ ErrorNoVATRateDefinedForSellerCountry=Error, no vat rates defined for country '%
 ErrorNoSocialContributionForSellerCountry=Error, no social/fiscal taxes type defined for country '%s'.
 ErrorFailedToSaveFile=Error, failed to save file.
 ErrorCannotAddThisParentWarehouse=You are trying to add a parent warehouse which is already a child of current one
+MaxNbOfRecordPerPage=Max nb of record per page
 NotAuthorized=You are not authorized to do that.
 SetDate=Set date
 SelectDate=Select a date
 SeeAlso=See also %s
 SeeHere=See here
+Apply=Apply
 BackgroundColorByDefault=Default background color
 FileRenamed=The file was successfully renamed
 FileUploaded=The file was successfully uploaded
@@ -86,7 +88,7 @@ Undefined=Undefined
 PasswordForgotten=Password forgotten?
 SeeAbove=See above
 HomeArea=Home area
-LastConnexion=Last connection
+LastConnexion=Latest connection
 PreviousConnexion=Previous connection
 PreviousValue=Previous value
 ConnectedOnMultiCompany=Connected on environment
@@ -236,7 +238,7 @@ DateCreation=Creation date
 DateCreationShort=Creat. date
 DateModification=Modification date
 DateModificationShort=Modif. date
-DateLastModification=Last modification date
+DateLastModification=Latest modification date
 DateValidation=Validation date
 DateClosing=Closing date
 DateDue=Due date
@@ -432,7 +434,7 @@ Reportings=Reporting
 Draft=Draft
 Drafts=Drafts
 Validated=Validated
-Opened=Open
+Opened=Opened
 New=New
 Discount=Discount
 Unknown=Unknown
@@ -460,6 +462,7 @@ DeletePicture=Picture delete
 ConfirmDeletePicture=Confirm picture deletion?
 Login=Login
 CurrentLogin=Current login
+EnterLoginDetail=Enter login details
 January=January
 February=February
 March=March
@@ -597,6 +600,8 @@ SessionName=Session name
 Method=Method
 Receive=Receive
 CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
+ExpectedValue=Expected Value
+CurrentValue=Current value
 PartialWoman=Partial
 TotalWoman=Total
 NeverReceived=Never received
@@ -753,6 +758,8 @@ RemoveString=Remove string '%s'
 SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
 DirectDownloadLink=Direct download link
 Download=Download
+ActualizeCurrency=Update currency rate
+Fiscalyear=Fiscal year
 # Week day
 Monday=Monday
 Tuesday=Tuesday
@@ -787,8 +794,8 @@ SetRef=Set ref
 Select2ResultFoundUseArrows=Some results found. Use arrows to select.
 Select2NotFound=No result found
 Select2Enter=Enter
-Select2MoreCharacter=or more character
-Select2MoreCharacters=or more characters
+Select2MoreCharacter=or more characters<br /><br /><strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
+Select2MoreCharacters=or more characters<br /><br /><strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
 Select2LoadingMoreResults=Loading more results...
 Select2SearchInProgress=Search in progress...
 SearchIntoThirdparties=Thirdparties
@@ -809,3 +816,5 @@ SearchIntoContracts=Contracts
 SearchIntoCustomerShipments=Customer shipments
 SearchIntoExpenseReports=Expense reports
 SearchIntoLeaves=Leaves
+
+BulkActions=Bulk actions
diff --git a/htdocs/langs/lo_LA/members.lang b/htdocs/langs/lo_LA/members.lang
index da41b2f962a..7825c94bf2b 100644
--- a/htdocs/langs/lo_LA/members.lang
+++ b/htdocs/langs/lo_LA/members.lang
@@ -45,7 +45,7 @@ MemberStatusDraft=Draft (needs to be validated)
 MemberStatusDraftShort=Draft
 MemberStatusActive=Validated (waiting subscription)
 MemberStatusActiveShort=Validated
-MemberStatusActiveLate=subscription expired
+MemberStatusActiveLate=Subscription expired
 MemberStatusActiveLateShort=Expired
 MemberStatusPaid=Subscription up to date
 MemberStatusPaidShort=Up to date
@@ -136,8 +136,8 @@ DocForAllMembersCards=Generate business cards for all members
 DocForOneMemberCards=Generate business cards for a particular member
 DocForLabels=Generate address sheets
 SubscriptionPayment=Subscription payment
-LastSubscriptionDate=Last subscription date
-LastSubscriptionAmount=Last subscription amount
+LastSubscriptionDate=Latest subscription date
+LastSubscriptionAmount=Latest subscription amount
 MembersStatisticsByCountries=Members statistics by country
 MembersStatisticsByState=Members statistics by state/province
 MembersStatisticsByTown=Members statistics by town
@@ -149,7 +149,7 @@ MembersByStateDesc=This screen show you statistics on members by state/provinces
 MembersByTownDesc=This screen show you statistics on members by town.
 MembersStatisticsDesc=Choose statistics you want to read...
 MenuMembersStats=Statistics
-LastMemberDate=Last member date
+LastMemberDate=Latest member date
 Nature=Nature
 Public=Information are public
 NewMemberbyWeb=New member added. Awaiting approval
diff --git a/htdocs/langs/lo_LA/orders.lang b/htdocs/langs/lo_LA/orders.lang
index 9d2e53e4fe2..331e3b49d3e 100644
--- a/htdocs/langs/lo_LA/orders.lang
+++ b/htdocs/langs/lo_LA/orders.lang
@@ -39,7 +39,7 @@ StatusOrderRefusedShort=Refused
 StatusOrderBilledShort=Billed
 StatusOrderToProcessShort=To process
 StatusOrderReceivedPartiallyShort=Partially received
-StatusOrderReceivedAllShort=Everything received
+StatusOrderReceivedAllShort=Products received
 StatusOrderCanceled=Canceled
 StatusOrderDraft=Draft (needs to be validated)
 StatusOrderValidated=Validated
@@ -51,7 +51,7 @@ StatusOrderApproved=Approved
 StatusOrderRefused=Refused
 StatusOrderBilled=Billed
 StatusOrderReceivedPartially=Partially received
-StatusOrderReceivedAll=Everything received
+StatusOrderReceivedAll=All products received
 ShippingExist=A shipment exists
 QtyOrdered=Qty ordered
 ProductQtyInDraft=Product quantity into draft orders
diff --git a/htdocs/langs/lo_LA/other.lang b/htdocs/langs/lo_LA/other.lang
index a7137fb4c4c..e57d267ae08 100644
--- a/htdocs/langs/lo_LA/other.lang
+++ b/htdocs/langs/lo_LA/other.lang
@@ -2,6 +2,7 @@
 SecurityCode=Security code
 NumberingShort=N°
 Tools=ເຄື່ອງມື
+TMenuTools=ເຄື່ອງມື
 ToolsDesc=All miscellaneous tools not included in other menu entries are collected here.<br /><br />All the tools can be reached in the left menu.
 Birthday=Birthday
 BirthdayDate=Birthday date
@@ -67,14 +68,15 @@ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find her
 PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nYou will find here the shipping __SHIPPINGREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nYou will find here the intervention __FICHINTERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n__PERSONALIZED__\n\n__SIGNATURE__
-DemoDesc=Dolibarr is a compact ERP/CRM supporting several functional modules. A demo showcasing all modules makes no sense as this scenario never occurs. So, several demo profiles are available.
+DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
+ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
 DemoFundation=Manage members of a foundation
 DemoFundation2=Manage members and bank account of a foundation
-DemoCompanyServiceOnly=Manage a freelance activity selling service only
+DemoCompanyServiceOnly=Company or freelance selling service only
 DemoCompanyShopWithCashDesk=Manage a shop with a cash desk
-DemoCompanyProductAndStocks=Manage a small or medium company selling products
-DemoCompanyAll=Manage a small or medium company with multiple activities (all main modules)
+DemoCompanyProductAndStocks=Company selling products with a shop
+DemoCompanyAll=Company with multiple activities (all main modules)
 CreatedBy=Created by %s
 ModifiedBy=Modified by %s
 ValidatedBy=Validated by %s
diff --git a/htdocs/langs/lo_LA/products.lang b/htdocs/langs/lo_LA/products.lang
index c7c033736c0..36c8c57a65e 100644
--- a/htdocs/langs/lo_LA/products.lang
+++ b/htdocs/langs/lo_LA/products.lang
@@ -5,6 +5,8 @@ ProductLabelTranslated=Translated product label
 ProductDescriptionTranslated=Translated product description
 ProductNoteTranslated=Translated product note
 ProductServiceCard=Products/Services card
+TMenuProducts=Products
+TMenuServices=Services
 Products=Products
 Services=Services
 Product=Product
@@ -58,7 +60,7 @@ SellingPrice=Selling price
 SellingPriceHT=Selling price (net of tax)
 SellingPriceTTC=Selling price (inc. tax)
 CostPriceDescription=This price (net of tax) can be used to store the average amount this product cost to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
-CostPriceUsage=In a future version, this value could be used for margin calculation.
+CostPriceUsage=This value could be used for margin calculation.
 SoldAmount=Sold amount
 PurchasedAmount=Purchased amount
 NewPrice=New price
@@ -140,6 +142,7 @@ ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b>?
 CloneContentProduct=Clone all main informations of product/service
 ClonePricesProduct=Clone main informations and prices
 CloneCompositionProduct=Clone packaged product/service
+CloneCombinationsProduct=Clone product variants
 ProductIsUsed=This product is used
 NewRefForClone=Ref. of new product/service
 SellingPrices=Selling prices
@@ -236,7 +239,7 @@ GlobalVariables=Global variables
 VariableToUpdate=Variable to update
 GlobalVariableUpdaters=Global variable updaters
 UpdateInterval=Update interval (minutes)
-LastUpdated=Last updated
+LastUpdated=Latest update
 CorrectlyUpdated=Correctly updated
 PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
 PropalMergePdfProductChooseFile=Select PDF files
@@ -256,4 +259,41 @@ VolumeUnits=Volume unit
 SizeUnits=Size unit
 DeleteProductBuyPrice=Delete buying price
 ConfirmDeleteProductBuyPrice=Are you sure you want to delete this buying price?
+SubProduct=Sub product
 
+#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
+ProductCombinations=Variants
+HideProductCombinations=Hide products variant in the products selector
+ProductCombination=Variant
+NewProductCombination=New variant
+EditProductCombination=Editing variant
+ProductCombinationGenerator=Variants generator
+Features=Features
+PriceImpact=Price impact
+WeightImpact=Weight impact
+NewProductAttribute=New attribute
+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
+PercentageVariation=Percentage variation
+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 child products
+ConfirmCloneProductCombinations=Would you like to copy all the product variant to the 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
diff --git a/htdocs/langs/lo_LA/projects.lang b/htdocs/langs/lo_LA/projects.lang
index e1102d27b3a..d29957e1825 100644
--- a/htdocs/langs/lo_LA/projects.lang
+++ b/htdocs/langs/lo_LA/projects.lang
@@ -29,9 +29,9 @@ DeleteAProject=Delete a project
 DeleteATask=Delete a task
 ConfirmDeleteAProject=Are you sure you want to delete this project?
 ConfirmDeleteATask=Are you sure you want to delete this task?
-OpenedProjects=Open projects
-OpenedTasks=Open tasks
-OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
+OpenedProjects=Opened projects
+OpenedTasks=Opened tasks
+OpportunitiesStatusForOpenedProjects=Opportunities amount of opened projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=Show project
 SetProject=Set project
@@ -47,7 +47,7 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
 TaskTimeDate=ວັນທີ
-TasksOnOpenedProject=Tasks on open projects
+TasksOnOpenedProject=Tasks on opened projects
 WorkloadNotDefined=Workload not defined
 NewTimeSpent=New time spent
 MyTimeSpent=My time spent
@@ -58,6 +58,7 @@ TaskDateEnd=Task end date
 TaskDescription=Task description
 NewTask=New task
 AddTask=Create task
+AddTimeSpent=Create time spent
 Activity=Activity
 Activities=Tasks/activities
 MyActivities=My tasks/activities
@@ -95,6 +96,7 @@ ValidateProject=Validate projet
 ConfirmValidateProject=Are you sure you want to validate this project?
 CloseAProject=Close project
 ConfirmCloseAProject=Are you sure you want to close this project?
+AlsoCloseAProject=Also close project (keep it open if you still need to follow production tasks on it)
 ReOpenAProject=Open project
 ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=Project contacts
@@ -120,7 +122,7 @@ CloneProjectFiles=Clone project joined files
 CloneTaskFiles=Clone task(s) joined files (if task(s) cloned)
 CloneMoveDate=Update project/tasks dates from now?
 ConfirmCloneProject=Are you sure to clone this project?
-ProjectReportDate=Change task date according project start date
+ProjectReportDate=Change task dates according to new project start date
 ErrorShiftTaskDate=Impossible to shift task date according to new project start date
 ProjectsAndTasksLines=Projects and tasks
 ProjectCreatedInDolibarr=Project %s created
@@ -177,9 +179,9 @@ ProjectsStatistics=Statistics on projects/leads
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 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.
-OpenedProjectsByThirdparties=Open projects by thirdparties
+OpenedProjectsByThirdparties=Opened projects by thirdparties
 OnlyOpportunitiesShort=Only opportunities
-OpenedOpportunitiesShort=Open opportunities
+OpenedOpportunitiesShort=Opened opportunities
 NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount
diff --git a/htdocs/langs/lo_LA/propal.lang b/htdocs/langs/lo_LA/propal.lang
index 52260fe2b4e..a14d25ce779 100644
--- a/htdocs/langs/lo_LA/propal.lang
+++ b/htdocs/langs/lo_LA/propal.lang
@@ -3,7 +3,7 @@ Proposals=Commercial proposals
 Proposal=Commercial proposal
 ProposalShort=Proposal
 ProposalsDraft=Draft commercial proposals
-ProposalsOpened=Open commercial proposals
+ProposalsOpened=Opened commercial proposals
 Prop=Commercial proposals
 CommercialProposal=Commercial proposal
 ProposalCard=Proposal card
@@ -26,9 +26,9 @@ AmountOfProposalsByMonthHT=Amount by month (net of tax)
 NbOfProposals=Number of commercial proposals
 ShowPropal=Show proposal
 PropalsDraft=Drafts
-PropalsOpened=Open
+PropalsOpened=Opened
 PropalStatusDraft=Draft (needs to be validated)
-PropalStatusValidated=Validated (proposal is open)
+PropalStatusValidated=Validated (proposal is opened)
 PropalStatusSigned=Signed (needs billing)
 PropalStatusNotSigned=Not signed (closed)
 PropalStatusBilled=Billed
diff --git a/htdocs/langs/lo_LA/stocks.lang b/htdocs/langs/lo_LA/stocks.lang
index 834fa104098..1db49b8d8dd 100644
--- a/htdocs/langs/lo_LA/stocks.lang
+++ b/htdocs/langs/lo_LA/stocks.lang
@@ -22,13 +22,15 @@ Movements=Movements
 ErrorWarehouseRefRequired=Warehouse reference name is required
 ListOfWarehouses=List of warehouses
 ListOfStockMovements=List of stock movements
+StockMovementForId=Movement ID %d
+ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Warehouses area
 Location=Location
 LocationSummary=Short name location
 NumberOfDifferentProducts=Number of different products
 NumberOfProducts=Total number of products
-LastMovement=Last movement
-LastMovements=Last movements
+LastMovement=Latest movement
+LastMovements=Latest movements
 Units=Units
 Unit=Unit
 StockCorrection=Correct stock
@@ -140,3 +142,4 @@ ProductStockWarehouseCreated=Stock limit for alert and desired optimal stock cor
 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
diff --git a/htdocs/langs/lo_LA/supplier_proposal.lang b/htdocs/langs/lo_LA/supplier_proposal.lang
index 621d7784e35..61b031459b0 100644
--- a/htdocs/langs/lo_LA/supplier_proposal.lang
+++ b/htdocs/langs/lo_LA/supplier_proposal.lang
@@ -8,7 +8,7 @@ SearchRequest=Find a request
 DraftRequests=Draft requests
 SupplierProposalsDraft=Draft supplier proposals
 LastModifiedRequests=Latest %s modified price requests
-RequestsOpened=Open price requests
+RequestsOpened=Opened price requests
 SupplierProposalArea=Supplier proposals area
 SupplierProposalShort=Supplier proposal
 SupplierProposals=Supplier proposals
@@ -23,7 +23,7 @@ ConfirmValidateAsk=Are you sure you want to validate this price request under na
 DeleteAsk=Delete request
 ValidateAsk=Validate request
 SupplierProposalStatusDraft=Draft (needs to be validated)
-SupplierProposalStatusValidated=Validated (request is open)
+SupplierProposalStatusValidated=Validated (request is opened)
 SupplierProposalStatusClosed=Closed
 SupplierProposalStatusSigned=Accepted
 SupplierProposalStatusNotSigned=Refused
diff --git a/htdocs/langs/lo_LA/suppliers.lang b/htdocs/langs/lo_LA/suppliers.lang
index 766e4a9bfe9..b890919ace5 100644
--- a/htdocs/langs/lo_LA/suppliers.lang
+++ b/htdocs/langs/lo_LA/suppliers.lang
@@ -24,10 +24,10 @@ ExportDataset_fournisseur_1=Supplier invoices list and invoice lines
 ExportDataset_fournisseur_2=Supplier invoices and payments
 ExportDataset_fournisseur_3=Supplier orders and order lines
 ApproveThisOrder=Approve this order
-ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b> ?
+ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b>?
 DenyingThisOrder=Deny this order
-ConfirmDenyingThisOrder=Are you sure you want to deny this order <b>%s</b> ?
-ConfirmCancelThisOrder=Are you sure you want to cancel this order <b>%s</b> ?
+ConfirmDenyingThisOrder=Are you sure you want to deny this order <b>%s</b>?
+ConfirmCancelThisOrder=Are you sure you want to cancel this order <b>%s</b>?
 AddSupplierOrder=Create supplier order
 AddSupplierInvoice=Create supplier invoice
 ListOfSupplierProductForSupplier=List of products and prices for supplier <b>%s</b>
@@ -41,3 +41,4 @@ DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Wrong quality
 ReputationForThisProduct=Reputation
 BuyerName=Buyer name
+AllProductServicePrices=All product / service prices
diff --git a/htdocs/langs/lo_LA/users.lang b/htdocs/langs/lo_LA/users.lang
index 88ceb7bfdd8..52e86969e00 100644
--- a/htdocs/langs/lo_LA/users.lang
+++ b/htdocs/langs/lo_LA/users.lang
@@ -36,7 +36,7 @@ AdministratorDesc=Administrator
 DefaultRights=Default permissions
 DefaultRightsDesc=Define here <u>default</u> permissions that are automatically granted to a <u>new created</u> user (Go on user card to change permission of an existing user).
 DolibarrUsers=Dolibarr users
-LastName=Last Name
+LastName=Last name
 FirstName=ຊື່ແທ້
 ListOfGroups=ລາຍການຂອງກຸ່ມ
 NewGroup=ກຸ່ມໃໝ່
diff --git a/htdocs/langs/lo_LA/withdrawals.lang b/htdocs/langs/lo_LA/withdrawals.lang
index 6e560a1abb1..a99d890e5f9 100644
--- a/htdocs/langs/lo_LA/withdrawals.lang
+++ b/htdocs/langs/lo_LA/withdrawals.lang
@@ -24,6 +24,7 @@ WithdrawStatistics=Direct debit payment statistics
 WithdrawRejectStatistics=Direct debit payment reject statistics
 LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
+WithdrawRequestsDone=%s direct debit payment requests recorded
 ThirdPartyBankCode=Third party bank code
 NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoice are on companies with a valid BAN.
 ClassCredited=Classify credited
@@ -76,8 +77,8 @@ RUM=UMR
 RUMLong=Unique Mandate Reference
 RUMWillBeGenerated=UMR number will be generated once bank account information are saved
 WithdrawMode=Direct debit mode (FRST or RECUR)
-WithdrawRequestAmount=Withdraw request amount:
-WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil amount.
+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
diff --git a/htdocs/langs/lt_LT/accountancy.lang b/htdocs/langs/lt_LT/accountancy.lang
index 69f6a8b5f8e..e07ab55aa6f 100644
--- a/htdocs/langs/lt_LT/accountancy.lang
+++ b/htdocs/langs/lt_LT/accountancy.lang
@@ -194,6 +194,8 @@ ChangeBinding=Change the binding
 
 ## Admin
 ApplyMassCategories=Apply mass categories
+AddAccountFromBookKeepingWithNoCategories=Add acccount already used with no categories
+CategoryDeleted=Category for the accounting account has been removed
 
 ## Export
 Exports=Eksportas
@@ -209,6 +211,7 @@ Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution
 Modelcsv_quadratus=Export towards Quadratus QuadraCompta
 Modelcsv_ebp=Export towards EBP
 Modelcsv_cogilog=Export towards Cogilog
+ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
 InitAccountancy=Init accountancy
diff --git a/htdocs/langs/lt_LT/admin.lang b/htdocs/langs/lt_LT/admin.lang
index 19ebafceeb4..b4104bb50d7 100644
--- a/htdocs/langs/lt_LT/admin.lang
+++ b/htdocs/langs/lt_LT/admin.lang
@@ -9,14 +9,20 @@ VersionDevelopment=Plėtojimas
 VersionUnknown=Nežinomas
 VersionRecommanded=Rekomenduojamas
 FileCheck=Files integrity checker
-FileCheckDesc=This tool allows you to check the integrity of files of your application, comparing each files with the official ones. You can use this tool to detect if some files were modified by a hacker for example.
+FileCheckDesc=This tool allows you to check the integrity of files and setup of your application, comparing each files with the official ones. 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.
+FileIntegrityIsStrictlyConformedWithReference=Files integrity is strictly conformed with the reference.
+FileIntegrityIsOkButFilesWereAdded=Files integrity check has passed, however some new files were added.
+FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified, removed or added.
+GlobalChecksum=Global checksum
 MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
 LocalSignature=Embedded local signature (less reliable)
 RemoteSignature=Remote distant signature (more reliable)
 FilesMissing=Trūkstami failai
 FilesUpdated=Atnaujinti failai
+FilesModified=Modified Files
+FilesAdded=Added Files
 FileCheckDolibarr=Check integrity of application files
-AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from a certified package
+AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from an official package
 XmlNotFound=Xml Integrity File of application not found
 SessionId=Sesijos ID
 SessionSaveHandler=Vedlys, sesijai išsaugoti
@@ -185,7 +191,9 @@ BoxesDesc=Widgets are components showing some information that you can add to pe
 OnlyActiveElementsAreShown=Rodomi tik elementai iš <a href="%s">leidžiami moduliai</a>.
 ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
-ModulesMarketPlaces=Daugiau modulių ...
+ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
+ModulesMarketPlaces=Find external modules...
+GoModuleSetupArea=To deploy/install a new module, go onto the Module setup area at <a href="%s">%s</a>.
 DoliStoreDesc=DoliStore, oficiali Dolibarr ERP / CRM išorinių modulių parduotuvė
 DoliPartnersDesc=List of companies providing custom developed modules or features (Note: anyone experienced in PHP programming can provide custom development for an open source project)
 WebSiteDesc=Reference websites to find more modules...
@@ -276,21 +284,22 @@ ModuleFamilyInterface=Interfaces with external systems
 MenuHandlers=Meniu prižiūrėtojai
 MenuAdmin=Meniu redaktorius
 DoNotUseInProduction=Nenaudoti gamyboje
-ThisIsProcessToFollow=Tai yra nustatymo eiga:
-ThisIsAlternativeProcessToFollow=Tai nustatymų procesui alternatyva:
+ThisIsProcessToFollow=This is steps to process:
+ThisIsAlternativeProcessToFollow=This is an alternative setup to process manually:
 StepNb=Žingsnis %s
 FindPackageFromWebSite=Ieškoti paketo, kuris suteikia norimą funkciją (pavyzdžiui oficialioje interneto svetainėje %s).
 DownloadPackageFromWebSite=Download package (for example from official web site %s).
-UnpackPackageInDolibarrRoot=Unpack package file into Dolibarr server directory dedicated to external modules: <b>%s</b>
-SetupIsReadyForUse=Diegimas baigtas ir Dolibarr yra paruoštas naudoti su šiuo nauju komponentu.
-NotExistsDirect=Alternatyvus pagrindinis katalogas nėra apibrėžtas. <br>
-InfDirAlt=Nuo 3 versijos galimanustatyti alternatyvų pagrindinį katalogą.Tai leis saugoti vienoje vietoje papildinius (plug-ins) ir vartotojo šablonus.<br>Tiesiog sukurkite katalogą Dolibarr pagrindiniame kataloge (pvz.: custom).<br>
-InfDirExample=<br>Tada deklaruoti faile conf.php<br> $dolibarr_main_url_root_alt = 'http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>*Šios eilutės yra pažymėtos "#", atžymėjimui reikia pašalinti šį simbolį.
+UnpackPackageInDolibarrRoot=Unpack the packaged files into server directory dedicated to Dolibarr: <b>%s</b>
+UnpackPackageInModulesRoot=To deploy/install an external module, unpack the packaged files into the server directory dedicated to modules: <b>%s</b>
+SetupIsReadyForUse=Module deployment is finished. You must however enable and setup the module in your application by going on the page to setup modules: <a href="%s">%s</a>.
+NotExistsDirect=The alternative root directory is not defined to an existing directory.<br>
+InfDirAlt=Since version 3, it is possible to define an alternative root directory. This allows you to store, into a dedicated directory, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
+InfDirExample=<br>Then declare it in the file <strong>conf.php</strong><br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>If these lines are commented with "#", to enable them, just uncomment by removing the "#" character.
 YouCanSubmitFile=For this step, you can send package using this tool: Select module file
 CurrentVersion=Dolibarr dabartinė versija
 CallUpdatePage=Go to the page that updates the database structure and data: %s.
 LastStableVersion=Latest stable version
-LastActivationDate=Last activation date
+LastActivationDate=Latest activation date
 UpdateServerOffline=Atnaujinti serverį offline
 GenericMaskCodes=Galite įvesti bet kokį užmaskuotą numeravimą. Šiame maskavime naudojamos sekančios žymės:<br><b>{000000}</b> atitinka skaičių, kuris bus padidinamas vienetu kiekvienam%s. Įveskite nulių iki pageidaujamo skaitiklio ilgio. Skaitiklis bus užpildomas nuliais iš kairės iki pilno skaitiklio ilgio. <br><b>{000000+000}</b> toks kaip paskutinis, bet nuokrypis atitinkantis numerį dešinėje už + ženklo taikomas pradedant pirmu %s. <br><b>{000000@x}</b> toks pat kaip ankstesnis, bet skaitiklis apnulinamas, kai pasiekiamas mėnuo x (x tarp 1 ir 12, arba naudojamas 0 pirmaisiais fiskalinių metų mėnesiais kaip aprašyta konfigūracijoje, arba 99 apnulinimui kiekvieną mėnesį). Jei ši opcija yra naudojama ir x yra 2 ar didesnis, tada seka {yy}{mm} arba {yyyy}{mm} taip pat reikalinga. <br><b>{dd}</b> diena (nuo 01 iki 31). <br><b>{mm}</b> mėnuo (nuo 01 iki 12). <br><b>{yy}<b/>, <b>{yyyy}</b> arba <b>{y}</b> metai, 2, 4 arba 1 skaitmenys. <br>
 GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
@@ -373,11 +382,11 @@ ExtrafieldCheckBox=Žymimasis langelis ("paukščiukas")
 ExtrafieldRadio=Opcijų mygtukai
 ExtrafieldCheckBoxFromList= Žymės langelis iš lentelės
 ExtrafieldLink=Nuoroda į objektą,
-ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>In order to have the list depending on another :<br>1,value1|parent_list_code:parent_key<br>2,value2|parent_list_code:parent_key
+ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list :<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list :<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
-ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
+ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Example : Societe:societe/class/societe.class.php
 LibraryToBuildPDF=Library used for PDF generation
 WarningUsingFPDF=Įspėjimas: Jūsų <b>conf.php</b> yra ribojanti direktyva <b>dolibarr_pdf_force_fpdf=1</b>. Tai reiškia, kad jūs naudojate FPDF biblioteką PDF failų generavimui. Ši biblioteka yra sena ir nepalaiko daug funkcijų (Unicode, vaizdo skaidrumo, kirilicos, arabų ir Azijos kalbų, ...), todėl galite patirti klaidų generuojant PDF.<br>Norėdami išspręsti šią problemą ir turėti visapusišką palaikymą generuojant PDF, atsisiųskite <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a> , tada pažymėkite (comment) arba pašalinkite eilutę <b>$dolibarr_pdf_force_fpdf=1</b> ir įdėkite vietoje jos <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
@@ -411,10 +420,11 @@ ModuleCompanyCodePanicum=Grąžinti tuščią apskaitos kodą.
 ModuleCompanyCodeDigitaria=Apskaitos kodas priklauso nuo trečiosios šalies kodo. Kodas yra sudarytas iš simbolių "C" į pirmąją poziciją, toliau seka 5 simbolių trečiosios šalies kodas.
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
-
+WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<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).
+ClickToShowDescription=Click to show description
 # Modules
 Module0Name=Vartotojai ir grupės
-Module0Desc=Vartotojų ir grupių valdymas
+Module0Desc=Users / Employees and Groups management
 Module1Name=Trečiosios šalys
 Module1Desc=Įmonių ir kontaktų valdymas (klientų, perspektyvų...)
 Module2Name=Prekybos
@@ -515,8 +525,8 @@ Module2200Name=Dinaminės kainos
 Module2200Desc=Nustatyti matematinių išraiškų naudojimą kainose
 Module2300Name=Cron
 Module2300Desc=Planinių darbų valdymas
-Module2400Name=Agenda/Events
-Module2400Desc=Follow events or rendez-vous. Record manual events into Agendas or let application logs automatic events for tracking purposes.
+Module2400Name=Events/Agenda
+Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous.
 Module2500Name=Elektroninis Turinio Valdymas
 Module2500Desc=Išsaugoti dokumentus ir dalintis jais
 Module2600Name=API/Web services (SOAP server)
@@ -582,7 +592,7 @@ Permission34=Ištrinti produktus
 Permission36=Žiūrėti/tvarkyti paslėptus produktus
 Permission38=Eksportuoti produktus
 Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
-Permission42=Sukurti/keisti projektus (bendrus projektus ir projektus, apie kuriuos kalbama)
+Permission42=Create/modify projects (shared project and projects i'm contact for). Can also create tasks and assign users to project and tasks
 Permission44=Ištrinti projektus (bendrus projektus ir projektus, apie kuriuos kalbama)
 Permission45=Export projects
 Permission61=Skaityti intervencijas
@@ -685,7 +695,7 @@ PermissionAdvanced253=Sukurti/keisti vidaus/išorės vartotojus ir leidimus
 Permission254=Sukurti/keisti tik išorės vartotojus
 Permission255=Keisti kitų vartotojų slaptažodžius
 Permission256=Ištrinti ar išjungti kitus vartotojus
-Permission262=Išplėsti prieigą prie visų trečiųjų šalių (ne tik tuos, kurie susiję su vartotoju). Neveiksminga išorės vartotojams (visada apribota sau).
+Permission262=Extend access to all third parties (not only third parties that user is a sale representative).<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 assignement matters).
 Permission271=Skaityti CA
 Permission272=Skaityti sąskaitas faktūras
 Permission273=Išrašyti sąskaitas faktūras
@@ -887,7 +897,7 @@ Offset=Nuokrypis
 AlwaysActive=Visada aktyvus
 Upgrade=Atnaujinti
 MenuUpgrade=Atnaujinti / Išplėsti
-AddExtensionThemeModuleOrOther=Pridėti išplėtimą (tema, modulis, ...)
+AddExtensionThemeModuleOrOther=Deploy/install external module
 WebServer=Web serveris
 DocumentRootServer=Web serverio pagrindiniame kataloge
 DataRootServer=Duomenų failų katalogas
@@ -994,7 +1004,7 @@ TriggerAlwaysActive=Trigeriai šiame faile yra visada aktyvūs, kokie bebūtų a
 TriggerActiveAsModuleActive=Trigeriai šiame faile yra aktyvūs, nes modulis <b>%s</b> yra įjungtas.
 GeneratedPasswordDesc=Nustatykite, kokią taisyklę norite naudoti naujo slaptažodžio generavimui, jeigu prašote automatinio slaptažodžio generavimo.\n\n kuri valdys norite naudoti generuoti naują slaptažodį, jei jūs paprašykite, kad auto generuoja slaptažodį
 DictionaryDesc=Insert all reference data. You can add your values to the default.
-ConstDesc=This page allows you to edit all other parameters not available in previous pages. These are mostly reserved parameters for developers or advanced troubleshooting.
+ConstDesc=This page allows you to edit all other parameters not available in previous pages. These are mostly reserved parameters for developers or advanced troubleshooting. For a list of options <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">check here</a>.
 MiscellaneousDesc=All other security related parameters are defined here.
 LimitsSetup=Apribojimų/Tikslumo nustatymai
 LimitsDesc=Čia galite nustatyti apribojimus, tikslumą ir optimizacijos priemones, naudojamas Dolibarr.
@@ -1161,10 +1171,6 @@ FreeLegalTextOnOrders=Laisvas tekstas užsakymuose
 WatermarkOnDraftOrders=Vandens ženklas užsakymų projektuose (nėra, jei lapas tuščias)
 ShippableOrderIconInList=Pridėti piktogramą į Užsakymų sąrašą, kuri nurodo, ar užsakymas yra tinkamas siuntimui
 BANK_ASK_PAYMENT_BANK_DURING_ORDER=Klausti užsakyme esančios banko sąskaitos paskirties
-##### Clicktodial #####
-ClickToDialSetup=Click To Dial modulio nuostatos
-ClickToDialUrlDesc=Paspaudus telefono piktogramą kviečiamas URL. Galima naudoti žymes<br><b>__PHONETO__</b>, tam, kad pakeisti asmens, kuriam skambinama, telefono numeriu<br><b>__PHONEFROM__</b>, tam, kad pakeisti asmens, kuris skambina, telefono numeriu (Jūsų)<br><b>__LOGIN__</b>, tam, kad  pakeisti Jūsų ClickToDial prisijungimo vardu (nustatytu vartotojo kortelėje)<br><b>__PASS__</b>, tam, kad pakeisti Jūsų ClickToDial slaptažodį (nustatytą vartotojo kortelėje).
-##### Bookmark4u #####
 ##### Interventions #####
 InterventionsSetup=Intervencijos modulio nuostatos
 FreeLegalTextOnInterventions=Laisvas tekstas intervencijų dokumentuose
@@ -1391,7 +1397,7 @@ SendingsSetup=Siuntimo modulio nuostatos
 SendingsReceiptModel=Įplaukų siuntimo modelis
 SendingsNumberingModules=Siuntinių numeravimo modulis
 SendingsAbility=Support shipping sheets for customer deliveries
-NoNeedForDeliveryReceipts=Daugeliu atvejų, siuntinių kvitai naudojami tiek pristatymo klientams žiniaraščiams (produktų sąrašas siuntimui), tiek gaunamiems žiniaraščiams pasirašytiems klientų. Taigi produkto pristatymo kvitai yra dubliuojanti funkcija ir retai aktyvuota.
+NoNeedForDeliveryReceipts=In most cases, shipping sheets are used both as sheets for customer deliveries (list of products to send) and sheets that is received and signed by customer. So product deliveries receipts is a duplicated feature and is rarely activated.
 FreeLegalTextOnShippings=Laisvas tekstas siuntų dokumentuose
 ##### Deliveries #####
 DeliveryOrderNumberingModules=Produktų pristatymo kvitų numeravimo modulis
@@ -1471,7 +1477,11 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Set automatically this default value for type of e
 AGENDA_DEFAULT_FILTER_TYPE=Nustatyti automatiškai šio įvykio tipą paieškos filtrui darbotvarkėje
 AGENDA_DEFAULT_FILTER_STATUS=Nustatyti automatiškai šio įvykio būklę paieškos filtrui darbotvarkėje
 AGENDA_DEFAULT_VIEW=Kurią kortelę norite atidaryti pagal nutylėjimą renkantis meniu Darbotvarkė
-##### ClickToDial #####
+AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
+AGENDA_NOTIFICATION_SOUND=Enable sound notification
+##### Clicktodial #####
+ClickToDialSetup=Click To Dial modulio nuostatos
+ClickToDialUrlDesc=Paspaudus telefono piktogramą kviečiamas URL. Galima naudoti žymes<br><b>__PHONETO__</b>, tam, kad pakeisti asmens, kuriam skambinama, telefono numeriu<br><b>__PHONEFROM__</b>, tam, kad pakeisti asmens, kuris skambina, telefono numeriu (Jūsų)<br><b>__LOGIN__</b>, tam, kad  pakeisti Jūsų ClickToDial prisijungimo vardu (nustatytu vartotojo kortelėje)<br><b>__PASS__</b>, tam, kad pakeisti Jūsų ClickToDial slaptažodį (nustatytą vartotojo kortelėje).
 ClickToDialDesc=This module allows to make phone numbers clickable. A click on this icon will call make your phone to 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.
 ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
 ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on same computer than the browser, and called when you click on a link in your browser that start 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.
@@ -1499,10 +1509,11 @@ EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint availa
 ##### API ####
 ApiSetup=API module setup
 ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
-ApiProductionMode=Enable production mode (this will activate use of a caches for services management)
+ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
 ApiExporerIs=You can explore the APIs at url
 OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
 ApiKey=Key for API
+WarningAPIExplorerDisabled=The API explorer has been disabled. API explorer is not required to provide API services. It is a tool for developer to find/test REST APIs. If you need this tool, go into setup of module API REST to activate it.
 ##### Bank #####
 BankSetupModule=Banko modulio nustatymas
 FreeLegalTextOnChequeReceipts=Laisvas tekstas čekių kvituose
@@ -1571,7 +1582,7 @@ 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:
 SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is only manual steps a privileged user can do.
 InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
-ConfFileMuseContainCustom=Installing an external module from application save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to have option<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
+ConfFileMuseContainCustom=Installing an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
 HighlightLinesColor=Highlight color of the line when the mouse passes over (keep empty for no highlight)
 TextTitleColor=Color of page title
@@ -1601,6 +1612,7 @@ FixTZ=Nustatyti TimeZone
 FillFixTZOnlyIfRequired=Example: +2 (fill only if problem experienced)
 ExpectedChecksum=Expected Checksum
 CurrentChecksum=Current Checksum
+ForcedConstants=Required constant values
 MailToSendProposal=To send customer proposal
 MailToSendOrder=To send customer order
 MailToSendInvoice=To send customer invoice
@@ -1609,13 +1621,14 @@ MailToSendIntervention=To send intervention
 MailToSendSupplierRequestForQuotation=To send quotation request to supplier
 MailToSendSupplierOrder=To send supplier order
 MailToSendSupplierInvoice=To send supplier invoice
+MailToSendContract=To send a contract
 MailToThirdparty=To send email from third party page
 ByDefaultInList=Show by default on list view
-YouUseLastStableVersion=You use the last stable version
+YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
 TitleExampleForMaintenanceRelease=Example of message you can use to announce this maintenance release (feel free to use it on your web sites)
-ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. You can download it from the download area of http://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.
-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, nor data structure change is present into this version. You can download it from the download area of http://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.
+ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. 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.
+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, nor data structure change is present into 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, you can enter here rule to have price for each level autocalculated according to price of first level, so you will have to enter only price for first level on each product. This page is here to save you time and can be usefull only if your prices for each leve are relative to first level. You can ignore this page in most cases.
 ModelModulesProduct=Templates for product documents
 ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
diff --git a/htdocs/langs/lt_LT/banks.lang b/htdocs/langs/lt_LT/banks.lang
index 34ecc27cfcd..8a129e47d00 100644
--- a/htdocs/langs/lt_LT/banks.lang
+++ b/htdocs/langs/lt_LT/banks.lang
@@ -74,7 +74,7 @@ Conciliate=Suderinti
 Conciliation=Suderinimas
 ReconciliationLate=Reconciliation late
 IncludeClosedAccount=Įtraukti uždarytas sąskaitas
-OnlyOpenedAccount=Tik atidarytos sąskaitos
+OnlyOpenedAccount=Tik atidarytas sąskaitas
 AccountToCredit=Kredituoti sąskaitą
 AccountToDebit=Debetuoti sąskaitą
 DisableConciliation=Išjungti suderinimo funkciją šiai sąskaitai
diff --git a/htdocs/langs/lt_LT/bills.lang b/htdocs/langs/lt_LT/bills.lang
index 84f13886c14..949f6b5aa51 100644
--- a/htdocs/langs/lt_LT/bills.lang
+++ b/htdocs/langs/lt_LT/bills.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - bills
 Bill=Sąskaita-faktūra
 Bills=Sąskaitos-faktūros
-BillsCustomers=Klientų sąskaitos-faktūros
-BillsCustomer=Customers invoice
-BillsSuppliers=Tiekėjų sąskaitos-faktūros
-BillsCustomersUnpaid=Neapmokėtos klientų sąskaitos-faktūros
-BillsCustomersUnpaidForCompany=Neapmokėtos kliento sąskaitos-faktūros %s
-BillsSuppliersUnpaid=Neapmokėtos tiekėjo sąskaitos-faktūros
-BillsSuppliersUnpaidForCompany=Neapmokėtos tiekėjo sąskaitos-faktūros %s
+BillsCustomers=Customer invoices
+BillsCustomer=Kliento sąskaita-faktūra
+BillsSuppliers=Supplier invoices
+BillsCustomersUnpaid=Neapmokėtos kliento sąskaitos
+BillsCustomersUnpaidForCompany=Unpaid customer invoices for %s
+BillsSuppliersUnpaid=Neapmokėtos tiekėjo sąskaitos
+BillsSuppliersUnpaidForCompany=Unpaid supplier invoices for %s
 BillsLate=Pavėluoti mokėjimai
 BillsStatistics=Customers invoices statistics
 BillsStatisticsSuppliers=Suppliers invoices statistics
@@ -62,8 +62,8 @@ 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 credit note or deposit 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.
+ConfirmDeletePayment=Ar tikrai norite ištrinti šį mokėjimą ?
+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.
 SupplierPayments=Tiekėjų mokėjimai
 ReceivedPayments=Gauti mokėjimai
 ReceivedCustomersPayments=Iš klientų gauti mokėjimai
@@ -78,6 +78,7 @@ PaymentMode=Mokėjimo būdas
 PaymentTypeDC=Debit/Credit Card
 PaymentTypePP=PayPal
 IdPaymentMode=Payment type (id)
+CodePaymentMode=Payment type (code)
 LabelPaymentMode=Payment type (label)
 PaymentModeShort=Mokėjimo būdas
 PaymentTerm=Mokėjimo terminas
@@ -102,9 +103,10 @@ 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=Atlikti mokėjimą
-DoPaymentBack=Atlikti sumokėtos sumos grąžinimą
+DoPayment=Enter payment
+DoPaymentBack=Enter refund
 ConvertToReduc=Konvertuoti į ateities nuolaidą
+ConvertExcessReceivedToReduc=Convert excess received into future discount
 EnterPaymentReceivedFromCustomer=Įveskite gautą iš kliento mokėjimą
 EnterPaymentDueToCustomer=Atlikti mokėjimą klientui
 DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
@@ -113,22 +115,24 @@ BillStatus=Sąskaitos-faktūros būklė
 StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Projektas (turi būti pripažintas galiojančiu)
 BillStatusPaid=Apmokėtas
-BillStatusPaidBackOrConverted=Apmokėtas arba konvertuotas į nuolaidą
+BillStatusPaidBackOrConverted=Refund or converted into discount
 BillStatusConverted=Apmokėtas (paruoštas galutinei sąskaitai-faktūrai)
 BillStatusCanceled=Neįvykęs
 BillStatusValidated=Pripažintas galiojančiu (turi būti apmokėtas)
 BillStatusStarted=Pradėtas
 BillStatusNotPaid=Neapmokėta
+BillStatusNotRefunded=Not refunded
 BillStatusClosedUnpaid=Uždaryta (neapmokėta)
 BillStatusClosedPaidPartially=Dalinai apmokėta
 BillShortStatusDraft=Projektas
 BillShortStatusPaid=Apmokėta
-BillShortStatusPaidBackOrConverted=Apdorota
+BillShortStatusPaidBackOrConverted=Refund or converted
 BillShortStatusConverted=Apdorota
 BillShortStatusCanceled=Neįvykusi
 BillShortStatusValidated=Pripažinta galiojančia
 BillShortStatusStarted=Pradėta
 BillShortStatusNotPaid=Neapmokėta
+BillShortStatusNotRefunded=Not refunded
 BillShortStatusClosedUnpaid=Uždaryta
 BillShortStatusClosedPaidPartially=Dalinai apmokėta
 PaymentStatusToValidShort=Pripažinti galiojančia
@@ -149,14 +153,14 @@ NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified
 FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
 NotARecurringInvoiceTemplate=Not a recurring template invoice
 NewBill=Nauja sąskaita-faktūra
-LastBills=Paskutinės %s sąskaitos-faktūros
-LastCustomersBills=Paskutinės %s klientų sąskaitos-faktūros
-LastSuppliersBills=Paskutinės %s tiekėjų sąskaitos-faktūros
+LastBills=Latest %s invoices
+LastCustomersBills=Latest %s customer invoices
+LastSuppliersBills=Latest %s supplier invoices
 AllBills=Visos sąskaitos-faktūros
 OtherBills=Kitos sąskaitos-faktūros
 DraftBills=Sąskaitų-faktūrų projektai
-CustomersDraftInvoices=Klientų sąskaitų-faktūrų projektai
-SuppliersDraftInvoices=Tiekėjų sąskaitų-faktūrų projektai
+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>?
@@ -203,7 +207,7 @@ AlreadyPaidNoCreditNotesNoDeposits=Jau apmokėta (be kreditinių sąskaitų ir d
 Abandoned=Neįvykusi
 RemainderToPay=Remaining unpaid
 RemainderToTake=Remaining amount to take
-RemainderToPayBack=Remaining amount to pay back
+RemainderToPayBack=Remaining amount to refund
 Rest=Laukiantis
 AmountExpected=Reikalaujama suma
 ExcessReceived=Gautas perviršis
@@ -270,6 +274,7 @@ Deposit=Depozitas
 Deposits=Depozitai
 DiscountFromCreditNote=Nuolaida kreditinei sąskaitai %s
 DiscountFromDeposit=Mokėjimai iš depozito sąskaitos-faktūros %s
+DiscountFromExcessReceived=Payments from excess received 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
 NewGlobalDiscount=Nauja absoliutinė nuolaida
@@ -277,8 +282,8 @@ NewRelativeDiscount=Naujas susijusi nuolaida
 NoteReason=Pastaba / Priežastis
 ReasonDiscount=Priežastis
 DiscountOfferedBy=Suteiktos
-DiscountStillRemaining=Nuolaidos dar išlikusios
-DiscountAlreadyCounted=Nuolaidos jau suskaičiuotos
+DiscountStillRemaining=Discounts available
+DiscountAlreadyCounted=Discounts already consumed
 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.
@@ -331,10 +336,12 @@ 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
 # PaymentConditions
 Statut=Būklė
-PaymentConditionShortRECEP=Nedelsiamas
-PaymentConditionRECEP=Nedelsiamas
+PaymentConditionShortRECEP=Due Upon Receipt
+PaymentConditionRECEP=Due Upon Receipt
 PaymentConditionShort30D=30 dienų
 PaymentCondition30D=30 dienų
 PaymentConditionShort30DENDMONTH=30 days of month-end
@@ -349,6 +356,14 @@ PaymentConditionShortPT_ORDER=Užsakymas
 PaymentConditionPT_ORDER=Užsakymo metu
 PaymentConditionShortPT_5050=50-50
 PaymentConditionPT_5050=50%% iš anksto, 50%% pristatymo metu
+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
 FixAmount=Nustatyti dydį
 VarAmount=Kintamas dydis (%% tot.)
 # PaymentType
@@ -418,7 +433,7 @@ ChequeDeposits=Čekių depozitai
 Cheques=Čekiai
 DepositId=Id deposit
 NbCheque=Number of checks
-CreditNoteConvertedIntoDiscount=Ši kreditinė sąskaita ar depozito sąskaita-faktūra buvo konvertuota į %s
+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ą
 ShowUnpaidAll=Rodyti visas neapmokėtas sąskaitas-faktūras
 ShowUnpaidLateOnly=Rodyti tik vėluojančias neapmokėtas sąskaitas
diff --git a/htdocs/langs/lt_LT/boxes.lang b/htdocs/langs/lt_LT/boxes.lang
index bb68b139a68..94b35129cfd 100644
--- a/htdocs/langs/lt_LT/boxes.lang
+++ b/htdocs/langs/lt_LT/boxes.lang
@@ -25,8 +25,8 @@ BoxTitleLastSuppliers=Latest %s recorded suppliers
 BoxTitleLastModifiedSuppliers=Latest %s modified suppliers
 BoxTitleLastModifiedCustomers=Latest %s modified customers
 BoxTitleLastCustomersOrProspects=Latest %s customers or prospects
-BoxTitleLastCustomerBills=Latest %s customer's invoices
-BoxTitleLastSupplierBills=Latest %s supplier's invoices
+BoxTitleLastCustomerBills=Latest %s customer invoices
+BoxTitleLastSupplierBills=Latest %s supplier invoices
 BoxTitleLastModifiedProspects=Latest %s modified prospects
 BoxTitleLastModifiedMembers=Latest %s members
 BoxTitleLastFicheInter=Latest %s modified interventions
@@ -51,12 +51,12 @@ ClickToAdd=Spauskite čia, norėdami pridėti.
 NoRecordedCustomers=Nėra įrašytų klientų
 NoRecordedContacts=Nėra įrašytų adresatų
 NoActionsToDo=Nėra veiksmų, kuriuos reikia padaryti
-NoRecordedOrders=Nėra įrašytų kliento užsakymų
+NoRecordedOrders=No recorded customer orders
 NoRecordedProposals=Nėra įrašytų pasiūlymų
-NoRecordedInvoices=Nėra įrašytų kliento sąskaitų-faktūrų
-NoUnpaidCustomerBills=Nėra neapmokėtų kliento sąskaitų-faktūrų
-NoUnpaidSupplierBills=Nėra neapmokėtų tiekėjo sąskaitų-faktūrų
-NoModifiedSupplierBills=Nėra įrašytų tiekėjo sąskaitų-faktūrų
+NoRecordedInvoices=No recorded customer invoices
+NoUnpaidCustomerBills=No unpaid customer invoices
+NoUnpaidSupplierBills=No unpaid supplier invoices
+NoModifiedSupplierBills=No recorded supplier invoices
 NoRecordedProducts=Nėra įrašytų produktų/paslaugų
 NoRecordedProspects=Nėra įrašytų planų
 NoContractedProducts=Nėra sutartinių produktų/paslaugų
diff --git a/htdocs/langs/lt_LT/companies.lang b/htdocs/langs/lt_LT/companies.lang
index 4ad86717dc4..bfcfb68884a 100644
--- a/htdocs/langs/lt_LT/companies.lang
+++ b/htdocs/langs/lt_LT/companies.lang
@@ -78,6 +78,10 @@ VATIsNotUsed=PVM nenaudojamas
 CopyAddressFromSoc=Fill address with third party address
 ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
 PaymentBankAccount=Payment bank account
+OverAllProposals=Total proposals
+OverAllOrders=Total orders
+OverAllInvoices=Total invoices
+OverAllSupplierProposals=Total price requests
 ##### Local Taxes #####
 LocalTax1IsUsed=Naudokite antrą mokestį
 LocalTax1IsUsedES= RE naudojamas
@@ -239,6 +243,10 @@ ProfId3RU=Prof ID 3 (KPP)
 ProfId4RU=Prof ID 4 (OKPO)
 ProfId5RU=-
 ProfId6RU=-
+ProfId1DZ=RC
+ProfId2DZ=Art.
+ProfId3DZ=NIF
+ProfId4DZ=NIS
 VATIntra=PVM kodas
 VATIntraShort=PVM kodas
 VATIntraSyntaxIsValid=Sintaksė galioja
@@ -382,8 +390,9 @@ ListCustomersShort=Klientų sąrašas
 ThirdPartiesArea=Trečių šalių ir kontaktų sritis
 LastModifiedThirdParties=Latest %s modified third parties
 UniqueThirdParties=Viso unikalių trečiųjų šalių
-InActivity=Atviras
+InActivity=Atidaryta
 ActivityCeased=Uždarytas
+ThirdPartyIsClosed=Third party is closed
 ProductsIntoElements=Produktų/paslaugų sąrašas %s
 CurrentOutstandingBill=Dabartinė neapmokėta sąskaita-faktūra
 OutstandingBill=Neapmokėtų sąskaitų-faktūrų maksimumas
@@ -396,7 +405,7 @@ MergeThirdparties=Sujungti trečiąsias šalis
 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 so you will be able to delete the duplicate one.
 ThirdpartiesMergeSuccess=Trečiosios šalys buvo sujungtos
 SaleRepresentativeLogin=Login of sales representative
-SaleRepresentativeFirstname=Firstname of sales representative
-SaleRepresentativeLastname=Lastname of sales representative
+SaleRepresentativeFirstname=First name of sales representative
+SaleRepresentativeLastname=Last name of sales representative
 ErrorThirdpartiesMerge=Ištrinanat trečiąją šalį įvyko klaida. Prašome patikrinti žurnalą. Pakeitimai buvo panaikinti.
 NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/lt_LT/compta.lang b/htdocs/langs/lt_LT/compta.lang
index 1d949691f5a..178a643e61b 100644
--- a/htdocs/langs/lt_LT/compta.lang
+++ b/htdocs/langs/lt_LT/compta.lang
@@ -65,6 +65,7 @@ PaymentSocialContribution=Socialinio / fiskalinio mokesčio mokėjimas
 PaymentVat=PVM mokėjimas
 ListPayment=Mokėjimų sąrašas
 ListOfCustomerPayments=Kliento mokėjimų sąrašas
+ListOfSupplierPayments=Tiekėjo mokėjimų sąrašas
 DateStartPeriod=Periodo pradžios data
 DateEndPeriod=Periodo pabaigos data
 newLT1Payment=New tax 2 payment
@@ -81,7 +82,7 @@ LT2PaymentES=IRPF mokėjimas
 LT2PaymentsES=IRPF mokėjimai
 VATPayment=Sales tax payment
 VATPayments=Sales tax payments
-VATRefund=Sales tax refund Refund
+VATRefund=Sales tax refund
 Refund=Refund
 SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Rodyti PVM mokėjimą
@@ -194,7 +195,7 @@ CloneTax=Clone a social/fiscal tax
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
 CloneTaxForNextMonth=Clone it for next month
 SimpleReport=Simple report
-AddExtraReport=Extra reports
+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
diff --git a/htdocs/langs/lt_LT/cron.lang b/htdocs/langs/lt_LT/cron.lang
index 059c4c09617..49700c9d714 100644
--- a/htdocs/langs/lt_LT/cron.lang
+++ b/htdocs/langs/lt_LT/cron.lang
@@ -1,10 +1,10 @@
 # Dolibarr language file - Source file is en_US - cron
 # About page
 # Right
-Permission23101 = Read Scheduled job
-Permission23102 = Create/update Scheduled job
-Permission23103 = Delete Scheduled job
-Permission23104 = Execute Scheduled job
+Permission23101 = Skaityti planinį darbą
+Permission23102 = sukurti / atnaujinti planinį darbą
+Permission23103 = Panaikinti planinį darbą
+Permission23104 = Vykdyti planinį darbą
 # Admin
 CronSetup= Numatytos užduoties valdymo nustatymas
 URLToLaunchCronJobs=URL to check and launch qualified cron jobs
@@ -17,14 +17,14 @@ CronMethodDoesNotExists=Class %s does not contains any method %s
 # Menu
 EnabledAndDisabled=Enabled and disabled
 # Page list
-CronLastOutput=Paskutinė paleista išvestis
-CronLastResult=Paskutinio rezultato kodas
+CronLastOutput=Latest run output
+CronLastResult=Latest result code
 CronCommand=Komanda
-CronList=Scheduled jobs
+CronList=Suplanuoti darbai
 CronDelete=Delete scheduled jobs
-CronConfirmDelete=Are you sure you want to delete these scheduled jobs ?
+CronConfirmDelete=Are you sure you want to delete these scheduled jobs?
 CronExecute=Launch scheduled job
-CronConfirmExecute=Are you sure you want to execute these scheduled jobs now ?
+CronConfirmExecute=Are you sure you want to execute these scheduled jobs now?
 CronInfo=Scheduled job module allow to execute job that have been planned
 CronTask=Darbas
 CronNone=Nė vienas
@@ -33,13 +33,13 @@ CronDtEnd=Not after
 CronDtNextLaunch=Kitas vykdymas
 CronDtLastLaunch=Start date of latest execution
 CronDtLastResult=End date of latest execution
-CronFrequency=Frequency
+CronFrequency=Dažnis
 CronClass=Class
 CronMethod=Metodas
 CronModule=Modulis
 CronNoJobs=Nėra registruotų darbų
 CronPriority=Prioritetas
-CronLabel=Label
+CronLabel=Etiketė
 CronNbRun=Pradėti skaičių
 CronMaxRun=Max nb. launch
 CronEach=Kiekvienas
@@ -65,7 +65,7 @@ CronMethodHelp=Objekto metodas įkėlimui. <BR> Pvz.: Dolibarr Produkto objekto
 CronArgsHelp=Metodo argumentai. <BR> Pvz.: Dolibarr Produkto objekto patraukimo metodas /htdocs/product/class/product.class.php, parametrų reikšmė gali būti <i>0, ProductRef</i>
 CronCommandHelp=Sistemos komandinė eilutė vykdymui
 CronCreateJob=Create new Scheduled Job
-CronFrom=From
+CronFrom=Nuo
 # Info
 # Common
 CronType=Job type
diff --git a/htdocs/langs/lt_LT/errors.lang b/htdocs/langs/lt_LT/errors.lang
index 2455c705e40..c00f0160604 100644
--- a/htdocs/langs/lt_LT/errors.lang
+++ b/htdocs/langs/lt_LT/errors.lang
@@ -11,6 +11,7 @@ ErrorLoginAlreadyExists=Prisijungimas %s jau egzistuoja
 ErrorGroupAlreadyExists=Grupė %s jau egzistuoja
 ErrorRecordNotFound=Įrašo nerasta
 ErrorFailToCopyFile=Nepavyko nukopijuoti failo '<b>%s</b>' į '<b>%s</b>'.
+ErrorFailToCopyDir=Failed to copy directory '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToRenameFile=Nepavyko pervadinti failo '<b>%s</b>' į '<b>%s</b>'
 ErrorFailToDeleteFile=Nepavyko pašalinti failo '<b>%s</b>'
 ErrorFailToCreateFile=Nepavyko sukurti failo '<b>%s</b>'.
@@ -115,7 +116,7 @@ ErrorNoActivatedBarcode=Nėra įjungta brūkšninio kodo tipo
 ErrUnzipFails=Nepavyko išpakuoti %s su ZipArchive
 ErrNoZipEngine=Nėra programos išpakuoti failui %s šiame PHP
 ErrorFileMustBeADolibarrPackage=Failas %s turi būti Dolibarr zip paketas
-ErrorFileRequired=Tai apima Dolibarr failo paketą
+ErrorModuleFileRequired=You must select a Dolibarr module package file
 ErrorPhpCurlNotInstalled=PHP CURL nėra įdiegta, tai yra būtina kalbantis su PayPal
 ErrorFailedToAddToMailmanList=Nepavyko pridėti įrašo %s į Paštininko sąrašą %s arba SPIP bazę
 ErrorFailedToRemoveToMailmanList=Nepavyko pašalinti įrašo %s iš Paštininko sąrašo %s arba SPIP bazės
@@ -170,14 +171,19 @@ ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
 ErrorFileMustHaveFormat=File must have format %s
 ErrorSupplierCountryIsNotDefined=Šio tiekėjo šalis nėra apibrėžta. Tai ištaisyti pirmiausia.
 ErrorsThirdpartyMerge=Failed to merge the two records. Request canceled.
-ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enougth for product %s to add it into a new order.
-ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enougth for product %s to add it into a new invoice.
-ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enougth for product %s to add it into a new shipment.
-ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enougth for product %s to add it into a new proposal.
-ErrorFailedToLoadLoginFileForMode=Failed to get the login file for mode '%s'.
+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 bank 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>
 
 # 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.
diff --git a/htdocs/langs/lt_LT/holiday.lang b/htdocs/langs/lt_LT/holiday.lang
index a0f182d1927..fa7334e1353 100644
--- a/htdocs/langs/lt_LT/holiday.lang
+++ b/htdocs/langs/lt_LT/holiday.lang
@@ -76,8 +76,9 @@ BoxTitleLastLeaveRequests=Latest %s modified leave requests
 HolidaysMonthlyUpdate=Mėnesio atnaujinimas
 ManualUpdate=Rankinis atnaujinimas
 HolidaysCancelation=Leave request cancelation
-EmployeeLastname=Employee lastname
-EmployeeFirstname=Employee firstname
+EmployeeLastname=Employee last name
+EmployeeFirstname=Employee first name
+TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
 
 ## Configuration du Module ##
 LastUpdateCP=Latest automatic update of leaves allocation
diff --git a/htdocs/langs/lt_LT/ldap.lang b/htdocs/langs/lt_LT/ldap.lang
index d375a93de92..ec904851e04 100644
--- a/htdocs/langs/lt_LT/ldap.lang
+++ b/htdocs/langs/lt_LT/ldap.lang
@@ -13,8 +13,8 @@ LDAPUsers=Vartotojai LDAP duomenų bazėje
 LDAPFieldStatus=Būklė
 LDAPFieldFirstSubscriptionDate=Pirma prenumeratos data
 LDAPFieldFirstSubscriptionAmount=Pirma prenumeratos suma
-LDAPFieldLastSubscriptionDate=Paskutinė prenumeratos data
-LDAPFieldLastSubscriptionAmount=Paskutinė prenumeratos suma
+LDAPFieldLastSubscriptionDate=Latest subscription date
+LDAPFieldLastSubscriptionAmount=Latest subscription amount
 LDAPFieldSkype=Skype id
 LDAPFieldSkypeExample=Example : skypeName
 UserSynchronized=Vartotojas sinchronizuotas
diff --git a/htdocs/langs/lt_LT/mails.lang b/htdocs/langs/lt_LT/mails.lang
index 14a87267a5c..4dc58be2aa7 100644
--- a/htdocs/langs/lt_LT/mails.lang
+++ b/htdocs/langs/lt_LT/mails.lang
@@ -35,7 +35,7 @@ MailingStatusSentPartialy=Išsiųsta dalinai
 MailingStatusSentCompletely=Išsiųsta pilnai
 MailingStatusError=Klaida
 MailingStatusNotSent=Neišsiųsta
-MailSuccessfulySent=E-laiškas sėkmingai išsiųstas (iš %s į %s)
+MailSuccessfulySent=Email successfully accepted for delivery (from %s to %s)
 MailingSuccessfullyValidated=E-paštas sėkmingai patvirtintas
 MailUnsubcribe=Atsisakyti pasirašymo
 MailingStatusNotContact=Daugiau nesikreipti
@@ -74,22 +74,28 @@ ResultOfMailSending=Result of mass EMail sending
 NbSelected=Nb selected
 NbIgnored=Nb ignored
 NbSent=Nb 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
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Failo eilutė %s
 RecipientSelectionModules=Apibrėžtos užklausos gavėjų atrankai
 MailSelectedRecipients=Pasirinkti gavėjai
 MailingArea=E-pašto sritis
-LastMailings=Paskutiniai %s e-laiškai
+LastMailings=Latest %s emailings
 TargetsStatistics=Nuorodų statistika
 NbOfCompaniesContacts=Unikalūs kontaktai/ adresai
 MailNoChangePossible=Patvirtintų e-laiškų gavėjai negali būti pakeisti
 SearchAMailing=E-pašto paieška
 SendMailing=Siųsti e-paštą
 SendMail=Siųsti e-laišką
-MailingNeedCommand=Saugumo sumetimais, siunčiant e-paštu yra geriau, kai tai atliekama iš komandinės eilutės. Jei turite vieną, kreipkitės į serverio administratorių pradėti šią komandą siųsti e-paštą visiems gavėjams:
+SentBy=Išsiųsta iš
+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=Galite siųsti jiems internetu pridedant parametrą MAILING_LIMIT_SENDBYWEB su maks. laiškų kiekio, norimų siųsti sesijos metu, reikšme. Tam eiti į Pagrindinis-Nustatymai-Kiti.
-ConfirmSendingEmailing=If you can't or prefer sending them with your www browser, please confirm you are sure you want to send emailing now from your browser?
+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.
 TargetsReset=Išvalyti sąrašą
 ToClearAllRecipientsClickHere=Spauskite čia, kad išvalytumėte šio e-laiško gavėjų sąrašą
@@ -144,3 +150,6 @@ AdvTgtCreateFilter=Create filter
 AdvTgtOrCreateNewFilter=Name of new filter
 NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
+OutGoingEmailSetup=Outgoing email setup
+InGoingEmailSetup=Incoming email setup
+
diff --git a/htdocs/langs/lt_LT/main.lang b/htdocs/langs/lt_LT/main.lang
index ab8b506e208..54dad192df6 100644
--- a/htdocs/langs/lt_LT/main.lang
+++ b/htdocs/langs/lt_LT/main.lang
@@ -63,11 +63,13 @@ ErrorNoVATRateDefinedForSellerCountry=Klaida, nėra apibrėžtų PVM tarifų ša
 ErrorNoSocialContributionForSellerCountry=Klaida, socialiniai / fiskaliniai mokesčiai neapibrėžti šaliai '%s'.
 ErrorFailedToSaveFile=Klaida, nepavyko išsaugoti failo.
 ErrorCannotAddThisParentWarehouse=You are trying to add a parent warehouse which is already a child of current one
+MaxNbOfRecordPerPage=Max nb of record per page
 NotAuthorized=You are not authorized to do that.
 SetDate=Nustatyti datą
 SelectDate=Pasirinkti datą
 SeeAlso=Taip pat žiūrėkite %s
 SeeHere=Žiūrėkite čia
+Apply=Taikyti
 BackgroundColorByDefault=Fono spalva pagal nutylėjimą
 FileRenamed=The file was successfully renamed
 FileUploaded=Failas buvo sėkmingai įkeltas
@@ -86,7 +88,7 @@ Undefined=Neapibrėžtas
 PasswordForgotten=Password forgotten?
 SeeAbove=Žiūrėti aukščiau
 HomeArea=Pagrindinė sritis
-LastConnexion=Paskutinis prisijungimas
+LastConnexion=Latest connection
 PreviousConnexion=Ankstesnis prisijungimas
 PreviousValue=Previous value
 ConnectedOnMultiCompany=Prisijungta aplinkoje
@@ -236,7 +238,7 @@ DateCreation=Sukūrimo data
 DateCreationShort=Creat. date
 DateModification=Pakeitimo data
 DateModificationShort=Pakeitimo data
-DateLastModification=Paskutinio pakeitimo data
+DateLastModification=Latest modification date
 DateValidation=Patvirtinimo data
 DateClosing=Uždarymo data
 DateDue=Laukiama data
@@ -432,7 +434,7 @@ Reportings=Ataskaitos
 Draft=Projektas
 Drafts=Projektai
 Validated=Pripažinti galiojančiais
-Opened=Atidarytas
+Opened=Atidaryta
 New=Naujas
 Discount=Nuolaida
 Unknown=Nežinomas
@@ -460,6 +462,7 @@ DeletePicture=Ištrinti nuotrauką
 ConfirmDeletePicture=Patvirtinkite nuotraukos trynimą
 Login=Prisijungimas
 CurrentLogin=Dabartinis prisijungimas
+EnterLoginDetail=Enter login details
 January=Sausis
 February=Vasaris
 March=Kovas
@@ -597,6 +600,8 @@ SessionName=Sesijos pavadinimas
 Method=Metodas
 Receive=Gauti
 CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
+ExpectedValue=Expected Value
+CurrentValue=Dabartinė reikšmė
 PartialWoman=Dalinis
 TotalWoman=Visas
 NeverReceived=Niekada negautas
@@ -753,6 +758,8 @@ RemoveString=Remove string '%s'
 SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
 DirectDownloadLink=Direct download link
 Download=Download
+ActualizeCurrency=Update currency rate
+Fiscalyear=Fiskaliniai metai
 # Week day
 Monday=Pirmadienis
 Tuesday=Antradienis
@@ -787,8 +794,8 @@ SetRef=Set ref
 Select2ResultFoundUseArrows=Some results found. Use arrows to select.
 Select2NotFound=No result found
 Select2Enter=Enter
-Select2MoreCharacter=or more character
-Select2MoreCharacters=or more characters
+Select2MoreCharacter=or more characters<br /><br /><strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
+Select2MoreCharacters=or more characters<br /><br /><strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
 Select2LoadingMoreResults=Loading more results...
 Select2SearchInProgress=Search in progress...
 SearchIntoThirdparties=Thirdparties
@@ -809,3 +816,5 @@ SearchIntoContracts=Sutartys
 SearchIntoCustomerShipments=Customer shipments
 SearchIntoExpenseReports=Išlaidų ataskaitos
 SearchIntoLeaves=Leaves
+
+BulkActions=Bulk actions
diff --git a/htdocs/langs/lt_LT/members.lang b/htdocs/langs/lt_LT/members.lang
index 444f8178d4d..8a2e5cf80ae 100644
--- a/htdocs/langs/lt_LT/members.lang
+++ b/htdocs/langs/lt_LT/members.lang
@@ -45,7 +45,7 @@ MemberStatusDraft=Projektas (turi būti patvirtintas)
 MemberStatusDraftShort=Projektas
 MemberStatusActive=Patvirtintas (laukiama pasirašymo)
 MemberStatusActiveShort=Patvirtintas
-MemberStatusActiveLate=Pasirašymas pasibaigęs
+MemberStatusActiveLate=Subscription expired
 MemberStatusActiveLateShort=Pasibaigęs
 MemberStatusPaid=Pasirašymas atnaujintas
 MemberStatusPaidShort=Atnaujintas
@@ -136,8 +136,8 @@ DocForAllMembersCards=Sukurti vizitines korteles visiems nariams
 DocForOneMemberCards=Sukurti vizitines korteles tam tikriems nariams
 DocForLabels=Sukurti adresų lapus
 SubscriptionPayment=Pasirašymo apmokėjimas
-LastSubscriptionDate=Paskutinio pasirašymo data
-LastSubscriptionAmount=Paskutinio pasirašymo suma
+LastSubscriptionDate=Latest subscription date
+LastSubscriptionAmount=Latest subscription amount
 MembersStatisticsByCountries=Narių statistiniai duomenys pagal šalį
 MembersStatisticsByState=Narių statistiniai duomenys pagal valstybę/regioną
 MembersStatisticsByTown=Narių statistiniai duomenys pagal miestus
@@ -149,7 +149,7 @@ MembersByStateDesc=Šis ekranas rodo narių statistiką pagal valstybes/regionus
 MembersByTownDesc=Šis ekranas rodo narių statistiką pagal miestus
 MembersStatisticsDesc=Pasirinkite statistiką, kurią norite skaityti
 MenuMembersStats=Statistika
-LastMemberDate=Paskutinio nario data
+LastMemberDate=Latest member date
 Nature=Kilmė
 Public=Informacija yra vieša
 NewMemberbyWeb=Naujas narys pridėtas. Laukiama patvirtinimo
diff --git a/htdocs/langs/lt_LT/orders.lang b/htdocs/langs/lt_LT/orders.lang
index a5d3ce6ecc6..cfd2fc3e47a 100644
--- a/htdocs/langs/lt_LT/orders.lang
+++ b/htdocs/langs/lt_LT/orders.lang
@@ -39,7 +39,7 @@ StatusOrderRefusedShort=Atmesta
 StatusOrderBilledShort=Sąskaita-faktūra pateikta
 StatusOrderToProcessShort=Apdoroti
 StatusOrderReceivedPartiallyShort=Dalinai gauta
-StatusOrderReceivedAllShort=Viskas gauta
+StatusOrderReceivedAllShort=Products received
 StatusOrderCanceled=Atšauktas
 StatusOrderDraft=Projektas (turi būti patvirtintas)
 StatusOrderValidated=Patvirtintas
@@ -51,7 +51,7 @@ StatusOrderApproved=Patvirtinta
 StatusOrderRefused=Atmesta
 StatusOrderBilled=Sąskaita-faktūra pateikta
 StatusOrderReceivedPartially=Dalinai gauta
-StatusOrderReceivedAll=Viskas gauta
+StatusOrderReceivedAll=All products received
 ShippingExist=Gabenimas vyksta
 QtyOrdered=Užsakytas kiekis
 ProductQtyInDraft=Prekių kiekis preliminariuose užsakymuose
diff --git a/htdocs/langs/lt_LT/other.lang b/htdocs/langs/lt_LT/other.lang
index 2ba7c32bdde..1a7647cf207 100644
--- a/htdocs/langs/lt_LT/other.lang
+++ b/htdocs/langs/lt_LT/other.lang
@@ -2,6 +2,7 @@
 SecurityCode=Saugos kodas
 NumberingShort=N°
 Tools=Įrankiai
+TMenuTools=Įrankiai
 ToolsDesc=All miscellaneous tools not included in other menu entries are collected here.<br /><br />All the tools can be reached in the left menu.
 Birthday=Gimimo diena
 BirthdayDate=Birthday date
@@ -67,14 +68,15 @@ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find her
 PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nČia rasite pakrovimo gabenimui dokumentą __ SHIPPINGREF__\n\n__ PERSONALIZED__Sincerely\n\n__ SIGNATURE__
 PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nČia rasite intervencijos dokumentą __ FICHINTERREF__\n\n__ PERSONALIZED__Sincerely\n\n__ SIGNATURE__
 PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n __ PERSONALIZED__ \n\n__ SIGNATURE__
-DemoDesc=Dolibarr is a compact ERP/CRM supporting several functional modules. A demo showcasing all modules makes no sense as this scenario never occurs. So, several demo profiles are available.
+DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
+ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
 DemoFundation=Valdyti organizacijos narius
 DemoFundation2=Valdyti organizacijos narius ir banko sąskaitą
-DemoCompanyServiceOnly=Valdyti tik laisvai samdomą pardavimo paslaugų veiklą
+DemoCompanyServiceOnly=Company or freelance selling service only
 DemoCompanyShopWithCashDesk=Valdyti parduotuvę su kasos aparatu
-DemoCompanyProductAndStocks=Valdyti mažos ar vidutinės įmonės parduodamus produktus
-DemoCompanyAll=Valdyti mažą ar vidutinio dydžio įmonę su keliomis veiklomis (visi pagrindiniai moduliai)
+DemoCompanyProductAndStocks=Company selling products with a shop
+DemoCompanyAll=Company with multiple activities (all main modules)
 CreatedBy=Sukurta %s
 ModifiedBy=Modifikuota %s
 ValidatedBy=Patvirtinta %s
diff --git a/htdocs/langs/lt_LT/products.lang b/htdocs/langs/lt_LT/products.lang
index 3a0257c8df1..0169e75851b 100644
--- a/htdocs/langs/lt_LT/products.lang
+++ b/htdocs/langs/lt_LT/products.lang
@@ -5,6 +5,8 @@ ProductLabelTranslated=Translated product label
 ProductDescriptionTranslated=Translated product description
 ProductNoteTranslated=Translated product note
 ProductServiceCard=Produkto / Paslaugos kortelė
+TMenuProducts=Produktai
+TMenuServices=Paslaugos
 Products=Produktai
 Services=Paslaugos
 Product=Produktas
@@ -58,7 +60,7 @@ SellingPrice=Pardavimo kaina
 SellingPriceHT=Pardavimo kaina (atskaičius mokesčius)
 SellingPriceTTC=Pardavimo kaina (įskaitant mokesčius)
 CostPriceDescription=This price (net of tax) can be used to store the average amount this product cost to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
-CostPriceUsage=In a future version, this value could be used for margin calculation.
+CostPriceUsage=This value could be used for margin calculation.
 SoldAmount=Sold amount
 PurchasedAmount=Purchased amount
 NewPrice=Nauja kaina
@@ -140,6 +142,7 @@ ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b>?
 CloneContentProduct=Klonuoti visą pagrindinę produkto/paslaugos informaciją
 ClonePricesProduct=Klonuoti pagrindinę informaciją ir kainas
 CloneCompositionProduct=Clone packaged product/service
+CloneCombinationsProduct=Clone product variants
 ProductIsUsed=Šis produktas naudojamas
 NewRefForClone=Naujo produkto/paslaugos nuoroda
 SellingPrices=Selling prices
@@ -236,7 +239,7 @@ GlobalVariables=Global variables
 VariableToUpdate=Variable to update
 GlobalVariableUpdaters=Global variable updaters
 UpdateInterval=Update interval (minutes)
-LastUpdated=Last updated
+LastUpdated=Latest update
 CorrectlyUpdated=Correctly updated
 PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
 PropalMergePdfProductChooseFile=Select PDF files
@@ -256,4 +259,41 @@ VolumeUnits=Volume unit
 SizeUnits=Size unit
 DeleteProductBuyPrice=Delete buying price
 ConfirmDeleteProductBuyPrice=Are you sure you want to delete this buying price?
+SubProduct=Sub product
 
+#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
+ProductCombinations=Variants
+HideProductCombinations=Hide products variant in the products selector
+ProductCombination=Variant
+NewProductCombination=New variant
+EditProductCombination=Editing variant
+ProductCombinationGenerator=Variants generator
+Features=Features
+PriceImpact=Price impact
+WeightImpact=Weight impact
+NewProductAttribute=Naujas atributas
+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
+PercentageVariation=Percentage variation
+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 child products
+ConfirmCloneProductCombinations=Would you like to copy all the product variant to the 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
diff --git a/htdocs/langs/lt_LT/projects.lang b/htdocs/langs/lt_LT/projects.lang
index c59cdd51b85..fe5adf133d1 100644
--- a/htdocs/langs/lt_LT/projects.lang
+++ b/htdocs/langs/lt_LT/projects.lang
@@ -29,9 +29,9 @@ DeleteAProject=Ištrinti projektą
 DeleteATask=Ištrinti užduotį
 ConfirmDeleteAProject=Are you sure you want to delete this project?
 ConfirmDeleteATask=Are you sure you want to delete this task?
-OpenedProjects=Open projects
-OpenedTasks=Open tasks
-OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
+OpenedProjects=Opened projects
+OpenedTasks=Opened tasks
+OpportunitiesStatusForOpenedProjects=Opportunities amount of opened projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=Rodyti projektą
 SetProject=Nustatykite projektą
@@ -47,7 +47,7 @@ TaskTimeSpent=Laikas, praleistas vykdant užduotis
 TaskTimeUser=Vartotojas
 TaskTimeNote=Pastaba
 TaskTimeDate=Data
-TasksOnOpenedProject=Užduotys atidarytuose projektuose
+TasksOnOpenedProject=Tasks on opened projects
 WorkloadNotDefined=Darbo krūvis nėra apibrėžtas
 NewTimeSpent=Naujas praleistas laikas
 MyTimeSpent=Mano praleistas laikas
@@ -58,6 +58,7 @@ TaskDateEnd=Užduoties pabaigos data
 TaskDescription=Užduoties aprašymas
 NewTask=Nauja užduotis
 AddTask=Sukurti užduotį
+AddTimeSpent=Create time spent
 Activity=Veikla
 Activities=Užduotys/veikla
 MyActivities=Mano užduotys/veikla
@@ -95,6 +96,7 @@ ValidateProject=Patvirtinti projektą
 ConfirmValidateProject=Are you sure you want to validate this project?
 CloseAProject=Uždaryti projektą
 ConfirmCloseAProject=Are you sure you want to close this project?
+AlsoCloseAProject=Also close project (keep it open if you still need to follow production tasks on it)
 ReOpenAProject=Atidaryti projektą
 ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=Projekto kontaktai
@@ -120,7 +122,7 @@ CloneProjectFiles=Klonuoti projekto jungiamus failus
 CloneTaskFiles=Klonuoti užduoties (-ių) jungiamus failus (jei užduotis (-ys) klonuotos)
 CloneMoveDate=Update project/tasks dates from now?
 ConfirmCloneProject=Are you sure to clone this project?
-ProjectReportDate=Pakeisti užduoties datą priklausomai nuo projekto pradžios datos
+ProjectReportDate=Change task dates according to new project start date
 ErrorShiftTaskDate=Neįmanoma perkelti užduoties datą į naujo projekto pradžios datą
 ProjectsAndTasksLines=Projektai ir užduotys
 ProjectCreatedInDolibarr=Projektas %s sukurtas
@@ -177,9 +179,9 @@ ProjectsStatistics=Statistics on projects/leads
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 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.
-OpenedProjectsByThirdparties=Open projects by thirdparties
+OpenedProjectsByThirdparties=Opened projects by thirdparties
 OnlyOpportunitiesShort=Only opportunities
-OpenedOpportunitiesShort=Open opportunities
+OpenedOpportunitiesShort=Opened opportunities
 NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount
diff --git a/htdocs/langs/lt_LT/propal.lang b/htdocs/langs/lt_LT/propal.lang
index a2e9e07fb43..53df03b5932 100644
--- a/htdocs/langs/lt_LT/propal.lang
+++ b/htdocs/langs/lt_LT/propal.lang
@@ -3,7 +3,7 @@ Proposals=Komerciniai pasiūlymai
 Proposal=Komercinis pasiūlymas
 ProposalShort=Pasiūlymas
 ProposalsDraft=Komercinių pasiūlymų projektai
-ProposalsOpened=Open commercial proposals
+ProposalsOpened=Atidaryti komerciniai pasiūlymai
 Prop=Komerciniai pasiūlymai
 CommercialProposal=Komercinis pasiūlymas
 ProposalCard=Pasiūlymo kortelė
@@ -28,7 +28,7 @@ ShowPropal=Rodyti pasiūlymą
 PropalsDraft=Projektai
 PropalsOpened=Atidaryta
 PropalStatusDraft=Projektas (turi būti patvirtintas)
-PropalStatusValidated=Patvirtintas (pasiūlymas yra atidarytas)
+PropalStatusValidated=Validated (proposal is opened)
 PropalStatusSigned=Pasirašyta (reikia pateikti sąskaitą-faktūrą)
 PropalStatusNotSigned=Nepasirašyta (uždarytas)
 PropalStatusBilled=Sąskaita-faktūra pateikta
diff --git a/htdocs/langs/lt_LT/stocks.lang b/htdocs/langs/lt_LT/stocks.lang
index 5cfca874d37..3c6dd908bd7 100644
--- a/htdocs/langs/lt_LT/stocks.lang
+++ b/htdocs/langs/lt_LT/stocks.lang
@@ -22,13 +22,15 @@ Movements=Judesiai
 ErrorWarehouseRefRequired=Sandėlio nuorodos pavadinimas yra būtinas
 ListOfWarehouses=Sandėlių sąrašas
 ListOfStockMovements=Atsargų judėjimų sąrašas
+StockMovementForId=Movement ID %d
+ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Sandėlių plotas
 Location=Vieta
 LocationSummary=Trumpas vietos pavadinimas
 NumberOfDifferentProducts=Skirtingų produktų skaičius
 NumberOfProducts=Viso produktų skaičius
-LastMovement=Paskutinis judėjimas
-LastMovements=Paskutiniai judęjimai
+LastMovement=Latest movement
+LastMovements=Latest movements
 Units=Vienetai
 Unit=Vienetas
 StockCorrection=Koreguoti atsargas
@@ -140,3 +142,4 @@ ProductStockWarehouseCreated=Stock limit for alert and desired optimal stock cor
 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
diff --git a/htdocs/langs/lt_LT/supplier_proposal.lang b/htdocs/langs/lt_LT/supplier_proposal.lang
index cccd8a69c7e..634e34696af 100644
--- a/htdocs/langs/lt_LT/supplier_proposal.lang
+++ b/htdocs/langs/lt_LT/supplier_proposal.lang
@@ -8,7 +8,7 @@ SearchRequest=Find a request
 DraftRequests=Draft requests
 SupplierProposalsDraft=Draft supplier proposals
 LastModifiedRequests=Latest %s modified price requests
-RequestsOpened=Open price requests
+RequestsOpened=Opened price requests
 SupplierProposalArea=Supplier proposals area
 SupplierProposalShort=Supplier proposal
 SupplierProposals=Supplier proposals
@@ -23,7 +23,7 @@ ConfirmValidateAsk=Are you sure you want to validate this price request under na
 DeleteAsk=Delete request
 ValidateAsk=Validate request
 SupplierProposalStatusDraft=Projektas (turi būti patvirtintas)
-SupplierProposalStatusValidated=Validated (request is open)
+SupplierProposalStatusValidated=Validated (request is opened)
 SupplierProposalStatusClosed=Uždaryta
 SupplierProposalStatusSigned=Accepted
 SupplierProposalStatusNotSigned=Atmestas
diff --git a/htdocs/langs/lt_LT/suppliers.lang b/htdocs/langs/lt_LT/suppliers.lang
index 62b5d3186bb..717aea623da 100644
--- a/htdocs/langs/lt_LT/suppliers.lang
+++ b/htdocs/langs/lt_LT/suppliers.lang
@@ -9,7 +9,7 @@ ShowSupplier=Rodyti tiekėją
 OrderDate=Užsakymo data
 BuyingPriceMin=Best buying price
 BuyingPriceMinShort=Best buying price
-TotalBuyingPriceMinShort=Total of subproducts buying prices
+TotalBuyingPriceMinShort=Iš viso subproduktų pirkimo kaina
 TotalSellingPriceMinShort=Total of subproducts selling prices
 SomeSubProductHaveNoPrices=Kai kurie subproduktai neturi apibrėžtos kainos
 AddSupplierPrice=Add buying price
@@ -24,10 +24,10 @@ ExportDataset_fournisseur_1=Tiekėjo sąskaitų-faktūrų sąrašas ir sąskaito
 ExportDataset_fournisseur_2=Tiekėjo sąskaitos-faktūros ir mokėjimai
 ExportDataset_fournisseur_3=Tiekėjo užsakymai ir užsakymo eilutės
 ApproveThisOrder=Patvirtinti šį užsakymą
-ConfirmApproveThisOrder=Ar tikrai norite patvirtinti užsakymą <b>%s</b> ?
+ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b>?
 DenyingThisOrder=Atmesti šį užsakymą
-ConfirmDenyingThisOrder=Ar tikrai norite atsisakyti šio užsakymo <b> s?</b>
-ConfirmCancelThisOrder=Ar tikrai norite atšaukti šį užsakymą <b>%s</b> ?
+ConfirmDenyingThisOrder=Are you sure you want to deny this order <b>%s</b>?
+ConfirmCancelThisOrder=Are you sure you want to cancel this order <b>%s</b>?
 AddSupplierOrder=Sukurti tiekėjo užsakymą
 AddSupplierInvoice=Sukurti tiekėjo sąskaitą-faktūrą
 ListOfSupplierProductForSupplier=Produktų ir kainų sąrašas tiekėjui <b>%s</b>
@@ -41,3 +41,4 @@ DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Wrong quality
 ReputationForThisProduct=Reputation
 BuyerName=Buyer name
+AllProductServicePrices=All product / service prices
diff --git a/htdocs/langs/lt_LT/users.lang b/htdocs/langs/lt_LT/users.lang
index 8eb26b0be25..4af781a0ec6 100644
--- a/htdocs/langs/lt_LT/users.lang
+++ b/htdocs/langs/lt_LT/users.lang
@@ -36,7 +36,7 @@ AdministratorDesc=Administratorius
 DefaultRights=Leidimai pagal nutylėjimą
 DefaultRightsDesc=Nustatykite čia teises <u>pagal nutylėjimą</u>, kurios yra automatiškai suteiktos <u>naujo sukurto</u> vartotojo (Eiti į vartotojo kortelę ir pakeisti esamo vartotojo teises).
 DolibarrUsers=Dolibarr vartotojai
-LastName=Last Name
+LastName=Pavardė
 FirstName=Vardas
 ListOfGroups=Grupių sąrašas
 NewGroup=Nauja grupė
diff --git a/htdocs/langs/lt_LT/withdrawals.lang b/htdocs/langs/lt_LT/withdrawals.lang
index 5ac2bb6c0f2..defb189bf56 100644
--- a/htdocs/langs/lt_LT/withdrawals.lang
+++ b/htdocs/langs/lt_LT/withdrawals.lang
@@ -24,6 +24,7 @@ WithdrawStatistics=Direct debit payment statistics
 WithdrawRejectStatistics=Direct debit payment reject statistics
 LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
+WithdrawRequestsDone=%s direct debit payment requests recorded
 ThirdPartyBankCode=Trečiosios šalies banko kodas
 NoInvoiceCouldBeWithdrawed=Nėra sėkmingai išimtų sąskaitų-faktūrų. Patikrinkite, ar sąskaitos-faktūros įmonėms, turinčioms galiojantį BAN.
 ClassCredited=Priskirti įskaitytas (credited)
@@ -76,8 +77,8 @@ RUM=UMR
 RUMLong=Unique Mandate Reference
 RUMWillBeGenerated=UMR number will be generated once bank account information are saved
 WithdrawMode=Direct debit mode (FRST or RECUR)
-WithdrawRequestAmount=Withdraw request amount:
-WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil amount.
+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
diff --git a/htdocs/langs/lv_LV/accountancy.lang b/htdocs/langs/lv_LV/accountancy.lang
index 5ad03c4dc53..f4c34b6b7f4 100644
--- a/htdocs/langs/lv_LV/accountancy.lang
+++ b/htdocs/langs/lv_LV/accountancy.lang
@@ -194,6 +194,8 @@ ChangeBinding=Change the binding
 
 ## Admin
 ApplyMassCategories=Apply mass categories
+AddAccountFromBookKeepingWithNoCategories=Add acccount already used with no categories
+CategoryDeleted=Category for the accounting account has been removed
 
 ## Export
 Exports=Eksports
@@ -209,6 +211,7 @@ Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution
 Modelcsv_quadratus=Export towards Quadratus QuadraCompta
 Modelcsv_ebp=Export towards EBP
 Modelcsv_cogilog=Export towards Cogilog
+ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
 InitAccountancy=Init accountancy
diff --git a/htdocs/langs/lv_LV/admin.lang b/htdocs/langs/lv_LV/admin.lang
index fb91789851f..1f4f60c4407 100644
--- a/htdocs/langs/lv_LV/admin.lang
+++ b/htdocs/langs/lv_LV/admin.lang
@@ -9,14 +9,20 @@ VersionDevelopment=Attīstība
 VersionUnknown=Nezināms
 VersionRecommanded=Ieteicams
 FileCheck=Failu veseluma pārbaudītājs
-FileCheckDesc=This tool allows you to check the integrity of files of your application, comparing each files with the official ones. You can use this tool to detect if some files were modified by a hacker for example.
+FileCheckDesc=This tool allows you to check the integrity of files and setup of your application, comparing each files with the official ones. 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.
+FileIntegrityIsStrictlyConformedWithReference=Files integrity is strictly conformed with the reference.
+FileIntegrityIsOkButFilesWereAdded=Files integrity check has passed, however some new files were added.
+FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified, removed or added.
+GlobalChecksum=Global checksum
 MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
 LocalSignature=Embedded local signature (less reliable)
 RemoteSignature=Remote distant signature (more reliable)
 FilesMissing=Trūkstošie faili
 FilesUpdated=Atjaunotie faili
+FilesModified=Modified Files
+FilesAdded=Added Files
 FileCheckDolibarr=Pārbaudīt aplikācijas failu veselumu
-AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from a certified package
+AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from an official package
 XmlNotFound=Xml Integrity File of application not found
 SessionId=Sesijas ID
 SessionSaveHandler=Handler, lai saglabātu sesijas
@@ -185,7 +191,9 @@ BoxesDesc=Widgets are components showing some information that you can add to pe
 OnlyActiveElementsAreShown=Tikai elementus no <a href="%s">iespējotu moduļi</a> tiek parādīts.
 ModulesDesc=Dolibarr moduļi noteikt, kura funkcionalitāte ir iespējots programmatūru. Daži moduļi pieprasa atļaujas, jums ir piešķirt lietotājiem, pēc tam ļaujot moduli. Noklikšķiniet uz pogas on / off ailē "Statuss", lai nodrošinātu moduli / funkciju.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
-ModulesMarketPlaces=Papildus moduļi ...
+ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
+ModulesMarketPlaces=Find external modules...
+GoModuleSetupArea=To deploy/install a new module, go onto the Module setup area at <a href="%s">%s</a>.
 DoliStoreDesc=DoliStore ir oficiālā mājaslapa Dolibarr ERP / CRM papildus moduļiem
 DoliPartnersDesc=List of companies providing custom developed modules or features (Note: anyone experienced in PHP programming can provide custom development for an open source project)
 WebSiteDesc=Reference websites to find more modules...
@@ -276,21 +284,22 @@ ModuleFamilyInterface=Interfaces with external systems
 MenuHandlers=Izvēlnes manipulatori
 MenuAdmin=Izvēlnes redaktors
 DoNotUseInProduction=Neizmantot produkcijā
-ThisIsProcessToFollow=Šie ir soļi, kas jāipilda:
-ThisIsAlternativeProcessToFollow=This is an alternative setup to process:
+ThisIsProcessToFollow=This is steps to process:
+ThisIsAlternativeProcessToFollow=This is an alternative setup to process manually:
 StepNb=Solis %s
 FindPackageFromWebSite=Atrast paku, kas nodrošina iespēju,  kura jums ir nepieciešama (piemēram oficiālajā tīmekļa vietnē %s).
 DownloadPackageFromWebSite=Lejupielādēt arhīvu (piem. no oficialās mājas lapas %s).
-UnpackPackageInDolibarrRoot=Atarhivēt paku Dolibarr servera direktorijā, kas paredzēta ārējiem moduļiem: <b>%s</b>
-SetupIsReadyForUse=Instalēšana ir pabeigta un Dolibarr ir gatavs lietošanai ar šo jauno komponentu.
-NotExistsDirect=Alternatīva saknes direktorijs nav definēta.<br>
-InfDirAlt=Kopš 3 versijas, ir iespējams noteikt alternatīvu sakne directory.Tas ļauj jums saglabāt, tajā pašā vietā, papildinājumus un pielāgotas veidnes.<br> Jums tikai jāizveido direktoriju Dolibarr saknē (piemēram: custom).<br>
-InfDirExample=<br> Tad paziņo to failu conf.php <br> $ Dolibarr_main_url_root_alt = 'http://myserver/custom' <br> $ Dolibarr_main_document_root_alt = '/ ceļš / uz / dolibarr / htdocs / custom' <br> * Šīs līnijas ir komentēja ar "#", lai uncomment tikai noņemt raksturs.
+UnpackPackageInDolibarrRoot=Unpack the packaged files into server directory dedicated to Dolibarr: <b>%s</b>
+UnpackPackageInModulesRoot=To deploy/install an external module, unpack the packaged files into the server directory dedicated to modules: <b>%s</b>
+SetupIsReadyForUse=Module deployment is finished. You must however enable and setup the module in your application by going on the page to setup modules: <a href="%s">%s</a>.
+NotExistsDirect=The alternative root directory is not defined to an existing directory.<br>
+InfDirAlt=Since version 3, it is possible to define an alternative root directory. This allows you to store, into a dedicated directory, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
+InfDirExample=<br>Then declare it in the file <strong>conf.php</strong><br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>If these lines are commented with "#", to enable them, just uncomment by removing the "#" character.
 YouCanSubmitFile=For this step, you can send package using this tool: Select module file
 CurrentVersion=Dolibarr pašreizējā versija
 CallUpdatePage=Go to the page that updates the database structure and data: %s.
 LastStableVersion=Jaunākā stabilā versija
-LastActivationDate=Pēdējais aktivizēšanas datums
+LastActivationDate=Latest activation date
 UpdateServerOffline=Update server offline
 GenericMaskCodes=Jūs varat ievadīt jebkuru numerācijas masku. Šajā maska, šādus tagus var izmantot: <br> <b>{000000}</b> atbilst skaitam, kas tiks palielināts par katru %s. Ievadīt tik daudz nullēm, kā vajadzīgajā garumā letes. Skaitītājs tiks pabeigts ar nullēm no kreisās puses, lai būtu tik daudz nullēm kā masku. <br> <b>{000000 000}</b> tāds pats kā iepriekšējais, bet kompensēt atbilst noteiktam skaitam pa labi uz + zīmi tiek piemērots, sākot ar pirmo %s. <br> <b>{000000 @ x}</b> tāds pats kā iepriekšējais, bet skaitītājs tiek atiestatīts uz nulli, kad mēnesī x ir sasniegts (x no 1 līdz 12, 0 vai izmantot agri no finanšu gada mēnešiem, kas noteiktas konfigurācijas, 99 vai atiestatīt uz nulli katru mēnesi ). Ja šis variants tiek izmantots, un x ir 2 vai vairāk, tad secība {gggg} {mm} vai {GGGG} {mm} ir arī nepieciešama. <br> <b>{Dd}</b> diena (no 01 līdz 31). <br> <b>{Mm}</b> mēnesi (no 01 līdz 12). <br> <b>{Yy}, {GGGG}</b> vai <b>{y}</b> gadu vairāk nekā 2, 4 vai 1 numuri. <br>
 GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of thirdparty type on n characters (see dictionary-thirdparty types).<br>
@@ -373,11 +382,11 @@ ExtrafieldCheckBox=Rūtiņa
 ExtrafieldRadio=Radio poga
 ExtrafieldCheckBoxFromList= Checkbox from table
 ExtrafieldLink=Link to an object
-ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>In order to have the list depending on another :<br>1,value1|parent_list_code:parent_key<br>2,value2|parent_list_code:parent_key
+ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list :<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list :<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
-ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
+ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Example : Societe:societe/class/societe.class.php
 LibraryToBuildPDF=Library used for PDF generation
 WarningUsingFPDF=Uzmanību: Jūsu <b>conf.php</b> satur direktīvu <b>dolibarr_pdf_force_fpdf = 1.</b> Tas nozīmē, ka jūs izmantojat FPDF bibliotēku, lai radītu PDF failus. Šī bibliotēka ir vecs un neatbalsta daudz funkcijām (Unicode, attēlu pārredzamība, kirilicas, arābu un Āzijas valodās, ...), tāpēc var rasties kļūdas laikā PDF paaudzes. <br> Lai atrisinātu šo problēmu, un ir pilnībā atbalsta PDF paaudzes, lūdzu, lejupielādējiet <a href="http://www.tcpdf.org/" target="_blank">TCPDF bibliotēka</a> , tad komentēt vai noņemt līnijas <b>$ dolibarr_pdf_force_fpdf = 1,</b> un pievienojiet vietā <b>$ dolibarr_lib_TCPDF_PATH = 'path_to_TCPDF_dir'</b>
@@ -411,10 +420,11 @@ ModuleCompanyCodePanicum=Atgriezt tukšu grāmatvedības uzskaites kodu.
 ModuleCompanyCodeDigitaria=Grāmatvedība kods ir atkarīgs no trešās personas kodu. Kods sastāv no simbols "C" pirmajā pozīcijā un pēc tam pirmais 5 zīmēm no trešās puses kodu.
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
-
+WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<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).
+ClickToShowDescription=Click to show description
 # Modules
 Module0Name=Lietotāji un grupas
-Module0Desc=Lietotāju un grupu vadība
+Module0Desc=Users / Employees and Groups management
 Module1Name=Trešās personas
 Module1Desc=Uzņēmumu un kontaktinformācijas vadība (klientu, perspektīvu ...)
 Module2Name=Tirdzniecība
@@ -515,8 +525,8 @@ Module2200Name=Dinamiskas cenas
 Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
 Module2300Desc=Scheduled job management
-Module2400Name=Agenda/Events
-Module2400Desc=Follow events or rendez-vous. Record manual events into Agendas or let application logs automatic events for tracking purposes.
+Module2400Name=Events/Agenda
+Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous.
 Module2500Name=Elektroniskā satura pārvaldība
 Module2500Desc=Saglabāt un nošārēt dokumentus
 Module2600Name=API/Web services (SOAP server)
@@ -582,7 +592,7 @@ Permission34=Dzēst produktus
 Permission36=Skatīt/vadīt slēptos produktus
 Permission38=Eksportēt produktus
 Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
-Permission42=Izveidot / mainīt projektus (dalīta projekts un projektu es esmu kontaktpersonai)
+Permission42=Create/modify projects (shared project and projects i'm contact for). Can also create tasks and assign users to project and tasks
 Permission44=Dzēst projektus (dalīta projekts un projektu es esmu kontaktpersonai)
 Permission45=Eksportēt projektus
 Permission61=Lasīt intervences
@@ -685,7 +695,7 @@ PermissionAdvanced253=Izveidot/mainīt iekšējoss/ārējos lietotājus un atļa
 Permission254=Izveidot/mainīt ārējos lietotājus tikai
 Permission255=Mainīt citu lietotāju paroli
 Permission256=Izdzēst vai bloķēt citus lietotājus
-Permission262=Paplašināt piekļuvi visām trešajām personām (ne tikai tiem, kas saistīti ar lietotāju). Nav efektīvi ārējiem lietotājiem (vienmēr ir tikai uz sevi).
+Permission262=Extend access to all third parties (not only third parties that user is a sale representative).<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 assignement matters).
 Permission271=Lasīt CA
 Permission272=Lasīt rēķinus
 Permission273=Izrakstīt rēķinus
@@ -887,7 +897,7 @@ Offset=Kompensācija
 AlwaysActive=Vienmēr aktīvs
 Upgrade=Atjaunināt
 MenuUpgrade=Atjaunināt / Paplašināt
-AddExtensionThemeModuleOrOther=Pievienot paplašinājumus (tēma, modulis, ...)
+AddExtensionThemeModuleOrOther=Deploy/install external module
 WebServer=Tīmekļa serveris
 DocumentRootServer=Web servera saknes direktorija
 DataRootServer=Datu failu direktorija
@@ -994,7 +1004,7 @@ TriggerAlwaysActive=Trigeri Šajā failā ir aktīva vienmēr, neatkarīgi ir ak
 TriggerActiveAsModuleActive=Trigeri Šajā failā ir aktīvs kā modulis <b>%s</b> ir iespējots.
 GeneratedPasswordDesc=Noteikt šeit, kas noteikums jūs vēlaties izmantot, lai radītu jaunu paroli, ja jūs lūgt, lai ir auto radīto paroli
 DictionaryDesc=Insert all reference data. You can add your values to the default.
-ConstDesc=This page allows you to edit all other parameters not available in previous pages. These are mostly reserved parameters for developers or advanced troubleshooting.
+ConstDesc=This page allows you to edit all other parameters not available in previous pages. These are mostly reserved parameters for developers or advanced troubleshooting. For a list of options <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">check here</a>.
 MiscellaneousDesc=All other security related parameters are defined here.
 LimitsSetup=Ierobežojumi / Precision iestatīšanas
 LimitsDesc=Jūs varat noteikt limitus, precizējumus un optimizācijas, kas izmantotas ar Dolibarr šeit
@@ -1161,10 +1171,6 @@ FreeLegalTextOnOrders=Brīvs teksts pasūtījumos
 WatermarkOnDraftOrders=Ūdenszīme projektu pasūtījumiem (none ja tukšs)
 ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable
 BANK_ASK_PAYMENT_BANK_DURING_ORDER=Ask for bank account destination of order
-##### Clicktodial #####
-ClickToDialSetup=Klikšķiniet lai  Dial moduļa uzstādīšanas
-ClickToDialUrlDesc=Url sauc, kad uz tālruņa Piktogramma klikšķis tiek darīts. In URL, jūs varat izmantot tagus <br> <b>__PHONETO__</b> Kas tiks aizstāts ar tālruņa numuru personai, lai izsauktu <br> <b>__PHONEFROM__</b> Kas tiks aizstāts ar tālruņa numuru, aicinot personas (jūsu) <br> <b>__LOGIN__</b> Kas tiks aizstāts ar jūsu clicktodial pieteikšanās (definēts jūsu lietotāja kartes) <br> <b>__PASS__</b> Kas tiks aizstāts ar jūsu clicktodial paroli (definēts jūsu lietotāja kartes).
-##### Bookmark4u #####
 ##### Interventions #####
 InterventionsSetup=Iejaukšanās modulis uzstādīšana
 FreeLegalTextOnInterventions=Brīvais teksts uz intervences dokumentiem
@@ -1391,7 +1397,7 @@ SendingsSetup=Nosūtot modulis iestatīšanu
 SendingsReceiptModel=Nosūtot saņemšanas modeli
 SendingsNumberingModules=Sendings numerācijas moduļus
 SendingsAbility=Support shipping sheets for customer deliveries
-NoNeedForDeliveryReceipts=Vairumā gadījumu, sendings ieņēmumi tiek izmantoti gan kā loksnes klientu piegādēm (produktu sarakstu, lai nosūtītu) un loksnes, kas tiek recevied un paraksta klientu. Tātad produkta piegādes kvītis ir dublēta iezīme, un reti aktivizēts.
+NoNeedForDeliveryReceipts=In most cases, shipping sheets are used both as sheets for customer deliveries (list of products to send) and sheets that is received and signed by customer. So product deliveries receipts is a duplicated feature and is rarely activated.
 FreeLegalTextOnShippings=Brīvais teksts piegādēs
 ##### Deliveries #####
 DeliveryOrderNumberingModules=Produkti piegādes kvīts numerācija modulis
@@ -1471,7 +1477,11 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Set automatically this default value for type of e
 AGENDA_DEFAULT_FILTER_TYPE=Set automatically this type of event into search filter of agenda view
 AGENDA_DEFAULT_FILTER_STATUS=Set automatically this status for events into search filter of agenda view
 AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
-##### ClickToDial #####
+AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
+AGENDA_NOTIFICATION_SOUND=Enable sound notification
+##### Clicktodial #####
+ClickToDialSetup=Klikšķiniet lai  Dial moduļa uzstādīšanas
+ClickToDialUrlDesc=Url sauc, kad uz tālruņa Piktogramma klikšķis tiek darīts. In URL, jūs varat izmantot tagus <br> <b>__PHONETO__</b> Kas tiks aizstāts ar tālruņa numuru personai, lai izsauktu <br> <b>__PHONEFROM__</b> Kas tiks aizstāts ar tālruņa numuru, aicinot personas (jūsu) <br> <b>__LOGIN__</b> Kas tiks aizstāts ar jūsu clicktodial pieteikšanās (definēts jūsu lietotāja kartes) <br> <b>__PASS__</b> Kas tiks aizstāts ar jūsu clicktodial paroli (definēts jūsu lietotāja kartes).
 ClickToDialDesc=This module allows to make phone numbers clickable. A click on this icon will call make your phone to 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.
 ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
 ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on same computer than the browser, and called when you click on a link in your browser that start 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.
@@ -1499,10 +1509,11 @@ EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint availa
 ##### API ####
 ApiSetup=API module setup
 ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
-ApiProductionMode=Enable production mode (this will activate use of a caches for services management)
+ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
 ApiExporerIs=You can explore the APIs at url
 OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
 ApiKey=Key for API
+WarningAPIExplorerDisabled=The API explorer has been disabled. API explorer is not required to provide API services. It is a tool for developer to find/test REST APIs. If you need this tool, go into setup of module API REST to activate it.
 ##### Bank #####
 BankSetupModule=Bankas moduļa uzstādīšana
 FreeLegalTextOnChequeReceipts=Brīvais teksts uz čeku ieņēmumiem
@@ -1571,7 +1582,7 @@ BackupDumpWizard=Wizard to build database backup dump file
 SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
 SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is only manual steps a privileged user can do.
 InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
-ConfFileMuseContainCustom=Installing an external module from application save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to have option<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
+ConfFileMuseContainCustom=Installing an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
 HighlightLinesColor=Highlight color of the line when the mouse passes over (keep empty for no highlight)
 TextTitleColor=Lapas virsraksta krāsa
@@ -1601,6 +1612,7 @@ FixTZ=Laika zonas labojums
 FillFixTZOnlyIfRequired=Example: +2 (fill only if problem experienced)
 ExpectedChecksum=Expected Checksum
 CurrentChecksum=Current Checksum
+ForcedConstants=Required constant values
 MailToSendProposal=To send customer proposal
 MailToSendOrder=To send customer order
 MailToSendInvoice=To send customer invoice
@@ -1609,13 +1621,14 @@ MailToSendIntervention=To send intervention
 MailToSendSupplierRequestForQuotation=To send quotation request to supplier
 MailToSendSupplierOrder=To send supplier order
 MailToSendSupplierInvoice=To send supplier invoice
+MailToSendContract=To send a contract
 MailToThirdparty=To send email from third party page
 ByDefaultInList=Show by default on list view
-YouUseLastStableVersion=Jūs izmantojat pēdējo stabilo versiju
+YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
 TitleExampleForMaintenanceRelease=Example of message you can use to announce this maintenance release (feel free to use it on your web sites)
-ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. You can download it from the download area of http://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.
-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, nor data structure change is present into this version. You can download it from the download area of http://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.
+ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. 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.
+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, nor data structure change is present into 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, you can enter here rule to have price for each level autocalculated according to price of first level, so you will have to enter only price for first level on each product. This page is here to save you time and can be usefull only if your prices for each leve are relative to first level. You can ignore this page in most cases.
 ModelModulesProduct=Templates for product documents
 ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
diff --git a/htdocs/langs/lv_LV/banks.lang b/htdocs/langs/lv_LV/banks.lang
index e1d6dbc56c4..f2e3c6ecc3a 100644
--- a/htdocs/langs/lv_LV/banks.lang
+++ b/htdocs/langs/lv_LV/banks.lang
@@ -74,18 +74,18 @@ Conciliate=Samierināt
 Conciliation=Samierināšanās
 ReconciliationLate=Reconciliation late
 IncludeClosedAccount=Iekļaut slēgti konti
-OnlyOpenedAccount=Tikai atvērtie konti
+OnlyOpenedAccount=Tikai atvērtiem kontiem
 AccountToCredit=Konts, lai kredītu
 AccountToDebit=Konta norakstīt
 DisableConciliation=Atslēgt izlīguma funkciju šim kontam
 ConciliationDisabled=Izlīgums līdzeklis invalīdiem
 LinkedToAConciliatedTransaction=Linked to a conciliated entry
-StatusAccountOpened=Atvērt
+StatusAccountOpened=Atvērts
 StatusAccountClosed=Slēgts
 AccountIdShort=Numurs
 LineRecord=Darījums
-AddBankRecord=Add entry
-AddBankRecordLong=Add entry manually
+AddBankRecord=Pievienot ierakstu
+AddBankRecordLong=Pievienot ierakstu manuāli
 ConciliatedBy=Jāsaskaņo ar
 DateConciliating=Izvērtējiet datumu
 BankLineConciliated=Entry reconciled
@@ -112,8 +112,8 @@ BankChecks=Bankas čeki
 BankChecksToReceipt=Checks awaiting deposit
 ShowCheckReceipt=Rādīt pārbaude depozīta saņemšanu
 NumberOfCheques=Pārbaužu skaits
-DeleteTransaction=Delete entry
-ConfirmDeleteTransaction=Are you sure you want to delete this entry?
+DeleteTransaction=Dzēst ierakstu
+ConfirmDeleteTransaction=Vai tiešām vēlaties dzēst šo ierakstu?
 ThisWillAlsoDeleteBankRecord=This will also delete generated bank entry
 BankMovements=Kustība
 PlannedTransactions=Planned entries
diff --git a/htdocs/langs/lv_LV/bills.lang b/htdocs/langs/lv_LV/bills.lang
index 816a6f2773c..93faa24e20a 100644
--- a/htdocs/langs/lv_LV/bills.lang
+++ b/htdocs/langs/lv_LV/bills.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - bills
 Bill=Pavadzīme
 Bills=Pavadzīmes
-BillsCustomers=Klientu rēķini
-BillsCustomer=Klientu rēķins
+BillsCustomers=Klienta rēķini
+BillsCustomer=Klienta rēķins
 BillsSuppliers=Piegādātāju rēķini
-BillsCustomersUnpaid=Neapmaksātie klientu rēķini
-BillsCustomersUnpaidForCompany=Neapmaksātie klientu rēķini %s
-BillsSuppliersUnpaid=Neapmaksātie piegādātāja -u rēķini
-BillsSuppliersUnpaidForCompany=Neapmaksātie piegādātāja -u rēķini %s
+BillsCustomersUnpaid=Neapmaksātie klienta rēķini
+BillsCustomersUnpaidForCompany=Unpaid customer invoices for %s
+BillsSuppliersUnpaid=Neapmaksātie piegādātāja rēķini
+BillsSuppliersUnpaidForCompany=Unpaid supplier invoices for %s
 BillsLate=Kavētie maksājumi
 BillsStatistics=Klientu rēķinu statistika
 BillsStatisticsSuppliers=Piegādātāju rēķinu statistika
@@ -63,7 +63,7 @@ paymentInInvoiceCurrency=in invoices currency
 PaidBack=Atmaksāts atpakaļ
 DeletePayment=Izdzēst maksājumu
 ConfirmDeletePayment=Vai tiešām vēlaties dzēst šo maksājumu?
-ConfirmConvertToReduc=Do you want to convert this credit note or deposit 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.
+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.
 SupplierPayments=Piegādātāju maksājumi
 ReceivedPayments=Saņemtie maksājumi
 ReceivedCustomersPayments=Maksājumi, kas saņemti no klientiem
@@ -78,6 +78,7 @@ PaymentMode=Maksājuma veids
 PaymentTypeDC=Debit/Credit Card
 PaymentTypePP=PayPal
 IdPaymentMode=Payment type (id)
+CodePaymentMode=Payment type (code)
 LabelPaymentMode=Payment type (label)
 PaymentModeShort=Maksājuma veids
 PaymentTerm=Apmaksas noteikumi
@@ -102,9 +103,10 @@ SearchACustomerInvoice=Meklēt klienta rēķinu
 SearchASupplierInvoice=Meklēt piegādātāja rēķinu
 CancelBill=Atcelt rēķinu
 SendRemindByMail=Sūtīt atgādinājumu izmantojot e-pastu
-DoPayment=Apmaksāt
-DoPaymentBack=Atgriezt maksājumu
+DoPayment=Enter payment
+DoPaymentBack=Enter refund
 ConvertToReduc=Pārvērst nākotnes atlaidē
+ConvertExcessReceivedToReduc=Convert excess received into future discount
 EnterPaymentReceivedFromCustomer=Ievadiet saņemto naudas summu no klienta
 EnterPaymentDueToCustomer=Veikt maksājumu dēļ klientam
 DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
@@ -113,22 +115,24 @@ BillStatus=Rēķina statuss
 StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Melnraksts (jāapstiprina)
 BillStatusPaid=Apmaksāts
-BillStatusPaidBackOrConverted=Samaksāta vai pārvērsti atlaidi
+BillStatusPaidBackOrConverted=Refund or converted into discount
 BillStatusConverted=Apmaksātais (gatavas pēdējo rēķinu)
 BillStatusCanceled=Pamests
 BillStatusValidated=Apstiprināts (jāapmaksā)
 BillStatusStarted=Sākts
 BillStatusNotPaid=Nav samaksāts
+BillStatusNotRefunded=Not refunded
 BillStatusClosedUnpaid=Slēgts (nav apmaksāts)
 BillStatusClosedPaidPartially=Samaksāts (daļēji)
 BillShortStatusDraft=Melnraksts
 BillShortStatusPaid=Apmaksāts
-BillShortStatusPaidBackOrConverted=Apstrādāts
+BillShortStatusPaidBackOrConverted=Refund or converted
 BillShortStatusConverted=Apstrādāts
 BillShortStatusCanceled=Pamests
 BillShortStatusValidated=Pārbaudīts
 BillShortStatusStarted=Sākts
 BillShortStatusNotPaid=Nav samaksāts
+BillShortStatusNotRefunded=Not refunded
 BillShortStatusClosedUnpaid=Slēgts
 BillShortStatusClosedPaidPartially=Samaksāts (daļēji)
 PaymentStatusToValidShort=Jāpārbauda
@@ -149,14 +153,14 @@ NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified
 FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
 NotARecurringInvoiceTemplate=Not a recurring template invoice
 NewBill=Jauns rēķins
-LastBills=Pēdējie %s rēķini
-LastCustomersBills=Pēdējie %s klientu rēķini
-LastSuppliersBills=Pēdējie %s piegādātāju rēķini
+LastBills=Latest %s invoices
+LastCustomersBills=Latest %s customer invoices
+LastSuppliersBills=Latest %s supplier invoices
 AllBills=Visi rēķini
 OtherBills=Citi rēķini
 DraftBills=Rēķinu sagatave
-CustomersDraftInvoices=Klientu rēķinu sagataves
-SuppliersDraftInvoices=Piegādātāju rēķinu sagataves
+CustomersDraftInvoices=Customer draft invoices
+SuppliersDraftInvoices=Supplier draft invoices
 Unpaid=Nesamaksāts
 ConfirmDeleteBill=Vai tiešām vēlaties dzēst šo rēķinu?
 ConfirmValidateBill=Vai jūs tiešām vēlaties apstiprināt šo rēķinu ar atsauci <b>%s</b>?
@@ -203,7 +207,7 @@ AlreadyPaidNoCreditNotesNoDeposits=Jau samaksāts (bez kredīta piezīmes un nog
 Abandoned=Pamests
 RemainderToPay=Neapmaksāts
 RemainderToTake=Atlikusī summa, kas jāsaņem
-RemainderToPayBack=Atlikusī summa, kas jāatdod atpakaļ
+RemainderToPayBack=Remaining amount to refund
 Rest=Līdz
 AmountExpected=Pieprasīto summu
 ExcessReceived=Excess saņemti
@@ -270,6 +274,7 @@ Deposit=Noguldījums
 Deposits=Noguldījumi
 DiscountFromCreditNote=Atlaide no kredīta piezīmes %s
 DiscountFromDeposit=Maksājumi no noguldījuma rēķina %s
+DiscountFromExcessReceived=Payments from excess received of invoice %s
 AbsoluteDiscountUse=Šis kredīta veids var izmantot rēķinā pirms tās apstiprināšanas
 CreditNoteDepositUse=Invoice must be validated to use this kind of credits
 NewGlobalDiscount=Jauna absolūta atlaide
@@ -277,8 +282,8 @@ NewRelativeDiscount=Jauna relatīva atlaide
 NoteReason=Piezīme / Iemesls
 ReasonDiscount=Iemesls
 DiscountOfferedBy=Piešķīris
-DiscountStillRemaining=Atlaides vēl atlikušas
-DiscountAlreadyCounted=Atlaides jau ir pieskaitītas
+DiscountStillRemaining=Discounts available
+DiscountAlreadyCounted=Discounts already consumed
 BillAddress=Rēķina adrese
 HelpEscompte=Šī atlaide ir piešķirta klientam, jo ​​tas maksājumu veica pirms termiņa.
 HelpAbandonBadCustomer=Šī summa ir pamests (klients teica, ka slikts klients), un tiek uzskatīts par ārkārtēju zaudēt.
@@ -331,10 +336,12 @@ 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
 # PaymentConditions
 Statut=Statuss
-PaymentConditionShortRECEP=Tūlītēja
-PaymentConditionRECEP=Nekavējoties
+PaymentConditionShortRECEP=Due Upon Receipt
+PaymentConditionRECEP=Due Upon Receipt
 PaymentConditionShort30D=30 dienas
 PaymentCondition30D=30 dienas
 PaymentConditionShort30DENDMONTH=30 days of month-end
@@ -349,6 +356,14 @@ PaymentConditionShortPT_ORDER=Pasūtījums
 PaymentConditionPT_ORDER=Pēc pasūtījuma
 PaymentConditionShortPT_5050=50-50
 PaymentConditionPT_5050=50%% priekšapmaksa, 50%% piegādes laikā
+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
 FixAmount=Noteikt daudzumu
 VarAmount=Mainīgais apjoms (%% tot.)
 # PaymentType
@@ -418,7 +433,7 @@ ChequeDeposits=Pārbaudes noguldījumi
 Cheques=Pārbaudes
 DepositId=Id deposit
 NbCheque=Number of checks
-CreditNoteConvertedIntoDiscount=Šis kredīts piezīme vai depozīta rēķins ir pārvērsta %s
+CreditNoteConvertedIntoDiscount=This %s has been converted into %s
 UsBillingContactAsIncoiveRecipientIfExist=Izmantot klientu norēķinu kontaktadresi, nevis trešo personu adresi, kā adresāta rēķiniem
 ShowUnpaidAll=Rādīt visus neapmaksātos rēķinus
 ShowUnpaidLateOnly=Rādīt vēlu neapmaksātiem rēķiniem tikai
@@ -441,7 +456,7 @@ ToMakePaymentBack=Atmaksāt
 ListOfYourUnpaidInvoices=Saraksts ar neapmaksātiem rēķiniem
 NoteListOfYourUnpaidInvoices=Piezīme: Šis saraksts satur tikai rēķinus par trešo pušu Jums ir saistīti ar kā pārdošanas pārstāvis.
 RevenueStamp=Ieņēmumi zīmogs
-YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of third party
+YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of third par
 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
 PDFCrabeDescription=Rēķina PDF  paraugs. Pilnākais rēķina paraugs (vēlamais paraugs)
diff --git a/htdocs/langs/lv_LV/boxes.lang b/htdocs/langs/lv_LV/boxes.lang
index bee8fbf8f6c..c3e603b567d 100644
--- a/htdocs/langs/lv_LV/boxes.lang
+++ b/htdocs/langs/lv_LV/boxes.lang
@@ -25,8 +25,8 @@ BoxTitleLastSuppliers=Latest %s recorded suppliers
 BoxTitleLastModifiedSuppliers=Latest %s modified suppliers
 BoxTitleLastModifiedCustomers=Latest %s modified customers
 BoxTitleLastCustomersOrProspects=Latest %s customers or prospects
-BoxTitleLastCustomerBills=Latest %s customer's invoices
-BoxTitleLastSupplierBills=Latest %s supplier's invoices
+BoxTitleLastCustomerBills=Latest %s customer invoices
+BoxTitleLastSupplierBills=Latest %s supplier invoices
 BoxTitleLastModifiedProspects=Latest %s modified prospects
 BoxTitleLastModifiedMembers=Latest %s members
 BoxTitleLastFicheInter=Latest %s modified interventions
@@ -51,12 +51,12 @@ ClickToAdd=Klikšķiniet šeit, lai pievienotu.
 NoRecordedCustomers=Nav ierakstīti klienti
 NoRecordedContacts=Nav ierakstītie kontakti
 NoActionsToDo=Nav nevienas darbības ko darīt
-NoRecordedOrders=Nav klientu pasūtījumu
+NoRecordedOrders=No recorded customer orders
 NoRecordedProposals=Nav saglabātu priekšlikumu
-NoRecordedInvoices=Nav reģistrētu klientu rēķini
-NoUnpaidCustomerBills=Nav neapmaksātu klienta'u rēķinu
-NoUnpaidSupplierBills=Nav neapmaksātu piegādātāja-u rēķini
-NoModifiedSupplierBills=Nav ierakstīti piegādātāja-u rēķini
+NoRecordedInvoices=No recorded customer invoices
+NoUnpaidCustomerBills=No unpaid customer invoices
+NoUnpaidSupplierBills=No unpaid supplier invoices
+NoModifiedSupplierBills=No recorded supplier invoices
 NoRecordedProducts=Nav ierakstīti produkti/pakalpojumi
 NoRecordedProspects=Nav ierakstītie perspektīvas
 NoContractedProducts=Nav produktu / pakalpojumu līgumi
diff --git a/htdocs/langs/lv_LV/companies.lang b/htdocs/langs/lv_LV/companies.lang
index c95e263b35d..dc341de1e32 100644
--- a/htdocs/langs/lv_LV/companies.lang
+++ b/htdocs/langs/lv_LV/companies.lang
@@ -78,6 +78,10 @@ VATIsNotUsed=PVN netiek izmantots
 CopyAddressFromSoc=Fill address with third party address
 ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
 PaymentBankAccount=Payment bank account
+OverAllProposals=Total proposals
+OverAllOrders=Total orders
+OverAllInvoices=Total invoices
+OverAllSupplierProposals=Total price requests
 ##### Local Taxes #####
 LocalTax1IsUsed=Pielietot otru nodokli
 LocalTax1IsUsedES= Tiek izmantots RE
@@ -239,6 +243,10 @@ ProfId3RU=Prof Id 3 (KPP)
 ProfId4RU=Prof Id 4 (Okpo)
 ProfId5RU=-
 ProfId6RU=-
+ProfId1DZ=RC
+ProfId2DZ=Art.
+ProfId3DZ=NIF
+ProfId4DZ=NIS
 VATIntra=PVN numurs
 VATIntraShort=PVN numurs
 VATIntraSyntaxIsValid=Sintakse ir pareiza
@@ -384,6 +392,7 @@ LastModifiedThirdParties=Latest %s modified third parties
 UniqueThirdParties=Kopējās unikālās trešās personas
 InActivity=Atvērts
 ActivityCeased=Slēgts
+ThirdPartyIsClosed=Third party is closed
 ProductsIntoElements=List of products/services into %s
 CurrentOutstandingBill=Current outstanding bill
 OutstandingBill=Maks. par izcilu rēķinu
@@ -396,7 +405,7 @@ MergeThirdparties=Merge third parties
 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 so you will be able to delete the duplicate one.
 ThirdpartiesMergeSuccess=Thirdparties have been merged
 SaleRepresentativeLogin=Login of sales representative
-SaleRepresentativeFirstname=Firstname of sales representative
-SaleRepresentativeLastname=Lastname of sales representative
+SaleRepresentativeFirstname=First name of sales representative
+SaleRepresentativeLastname=Last name of sales representative
 ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
 NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/lv_LV/compta.lang b/htdocs/langs/lv_LV/compta.lang
index f875f45dd0f..cb3fb940f6c 100644
--- a/htdocs/langs/lv_LV/compta.lang
+++ b/htdocs/langs/lv_LV/compta.lang
@@ -65,6 +65,7 @@ PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=PVN maksājumi
 ListPayment=Maksājumu saraksts
 ListOfCustomerPayments=Saraksts klientu maksājumu
+ListOfSupplierPayments=Saraksts piegādātāja maksājumu
 DateStartPeriod=Date start period
 DateEndPeriod=Datums un periods
 newLT1Payment=New tax 2 payment
@@ -81,7 +82,7 @@ LT2PaymentES=IRPF Maksājumu
 LT2PaymentsES=IRPF Maksājumi
 VATPayment=Sales tax payment
 VATPayments=Sales tax payments
-VATRefund=Sales tax refund Refund
+VATRefund=Sales tax refund
 Refund=Atmaksa
 SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Rādīt PVN maksājumu
@@ -194,7 +195,7 @@ CloneTax=Clone a social/fiscal tax
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
 CloneTaxForNextMonth=Klonēt nākošam mēnesim
 SimpleReport=Simple report
-AddExtraReport=Extra reports
+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
diff --git a/htdocs/langs/lv_LV/cron.lang b/htdocs/langs/lv_LV/cron.lang
index 8b506ba9445..dbde31ee42d 100644
--- a/htdocs/langs/lv_LV/cron.lang
+++ b/htdocs/langs/lv_LV/cron.lang
@@ -17,8 +17,8 @@ CronMethodDoesNotExists=Class %s does not contains any method %s
 # Menu
 EnabledAndDisabled=Enabled and disabled
 # Page list
-CronLastOutput=Pēdējo reizi palaist izejas
-CronLastResult=Pēdējais rezultātu kods
+CronLastOutput=Latest run output
+CronLastResult=Latest result code
 CronCommand=Komanda
 CronList=Scheduled jobs
 CronDelete=Delete scheduled jobs
diff --git a/htdocs/langs/lv_LV/errors.lang b/htdocs/langs/lv_LV/errors.lang
index 9722c075d29..0962082bf40 100644
--- a/htdocs/langs/lv_LV/errors.lang
+++ b/htdocs/langs/lv_LV/errors.lang
@@ -11,6 +11,7 @@ ErrorLoginAlreadyExists=Lietotājs %s jau pastāv.
 ErrorGroupAlreadyExists=Grupa %s jau pastāv.
 ErrorRecordNotFound=Ierakstīt nav atrasts.
 ErrorFailToCopyFile=Neizdevās nokopēt failu '<b>%s</b>' uz '<b>%s</b>'.
+ErrorFailToCopyDir=Failed to copy directory '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToRenameFile=Neizdevās pārdēvēt failu '<b>%s</b>' uz '<b>%s</b>'.
 ErrorFailToDeleteFile=Neizdevās izdzēst failu '<b>%s</b>'.
 ErrorFailToCreateFile=Neizdevās izveidot failu '<b>%s</b>'.
@@ -115,7 +116,7 @@ ErrorNoActivatedBarcode=Nav svītrkodu veids aktivizēts
 ErrUnzipFails=Neizdevās atarhivēt %s izmantojot ZipArchive
 ErrNoZipEngine=Nav dzinēja unzip %s failu šajā PHP
 ErrorFileMustBeADolibarrPackage=Failam %s jābūt Dolibarr zip
-ErrorFileRequired=Tas aizņem paketi Dolibarr failu
+ErrorModuleFileRequired=You must select a Dolibarr module package file
 ErrorPhpCurlNotInstalled=PHP CURL nav uzstādīts, tas ir svarīgi runāt ar Paypal
 ErrorFailedToAddToMailmanList=Neizdevās pievienot ierakstu %s, lai pastnieks saraksta %s vai SPIP bāze
 ErrorFailedToRemoveToMailmanList=Neizdevās noņemt ierakstu %s, lai pastnieks saraksta %s vai SPIP bāze
@@ -170,14 +171,19 @@ ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
 ErrorFileMustHaveFormat=File must have format %s
 ErrorSupplierCountryIsNotDefined=Valsts šim piegādātājam nav noteikts. Labot šo pirmo.
 ErrorsThirdpartyMerge=Failed to merge the two records. Request canceled.
-ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enougth for product %s to add it into a new order.
-ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enougth for product %s to add it into a new invoice.
-ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enougth for product %s to add it into a new shipment.
-ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enougth for product %s to add it into a new proposal.
-ErrorFailedToLoadLoginFileForMode=Failed to get the login file for mode '%s'.
+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 bank 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>
 
 # 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.
diff --git a/htdocs/langs/lv_LV/holiday.lang b/htdocs/langs/lv_LV/holiday.lang
index 3d44be4ec72..ec868f3c6cc 100644
--- a/htdocs/langs/lv_LV/holiday.lang
+++ b/htdocs/langs/lv_LV/holiday.lang
@@ -76,8 +76,9 @@ BoxTitleLastLeaveRequests=Latest %s modified leave requests
 HolidaysMonthlyUpdate=Ikmēneša atjauninājums
 ManualUpdate=Manuāla aktualizēšana
 HolidaysCancelation=Leave request cancelation
-EmployeeLastname=Darbinieka uzvārds
-EmployeeFirstname=Darbinieka vārds
+EmployeeLastname=Employee last name
+EmployeeFirstname=Employee first name
+TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
 
 ## Configuration du Module ##
 LastUpdateCP=Latest automatic update of leaves allocation
diff --git a/htdocs/langs/lv_LV/ldap.lang b/htdocs/langs/lv_LV/ldap.lang
index a13fa8a8c63..ac32722465a 100644
--- a/htdocs/langs/lv_LV/ldap.lang
+++ b/htdocs/langs/lv_LV/ldap.lang
@@ -13,10 +13,10 @@ LDAPUsers=Lietotāji LDAP datu bāzē
 LDAPFieldStatus=Statuss
 LDAPFieldFirstSubscriptionDate=Pirmais abonēšanas datumu
 LDAPFieldFirstSubscriptionAmount=Pirmais parakstīšanās summu
-LDAPFieldLastSubscriptionDate=Pēdējā abonēšanas datums
-LDAPFieldLastSubscriptionAmount=Pēdējā parakstīšanās summu
+LDAPFieldLastSubscriptionDate=Latest subscription date
+LDAPFieldLastSubscriptionAmount=Latest subscription amount
 LDAPFieldSkype=Skype id
-LDAPFieldSkypeExample=Example : skypeName
+LDAPFieldSkypeExample=Piemērs : skypeNosaukums
 UserSynchronized=Lietotājs sinhronizēts
 GroupSynchronized=Grupa sinhronizēta
 MemberSynchronized=Biedrs sinhronizēti
diff --git a/htdocs/langs/lv_LV/mails.lang b/htdocs/langs/lv_LV/mails.lang
index 04c60ba836b..ca0443729f2 100644
--- a/htdocs/langs/lv_LV/mails.lang
+++ b/htdocs/langs/lv_LV/mails.lang
@@ -35,7 +35,7 @@ MailingStatusSentPartialy=Nosūtīts daļēji
 MailingStatusSentCompletely=Nosūtīta pilnīgi
 MailingStatusError=Kļūda
 MailingStatusNotSent=Nav nosūtīts
-MailSuccessfulySent=E-pasts veiksmīgi nosūtīts (no %s līdz %s)
+MailSuccessfulySent=Email successfully accepted for delivery (from %s to %s)
 MailingSuccessfullyValidated=Pasta vēstuļu sūtīšanas veiksmīgi apstiprināti
 MailUnsubcribe=Atrakstīties
 MailingStatusNotContact=Nesazināties
@@ -74,22 +74,28 @@ ResultOfMailSending=Result of mass EMail sending
 NbSelected=Nb selected
 NbIgnored=Nb ignored
 NbSent=Nb 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
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Line %s failā
 RecipientSelectionModules=Definētie pieprasījumi saņēmēja izvēles
 MailSelectedRecipients=Atlasītie saņēmēji
 MailingArea=Emailings platība
-LastMailings=Pēdējās %s emailings
+LastMailings=Latest %s emailings
 TargetsStatistics=Mērķi statistika
 NbOfCompaniesContacts=Unikālie kontakti/adreses
 MailNoChangePossible=Saņēmējiem par apstiprinātus pasta vēstuļu sūtīšanas nevar mainīt
 SearchAMailing=Meklēt e-pastu
 SendMailing=Nosūtīt e-pastu
 SendMail=Sūtīt e-pastu
-MailingNeedCommand=Drošības apsvērumu dēļ, sūtot e-pasta vēstuļu sūtīšanas ir labāk, ja to veic no komandrindas. Ja jums ir viens, jautājiet savam servera administratoru, lai uzsāktu šādu komandu, lai nosūtītu pasta vēstuļu sūtīšanas uz visiem saņēmējiem:
+SentBy=Iesūtīja
+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=Taču jūs varat sūtīt tos tiešsaistē, pievienojot parametru MAILING_LIMIT_SENDBYWEB ar vērtību max skaitu e-pasta Jūs vēlaties nosūtīt pa sesiju. Lai to izdarītu, dodieties uz Home - Setup - pārējie.
-ConfirmSendingEmailing=If you can't or prefer sending them with your www browser, please confirm you are sure you want to send emailing now from your browser?
+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.
 TargetsReset=Nodzēst sarakstu
 ToClearAllRecipientsClickHere=Klikšķiniet šeit, lai notīrītu adresātu sarakstu par šo pasta vēstuļu sūtīšanas
@@ -144,3 +150,6 @@ AdvTgtCreateFilter=Izveidot filtru
 AdvTgtOrCreateNewFilter=Jauna filtra nosaukums
 NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
+OutGoingEmailSetup=Outgoing email setup
+InGoingEmailSetup=Incoming email setup
+
diff --git a/htdocs/langs/lv_LV/main.lang b/htdocs/langs/lv_LV/main.lang
index 65e139e5596..f9b0f6f238d 100644
--- a/htdocs/langs/lv_LV/main.lang
+++ b/htdocs/langs/lv_LV/main.lang
@@ -63,11 +63,13 @@ ErrorNoVATRateDefinedForSellerCountry=Kļūda, PVN likme nav definēta sekojoša
 ErrorNoSocialContributionForSellerCountry=Error, no social/fiscal taxes type defined for country '%s'.
 ErrorFailedToSaveFile=Kļūda, neizdevās saglabāt failu.
 ErrorCannotAddThisParentWarehouse=You are trying to add a parent warehouse which is already a child of current one
+MaxNbOfRecordPerPage=Max nb of record per page
 NotAuthorized=Jums nav tiesību, lai veiktu šo darbību.
 SetDate=Iestatīt datumu
 SelectDate=Izvēlēties datumu
 SeeAlso=Skatīt arī %s
 SeeHere=See here
+Apply=Pielietot
 BackgroundColorByDefault=Noklusējuma fona krāsu
 FileRenamed=The file was successfully renamed
 FileUploaded=The file was successfully uploaded
@@ -86,7 +88,7 @@ Undefined=Nav definēts
 PasswordForgotten=Aizmirsāt paroli?
 SeeAbove=Skatīt iepriekš
 HomeArea=Mājas sadaļa
-LastConnexion=Pēdējā savienojums
+LastConnexion=Latest connection
 PreviousConnexion=Iepriekšējā pieslēgšanās
 PreviousValue=Iepriekšējā vērtība
 ConnectedOnMultiCompany=Pieslēgts videi
@@ -236,7 +238,7 @@ DateCreation=Izveidošanas datums
 DateCreationShort=Izv. datums
 DateModification=Labošanas datums
 DateModificationShort=Modif. datums
-DateLastModification=Pēdējo izmaiņu datums
+DateLastModification=Latest modification date
 DateValidation=Apstiprināšanas datums
 DateClosing=Beigu datums
 DateDue=Izpildes datums
@@ -382,7 +384,7 @@ ActionsToDoShort=Vēl jādara
 ActionsDoneShort=Darīts
 ActionNotApplicable=Nav piemērojams
 ActionRunningNotStarted=Jāsāk
-ActionRunningShort=In progress
+ActionRunningShort=Procesā
 ActionDoneShort=Pabeigts
 ActionUncomplete=Nepabeigts
 CompanyFoundation=Kompānija/Organizācija
@@ -432,7 +434,7 @@ Reportings=Pārskati
 Draft=Melnraksts
 Drafts=Melnraksti
 Validated=Apstiprināts
-Opened=Atvērt
+Opened=Atvērts
 New=Jauns
 Discount=Atlaide
 Unknown=Nezināms
@@ -460,6 +462,7 @@ DeletePicture=Dzēst attēlu
 ConfirmDeletePicture=Apstiprināt attēla dzēšanu
 Login=Ieiet
 CurrentLogin=Pašreiz pieteicies
+EnterLoginDetail=Enter login details
 January=Janvāris
 February=Februāris
 March=Marts
@@ -597,6 +600,8 @@ SessionName=Sesijas nosaukums
 Method=Metode
 Receive=Saņemt
 CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
+ExpectedValue=Expected Value
+CurrentValue=Pašreizējā vērtība
 PartialWoman=Daļējs
 TotalWoman=Kopsumma
 NeverReceived=Nekad nav saņemts
@@ -753,6 +758,8 @@ RemoveString=Remove string '%s'
 SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
 DirectDownloadLink=Direct download link
 Download=Download
+ActualizeCurrency=Update currency rate
+Fiscalyear=Fiskālais gads
 # Week day
 Monday=Pirmdiena
 Tuesday=Otrdiena
@@ -787,8 +794,8 @@ SetRef=Set ref
 Select2ResultFoundUseArrows=Some results found. Use arrows to select.
 Select2NotFound=Rezultāti nav atrasti
 Select2Enter=Ieiet
-Select2MoreCharacter=vai vairāk rakstzīmes
-Select2MoreCharacters=vai vairāk simbolus
+Select2MoreCharacter=or more characters<br /><br /><strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
+Select2MoreCharacters=or more characters<br /><br /><strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
 Select2LoadingMoreResults=Ielādē vairāk rezultātus...
 Select2SearchInProgress=Meklēšana procesā...
 SearchIntoThirdparties=Trešās puses
@@ -809,3 +816,5 @@ SearchIntoContracts=Līgumi
 SearchIntoCustomerShipments=Customer shipments
 SearchIntoExpenseReports=Izdevumu atskaites
 SearchIntoLeaves=Leaves
+
+BulkActions=Bulk actions
diff --git a/htdocs/langs/lv_LV/members.lang b/htdocs/langs/lv_LV/members.lang
index aee0a5a4295..f0fcac81487 100644
--- a/htdocs/langs/lv_LV/members.lang
+++ b/htdocs/langs/lv_LV/members.lang
@@ -45,7 +45,7 @@ MemberStatusDraft=Projekts (ir jāapstiprina)
 MemberStatusDraftShort=Projekts
 MemberStatusActive=Validēta (gaidīšanas abonements)
 MemberStatusActiveShort=Apstiprināts
-MemberStatusActiveLate=abonements beidzies
+MemberStatusActiveLate=Subscription expired
 MemberStatusActiveLateShort=Beidzies
 MemberStatusPaid=Abonēšana atjaunināta
 MemberStatusPaidShort=Aktuāls
@@ -136,8 +136,8 @@ DocForAllMembersCards=Izveidot vizītkartes visiem dalībniekiem
 DocForOneMemberCards=Izveidot vizītkartes kādā konkrētā dalībnieka
 DocForLabels=Izveidot adrešu lapas
 SubscriptionPayment=Abonēšanas maksa
-LastSubscriptionDate=Pēdējā abonēšanas datums
-LastSubscriptionAmount=Pēdējā parakstīšanās summu
+LastSubscriptionDate=Latest subscription date
+LastSubscriptionAmount=Latest subscription amount
 MembersStatisticsByCountries=Dalībnieku statistika pa valstīm
 MembersStatisticsByState=Dalībnieku statistika pēc štatiem/provincēm
 MembersStatisticsByTown=Dalībnieku statistika pa pilsētām
@@ -149,7 +149,7 @@ MembersByStateDesc=Šis ekrāns parādīs statistiku par dalībniekiem, valsts /
 MembersByTownDesc=Šis ekrāns parādīs statistiku par biedriem ar pilsētu.
 MembersStatisticsDesc=Izvēlieties statistiku vēlaties izlasīt ...
 MenuMembersStats=Statistika
-LastMemberDate=Pēdējās loceklis datums
+LastMemberDate=Latest member date
 Nature=Daba
 Public=Informācija ir publiska
 NewMemberbyWeb=Jauns dalībnieks pievienots. Gaida apstiprinājumu
diff --git a/htdocs/langs/lv_LV/orders.lang b/htdocs/langs/lv_LV/orders.lang
index 7a4d8b45a6c..4126eed0fc7 100644
--- a/htdocs/langs/lv_LV/orders.lang
+++ b/htdocs/langs/lv_LV/orders.lang
@@ -39,7 +39,7 @@ StatusOrderRefusedShort=Atteikts
 StatusOrderBilledShort=Billed
 StatusOrderToProcessShort=Jāapstrādā
 StatusOrderReceivedPartiallyShort=Daļēji saņemti
-StatusOrderReceivedAllShort=Viss saņemts
+StatusOrderReceivedAllShort=Products received
 StatusOrderCanceled=Atcelts
 StatusOrderDraft=Projekts (ir jāapstiprina)
 StatusOrderValidated=Apstiprināts
@@ -51,7 +51,7 @@ StatusOrderApproved=Apstiprināts
 StatusOrderRefused=Atteikts
 StatusOrderBilled=Billed
 StatusOrderReceivedPartially=Daļēji saņemts
-StatusOrderReceivedAll=Viss saņemts
+StatusOrderReceivedAll=All products received
 ShippingExist=Sūtījums pastāv
 QtyOrdered=Pasūtītais daudzums
 ProductQtyInDraft=Product quantity into draft orders
diff --git a/htdocs/langs/lv_LV/other.lang b/htdocs/langs/lv_LV/other.lang
index 4647f1b0dda..3b169d369c3 100644
--- a/htdocs/langs/lv_LV/other.lang
+++ b/htdocs/langs/lv_LV/other.lang
@@ -2,6 +2,7 @@
 SecurityCode=Drošības kods
 NumberingShort=N°
 Tools=Darbarīki
+TMenuTools=Rīki
 ToolsDesc=All miscellaneous tools not included in other menu entries are collected here.<br /><br />All the tools can be reached in the left menu.
 Birthday=Dzimšanas diena
 BirthdayDate=Dzimšanas diena
@@ -67,14 +68,15 @@ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find her
 PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nYou will find here the shipping __SHIPPINGREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nYou will find here the intervention __FICHINTERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n__PERSONALIZED__\n\n__SIGNATURE__
-DemoDesc=Dolibarr is a compact ERP/CRM supporting several functional modules. A demo showcasing all modules makes no sense as this scenario never occurs. So, several demo profiles are available.
+DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
+ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
 DemoFundation=Pārvaldīt locekļus nodibinājumam
 DemoFundation2=Pārvaldīt dalībniekus un bankas kontu nodibinājumam
-DemoCompanyServiceOnly=Pārvaldīt ārštata darbības pārdošanas pakalpojumus tikai
+DemoCompanyServiceOnly=Company or freelance selling service only
 DemoCompanyShopWithCashDesk=Pārvaldīt veikals ar kasē
-DemoCompanyProductAndStocks=Vadīt nelielu vai vidēja uzņēmuma produktu pārdošanu
-DemoCompanyAll=Pārvaldīt maza vai vidēja uzņēmuma ar vairākiem pasākumiem (visi galvenie moduļi)
+DemoCompanyProductAndStocks=Company selling products with a shop
+DemoCompanyAll=Company with multiple activities (all main modules)
 CreatedBy=Izveidoja %s
 ModifiedBy=Laboja %s
 ValidatedBy=Apstiprināja %s
diff --git a/htdocs/langs/lv_LV/products.lang b/htdocs/langs/lv_LV/products.lang
index 9fc576d3ffa..ff5ca9c3e61 100644
--- a/htdocs/langs/lv_LV/products.lang
+++ b/htdocs/langs/lv_LV/products.lang
@@ -5,6 +5,8 @@ ProductLabelTranslated=Translated product label
 ProductDescriptionTranslated=Translated product description
 ProductNoteTranslated=Translated product note
 ProductServiceCard=Produktu / Pakalpojumu kartiņa
+TMenuProducts=Produkti
+TMenuServices=Pakalpojumi
 Products=Produkti
 Services=Pakalpojumi
 Product=Produkts
@@ -58,7 +60,7 @@ SellingPrice=Pārdošanas cena
 SellingPriceHT=Pārdošanas cena (bez PVN)
 SellingPriceTTC=Pārdošanas cena (ar PVN)
 CostPriceDescription=This price (net of tax) can be used to store the average amount this product cost to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
-CostPriceUsage=In a future version, this value could be used for margin calculation.
+CostPriceUsage=This value could be used for margin calculation.
 SoldAmount=Sold amount
 PurchasedAmount=Purchased amount
 NewPrice=Jaunā cena
@@ -140,6 +142,7 @@ ConfirmCloneProduct=Vai jūs tiešām vēlaties klonēt šo produktu vai pakalpo
 CloneContentProduct=Klons visus galvenos informations par produktu / pakalpojumu
 ClonePricesProduct=Klons galvenos informations un cenas
 CloneCompositionProduct=Clone packaged product/service
+CloneCombinationsProduct=Clone product variants
 ProductIsUsed=Šis produkts tiek izmantots
 NewRefForClone=Ref. jaunu produktu / pakalpojumu
 SellingPrices=Pārdošanas cenas
@@ -206,7 +209,7 @@ DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of bar c
 BarCodeDataForProduct=Svītrkoda produkta informācija %s :
 BarCodeDataForThirdparty=Svītrkoda informācija trešajām personām %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
+PriceByCustomer=Dažādas cenas katram klientam
 PriceCatalogue=A single sell price per product/service
 PricingRule=Cenu veidošanas noteikumi
 AddCustomerPrice=Add price by customer
@@ -236,7 +239,7 @@ GlobalVariables=Global variables
 VariableToUpdate=Variable to update
 GlobalVariableUpdaters=Global variable updaters
 UpdateInterval=Atjaunošanās intervāls (minūtes)
-LastUpdated=Pēdējo reizi atjaunots
+LastUpdated=Latest update
 CorrectlyUpdated=Correctly updated
 PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
 PropalMergePdfProductChooseFile=Izvēlieties PDF failus
@@ -256,4 +259,41 @@ VolumeUnits=Volume unit
 SizeUnits=Izmēra vienība
 DeleteProductBuyPrice=Dzēst pirkšanas cenu
 ConfirmDeleteProductBuyPrice=Vai tiešām vēlaties dzēst pirkšanas cenu?
+SubProduct=Sub product
 
+#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
+ProductCombinations=Variants
+HideProductCombinations=Hide products variant in the products selector
+ProductCombination=Variant
+NewProductCombination=New variant
+EditProductCombination=Editing variant
+ProductCombinationGenerator=Variants generator
+Features=Features
+PriceImpact=Price impact
+WeightImpact=Weight impact
+NewProductAttribute=Jauns atribūts
+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
+PercentageVariation=Percentage variation
+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 child products
+ConfirmCloneProductCombinations=Would you like to copy all the product variant to the 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
diff --git a/htdocs/langs/lv_LV/projects.lang b/htdocs/langs/lv_LV/projects.lang
index cbd1bf82b95..c5d2461511c 100644
--- a/htdocs/langs/lv_LV/projects.lang
+++ b/htdocs/langs/lv_LV/projects.lang
@@ -30,8 +30,8 @@ DeleteATask=Izdzēst uzdevumu
 ConfirmDeleteAProject=Vai tiešām vēlaties dzēst šo projektu?
 ConfirmDeleteATask=Vai tiešām vēlaties dzēst šo uzdevumu?
 OpenedProjects=Atvērtie projekti
-OpenedTasks=Atvērtie uzdevumi
-OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
+OpenedTasks=Opened tasks
+OpportunitiesStatusForOpenedProjects=Opportunities amount of opened projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=Rādīt projektu
 SetProject=Izvēlēties projektu
@@ -47,7 +47,7 @@ TaskTimeSpent=Pavadītais laiks veicot uzdevumus
 TaskTimeUser=Lietotājs
 TaskTimeNote=Piezīme
 TaskTimeDate=Datums
-TasksOnOpenedProject=Tasks on open projects
+TasksOnOpenedProject=Tasks on opened projects
 WorkloadNotDefined=Workload not defined
 NewTimeSpent=Jauns pavadītais laiks
 MyTimeSpent=Mans pavadīts laiks
@@ -58,6 +58,7 @@ TaskDateEnd=Uzdevuma beigu datums
 TaskDescription=Uzdevuma apraksts
 NewTask=Jauns uzdevums
 AddTask=Izveidot uzdevumu
+AddTimeSpent=Create time spent
 Activity=Aktivitāte
 Activities=Uzdevumi/aktivitātes
 MyActivities=Mani uzdevumi / aktivitātes
@@ -95,6 +96,7 @@ ValidateProject=Apstiprināt Projet
 ConfirmValidateProject=Vai jūs tiešām vēlaties apstiprināt šo projektu?
 CloseAProject=Aizvērt projektu
 ConfirmCloseAProject=Are you sure you want to close this project?
+AlsoCloseAProject=Also close project (keep it open if you still need to follow production tasks on it)
 ReOpenAProject=Atvērt projektu
 ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=Projekta kontakti
@@ -120,7 +122,7 @@ CloneProjectFiles=Klons projekts pievienojās failus
 CloneTaskFiles=Klons uzdevums (-i) pievienotie failus (ja uzdevums (-i) klonēt)
 CloneMoveDate=Update project/tasks dates from now?
 ConfirmCloneProject=Are you sure to clone this project?
-ProjectReportDate=Mainīt uzdevumu datums atbilstoši projekta sākuma datumu
+ProjectReportDate=Change task dates according to new project start date
 ErrorShiftTaskDate=Nav iespējams novirzīt uzdevumu datumu saskaņā ar jaunu projektu uzsākšanas datuma
 ProjectsAndTasksLines=Projekti un uzdevumi
 ProjectCreatedInDolibarr=Projekta %s izveidots
@@ -177,9 +179,9 @@ ProjectsStatistics=Statistics on projects/leads
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 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.
-OpenedProjectsByThirdparties=Open projects by thirdparties
+OpenedProjectsByThirdparties=Opened projects by thirdparties
 OnlyOpportunitiesShort=Only opportunities
-OpenedOpportunitiesShort=Open opportunities
+OpenedOpportunitiesShort=Opened opportunities
 NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount
diff --git a/htdocs/langs/lv_LV/propal.lang b/htdocs/langs/lv_LV/propal.lang
index d24aadb1e4d..346f9bd06f1 100644
--- a/htdocs/langs/lv_LV/propal.lang
+++ b/htdocs/langs/lv_LV/propal.lang
@@ -3,7 +3,7 @@ Proposals=Komerciālie priekšlikumi
 Proposal=Komerciālais priekšlikums
 ProposalShort=Priekšlikums
 ProposalsDraft=Sagatave komerciālajiem priekšlikumiem
-ProposalsOpened=Open commercial proposals
+ProposalsOpened=Atvērtie komerciālie priekšlikumi
 Prop=Komerciālie priekšlikumi
 CommercialProposal=Komerciālais priekšlikums
 ProposalCard=Priekšlikuma kartiņa
@@ -28,7 +28,7 @@ ShowPropal=Rādīt priekšlikumu
 PropalsDraft=Sagatave
 PropalsOpened=Atvērts
 PropalStatusDraft=Projekts (ir jāapstiprina)
-PropalStatusValidated=Apstiprināts (priekšlikums ir atvērts)
+PropalStatusValidated=Validated (proposal is opened)
 PropalStatusSigned=Parakstīts (vajadzības rēķinu)
 PropalStatusNotSigned=Nav parakstīts (slēgta)
 PropalStatusBilled=Jāmaksā
diff --git a/htdocs/langs/lv_LV/stocks.lang b/htdocs/langs/lv_LV/stocks.lang
index 3b5ac1e4f9e..7f07b706f1e 100644
--- a/htdocs/langs/lv_LV/stocks.lang
+++ b/htdocs/langs/lv_LV/stocks.lang
@@ -22,13 +22,15 @@ Movements=Kustības
 ErrorWarehouseRefRequired=Noliktava nosaukums ir obligāts
 ListOfWarehouses=Saraksts noliktavās
 ListOfStockMovements=Krājumu pārvietošanas saraksts
+StockMovementForId=Movement ID %d
+ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Noliktavas platība
 Location=Vieta
 LocationSummary=Īsais atrašanās vietas nosaukums
 NumberOfDifferentProducts=Dažādu produktu skaits
 NumberOfProducts=Kopējais produktu skaits
-LastMovement=Pēdējā pārvietošana
-LastMovements=Pēdējās pārvietošanas
+LastMovement=Latest movement
+LastMovements=Latest movements
 Units=Vienības
 Unit=Vienība
 StockCorrection=Labot krājumus
@@ -140,3 +142,4 @@ ProductStockWarehouseCreated=Stock limit for alert and desired optimal stock cor
 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
diff --git a/htdocs/langs/lv_LV/supplier_proposal.lang b/htdocs/langs/lv_LV/supplier_proposal.lang
index 30c4d0fe6bb..93de6ba9e01 100644
--- a/htdocs/langs/lv_LV/supplier_proposal.lang
+++ b/htdocs/langs/lv_LV/supplier_proposal.lang
@@ -8,7 +8,7 @@ SearchRequest=Atrast pieprasījumu
 DraftRequests=Pieprasījuma melnraksts
 SupplierProposalsDraft=Draft supplier proposals
 LastModifiedRequests=Latest %s modified price requests
-RequestsOpened=Atvērt cenas pieprasījumu
+RequestsOpened=Opened price requests
 SupplierProposalArea=Supplier proposals area
 SupplierProposalShort=Supplier proposal
 SupplierProposals=Supplier proposals
@@ -23,7 +23,7 @@ ConfirmValidateAsk=Are you sure you want to validate this price request under na
 DeleteAsk=Dzēst pieprasījumu
 ValidateAsk=Apstiprināt pieprasījumu
 SupplierProposalStatusDraft=Draft (needs to be validated)
-SupplierProposalStatusValidated=Validated (request is open)
+SupplierProposalStatusValidated=Validated (request is opened)
 SupplierProposalStatusClosed=Slēgts
 SupplierProposalStatusSigned=Apstiprināts
 SupplierProposalStatusNotSigned=Atteikts
diff --git a/htdocs/langs/lv_LV/suppliers.lang b/htdocs/langs/lv_LV/suppliers.lang
index 19463a240a0..24787d58eab 100644
--- a/htdocs/langs/lv_LV/suppliers.lang
+++ b/htdocs/langs/lv_LV/suppliers.lang
@@ -12,8 +12,8 @@ BuyingPriceMinShort=Best buying price
 TotalBuyingPriceMinShort=Total of subproducts buying prices
 TotalSellingPriceMinShort=Total of subproducts selling prices
 SomeSubProductHaveNoPrices=Dažiem apakšproduktiem nav norādītas cenas
-AddSupplierPrice=Add buying price
-ChangeSupplierPrice=Change buying price
+AddSupplierPrice=Pievienot pirkšanas cenu
+ChangeSupplierPrice=Mainīt piegādātāja cenu
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=Šī atsauce piegādātājam jau ir saistīta ar atsauci: %s
 NoRecordedSuppliers=Nav reģistrētu piegādātāju
 SupplierPayment=Piegādātājs maksājums
@@ -37,7 +37,8 @@ MenuOrdersSupplierToBill=Supplier orders to invoice
 NbDaysToDelivery=Piegādes kavēšanās dienās
 DescNbDaysToDelivery=The biggest deliver delay of the products from this order
 SupplierReputation=Supplier reputation
-DoNotOrderThisProductToThisSupplier=Do not order
-NotTheGoodQualitySupplier=Wrong quality
-ReputationForThisProduct=Reputation
-BuyerName=Buyer name
+DoNotOrderThisProductToThisSupplier=Nepasūtīt
+NotTheGoodQualitySupplier=Nepareizs daudzums
+ReputationForThisProduct=Reputācija
+BuyerName=Pircēja vārds
+AllProductServicePrices=All product / service prices
diff --git a/htdocs/langs/lv_LV/withdrawals.lang b/htdocs/langs/lv_LV/withdrawals.lang
index ea29c5a2f7c..038c9a2b742 100644
--- a/htdocs/langs/lv_LV/withdrawals.lang
+++ b/htdocs/langs/lv_LV/withdrawals.lang
@@ -24,6 +24,7 @@ WithdrawStatistics=Direct debit payment statistics
 WithdrawRejectStatistics=Direct debit payment reject statistics
 LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
+WithdrawRequestsDone=%s direct debit payment requests recorded
 ThirdPartyBankCode=Trešās puses bankas kods
 NoInvoiceCouldBeWithdrawed=Nevienu rēķinu withdrawed ar panākumiem. Pārbaudiet, ka rēķins ir par uzņēmumiem, ar derīgu BAN.
 ClassCredited=Klasificēt kreditē
@@ -76,8 +77,8 @@ RUM=UMR
 RUMLong=Unique Mandate Reference
 RUMWillBeGenerated=UMR number will be generated once bank account information are saved
 WithdrawMode=Direct debit mode (FRST or RECUR)
-WithdrawRequestAmount=Withdraw request amount:
-WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil amount.
+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
diff --git a/htdocs/langs/mk_MK/accountancy.lang b/htdocs/langs/mk_MK/accountancy.lang
index 5de95948fbf..4c2336b97b0 100644
--- a/htdocs/langs/mk_MK/accountancy.lang
+++ b/htdocs/langs/mk_MK/accountancy.lang
@@ -194,6 +194,8 @@ ChangeBinding=Change the binding
 
 ## Admin
 ApplyMassCategories=Apply mass categories
+AddAccountFromBookKeepingWithNoCategories=Add acccount already used with no categories
+CategoryDeleted=Category for the accounting account has been removed
 
 ## Export
 Exports=Exports
@@ -209,6 +211,7 @@ Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution
 Modelcsv_quadratus=Export towards Quadratus QuadraCompta
 Modelcsv_ebp=Export towards EBP
 Modelcsv_cogilog=Export towards Cogilog
+ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
 InitAccountancy=Init accountancy
diff --git a/htdocs/langs/mk_MK/admin.lang b/htdocs/langs/mk_MK/admin.lang
index 7bd42e02e62..b4d6aa3fddd 100644
--- a/htdocs/langs/mk_MK/admin.lang
+++ b/htdocs/langs/mk_MK/admin.lang
@@ -9,14 +9,20 @@ VersionDevelopment=Development
 VersionUnknown=Unknown
 VersionRecommanded=Recommended
 FileCheck=Files integrity checker
-FileCheckDesc=This tool allows you to check the integrity of files of your application, comparing each files with the official ones. You can use this tool to detect if some files were modified by a hacker for example.
+FileCheckDesc=This tool allows you to check the integrity of files and setup of your application, comparing each files with the official ones. 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.
+FileIntegrityIsStrictlyConformedWithReference=Files integrity is strictly conformed with the reference.
+FileIntegrityIsOkButFilesWereAdded=Files integrity check has passed, however some new files were added.
+FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified, removed or added.
+GlobalChecksum=Global checksum
 MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
 LocalSignature=Embedded local signature (less reliable)
 RemoteSignature=Remote distant signature (more reliable)
 FilesMissing=Missing Files
 FilesUpdated=Updated Files
+FilesModified=Modified Files
+FilesAdded=Added Files
 FileCheckDolibarr=Check integrity of application files
-AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from a certified package
+AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from an official package
 XmlNotFound=Xml Integrity File of application not found
 SessionId=Session ID
 SessionSaveHandler=Handler to save sessions
@@ -185,7 +191,9 @@ BoxesDesc=Widgets are components showing some information that you can add to pe
 OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
 ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
-ModulesMarketPlaces=More modules...
+ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
+ModulesMarketPlaces=Find external modules...
+GoModuleSetupArea=To deploy/install a new module, go onto the Module setup area at <a href="%s">%s</a>.
 DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules
 DoliPartnersDesc=List of companies providing custom developed modules or features (Note: anyone experienced in PHP programming can provide custom development for an open source project)
 WebSiteDesc=Reference websites to find more modules...
@@ -276,21 +284,22 @@ ModuleFamilyInterface=Interfaces with external systems
 MenuHandlers=Menu handlers
 MenuAdmin=Menu editor
 DoNotUseInProduction=Do not use in production
-ThisIsProcessToFollow=This is setup to process:
-ThisIsAlternativeProcessToFollow=This is an alternative setup to process:
+ThisIsProcessToFollow=This is steps to process:
+ThisIsAlternativeProcessToFollow=This is an alternative setup to process manually:
 StepNb=Step %s
 FindPackageFromWebSite=Find a package that provides feature you want (for example on official web site %s).
 DownloadPackageFromWebSite=Download package (for example from official web site %s).
-UnpackPackageInDolibarrRoot=Unpack package file into Dolibarr server directory dedicated to external modules: <b>%s</b>
-SetupIsReadyForUse=Install is finished and Dolibarr is ready to use with this new component.
-NotExistsDirect=The alternative root directory is not defined.<br>
-InfDirAlt=Since version 3 it is possible to define an alternative root directory.This allows you to store, same place, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
-InfDirExample=<br>Then declare it in the file conf.php<br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>*These lines are commented with "#", to uncomment only remove the character.
+UnpackPackageInDolibarrRoot=Unpack the packaged files into server directory dedicated to Dolibarr: <b>%s</b>
+UnpackPackageInModulesRoot=To deploy/install an external module, unpack the packaged files into the server directory dedicated to modules: <b>%s</b>
+SetupIsReadyForUse=Module deployment is finished. You must however enable and setup the module in your application by going on the page to setup modules: <a href="%s">%s</a>.
+NotExistsDirect=The alternative root directory is not defined to an existing directory.<br>
+InfDirAlt=Since version 3, it is possible to define an alternative root directory. This allows you to store, into a dedicated directory, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
+InfDirExample=<br>Then declare it in the file <strong>conf.php</strong><br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>If these lines are commented with "#", to enable them, just uncomment by removing the "#" character.
 YouCanSubmitFile=For this step, you can send package using this tool: Select module file
 CurrentVersion=Dolibarr current version
 CallUpdatePage=Go to the page that updates the database structure and data: %s.
 LastStableVersion=Latest stable version
-LastActivationDate=Last activation date
+LastActivationDate=Latest activation date
 UpdateServerOffline=Update server offline
 GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s. <br><b>{000000@x}</b> same as previous but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
 GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
@@ -373,11 +382,11 @@ ExtrafieldCheckBox=Checkbox
 ExtrafieldRadio=Radio button
 ExtrafieldCheckBoxFromList= Checkbox from table
 ExtrafieldLink=Link to an object
-ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>In order to have the list depending on another :<br>1,value1|parent_list_code:parent_key<br>2,value2|parent_list_code:parent_key
+ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list :<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list :<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
-ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
+ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Example : Societe:societe/class/societe.class.php
 LibraryToBuildPDF=Library used for PDF generation
 WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
@@ -411,10 +420,11 @@ ModuleCompanyCodePanicum=Return an empty accountancy code.
 ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party code.
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
-
+WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<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).
+ClickToShowDescription=Click to show description
 # Modules
 Module0Name=Users & groups
-Module0Desc=Users and groups management
+Module0Desc=Users / Employees and Groups management
 Module1Name=Third parties
 Module1Desc=Companies and contact management (customers, prospects...)
 Module2Name=Commercial
@@ -515,8 +525,8 @@ Module2200Name=Dynamic Prices
 Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
 Module2300Desc=Scheduled job management
-Module2400Name=Agenda/Events
-Module2400Desc=Follow events or rendez-vous. Record manual events into Agendas or let application logs automatic events for tracking purposes.
+Module2400Name=Events/Agenda
+Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous.
 Module2500Name=Electronic Content Management
 Module2500Desc=Save and share documents
 Module2600Name=API/Web services (SOAP server)
@@ -582,7 +592,7 @@ Permission34=Delete products
 Permission36=See/manage hidden products
 Permission38=Export products
 Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
-Permission42=Create/modify projects (shared project and projects i'm contact for)
+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)
 Permission45=Export projects
 Permission61=Read interventions
@@ -685,7 +695,7 @@ PermissionAdvanced253=Create/modify internal/external users and permissions
 Permission254=Create/modify external users only
 Permission255=Modify other users password
 Permission256=Delete or disable other users
-Permission262=Extend access to all third parties (not only those linked to user). Not effective for external users (always limited to themselves).
+Permission262=Extend access to all third parties (not only third parties that user is a sale representative).<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 assignement matters).
 Permission271=Read CA
 Permission272=Read invoices
 Permission273=Issue invoices
@@ -887,7 +897,7 @@ Offset=Offset
 AlwaysActive=Always active
 Upgrade=Upgrade
 MenuUpgrade=Upgrade / Extend
-AddExtensionThemeModuleOrOther=Add extension (theme, module, ...)
+AddExtensionThemeModuleOrOther=Deploy/install external module
 WebServer=Web server
 DocumentRootServer=Web server's root directory
 DataRootServer=Data files directory
@@ -994,7 +1004,7 @@ TriggerAlwaysActive=Triggers in this file are always active, whatever are the ac
 TriggerActiveAsModuleActive=Triggers in this file are active as module <b>%s</b> is enabled.
 GeneratedPasswordDesc=Define here which rule you want to use to generate new password if you ask to have auto generated password
 DictionaryDesc=Insert all reference data. You can add your values to the default.
-ConstDesc=This page allows you to edit all other parameters not available in previous pages. These are mostly reserved parameters for developers or advanced troubleshooting.
+ConstDesc=This page allows you to edit all other parameters not available in previous pages. These are mostly reserved parameters for developers or advanced troubleshooting. For a list of options <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">check here</a>.
 MiscellaneousDesc=All other security related parameters are defined here.
 LimitsSetup=Limits/Precision setup
 LimitsDesc=You can define limits, precisions and optimisations used by Dolibarr here
@@ -1161,10 +1171,6 @@ FreeLegalTextOnOrders=Free text on orders
 WatermarkOnDraftOrders=Watermark on draft orders (none if empty)
 ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable
 BANK_ASK_PAYMENT_BANK_DURING_ORDER=Ask for bank account destination of order
-##### Clicktodial #####
-ClickToDialSetup=Click To Dial module setup
-ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with your clicktodial login (defined on your user card)<br><b>__PASS__</b> that will be replaced with your clicktodial password (defined on your user card).
-##### Bookmark4u #####
 ##### Interventions #####
 InterventionsSetup=Interventions module setup
 FreeLegalTextOnInterventions=Free text on intervention documents
@@ -1391,7 +1397,7 @@ SendingsSetup=Sending module setup
 SendingsReceiptModel=Sending receipt model
 SendingsNumberingModules=Sendings numbering modules
 SendingsAbility=Support shipping sheets for customer deliveries
-NoNeedForDeliveryReceipts=In most cases, sendings receipts are used both as sheets for customer deliveries (list of products to send) and sheets that is recevied and signed by customer. So product deliveries receipts is a duplicated feature and is rarely activated.
+NoNeedForDeliveryReceipts=In most cases, shipping sheets are used both as sheets for customer deliveries (list of products to send) and sheets that is received and signed by customer. So product deliveries receipts is a duplicated feature and is rarely activated.
 FreeLegalTextOnShippings=Free text on shipments
 ##### Deliveries #####
 DeliveryOrderNumberingModules=Products deliveries receipt numbering module
@@ -1471,7 +1477,11 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Set automatically this default value for type of e
 AGENDA_DEFAULT_FILTER_TYPE=Set automatically this type of event into search filter of agenda view
 AGENDA_DEFAULT_FILTER_STATUS=Set automatically this status for events into search filter of agenda view
 AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
-##### ClickToDial #####
+AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
+AGENDA_NOTIFICATION_SOUND=Enable sound notification
+##### Clicktodial #####
+ClickToDialSetup=Click To Dial module setup
+ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with your clicktodial login (defined on your user card)<br><b>__PASS__</b> that will be replaced with your clicktodial password (defined on your user card).
 ClickToDialDesc=This module allows to make phone numbers clickable. A click on this icon will call make your phone to 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.
 ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
 ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on same computer than the browser, and called when you click on a link in your browser that start 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.
@@ -1499,10 +1509,11 @@ EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint availa
 ##### API ####
 ApiSetup=API module setup
 ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
-ApiProductionMode=Enable production mode (this will activate use of a caches for services management)
+ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
 ApiExporerIs=You can explore the APIs at url
 OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
 ApiKey=Key for API
+WarningAPIExplorerDisabled=The API explorer has been disabled. API explorer is not required to provide API services. It is a tool for developer to find/test REST APIs. If you need this tool, go into setup of module API REST to activate it.
 ##### Bank #####
 BankSetupModule=Bank module setup
 FreeLegalTextOnChequeReceipts=Free text on cheque receipts
@@ -1571,7 +1582,7 @@ BackupDumpWizard=Wizard to build database backup dump file
 SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
 SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is only manual steps a privileged user can do.
 InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
-ConfFileMuseContainCustom=Installing an external module from application save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to have option<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
+ConfFileMuseContainCustom=Installing an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
 HighlightLinesColor=Highlight color of the line when the mouse passes over (keep empty for no highlight)
 TextTitleColor=Color of page title
@@ -1601,6 +1612,7 @@ FixTZ=TimeZone fix
 FillFixTZOnlyIfRequired=Example: +2 (fill only if problem experienced)
 ExpectedChecksum=Expected Checksum
 CurrentChecksum=Current Checksum
+ForcedConstants=Required constant values
 MailToSendProposal=To send customer proposal
 MailToSendOrder=To send customer order
 MailToSendInvoice=To send customer invoice
@@ -1609,13 +1621,14 @@ MailToSendIntervention=To send intervention
 MailToSendSupplierRequestForQuotation=To send quotation request to supplier
 MailToSendSupplierOrder=To send supplier order
 MailToSendSupplierInvoice=To send supplier invoice
+MailToSendContract=To send a contract
 MailToThirdparty=To send email from third party page
 ByDefaultInList=Show by default on list view
-YouUseLastStableVersion=You use the last stable version
+YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
 TitleExampleForMaintenanceRelease=Example of message you can use to announce this maintenance release (feel free to use it on your web sites)
-ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. You can download it from the download area of http://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.
-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, nor data structure change is present into this version. You can download it from the download area of http://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.
+ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. 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.
+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, nor data structure change is present into 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, you can enter here rule to have price for each level autocalculated according to price of first level, so you will have to enter only price for first level on each product. This page is here to save you time and can be usefull only if your prices for each leve are relative to first level. You can ignore this page in most cases.
 ModelModulesProduct=Templates for product documents
 ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
diff --git a/htdocs/langs/mk_MK/banks.lang b/htdocs/langs/mk_MK/banks.lang
index 7ae841cf0f3..f0c41d5d5bf 100644
--- a/htdocs/langs/mk_MK/banks.lang
+++ b/htdocs/langs/mk_MK/banks.lang
@@ -74,13 +74,13 @@ Conciliate=Reconcile
 Conciliation=Reconciliation
 ReconciliationLate=Reconciliation late
 IncludeClosedAccount=Include closed accounts
-OnlyOpenedAccount=Only open accounts
+OnlyOpenedAccount=Only opened accounts
 AccountToCredit=Account to credit
 AccountToDebit=Account to debit
 DisableConciliation=Disable reconciliation feature for this account
 ConciliationDisabled=Reconciliation feature disabled
 LinkedToAConciliatedTransaction=Linked to a conciliated entry
-StatusAccountOpened=Open
+StatusAccountOpened=Opened
 StatusAccountClosed=Closed
 AccountIdShort=Number
 LineRecord=Transaction
diff --git a/htdocs/langs/mk_MK/bills.lang b/htdocs/langs/mk_MK/bills.lang
index bf3b48a37e9..5fb3b6169da 100644
--- a/htdocs/langs/mk_MK/bills.lang
+++ b/htdocs/langs/mk_MK/bills.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - bills
 Bill=Invoice
 Bills=Invoices
-BillsCustomers=Customers invoices
-BillsCustomer=Customers invoice
-BillsSuppliers=Suppliers invoices
-BillsCustomersUnpaid=Unpaid customers invoices
-BillsCustomersUnpaidForCompany=Unpaid customer's invoices for %s
-BillsSuppliersUnpaid=Unpaid supplier's invoices
-BillsSuppliersUnpaidForCompany=Unpaid supplier's invoices for %s
+BillsCustomers=Customer invoices
+BillsCustomer=Customer invoice
+BillsSuppliers=Supplier invoices
+BillsCustomersUnpaid=Unpaid customer invoices
+BillsCustomersUnpaidForCompany=Unpaid customer invoices for %s
+BillsSuppliersUnpaid=Unpaid supplier invoices
+BillsSuppliersUnpaidForCompany=Unpaid supplier invoices for %s
 BillsLate=Late payments
 BillsStatistics=Customers invoices statistics
 BillsStatisticsSuppliers=Suppliers invoices statistics
@@ -62,8 +62,8 @@ PaymentsBack=Payments back
 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 credit note or deposit 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.
+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.
 SupplierPayments=Suppliers payments
 ReceivedPayments=Received payments
 ReceivedCustomersPayments=Payments received from customers
@@ -78,6 +78,7 @@ PaymentMode=Payment type
 PaymentTypeDC=Debit/Credit Card
 PaymentTypePP=PayPal
 IdPaymentMode=Payment type (id)
+CodePaymentMode=Payment type (code)
 LabelPaymentMode=Payment type (label)
 PaymentModeShort=Payment type
 PaymentTerm=Payment term
@@ -102,9 +103,10 @@ SearchACustomerInvoice=Search for a customer invoice
 SearchASupplierInvoice=Search for a supplier invoice
 CancelBill=Cancel an invoice
 SendRemindByMail=Send reminder by EMail
-DoPayment=Do payment
-DoPaymentBack=Do payment back
+DoPayment=Enter payment
+DoPaymentBack=Enter refund
 ConvertToReduc=Convert into future discount
+ConvertExcessReceivedToReduc=Convert excess received into future discount
 EnterPaymentReceivedFromCustomer=Enter payment received from customer
 EnterPaymentDueToCustomer=Make payment due to customer
 DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
@@ -113,22 +115,24 @@ BillStatus=Invoice status
 StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Draft (needs to be validated)
 BillStatusPaid=Paid
-BillStatusPaidBackOrConverted=Paid or converted into discount
+BillStatusPaidBackOrConverted=Refund or converted into discount
 BillStatusConverted=Paid (ready for final invoice)
 BillStatusCanceled=Abandoned
 BillStatusValidated=Validated (needs to be paid)
 BillStatusStarted=Started
 BillStatusNotPaid=Not paid
+BillStatusNotRefunded=Not refunded
 BillStatusClosedUnpaid=Closed (unpaid)
 BillStatusClosedPaidPartially=Paid (partially)
 BillShortStatusDraft=Draft
 BillShortStatusPaid=Paid
-BillShortStatusPaidBackOrConverted=Processed
+BillShortStatusPaidBackOrConverted=Refund or converted
 BillShortStatusConverted=Processed
 BillShortStatusCanceled=Abandoned
 BillShortStatusValidated=Validated
 BillShortStatusStarted=Started
 BillShortStatusNotPaid=Not paid
+BillShortStatusNotRefunded=Not refunded
 BillShortStatusClosedUnpaid=Closed
 BillShortStatusClosedPaidPartially=Paid (partially)
 PaymentStatusToValidShort=To validate
@@ -149,14 +153,14 @@ NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified
 FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
 NotARecurringInvoiceTemplate=Not a recurring template invoice
 NewBill=New invoice
-LastBills=Last %s invoices
-LastCustomersBills=Last %s customers invoices
-LastSuppliersBills=Last %s suppliers invoices
+LastBills=Latest %s invoices
+LastCustomersBills=Latest %s customer invoices
+LastSuppliersBills=Latest %s supplier invoices
 AllBills=All invoices
 OtherBills=Other invoices
 DraftBills=Draft invoices
-CustomersDraftInvoices=Customers draft invoices
-SuppliersDraftInvoices=Suppliers draft invoices
+CustomersDraftInvoices=Customer draft invoices
+SuppliersDraftInvoices=Supplier draft invoices
 Unpaid=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>?
@@ -203,7 +207,7 @@ AlreadyPaidNoCreditNotesNoDeposits=Already paid (without credit notes and deposi
 Abandoned=Abandoned
 RemainderToPay=Remaining unpaid
 RemainderToTake=Remaining amount to take
-RemainderToPayBack=Remaining amount to pay back
+RemainderToPayBack=Remaining amount to refund
 Rest=Pending
 AmountExpected=Amount claimed
 ExcessReceived=Excess received
@@ -270,6 +274,7 @@ Deposit=Deposit
 Deposits=Deposits
 DiscountFromCreditNote=Discount from credit note %s
 DiscountFromDeposit=Payments from deposit invoice %s
+DiscountFromExcessReceived=Payments from excess received of invoice %s
 AbsoluteDiscountUse=This kind of credit can be used on invoice before its validation
 CreditNoteDepositUse=Invoice must be validated to use this kind of credits
 NewGlobalDiscount=New absolute discount
@@ -277,8 +282,8 @@ NewRelativeDiscount=New relative discount
 NoteReason=Note/Reason
 ReasonDiscount=Reason
 DiscountOfferedBy=Granted by
-DiscountStillRemaining=Discounts still remaining
-DiscountAlreadyCounted=Discounts already counted
+DiscountStillRemaining=Discounts available
+DiscountAlreadyCounted=Discounts already consumed
 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.
@@ -331,10 +336,12 @@ 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
 # PaymentConditions
 Statut=Status
-PaymentConditionShortRECEP=Immediate
-PaymentConditionRECEP=Immediate
+PaymentConditionShortRECEP=Due Upon Receipt
+PaymentConditionRECEP=Due Upon Receipt
 PaymentConditionShort30D=30 days
 PaymentCondition30D=30 days
 PaymentConditionShort30DENDMONTH=30 days of month-end
@@ -349,6 +356,14 @@ PaymentConditionShortPT_ORDER=Order
 PaymentConditionPT_ORDER=On order
 PaymentConditionShortPT_5050=50-50
 PaymentConditionPT_5050=50%% in advance, 50%% on delivery
+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
 FixAmount=Fix amount
 VarAmount=Variable amount (%% tot.)
 # PaymentType
@@ -418,7 +433,7 @@ ChequeDeposits=Checks deposits
 Cheques=Checks
 DepositId=Id deposit
 NbCheque=Number of checks
-CreditNoteConvertedIntoDiscount=This credit note or deposit invoice has been converted into %s
+CreditNoteConvertedIntoDiscount=This %s has been converted into %s
 UsBillingContactAsIncoiveRecipientIfExist=Use customer billing contact address instead of third party address as recipient for invoices
 ShowUnpaidAll=Show all unpaid invoices
 ShowUnpaidLateOnly=Show late unpaid invoices only
diff --git a/htdocs/langs/mk_MK/boxes.lang b/htdocs/langs/mk_MK/boxes.lang
index 98970318e85..38b03b4268d 100644
--- a/htdocs/langs/mk_MK/boxes.lang
+++ b/htdocs/langs/mk_MK/boxes.lang
@@ -25,8 +25,8 @@ BoxTitleLastSuppliers=Latest %s recorded suppliers
 BoxTitleLastModifiedSuppliers=Latest %s modified suppliers
 BoxTitleLastModifiedCustomers=Latest %s modified customers
 BoxTitleLastCustomersOrProspects=Latest %s customers or prospects
-BoxTitleLastCustomerBills=Latest %s customer's invoices
-BoxTitleLastSupplierBills=Latest %s supplier's invoices
+BoxTitleLastCustomerBills=Latest %s customer invoices
+BoxTitleLastSupplierBills=Latest %s supplier invoices
 BoxTitleLastModifiedProspects=Latest %s modified prospects
 BoxTitleLastModifiedMembers=Latest %s members
 BoxTitleLastFicheInter=Latest %s modified interventions
@@ -51,12 +51,12 @@ ClickToAdd=Click here to add.
 NoRecordedCustomers=No recorded customers
 NoRecordedContacts=No recorded contacts
 NoActionsToDo=No actions to do
-NoRecordedOrders=No recorded customer's orders
+NoRecordedOrders=No recorded customer orders
 NoRecordedProposals=No recorded proposals
-NoRecordedInvoices=No recorded customer's invoices
-NoUnpaidCustomerBills=No unpaid customer's invoices
-NoUnpaidSupplierBills=No unpaid supplier's invoices
-NoModifiedSupplierBills=No recorded supplier's invoices
+NoRecordedInvoices=No recorded customer invoices
+NoUnpaidCustomerBills=No unpaid customer invoices
+NoUnpaidSupplierBills=No unpaid supplier invoices
+NoModifiedSupplierBills=No recorded supplier invoices
 NoRecordedProducts=No recorded products/services
 NoRecordedProspects=No recorded prospects
 NoContractedProducts=No products/services contracted
diff --git a/htdocs/langs/mk_MK/companies.lang b/htdocs/langs/mk_MK/companies.lang
index 4a631b092cf..1b7efa3c14e 100644
--- a/htdocs/langs/mk_MK/companies.lang
+++ b/htdocs/langs/mk_MK/companies.lang
@@ -78,6 +78,10 @@ VATIsNotUsed=VAT is not used
 CopyAddressFromSoc=Fill address with third party address
 ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
 PaymentBankAccount=Payment bank account
+OverAllProposals=Total proposals
+OverAllOrders=Total orders
+OverAllInvoices=Total invoices
+OverAllSupplierProposals=Total price requests
 ##### Local Taxes #####
 LocalTax1IsUsed=Use second tax
 LocalTax1IsUsedES= RE is used
@@ -239,6 +243,10 @@ ProfId3RU=Prof Id 3 (KPP)
 ProfId4RU=Prof Id 4 (OKPO)
 ProfId5RU=-
 ProfId6RU=-
+ProfId1DZ=RC
+ProfId2DZ=Art.
+ProfId3DZ=NIF
+ProfId4DZ=NIS
 VATIntra=VAT number
 VATIntraShort=VAT number
 VATIntraSyntaxIsValid=Syntax is valid
@@ -382,8 +390,9 @@ ListCustomersShort=List of customers
 ThirdPartiesArea=Third parties and contact area
 LastModifiedThirdParties=Latest %s modified third parties
 UniqueThirdParties=Total of unique third parties
-InActivity=Open
+InActivity=Opened
 ActivityCeased=Closed
+ThirdPartyIsClosed=Third party is closed
 ProductsIntoElements=List of products/services into %s
 CurrentOutstandingBill=Current outstanding bill
 OutstandingBill=Max. for outstanding bill
@@ -396,7 +405,7 @@ MergeThirdparties=Merge third parties
 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 so you will be able to delete the duplicate one.
 ThirdpartiesMergeSuccess=Thirdparties have been merged
 SaleRepresentativeLogin=Login of sales representative
-SaleRepresentativeFirstname=Firstname of sales representative
-SaleRepresentativeLastname=Lastname of sales representative
+SaleRepresentativeFirstname=First name of sales representative
+SaleRepresentativeLastname=Last name of sales representative
 ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
 NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/mk_MK/compta.lang b/htdocs/langs/mk_MK/compta.lang
index 17f2bb4e98f..5e9814369ec 100644
--- a/htdocs/langs/mk_MK/compta.lang
+++ b/htdocs/langs/mk_MK/compta.lang
@@ -65,6 +65,7 @@ PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=VAT payment
 ListPayment=List of payments
 ListOfCustomerPayments=List of customer payments
+ListOfSupplierPayments=List of supplier payments
 DateStartPeriod=Date start period
 DateEndPeriod=Date end period
 newLT1Payment=New tax 2 payment
@@ -81,7 +82,7 @@ LT2PaymentES=IRPF Payment
 LT2PaymentsES=IRPF Payments
 VATPayment=Sales tax payment
 VATPayments=Sales tax payments
-VATRefund=Sales tax refund Refund
+VATRefund=Sales tax refund
 Refund=Refund
 SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Show VAT payment
@@ -194,7 +195,7 @@ CloneTax=Clone a social/fiscal tax
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
 CloneTaxForNextMonth=Clone it for next month
 SimpleReport=Simple report
-AddExtraReport=Extra reports
+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
diff --git a/htdocs/langs/mk_MK/cron.lang b/htdocs/langs/mk_MK/cron.lang
index cb68b31c80f..ae15e3b505f 100644
--- a/htdocs/langs/mk_MK/cron.lang
+++ b/htdocs/langs/mk_MK/cron.lang
@@ -17,8 +17,8 @@ CronMethodDoesNotExists=Class %s does not contains any method %s
 # Menu
 EnabledAndDisabled=Enabled and disabled
 # Page list
-CronLastOutput=Last run output
-CronLastResult=Last result code
+CronLastOutput=Latest run output
+CronLastResult=Latest result code
 CronCommand=Command
 CronList=Scheduled jobs
 CronDelete=Delete scheduled jobs
diff --git a/htdocs/langs/mk_MK/errors.lang b/htdocs/langs/mk_MK/errors.lang
index f935ce72d41..9e2eb6817ef 100644
--- a/htdocs/langs/mk_MK/errors.lang
+++ b/htdocs/langs/mk_MK/errors.lang
@@ -11,6 +11,7 @@ ErrorLoginAlreadyExists=Login %s already exists.
 ErrorGroupAlreadyExists=Group %s already exists.
 ErrorRecordNotFound=Record not found.
 ErrorFailToCopyFile=Failed to copy file '<b>%s</b>' into '<b>%s</b>'.
+ErrorFailToCopyDir=Failed to copy directory '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToRenameFile=Failed to rename file '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToDeleteFile=Failed to remove file '<b>%s</b>'.
 ErrorFailToCreateFile=Failed to create file '<b>%s</b>'.
@@ -115,7 +116,7 @@ ErrorNoActivatedBarcode=No barcode type activated
 ErrUnzipFails=Failed to unzip %s with ZipArchive
 ErrNoZipEngine=No engine to unzip %s file in this PHP
 ErrorFileMustBeADolibarrPackage=The file %s must be a Dolibarr zip package
-ErrorFileRequired=It takes a package Dolibarr file
+ErrorModuleFileRequired=You must select a Dolibarr module package file
 ErrorPhpCurlNotInstalled=The PHP CURL is not installed, this is essential to talk with 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
@@ -170,14 +171,19 @@ ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
 ErrorFileMustHaveFormat=File must have format %s
 ErrorSupplierCountryIsNotDefined=Country for this supplier is not defined. Correct this first.
 ErrorsThirdpartyMerge=Failed to merge the two records. Request canceled.
-ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enougth for product %s to add it into a new order.
-ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enougth for product %s to add it into a new invoice.
-ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enougth for product %s to add it into a new shipment.
-ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enougth for product %s to add it into a new proposal.
-ErrorFailedToLoadLoginFileForMode=Failed to get the login file for mode '%s'.
+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 bank 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>
 
 # 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.
diff --git a/htdocs/langs/mk_MK/holiday.lang b/htdocs/langs/mk_MK/holiday.lang
index a95da81eaaa..50d97c0d8cc 100644
--- a/htdocs/langs/mk_MK/holiday.lang
+++ b/htdocs/langs/mk_MK/holiday.lang
@@ -76,8 +76,9 @@ BoxTitleLastLeaveRequests=Latest %s modified leave requests
 HolidaysMonthlyUpdate=Monthly update
 ManualUpdate=Manual update
 HolidaysCancelation=Leave request cancelation
-EmployeeLastname=Employee lastname
-EmployeeFirstname=Employee firstname
+EmployeeLastname=Employee last name
+EmployeeFirstname=Employee first name
+TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
 
 ## Configuration du Module ##
 LastUpdateCP=Latest automatic update of leaves allocation
diff --git a/htdocs/langs/mk_MK/ldap.lang b/htdocs/langs/mk_MK/ldap.lang
index a17019d00fb..42e699de311 100644
--- a/htdocs/langs/mk_MK/ldap.lang
+++ b/htdocs/langs/mk_MK/ldap.lang
@@ -13,8 +13,8 @@ LDAPUsers=Users in LDAP database
 LDAPFieldStatus=Status
 LDAPFieldFirstSubscriptionDate=First subscription date
 LDAPFieldFirstSubscriptionAmount=First subscription amount
-LDAPFieldLastSubscriptionDate=Last subscription date
-LDAPFieldLastSubscriptionAmount=Last subscription amount
+LDAPFieldLastSubscriptionDate=Latest subscription date
+LDAPFieldLastSubscriptionAmount=Latest subscription amount
 LDAPFieldSkype=Skype id
 LDAPFieldSkypeExample=Example : skypeName
 UserSynchronized=User synchronized
diff --git a/htdocs/langs/mk_MK/mails.lang b/htdocs/langs/mk_MK/mails.lang
index ab18dcdca25..c830b551a67 100644
--- a/htdocs/langs/mk_MK/mails.lang
+++ b/htdocs/langs/mk_MK/mails.lang
@@ -35,7 +35,7 @@ MailingStatusSentPartialy=Sent partialy
 MailingStatusSentCompletely=Sent completely
 MailingStatusError=Error
 MailingStatusNotSent=Not sent
-MailSuccessfulySent=Email successfully sent (from %s to %s)
+MailSuccessfulySent=Email successfully accepted for delivery (from %s to %s)
 MailingSuccessfullyValidated=EMailing successfully validated
 MailUnsubcribe=Unsubscribe
 MailingStatusNotContact=Don't contact anymore
@@ -74,22 +74,28 @@ ResultOfMailSending=Result of mass EMail sending
 NbSelected=Nb selected
 NbIgnored=Nb ignored
 NbSent=Nb 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
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Line %s in file
 RecipientSelectionModules=Defined requests for recipient's selection
 MailSelectedRecipients=Selected recipients
 MailingArea=EMailings area
-LastMailings=Last %s emailings
+LastMailings=Latest %s emailings
 TargetsStatistics=Targets statistics
 NbOfCompaniesContacts=Unique contacts/addresses
 MailNoChangePossible=Recipients for validated emailing can't be changed
 SearchAMailing=Search mailing
 SendMailing=Send emailing
 SendMail=Send email
-MailingNeedCommand=For security reason, sending an emailing is better when performed from command line. If you have one, ask your server administrator to launch the following command to send the emailing to all recipients:
+SentBy=Sent by
+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=You can however send them online by adding parameter MAILING_LIMIT_SENDBYWEB with value of max number of emails you want to send by session. For this, go on Home - Setup - Other.
-ConfirmSendingEmailing=If you can't or prefer sending them with your www browser, please confirm you are sure you want to send emailing now from your browser?
+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.
 TargetsReset=Clear list
 ToClearAllRecipientsClickHere=Click here to clear the recipient list for this emailing
@@ -144,3 +150,6 @@ AdvTgtCreateFilter=Create filter
 AdvTgtOrCreateNewFilter=Name of new filter
 NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
+OutGoingEmailSetup=Outgoing email setup
+InGoingEmailSetup=Incoming email setup
+
diff --git a/htdocs/langs/mk_MK/main.lang b/htdocs/langs/mk_MK/main.lang
index 121ae45ec29..6f9e956fa10 100644
--- a/htdocs/langs/mk_MK/main.lang
+++ b/htdocs/langs/mk_MK/main.lang
@@ -63,11 +63,13 @@ ErrorNoVATRateDefinedForSellerCountry=Error, no vat rates defined for country '%
 ErrorNoSocialContributionForSellerCountry=Error, no social/fiscal taxes type defined for country '%s'.
 ErrorFailedToSaveFile=Error, failed to save file.
 ErrorCannotAddThisParentWarehouse=You are trying to add a parent warehouse which is already a child of current one
+MaxNbOfRecordPerPage=Max nb of record per page
 NotAuthorized=You are not authorized to do that.
 SetDate=Set date
 SelectDate=Select a date
 SeeAlso=See also %s
 SeeHere=See here
+Apply=Apply
 BackgroundColorByDefault=Default background color
 FileRenamed=The file was successfully renamed
 FileUploaded=The file was successfully uploaded
@@ -86,7 +88,7 @@ Undefined=Undefined
 PasswordForgotten=Password forgotten?
 SeeAbove=See above
 HomeArea=Home area
-LastConnexion=Last connection
+LastConnexion=Latest connection
 PreviousConnexion=Previous connection
 PreviousValue=Previous value
 ConnectedOnMultiCompany=Connected on environment
@@ -236,7 +238,7 @@ DateCreation=Creation date
 DateCreationShort=Creat. date
 DateModification=Modification date
 DateModificationShort=Modif. date
-DateLastModification=Last modification date
+DateLastModification=Latest modification date
 DateValidation=Validation date
 DateClosing=Closing date
 DateDue=Due date
@@ -432,7 +434,7 @@ Reportings=Reporting
 Draft=Draft
 Drafts=Drafts
 Validated=Validated
-Opened=Open
+Opened=Opened
 New=New
 Discount=Discount
 Unknown=Unknown
@@ -460,6 +462,7 @@ DeletePicture=Picture delete
 ConfirmDeletePicture=Confirm picture deletion?
 Login=Login
 CurrentLogin=Current login
+EnterLoginDetail=Enter login details
 January=January
 February=February
 March=March
@@ -597,6 +600,8 @@ SessionName=Session name
 Method=Method
 Receive=Receive
 CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
+ExpectedValue=Expected Value
+CurrentValue=Current value
 PartialWoman=Partial
 TotalWoman=Total
 NeverReceived=Never received
@@ -753,6 +758,8 @@ RemoveString=Remove string '%s'
 SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
 DirectDownloadLink=Direct download link
 Download=Download
+ActualizeCurrency=Update currency rate
+Fiscalyear=Fiscal year
 # Week day
 Monday=Monday
 Tuesday=Tuesday
@@ -787,8 +794,8 @@ SetRef=Set ref
 Select2ResultFoundUseArrows=Some results found. Use arrows to select.
 Select2NotFound=No result found
 Select2Enter=Enter
-Select2MoreCharacter=or more character
-Select2MoreCharacters=or more characters
+Select2MoreCharacter=or more characters<br /><br /><strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
+Select2MoreCharacters=or more characters<br /><br /><strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
 Select2LoadingMoreResults=Loading more results...
 Select2SearchInProgress=Search in progress...
 SearchIntoThirdparties=Thirdparties
@@ -809,3 +816,5 @@ SearchIntoContracts=Contracts
 SearchIntoCustomerShipments=Customer shipments
 SearchIntoExpenseReports=Expense reports
 SearchIntoLeaves=Leaves
+
+BulkActions=Bulk actions
diff --git a/htdocs/langs/mk_MK/members.lang b/htdocs/langs/mk_MK/members.lang
index df911af6f71..8f6f76ba48f 100644
--- a/htdocs/langs/mk_MK/members.lang
+++ b/htdocs/langs/mk_MK/members.lang
@@ -45,7 +45,7 @@ MemberStatusDraft=Draft (needs to be validated)
 MemberStatusDraftShort=Draft
 MemberStatusActive=Validated (waiting subscription)
 MemberStatusActiveShort=Validated
-MemberStatusActiveLate=subscription expired
+MemberStatusActiveLate=Subscription expired
 MemberStatusActiveLateShort=Expired
 MemberStatusPaid=Subscription up to date
 MemberStatusPaidShort=Up to date
@@ -136,8 +136,8 @@ DocForAllMembersCards=Generate business cards for all members
 DocForOneMemberCards=Generate business cards for a particular member
 DocForLabels=Generate address sheets
 SubscriptionPayment=Subscription payment
-LastSubscriptionDate=Last subscription date
-LastSubscriptionAmount=Last subscription amount
+LastSubscriptionDate=Latest subscription date
+LastSubscriptionAmount=Latest subscription amount
 MembersStatisticsByCountries=Members statistics by country
 MembersStatisticsByState=Members statistics by state/province
 MembersStatisticsByTown=Members statistics by town
@@ -149,7 +149,7 @@ MembersByStateDesc=This screen show you statistics on members by state/provinces
 MembersByTownDesc=This screen show you statistics on members by town.
 MembersStatisticsDesc=Choose statistics you want to read...
 MenuMembersStats=Statistics
-LastMemberDate=Last member date
+LastMemberDate=Latest member date
 Nature=Nature
 Public=Information are public
 NewMemberbyWeb=New member added. Awaiting approval
diff --git a/htdocs/langs/mk_MK/orders.lang b/htdocs/langs/mk_MK/orders.lang
index 9d2e53e4fe2..331e3b49d3e 100644
--- a/htdocs/langs/mk_MK/orders.lang
+++ b/htdocs/langs/mk_MK/orders.lang
@@ -39,7 +39,7 @@ StatusOrderRefusedShort=Refused
 StatusOrderBilledShort=Billed
 StatusOrderToProcessShort=To process
 StatusOrderReceivedPartiallyShort=Partially received
-StatusOrderReceivedAllShort=Everything received
+StatusOrderReceivedAllShort=Products received
 StatusOrderCanceled=Canceled
 StatusOrderDraft=Draft (needs to be validated)
 StatusOrderValidated=Validated
@@ -51,7 +51,7 @@ StatusOrderApproved=Approved
 StatusOrderRefused=Refused
 StatusOrderBilled=Billed
 StatusOrderReceivedPartially=Partially received
-StatusOrderReceivedAll=Everything received
+StatusOrderReceivedAll=All products received
 ShippingExist=A shipment exists
 QtyOrdered=Qty ordered
 ProductQtyInDraft=Product quantity into draft orders
diff --git a/htdocs/langs/mk_MK/other.lang b/htdocs/langs/mk_MK/other.lang
index 1ea1f9da1db..ab937ff3bab 100644
--- a/htdocs/langs/mk_MK/other.lang
+++ b/htdocs/langs/mk_MK/other.lang
@@ -2,6 +2,7 @@
 SecurityCode=Security code
 NumberingShort=N°
 Tools=Tools
+TMenuTools=Tools
 ToolsDesc=All miscellaneous tools not included in other menu entries are collected here.<br /><br />All the tools can be reached in the left menu.
 Birthday=Birthday
 BirthdayDate=Birthday date
@@ -67,14 +68,15 @@ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find her
 PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nYou will find here the shipping __SHIPPINGREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nYou will find here the intervention __FICHINTERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n__PERSONALIZED__\n\n__SIGNATURE__
-DemoDesc=Dolibarr is a compact ERP/CRM supporting several functional modules. A demo showcasing all modules makes no sense as this scenario never occurs. So, several demo profiles are available.
+DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
+ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
 DemoFundation=Manage members of a foundation
 DemoFundation2=Manage members and bank account of a foundation
-DemoCompanyServiceOnly=Manage a freelance activity selling service only
+DemoCompanyServiceOnly=Company or freelance selling service only
 DemoCompanyShopWithCashDesk=Manage a shop with a cash desk
-DemoCompanyProductAndStocks=Manage a small or medium company selling products
-DemoCompanyAll=Manage a small or medium company with multiple activities (all main modules)
+DemoCompanyProductAndStocks=Company selling products with a shop
+DemoCompanyAll=Company with multiple activities (all main modules)
 CreatedBy=Created by %s
 ModifiedBy=Modified by %s
 ValidatedBy=Validated by %s
diff --git a/htdocs/langs/mk_MK/products.lang b/htdocs/langs/mk_MK/products.lang
index 20440eb611b..3a412a5789c 100644
--- a/htdocs/langs/mk_MK/products.lang
+++ b/htdocs/langs/mk_MK/products.lang
@@ -5,6 +5,8 @@ ProductLabelTranslated=Translated product label
 ProductDescriptionTranslated=Translated product description
 ProductNoteTranslated=Translated product note
 ProductServiceCard=Products/Services card
+TMenuProducts=Products
+TMenuServices=Services
 Products=Products
 Services=Services
 Product=Product
@@ -58,7 +60,7 @@ SellingPrice=Selling price
 SellingPriceHT=Selling price (net of tax)
 SellingPriceTTC=Selling price (inc. tax)
 CostPriceDescription=This price (net of tax) can be used to store the average amount this product cost to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
-CostPriceUsage=In a future version, this value could be used for margin calculation.
+CostPriceUsage=This value could be used for margin calculation.
 SoldAmount=Sold amount
 PurchasedAmount=Purchased amount
 NewPrice=New price
@@ -140,6 +142,7 @@ ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b>?
 CloneContentProduct=Clone all main informations of product/service
 ClonePricesProduct=Clone main informations and prices
 CloneCompositionProduct=Clone packaged product/service
+CloneCombinationsProduct=Clone product variants
 ProductIsUsed=This product is used
 NewRefForClone=Ref. of new product/service
 SellingPrices=Selling prices
@@ -236,7 +239,7 @@ GlobalVariables=Global variables
 VariableToUpdate=Variable to update
 GlobalVariableUpdaters=Global variable updaters
 UpdateInterval=Update interval (minutes)
-LastUpdated=Last updated
+LastUpdated=Latest update
 CorrectlyUpdated=Correctly updated
 PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
 PropalMergePdfProductChooseFile=Select PDF files
@@ -256,4 +259,41 @@ VolumeUnits=Volume unit
 SizeUnits=Size unit
 DeleteProductBuyPrice=Delete buying price
 ConfirmDeleteProductBuyPrice=Are you sure you want to delete this buying price?
+SubProduct=Sub product
 
+#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
+ProductCombinations=Variants
+HideProductCombinations=Hide products variant in the products selector
+ProductCombination=Variant
+NewProductCombination=New variant
+EditProductCombination=Editing variant
+ProductCombinationGenerator=Variants generator
+Features=Features
+PriceImpact=Price impact
+WeightImpact=Weight impact
+NewProductAttribute=New attribute
+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
+PercentageVariation=Percentage variation
+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 child products
+ConfirmCloneProductCombinations=Would you like to copy all the product variant to the 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
diff --git a/htdocs/langs/mk_MK/projects.lang b/htdocs/langs/mk_MK/projects.lang
index ecf61d17d36..f9c603ce113 100644
--- a/htdocs/langs/mk_MK/projects.lang
+++ b/htdocs/langs/mk_MK/projects.lang
@@ -29,9 +29,9 @@ DeleteAProject=Delete a project
 DeleteATask=Delete a task
 ConfirmDeleteAProject=Are you sure you want to delete this project?
 ConfirmDeleteATask=Are you sure you want to delete this task?
-OpenedProjects=Open projects
-OpenedTasks=Open tasks
-OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
+OpenedProjects=Opened projects
+OpenedTasks=Opened tasks
+OpportunitiesStatusForOpenedProjects=Opportunities amount of opened projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=Show project
 SetProject=Set project
@@ -47,7 +47,7 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
 TaskTimeDate=Date
-TasksOnOpenedProject=Tasks on open projects
+TasksOnOpenedProject=Tasks on opened projects
 WorkloadNotDefined=Workload not defined
 NewTimeSpent=New time spent
 MyTimeSpent=My time spent
@@ -58,6 +58,7 @@ TaskDateEnd=Task end date
 TaskDescription=Task description
 NewTask=New task
 AddTask=Create task
+AddTimeSpent=Create time spent
 Activity=Activity
 Activities=Tasks/activities
 MyActivities=My tasks/activities
@@ -95,6 +96,7 @@ ValidateProject=Validate projet
 ConfirmValidateProject=Are you sure you want to validate this project?
 CloseAProject=Close project
 ConfirmCloseAProject=Are you sure you want to close this project?
+AlsoCloseAProject=Also close project (keep it open if you still need to follow production tasks on it)
 ReOpenAProject=Open project
 ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=Project contacts
@@ -120,7 +122,7 @@ CloneProjectFiles=Clone project joined files
 CloneTaskFiles=Clone task(s) joined files (if task(s) cloned)
 CloneMoveDate=Update project/tasks dates from now?
 ConfirmCloneProject=Are you sure to clone this project?
-ProjectReportDate=Change task date according project start date
+ProjectReportDate=Change task dates according to new project start date
 ErrorShiftTaskDate=Impossible to shift task date according to new project start date
 ProjectsAndTasksLines=Projects and tasks
 ProjectCreatedInDolibarr=Project %s created
@@ -177,9 +179,9 @@ ProjectsStatistics=Statistics on projects/leads
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 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.
-OpenedProjectsByThirdparties=Open projects by thirdparties
+OpenedProjectsByThirdparties=Opened projects by thirdparties
 OnlyOpportunitiesShort=Only opportunities
-OpenedOpportunitiesShort=Open opportunities
+OpenedOpportunitiesShort=Opened opportunities
 NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount
diff --git a/htdocs/langs/mk_MK/propal.lang b/htdocs/langs/mk_MK/propal.lang
index 52260fe2b4e..a14d25ce779 100644
--- a/htdocs/langs/mk_MK/propal.lang
+++ b/htdocs/langs/mk_MK/propal.lang
@@ -3,7 +3,7 @@ Proposals=Commercial proposals
 Proposal=Commercial proposal
 ProposalShort=Proposal
 ProposalsDraft=Draft commercial proposals
-ProposalsOpened=Open commercial proposals
+ProposalsOpened=Opened commercial proposals
 Prop=Commercial proposals
 CommercialProposal=Commercial proposal
 ProposalCard=Proposal card
@@ -26,9 +26,9 @@ AmountOfProposalsByMonthHT=Amount by month (net of tax)
 NbOfProposals=Number of commercial proposals
 ShowPropal=Show proposal
 PropalsDraft=Drafts
-PropalsOpened=Open
+PropalsOpened=Opened
 PropalStatusDraft=Draft (needs to be validated)
-PropalStatusValidated=Validated (proposal is open)
+PropalStatusValidated=Validated (proposal is opened)
 PropalStatusSigned=Signed (needs billing)
 PropalStatusNotSigned=Not signed (closed)
 PropalStatusBilled=Billed
diff --git a/htdocs/langs/mk_MK/stocks.lang b/htdocs/langs/mk_MK/stocks.lang
index 834fa104098..1db49b8d8dd 100644
--- a/htdocs/langs/mk_MK/stocks.lang
+++ b/htdocs/langs/mk_MK/stocks.lang
@@ -22,13 +22,15 @@ Movements=Movements
 ErrorWarehouseRefRequired=Warehouse reference name is required
 ListOfWarehouses=List of warehouses
 ListOfStockMovements=List of stock movements
+StockMovementForId=Movement ID %d
+ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Warehouses area
 Location=Location
 LocationSummary=Short name location
 NumberOfDifferentProducts=Number of different products
 NumberOfProducts=Total number of products
-LastMovement=Last movement
-LastMovements=Last movements
+LastMovement=Latest movement
+LastMovements=Latest movements
 Units=Units
 Unit=Unit
 StockCorrection=Correct stock
@@ -140,3 +142,4 @@ ProductStockWarehouseCreated=Stock limit for alert and desired optimal stock cor
 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
diff --git a/htdocs/langs/mk_MK/supplier_proposal.lang b/htdocs/langs/mk_MK/supplier_proposal.lang
index 621d7784e35..61b031459b0 100644
--- a/htdocs/langs/mk_MK/supplier_proposal.lang
+++ b/htdocs/langs/mk_MK/supplier_proposal.lang
@@ -8,7 +8,7 @@ SearchRequest=Find a request
 DraftRequests=Draft requests
 SupplierProposalsDraft=Draft supplier proposals
 LastModifiedRequests=Latest %s modified price requests
-RequestsOpened=Open price requests
+RequestsOpened=Opened price requests
 SupplierProposalArea=Supplier proposals area
 SupplierProposalShort=Supplier proposal
 SupplierProposals=Supplier proposals
@@ -23,7 +23,7 @@ ConfirmValidateAsk=Are you sure you want to validate this price request under na
 DeleteAsk=Delete request
 ValidateAsk=Validate request
 SupplierProposalStatusDraft=Draft (needs to be validated)
-SupplierProposalStatusValidated=Validated (request is open)
+SupplierProposalStatusValidated=Validated (request is opened)
 SupplierProposalStatusClosed=Closed
 SupplierProposalStatusSigned=Accepted
 SupplierProposalStatusNotSigned=Refused
diff --git a/htdocs/langs/mk_MK/suppliers.lang b/htdocs/langs/mk_MK/suppliers.lang
index 766e4a9bfe9..3f72a4d8d1e 100644
--- a/htdocs/langs/mk_MK/suppliers.lang
+++ b/htdocs/langs/mk_MK/suppliers.lang
@@ -41,3 +41,4 @@ DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Wrong quality
 ReputationForThisProduct=Reputation
 BuyerName=Buyer name
+AllProductServicePrices=All product / service prices
diff --git a/htdocs/langs/mk_MK/users.lang b/htdocs/langs/mk_MK/users.lang
index b836db8eb42..a0a1eae8697 100644
--- a/htdocs/langs/mk_MK/users.lang
+++ b/htdocs/langs/mk_MK/users.lang
@@ -36,7 +36,7 @@ AdministratorDesc=Administrator
 DefaultRights=Default permissions
 DefaultRightsDesc=Define here <u>default</u> permissions that are automatically granted to a <u>new created</u> user (Go on user card to change permission of an existing user).
 DolibarrUsers=Dolibarr users
-LastName=Last Name
+LastName=Last name
 FirstName=First name
 ListOfGroups=List of groups
 NewGroup=New group
diff --git a/htdocs/langs/mk_MK/withdrawals.lang b/htdocs/langs/mk_MK/withdrawals.lang
index 6e560a1abb1..a99d890e5f9 100644
--- a/htdocs/langs/mk_MK/withdrawals.lang
+++ b/htdocs/langs/mk_MK/withdrawals.lang
@@ -24,6 +24,7 @@ WithdrawStatistics=Direct debit payment statistics
 WithdrawRejectStatistics=Direct debit payment reject statistics
 LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
+WithdrawRequestsDone=%s direct debit payment requests recorded
 ThirdPartyBankCode=Third party bank code
 NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoice are on companies with a valid BAN.
 ClassCredited=Classify credited
@@ -76,8 +77,8 @@ RUM=UMR
 RUMLong=Unique Mandate Reference
 RUMWillBeGenerated=UMR number will be generated once bank account information are saved
 WithdrawMode=Direct debit mode (FRST or RECUR)
-WithdrawRequestAmount=Withdraw request amount:
-WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil amount.
+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
diff --git a/htdocs/langs/mn_MN/accountancy.lang b/htdocs/langs/mn_MN/accountancy.lang
index 5de95948fbf..4c2336b97b0 100644
--- a/htdocs/langs/mn_MN/accountancy.lang
+++ b/htdocs/langs/mn_MN/accountancy.lang
@@ -194,6 +194,8 @@ ChangeBinding=Change the binding
 
 ## Admin
 ApplyMassCategories=Apply mass categories
+AddAccountFromBookKeepingWithNoCategories=Add acccount already used with no categories
+CategoryDeleted=Category for the accounting account has been removed
 
 ## Export
 Exports=Exports
@@ -209,6 +211,7 @@ Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution
 Modelcsv_quadratus=Export towards Quadratus QuadraCompta
 Modelcsv_ebp=Export towards EBP
 Modelcsv_cogilog=Export towards Cogilog
+ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
 InitAccountancy=Init accountancy
diff --git a/htdocs/langs/mn_MN/admin.lang b/htdocs/langs/mn_MN/admin.lang
index 23c8998e615..7282d9a21db 100644
--- a/htdocs/langs/mn_MN/admin.lang
+++ b/htdocs/langs/mn_MN/admin.lang
@@ -9,14 +9,20 @@ VersionDevelopment=Development
 VersionUnknown=Unknown
 VersionRecommanded=Recommended
 FileCheck=Files integrity checker
-FileCheckDesc=This tool allows you to check the integrity of files of your application, comparing each files with the official ones. You can use this tool to detect if some files were modified by a hacker for example.
+FileCheckDesc=This tool allows you to check the integrity of files and setup of your application, comparing each files with the official ones. 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.
+FileIntegrityIsStrictlyConformedWithReference=Files integrity is strictly conformed with the reference.
+FileIntegrityIsOkButFilesWereAdded=Files integrity check has passed, however some new files were added.
+FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified, removed or added.
+GlobalChecksum=Global checksum
 MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
 LocalSignature=Embedded local signature (less reliable)
 RemoteSignature=Remote distant signature (more reliable)
 FilesMissing=Missing Files
 FilesUpdated=Updated Files
+FilesModified=Modified Files
+FilesAdded=Added Files
 FileCheckDolibarr=Check integrity of application files
-AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from a certified package
+AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from an official package
 XmlNotFound=Xml Integrity File of application not found
 SessionId=Session ID
 SessionSaveHandler=Handler to save sessions
@@ -185,7 +191,9 @@ BoxesDesc=Widgets are components showing some information that you can add to pe
 OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
 ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
-ModulesMarketPlaces=More modules...
+ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
+ModulesMarketPlaces=Find external modules...
+GoModuleSetupArea=To deploy/install a new module, go onto the Module setup area at <a href="%s">%s</a>.
 DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules
 DoliPartnersDesc=List of companies providing custom developed modules or features (Note: anyone experienced in PHP programming can provide custom development for an open source project)
 WebSiteDesc=Reference websites to find more modules...
@@ -276,21 +284,22 @@ ModuleFamilyInterface=Interfaces with external systems
 MenuHandlers=Menu handlers
 MenuAdmin=Menu editor
 DoNotUseInProduction=Do not use in production
-ThisIsProcessToFollow=This is setup to process:
-ThisIsAlternativeProcessToFollow=This is an alternative setup to process:
+ThisIsProcessToFollow=This is steps to process:
+ThisIsAlternativeProcessToFollow=This is an alternative setup to process manually:
 StepNb=Step %s
 FindPackageFromWebSite=Find a package that provides feature you want (for example on official web site %s).
 DownloadPackageFromWebSite=Download package (for example from official web site %s).
-UnpackPackageInDolibarrRoot=Unpack package file into Dolibarr server directory dedicated to external modules: <b>%s</b>
-SetupIsReadyForUse=Install is finished and Dolibarr is ready to use with this new component.
-NotExistsDirect=The alternative root directory is not defined.<br>
-InfDirAlt=Since version 3 it is possible to define an alternative root directory.This allows you to store, same place, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
-InfDirExample=<br>Then declare it in the file conf.php<br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>*These lines are commented with "#", to uncomment only remove the character.
+UnpackPackageInDolibarrRoot=Unpack the packaged files into server directory dedicated to Dolibarr: <b>%s</b>
+UnpackPackageInModulesRoot=To deploy/install an external module, unpack the packaged files into the server directory dedicated to modules: <b>%s</b>
+SetupIsReadyForUse=Module deployment is finished. You must however enable and setup the module in your application by going on the page to setup modules: <a href="%s">%s</a>.
+NotExistsDirect=The alternative root directory is not defined to an existing directory.<br>
+InfDirAlt=Since version 3, it is possible to define an alternative root directory. This allows you to store, into a dedicated directory, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
+InfDirExample=<br>Then declare it in the file <strong>conf.php</strong><br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>If these lines are commented with "#", to enable them, just uncomment by removing the "#" character.
 YouCanSubmitFile=For this step, you can send package using this tool: Select module file
 CurrentVersion=Dolibarr current version
 CallUpdatePage=Go to the page that updates the database structure and data: %s.
 LastStableVersion=Latest stable version
-LastActivationDate=Last activation date
+LastActivationDate=Latest activation date
 UpdateServerOffline=Update server offline
 GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s. <br><b>{000000@x}</b> same as previous but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
 GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
@@ -373,11 +382,11 @@ ExtrafieldCheckBox=Checkbox
 ExtrafieldRadio=Radio button
 ExtrafieldCheckBoxFromList= Checkbox from table
 ExtrafieldLink=Link to an object
-ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>In order to have the list depending on another :<br>1,value1|parent_list_code:parent_key<br>2,value2|parent_list_code:parent_key
+ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list :<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list :<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
-ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
+ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Example : Societe:societe/class/societe.class.php
 LibraryToBuildPDF=Library used for PDF generation
 WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
@@ -411,10 +420,11 @@ ModuleCompanyCodePanicum=Return an empty accountancy code.
 ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party code.
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
-
+WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<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).
+ClickToShowDescription=Click to show description
 # Modules
 Module0Name=Users & groups
-Module0Desc=Users and groups management
+Module0Desc=Users / Employees and Groups management
 Module1Name=Third parties
 Module1Desc=Companies and contact management (customers, prospects...)
 Module2Name=Commercial
@@ -515,8 +525,8 @@ Module2200Name=Dynamic Prices
 Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
 Module2300Desc=Scheduled job management
-Module2400Name=Agenda/Events
-Module2400Desc=Follow events or rendez-vous. Record manual events into Agendas or let application logs automatic events for tracking purposes.
+Module2400Name=Events/Agenda
+Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous.
 Module2500Name=Electronic Content Management
 Module2500Desc=Save and share documents
 Module2600Name=API/Web services (SOAP server)
@@ -582,7 +592,7 @@ Permission34=Delete products
 Permission36=See/manage hidden products
 Permission38=Export products
 Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
-Permission42=Create/modify projects (shared project and projects i'm contact for)
+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)
 Permission45=Export projects
 Permission61=Read interventions
@@ -685,7 +695,7 @@ PermissionAdvanced253=Create/modify internal/external users and permissions
 Permission254=Create/modify external users only
 Permission255=Modify other users password
 Permission256=Delete or disable other users
-Permission262=Extend access to all third parties (not only those linked to user). Not effective for external users (always limited to themselves).
+Permission262=Extend access to all third parties (not only third parties that user is a sale representative).<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 assignement matters).
 Permission271=Read CA
 Permission272=Read invoices
 Permission273=Issue invoices
@@ -887,7 +897,7 @@ Offset=Offset
 AlwaysActive=Always active
 Upgrade=Upgrade
 MenuUpgrade=Upgrade / Extend
-AddExtensionThemeModuleOrOther=Add extension (theme, module, ...)
+AddExtensionThemeModuleOrOther=Deploy/install external module
 WebServer=Web server
 DocumentRootServer=Web server's root directory
 DataRootServer=Data files directory
@@ -994,7 +1004,7 @@ TriggerAlwaysActive=Triggers in this file are always active, whatever are the ac
 TriggerActiveAsModuleActive=Triggers in this file are active as module <b>%s</b> is enabled.
 GeneratedPasswordDesc=Define here which rule you want to use to generate new password if you ask to have auto generated password
 DictionaryDesc=Insert all reference data. You can add your values to the default.
-ConstDesc=This page allows you to edit all other parameters not available in previous pages. These are mostly reserved parameters for developers or advanced troubleshooting.
+ConstDesc=This page allows you to edit all other parameters not available in previous pages. These are mostly reserved parameters for developers or advanced troubleshooting. For a list of options <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">check here</a>.
 MiscellaneousDesc=All other security related parameters are defined here.
 LimitsSetup=Limits/Precision setup
 LimitsDesc=You can define limits, precisions and optimisations used by Dolibarr here
@@ -1161,10 +1171,6 @@ FreeLegalTextOnOrders=Free text on orders
 WatermarkOnDraftOrders=Watermark on draft orders (none if empty)
 ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable
 BANK_ASK_PAYMENT_BANK_DURING_ORDER=Ask for bank account destination of order
-##### Clicktodial #####
-ClickToDialSetup=Click To Dial module setup
-ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with your clicktodial login (defined on your user card)<br><b>__PASS__</b> that will be replaced with your clicktodial password (defined on your user card).
-##### Bookmark4u #####
 ##### Interventions #####
 InterventionsSetup=Interventions module setup
 FreeLegalTextOnInterventions=Free text on intervention documents
@@ -1391,7 +1397,7 @@ SendingsSetup=Sending module setup
 SendingsReceiptModel=Sending receipt model
 SendingsNumberingModules=Sendings numbering modules
 SendingsAbility=Support shipping sheets for customer deliveries
-NoNeedForDeliveryReceipts=In most cases, sendings receipts are used both as sheets for customer deliveries (list of products to send) and sheets that is recevied and signed by customer. So product deliveries receipts is a duplicated feature and is rarely activated.
+NoNeedForDeliveryReceipts=In most cases, shipping sheets are used both as sheets for customer deliveries (list of products to send) and sheets that is received and signed by customer. So product deliveries receipts is a duplicated feature and is rarely activated.
 FreeLegalTextOnShippings=Free text on shipments
 ##### Deliveries #####
 DeliveryOrderNumberingModules=Products deliveries receipt numbering module
@@ -1471,7 +1477,11 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Set automatically this default value for type of e
 AGENDA_DEFAULT_FILTER_TYPE=Set automatically this type of event into search filter of agenda view
 AGENDA_DEFAULT_FILTER_STATUS=Set automatically this status for events into search filter of agenda view
 AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
-##### ClickToDial #####
+AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
+AGENDA_NOTIFICATION_SOUND=Enable sound notification
+##### Clicktodial #####
+ClickToDialSetup=Click To Dial module setup
+ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with your clicktodial login (defined on your user card)<br><b>__PASS__</b> that will be replaced with your clicktodial password (defined on your user card).
 ClickToDialDesc=This module allows to make phone numbers clickable. A click on this icon will call make your phone to 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.
 ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
 ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on same computer than the browser, and called when you click on a link in your browser that start 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.
@@ -1499,10 +1509,11 @@ EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint availa
 ##### API ####
 ApiSetup=API module setup
 ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
-ApiProductionMode=Enable production mode (this will activate use of a caches for services management)
+ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
 ApiExporerIs=You can explore the APIs at url
 OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
 ApiKey=Key for API
+WarningAPIExplorerDisabled=The API explorer has been disabled. API explorer is not required to provide API services. It is a tool for developer to find/test REST APIs. If you need this tool, go into setup of module API REST to activate it.
 ##### Bank #####
 BankSetupModule=Bank module setup
 FreeLegalTextOnChequeReceipts=Free text on cheque receipts
@@ -1571,7 +1582,7 @@ BackupDumpWizard=Wizard to build database backup dump file
 SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
 SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is only manual steps a privileged user can do.
 InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
-ConfFileMuseContainCustom=Installing an external module from application save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to have option<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
+ConfFileMuseContainCustom=Installing an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
 HighlightLinesColor=Highlight color of the line when the mouse passes over (keep empty for no highlight)
 TextTitleColor=Color of page title
@@ -1601,6 +1612,7 @@ FixTZ=TimeZone fix
 FillFixTZOnlyIfRequired=Example: +2 (fill only if problem experienced)
 ExpectedChecksum=Expected Checksum
 CurrentChecksum=Current Checksum
+ForcedConstants=Required constant values
 MailToSendProposal=To send customer proposal
 MailToSendOrder=To send customer order
 MailToSendInvoice=To send customer invoice
@@ -1609,13 +1621,14 @@ MailToSendIntervention=To send intervention
 MailToSendSupplierRequestForQuotation=To send quotation request to supplier
 MailToSendSupplierOrder=To send supplier order
 MailToSendSupplierInvoice=To send supplier invoice
+MailToSendContract=To send a contract
 MailToThirdparty=To send email from third party page
 ByDefaultInList=Show by default on list view
-YouUseLastStableVersion=You use the last stable version
+YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
 TitleExampleForMaintenanceRelease=Example of message you can use to announce this maintenance release (feel free to use it on your web sites)
-ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. You can download it from the download area of http://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.
-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, nor data structure change is present into this version. You can download it from the download area of http://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.
+ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. 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.
+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, nor data structure change is present into 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, you can enter here rule to have price for each level autocalculated according to price of first level, so you will have to enter only price for first level on each product. This page is here to save you time and can be usefull only if your prices for each leve are relative to first level. You can ignore this page in most cases.
 ModelModulesProduct=Templates for product documents
 ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
diff --git a/htdocs/langs/mn_MN/banks.lang b/htdocs/langs/mn_MN/banks.lang
index 7ae841cf0f3..f0c41d5d5bf 100644
--- a/htdocs/langs/mn_MN/banks.lang
+++ b/htdocs/langs/mn_MN/banks.lang
@@ -74,13 +74,13 @@ Conciliate=Reconcile
 Conciliation=Reconciliation
 ReconciliationLate=Reconciliation late
 IncludeClosedAccount=Include closed accounts
-OnlyOpenedAccount=Only open accounts
+OnlyOpenedAccount=Only opened accounts
 AccountToCredit=Account to credit
 AccountToDebit=Account to debit
 DisableConciliation=Disable reconciliation feature for this account
 ConciliationDisabled=Reconciliation feature disabled
 LinkedToAConciliatedTransaction=Linked to a conciliated entry
-StatusAccountOpened=Open
+StatusAccountOpened=Opened
 StatusAccountClosed=Closed
 AccountIdShort=Number
 LineRecord=Transaction
diff --git a/htdocs/langs/mn_MN/bills.lang b/htdocs/langs/mn_MN/bills.lang
index bf3b48a37e9..5fb3b6169da 100644
--- a/htdocs/langs/mn_MN/bills.lang
+++ b/htdocs/langs/mn_MN/bills.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - bills
 Bill=Invoice
 Bills=Invoices
-BillsCustomers=Customers invoices
-BillsCustomer=Customers invoice
-BillsSuppliers=Suppliers invoices
-BillsCustomersUnpaid=Unpaid customers invoices
-BillsCustomersUnpaidForCompany=Unpaid customer's invoices for %s
-BillsSuppliersUnpaid=Unpaid supplier's invoices
-BillsSuppliersUnpaidForCompany=Unpaid supplier's invoices for %s
+BillsCustomers=Customer invoices
+BillsCustomer=Customer invoice
+BillsSuppliers=Supplier invoices
+BillsCustomersUnpaid=Unpaid customer invoices
+BillsCustomersUnpaidForCompany=Unpaid customer invoices for %s
+BillsSuppliersUnpaid=Unpaid supplier invoices
+BillsSuppliersUnpaidForCompany=Unpaid supplier invoices for %s
 BillsLate=Late payments
 BillsStatistics=Customers invoices statistics
 BillsStatisticsSuppliers=Suppliers invoices statistics
@@ -62,8 +62,8 @@ PaymentsBack=Payments back
 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 credit note or deposit 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.
+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.
 SupplierPayments=Suppliers payments
 ReceivedPayments=Received payments
 ReceivedCustomersPayments=Payments received from customers
@@ -78,6 +78,7 @@ PaymentMode=Payment type
 PaymentTypeDC=Debit/Credit Card
 PaymentTypePP=PayPal
 IdPaymentMode=Payment type (id)
+CodePaymentMode=Payment type (code)
 LabelPaymentMode=Payment type (label)
 PaymentModeShort=Payment type
 PaymentTerm=Payment term
@@ -102,9 +103,10 @@ SearchACustomerInvoice=Search for a customer invoice
 SearchASupplierInvoice=Search for a supplier invoice
 CancelBill=Cancel an invoice
 SendRemindByMail=Send reminder by EMail
-DoPayment=Do payment
-DoPaymentBack=Do payment back
+DoPayment=Enter payment
+DoPaymentBack=Enter refund
 ConvertToReduc=Convert into future discount
+ConvertExcessReceivedToReduc=Convert excess received into future discount
 EnterPaymentReceivedFromCustomer=Enter payment received from customer
 EnterPaymentDueToCustomer=Make payment due to customer
 DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
@@ -113,22 +115,24 @@ BillStatus=Invoice status
 StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Draft (needs to be validated)
 BillStatusPaid=Paid
-BillStatusPaidBackOrConverted=Paid or converted into discount
+BillStatusPaidBackOrConverted=Refund or converted into discount
 BillStatusConverted=Paid (ready for final invoice)
 BillStatusCanceled=Abandoned
 BillStatusValidated=Validated (needs to be paid)
 BillStatusStarted=Started
 BillStatusNotPaid=Not paid
+BillStatusNotRefunded=Not refunded
 BillStatusClosedUnpaid=Closed (unpaid)
 BillStatusClosedPaidPartially=Paid (partially)
 BillShortStatusDraft=Draft
 BillShortStatusPaid=Paid
-BillShortStatusPaidBackOrConverted=Processed
+BillShortStatusPaidBackOrConverted=Refund or converted
 BillShortStatusConverted=Processed
 BillShortStatusCanceled=Abandoned
 BillShortStatusValidated=Validated
 BillShortStatusStarted=Started
 BillShortStatusNotPaid=Not paid
+BillShortStatusNotRefunded=Not refunded
 BillShortStatusClosedUnpaid=Closed
 BillShortStatusClosedPaidPartially=Paid (partially)
 PaymentStatusToValidShort=To validate
@@ -149,14 +153,14 @@ NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified
 FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
 NotARecurringInvoiceTemplate=Not a recurring template invoice
 NewBill=New invoice
-LastBills=Last %s invoices
-LastCustomersBills=Last %s customers invoices
-LastSuppliersBills=Last %s suppliers invoices
+LastBills=Latest %s invoices
+LastCustomersBills=Latest %s customer invoices
+LastSuppliersBills=Latest %s supplier invoices
 AllBills=All invoices
 OtherBills=Other invoices
 DraftBills=Draft invoices
-CustomersDraftInvoices=Customers draft invoices
-SuppliersDraftInvoices=Suppliers draft invoices
+CustomersDraftInvoices=Customer draft invoices
+SuppliersDraftInvoices=Supplier draft invoices
 Unpaid=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>?
@@ -203,7 +207,7 @@ AlreadyPaidNoCreditNotesNoDeposits=Already paid (without credit notes and deposi
 Abandoned=Abandoned
 RemainderToPay=Remaining unpaid
 RemainderToTake=Remaining amount to take
-RemainderToPayBack=Remaining amount to pay back
+RemainderToPayBack=Remaining amount to refund
 Rest=Pending
 AmountExpected=Amount claimed
 ExcessReceived=Excess received
@@ -270,6 +274,7 @@ Deposit=Deposit
 Deposits=Deposits
 DiscountFromCreditNote=Discount from credit note %s
 DiscountFromDeposit=Payments from deposit invoice %s
+DiscountFromExcessReceived=Payments from excess received of invoice %s
 AbsoluteDiscountUse=This kind of credit can be used on invoice before its validation
 CreditNoteDepositUse=Invoice must be validated to use this kind of credits
 NewGlobalDiscount=New absolute discount
@@ -277,8 +282,8 @@ NewRelativeDiscount=New relative discount
 NoteReason=Note/Reason
 ReasonDiscount=Reason
 DiscountOfferedBy=Granted by
-DiscountStillRemaining=Discounts still remaining
-DiscountAlreadyCounted=Discounts already counted
+DiscountStillRemaining=Discounts available
+DiscountAlreadyCounted=Discounts already consumed
 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.
@@ -331,10 +336,12 @@ 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
 # PaymentConditions
 Statut=Status
-PaymentConditionShortRECEP=Immediate
-PaymentConditionRECEP=Immediate
+PaymentConditionShortRECEP=Due Upon Receipt
+PaymentConditionRECEP=Due Upon Receipt
 PaymentConditionShort30D=30 days
 PaymentCondition30D=30 days
 PaymentConditionShort30DENDMONTH=30 days of month-end
@@ -349,6 +356,14 @@ PaymentConditionShortPT_ORDER=Order
 PaymentConditionPT_ORDER=On order
 PaymentConditionShortPT_5050=50-50
 PaymentConditionPT_5050=50%% in advance, 50%% on delivery
+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
 FixAmount=Fix amount
 VarAmount=Variable amount (%% tot.)
 # PaymentType
@@ -418,7 +433,7 @@ ChequeDeposits=Checks deposits
 Cheques=Checks
 DepositId=Id deposit
 NbCheque=Number of checks
-CreditNoteConvertedIntoDiscount=This credit note or deposit invoice has been converted into %s
+CreditNoteConvertedIntoDiscount=This %s has been converted into %s
 UsBillingContactAsIncoiveRecipientIfExist=Use customer billing contact address instead of third party address as recipient for invoices
 ShowUnpaidAll=Show all unpaid invoices
 ShowUnpaidLateOnly=Show late unpaid invoices only
diff --git a/htdocs/langs/mn_MN/boxes.lang b/htdocs/langs/mn_MN/boxes.lang
index 98970318e85..38b03b4268d 100644
--- a/htdocs/langs/mn_MN/boxes.lang
+++ b/htdocs/langs/mn_MN/boxes.lang
@@ -25,8 +25,8 @@ BoxTitleLastSuppliers=Latest %s recorded suppliers
 BoxTitleLastModifiedSuppliers=Latest %s modified suppliers
 BoxTitleLastModifiedCustomers=Latest %s modified customers
 BoxTitleLastCustomersOrProspects=Latest %s customers or prospects
-BoxTitleLastCustomerBills=Latest %s customer's invoices
-BoxTitleLastSupplierBills=Latest %s supplier's invoices
+BoxTitleLastCustomerBills=Latest %s customer invoices
+BoxTitleLastSupplierBills=Latest %s supplier invoices
 BoxTitleLastModifiedProspects=Latest %s modified prospects
 BoxTitleLastModifiedMembers=Latest %s members
 BoxTitleLastFicheInter=Latest %s modified interventions
@@ -51,12 +51,12 @@ ClickToAdd=Click here to add.
 NoRecordedCustomers=No recorded customers
 NoRecordedContacts=No recorded contacts
 NoActionsToDo=No actions to do
-NoRecordedOrders=No recorded customer's orders
+NoRecordedOrders=No recorded customer orders
 NoRecordedProposals=No recorded proposals
-NoRecordedInvoices=No recorded customer's invoices
-NoUnpaidCustomerBills=No unpaid customer's invoices
-NoUnpaidSupplierBills=No unpaid supplier's invoices
-NoModifiedSupplierBills=No recorded supplier's invoices
+NoRecordedInvoices=No recorded customer invoices
+NoUnpaidCustomerBills=No unpaid customer invoices
+NoUnpaidSupplierBills=No unpaid supplier invoices
+NoModifiedSupplierBills=No recorded supplier invoices
 NoRecordedProducts=No recorded products/services
 NoRecordedProspects=No recorded prospects
 NoContractedProducts=No products/services contracted
diff --git a/htdocs/langs/mn_MN/companies.lang b/htdocs/langs/mn_MN/companies.lang
index 4a631b092cf..1b7efa3c14e 100644
--- a/htdocs/langs/mn_MN/companies.lang
+++ b/htdocs/langs/mn_MN/companies.lang
@@ -78,6 +78,10 @@ VATIsNotUsed=VAT is not used
 CopyAddressFromSoc=Fill address with third party address
 ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
 PaymentBankAccount=Payment bank account
+OverAllProposals=Total proposals
+OverAllOrders=Total orders
+OverAllInvoices=Total invoices
+OverAllSupplierProposals=Total price requests
 ##### Local Taxes #####
 LocalTax1IsUsed=Use second tax
 LocalTax1IsUsedES= RE is used
@@ -239,6 +243,10 @@ ProfId3RU=Prof Id 3 (KPP)
 ProfId4RU=Prof Id 4 (OKPO)
 ProfId5RU=-
 ProfId6RU=-
+ProfId1DZ=RC
+ProfId2DZ=Art.
+ProfId3DZ=NIF
+ProfId4DZ=NIS
 VATIntra=VAT number
 VATIntraShort=VAT number
 VATIntraSyntaxIsValid=Syntax is valid
@@ -382,8 +390,9 @@ ListCustomersShort=List of customers
 ThirdPartiesArea=Third parties and contact area
 LastModifiedThirdParties=Latest %s modified third parties
 UniqueThirdParties=Total of unique third parties
-InActivity=Open
+InActivity=Opened
 ActivityCeased=Closed
+ThirdPartyIsClosed=Third party is closed
 ProductsIntoElements=List of products/services into %s
 CurrentOutstandingBill=Current outstanding bill
 OutstandingBill=Max. for outstanding bill
@@ -396,7 +405,7 @@ MergeThirdparties=Merge third parties
 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 so you will be able to delete the duplicate one.
 ThirdpartiesMergeSuccess=Thirdparties have been merged
 SaleRepresentativeLogin=Login of sales representative
-SaleRepresentativeFirstname=Firstname of sales representative
-SaleRepresentativeLastname=Lastname of sales representative
+SaleRepresentativeFirstname=First name of sales representative
+SaleRepresentativeLastname=Last name of sales representative
 ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
 NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/mn_MN/compta.lang b/htdocs/langs/mn_MN/compta.lang
index 17f2bb4e98f..5e9814369ec 100644
--- a/htdocs/langs/mn_MN/compta.lang
+++ b/htdocs/langs/mn_MN/compta.lang
@@ -65,6 +65,7 @@ PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=VAT payment
 ListPayment=List of payments
 ListOfCustomerPayments=List of customer payments
+ListOfSupplierPayments=List of supplier payments
 DateStartPeriod=Date start period
 DateEndPeriod=Date end period
 newLT1Payment=New tax 2 payment
@@ -81,7 +82,7 @@ LT2PaymentES=IRPF Payment
 LT2PaymentsES=IRPF Payments
 VATPayment=Sales tax payment
 VATPayments=Sales tax payments
-VATRefund=Sales tax refund Refund
+VATRefund=Sales tax refund
 Refund=Refund
 SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Show VAT payment
@@ -194,7 +195,7 @@ CloneTax=Clone a social/fiscal tax
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
 CloneTaxForNextMonth=Clone it for next month
 SimpleReport=Simple report
-AddExtraReport=Extra reports
+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
diff --git a/htdocs/langs/mn_MN/cron.lang b/htdocs/langs/mn_MN/cron.lang
index cb68b31c80f..b1e8bcb36d2 100644
--- a/htdocs/langs/mn_MN/cron.lang
+++ b/htdocs/langs/mn_MN/cron.lang
@@ -17,14 +17,14 @@ CronMethodDoesNotExists=Class %s does not contains any method %s
 # Menu
 EnabledAndDisabled=Enabled and disabled
 # Page list
-CronLastOutput=Last run output
-CronLastResult=Last result code
+CronLastOutput=Latest run output
+CronLastResult=Latest result code
 CronCommand=Command
 CronList=Scheduled jobs
 CronDelete=Delete scheduled jobs
-CronConfirmDelete=Are you sure you want to delete these scheduled jobs ?
+CronConfirmDelete=Are you sure you want to delete these scheduled jobs?
 CronExecute=Launch scheduled job
-CronConfirmExecute=Are you sure you want to execute these scheduled jobs now ?
+CronConfirmExecute=Are you sure you want to execute these scheduled jobs now?
 CronInfo=Scheduled job module allow to execute job that have been planned
 CronTask=Job
 CronNone=None
diff --git a/htdocs/langs/mn_MN/errors.lang b/htdocs/langs/mn_MN/errors.lang
index f935ce72d41..9e2eb6817ef 100644
--- a/htdocs/langs/mn_MN/errors.lang
+++ b/htdocs/langs/mn_MN/errors.lang
@@ -11,6 +11,7 @@ ErrorLoginAlreadyExists=Login %s already exists.
 ErrorGroupAlreadyExists=Group %s already exists.
 ErrorRecordNotFound=Record not found.
 ErrorFailToCopyFile=Failed to copy file '<b>%s</b>' into '<b>%s</b>'.
+ErrorFailToCopyDir=Failed to copy directory '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToRenameFile=Failed to rename file '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToDeleteFile=Failed to remove file '<b>%s</b>'.
 ErrorFailToCreateFile=Failed to create file '<b>%s</b>'.
@@ -115,7 +116,7 @@ ErrorNoActivatedBarcode=No barcode type activated
 ErrUnzipFails=Failed to unzip %s with ZipArchive
 ErrNoZipEngine=No engine to unzip %s file in this PHP
 ErrorFileMustBeADolibarrPackage=The file %s must be a Dolibarr zip package
-ErrorFileRequired=It takes a package Dolibarr file
+ErrorModuleFileRequired=You must select a Dolibarr module package file
 ErrorPhpCurlNotInstalled=The PHP CURL is not installed, this is essential to talk with 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
@@ -170,14 +171,19 @@ ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
 ErrorFileMustHaveFormat=File must have format %s
 ErrorSupplierCountryIsNotDefined=Country for this supplier is not defined. Correct this first.
 ErrorsThirdpartyMerge=Failed to merge the two records. Request canceled.
-ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enougth for product %s to add it into a new order.
-ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enougth for product %s to add it into a new invoice.
-ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enougth for product %s to add it into a new shipment.
-ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enougth for product %s to add it into a new proposal.
-ErrorFailedToLoadLoginFileForMode=Failed to get the login file for mode '%s'.
+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 bank 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>
 
 # 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.
diff --git a/htdocs/langs/mn_MN/holiday.lang b/htdocs/langs/mn_MN/holiday.lang
index a95da81eaaa..50d97c0d8cc 100644
--- a/htdocs/langs/mn_MN/holiday.lang
+++ b/htdocs/langs/mn_MN/holiday.lang
@@ -76,8 +76,9 @@ BoxTitleLastLeaveRequests=Latest %s modified leave requests
 HolidaysMonthlyUpdate=Monthly update
 ManualUpdate=Manual update
 HolidaysCancelation=Leave request cancelation
-EmployeeLastname=Employee lastname
-EmployeeFirstname=Employee firstname
+EmployeeLastname=Employee last name
+EmployeeFirstname=Employee first name
+TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
 
 ## Configuration du Module ##
 LastUpdateCP=Latest automatic update of leaves allocation
diff --git a/htdocs/langs/mn_MN/ldap.lang b/htdocs/langs/mn_MN/ldap.lang
index a17019d00fb..42e699de311 100644
--- a/htdocs/langs/mn_MN/ldap.lang
+++ b/htdocs/langs/mn_MN/ldap.lang
@@ -13,8 +13,8 @@ LDAPUsers=Users in LDAP database
 LDAPFieldStatus=Status
 LDAPFieldFirstSubscriptionDate=First subscription date
 LDAPFieldFirstSubscriptionAmount=First subscription amount
-LDAPFieldLastSubscriptionDate=Last subscription date
-LDAPFieldLastSubscriptionAmount=Last subscription amount
+LDAPFieldLastSubscriptionDate=Latest subscription date
+LDAPFieldLastSubscriptionAmount=Latest subscription amount
 LDAPFieldSkype=Skype id
 LDAPFieldSkypeExample=Example : skypeName
 UserSynchronized=User synchronized
diff --git a/htdocs/langs/mn_MN/mails.lang b/htdocs/langs/mn_MN/mails.lang
index ab18dcdca25..c830b551a67 100644
--- a/htdocs/langs/mn_MN/mails.lang
+++ b/htdocs/langs/mn_MN/mails.lang
@@ -35,7 +35,7 @@ MailingStatusSentPartialy=Sent partialy
 MailingStatusSentCompletely=Sent completely
 MailingStatusError=Error
 MailingStatusNotSent=Not sent
-MailSuccessfulySent=Email successfully sent (from %s to %s)
+MailSuccessfulySent=Email successfully accepted for delivery (from %s to %s)
 MailingSuccessfullyValidated=EMailing successfully validated
 MailUnsubcribe=Unsubscribe
 MailingStatusNotContact=Don't contact anymore
@@ -74,22 +74,28 @@ ResultOfMailSending=Result of mass EMail sending
 NbSelected=Nb selected
 NbIgnored=Nb ignored
 NbSent=Nb 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
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Line %s in file
 RecipientSelectionModules=Defined requests for recipient's selection
 MailSelectedRecipients=Selected recipients
 MailingArea=EMailings area
-LastMailings=Last %s emailings
+LastMailings=Latest %s emailings
 TargetsStatistics=Targets statistics
 NbOfCompaniesContacts=Unique contacts/addresses
 MailNoChangePossible=Recipients for validated emailing can't be changed
 SearchAMailing=Search mailing
 SendMailing=Send emailing
 SendMail=Send email
-MailingNeedCommand=For security reason, sending an emailing is better when performed from command line. If you have one, ask your server administrator to launch the following command to send the emailing to all recipients:
+SentBy=Sent by
+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=You can however send them online by adding parameter MAILING_LIMIT_SENDBYWEB with value of max number of emails you want to send by session. For this, go on Home - Setup - Other.
-ConfirmSendingEmailing=If you can't or prefer sending them with your www browser, please confirm you are sure you want to send emailing now from your browser?
+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.
 TargetsReset=Clear list
 ToClearAllRecipientsClickHere=Click here to clear the recipient list for this emailing
@@ -144,3 +150,6 @@ AdvTgtCreateFilter=Create filter
 AdvTgtOrCreateNewFilter=Name of new filter
 NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
+OutGoingEmailSetup=Outgoing email setup
+InGoingEmailSetup=Incoming email setup
+
diff --git a/htdocs/langs/mn_MN/main.lang b/htdocs/langs/mn_MN/main.lang
index b5ad98b5d31..a44f4c82eec 100644
--- a/htdocs/langs/mn_MN/main.lang
+++ b/htdocs/langs/mn_MN/main.lang
@@ -63,11 +63,13 @@ ErrorNoVATRateDefinedForSellerCountry=Error, no vat rates defined for country '%
 ErrorNoSocialContributionForSellerCountry=Error, no social/fiscal taxes type defined for country '%s'.
 ErrorFailedToSaveFile=Error, failed to save file.
 ErrorCannotAddThisParentWarehouse=You are trying to add a parent warehouse which is already a child of current one
+MaxNbOfRecordPerPage=Max nb of record per page
 NotAuthorized=You are not authorized to do that.
 SetDate=Set date
 SelectDate=Select a date
 SeeAlso=See also %s
 SeeHere=See here
+Apply=Apply
 BackgroundColorByDefault=Default background color
 FileRenamed=The file was successfully renamed
 FileUploaded=The file was successfully uploaded
@@ -86,7 +88,7 @@ Undefined=Undefined
 PasswordForgotten=Password forgotten?
 SeeAbove=See above
 HomeArea=Home area
-LastConnexion=Last connection
+LastConnexion=Latest connection
 PreviousConnexion=Previous connection
 PreviousValue=Previous value
 ConnectedOnMultiCompany=Connected on environment
@@ -236,7 +238,7 @@ DateCreation=Creation date
 DateCreationShort=Creat. date
 DateModification=Modification date
 DateModificationShort=Modif. date
-DateLastModification=Last modification date
+DateLastModification=Latest modification date
 DateValidation=Validation date
 DateClosing=Closing date
 DateDue=Due date
@@ -432,7 +434,7 @@ Reportings=Reporting
 Draft=Draft
 Drafts=Drafts
 Validated=Validated
-Opened=Open
+Opened=Opened
 New=New
 Discount=Discount
 Unknown=Unknown
@@ -460,6 +462,7 @@ DeletePicture=Picture delete
 ConfirmDeletePicture=Confirm picture deletion?
 Login=Login
 CurrentLogin=Current login
+EnterLoginDetail=Enter login details
 January=January
 February=February
 March=March
@@ -597,6 +600,8 @@ SessionName=Session name
 Method=Method
 Receive=Receive
 CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
+ExpectedValue=Expected Value
+CurrentValue=Current value
 PartialWoman=Partial
 TotalWoman=Total
 NeverReceived=Never received
@@ -753,6 +758,8 @@ RemoveString=Remove string '%s'
 SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
 DirectDownloadLink=Direct download link
 Download=Download
+ActualizeCurrency=Update currency rate
+Fiscalyear=Fiscal year
 # Week day
 Monday=Monday
 Tuesday=Tuesday
@@ -787,8 +794,8 @@ SetRef=Set ref
 Select2ResultFoundUseArrows=Some results found. Use arrows to select.
 Select2NotFound=No result found
 Select2Enter=Enter
-Select2MoreCharacter=or more character
-Select2MoreCharacters=or more characters
+Select2MoreCharacter=or more characters<br /><br /><strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
+Select2MoreCharacters=or more characters<br /><br /><strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
 Select2LoadingMoreResults=Loading more results...
 Select2SearchInProgress=Search in progress...
 SearchIntoThirdparties=Thirdparties
@@ -809,3 +816,5 @@ SearchIntoContracts=Contracts
 SearchIntoCustomerShipments=Customer shipments
 SearchIntoExpenseReports=Expense reports
 SearchIntoLeaves=Leaves
+
+BulkActions=Bulk actions
diff --git a/htdocs/langs/mn_MN/members.lang b/htdocs/langs/mn_MN/members.lang
index df911af6f71..8f6f76ba48f 100644
--- a/htdocs/langs/mn_MN/members.lang
+++ b/htdocs/langs/mn_MN/members.lang
@@ -45,7 +45,7 @@ MemberStatusDraft=Draft (needs to be validated)
 MemberStatusDraftShort=Draft
 MemberStatusActive=Validated (waiting subscription)
 MemberStatusActiveShort=Validated
-MemberStatusActiveLate=subscription expired
+MemberStatusActiveLate=Subscription expired
 MemberStatusActiveLateShort=Expired
 MemberStatusPaid=Subscription up to date
 MemberStatusPaidShort=Up to date
@@ -136,8 +136,8 @@ DocForAllMembersCards=Generate business cards for all members
 DocForOneMemberCards=Generate business cards for a particular member
 DocForLabels=Generate address sheets
 SubscriptionPayment=Subscription payment
-LastSubscriptionDate=Last subscription date
-LastSubscriptionAmount=Last subscription amount
+LastSubscriptionDate=Latest subscription date
+LastSubscriptionAmount=Latest subscription amount
 MembersStatisticsByCountries=Members statistics by country
 MembersStatisticsByState=Members statistics by state/province
 MembersStatisticsByTown=Members statistics by town
@@ -149,7 +149,7 @@ MembersByStateDesc=This screen show you statistics on members by state/provinces
 MembersByTownDesc=This screen show you statistics on members by town.
 MembersStatisticsDesc=Choose statistics you want to read...
 MenuMembersStats=Statistics
-LastMemberDate=Last member date
+LastMemberDate=Latest member date
 Nature=Nature
 Public=Information are public
 NewMemberbyWeb=New member added. Awaiting approval
diff --git a/htdocs/langs/mn_MN/orders.lang b/htdocs/langs/mn_MN/orders.lang
index 9d2e53e4fe2..331e3b49d3e 100644
--- a/htdocs/langs/mn_MN/orders.lang
+++ b/htdocs/langs/mn_MN/orders.lang
@@ -39,7 +39,7 @@ StatusOrderRefusedShort=Refused
 StatusOrderBilledShort=Billed
 StatusOrderToProcessShort=To process
 StatusOrderReceivedPartiallyShort=Partially received
-StatusOrderReceivedAllShort=Everything received
+StatusOrderReceivedAllShort=Products received
 StatusOrderCanceled=Canceled
 StatusOrderDraft=Draft (needs to be validated)
 StatusOrderValidated=Validated
@@ -51,7 +51,7 @@ StatusOrderApproved=Approved
 StatusOrderRefused=Refused
 StatusOrderBilled=Billed
 StatusOrderReceivedPartially=Partially received
-StatusOrderReceivedAll=Everything received
+StatusOrderReceivedAll=All products received
 ShippingExist=A shipment exists
 QtyOrdered=Qty ordered
 ProductQtyInDraft=Product quantity into draft orders
diff --git a/htdocs/langs/mn_MN/other.lang b/htdocs/langs/mn_MN/other.lang
index 1ea1f9da1db..ab937ff3bab 100644
--- a/htdocs/langs/mn_MN/other.lang
+++ b/htdocs/langs/mn_MN/other.lang
@@ -2,6 +2,7 @@
 SecurityCode=Security code
 NumberingShort=N°
 Tools=Tools
+TMenuTools=Tools
 ToolsDesc=All miscellaneous tools not included in other menu entries are collected here.<br /><br />All the tools can be reached in the left menu.
 Birthday=Birthday
 BirthdayDate=Birthday date
@@ -67,14 +68,15 @@ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find her
 PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nYou will find here the shipping __SHIPPINGREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nYou will find here the intervention __FICHINTERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n__PERSONALIZED__\n\n__SIGNATURE__
-DemoDesc=Dolibarr is a compact ERP/CRM supporting several functional modules. A demo showcasing all modules makes no sense as this scenario never occurs. So, several demo profiles are available.
+DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
+ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
 DemoFundation=Manage members of a foundation
 DemoFundation2=Manage members and bank account of a foundation
-DemoCompanyServiceOnly=Manage a freelance activity selling service only
+DemoCompanyServiceOnly=Company or freelance selling service only
 DemoCompanyShopWithCashDesk=Manage a shop with a cash desk
-DemoCompanyProductAndStocks=Manage a small or medium company selling products
-DemoCompanyAll=Manage a small or medium company with multiple activities (all main modules)
+DemoCompanyProductAndStocks=Company selling products with a shop
+DemoCompanyAll=Company with multiple activities (all main modules)
 CreatedBy=Created by %s
 ModifiedBy=Modified by %s
 ValidatedBy=Validated by %s
diff --git a/htdocs/langs/mn_MN/products.lang b/htdocs/langs/mn_MN/products.lang
index 20440eb611b..3a412a5789c 100644
--- a/htdocs/langs/mn_MN/products.lang
+++ b/htdocs/langs/mn_MN/products.lang
@@ -5,6 +5,8 @@ ProductLabelTranslated=Translated product label
 ProductDescriptionTranslated=Translated product description
 ProductNoteTranslated=Translated product note
 ProductServiceCard=Products/Services card
+TMenuProducts=Products
+TMenuServices=Services
 Products=Products
 Services=Services
 Product=Product
@@ -58,7 +60,7 @@ SellingPrice=Selling price
 SellingPriceHT=Selling price (net of tax)
 SellingPriceTTC=Selling price (inc. tax)
 CostPriceDescription=This price (net of tax) can be used to store the average amount this product cost to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
-CostPriceUsage=In a future version, this value could be used for margin calculation.
+CostPriceUsage=This value could be used for margin calculation.
 SoldAmount=Sold amount
 PurchasedAmount=Purchased amount
 NewPrice=New price
@@ -140,6 +142,7 @@ ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b>?
 CloneContentProduct=Clone all main informations of product/service
 ClonePricesProduct=Clone main informations and prices
 CloneCompositionProduct=Clone packaged product/service
+CloneCombinationsProduct=Clone product variants
 ProductIsUsed=This product is used
 NewRefForClone=Ref. of new product/service
 SellingPrices=Selling prices
@@ -236,7 +239,7 @@ GlobalVariables=Global variables
 VariableToUpdate=Variable to update
 GlobalVariableUpdaters=Global variable updaters
 UpdateInterval=Update interval (minutes)
-LastUpdated=Last updated
+LastUpdated=Latest update
 CorrectlyUpdated=Correctly updated
 PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
 PropalMergePdfProductChooseFile=Select PDF files
@@ -256,4 +259,41 @@ VolumeUnits=Volume unit
 SizeUnits=Size unit
 DeleteProductBuyPrice=Delete buying price
 ConfirmDeleteProductBuyPrice=Are you sure you want to delete this buying price?
+SubProduct=Sub product
 
+#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
+ProductCombinations=Variants
+HideProductCombinations=Hide products variant in the products selector
+ProductCombination=Variant
+NewProductCombination=New variant
+EditProductCombination=Editing variant
+ProductCombinationGenerator=Variants generator
+Features=Features
+PriceImpact=Price impact
+WeightImpact=Weight impact
+NewProductAttribute=New attribute
+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
+PercentageVariation=Percentage variation
+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 child products
+ConfirmCloneProductCombinations=Would you like to copy all the product variant to the 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
diff --git a/htdocs/langs/mn_MN/projects.lang b/htdocs/langs/mn_MN/projects.lang
index ecf61d17d36..f9c603ce113 100644
--- a/htdocs/langs/mn_MN/projects.lang
+++ b/htdocs/langs/mn_MN/projects.lang
@@ -29,9 +29,9 @@ DeleteAProject=Delete a project
 DeleteATask=Delete a task
 ConfirmDeleteAProject=Are you sure you want to delete this project?
 ConfirmDeleteATask=Are you sure you want to delete this task?
-OpenedProjects=Open projects
-OpenedTasks=Open tasks
-OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
+OpenedProjects=Opened projects
+OpenedTasks=Opened tasks
+OpportunitiesStatusForOpenedProjects=Opportunities amount of opened projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=Show project
 SetProject=Set project
@@ -47,7 +47,7 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
 TaskTimeDate=Date
-TasksOnOpenedProject=Tasks on open projects
+TasksOnOpenedProject=Tasks on opened projects
 WorkloadNotDefined=Workload not defined
 NewTimeSpent=New time spent
 MyTimeSpent=My time spent
@@ -58,6 +58,7 @@ TaskDateEnd=Task end date
 TaskDescription=Task description
 NewTask=New task
 AddTask=Create task
+AddTimeSpent=Create time spent
 Activity=Activity
 Activities=Tasks/activities
 MyActivities=My tasks/activities
@@ -95,6 +96,7 @@ ValidateProject=Validate projet
 ConfirmValidateProject=Are you sure you want to validate this project?
 CloseAProject=Close project
 ConfirmCloseAProject=Are you sure you want to close this project?
+AlsoCloseAProject=Also close project (keep it open if you still need to follow production tasks on it)
 ReOpenAProject=Open project
 ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=Project contacts
@@ -120,7 +122,7 @@ CloneProjectFiles=Clone project joined files
 CloneTaskFiles=Clone task(s) joined files (if task(s) cloned)
 CloneMoveDate=Update project/tasks dates from now?
 ConfirmCloneProject=Are you sure to clone this project?
-ProjectReportDate=Change task date according project start date
+ProjectReportDate=Change task dates according to new project start date
 ErrorShiftTaskDate=Impossible to shift task date according to new project start date
 ProjectsAndTasksLines=Projects and tasks
 ProjectCreatedInDolibarr=Project %s created
@@ -177,9 +179,9 @@ ProjectsStatistics=Statistics on projects/leads
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 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.
-OpenedProjectsByThirdparties=Open projects by thirdparties
+OpenedProjectsByThirdparties=Opened projects by thirdparties
 OnlyOpportunitiesShort=Only opportunities
-OpenedOpportunitiesShort=Open opportunities
+OpenedOpportunitiesShort=Opened opportunities
 NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount
diff --git a/htdocs/langs/mn_MN/propal.lang b/htdocs/langs/mn_MN/propal.lang
index 52260fe2b4e..a14d25ce779 100644
--- a/htdocs/langs/mn_MN/propal.lang
+++ b/htdocs/langs/mn_MN/propal.lang
@@ -3,7 +3,7 @@ Proposals=Commercial proposals
 Proposal=Commercial proposal
 ProposalShort=Proposal
 ProposalsDraft=Draft commercial proposals
-ProposalsOpened=Open commercial proposals
+ProposalsOpened=Opened commercial proposals
 Prop=Commercial proposals
 CommercialProposal=Commercial proposal
 ProposalCard=Proposal card
@@ -26,9 +26,9 @@ AmountOfProposalsByMonthHT=Amount by month (net of tax)
 NbOfProposals=Number of commercial proposals
 ShowPropal=Show proposal
 PropalsDraft=Drafts
-PropalsOpened=Open
+PropalsOpened=Opened
 PropalStatusDraft=Draft (needs to be validated)
-PropalStatusValidated=Validated (proposal is open)
+PropalStatusValidated=Validated (proposal is opened)
 PropalStatusSigned=Signed (needs billing)
 PropalStatusNotSigned=Not signed (closed)
 PropalStatusBilled=Billed
diff --git a/htdocs/langs/mn_MN/stocks.lang b/htdocs/langs/mn_MN/stocks.lang
index 834fa104098..1db49b8d8dd 100644
--- a/htdocs/langs/mn_MN/stocks.lang
+++ b/htdocs/langs/mn_MN/stocks.lang
@@ -22,13 +22,15 @@ Movements=Movements
 ErrorWarehouseRefRequired=Warehouse reference name is required
 ListOfWarehouses=List of warehouses
 ListOfStockMovements=List of stock movements
+StockMovementForId=Movement ID %d
+ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Warehouses area
 Location=Location
 LocationSummary=Short name location
 NumberOfDifferentProducts=Number of different products
 NumberOfProducts=Total number of products
-LastMovement=Last movement
-LastMovements=Last movements
+LastMovement=Latest movement
+LastMovements=Latest movements
 Units=Units
 Unit=Unit
 StockCorrection=Correct stock
@@ -140,3 +142,4 @@ ProductStockWarehouseCreated=Stock limit for alert and desired optimal stock cor
 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
diff --git a/htdocs/langs/mn_MN/supplier_proposal.lang b/htdocs/langs/mn_MN/supplier_proposal.lang
index 621d7784e35..61b031459b0 100644
--- a/htdocs/langs/mn_MN/supplier_proposal.lang
+++ b/htdocs/langs/mn_MN/supplier_proposal.lang
@@ -8,7 +8,7 @@ SearchRequest=Find a request
 DraftRequests=Draft requests
 SupplierProposalsDraft=Draft supplier proposals
 LastModifiedRequests=Latest %s modified price requests
-RequestsOpened=Open price requests
+RequestsOpened=Opened price requests
 SupplierProposalArea=Supplier proposals area
 SupplierProposalShort=Supplier proposal
 SupplierProposals=Supplier proposals
@@ -23,7 +23,7 @@ ConfirmValidateAsk=Are you sure you want to validate this price request under na
 DeleteAsk=Delete request
 ValidateAsk=Validate request
 SupplierProposalStatusDraft=Draft (needs to be validated)
-SupplierProposalStatusValidated=Validated (request is open)
+SupplierProposalStatusValidated=Validated (request is opened)
 SupplierProposalStatusClosed=Closed
 SupplierProposalStatusSigned=Accepted
 SupplierProposalStatusNotSigned=Refused
diff --git a/htdocs/langs/mn_MN/suppliers.lang b/htdocs/langs/mn_MN/suppliers.lang
index 766e4a9bfe9..b890919ace5 100644
--- a/htdocs/langs/mn_MN/suppliers.lang
+++ b/htdocs/langs/mn_MN/suppliers.lang
@@ -24,10 +24,10 @@ ExportDataset_fournisseur_1=Supplier invoices list and invoice lines
 ExportDataset_fournisseur_2=Supplier invoices and payments
 ExportDataset_fournisseur_3=Supplier orders and order lines
 ApproveThisOrder=Approve this order
-ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b> ?
+ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b>?
 DenyingThisOrder=Deny this order
-ConfirmDenyingThisOrder=Are you sure you want to deny this order <b>%s</b> ?
-ConfirmCancelThisOrder=Are you sure you want to cancel this order <b>%s</b> ?
+ConfirmDenyingThisOrder=Are you sure you want to deny this order <b>%s</b>?
+ConfirmCancelThisOrder=Are you sure you want to cancel this order <b>%s</b>?
 AddSupplierOrder=Create supplier order
 AddSupplierInvoice=Create supplier invoice
 ListOfSupplierProductForSupplier=List of products and prices for supplier <b>%s</b>
@@ -41,3 +41,4 @@ DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Wrong quality
 ReputationForThisProduct=Reputation
 BuyerName=Buyer name
+AllProductServicePrices=All product / service prices
diff --git a/htdocs/langs/mn_MN/users.lang b/htdocs/langs/mn_MN/users.lang
index b836db8eb42..a0a1eae8697 100644
--- a/htdocs/langs/mn_MN/users.lang
+++ b/htdocs/langs/mn_MN/users.lang
@@ -36,7 +36,7 @@ AdministratorDesc=Administrator
 DefaultRights=Default permissions
 DefaultRightsDesc=Define here <u>default</u> permissions that are automatically granted to a <u>new created</u> user (Go on user card to change permission of an existing user).
 DolibarrUsers=Dolibarr users
-LastName=Last Name
+LastName=Last name
 FirstName=First name
 ListOfGroups=List of groups
 NewGroup=New group
diff --git a/htdocs/langs/mn_MN/withdrawals.lang b/htdocs/langs/mn_MN/withdrawals.lang
index 6e560a1abb1..a99d890e5f9 100644
--- a/htdocs/langs/mn_MN/withdrawals.lang
+++ b/htdocs/langs/mn_MN/withdrawals.lang
@@ -24,6 +24,7 @@ WithdrawStatistics=Direct debit payment statistics
 WithdrawRejectStatistics=Direct debit payment reject statistics
 LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
+WithdrawRequestsDone=%s direct debit payment requests recorded
 ThirdPartyBankCode=Third party bank code
 NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoice are on companies with a valid BAN.
 ClassCredited=Classify credited
@@ -76,8 +77,8 @@ RUM=UMR
 RUMLong=Unique Mandate Reference
 RUMWillBeGenerated=UMR number will be generated once bank account information are saved
 WithdrawMode=Direct debit mode (FRST or RECUR)
-WithdrawRequestAmount=Withdraw request amount:
-WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil amount.
+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
diff --git a/htdocs/langs/nb_NO/accountancy.lang b/htdocs/langs/nb_NO/accountancy.lang
index 4613f9db2ed..16fef0ae733 100644
--- a/htdocs/langs/nb_NO/accountancy.lang
+++ b/htdocs/langs/nb_NO/accountancy.lang
@@ -194,6 +194,8 @@ ChangeBinding=Endre bindingen
 
 ## Admin
 ApplyMassCategories=Masseinnlegging av kategorier
+AddAccountFromBookKeepingWithNoCategories=Add acccount already used with no categories
+CategoryDeleted=Category for the accounting account has been removed
 
 ## Export
 Exports=Eksporter
@@ -209,6 +211,7 @@ Modelcsv_ciel=Eksport til Sage Ciel Compta eller Compta Evolution
 Modelcsv_quadratus=Eksport til Quadratus QuadraCompta
 Modelcsv_ebp=Eksporter mot EBP
 Modelcsv_cogilog=Eksport mot Cogilog
+ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
 InitAccountancy=Initier regnskap
diff --git a/htdocs/langs/nb_NO/admin.lang b/htdocs/langs/nb_NO/admin.lang
index acf6f882bb6..a6399b3fecb 100644
--- a/htdocs/langs/nb_NO/admin.lang
+++ b/htdocs/langs/nb_NO/admin.lang
@@ -9,14 +9,20 @@ VersionDevelopment=Utviklingsversjon
 VersionUnknown=Ukjent
 VersionRecommanded=Anbefalt
 FileCheck=Filintegritetssjekker
-FileCheckDesc=Dette verktøyet tillater deg å kontrollere integriteten til filer i applikasjonen, og sammenligner hver fil med de offisielle filene. Du kan kan bruke verktøyet til å kontrollere om filene ble endret av f.eks en hacker.
+FileCheckDesc=This tool allows you to check the integrity of files and setup of your application, comparing each files with the official ones. 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.
+FileIntegrityIsStrictlyConformedWithReference=Files integrity is strictly conformed with the reference.
+FileIntegrityIsOkButFilesWereAdded=Files integrity check has passed, however some new files were added.
+FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified, removed or added.
+GlobalChecksum=Global sjekksum
 MakeIntegrityAnalysisFrom=Opprett integritetsanalyse av applikasjonsfiler fra
 LocalSignature=Innebygget lokal signatur (mindre pålitelig)
 RemoteSignature=Fjernsignatur (mer pålitelig)
 FilesMissing=Manglende filer
 FilesUpdated=Oppdaterte filer
+FilesModified=Modified Files
+FilesAdded=Added Files
 FileCheckDolibarr=Integritetssjekk av applikasjonsfilene
-AvailableOnlyOnPackagedVersions=Den lokale filen for integritetssjekk er kun tilgjengelig hvis applikasjonen er installert fra en sertifisert pakke
+AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from an official package
 XmlNotFound=Xml Integritetsfilen til applikasjonen ble ikke funnet
 SessionId=Økt-ID
 SessionSaveHandler=Håndterer for å lagre sesjoner
@@ -185,7 +191,9 @@ BoxesDesc=Widgeter er komponenter som viser litt informasjon som du kan legge ti
 OnlyActiveElementsAreShown=Bare elementer fra <a href="%s">aktiverte moduler</a> vises.
 ModulesDesc=Dolibarr-moduler definerer hvilke funksjonaliteter som er aktivert i programmet. Noen moduler krever tillatelser du må gi for brukerne, etter å ha aktivert modulen. Klikk på knappen på/av for å aktivere en modul/funksjon.
 ModulesMarketPlaceDesc=Du kan finne flere moduler for nedlasting på eksterne nettsteder.
-ModulesMarketPlaces=Flere moduler ...
+ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
+ModulesMarketPlaces=Find external modules...
+GoModuleSetupArea=To deploy/install a new module, go onto the Module setup area at <a href="%s">%s</a>.
 DoliStoreDesc=DoliStore, den offisielle markedsplassen for eksterne moduler til Dolibarr ERP/CRM 
 DoliPartnersDesc=Liste over selskaper som tilbyr spesialtilpassede moduler og funksjoner (Merk: Erfarne PHP-programmerere kan gi tilpasset utvikling for åpen kildekode)
 WebSiteDesc=Referansesider for å finne flere moduler.
@@ -229,8 +237,8 @@ PaperSize=Paper type
 Orientation=Orientation
 SpaceX=Space X
 SpaceY=Space Y
-FontSize=Font size
-Content=Content
+FontSize=Fontstørrelse
+Content=Innhold
 NoticePeriod=Oppsigelsestid
 NewByMonth=New by month
 Emails=E-poster
@@ -276,21 +284,22 @@ ModuleFamilyInterface=Grensesnitt mot eksterne systemer
 MenuHandlers=Menyhåndtering
 MenuAdmin=Menyredigering
 DoNotUseInProduction=Ikke bruk i produksjon
-ThisIsProcessToFollow=Dette er innstillinger for:
-ThisIsAlternativeProcessToFollow=Alternativt oppsett for å prosessere:
+ThisIsProcessToFollow=This is steps to process:
+ThisIsAlternativeProcessToFollow=This is an alternative setup to process manually:
 StepNb=Trinn %s
 FindPackageFromWebSite=Finn en pakke som inneholder funksjonen du vil bruke (for eksempel på nettsider %s).
 DownloadPackageFromWebSite=Last ned pakke (for eksempel fra den offisielle websiden %s).
-UnpackPackageInDolibarrRoot=Pakk ut filen i Dolibarrs servermappe for eksterne moduler:<b>%s</b>
-SetupIsReadyForUse=Installasjonen er ferdig og Dolibarr er klar til bruk med den nye modulen.
-NotExistsDirect=Alternativ rotkatalog er ikke definert. <br>
-InfDirAlt=Etter versjon 3 er det mulig å definere en alternativ rotkatalog. Dette lar deg lagre plug-ins og egendefinerte maler på samme sted.<br>Bare lag en katalog i roten av Dolibarr (f.eks: egendefinert).<br>
-InfDirExample=<br>Aktiver det i conf.php<br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>*disse linjene er deaktivert med "#", for å aktivere fjernes #
+UnpackPackageInDolibarrRoot=Unpack the packaged files into server directory dedicated to Dolibarr: <b>%s</b>
+UnpackPackageInModulesRoot=To deploy/install an external module, unpack the packaged files into the server directory dedicated to modules: <b>%s</b>
+SetupIsReadyForUse=Module deployment is finished. You must however enable and setup the module in your application by going on the page to setup modules: <a href="%s">%s</a>.
+NotExistsDirect=The alternative root directory is not defined to an existing directory.<br>
+InfDirAlt=Since version 3, it is possible to define an alternative root directory. This allows you to store, into a dedicated directory, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
+InfDirExample=<br>Then declare it in the file <strong>conf.php</strong><br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>If these lines are commented with "#", to enable them, just uncomment by removing the "#" character.
 YouCanSubmitFile=I dette trinnet kan du sende pakken med dette verktøyet: Velg modulfil
 CurrentVersion=Gjeldende versjon av Dolibarr 
 CallUpdatePage=Gå til siden som oppdaterer data og databasestruktur: %s.
 LastStableVersion=Siste stabile versjon
-LastActivationDate=Siste aktiveringsdato
+LastActivationDate=Latest activation date
 UpdateServerOffline=Oppdater serveren offline
 GenericMaskCodes=Her kan du legge inn nummereringsmal. I malen kan du bruke følgende tagger:<br><b>{000000}</b> tilsvarer et tall som økes ved hver %s. Angi så mange nuller som du ønsker at lengden på telleren skal være. Telleren vil ha ledende nuller i henhold til malens lengde. <br><b>{000000+000}</b> samme som forrige, men med en forskyvning til høyre for + tegnet, starter fra første %s. <br><b>{000000@x}</b> samme som forrige, men telleren starter fra null når måned x nås (x mellom 1 og 12). Hvis dette valget brukes og x er 2 eller mer kreves også sekvensen {yy}{mm} eller {yyyy}{mm} kreves også. <br><b>{dd}</b> dag (01 til 31).<br><b>{mm}</b> måned (01 til 12).<br><b>{yy}</b>, <b>{yyyy}</b> eller <b>{y}</b> årstall over 2, 4 eller 1 siffer. <br> <b>{cccc000}</b> klientkoden på n tegn etterfulgt av en klientreferanse uten forskyvning og nullet med den globale telleren.<br><br>Alle andre tegn i malen vil forbli intakte.<br>Mellomrom er ikke tillatt.<br><br><u>Eksempel på den 99de %s av tredjeparten blir 31/01/2007:</u><br><b>ABC{yy}{mm}-{000000}</b> vil gi <b>ABC0701-000099</b><br><b>{0000+100}-ZZZ/{dd}/XXX</b> vil gi <b>0199-ZZZ/31/XXX</b><br>
 GenericMaskCodes2=<b>{cccc}</b> klientkoden på n tegn<br><b>{cccc000}</b> klientkoden på n tegn etterfølges av en teller dedikert til kunden. Denne telleren blir tilbakestilt til samtidig som den globale telleren.<br><b>{tttt}</b> Koden av tredjeparts type på n tegn (se ordbok-tredjepartstyper). <br>
@@ -373,11 +382,11 @@ ExtrafieldCheckBox=Avmerkingsboks
 ExtrafieldRadio=Radio-knapp
 ExtrafieldCheckBoxFromList= Avkrysningsboks fra tabell
 ExtrafieldLink=Lenke til et objekt
-ExtrafieldParamHelpselect=Parameterlisten må settes opp med nøkkel,verdi<br><br> for eksempel: <br>1,verdi1<br>2,verdi2<br>3,verdi3<br>...<br><br>For å gjøre listen avhengig av en annen liste:<br>1,value1|parent_list_code:parent_key<br>2,value2|parent_list_code:parent_key
+ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list :<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list :<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=Parameterlisten må settes opp med nøkkel,verdi<br><br> for eksempel: <br>1,verdi1<br>2,verdi2<br>3,verdi3<br>...
 ExtrafieldParamHelpradio=Parameterlisten må settes opp med nøkkel,verdi<br><br> for eksempel: <br>1,verdi1<br>2,verdi2<br>3,verdi3<br>...
-ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
-ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
+ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parametre må være ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Eksempel : Societe:societe/class/societe.class.php
 LibraryToBuildPDF=Bibliotek brukt for PDF-generering
 WarningUsingFPDF=Advarsel! <b>conf.php</b> inneholder direktivet <b>dolibarr_pdf_force_fpdf=1</b>. Dette betyr at du bruker FPDF biblioteket for å generere PDF-filer. Dette biblioteket er gammelt og støtter ikke en rekke funksjoner (Unicode, bilde-transparens, kyrillisk, arabiske og asiatiske språk, ...), så du kan oppleve feil under PDF generering. <br> For å løse dette, og ha full støtte ved PDF generering, kan du laste ned <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, deretter kommentere eller fjerne linjen <b>$dolibarr_pdf_force_fpdf=1</b>, og i stedet legge inn <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
@@ -411,10 +420,11 @@ ModuleCompanyCodePanicum=Velg en tom regnskapskode
 ModuleCompanyCodeDigitaria=Regnskapskode avhenger av tredjepartskode. Koden består av karakteren "C" i første posisjon, etterfulgt av de første 5 tegnene i tredjepartskoden.
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Bruk 3-trinns godkjennelse når beløpet (eks. MVA) er høyere enn...
-
+WarningPHPMail=ADVARSEL: Noen e-postleverandører (som Yahoo) tillater deg ikke å sende en e-post fra en annen server enn Yahoo-serveren hvis e-postadressen benyttes som avsender er din Yahoo e-post (som myemail@yahoo.com, myemail@yahoo.fr, ...). Ditt nåværende oppsett bruker serveren til programmet til å sende e-post, så noen mottakere (det ene er kompatible med den restriktive DMARC protokollen), vil be Yahoo om de kan ta imot e-post og Yahoo vil svare "nei" fordi serveren er ikke en server eid av Yahoo, så flere av dine sendte e-poster kan ikke aksepteres. <br> Hvis e-postleverandøren (som Yahoo) har denne begrensningen, må du endre e-post-oppsett for å velge den andre metoden "SMTP server" og skriv inn SMTP-server og legitimasjon som tilbys av e-postleverandøren (be e-postleverandøren om å få SMTP-legitimasjon for kontoen din).
+ClickToShowDescription=Click to show description
 # Modules
 Module0Name=Brukere & grupper
-Module0Desc=Behandling av brukere og grupper
+Module0Desc=Users / Employees and Groups management
 Module1Name=Tredjeparter
 Module1Desc=Behandling av bedrifter og kontaktpersoner
 Module2Name=Handel
@@ -515,8 +525,8 @@ Module2200Name=Dynamiske priser
 Module2200Desc=Aktiver mulighet for matematiske utrykk for å beregne priser
 Module2300Name=Cron
 Module2300Desc=Behandling av planlagte oppgaver
-Module2400Name=Agenda/Hendelser
-Module2400Desc=Følg hendelser eller møter. Registrer hendelser manuelt i agendaer eller la app-logger registrere hendelser automatisk for sporing.
+Module2400Name=Hendelser/Agenda
+Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous.
 Module2500Name=Elektronisk Innholdshåndtering-ECM
 Module2500Desc=Lagre og dele dokumenter
 Module2600Name=API/Web tjenseter(SOAP server)
@@ -582,7 +592,7 @@ Permission34=Slett varer
 Permission36=Se/administrer skjulte varer
 Permission38=Eksporter varer
 Permission41=Les prosjekter og oppgaver (delte prosjekter og de jeg er kontakt for). Her kan du også legge inn tidsbruk på tildelte oppgaver (timelister)
-Permission42=Opprett/endre prosjekter(delte og de jeg er kontakt for)
+Permission42=Create/modify projects (shared project and projects i'm contact for). Can also create tasks and assign users to project and tasks
 Permission44=Slett prosjekter (delte og mine egne)
 Permission45=Eksporter prosjekter
 Permission61=Vis intervensjoner
@@ -685,7 +695,7 @@ PermissionAdvanced253=Opprett/endre interne/eksterne brukere og tillatelser
 Permission254=Slette eller deaktivere andre brukere
 Permission255=Opprett/endre egen brukerinformasjon
 Permission256=Slett eller deaktiver andre brukere
-Permission262=Utvid tilgangen til alle tredjeparter (ikke bare de som er lenket til brukeren). Påvirker ikke eksterne brukere (som alltid er begrenset til seg selv).
+Permission262=Extend access to all third parties (not only third parties that user is a sale representative).<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 assignement matters).
 Permission271=Vis CA
 Permission272=Vis fakturaer
 Permission273=Opprett fakturaer
@@ -825,7 +835,7 @@ DictionaryPaymentModes=Betalingsmåter
 DictionaryTypeContact=Kontakt/adressetyper
 DictionaryEcotaxe=Miljøgebyr (WEEE)
 DictionaryPaperFormat=Papirformater
-DictionaryFormatCards=Cards formats
+DictionaryFormatCards=Kortformater
 DictionaryFees=Avgiftstyper
 DictionarySendingMethods=Leveringsmetoder
 DictionaryStaff=Stab
@@ -887,7 +897,7 @@ Offset=Forskyvning
 AlwaysActive=Alltid aktiv
 Upgrade=Oppgrader
 MenuUpgrade=Oppgrader/Utvid
-AddExtensionThemeModuleOrOther=Legg til utvidelse (tema, modul ...)
+AddExtensionThemeModuleOrOther=Deploy/install external module
 WebServer=Webserver
 DocumentRootServer=Webserverens rotkatalog
 DataRootServer=Mappe for datafiler
@@ -994,7 +1004,7 @@ TriggerAlwaysActive=Utløserne i denne filen er alltid slått på, uansett hvilk
 TriggerActiveAsModuleActive=Utløserne i denne filen er slått på ettersom modulen <b>%s</b> er slått på.
 GeneratedPasswordDesc=Her angir du hvilken regel som skal generere nye passord dersom du ber om å ha automatisk opprettede passord
 DictionaryDesc=Sett alle referansedata. Du kan legge til dine verdier som standard.
-ConstDesc=Denne siden lar deg redigere alle andre parametre som ikke finnes på foregående sider. Disse er stort sett forbeholdt parametre for utviklere eller avansert feilsøking.
+ConstDesc=This page allows you to edit all other parameters not available in previous pages. These are mostly reserved parameters for developers or advanced troubleshooting. For a list of options <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">check here</a>.
 MiscellaneousDesc=Alle andre sikkerhetsrelaterte parametre er definert her.
 LimitsSetup=Grenser/presisjon
 LimitsDesc=Her angir du grenser og presisjon som skal brukes i programmet
@@ -1161,10 +1171,6 @@ FreeLegalTextOnOrders=Fritekst på ordre
 WatermarkOnDraftOrders=Vannmerke på ordrekladder (ingen hvis tom)
 ShippableOrderIconInList=Legg til et ikon i ordrelisten for å vise om ordren kan sendes
 BANK_ASK_PAYMENT_BANK_DURING_ORDER=Be om bankkontor for ordre
-##### Clicktodial #####
-ClickToDialSetup='Click To Dial' modul
-ClickToDialUrlDesc=URL som kalles når man klikker på telefonikonet. I URL, kan du bruke koder <br> <b> __ PHONETO __ </b> som vil bli erstattet med telefonnummeret til personen du vil ringe <br> <b> __ PHONEFROM __ </b> som vil bli erstattet med telefonnummer for å ringe person (din) <br> <b> __ lOGG __ </b> som vil bli erstattet med clicktodial innlogging (definert på brukerkort ) <br> <b> __ PASS __ </b> som vil bli erstattet med clicktodial passord (defineres på brukerkort ).
-##### Bookmark4u #####
 ##### Interventions #####
 InterventionsSetup=Oppsett av intervensjoner-modulen
 FreeLegalTextOnInterventions=Fritekst i intervensjonsdokumenter
@@ -1391,7 +1397,7 @@ SendingsSetup=Oppsett av forsendelsesmodulen
 SendingsReceiptModel=Modell for forsendelseskvitteringer
 SendingsNumberingModules=Nummereringsmodell for for sendelser
 SendingsAbility=Støtt forsendelsesskjemaer for kundeleveranser
-NoNeedForDeliveryReceipts=I de fleste tilfeller er forsendelseskvitteringer brukt både som ark for kundeleveranser (liste over varer som skal sendes) og ark som er mottatt og signert av kunden. Så vareleveringskvitteringer er en dobbel funksjon og er sjelden aktivert.
+NoNeedForDeliveryReceipts=In most cases, shipping sheets are used both as sheets for customer deliveries (list of products to send) and sheets that is received and signed by customer. So product deliveries receipts is a duplicated feature and is rarely activated.
 FreeLegalTextOnShippings=Fritekst på leveringer
 ##### Deliveries #####
 DeliveryOrderNumberingModules=Nummereringsmodul for vareleveringskvitteringer
@@ -1471,7 +1477,11 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Sett denne standardverdien automatisk for hendelse
 AGENDA_DEFAULT_FILTER_TYPE=Sett denne hendelsestypen automatisk i søkefilteret til Agenda-visning
 AGENDA_DEFAULT_FILTER_STATUS=Sett denne statustypen automatisk i søkefilteret til Agenda-visning
 AGENDA_DEFAULT_VIEW=Hvilken fane vil åpne som standard når du velger Agenda-menyen?
-##### ClickToDial #####
+AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
+AGENDA_NOTIFICATION_SOUND=Aktiver lydvarsler
+##### Clicktodial #####
+ClickToDialSetup='Click To Dial' modul
+ClickToDialUrlDesc=URL som kalles når man klikker på telefonikonet. I URL, kan du bruke koder <br> <b> __ PHONETO __ </b> som vil bli erstattet med telefonnummeret til personen du vil ringe <br> <b> __ PHONEFROM __ </b> som vil bli erstattet med telefonnummer for å ringe person (din) <br> <b> __ lOGG __ </b> som vil bli erstattet med clicktodial innlogging (definert på brukerkort ) <br> <b> __ PASS __ </b> som vil bli erstattet med clicktodial passord (defineres på brukerkort ).
 ClickToDialDesc=Denne modulen gjør telefonnumre klikkbare. Ved å klikke på dette ikonet vil telefonen din ringe opp nummeret.
 ClickToDialUseTelLink=Bruk kun en lenke "tlf:" for telefonnumre
 ClickToDialUseTelLinkDesc=Bruk denne metoden hvis brukerne har en softphone eller et programvaregrensesnitt installert på samme datamaskin som nettleseren, og kalles når du klikker på en link i nettleseren din som starter med "tel:". Hvis du trenger en full server-løsning (uten behov for lokal installasjon av programvare), må du sette denne på "Nei" og fylle neste felt.
@@ -1499,10 +1509,11 @@ EndPointIs=SOAP-klienter må sende sine forespørsler til Dolibarr endepunkt til
 ##### API ####
 ApiSetup=Oppsett av API-modul
 ApiDesc=Ved å  aktivere denne modulen, blir Dolibarr en REST-server for diverse web-tjenester
-ApiProductionMode=Aktiver produksjonsmodus (dette vil aktivere bruk av en kasse for tjenestehåndtering)
+ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
 ApiExporerIs=Du kan utforske API'ene i URL
 OnlyActiveElementsAreExposed=Bare elementer fra aktiverte moduler er vist
 ApiKey=API-nøkkel
+WarningAPIExplorerDisabled=The API explorer has been disabled. API explorer is not required to provide API services. It is a tool for developer to find/test REST APIs. If you need this tool, go into setup of module API REST to activate it.
 ##### Bank #####
 BankSetupModule=Oppsett av Bankmodulen
 FreeLegalTextOnChequeReceipts=Fritekst på å sjekkvitteringer
@@ -1571,12 +1582,12 @@ BackupDumpWizard=Veiviser for å bygge database-backup dumpfil
 SomethingMakeInstallFromWebNotPossible=Installasjon av ekstern modul er ikke mulig fra webgrensesnittet på grunn av:
 SomethingMakeInstallFromWebNotPossible2=På grunn av dette, er prosessen for å oppgradere beskrevet her, bare manuelle trinn en privilegert bruker kan gjøre.
 InstallModuleFromWebHasBeenDisabledByFile=Administrator har deaktivert muligheten for å installere eksterne moduler. Administrator må fjerne filen <strong>%s</strong> for å tillate dette.
-ConfFileMuseContainCustom=For å installere en ekstern modul, må du lagre filene i mappen <strong>%s</strong>. For at Dolibarr skal kunne behandle denne katalogen, må du først endre <strong>conf/conf.php</strong> til <br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
+ConfFileMuseContainCustom=Installing an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Fremhev tabellinjer når musen flyttes over
 HighlightLinesColor=Uthev fargen på linjen når musen føres over (holdes tom for ingen uthevning)
 TextTitleColor=Farge på sidetittel
 LinkColor=Farge på lenker
-PressF5AfterChangingThis=Press F5 on keyboard or clear your browser cache after changing this value to have it effective
+PressF5AfterChangingThis=Trykk F5 eller slett nettleserens cache for at endringene skal tre i kraft
 NotSupportedByAllThemes=Vil virke med kjernetemaer, vil kanskje ikke virke med eksterne temaer
 BackgroundColor=Bakgrunnsfarge
 TopMenuBackgroundColor=Bakgrunnsfarge for toppmeny
@@ -1601,6 +1612,7 @@ FixTZ=Tidssone offset
 FillFixTZOnlyIfRequired=Eksempel: +2 (fylles kun ut ved problemer)
 ExpectedChecksum=Forventet sjekksum
 CurrentChecksum=Gjeldende sjekksum
+ForcedConstants=Required constant values
 MailToSendProposal=For å sende tilbud
 MailToSendOrder=For å sende kundeordre
 MailToSendInvoice=For å sende kundefaktura
@@ -1609,13 +1621,14 @@ MailToSendIntervention=For å sende intervensjon
 MailToSendSupplierRequestForQuotation=For å sende forespørsel til leverandør
 MailToSendSupplierOrder=For å sende leverandørordre
 MailToSendSupplierInvoice=For å sende leverandørfaktura
+MailToSendContract=To send a contract
 MailToThirdparty=For å sende epost fra tredjepart-side
 ByDefaultInList=Vis som standard for liste
-YouUseLastStableVersion=Du bruker siste stabile verjon
+YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=Eksempel på melding du kan bruke for å annonsere større oppdateringer (du kan bruke denne på dine websider)
 TitleExampleForMaintenanceRelease=Eksempel på beskjed du kan bruke for å annonsere denne vedlikeholdsversjonen (du kan bruke den på dine websider)
-ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s er tilgjengelig. Versjon %s er en større utgivelse med mange nye funksjoner både for brukere og utviklere. Du kan hente den fra nedlastningsområdet http://www.dolibarr.org portal (undermappe: Stable versions). Du kan lese <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for en komplett liste over forandringer som er gjort.
-ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s er tilgjengelig. Versjon %s er en vedlikeholdsversjon, så den inneholder bare bugreparasjoner. Vi anbefaler alle som bruker en eldre versjon om å oppgradere til denne. Som i alle vedlikeholdsversjoner, er det ingen nye funksjoner eller strukturendringer i denne versjonen. Du hente den fra nedlastningsområdet http://www.dolibarr.org portal (underkatalog: Stable versions). Du kan lese <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for en komplett liste over endringer som er gjort.
+ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. 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.
+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, nor data structure change is present into 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=Når alternativet "Flere prisnivået per vare/tjeneste" er på, kan du definere forskjellige priser (ett pr prisnivå) for hvert produkt. For å spare tid, kan du lage en regel som gir pris for hvert nivå autokalkulert i forhold til prisen på første nivå, slik at du bar legger inn en pris for hvert produkt. Denne siden er laget for å spare tid og kan være nyttig hvis prisene for hvert nivå står i forhold til første nivå. Du kan ignorere denne siden i de fleste tilfeller.
 ModelModulesProduct=Maler for produkt-dokumenter
 ToGenerateCodeDefineAutomaticRuleFirst=For å være i stand til å generere automatiske koder, må du først definere program for å automatisk definere strekkodenummer.
diff --git a/htdocs/langs/nb_NO/banks.lang b/htdocs/langs/nb_NO/banks.lang
index a44ad012ce7..e2af0d1a3c2 100644
--- a/htdocs/langs/nb_NO/banks.lang
+++ b/htdocs/langs/nb_NO/banks.lang
@@ -28,10 +28,10 @@ Reconciliation=Bankavstemming
 RIB=Bankkontonummer
 IBAN=IBAN-nummer
 BIC=BIC/SWIFT-nummer
-SwiftValid=BIC/SWIFT valid
-SwiftVNotalid=BIC/SWIFT not valid
-IbanValid=BAN valid
-IbanNotValid=BAN not valid
+SwiftValid=BIC/SWIFT gyldig
+SwiftVNotalid=BIC/SWIFT ikke gyldig
+IbanValid=BAN gyldig
+IbanNotValid=BAN ikke gyldig
 StandingOrders=Direktedebet-ordre
 StandingOrder=Direktedebet-ordre
 AccountStatement=Kontoutskrift
@@ -74,13 +74,13 @@ Conciliate=Avstem
 Conciliation=Avstemming
 ReconciliationLate=Avstemming forsinket
 IncludeClosedAccount=Ta med lukkede konti
-OnlyOpenedAccount=Kun åpne konti
+OnlyOpenedAccount=Bare åpne konti
 AccountToCredit=Konto å kreditere
 AccountToDebit=Konto å debitere
 DisableConciliation=Slå av avstemmingsfunksjon for denne kontoen
 ConciliationDisabled=Avstemmingsfunksjon slått av
 LinkedToAConciliatedTransaction=Lenket til en avstemt oppføring
-StatusAccountOpened=Åpne
+StatusAccountOpened=Åpnet
 StatusAccountClosed=Lukket
 AccountIdShort=Nummer
 LineRecord=Transaksjon
diff --git a/htdocs/langs/nb_NO/bills.lang b/htdocs/langs/nb_NO/bills.lang
index db5b6139e85..e6f9c4d9887 100644
--- a/htdocs/langs/nb_NO/bills.lang
+++ b/htdocs/langs/nb_NO/bills.lang
@@ -2,12 +2,12 @@
 Bill=Faktura
 Bills=Fakturaer
 BillsCustomers=Kundefakturaer
-BillsCustomer=Kundens faktura
-BillsSuppliers=Leverandørens fakturaer
+BillsCustomer=Kundefaktura
+BillsSuppliers=Leverandørfakturaer
 BillsCustomersUnpaid=Ubetalte kundefakturaer
-BillsCustomersUnpaidForCompany=Ubetalte kundefakturaer for %s
+BillsCustomersUnpaidForCompany=Unpaid customer invoices for %s
 BillsSuppliersUnpaid=Ubetalte leverandørfakturaer
-BillsSuppliersUnpaidForCompany=Ubetalte leverandørfakturaer for %s
+BillsSuppliersUnpaidForCompany=Unpaid supplier invoices for %s
 BillsLate=Forfalte betalinger
 BillsStatistics=Kunde fakturastatistikker
 BillsStatisticsSuppliers=Leverandør fakturastatistikker
@@ -63,7 +63,7 @@ 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 kreditnotaen eller innskuddet 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 kunden.
+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.
 SupplierPayments=Leverandørbetalinger
 ReceivedPayments=Mottatte betalinger
 ReceivedCustomersPayments=Betalinger mottatt fra kunder
@@ -78,6 +78,7 @@ PaymentMode=Betalingsmåte
 PaymentTypeDC=Debet/kredit-kort
 PaymentTypePP=PayPal
 IdPaymentMode=Betalingstype (ID)
+CodePaymentMode=Payment type (code)
 LabelPaymentMode=Betalingstype (etikett)
 PaymentModeShort=Betalingstype
 PaymentTerm=Betalingsbetingelser
@@ -102,9 +103,10 @@ SearchACustomerInvoice=Finn kundefaktura
 SearchASupplierInvoice=Finn leverandørfaktura
 CancelBill=Kanseller en faktura
 SendRemindByMail=E-postpåminnelse
-DoPayment=Utfør betaling
-DoPaymentBack=Utfør tilbakebetaling
+DoPayment=Enter payment
+DoPaymentBack=Enter refund
 ConvertToReduc=Konverter til framtidig rabatt
+ConvertExcessReceivedToReduc=Convert excess received into future discount
 EnterPaymentReceivedFromCustomer=Legg inn betaling mottatt fra kunde
 EnterPaymentDueToCustomer=Lag purring til kunde
 DisabledBecauseRemainderToPayIsZero=Slått av fordi restbeløpet er null
@@ -113,22 +115,24 @@ BillStatus=Fakturastatus
 StatusOfGeneratedInvoices=Status for genererte fakturaer
 BillStatusDraft=Kladd (må valideres)
 BillStatusPaid=Betalt
-BillStatusPaidBackOrConverted=Betalt eller konvertert til rabatt
+BillStatusPaidBackOrConverted=Refund or converted into discount
 BillStatusConverted=Betalt (klar for siste faktura)
 BillStatusCanceled=Tapsført
 BillStatusValidated=Validert (må betales)
 BillStatusStarted=Startet
 BillStatusNotPaid=Ubetalt
+BillStatusNotRefunded=Ikke refundert
 BillStatusClosedUnpaid=Lukket (ubetalt)
 BillStatusClosedPaidPartially=Delbetalt
 BillShortStatusDraft=Kladd
 BillShortStatusPaid=Betalt
-BillShortStatusPaidBackOrConverted=Behandlet
+BillShortStatusPaidBackOrConverted=Refund or converted
 BillShortStatusConverted=Behandlet
 BillShortStatusCanceled=Tapsført
 BillShortStatusValidated=Validert
 BillShortStatusStarted=Startet
 BillShortStatusNotPaid=Ubetalt
+BillShortStatusNotRefunded=Ikke refundert
 BillShortStatusClosedUnpaid=Lukket
 BillShortStatusClosedPaidPartially=Delbetalt
 PaymentStatusToValidShort=Til validering
@@ -149,14 +153,14 @@ NoQualifiedRecurringInvoiceTemplateFound=Ingen gjentagende-fakturamal kvalifiser
 FoundXQualifiedRecurringInvoiceTemplate=Fant %s gjentagende-fakturamal(er) kvalifisert for generering.
 NotARecurringInvoiceTemplate=Ikke en mal for gjentagende faktura
 NewBill=Ny faktura
-LastBills=Siste %s fakturaer
-LastCustomersBills=Siste %s kundefakturaer
-LastSuppliersBills=Siste %s kundefakturaer
+LastBills=Latest %s invoices
+LastCustomersBills=Latest %s customer invoices
+LastSuppliersBills=Latest %s supplier invoices
 AllBills=Alle fakturaer
 OtherBills=Andre fakturaer
 DraftBills=Fakturakladder
-CustomersDraftInvoices=Kunde fakturakladder
-SuppliersDraftInvoices=Leverandør fakturakladder
+CustomersDraftInvoices=Customer draft invoices
+SuppliersDraftInvoices=Supplier draft invoices
 Unpaid=Ubetalt
 ConfirmDeleteBill=Er du sikker på at du vil slette denne fakturaen?
 ConfirmValidateBill=Er du sikker på at du vil validere denne fakturaen med referanse <b>%s</b>?
@@ -203,7 +207,7 @@ AlreadyPaidNoCreditNotesNoDeposits=Allerede betalt (uten kreditnotater og innsku
 Abandoned=Tapsført
 RemainderToPay=Restbeløp
 RemainderToTake=Restbeløp
-RemainderToPayBack=Restbeløp
+RemainderToPayBack=Remaining amount to refund
 Rest=Venter
 AmountExpected=Beløp purret
 ExcessReceived=Overskytende
@@ -270,6 +274,7 @@ Deposit=Innskudd
 Deposits=Innskudd
 DiscountFromCreditNote=Rabatt fra kreditnota %s
 DiscountFromDeposit=Betalinger fra innskuddsfaktura %s
+DiscountFromExcessReceived=Payments from excess received of invoice %s
 AbsoluteDiscountUse=Denne typen kreditt kan brukes på faktura før den godkjennes
 CreditNoteDepositUse=Fakturaen m valideres for å kunne bruke denne typen kredit
 NewGlobalDiscount=Ny absolutt rabatt
@@ -277,8 +282,8 @@ NewRelativeDiscount=Ny relativ rabatt
 NoteReason=Notat/Årsak
 ReasonDiscount=Årsak
 DiscountOfferedBy=Innrømmet av
-DiscountStillRemaining=Gjenstående rabatt
-DiscountAlreadyCounted=Rabatt allerede avregnet
+DiscountStillRemaining=Discounts available
+DiscountAlreadyCounted=Discounts already consumed
 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.
@@ -331,10 +336,12 @@ InvoiceAutoValidate=Valider fakturaer automatisk
 GeneratedFromRecurringInvoice=Generert fra gjentagende-fakturamal %s
 DateIsNotEnough=Dato ikke nådd enda
 InvoiceGeneratedFromTemplate=Faktura %s generert fra gjentagende-fakturamal %s
+WarningInvoiceDateInFuture=Warning, the invoice date is higher than current date
+WarningInvoiceDateTooFarInFuture=Warning, the invoice date is too far from current date
 # PaymentConditions
 Statut=Status
-PaymentConditionShortRECEP=Kontant
-PaymentConditionRECEP=Kontant
+PaymentConditionShortRECEP=Due Upon Receipt
+PaymentConditionRECEP=Due Upon Receipt
 PaymentConditionShort30D=30 dager
 PaymentCondition30D=30 dager
 PaymentConditionShort30DENDMONTH=30 dager etter månedsslutt
@@ -349,6 +356,14 @@ PaymentConditionShortPT_ORDER=Ordre
 PaymentConditionPT_ORDER=I bestilling
 PaymentConditionShortPT_5050=50-50
 PaymentConditionPT_5050=50%% i forskudd, 50%% ved levering
+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
 FixAmount=Fast beløp
 VarAmount=Variabelt beløp
 # PaymentType
@@ -418,7 +433,7 @@ ChequeDeposits=Sjekkinnskudd
 Cheques=Sjekker
 DepositId=Innskudds-ID
 NbCheque=Antall sjekker
-CreditNoteConvertedIntoDiscount=Denne kreditnotaen er konvertert til %s
+CreditNoteConvertedIntoDiscount=This %s has been converted into %s
 UsBillingContactAsIncoiveRecipientIfExist=Bruk kontaktpersonens adresse i stedet for tredjepartens adresse
 ShowUnpaidAll=Vis alle ubetalte fakturaer
 ShowUnpaidLateOnly=Vis kun forfalte fakturaer
diff --git a/htdocs/langs/nb_NO/boxes.lang b/htdocs/langs/nb_NO/boxes.lang
index b873318a00b..03f98fb9f3e 100644
--- a/htdocs/langs/nb_NO/boxes.lang
+++ b/htdocs/langs/nb_NO/boxes.lang
@@ -25,8 +25,8 @@ BoxTitleLastSuppliers=Siste %s registrerte leverandører
 BoxTitleLastModifiedSuppliers=Siste %s endrede leverandører
 BoxTitleLastModifiedCustomers=Siste %s endrede kunder
 BoxTitleLastCustomersOrProspects=Siste %s endrede kunder eller prospekter
-BoxTitleLastCustomerBills=Siste %s kunders fakturaer
-BoxTitleLastSupplierBills=Siste %s leverandørers fakturaer
+BoxTitleLastCustomerBills=Latest %s customer invoices
+BoxTitleLastSupplierBills=Latest %s supplier invoices
 BoxTitleLastModifiedProspects=Siste %s endrede prospekter
 BoxTitleLastModifiedMembers=Siste %s medlemmer
 BoxTitleLastFicheInter=Siste %s endrede intervensjoner
@@ -51,12 +51,12 @@ ClickToAdd=Klikk her for å legge til.
 NoRecordedCustomers=Ingen registrerte kunder
 NoRecordedContacts=Ingen registrerte kontakter
 NoActionsToDo=Ingen åpne handlinger
-NoRecordedOrders=Ingen registrerte kunderordre
+NoRecordedOrders=No recorded customer orders
 NoRecordedProposals=Ingen registrerte tilbud
-NoRecordedInvoices=Ingen registrerte kundefakturaer
-NoUnpaidCustomerBills=Ingen ubetalte kundefakturaer
-NoUnpaidSupplierBills=Ingen ubetalte leverandørfakturaer
-NoModifiedSupplierBills=Ingen registrerte leverandørfakturaer
+NoRecordedInvoices=No recorded customer invoices
+NoUnpaidCustomerBills=No unpaid customer invoices
+NoUnpaidSupplierBills=No unpaid supplier invoices
+NoModifiedSupplierBills=No recorded supplier invoices
 NoRecordedProducts=Ingen registrerte varer/tjenester
 NoRecordedProspects=Ingen registrerte prospekter
 NoContractedProducts=Ingen innleide varer/tjenester
diff --git a/htdocs/langs/nb_NO/companies.lang b/htdocs/langs/nb_NO/companies.lang
index cbda16e01b3..6aa6f47bbc5 100644
--- a/htdocs/langs/nb_NO/companies.lang
+++ b/htdocs/langs/nb_NO/companies.lang
@@ -78,6 +78,10 @@ VATIsNotUsed=MVA skal ikke beregnes
 CopyAddressFromSoc=Fyll inn adressen med tredjepartsadressen
 ThirdpartyNotCustomerNotSupplierSoNoRef=Tredjeparts verken kunde eller leverandør, ingen tilgjengelige henvisende objekter
 PaymentBankAccount=Bankkonto betaling
+OverAllProposals=Totalt antall tilbud
+OverAllOrders=Totalt antall ordre
+OverAllInvoices=Totalt antall fakturaer
+OverAllSupplierProposals=Total price requests
 ##### Local Taxes #####
 LocalTax1IsUsed=Bruk avgift 2
 LocalTax1IsUsedES= RE brukes
@@ -239,6 +243,10 @@ ProfId3RU=Prof ID 3 (KPP)
 ProfId4RU=Prof ID 4 (OKPO)
 ProfId5RU=-
 ProfId6RU=-
+ProfId1DZ=RC
+ProfId2DZ=Art.
+ProfId3DZ=NIF
+ProfId4DZ=NIS
 VATIntra=Organisasjonsnummer
 VATIntraShort=Organisasjonsnummer
 VATIntraSyntaxIsValid=Gyldig syntaks
@@ -382,8 +390,9 @@ ListCustomersShort=Liste over kunder
 ThirdPartiesArea=Tredjepart og kontaktområde
 LastModifiedThirdParties=Siste %s endrede tredjeparter
 UniqueThirdParties=Totalt antall unike tredjeparter
-InActivity=Åpen
+InActivity=Åpnet
 ActivityCeased=Stengt
+ThirdPartyIsClosed=Tredjepart er stengt
 ProductsIntoElements=Liste over varer/tjenester i %s
 CurrentOutstandingBill=Gjeldende utestående regning
 OutstandingBill=Max. utestående beløp
@@ -396,7 +405,7 @@ MergeThirdparties=Flett tredjeparter
 ConfirmMergeThirdparties=Er du sikker på at du vil slå sammen denne tredjeparten med den nåværende? Alle koblede objekter (fakturaer, bestillinger, ...) vil bli flyttet til nåværenede tredjepart, slik at du vil være i stand til å slette den dupliserte.
 ThirdpartiesMergeSuccess=Tredjepartene er blitt flettet
 SaleRepresentativeLogin=Innlogging for salgsrepresentant
-SaleRepresentativeFirstname=Fornavnet til salgsrepresentanten
-SaleRepresentativeLastname=Etternavnet til salgsrepresentanten
+SaleRepresentativeFirstname=First name of sales representative
+SaleRepresentativeLastname=Last name of sales representative
 ErrorThirdpartiesMerge=Det oppsto en feil ved sletting av tredjeparter. Vennligst sjekk loggen. Endringer er tilbakeført til opprinnelig stand.
 NewCustomerSupplierCodeProposed=Ny kunde eller leverandørkode foreslått med duplisert kode
diff --git a/htdocs/langs/nb_NO/compta.lang b/htdocs/langs/nb_NO/compta.lang
index f0046781465..b7db78f3f7c 100644
--- a/htdocs/langs/nb_NO/compta.lang
+++ b/htdocs/langs/nb_NO/compta.lang
@@ -65,6 +65,7 @@ PaymentSocialContribution=Skatter- og avgiftsbetaling
 PaymentVat=MVA betaling
 ListPayment=Liste over betalinger
 ListOfCustomerPayments=Liste over kundebetalinger
+ListOfSupplierPayments=Liste over leverandørbetalinger
 DateStartPeriod=Startdato
 DateEndPeriod=Sluttdato
 newLT1Payment=Ny MVA 2 betaling
@@ -81,7 +82,7 @@ LT2PaymentES=IRPF Betaling
 LT2PaymentsES=IRPF Betalinger
 VATPayment=MVA.betaling
 VATPayments=MVA.betalinger
-VATRefund=MVA tilbakebetaling
+VATRefund=Sales tax refund
 Refund=Refusjon
 SocialContributionsPayments=Skatter- og avgiftsbetalinger
 ShowVatPayment=Vis MVA betaling
@@ -194,7 +195,7 @@ CloneTax=Klon skatt/avgift
 ConfirmCloneTax=Bekreft kloning av skatt/avgiftsbetaling
 CloneTaxForNextMonth=Klon for neste måned
 SimpleReport=Enkel rapport
-AddExtraReport=Ekstra rapporter
+AddExtraReport=Extra reports (add foreign and national customer report)
 OtherCountriesCustomersReport=Rapport over utenlandske kunder
 BasedOnTwoFirstLettersOfVATNumberBeingDifferentFromYourCompanyCountry=Basert på de at to første bokstavene i MVA-nummeret er ulik ditt eget selskaps landskode
 SameCountryCustomersWithVAT=Rapport over nasjonale kunder
diff --git a/htdocs/langs/nb_NO/cron.lang b/htdocs/langs/nb_NO/cron.lang
index 95e229547a2..80a425cbd67 100644
--- a/htdocs/langs/nb_NO/cron.lang
+++ b/htdocs/langs/nb_NO/cron.lang
@@ -17,8 +17,8 @@ CronMethodDoesNotExists=Klasse %s inneholder ingen metode %s
 # Menu
 EnabledAndDisabled=Aktivert og deaktivert
 # Page list
-CronLastOutput=Resultat av forrige kjøring
-CronLastResult=Siste kjøring - kode
+CronLastOutput=Latest run output
+CronLastResult=Latest result code
 CronCommand=Kommando
 CronList=Planlagte jobber
 CronDelete=Slett planlagte jobber
diff --git a/htdocs/langs/nb_NO/errors.lang b/htdocs/langs/nb_NO/errors.lang
index ce4b074f179..3e0d32e672c 100644
--- a/htdocs/langs/nb_NO/errors.lang
+++ b/htdocs/langs/nb_NO/errors.lang
@@ -11,6 +11,7 @@ ErrorLoginAlreadyExists=brukernavnet %s eksisterer allerede.
 ErrorGroupAlreadyExists=Gruppen %s eksisterer allerede.
 ErrorRecordNotFound=Posten ble ikke funnet.
 ErrorFailToCopyFile=Klarte ikke å kopiere filen '<b>«%s</b>' til '<b>%s</b>'.
+ErrorFailToCopyDir=Failed to copy directory '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToRenameFile=Kunne ikke omdøpe filen '<b>%s</b>' til '<b>%s</b>'
 ErrorFailToDeleteFile=Kunne ikke fjerne filen '<b>%s</b>'.
 ErrorFailToCreateFile=Kunne ikke opprette filen '<b>%s</b>'.
@@ -115,7 +116,7 @@ ErrorNoActivatedBarcode=Ingen strekkodetype aktivert
 ErrUnzipFails=Klarte ikke å pakke ut %s med ZipArchive
 ErrNoZipEngine=Ingen applikasjon som kan pakke ut %s i denne PHP
 ErrorFileMustBeADolibarrPackage=Filen %s må være en Dolibarr zip-pakke
-ErrorFileRequired=Må være en Dolibarr zip-pakke
+ErrorModuleFileRequired=You must select a Dolibarr module package file
 ErrorPhpCurlNotInstalled=PHP CURL er ikke installert. Denne må være installert for å kommunisere med Paypal
 ErrorFailedToAddToMailmanList=Klarte ikke å legge post %s til Mailman-liste %s eller SPIP-base
 ErrorFailedToRemoveToMailmanList=Klarte ikke å fjerne post %s fra Mailman-liste %s eller SPIP-base
@@ -170,14 +171,19 @@ ErrorWarehouseRequiredIntoShipmentLine=Lager er obligatorisk for å kunne levere
 ErrorFileMustHaveFormat=Filen må ha formatet %s
 ErrorSupplierCountryIsNotDefined=Land for denne leverandøren er ikke valgt. Korriger dette først.
 ErrorsThirdpartyMerge=Klarte ikke å flette de to postene. Forespørsel ble avbrutt.
-ErrorStockIsNotEnoughToAddProductOnOrder=Ikke nok lagerbeholdning for varen %s til å legges til i en ny ordre.
-ErrorStockIsNotEnoughToAddProductOnInvoice=Ikke nok lagerbeholdning for varen %s til å legges til i en ny faktura.
-ErrorStockIsNotEnoughToAddProductOnShipment=Ikke nok lagerbeholdning for varen %s til å legges til i en ny levering.
-ErrorStockIsNotEnoughToAddProductOnProposal=Ikke nok lagerbeholdning for varen %s til å legges til i et nytt tilbud.
-ErrorFailedToLoadLoginFileForMode=Kunne ikke finne innloggingsfil for modus '%s'.
+ErrorStockIsNotEnoughToAddProductOnOrder=Lagernivå er for lavt for å legge %s til i en ny ordre
+ErrorStockIsNotEnoughToAddProductOnInvoice=Lagernivå er for lavt for å legge %s til i en ny faktura
+ErrorStockIsNotEnoughToAddProductOnShipment=Lagernivå er for lavt for å legge %s til i en ny forsendelse
+ErrorStockIsNotEnoughToAddProductOnProposal=Lagernivå er for lavt for å legge %s til i et nytt tilbud
+ErrorFailedToLoadLoginFileForMode=Klarte ikke å hente innloggingsnøkkel for modus '%s'.
 ErrorModuleNotFound=Modulfilen ble ikke funnet.
 ErrorFieldAccountNotDefinedForBankLine=Verdi for regnskapskode er ikke definert bankkonto linje %s
 ErrorBankStatementNameMustFollowRegex=Feil, navn på kontoutskrift må følge syntaksregelen %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=Oppgaven er allerede tildelt bruker
+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>
 
 # 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.
diff --git a/htdocs/langs/nb_NO/exports.lang b/htdocs/langs/nb_NO/exports.lang
index eb675206c14..cc08e1e8d30 100644
--- a/htdocs/langs/nb_NO/exports.lang
+++ b/htdocs/langs/nb_NO/exports.lang
@@ -110,7 +110,7 @@ Enclosure=Innbygging
 SpecialCode=Spesialkode
 ExportStringFilter=%% tillater at at en eller flere karakterer i teksten kan erstattes
 ExportDateFilter=ÅÅÅÅ, ÅÅÅÅMM, ÅÅÅÅMMDD : filtrert etter år/måned/dag<br>ÅÅÅÅ+ÅÅÅÅ, ÅÅÅÅMM+ÅÅÅÅMM, ÅÅÅÅMMDD+ÅÅÅÅMMDD: filtrerer en tidsperiode<br> > ÅÅÅÅ, > ÅÅÅÅMM, > ÅÅÅÅMMDD: filteret velger alle påfølgende år<br> < ÅÅÅÅ, < ÅÅÅÅMM, < ÅÅÅÅMMDD: filteret velger alle foregående år
-ExportNumericFilter='NNNNN' filtrer etter en verdi<br>'NNNNN+NNNNN' filtrerer etter verdirekke<br>'&gt;NNNNN' filtrerer etter synkende verdier<br>'&gt;NNNNN' filtrerer etter stigende verdier
+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
 ImportFromLine=Import starter fra linjenummer
 EndAtLineNb=Slutter på linjenummer
 SetThisValueTo2ToExcludeFirstLine=For eksempel, sett denne verdien til 3 for å eksludere de 2 første linjene
@@ -120,3 +120,8 @@ SelectFilterFields=Hvis du vil filtrere etter noen verdier, kan du endre dem her
 FilteredFields=Filtrerte felt
 FilteredFieldsValues=Filterverdi
 FormatControlRule=Format kontrollregel
+## imports updates
+KeysToUseForUpdates=Nøkkel for bruk ved dataoppdatering
+NbInsert=Antall innsatte linjer: %s
+NbUpdate=Antall oppdaterte linjer: %s
+MultipleRecordFoundWithTheseFilters=Flere poster er blitt funnet med disse filtrene: %s
diff --git a/htdocs/langs/nb_NO/holiday.lang b/htdocs/langs/nb_NO/holiday.lang
index 9a0b88e946f..360490e8305 100644
--- a/htdocs/langs/nb_NO/holiday.lang
+++ b/htdocs/langs/nb_NO/holiday.lang
@@ -76,8 +76,9 @@ BoxTitleLastLeaveRequests=Siste %s endrede ferieforespørsler
 HolidaysMonthlyUpdate=Månedlig oppdatering
 ManualUpdate=Manuell oppdatering
 HolidaysCancelation=Kansellering av feriesøknader
-EmployeeLastname=Ansatts etternavn
-EmployeeFirstname=Ansatts fornavn
+EmployeeLastname=Employee last name
+EmployeeFirstname=Employee first name
+TypeWasDisabledOrRemoved=Ferietype (id %s) ble deaktivert eller slettet
 
 ## Configuration du Module ##
 LastUpdateCP=Siste automatiske oppdatering av ferietildeling
diff --git a/htdocs/langs/nb_NO/interventions.lang b/htdocs/langs/nb_NO/interventions.lang
index 01a1d09c784..74f40a02384 100644
--- a/htdocs/langs/nb_NO/interventions.lang
+++ b/htdocs/langs/nb_NO/interventions.lang
@@ -26,7 +26,7 @@ DocumentModelStandard=Standard dokumentet modell for intervensjoner
 InterventionCardsAndInterventionLines=Intervensjoner og intervensjonslinjer
 InterventionClassifyBilled=Merk "Fakturert"
 InterventionClassifyUnBilled=Merk "Ikke fakturert"
-InterventionClassifyDone=Classify "Done"
+InterventionClassifyDone=Klassifiser som "utført"
 StatusInterInvoiced=Fakturert
 ShowIntervention=Vis intervensjon
 SendInterventionRef=Send intervensjon %s
@@ -41,6 +41,7 @@ InterventionDeletedInDolibarr=Intervensjon %s ble slettet
 InterventionsArea=Område for intervensjoner
 DraftFichinter=Intervensjonskladder
 LastModifiedInterventions=Siste %s endrede intervensjoner
+FichinterToProcess=Interventions to process
 ##### Types de contacts #####
 TypeContact_fichinter_external_CUSTOMER=Ansvarlig for kundeoppfølging
 # Modele numérotation
diff --git a/htdocs/langs/nb_NO/languages.lang b/htdocs/langs/nb_NO/languages.lang
index 85a9b0906cd..0cb66056b62 100644
--- a/htdocs/langs/nb_NO/languages.lang
+++ b/htdocs/langs/nb_NO/languages.lang
@@ -12,6 +12,7 @@ Language_de_DE=Tysk
 Language_de_AT=Tysk (Østerrike)
 Language_de_CH=Tysk (Sveits)
 Language_el_GR=Gresk
+Language_el_CY=Gresk (Kypros)
 Language_en_AU=Engelsk (Australia)
 Language_en_CA=Engelsk (Canada)
 Language_en_GB=Engelsk (U.K.)
@@ -26,8 +27,10 @@ Language_es_BO=Spansk (Bolivia)
 Language_es_CL=Spansk (Chile)
 Language_es_CO=Spansk (Colombia)
 Language_es_DO=Spansk (Den Dominikanske republikk)
+Language_es_EC=Spansk (Ecuador)
 Language_es_HN=Spansk (Honduras)
 Language_es_MX=Spansk (Mexico)
+Language_es_PA=Spansk (Panama)
 Language_es_PY=Spansk (Paraguay)
 Language_es_PE=Spansk (Peru)
 Language_es_PR=Spansk (Puerto Rico)
@@ -50,12 +53,14 @@ Language_is_IS=Islandsk
 Language_it_IT=Italiensk
 Language_ja_JP=Japansk
 Language_ka_GE=Georgisk
+Language_km_KH=Khmer
 Language_kn_IN=Kanadisk
 Language_ko_KR=Koreansk
 Language_lo_LA=Laotisk
 Language_lt_LT=Litauisk
 Language_lv_LV=Latvisk
 Language_mk_MK=Makedonsk
+Language_mn_MN=Mongolsk
 Language_nb_NO=Norsk (bokmål)
 Language_nl_BE=Nederlandsk (Belgia)
 Language_nl_NL=Nederlandsk (Nederland)
diff --git a/htdocs/langs/nb_NO/ldap.lang b/htdocs/langs/nb_NO/ldap.lang
index 108947736d1..d6e2c88d782 100644
--- a/htdocs/langs/nb_NO/ldap.lang
+++ b/htdocs/langs/nb_NO/ldap.lang
@@ -13,8 +13,8 @@ LDAPUsers=Brukere i LDAP-databasen
 LDAPFieldStatus=Status
 LDAPFieldFirstSubscriptionDate=Første abonnementsdato
 LDAPFieldFirstSubscriptionAmount=Første abonnementsbeløp
-LDAPFieldLastSubscriptionDate=Siste abonnementsdato
-LDAPFieldLastSubscriptionAmount=Siste abonnementsbeløp
+LDAPFieldLastSubscriptionDate=Latest subscription date
+LDAPFieldLastSubscriptionAmount=Latest subscription amount
 LDAPFieldSkype=Skype ID
 LDAPFieldSkypeExample=Eksempel: skypeNavn
 UserSynchronized=Brukeren er synkronisert
diff --git a/htdocs/langs/nb_NO/loan.lang b/htdocs/langs/nb_NO/loan.lang
index 60fd26bfb87..ed27f6c5024 100644
--- a/htdocs/langs/nb_NO/loan.lang
+++ b/htdocs/langs/nb_NO/loan.lang
@@ -10,9 +10,9 @@ LoanCapital=Kapital
 Insurance=Forsikring
 Interest=Rente
 Nbterms=Antall terminer
-LoanAccountancyCapitalCode=Accounting account capital
-LoanAccountancyInsuranceCode=Accounting account insurance
-LoanAccountancyInterestCode=Accounting account interest
+LoanAccountancyCapitalCode=Regnskapskonto kapital
+LoanAccountancyInsuranceCode=Regnskapskonto forsikring
+LoanAccountancyInterestCode=Regnskapskonto rente
 ConfirmDeleteLoan=Bekreft sletting av dette lånet
 LoanDeleted=Lånet ble slettet
 ConfirmPayLoan=Bekreft at dette lånet er klassifisert som betalt
@@ -43,8 +43,9 @@ LoanCalcDesc=Denne <b>boliglånskalkulatoren</b> kan brukes til å finne ut mån
 GoToInterest=%s vil gå mot INTEREST
 GoToPrincipal=%s vil gå mot PRINCIPAL
 YouWillSpend=Du kommer til å bruke %s i år %s
+ListLoanAssociatedProject=List of loan associated with the project
 # Admin
 ConfigLoan=Oppset av lån-modulen
-LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accounting account capital by default
-LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accounting account interest by default
-LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accounting account insurance by default
+LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Standard regnskapskonto kapital
+LOAN_ACCOUNTING_ACCOUNT_INTEREST=Standard regnskapskonto  rente
+LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Standard regnskapskonto forsikring
diff --git a/htdocs/langs/nb_NO/mails.lang b/htdocs/langs/nb_NO/mails.lang
index a3d2e5b4925..66f4697840e 100644
--- a/htdocs/langs/nb_NO/mails.lang
+++ b/htdocs/langs/nb_NO/mails.lang
@@ -35,7 +35,7 @@ MailingStatusSentPartialy=Delvis sendt
 MailingStatusSentCompletely=Utsendelse komplett
 MailingStatusError=Feil
 MailingStatusNotSent=Ikke sendt
-MailSuccessfulySent=E-post ble sendt (fra %s til %s)
+MailSuccessfulySent=Email successfully accepted for delivery (from %s to %s)
 MailingSuccessfullyValidated=Utsendelse validert
 MailUnsubcribe=Avmelding
 MailingStatusNotContact=Skal ikke kontaktes flere ganger
@@ -74,22 +74,28 @@ ResultOfMailSending=Resultat av masseutsendelse av epost
 NbSelected=Ant. valgt
 NbIgnored=Ant. ignorert
 NbSent=Ant. 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
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Antall linjer i filen: %s
 RecipientSelectionModules=Forespørsel om lesebekreftelse
 MailSelectedRecipients=Valgte mottagere
 MailingArea=Område for e-postutsendelser
-LastMailings=Siste %s utsendelser
+LastMailings=Latest %s emailings
 TargetsStatistics=Statistikk over målgruppe
 NbOfCompaniesContacts=Unike kontakter/adresser
 MailNoChangePossible=Du kan ikke endre mottagere når utsendelsen er godkjent
 SearchAMailing=Finn utsendelse
 SendMailing=Send utesendelse
 SendMail=Send e-post
-MailingNeedCommand=For sikkerhets skyld sende en e-post er bedre når utføres fra kommandolinjen. Hvis du har en, spør din server administrator å lansere følgende kommando for å sende e-post til alle mottakere:
+SentBy=Sendt av
+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=Du kan imidlertid sende dem online ver å sette parameteret MAILING_LIMIT_SENDBYWEB til en verdi tilsvarende den maksimale antalle e-poster du ønsker å sende i en økt.
-ConfirmSendingEmailing=Hvis du ikke kan eller foretrekker å sende dem med din nettleser, må du bekrefte at du er sikker på at du vil sende e-post nå, fra nettleseren.
+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=Merk: E-postutsendelser fra web-grensenitt er delt opp i flere omganger av sikkerhets-/timeout-hensyn.<b>%s</b> mottakere for hver utsendelse.
 TargetsReset=Tøm liste
 ToClearAllRecipientsClickHere=Trykk på knappen for å tømme mottagerlisten
@@ -144,3 +150,6 @@ AdvTgtCreateFilter=Opprett filter
 AdvTgtOrCreateNewFilter=Navn på nytt filter
 NoContactWithCategoryFound=Ingen kontakter/adresser med kategori funnet
 NoContactLinkedToThirdpartieWithCategoryFound=Ingen kontakter/adresser med kategori funnet
+OutGoingEmailSetup=Outgoing email setup
+InGoingEmailSetup=Incoming email setup
+
diff --git a/htdocs/langs/nb_NO/main.lang b/htdocs/langs/nb_NO/main.lang
index a1dd21db204..59f6c4f81dc 100644
--- a/htdocs/langs/nb_NO/main.lang
+++ b/htdocs/langs/nb_NO/main.lang
@@ -63,11 +63,13 @@ ErrorNoVATRateDefinedForSellerCountry=Feil: Det er ikke definert noen MVA-satser
 ErrorNoSocialContributionForSellerCountry=Feil! Ingen skatter og avgifter definert for landet '%s'
 ErrorFailedToSaveFile=Feil: Klarte ikke å lagre filen.
 ErrorCannotAddThisParentWarehouse=You are trying to add a parent warehouse which is already a child of current one
+MaxNbOfRecordPerPage=Maks. antall poster pr side
 NotAuthorized=Du er ikke autorisert for å gjøre dette.
 SetDate=Still dato
 SelectDate=Velg en dato
 SeeAlso=Se også %s
 SeeHere=Se her
+Apply=Legg til
 BackgroundColorByDefault=Standard bakgrunnsfarge
 FileRenamed=Filen har fått nytt navn
 FileUploaded=Opplastningen var vellykket
@@ -86,7 +88,7 @@ Undefined=Udefinert
 PasswordForgotten=Glemt passordet?
 SeeAbove=Se ovenfor
 HomeArea=Hjemmeområde
-LastConnexion=Siste tilkobling
+LastConnexion=Latest connection
 PreviousConnexion=Forrige tilkobling
 PreviousValue=Forrige verdi
 ConnectedOnMultiCompany=Tilkoblet miljø
@@ -206,7 +208,7 @@ Family=Familie
 Description=Beskrivelse
 Designation=Beskrivelse
 Model=Doc template
-DefaultModel=Default doc template
+DefaultModel=Standard dokumentmal
 Action=Handling
 About=Om
 Number=Antall
@@ -236,7 +238,7 @@ DateCreation=Opprettet den
 DateCreationShort=Oppr. dato
 DateModification=Endret den
 DateModificationShort=Mod. dato
-DateLastModification=Sist endret den
+DateLastModification=Latest modification date
 DateValidation=Validert den
 DateClosing=Lukket den
 DateDue=Forfallsdato
@@ -432,7 +434,7 @@ Reportings=Rapportering
 Draft=Kladd
 Drafts=Kladder
 Validated=Validert
-Opened=Åpne
+Opened=Åpnet
 New=Ny
 Discount=Rabatt
 Unknown=Ukjent
@@ -460,6 +462,7 @@ DeletePicture=Slett bilde
 ConfirmDeletePicture=Bekreft sletting av bilde?
 Login=Innlogging
 CurrentLogin=Gjeldende innlogging
+EnterLoginDetail=Tast inn innloggingsdetaljer
 January=Januar
 February=Februar
 March=Mars
@@ -597,6 +600,8 @@ SessionName=Sesjonnavn
 Method=Metode
 Receive=Motta
 CompleteOrNoMoreReceptionExpected=Komplett eller ingenting mer forventet
+ExpectedValue=Expected Value
+CurrentValue=Gjeldende verdi
 PartialWoman=Delvis
 TotalWoman=Total
 NeverReceived=Aldri mottatt
@@ -618,7 +623,7 @@ CurrentTheme=Gjeldende tema
 CurrentMenuManager=Nåværende menymanager
 Browser=Nettleser
 Layout=Layout
-Screen=Screen
+Screen=Skjerm
 DisabledModules=Avslåtte moduler
 For=For
 ForCustomer=For kunde
@@ -697,7 +702,7 @@ Test=Test
 Element=Element
 NoPhotoYet=Ingen bilder tilgjengelig ennå
 Dashboard=Kontrollpanel
-MyDashboard=My dashboard
+MyDashboard=Mitt kontrollpanel
 Deductible=Egenandel
 from=fra
 toward=mot
@@ -731,7 +736,7 @@ DeleteLine=Slett linje
 ConfirmDeleteLine=Er du sikker på at du vil slette denne linjen?
 NoPDFAvailableForDocGenAmongChecked=Ingen PDF-generering var tilgjengelig for avkryssede dokumenter
 TooManyRecordForMassAction=For mange poster valgt for masseutførelse. Denne handlingen er begrenset til %s poster.
-NoRecordSelected=No record selected
+NoRecordSelected=Ingen poster valgt
 MassFilesArea= Filområde bygget av massehandlinger
 ShowTempMassFilesArea=Vis filområde bygget av massehandlinger
 RelatedObjects=Relaterte objekter
@@ -751,8 +756,10 @@ GroupBy=Grupper etter...
 ViewFlatList=Vis liste
 RemoveString=Remove string '%s'
 SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
-DirectDownloadLink=Direct download link
-Download=Download
+DirectDownloadLink=Link for direktenedlasning
+Download=Last ned
+ActualizeCurrency=Oppdater valutakurs
+Fiscalyear=Regnskapsår
 # Week day
 Monday=Mandag
 Tuesday=Tirsdag
@@ -787,8 +794,8 @@ SetRef=Sett ref
 Select2ResultFoundUseArrows=Noen resultater funnet. Bruk pilene for å velge
 Select2NotFound=Ingen resultater funnet
 Select2Enter=Tast inn
-Select2MoreCharacter=eller flere karakterer
-Select2MoreCharacters=eller flere tegn
+Select2MoreCharacter=or more characters<br /><br /><strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
+Select2MoreCharacters=or more characters<br /><br /><strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
 Select2LoadingMoreResults=Laster flere resultater...
 Select2SearchInProgress=Søk pågår...
 SearchIntoThirdparties=Tredjeparter
@@ -809,3 +816,5 @@ SearchIntoContracts=Kontrakter
 SearchIntoCustomerShipments=Kundeforsendelser
 SearchIntoExpenseReports=Utgiftsrapporter
 SearchIntoLeaves=Ferier
+
+BulkActions=Bulk actions
diff --git a/htdocs/langs/nb_NO/members.lang b/htdocs/langs/nb_NO/members.lang
index 310cd2f820e..105e3e3c2fd 100644
--- a/htdocs/langs/nb_NO/members.lang
+++ b/htdocs/langs/nb_NO/members.lang
@@ -13,7 +13,7 @@ ListOfValidatedPublicMembers=Liste over godkjente offentlige medlemmer
 ErrorThisMemberIsNotPublic=Dette medlemet er ikke offentlig
 ErrorMemberIsAlreadyLinkedToThisThirdParty=Et annet medlem (navn: <b>%s</b>, innlogging: <b>%s</b>) er allerede koblet til en tredje part <b>%s</b>. Fjern denne lenken først fordi en tredjepart ikke kan knyttes til bare ett medlem (og vice versa).
 ErrorUserPermissionAllowsToLinksToItselfOnly=Av sikkerhetsgrunner må du ha tilgang til å redigere alle brukere for å kunne knytte et medlem til en bruker som ikke er ditt.
-ThisIsContentOfYourCard=Hi.<br><br>This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
+ThisIsContentOfYourCard=Hei.<br><br>Dette er en påminnelse om informasjonen vi får om deg. Ta kontakt hvis noe er feil.<br><br>
 CardContent=Innhold på medlemskortet ditt
 SetLinkToUser=Lenke til en Dolibarr bruker
 SetLinkToThirdParty=Lenke til en Dolibarr tredjepart
@@ -45,7 +45,7 @@ MemberStatusDraft=Utkastl (må valideres)
 MemberStatusDraftShort=Utkast
 MemberStatusActive=Validert (venter abonnement)
 MemberStatusActiveShort=Validert
-MemberStatusActiveLate=abonnement utløpt
+MemberStatusActiveLate=Abonnement utgått
 MemberStatusActiveLateShort=Utløpt
 MemberStatusPaid=Abonnement oppdatert
 MemberStatusPaidShort=Oppdatert
@@ -136,8 +136,8 @@ DocForAllMembersCards=Generer visittkort for alle medlemmer
 DocForOneMemberCards=Generer visittkort for et bestemt medlem
 DocForLabels=Generer adresseark
 SubscriptionPayment=Abonnementsbetaling
-LastSubscriptionDate=Siste abonnementsdato
-LastSubscriptionAmount=Siste tegningsbeløp
+LastSubscriptionDate=Latest subscription date
+LastSubscriptionAmount=Latest subscription amount
 MembersStatisticsByCountries=Medlemsstatistikk etter land
 MembersStatisticsByState=Medlemsstatistikk etter delstat/provins
 MembersStatisticsByTown=Medlemsstatistikk etter by
@@ -149,7 +149,7 @@ MembersByStateDesc=Denne skjermen viser deg statistikk over medlemmer etter omr
 MembersByTownDesc=Denne skjermen viser deg statistikk over medlemmer etter by.
 MembersStatisticsDesc=Velg statistikk du ønsker å lese ...
 MenuMembersStats=Statistikk
-LastMemberDate=Siste medlem dato
+LastMemberDate=Latest member date
 Nature=Natur
 Public=Informasjon er offentlig
 NewMemberbyWeb=Nytt medlem lagt til. Venter på godkjenning
diff --git a/htdocs/langs/nb_NO/oauth.lang b/htdocs/langs/nb_NO/oauth.lang
index 7dc50090786..5be463dd345 100644
--- a/htdocs/langs/nb_NO/oauth.lang
+++ b/htdocs/langs/nb_NO/oauth.lang
@@ -2,15 +2,20 @@
 ConfigOAuth=Oauth Konfigurasjon
 OAuthServices=OAuth tjenester
 ManualTokenGeneration=Manuell nøkkelgenerering
+TokenManager=Nøkkelhåndterer
+IsTokenGenerated=Er nøkkel generert?
 NoAccessToken=Ingen adgangsnøkkel lagret i lokal database
 HasAccessToken=En nøkkel ble generert og lagret i lokal database
 NewTokenStored=Nøkkel mottatt og lagret
-ToCheckDeleteTokenOnProvider=Kontroller/slett autorisasjon lagret av %s OAuth leverandør
+ToCheckDeleteTokenOnProvider=Click here to check/delete authorization saved by %s OAuth provider
 TokenDeleted=Nøkkel slettet
 RequestAccess=Klikk her for forespørsel/fornyet adgang og motta ny nøkkel
 DeleteAccess=Klikk her for å slette nøkkel
 UseTheFollowingUrlAsRedirectURI=Bruk følgende URL som redirect-URL når du lager din legitimasjon hos din OAuth tilbyder
 ListOfSupportedOauthProviders=Legg inn opplysninger fra din OAuth2-leverandør. Kun supporterte OAuth2-leverandører vises her. Dette oppsettet kan bli brukt av andre moduler som trenger OAuth2-autentisering
+OAuthSetupForLogin=Page to generate an OAuth token
+SeePreviousTab=Se forrige fane
+OAuthIDSecret=OAuth ID and Secret
 TOKEN_REFRESH=Nøkkeloppfriskning tilstede
 TOKEN_EXPIRED=Nøkkel utgått
 TOKEN_EXPIRE_AT=Nøkkel utgår
diff --git a/htdocs/langs/nb_NO/orders.lang b/htdocs/langs/nb_NO/orders.lang
index 45d63df68df..b6545b6aa7b 100644
--- a/htdocs/langs/nb_NO/orders.lang
+++ b/htdocs/langs/nb_NO/orders.lang
@@ -39,7 +39,7 @@ StatusOrderRefusedShort=Avvist
 StatusOrderBilledShort=Fakturert
 StatusOrderToProcessShort=Til behandling
 StatusOrderReceivedPartiallyShort=Delvis mottatt
-StatusOrderReceivedAllShort=Alt er mottatt
+StatusOrderReceivedAllShort=Products received
 StatusOrderCanceled=Kansellert
 StatusOrderDraft=Kladd (trenger validering)
 StatusOrderValidated=Validert
@@ -51,7 +51,7 @@ StatusOrderApproved=Godkjent
 StatusOrderRefused=Avvist
 StatusOrderBilled=Fakturert
 StatusOrderReceivedPartially=Delvis mottatt
-StatusOrderReceivedAll=Alt er mottatt
+StatusOrderReceivedAll=All products received
 ShippingExist=En forsendelse eksisterer
 QtyOrdered=Antall bestilt
 ProductQtyInDraft=Varemengde i ordrekladder
@@ -101,7 +101,7 @@ OnProcessOrders=Ordre i behandling
 RefOrder=Ref. ordre
 RefCustomerOrder=Kundens ordrereferanse
 RefOrderSupplier=Leverandørens ordrereferanse
-RefOrderSupplierShort=Ref. order supplier
+RefOrderSupplierShort=Leverandørs ordreref.
 SendOrderByMail=Send ordre med post
 ActionsOnOrder=Handlinger ifm. ordre
 NoArticleOfTypeProduct=Der er ingen varer av typen 'vare' på ordren, så det er ingen varer å sende
diff --git a/htdocs/langs/nb_NO/other.lang b/htdocs/langs/nb_NO/other.lang
index d23550123d6..28b1f6a7468 100644
--- a/htdocs/langs/nb_NO/other.lang
+++ b/htdocs/langs/nb_NO/other.lang
@@ -2,6 +2,7 @@
 SecurityCode=Sikkerhetskode
 NumberingShort=Nr
 Tools=Verktøy
+TMenuTools=Verktøy
 ToolsDesc=Alle andre verktøy som ikke inngår i andre menyoppføringer er samlet her. <br/><br/> Alle verktøyene kan nås i menyen til venstre.
 Birthday=Fødselsdag
 BirthdayDate=Fødselsdag
@@ -67,14 +68,15 @@ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nVedlagt følger f
 PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nVedlagt følger leveranse __SHIPPINGREF__\n\n__PERSONALIZED__med vennlig hilsen\n\n__SIGNATURE__
 PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nVedlagt følger intervensjon __FICHINTERREF__\n\n__PERSONALIZED__med vennlig hilsen\n\n__SIGNATURE__
 PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n__PERSONALIZED__\n\n__SIGNATURE__
-DemoDesc=Dolibarr er en kompakt ERP/CRM som støtter flere funksjonelle moduler. En demoversjon med alle moduler gir ingen mening da dette scenariet aldri skjer. Derfor er flere demoprofiler tilgjengelig.
+DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Velg en demoprofil som passer best til dine krav
+ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
 DemoFundation=Håndtere medlemmer i en organisasjon
 DemoFundation2=Håndtere medlemmer og bankkonti i en organisasjon
-DemoCompanyServiceOnly=Administrer en freelancevirksomhet som kun selger tjenester
+DemoCompanyServiceOnly=Company or freelance selling service only
 DemoCompanyShopWithCashDesk=Administrer en butikk med kontantomsetning/kasse
-DemoCompanyProductAndStocks=Administrer en liten eller mellomstor bedrift som selger varer
-DemoCompanyAll=Administrer en liten eller mellomstor bedrift med mange aktiviteter (alle hovedmoduler)
+DemoCompanyProductAndStocks=Company selling products with a shop
+DemoCompanyAll=Company with multiple activities (all main modules)
 CreatedBy=Laget av %s
 ModifiedBy=Endret av %s
 ValidatedBy=Validertav %s
diff --git a/htdocs/langs/nb_NO/products.lang b/htdocs/langs/nb_NO/products.lang
index 90d2724eaa9..9ce6464242b 100644
--- a/htdocs/langs/nb_NO/products.lang
+++ b/htdocs/langs/nb_NO/products.lang
@@ -5,6 +5,8 @@ ProductLabelTranslated=Oversatt produktetikett
 ProductDescriptionTranslated=Oversatt produktbeskrivelse
 ProductNoteTranslated=Oversatt produktnotat
 ProductServiceCard=Kort for Varer/Tjenester
+TMenuProducts=Varer
+TMenuServices=Tjenester
 Products=Varer
 Services=Tjenester
 Product=Vare
@@ -58,7 +60,7 @@ SellingPrice=Salgspris
 SellingPriceHT=Salgspris (eks. MVA)
 SellingPriceTTC=Salgspris (inkl. MVA)
 CostPriceDescription=Denne prisen (eks. MVA) kan brukes til å lagre det gjennomsnittlige beløpet dette produktet koster din bedrift. Det kan være en hvilken som helst pris du beregner selv, for eksempel fra gjennomsnittlig kjøpskurs pluss gjennomsnittlig produksjon og distribusjonkostnader.
-CostPriceUsage=I senere versjoner, kan denne verdien brukes til å kalkulere marginer.
+CostPriceUsage=This value could be used for margin calculation.
 SoldAmount=Mengde solgt
 PurchasedAmount=Mengde kjøpt
 NewPrice=Ny pris
@@ -140,6 +142,7 @@ ConfirmCloneProduct=Er du sikker på at du vil klone vare eller tjeneste <b>%s</
 CloneContentProduct=Klon alle de viktigste informasjoner av vare/tjeneste
 ClonePricesProduct=Klon viktigste informasjon og priser
 CloneCompositionProduct=Klon komponentvare/tjeneste
+CloneCombinationsProduct=Clone product variants
 ProductIsUsed=Denne varen brukes
 NewRefForClone=Ref. av nye vare/tjeneste
 SellingPrices=Utsalgspris
@@ -236,7 +239,7 @@ GlobalVariables=Globale variabler
 VariableToUpdate=Variabel å oppdatere
 GlobalVariableUpdaters=Oppdatering av globale variabler
 UpdateInterval=Oppdateringsintervall (minutter)
-LastUpdated=Sist oppdatert
+LastUpdated=Latest update
 CorrectlyUpdated=Korrekt oppdatert
 PropalMergePdfProductActualFile=Filer brukt for å legge til i PDF Azur er
 PropalMergePdfProductChooseFile=Velg PDF-filer
@@ -256,4 +259,41 @@ VolumeUnits=Volumenhet
 SizeUnits=Størrelseenhet
 DeleteProductBuyPrice=Slett innkjøpspris
 ConfirmDeleteProductBuyPrice=Er du sikker på at du vil slette denne innkjøpsprisen?
+SubProduct=Sub product
 
+#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
+ProductCombinations=Variants
+HideProductCombinations=Hide products variant in the products selector
+ProductCombination=Variant
+NewProductCombination=New variant
+EditProductCombination=Editing variant
+ProductCombinationGenerator=Variants generator
+Features=Features
+PriceImpact=Price impact
+WeightImpact=Weight impact
+NewProductAttribute=Ny attributt
+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
+PercentageVariation=Percentage variation
+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 child products
+ConfirmCloneProductCombinations=Would you like to copy all the product variant to the 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
diff --git a/htdocs/langs/nb_NO/projects.lang b/htdocs/langs/nb_NO/projects.lang
index 9c4cef4cab0..fc9c1921677 100644
--- a/htdocs/langs/nb_NO/projects.lang
+++ b/htdocs/langs/nb_NO/projects.lang
@@ -29,9 +29,9 @@ DeleteAProject=Slett et prosjekt
 DeleteATask=Slett en oppgave
 ConfirmDeleteAProject=Er du sikker på at du vil slette dette prosjektet?
 ConfirmDeleteATask=Er du sikker på at du vil slette denne oppgaven?
-OpenedProjects=Åpne prosjekter
-OpenedTasks=Åpne oppgaver
-OpportunitiesStatusForOpenedProjects=Mulighet-beløp på åpne prosjekter etter status
+OpenedProjects=Åpnede prosjekter
+OpenedTasks=Åpnede oppgaver
+OpportunitiesStatusForOpenedProjects=Beløp på muligheter i åpnede prosjekter, etter status
 OpportunitiesStatusForProjects=Mulighet - beløp på prosjekter etter status
 ShowProject=Vis prosjekt
 SetProject=Sett prosjekt
@@ -47,7 +47,7 @@ TaskTimeSpent=Tid brukt på oppgaver
 TaskTimeUser=Bruker
 TaskTimeNote=Notat
 TaskTimeDate=Dato
-TasksOnOpenedProject=Oppgaver i åpne prosjekter
+TasksOnOpenedProject=Tasks on opened projects
 WorkloadNotDefined=Arbeidsmengde ikke definert
 NewTimeSpent=Ny tid brukt
 MyTimeSpent=Mitt tidsforbruk
@@ -58,6 +58,7 @@ TaskDateEnd=Oppgave sluttdato
 TaskDescription=Oppgave beskrivelse
 NewTask=Ny oppgave
 AddTask=Opprett oppgave
+AddTimeSpent=Opprett tidsforbruk
 Activity=Aktivitet
 Activities=Oppgaver/aktiviteter
 MyActivities=Mine oppgaver/aktiviteter
@@ -95,6 +96,7 @@ ValidateProject=Valider prosjekt
 ConfirmValidateProject=Er du sikker på at du vil validere dette prosjektet?
 CloseAProject=Lukk prosjektet
 ConfirmCloseAProject=Er du sikker på at du vil lukke dette prosjektet?
+AlsoCloseAProject=Also close project (keep it open if you still need to follow production tasks on it)
 ReOpenAProject=Åpne prosjekt
 ConfirmReOpenAProject=Er du sikker på at du vil gjenåpne dette prosjektet?
 ProjectContact=Prosjekt kontakter
@@ -120,7 +122,7 @@ CloneProjectFiles=Klon prosjekt-tilknyttede filer
 CloneTaskFiles=Klon oppgave-tilknyttede fil(er) (hvis oppgave(r) er klonet)
 CloneMoveDate=Oppdater prosjekter/oppgaver fra nå?
 ConfirmCloneProject=Er du sikker på at du vil klone dette prosjektet?
-ProjectReportDate=Endre oppgave-dato til prosjekt-startdato
+ProjectReportDate=Change task dates according to new project start date
 ErrorShiftTaskDate=Kan ikke skifte oppgave-dato etter nytt prosjekt-startdato
 ProjectsAndTasksLines=Prosjekter og oppgaver
 ProjectCreatedInDolibarr=Prosjekt %s opprettet
@@ -177,7 +179,7 @@ ProjectsStatistics=Statistikk over muligheter
 TaskAssignedToEnterTime=Oppgave tildelt. Tidsbruk kan legges til
 IdTaskTime=Oppgave-tid ID
 YouCanCompleteRef=Hvis du ønsker å tilføre referansen med litt informasjon (for å bruke det som søkefiltre ), er det anbefalt å legge til et - tegn for å skille den, så den automatiske nummereringen fortsatt fungerer korrekt for neste prosjekt. For eksempel %s-ABC. Du kan også foretrekke å legge søkenøkler til etiketten. Men beste praksis kan være å legge et dedikert felt, også kalt komplementære egenskaper.
-OpenedProjectsByThirdparties=Åpne prosjekter etter tredjeparter
+OpenedProjectsByThirdparties=Prosjekter åpnet av tredjeparter
 OnlyOpportunitiesShort=Kun muligheter
 OpenedOpportunitiesShort=Åpne muligheter
 NotAnOpportunityShort=Ikke en mulighet
diff --git a/htdocs/langs/nb_NO/propal.lang b/htdocs/langs/nb_NO/propal.lang
index 7144670ab55..12d324924bb 100644
--- a/htdocs/langs/nb_NO/propal.lang
+++ b/htdocs/langs/nb_NO/propal.lang
@@ -3,7 +3,7 @@ Proposals=Tilbud
 Proposal=Tilbud
 ProposalShort=Tilbud
 ProposalsDraft=Tilbudskladder
-ProposalsOpened=Åpne tilbud
+ProposalsOpened=Åpnede tilbud
 Prop=Tilbud
 CommercialProposal=Tilbud
 ProposalCard=Tilbudskort
@@ -26,9 +26,9 @@ AmountOfProposalsByMonthHT=Tilbudsbeløp pr måned (eksl. MVA)
 NbOfProposals=Antall tilbud
 ShowPropal=Vis tilbud
 PropalsDraft=Kladder
-PropalsOpened=Åpent
+PropalsOpened=Åpnet
 PropalStatusDraft=Kladd (trenger validering)
-PropalStatusValidated=Godkjent (tilbudet er åpent)
+PropalStatusValidated=Validated (proposal is opened)
 PropalStatusSigned=Akseptert(kan faktureres)
 PropalStatusNotSigned=Ikke akseptert(lukket)
 PropalStatusBilled=Fakturert
diff --git a/htdocs/langs/nb_NO/stocks.lang b/htdocs/langs/nb_NO/stocks.lang
index c6a9848c759..6c00292f6e2 100644
--- a/htdocs/langs/nb_NO/stocks.lang
+++ b/htdocs/langs/nb_NO/stocks.lang
@@ -22,13 +22,15 @@ Movements=Bevegelser
 ErrorWarehouseRefRequired=Du må angi et navn på lageret
 ListOfWarehouses=Oversikt over lagre
 ListOfStockMovements=Oversikt over bevegelser
+StockMovementForId=Movement ID %d
+ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Område for lager
 Location=Lokasjon
 LocationSummary=Kort navn på lokasjon
 NumberOfDifferentProducts=Antall forskjellige varer
 NumberOfProducts=Totalt antall varer
-LastMovement=Siste bevegelse
-LastMovements=Siste bevegelser
+LastMovement=Latest movement
+LastMovements=Latest movements
 Units=Enheter
 Unit=Enhet
 StockCorrection=Korriger lagerbeholdning
@@ -140,3 +142,4 @@ ProductStockWarehouseCreated=Varsel for nedre og ønsket varebeholdning opprette
 ProductStockWarehouseUpdated=Varsel for nedre og ønsket varebeholdning oppdatert
 ProductStockWarehouseDeleted=Varsel for nedre og ønsket varebeholdning slettet
 AddNewProductStockWarehouse=Sett ny grense for nedre og ønsket varebeholdning 
+AddStockLocationLine=Decrease quantity then click to add another warehouse for this product
diff --git a/htdocs/langs/nb_NO/supplier_proposal.lang b/htdocs/langs/nb_NO/supplier_proposal.lang
index 689f5816e72..f1c9df0c25e 100644
--- a/htdocs/langs/nb_NO/supplier_proposal.lang
+++ b/htdocs/langs/nb_NO/supplier_proposal.lang
@@ -8,7 +8,7 @@ SearchRequest=Finn en forspørsel
 DraftRequests=Forespørsel-kladder
 SupplierProposalsDraft=Leverandørtilbud-maler
 LastModifiedRequests=Siste %s endrede prisforespørsler
-RequestsOpened=Åpne prisforespørsler
+RequestsOpened=Opened price requests
 SupplierProposalArea=Område for leverandørtilbud
 SupplierProposalShort=Leverandørtilbud
 SupplierProposals=Leverandørtilbud
@@ -23,7 +23,7 @@ ConfirmValidateAsk=Er du sikker på at du vil validere prisforespørsel <b>%s</b
 DeleteAsk=Slett forespørsel
 ValidateAsk=Valider forespørsel
 SupplierProposalStatusDraft=Kladd (må valideres)
-SupplierProposalStatusValidated=Validert (forespørsel er åpen)
+SupplierProposalStatusValidated=Validated (request is opened)
 SupplierProposalStatusClosed=Lukket
 SupplierProposalStatusSigned=Akseptert
 SupplierProposalStatusNotSigned=Avvist
diff --git a/htdocs/langs/nb_NO/suppliers.lang b/htdocs/langs/nb_NO/suppliers.lang
index b1b15834081..fa462f1baf1 100644
--- a/htdocs/langs/nb_NO/suppliers.lang
+++ b/htdocs/langs/nb_NO/suppliers.lang
@@ -41,3 +41,4 @@ DoNotOrderThisProductToThisSupplier=Ikke bestill
 NotTheGoodQualitySupplier=Feil kvalitet
 ReputationForThisProduct=Rykte
 BuyerName=Kjøpernavn
+AllProductServicePrices=All product / service prices
diff --git a/htdocs/langs/nb_NO/trips.lang b/htdocs/langs/nb_NO/trips.lang
index 88aac1a4a90..a9297977a60 100644
--- a/htdocs/langs/nb_NO/trips.lang
+++ b/htdocs/langs/nb_NO/trips.lang
@@ -21,7 +21,17 @@ ListToApprove=Venter på godkjenning
 ExpensesArea=Område for reiseregninger
 ClassifyRefunded=Klassifisert 'refundert'
 ExpenseReportWaitingForApproval=En ny reiseregning er sendt inn for godkjenning
-ExpenseReportWaitingForApprovalMessage=En ny reiseregning er sendt inn og venter på godkjenning.\n- Bruker: %s\n- Periode: %s\nKlikk her for å godkjenne: %s
+ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n - User: %s\n - Period: %s\nClick here to validate: %s
+ExpenseReportWaitingForReApproval=An expense report has been submitted for re-approval
+ExpenseReportWaitingForReApprovalMessage=An expense report has been submitted and is waiting for re-approval.\nThe %s, you refused to approve the expense report for this reason: %s.\nA new version has been proposed and waiting for your approval.\n - User: %s\n - Period: %s\nClick here to validate: %s
+ExpenseReportApproved=En utgiftsrapport ble godkjent
+ExpenseReportApprovedMessage=Utgiftrapport %s ble godkjent.\n- Bruker: %s\n- Godkjent av: %s\nKlikk her for å vise utgiftsrapporten: %s
+ExpenseReportRefused=En utgiftsrapport ble avvist
+ExpenseReportRefusedMessage=Utgiftrapport %s ble avvist.\n- Bruker: %s\n- Avvist av: %s\n- Årsak for avvisning:%s\nKlikk her for å vise utgiftsrapporten: %s
+ExpenseReportCanceled=En utgiftsrapport ble kansellert
+ExpenseReportCanceledMessage=Utgiftrapport %s ble kansellert.\n- Bruker: %s\n- Kansellert av: %s\n- Årsak til kansellering: %s\nKlikk her for å vise utgiftsrapporten: %s
+ExpenseReportPaid=En utgiftsrapport ble betalt
+ExpenseReportPaidMessage=Utgiftrapport %s ble betalt.\n- Bruker: %s\n- Betalt av: %s\nKlikk her for å vise utgiftsrapporten: %s
 TripId=Reiseregnings - ID
 AnyOtherInThisListCanValidate=Person som skal informeres for godkjenning
 TripSociete=Firmainformasjon
@@ -59,31 +69,23 @@ DATE_REFUS=Avvist dato
 DATE_SAVE=Godkjennelsesdato
 DATE_CANCEL=Kansellert dato
 DATE_PAIEMENT=Betalt dato
-
 BROUILLONNER=Gjenåpne
 ValidateAndSubmit=Valider og send til godkjenning
 ValidatedWaitingApproval=Validert (venter på godkjenning)
-
 NOT_AUTHOR=Reiseregningener ikke opprettet av deg. Operasjonen avbrutt.
-
 ConfirmRefuseTrip=Er du sikker på at du vil avvise denne utgiftsrapporten?
-
 ValideTrip=Godkjenn reiseregning
 ConfirmValideTrip=Er du sikker på at du vil godkjenne denne utgiftsrapporten?
-
 PaidTrip=Betal en reiseregning
 ConfirmPaidTrip=Er du sikker på at du vil endre status på denne utgiftsrapporten til "betalt"?
-
 ConfirmCancelTrip=Er du sikker på at du vil kansellere denne utgiftsrapporten?
-
 BrouillonnerTrip=Endre reiseregning til "kladd"
 ConfirmBrouillonnerTrip=Er du sikker på at du vil endre status på denne utgiftsrapporten til "utkast"?
-
 SaveTrip=Godkjenn reiseregning
 ConfirmSaveTrip=Er du sikker på at du vil validere denne utgiftsrapporten?
-
 NoTripsToExportCSV=Ingen reiseregning å eksportere for denne perioden
 ExpenseReportPayment=Betaling av utgiftsrapport
-
 ExpenseReportsToApprove=Utgiftsrapporter for godkjenning
 ExpenseReportsToPay=Utgiftsrapport å betale
+CloneExpenseReport=Klon utgiftsrapport
+ConfirmCloneExpenseReport=Er du sikker på at du vil klone denne utgiftsrapporten?
diff --git a/htdocs/langs/nb_NO/withdrawals.lang b/htdocs/langs/nb_NO/withdrawals.lang
index cb9f0757ecb..0aca4764afc 100644
--- a/htdocs/langs/nb_NO/withdrawals.lang
+++ b/htdocs/langs/nb_NO/withdrawals.lang
@@ -23,7 +23,8 @@ WithdrawalsSetup=Oppsett av direktedebetsbetalinger
 WithdrawStatistics=Statistikk over direktedebetsbetalinger
 WithdrawRejectStatistics=Statistikk over avviste direktedebetsbetalinger
 LastWithdrawalReceipt=Siste %s direktedebetskvitteringer
-MakeWithdrawRequest=Opprett en forespørsel om tilbakekalling
+MakeWithdrawRequest=Make a direct debit payment request
+WithdrawRequestsDone=%s direct debit payment requests recorded
 ThirdPartyBankCode=Tredjepartens bankkonto
 NoInvoiceCouldBeWithdrawed=Ingen faktura tilbakekalt. Sjekk at faktura er på firmaer med gyldig BAN.
 ClassCredited=Klassifiser som kreditert
@@ -76,8 +77,8 @@ RUM=UMR
 RUMLong=Unik Mandat Referanse
 RUMWillBeGenerated=UMR.nummer vil bli generert når bankkonto-informasjon er lagret
 WithdrawMode=Direktedebetsmodus (FRST eller RECUR)
-WithdrawRequestAmount=Beløp på tilbaketrekkingsforespørsel
-WithdrawRequestErrorNilAmount=Kan ikke lage tilbaketrekkingsforespørsel ved null-beløp
+WithdrawRequestAmount=Amount of Direct debit request:
+WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty amount.
 SepaMandate=SEPA Direktedebet mandat
 SepaMandateShort=SEPA-Mandat
 PleaseReturnMandate=Vennligst returner dette mandatskjemaet via epost til %s eller med post til
diff --git a/htdocs/langs/nl_BE/accountancy.lang b/htdocs/langs/nl_BE/accountancy.lang
index 4ebecd4b78a..2c832e27ab6 100644
--- a/htdocs/langs/nl_BE/accountancy.lang
+++ b/htdocs/langs/nl_BE/accountancy.lang
@@ -9,16 +9,17 @@ ConfigAccountingExpert=Configuratie van de module boekhouding expert
 Journaux=Dagboeken
 JournalFinancial=Financiële dagboeken
 BackToChartofaccounts=Geef kaart van accounts terug
-Selectchartofaccounts=Selecteer een kaart van accounts
+MenuAccountancy=Boekhouding
 Addanaccount=Voeg een boekhouder account toe
 AccountAccounting=Boekhouder account
-AccountAccountingSuggest=Boekhouder account voorstel
+AccountAccountingShort=Rekening
 Bookkeeping=Grootboek
 CAHTF=Totaal leveranciersaankoop voor BTW
 Processing=Verwerken
-EndProcessing=Einde van het verwerkingsprocess
 SelectedLines=Geselecteerde lijnen
 Lineofinvoice=Factuur lijn
+Docdate=Datum
+Docref=Artikelcode
 TotalVente=Totaal omzet voor belastingen
 Modelcsv=Model van een export
 OptionsDeactivatedForThisExportModel=Voor dit export model zijn de opties gedeactiveerd.
diff --git a/htdocs/langs/nl_BE/admin.lang b/htdocs/langs/nl_BE/admin.lang
index bc7d5897a37..5ccd2a2a17d 100644
--- a/htdocs/langs/nl_BE/admin.lang
+++ b/htdocs/langs/nl_BE/admin.lang
@@ -1,2 +1,4 @@
 # Dolibarr language file - Source file is en_US - admin
+SubmitTranslationENUS=Als de vertaling voor deze taal niet volledig is of een fout bevat, dan kunt u dit corrigeren door het bewuste taalbestand in de map <b>Langs/%s</b> te wijzigen en de wijzigingen op het Dolibarr forum te delen met anderen: www.dolibarr.org.
 ModuleFamilyHr=Personeelszaken (HR)
+ExtrafieldPassword=Paswoord
diff --git a/htdocs/langs/nl_BE/bills.lang b/htdocs/langs/nl_BE/bills.lang
index 99b27783e96..9dc442ac8f1 100644
--- a/htdocs/langs/nl_BE/bills.lang
+++ b/htdocs/langs/nl_BE/bills.lang
@@ -1,5 +1,6 @@
 # Dolibarr language file - Source file is en_US - bills
-BillsCustomers=Klantenfacturen
+BillsCustomers=Klant facturen
+BillsSuppliers=Leverancier facturen
 DisabledBecauseNotErasable=Niet mogelijk omdat het niet kan worden gewist
 IdPaymentMode=Betalingsmanier (id)
 LabelPaymentMode=Betalingsmanier (label)
@@ -8,7 +9,6 @@ CreateCreditNote=Aanmaak krediet nota
 StatusOfGeneratedInvoices=Lijst van genereerde facturen
 BillStatusDraft=Conceptfactuur (moet worden gevalideerd)
 BillShortStatusClosedUnpaid=Afgesloten
-CustomersDraftInvoices=Klantenconceptfacturen
 ShowInvoiceSituation=Toon situatie factuur
 RemainderToBill=Nog te factureren
 DateMaxPayment=Te betalen vóór
diff --git a/htdocs/langs/nl_BE/companies.lang b/htdocs/langs/nl_BE/companies.lang
index ab4417ce78f..989b17320a9 100644
--- a/htdocs/langs/nl_BE/companies.lang
+++ b/htdocs/langs/nl_BE/companies.lang
@@ -31,5 +31,5 @@ ImportDataset_company_4=Derde partij/Verkoopsverantwoordelijke (Affecteert verko
 ProductsIntoElements=Lijst van producten/diensten in %s
 MergeOriginThirdparty=Kopieer derde partij (derde partij die je wil verwijderen)
 MergeThirdparties=Voeg derde partijen samen
-ConfirmMergeThirdparties=Bent u zeker dat u deze derde partij wil samenvoegen met de huidige ? Alle gekoppelde objecten (facturen, orders, ...) worden verplaatst naar de huidige derde partij zodat u de gedupliceerde kan verwijderen.
 ThirdpartiesMergeSuccess=Derde partijen werden samen gevoegd.
+ErrorThirdpartiesMerge=Er was een fout tijdens het verwijderen van derde partijen. controleer het logboek. Aanpassingen werden teruggezet.
diff --git a/htdocs/langs/nl_BE/compta.lang b/htdocs/langs/nl_BE/compta.lang
index ac28be99ab3..85b92a9942f 100644
--- a/htdocs/langs/nl_BE/compta.lang
+++ b/htdocs/langs/nl_BE/compta.lang
@@ -34,13 +34,11 @@ RulesCADue=- Dit omvat de verschuldigde afnemersfacturen, betaald of niet. <br>-
 RulesCAIn=- Dit omvat alle effectieve betalingen van afnemersfacturen.<br>- Het is gebaseerd op de betaaldatum van deze facturen<br>
 VATReport=BTW rapport
 WarningDepositsNotIncluded=Deposito facturen worden niet opgenomen in deze versie met deze boekhoudmodule.
-ACCOUNTING_VAT_SOLD_ACCOUNT=Standaard boekhoudkundige code voor ontvangen BTW (BTW op verkoop)
-ACCOUNTING_VAT_BUY_ACCOUNT=Standaard boekhoudkundige code voor teruggetrokken BTW (BTW op aankopen)
 CloneTax=Kopieer een sociale bijdrage/belasting
 ConfirmCloneTax=Bevestig kopie van betaling sociale bijdrage/belasting
 SimpleReport=Eenvoudig rapport
-AddExtraReport=Extra rapporten
 OtherCountriesCustomersReport=Buitenlands klantenrapport
 BasedOnTwoFirstLettersOfVATNumberBeingDifferentFromYourCompanyCountry=Gebaseerd op de eerste 2 letters van het BTW-nummer, anders dan die van uw eigen landcode
 SameCountryCustomersWithVAT=Nationaal klantenrapport
 BasedOnTwoFirstLettersOfVATNumberBeingTheSameAsYourCompanyCountry=Gebaseerd op de eerste 2 letters van het BTW-nummer, overeenkomstig met die van uw eigen landcode
+ImportDataset_tax_contrib=Sociale bijdragen/belastingen
diff --git a/htdocs/langs/nl_BE/mails.lang b/htdocs/langs/nl_BE/mails.lang
index 20dd4bfc777..76be83cdd13 100644
--- a/htdocs/langs/nl_BE/mails.lang
+++ b/htdocs/langs/nl_BE/mails.lang
@@ -5,7 +5,6 @@ ResultOfMailSending=Resultaat van massa EMail versturen
 NbSelected=Nr geselecteerd
 NbIgnored=Nr genegeerd
 NbSent=Nr verstuurd
-LastMailings=Laatste %s E-mailings
 SearchAMailing=Zoek een E-mailing
 SendMailing=Verzend E-mailing
 AddNewNotification=Activeer een niewe e-mail notificatie doel
diff --git a/htdocs/langs/nl_BE/main.lang b/htdocs/langs/nl_BE/main.lang
index 6aff57a176f..ae55704fe49 100644
--- a/htdocs/langs/nl_BE/main.lang
+++ b/htdocs/langs/nl_BE/main.lang
@@ -20,20 +20,30 @@ FormatDateHourSecShort=%d/%m/%Y %I:%M:%S %p
 FormatDateHourTextShort=%d %b %Y %H:%M
 FormatDateHourText=%d %B %Y %H:%M
 NoTemplateDefined=Geen model gedefinieerd voor dit email type
+NoRecordFound=Geen record gevonden
+ErrorFileNotUploaded=Bestand is niet geüpload. Controleer of de grootte niet meer is dan maximaal toegestaan, of er vrije ruimte beschikbaar is op de schijf en of er niet al een bestand met dezelfde naam in deze map bestaat.
+ErrorWrongHostParameter=Verkeerde host instelling
+ErrorRecordIsUsedByChild=Tabelregel verwijderen mislukt. Deze tabelregel wordt gebruikt door ten minste een onderliggend tabelregel.
 NotAuthorized=U bent niet toegelaten om dat te doen.
+FileWasNotUploaded=Een bestand is geselecteerd als bijlage, maar is nog niet geupload. Klik hiervoor op "Bevestig dit bestand".
+GoToHelpPage=Contacteer helpdesk
+RecordSaved=Tabelregel opgeslagen
+RecordDeleted=Record verwijderd
 NoFilter=Geen filter
 DateToday=Datum van vandaag
 DateReference=Referentie datum
+DateStart=Start datum
+DateEnd=Eind datum
 DateCreationShort=Aanmaak datum
 YouCanSetDefaultValueInModuleSetup=Je kan de standaard waarde gebruiken wanneer je een nieuw record plaatst in de module setup
 SetLinkToAnotherThirdParty=Link naar een derde partij
 SelectAction=Selecteer actie
-ShowTransaction=Toon transactie op bankrekening
 Deny=Weigeren
 Denied=Geweigerd
 Sincerely=Met vriendelijke groeten
 DeleteLine=Verwijder lijn
-ConfirmDeleteLine=Weet u zeker dat u deze lijn wilt verwijderen?
+ClassifyBilled=Wijzig Status naar "gefactureerd"
+Exports=Exporten
 Select2NotFound=Geen resultaten gevonden
 Select2LoadingMoreResults=Laden van meer resultaten...
 Select2SearchInProgress=Zoeken is aan de gang...
diff --git a/htdocs/langs/nl_BE/orders.lang b/htdocs/langs/nl_BE/orders.lang
index 981655b2d4d..06646b9a678 100644
--- a/htdocs/langs/nl_BE/orders.lang
+++ b/htdocs/langs/nl_BE/orders.lang
@@ -13,6 +13,7 @@ SuppliersOrdersToProcess=Nog te verwerken leveranciersbestellingen
 StatusOrderDraftShort=Ontwerp bestelling
 StatusOrderSentShort=In uitvoering
 StatusOrderDelivered=Geleverd
+StatusOrderDeliveredShort=Geleverd
 UnvalidateOrder=Maak validatie bestelling ongedaan
 OrderReopened=Bestelling %s heropend
 NoOrder=Geen order
diff --git a/htdocs/langs/nl_BE/other.lang b/htdocs/langs/nl_BE/other.lang
index f02f2c9c642..b1d06de55b8 100644
--- a/htdocs/langs/nl_BE/other.lang
+++ b/htdocs/langs/nl_BE/other.lang
@@ -5,3 +5,6 @@ PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe willen U waars
 PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nHierbij vindt U de prijs offerte  __ASKREF__\n\n__PERSONALIZED__Met oprechte groeten\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nHierbij vindt U de factuur __REF__\n\n__PERSONALIZED__Met oprechte groeten\n\n__SIGNATURE__
 FileIsTooBig=Bestanden zijn te groot
+WebsiteSetup=Setup van de module website
+WEBSITE_PAGEURL=URL van de pagina
+WEBSITE_KEYWORDS=Trefwoorden
diff --git a/htdocs/langs/nl_BE/products.lang b/htdocs/langs/nl_BE/products.lang
index dbb8601323c..70da9583209 100644
--- a/htdocs/langs/nl_BE/products.lang
+++ b/htdocs/langs/nl_BE/products.lang
@@ -8,6 +8,5 @@ OnBuy=Te koop
 NotOnSell=Niet meer beschikbaar
 ProductStatusNotOnSell=Niet meer verkrijgbaar
 ProductStatusOnSellShort=Te koop
-AssociatedProductsAbility=Activeer package
 ProductSellByQuarterHT=Bruto omzetcijfer per trimester
 ServiceSellByQuarterHT=Bruto omzetcijfer per trimester
diff --git a/htdocs/langs/nl_BE/propal.lang b/htdocs/langs/nl_BE/propal.lang
index 00312ddf80f..93c1c0f9a90 100644
--- a/htdocs/langs/nl_BE/propal.lang
+++ b/htdocs/langs/nl_BE/propal.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - propal
-ProposalsOpened=Openstaande offertes
 CreateEmptyPropal=Creëer een lege offerte uit de lijst van producten / diensten
 TypeContact_propal_internal_SALESREPFOLL=Vertegenwoordiger die de offerte opvolgt
 TypeContact_propal_external_BILLING=Contactpersoon afnemersfactuur
diff --git a/htdocs/langs/nl_BE/supplier_proposal.lang b/htdocs/langs/nl_BE/supplier_proposal.lang
index 9f6a1c4ade2..042e7535652 100644
--- a/htdocs/langs/nl_BE/supplier_proposal.lang
+++ b/htdocs/langs/nl_BE/supplier_proposal.lang
@@ -1,3 +1,7 @@
 # Dolibarr language file - Source file is en_US - supplier_proposal
 SupplierProposals=Leverancier voorstellen
+SupplierProposalsShort=Leverancier voorstellen
+SupplierProposalStatusDraft=Conceptfactuur (moet worden gevalideerd)
+SupplierProposalStatusClosed=Afgesloten
 SupplierProposalStatusDraftShort=Concept
+SupplierProposalStatusClosedShort=Afgesloten
diff --git a/htdocs/langs/nl_BE/suppliers.lang b/htdocs/langs/nl_BE/suppliers.lang
deleted file mode 100644
index 4f72c0f87a1..00000000000
--- a/htdocs/langs/nl_BE/suppliers.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - suppliers
-TotalBuyingPriceMinShort=Totaal van aankoopprijzen subproducten
diff --git a/htdocs/langs/nl_NL/accountancy.lang b/htdocs/langs/nl_NL/accountancy.lang
index 27357103527..ebcac1f50a5 100644
--- a/htdocs/langs/nl_NL/accountancy.lang
+++ b/htdocs/langs/nl_NL/accountancy.lang
@@ -194,6 +194,8 @@ ChangeBinding=Change the binding
 
 ## Admin
 ApplyMassCategories=Apply mass categories
+AddAccountFromBookKeepingWithNoCategories=Add acccount already used with no categories
+CategoryDeleted=Category for the accounting account has been removed
 
 ## Export
 Exports=Export
@@ -209,6 +211,7 @@ Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution
 Modelcsv_quadratus=Export towards Quadratus QuadraCompta
 Modelcsv_ebp=Export towards EBP
 Modelcsv_cogilog=Export towards Cogilog
+ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
 InitAccountancy=Init accountancy
diff --git a/htdocs/langs/nl_NL/admin.lang b/htdocs/langs/nl_NL/admin.lang
index 337bf56cf38..eba7714d19b 100644
--- a/htdocs/langs/nl_NL/admin.lang
+++ b/htdocs/langs/nl_NL/admin.lang
@@ -9,14 +9,20 @@ VersionDevelopment=Ontwikkeling
 VersionUnknown=Onbekend
 VersionRecommanded=Aanbevolen
 FileCheck=Files integrity checker
-FileCheckDesc=This tool allows you to check the integrity of files of your application, comparing each files with the official ones. You can use this tool to detect if some files were modified by a hacker for example.
+FileCheckDesc=This tool allows you to check the integrity of files and setup of your application, comparing each files with the official ones. 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.
+FileIntegrityIsStrictlyConformedWithReference=Files integrity is strictly conformed with the reference.
+FileIntegrityIsOkButFilesWereAdded=Files integrity check has passed, however some new files were added.
+FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified, removed or added.
+GlobalChecksum=Global checksum
 MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
 LocalSignature=Embedded local signature (less reliable)
 RemoteSignature=Remote distant signature (more reliable)
 FilesMissing=Ontbrekende bestanden
 FilesUpdated=Bijgewerkte bestanden
+FilesModified=Modified Files
+FilesAdded=Added Files
 FileCheckDolibarr=Check integrity of application files
-AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from a certified package
+AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from an official package
 XmlNotFound=Xml Integrity File of application not found
 SessionId=Sessie-ID
 SessionSaveHandler=Wijze van sessieopslag
@@ -185,7 +191,9 @@ BoxesDesc=Widgets are components showing some information that you can add to pe
 OnlyActiveElementsAreShown=Alleen elementen van ingeschakelde <a href="%s">modules</a> worden getoond.
 ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
-ModulesMarketPlaces=Meer modules
+ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
+ModulesMarketPlaces=Find external modules...
+GoModuleSetupArea=To deploy/install a new module, go onto the Module setup area at <a href="%s">%s</a>.
 DoliStoreDesc=DoliStore, de officiële markt voor externe Dolibarr ERP / CRM modules
 DoliPartnersDesc=List of companies providing custom developed modules or features (Note: anyone experienced in PHP programming can provide custom development for an open source project)
 WebSiteDesc=Reference websites to find more modules...
@@ -276,21 +284,22 @@ ModuleFamilyInterface=Interfaces with external systems
 MenuHandlers=Menuverwerkers
 MenuAdmin=Menu wijzigen
 DoNotUseInProduction=Niet in productie gebruiken
-ThisIsProcessToFollow=Dit is ingesteld op de verwerking van:
-ThisIsAlternativeProcessToFollow=Dit is een alternatieve instelling te verwerken:
+ThisIsProcessToFollow=This is steps to process:
+ThisIsAlternativeProcessToFollow=This is an alternative setup to process manually:
 StepNb=Stap %s
 FindPackageFromWebSite=Vind een pakket die u de functionaliteit geeft die u wilt (bijvoorbeeld op de officiële website van %s).
 DownloadPackageFromWebSite=Download het pakket (voorbeeld vanaf de officiële web site %s).
-UnpackPackageInDolibarrRoot=Pak bestand uit op de Dolibarr server directorie toegewezen aan de externe modules: <b>%s</b>
-SetupIsReadyForUse=Installatie is voltooid en Dolibarr is gereed voor het gebruik van de nieuwe functionaliteit.
-NotExistsDirect=De alternatieve root directory is niet bepaald.<br>
-InfDirAlt=Vanaf versie 3 is het mogelijk om een alternatieve root directory te definiëren.  Dit laat je toe om op dezelfde plaats zowel plug-ins als eigen templates te bewaren. <br>Maak gewoon een directory op het niveau van de root van Dolibarr (bv met de naam: aanpassing).<br>
-InfDirExample=<br>Kondig die dan aan in het bestand conf.php<br> $dolibarr_main_url_root_alt='http://myserver/aanpassing'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/aanpassing'<br>*Deze lijnen zijn inactief gemaakt met een "#" teken, verwijder dat teken om ze te aktiveren.
+UnpackPackageInDolibarrRoot=Unpack the packaged files into server directory dedicated to Dolibarr: <b>%s</b>
+UnpackPackageInModulesRoot=To deploy/install an external module, unpack the packaged files into the server directory dedicated to modules: <b>%s</b>
+SetupIsReadyForUse=Module deployment is finished. You must however enable and setup the module in your application by going on the page to setup modules: <a href="%s">%s</a>.
+NotExistsDirect=The alternative root directory is not defined to an existing directory.<br>
+InfDirAlt=Since version 3, it is possible to define an alternative root directory. This allows you to store, into a dedicated directory, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
+InfDirExample=<br>Then declare it in the file <strong>conf.php</strong><br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>If these lines are commented with "#", to enable them, just uncomment by removing the "#" character.
 YouCanSubmitFile=Voor deze stap, kan je het pakket versturen gebruikmakend van dit hulpmiddel: Selecteer module bestand
 CurrentVersion=Huidige versie van Dolibarr
 CallUpdatePage=Go to the page that updates the database structure and data: %s.
 LastStableVersion=Latest stable version
-LastActivationDate=Last activation date
+LastActivationDate=Latest activation date
 UpdateServerOffline=Updateserver offline
 GenericMaskCodes=U kunt elk gewenst maskernummer invoeren. In dit masker, kunnen de volgende tags worden gebruikt:<br><b>{000000}</b> correspondeert met een nummer welke vermeerderd zal worden op elke %s. Voer zoveel nullen in als de gewenste lengte van de teller. De teller wordt aangevuld met nullen vanaf links zodat er zoveel nullen zijn als in het masker.<br><b>{000000+000}</b> hetzelfde als voorgaand maar een offset corresponderend met het nummer aan de rechterkant van het + teken is toegevoegd startend op de eerste %s. <br><b>{000000@x}</b> hetzelfde als voorgaande maar de teller wordt gereset naar nul, wanneer maand x is bereikt (x tussen 1 en 12). Als deze optie is gebruikt en x is 2 of hoger, dan is de volgorde {yy}{mm} of {yyyy}{mm} ook vereist. <br><b>{dd}</b> dag (01 t/m 31).<br><b>{mm}</b> maand (01 t/m 12).<br><b>{yy}</b>, <b>{yyyy}</b> of <b>{y}</b> jaat over 2, 4 of 1 nummer(s). <br>
 GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
@@ -373,11 +382,11 @@ ExtrafieldCheckBox=Aanvink-vak
 ExtrafieldRadio=Radioknop
 ExtrafieldCheckBoxFromList= Checkbox from table
 ExtrafieldLink=Link naar een object
-ExtrafieldParamHelpselect=Parameterlijsten hebben de waarden sleutel,waarde<br><br> bijvoorbeeld: <br>1,waarde1<br>2,waarde2<br>3,waarde3<br>...<br><br>Voor een afhankelijke lijst:<br>1,waarde1|parent_list_code:parent_key<br>2,waarde2|parent_list_code:parent_key
+ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list :<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list :<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=Een parameterlijst heeft de waarden sleutel,waarde<br><br> bijvoorbeeld: <br>1,waarde1<br>2,waarde2<br>3,waarde3<br>...<br><br>
 ExtrafieldParamHelpradio=Lijst van parameters moet bestaan uit sleutel,waarde<br><br>bv:<br>1,waarde<br>2,waarde2<br>3,waarde3<br>...
-ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
-ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
+ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Example : Societe:societe/class/societe.class.php
 LibraryToBuildPDF=Library used for PDF generation
 WarningUsingFPDF=Opgelet: je <br>conf.php</b> bevat de instelling <b>dolibarr_pdf_force_fpdf=1</b>.  Dat betekent dat je de FPDF bibliotheek gebruikt om PDF bestanden te maken.  Deze bibliotheek is oud, en ondersteunt een aantal mogelijkheden niet (Unicode, transparantie in beelden, cyrillische, arabische en aziatische talen, ...), dus er kunnen fouten optreden bij het maken van PDF's.  <br>Om dat op te lossen, en om volledige ondersteuning van PDF-maken te hebben, download aub <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, en dan verwijder of maak commentaar van de lijn <b>$dolibarr_pdf_force_fpdf=1</b>, en voeg in plaats daarvan <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b> toe.
@@ -411,10 +420,11 @@ ModuleCompanyCodePanicum=Geef een lege boekhoudkundige code terug.
 ModuleCompanyCodeDigitaria=Boekhoudkundige-code is afhankelijk van derden code. De code bestaat uit het teken "C" in de eerste positie, gevolgd door de eerste 5 tekens van de derden code.
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
-
+WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<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).
+ClickToShowDescription=Click to show description
 # Modules
 Module0Name=Gebruikers & groepen
-Module0Desc=Beheer gebruikers en groepen
+Module0Desc=Users / Employees and Groups management
 Module1Name=Beheer derde partijen
 Module1Desc=Beheer van derde partijen (klanten, leveranciers en contactpersonen). Ook kunt u hier sjabloondocumenten uploaden.
 Module2Name=Commercieel
@@ -515,8 +525,8 @@ Module2200Name=Dynamische prijzen
 Module2200Desc=Het gebruik van wiskundige uitdrukkingen voor prijzen mogelijk te maken
 Module2300Name=Cron
 Module2300Desc=Beheer taakplanning
-Module2400Name=Agenda/Events
-Module2400Desc=Follow events or rendez-vous. Record manual events into Agendas or let application logs automatic events for tracking purposes.
+Module2400Name=Events/Agenda
+Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous.
 Module2500Name=Electronic Content Management
 Module2500Desc=Opslaan en delen van documenten
 Module2600Name=API/Web services (SOAP server)
@@ -582,7 +592,7 @@ Permission34=Verwijderen producten / diensten
 Permission36=Exporteer producten / diensten
 Permission38=Export producten
 Permission41=Lees projecten en taken (gedeeld project en project waarvan ik contactpersoon ben). Kan ook de gebruikte tijd invoeren op toegewezen taken (rooster).
-Permission42=Creëer / wijzig projecten (Gedeelde projecten en projecten waarvoor ik de contactpersoon ben)
+Permission42=Create/modify projects (shared project and projects i'm contact for). Can also create tasks and assign users to project and tasks
 Permission44=Verwijder projecten (Gedeelde projecten en projecten waarvoor ik de contactpersoon ben)
 Permission45=Export projects
 Permission61=Bekijk interventies
@@ -685,7 +695,7 @@ PermissionAdvanced253=Creëer / wijzig de rechten van internet / externe gebruik
 Permission254=Verwijderen of uitschakelen van andere gebruikers
 Permission255=Creëren / wijzigen eigen gebruikersgegevens
 Permission256=Wijzigen eigen wachtwoord
-Permission262=Uitbreiden van de toegang tot iedereen die verbonden is aan de Klant (niet alleen die welke verband houden met de gebruiker). Niet functioneel voor externe gebruikers (altijd beperkt tot zichzelf).
+Permission262=Extend access to all third parties (not only third parties that user is a sale representative).<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 assignement matters).
 Permission271=Lees CA
 Permission272=Facturen inzien
 Permission273=Facturen uitgeven
@@ -887,7 +897,7 @@ Offset=Offset (afstand)
 AlwaysActive=Altijd actief
 Upgrade=Bijwerken
 MenuUpgrade=Bijwerken / Uitbreiden
-AddExtensionThemeModuleOrOther=Toevoegen uitbreiding (thema, module, etc)
+AddExtensionThemeModuleOrOther=Deploy/install external module
 WebServer=Webserver
 DocumentRootServer='Root' map van de webserver
 DataRootServer=Gegevensbestandenmap
@@ -994,7 +1004,7 @@ TriggerAlwaysActive=Initiatoren in dit bestand zijn altijd actief, ongeacht de g
 TriggerActiveAsModuleActive=Initiatoren in dit bestand zijn actief als module <b>%s</b> is ingeschakeld.
 GeneratedPasswordDesc=Stel hier de regel in die u wilt gebruiken voor het genereren van een nieuwe wachtwoord als u vraagt om een automatisch gegenereerd wachtwoord
 DictionaryDesc=Insert all reference data. You can add your values to the default.
-ConstDesc=This page allows you to edit all other parameters not available in previous pages. These are mostly reserved parameters for developers or advanced troubleshooting.
+ConstDesc=This page allows you to edit all other parameters not available in previous pages. These are mostly reserved parameters for developers or advanced troubleshooting. For a list of options <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">check here</a>.
 MiscellaneousDesc=All other security related parameters are defined here.
 LimitsSetup=Limieten- en precisieinstellingen
 LimitsDesc=U kunt hier limieten en preciseringen die Dolibarr gebruikt instellen
@@ -1161,10 +1171,6 @@ FreeLegalTextOnOrders=Vrije tekst op opdrachten
 WatermarkOnDraftOrders=Watermerk op ontwerp-orders (geen indien leeg)
 ShippableOrderIconInList=Voeg een icoon toe aan de lijst Bestellingen die aangeeft wanneer leverbaar
 BANK_ASK_PAYMENT_BANK_DURING_ORDER=Ask for bank account destination of order
-##### Clicktodial #####
-ClickToDialSetup='Click-To-Dial' moduleinstellingen
-ClickToDialUrlDesc=Aangeroepen URL wanneer er geklikt wordt op een telefoonicoontje. In de URL kunt u 'tags' gebruiken<br><b>__PHONETO__</b> zal vervangen worden met het telefoonnummer dat gebeld moet worden<br><b>__PHONEFROM__</b> zal worden vervangen met het telefoonnummer van de bellende persoon (uw telefoonnummer)<br><b>__LOGIN__</b> zal vervangen worden door uw 'Click-To-Dial'-accountgebruikersnaam (Zoals ingesteld op uw gebruikerskaartdetails<br><b>__PASS__</b> zal vervangen worden door uw "Click-To-Dial"-accountwachtwoord (Zoals ingesteld op uw gebruikerskaartdetails).
-##### Bookmark4u #####
 ##### Interventions #####
 InterventionsSetup=Interventiemodule-instellingen
 FreeLegalTextOnInterventions=Vrije tekst op interventiedocumenten
@@ -1391,7 +1397,7 @@ SendingsSetup=Verzendingsmoduleinstellingen
 SendingsReceiptModel=Verzendontvangstsjabloon
 SendingsNumberingModules=Verzendingen nummering modules
 SendingsAbility=Support shipping sheets for customer deliveries
-NoNeedForDeliveryReceipts=In de meeste gevallen worden de verzendingsbrieven gebruikt als brieven voor de afnemersleveringen (lijst van te verzenden producten ) evenals voor ontvangstbewijzen ondertekend door de afnemer. Derhalve zijn ontvangstbevestigingen een dubbele functionaliteit en worden deze zelden geactiveerd.
+NoNeedForDeliveryReceipts=In most cases, shipping sheets are used both as sheets for customer deliveries (list of products to send) and sheets that is received and signed by customer. So product deliveries receipts is a duplicated feature and is rarely activated.
 FreeLegalTextOnShippings=Vrije tekst op verzendingen
 ##### Deliveries #####
 DeliveryOrderNumberingModules=ontvangstbevestigingennummeringsmodule
@@ -1471,7 +1477,11 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Set automatically this default value for type of e
 AGENDA_DEFAULT_FILTER_TYPE=Stel automatisch dit soort evenementen in zoekfilter van agendaweergave
 AGENDA_DEFAULT_FILTER_STATUS=Stel automatisch deze status voor evenementen in zoekfilter van agendaweergave
 AGENDA_DEFAULT_VIEW=Welk tabblad wilt u standaard openen bij het selecteren van menu Agenda
-##### ClickToDial #####
+AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
+AGENDA_NOTIFICATION_SOUND=Enable sound notification
+##### Clicktodial #####
+ClickToDialSetup='Click-To-Dial' moduleinstellingen
+ClickToDialUrlDesc=Aangeroepen URL wanneer er geklikt wordt op een telefoonicoontje. In de URL kunt u 'tags' gebruiken<br><b>__PHONETO__</b> zal vervangen worden met het telefoonnummer dat gebeld moet worden<br><b>__PHONEFROM__</b> zal worden vervangen met het telefoonnummer van de bellende persoon (uw telefoonnummer)<br><b>__LOGIN__</b> zal vervangen worden door uw 'Click-To-Dial'-accountgebruikersnaam (Zoals ingesteld op uw gebruikerskaartdetails<br><b>__PASS__</b> zal vervangen worden door uw "Click-To-Dial"-accountwachtwoord (Zoals ingesteld op uw gebruikerskaartdetails).
 ClickToDialDesc=This module allows to make phone numbers clickable. A click on this icon will call make your phone to 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.
 ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
 ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on same computer than the browser, and called when you click on a link in your browser that start 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.
@@ -1499,10 +1509,11 @@ EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint availa
 ##### API ####
 ApiSetup=API module setup
 ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
-ApiProductionMode=Enable production mode (this will activate use of a caches for services management)
+ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
 ApiExporerIs=You can explore the APIs at url
 OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
 ApiKey=Key for API
+WarningAPIExplorerDisabled=The API explorer has been disabled. API explorer is not required to provide API services. It is a tool for developer to find/test REST APIs. If you need this tool, go into setup of module API REST to activate it.
 ##### Bank #####
 BankSetupModule=Bankmoduleinstellingen
 FreeLegalTextOnChequeReceipts=Eigen tekst op cheque-ontvangsten
@@ -1571,7 +1582,7 @@ 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:
 SomethingMakeInstallFromWebNotPossible2=Om deze reden, is het upgrade process hier beschreven alleen in handmatige stappen door een bevoorrechte gebruiker te doen.
 InstallModuleFromWebHasBeenDisabledByFile=Installeren van externe module van toepassing is uitgeschakeld door uw beheerder. Je moet hem vragen om het bestand <strong>%s</strong>  te verwijderen om deze functie mogelijk te maken.
-ConfFileMuseContainCustom=Installing an external module from application save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to have option<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
+ConfFileMuseContainCustom=Installing an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
 HighlightLinesColor=Highlight color of the line when the mouse passes over (keep empty for no highlight)
 TextTitleColor=Color of page title
@@ -1601,6 +1612,7 @@ FixTZ=TimeZone fix
 FillFixTZOnlyIfRequired=Example: +2 (fill only if problem experienced)
 ExpectedChecksum=Expected Checksum
 CurrentChecksum=Current Checksum
+ForcedConstants=Required constant values
 MailToSendProposal=To send customer proposal
 MailToSendOrder=To send customer order
 MailToSendInvoice=To send customer invoice
@@ -1609,13 +1621,14 @@ MailToSendIntervention=To send intervention
 MailToSendSupplierRequestForQuotation=To send quotation request to supplier
 MailToSendSupplierOrder=To send supplier order
 MailToSendSupplierInvoice=To send supplier invoice
+MailToSendContract=To send a contract
 MailToThirdparty=To send email from third party page
 ByDefaultInList=Show by default on list view
-YouUseLastStableVersion=You use the last stable version
+YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
 TitleExampleForMaintenanceRelease=Example of message you can use to announce this maintenance release (feel free to use it on your web sites)
-ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. You can download it from the download area of http://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.
-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, nor data structure change is present into this version. You can download it from the download area of http://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.
+ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. 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.
+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, nor data structure change is present into 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, you can enter here rule to have price for each level autocalculated according to price of first level, so you will have to enter only price for first level on each product. This page is here to save you time and can be usefull only if your prices for each leve are relative to first level. You can ignore this page in most cases.
 ModelModulesProduct=Templates for product documents
 ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
diff --git a/htdocs/langs/nl_NL/banks.lang b/htdocs/langs/nl_NL/banks.lang
index d6741174e93..c3b7b53bee9 100644
--- a/htdocs/langs/nl_NL/banks.lang
+++ b/htdocs/langs/nl_NL/banks.lang
@@ -74,13 +74,13 @@ Conciliate=Afstemmen
 Conciliation=Afstemming
 ReconciliationLate=Reconciliation late
 IncludeClosedAccount=Inclusief opgeheven rekeningen
-OnlyOpenedAccount=Alleen open accounts
+OnlyOpenedAccount=Alleen open rekeningen
 AccountToCredit=Te crediteren rekening
 AccountToDebit=Te debiteren rekening
 DisableConciliation=Afstemming van deze rekening uitschakelen
 ConciliationDisabled=Afstemming voor deze rekening is uitgeschakeld
 LinkedToAConciliatedTransaction=Linked to a conciliated entry
-StatusAccountOpened=Open
+StatusAccountOpened=Geopend
 StatusAccountClosed=Opgeheven
 AccountIdShort=Aantal
 LineRecord=Transactie
diff --git a/htdocs/langs/nl_NL/bills.lang b/htdocs/langs/nl_NL/bills.lang
index 516bece680e..7a6b9980f8f 100644
--- a/htdocs/langs/nl_NL/bills.lang
+++ b/htdocs/langs/nl_NL/bills.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - bills
 Bill=Factuur
 Bills=Facturen
-BillsCustomers=Afnemersfacturen
+BillsCustomers=Klantenfactuur
 BillsCustomer=Afnemersfactuur
 BillsSuppliers=Leveranciersfacturen
-BillsCustomersUnpaid=Onbetaalde afnemersfacturen
-BillsCustomersUnpaidForCompany=Onbetaalde afnemersfacturen voor %s
+BillsCustomersUnpaid=Onbetaalde klant facturen
+BillsCustomersUnpaidForCompany=Unpaid customer invoices for %s
 BillsSuppliersUnpaid=Onbetaalde leveranciersfacturen
-BillsSuppliersUnpaidForCompany=Onbetaalde leveranciersfacturen voor %s
+BillsSuppliersUnpaidForCompany=Unpaid supplier invoices for %s
 BillsLate=Betalingsachterstand
 BillsStatistics=Statistieken afnemersfacturen
 BillsStatisticsSuppliers=Statistieken leveranciersfacturen
@@ -63,7 +63,7 @@ paymentInInvoiceCurrency=Factuur valuta
 PaidBack=Terugbetaald
 DeletePayment=Betaling verwijderen
 ConfirmDeletePayment=Weet u zeker dat u deze betaling wilt verwijderen?
-ConfirmConvertToReduc=Wilt u deze credietnota of storting converteren in absolute korting?<br>De hoeveelheid zal worden opgeslagen en kan worden toegepast als korting in toekomstige facturen voor deze klant.
+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.
 SupplierPayments=Leveranciersbetalingen
 ReceivedPayments=Ontvangen betalingen
 ReceivedCustomersPayments=Ontvangen betalingen van afnemers
@@ -78,6 +78,7 @@ PaymentMode=Betalingstype
 PaymentTypeDC=Debet / Kredietkaart
 PaymentTypePP=PayPal
 IdPaymentMode=Betalingstype (Id)
+CodePaymentMode=Payment type (code)
 LabelPaymentMode=Betalingstype (label)
 PaymentModeShort=Betalingstype
 PaymentTerm=Betalingstermijn
@@ -102,9 +103,10 @@ SearchACustomerInvoice=Zoek een afnemersfactuur
 SearchASupplierInvoice=Zoek een leveranciersfactuur
 CancelBill=Verwijder factuur
 SendRemindByMail=E-mail een herinnering
-DoPayment=Doe een betaling
-DoPaymentBack=Doe een terugbetaling
+DoPayment=Enter payment
+DoPaymentBack=Enter refund
 ConvertToReduc=Omzetten in een toekomstige korting
+ConvertExcessReceivedToReduc=Convert excess received into future discount
 EnterPaymentReceivedFromCustomer=Voer een ontvangen betaling van afnemer in
 EnterPaymentDueToCustomer=Voer een betaling te doen aan afnemer in
 DisabledBecauseRemainderToPayIsZero=Uitgeschakeld omdat restant te betalen gelijk is aan nul
@@ -113,22 +115,24 @@ BillStatus=Factuurstatus
 StatusOfGeneratedInvoices=Status van gegenereerde facturen
 BillStatusDraft=Concept (moet worden gevalideerd)
 BillStatusPaid=Betaald
-BillStatusPaidBackOrConverted=Betaald of omgezet in een korting
+BillStatusPaidBackOrConverted=Refund or converted into discount
 BillStatusConverted=Omgezet in korting
 BillStatusCanceled=Verlaten
 BillStatusValidated=Gevalideerd (moet worden betaald)
 BillStatusStarted=Gestart
 BillStatusNotPaid=Niet betaald
+BillStatusNotRefunded=Not refunded
 BillStatusClosedUnpaid=Gesloten (onbetaald)
 BillStatusClosedPaidPartially=Betaald (gedeeltelijk)
 BillShortStatusDraft=Concept
 BillShortStatusPaid=Betaald
-BillShortStatusPaidBackOrConverted=Verwerkt
+BillShortStatusPaidBackOrConverted=Refund or converted
 BillShortStatusConverted=Verwerkte
 BillShortStatusCanceled=Verlaten
 BillShortStatusValidated=Gevalideerd
 BillShortStatusStarted=Gestart
 BillShortStatusNotPaid=Niet betaald
+BillShortStatusNotRefunded=Not refunded
 BillShortStatusClosedUnpaid=Gesloten
 BillShortStatusClosedPaidPartially=Betaald (gedeeltelijk)
 PaymentStatusToValidShort=Te valideren
@@ -149,14 +153,14 @@ NoQualifiedRecurringInvoiceTemplateFound=Geen geschikte sjablonen gevonden voor
 FoundXQualifiedRecurringInvoiceTemplate=%s geschikte sjablonen gevonden voor terugkerende factu(u)r(en)
 NotARecurringInvoiceTemplate=Not a recurring template invoice
 NewBill=Nieuwe factuur
-LastBills=Laatste %s facturen
-LastCustomersBills=Laatste %s afnemersfacturen
-LastSuppliersBills=Laatste %s leveranciersfacturen
+LastBills=Latest %s invoices
+LastCustomersBills=Latest %s customer invoices
+LastSuppliersBills=Latest %s supplier invoices
 AllBills=Alle facturen
 OtherBills=Andere facturen
 DraftBills=conceptfacturen
-CustomersDraftInvoices=Afnemersconceptfacturen
-SuppliersDraftInvoices=Leveranciersconceptfacturen
+CustomersDraftInvoices=Customer draft invoices
+SuppliersDraftInvoices=Supplier draft invoices
 Unpaid=Onbetaalde
 ConfirmDeleteBill=Weet u zeker dat u deze factuur wilt verwijderen?
 ConfirmValidateBill=Weet u zeker dat u factuur met referentie <b>%s</b> wilt verwijderen?
@@ -203,7 +207,7 @@ AlreadyPaidNoCreditNotesNoDeposits=Reeds betaald (zonder creditnota's en stortin
 Abandoned=Verlaten
 RemainderToPay=Resterend onbetaald
 RemainderToTake=Resterende bedrag over te nemen
-RemainderToPayBack=Resterende bedrag terug te betalen
+RemainderToPayBack=Remaining amount to refund
 Rest=Hangende
 AmountExpected=Gevorderde bedrag
 ExcessReceived=Overbetaling
@@ -270,6 +274,7 @@ Deposit=Deposito / Borgsom
 Deposits=Deposito's
 DiscountFromCreditNote=Korting van creditnota %s
 DiscountFromDeposit=Betalingen van depositofactuur %s
+DiscountFromExcessReceived=Payments from excess received of invoice %s
 AbsoluteDiscountUse=Dit soort krediet kan gebruikt worden op de factuur voorafgaande aan de validatie
 CreditNoteDepositUse=Om dit soort crediet te gebruiken moet deze factuur gevalideerd worden.
 NewGlobalDiscount=Nieuwe korting
@@ -277,8 +282,8 @@ NewRelativeDiscount=Nieuwe relatiekorting
 NoteReason=Notitie / Reden
 ReasonDiscount=Reden
 DiscountOfferedBy=Verleend door
-DiscountStillRemaining=Nog overgebleven korting
-DiscountAlreadyCounted=Al verstrekte korting
+DiscountStillRemaining=Discounts available
+DiscountAlreadyCounted=Discounts already consumed
 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.
@@ -331,10 +336,12 @@ InvoiceAutoValidate=Valideer facturen automatisch
 GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
 DateIsNotEnough=Datum nog niet bereikt
 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
 # PaymentConditions
 Statut=Status
-PaymentConditionShortRECEP=Direct
-PaymentConditionRECEP=Direct
+PaymentConditionShortRECEP=Due Upon Receipt
+PaymentConditionRECEP=Due Upon Receipt
 PaymentConditionShort30D=30 dagen
 PaymentCondition30D=30 dagen
 PaymentConditionShort30DENDMONTH=30 dagen na einde van de maand
@@ -349,6 +356,14 @@ PaymentConditionShortPT_ORDER=Order
 PaymentConditionPT_ORDER=Bij bestelling
 PaymentConditionShortPT_5050=50-50
 PaymentConditionPT_5050=50%% voorschot, 50%% bij levering
+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
 FixAmount=Vast bedrag
 VarAmount=Variabel bedrag  (%% tot.)
 # PaymentType
@@ -418,7 +433,7 @@ ChequeDeposits=Cheques deposito's
 Cheques=Cheques
 DepositId=ID storting
 NbCheque=Aantal cheques
-CreditNoteConvertedIntoDiscount=Deze creditnota of deposit is omgezet naar %s
+CreditNoteConvertedIntoDiscount=This %s has been converted into %s
 UsBillingContactAsIncoiveRecipientIfExist=Gebruik afnemersfacturatiecontactadres in plaats van derde adres als ontvanger voor de facturen
 ShowUnpaidAll=Bekijk alle onbetaalde
 ShowUnpaidLateOnly=Toon alleen onbetaalde te late facturen
diff --git a/htdocs/langs/nl_NL/boxes.lang b/htdocs/langs/nl_NL/boxes.lang
index c398a6cba50..51662525382 100644
--- a/htdocs/langs/nl_NL/boxes.lang
+++ b/htdocs/langs/nl_NL/boxes.lang
@@ -25,8 +25,8 @@ BoxTitleLastSuppliers=Latest %s recorded suppliers
 BoxTitleLastModifiedSuppliers=Latest %s modified suppliers
 BoxTitleLastModifiedCustomers=Latest %s modified customers
 BoxTitleLastCustomersOrProspects=Latest %s customers or prospects
-BoxTitleLastCustomerBills=Latest %s customer's invoices
-BoxTitleLastSupplierBills=Latest %s supplier's invoices
+BoxTitleLastCustomerBills=Latest %s customer invoices
+BoxTitleLastSupplierBills=Latest %s supplier invoices
 BoxTitleLastModifiedProspects=Latest %s modified prospects
 BoxTitleLastModifiedMembers=Latest %s members
 BoxTitleLastFicheInter=Latest %s modified interventions
@@ -51,12 +51,12 @@ ClickToAdd=Klik hier om toe te voegen.
 NoRecordedCustomers=Geen geregistreerde afnemers
 NoRecordedContacts=Geen geregistreerde contacten
 NoActionsToDo=Geen acties te doen
-NoRecordedOrders=Geen geregistreerde afnemersopdrachten
+NoRecordedOrders=No recorded customer orders
 NoRecordedProposals=Geen geregistreerde offertes
-NoRecordedInvoices=Geen geregistreerde afnemersfacturen
-NoUnpaidCustomerBills=Geen onbetaalde afnemersfacturen
-NoUnpaidSupplierBills=Geen onbetaalde leverancierfacturen
-NoModifiedSupplierBills=Geen geregistreerd leveranciersfacturen
+NoRecordedInvoices=No recorded customer invoices
+NoUnpaidCustomerBills=No unpaid customer invoices
+NoUnpaidSupplierBills=No unpaid supplier invoices
+NoModifiedSupplierBills=No recorded supplier invoices
 NoRecordedProducts=Geen geregistreerde producten / diensten
 NoRecordedProspects=Geen geregistreerde prospecten
 NoContractedProducts=Geen gecontracteerde producten / diensten
diff --git a/htdocs/langs/nl_NL/companies.lang b/htdocs/langs/nl_NL/companies.lang
index f0573bef12f..0c0d8aca2cd 100644
--- a/htdocs/langs/nl_NL/companies.lang
+++ b/htdocs/langs/nl_NL/companies.lang
@@ -78,6 +78,10 @@ VATIsNotUsed=BTW wordt niet gebruikt
 CopyAddressFromSoc=Fill address with third party address
 ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
 PaymentBankAccount=Payment bank account
+OverAllProposals=Total proposals
+OverAllOrders=Total orders
+OverAllInvoices=Total invoices
+OverAllSupplierProposals=Total price requests
 ##### Local Taxes #####
 LocalTax1IsUsed=Gebruik tweede belasting
 LocalTax1IsUsedES= RE wordt gebruikt
@@ -239,6 +243,10 @@ ProfId3RU=Prof Id 3 (KPP)
 ProfId4RU=Prof Id 4 (Okpo)
 ProfId5RU=-
 ProfId6RU=-
+ProfId1DZ=RC
+ProfId2DZ=Art.
+ProfId3DZ=NIF
+ProfId4DZ=NIS
 VATIntra=BTW-nummer
 VATIntraShort=BTW-nummer
 VATIntraSyntaxIsValid=Syntax is geldig
@@ -382,8 +390,9 @@ ListCustomersShort=Afnemersoverzicht
 ThirdPartiesArea=Relaties en contactpersonen
 LastModifiedThirdParties=Latest %s modified third parties
 UniqueThirdParties=Totaal aantal unieke derde partijen
-InActivity=Open
+InActivity=Geopend
 ActivityCeased=Gesloten
+ThirdPartyIsClosed=Third party is closed
 ProductsIntoElements=Lijst producten/diensten in %s
 CurrentOutstandingBill=Huidige openstaande rekening
 OutstandingBill=Max. voor openstaande rekening
@@ -396,7 +405,7 @@ MergeThirdparties=Samenvoegen third parties
 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 so you will be able to delete the duplicate one.
 ThirdpartiesMergeSuccess=Third parties zijn samengevoegd
 SaleRepresentativeLogin=Login of sales representative
-SaleRepresentativeFirstname=Firstname of sales representative
-SaleRepresentativeLastname=Lastname of sales representative
+SaleRepresentativeFirstname=First name of sales representative
+SaleRepresentativeLastname=Last name of sales representative
 ErrorThirdpartiesMerge=Er is iets fout gegaan tijdens verwijderen third parties. Check de log. Veranderingen zijn teruggedraaid.
 NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/nl_NL/compta.lang b/htdocs/langs/nl_NL/compta.lang
index b98a0a775ca..4dc07f35e50 100644
--- a/htdocs/langs/nl_NL/compta.lang
+++ b/htdocs/langs/nl_NL/compta.lang
@@ -65,6 +65,7 @@ PaymentSocialContribution=Sociale/fiscale belastingbetaling
 PaymentVat=BTW betaling
 ListPayment=Betalingenlijst
 ListOfCustomerPayments=Afnemersbetalingenlijst
+ListOfSupplierPayments=Leveranciersbetalingenlijst
 DateStartPeriod=Startdatum periode
 DateEndPeriod=Einddatum periode
 newLT1Payment=New tax 2 payment
@@ -81,7 +82,7 @@ LT2PaymentES=IRPF betaling
 LT2PaymentsES=IRPF Betalingen
 VATPayment=Sales tax payment
 VATPayments=Sales tax payments
-VATRefund=Sales tax refund Refund
+VATRefund=Sales tax refund
 Refund=Refund
 SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Toon BTW-betaling
@@ -194,7 +195,7 @@ CloneTax=Clone a social/fiscal tax
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
 CloneTaxForNextMonth=Kloon het voor volgende maand
 SimpleReport=Simple report
-AddExtraReport=Extra reports
+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
diff --git a/htdocs/langs/nl_NL/cron.lang b/htdocs/langs/nl_NL/cron.lang
index 1b9c86dd7fd..a33f2824410 100644
--- a/htdocs/langs/nl_NL/cron.lang
+++ b/htdocs/langs/nl_NL/cron.lang
@@ -1,10 +1,10 @@
 # Dolibarr language file - Source file is en_US - cron
 # About page
 # Right
-Permission23101 = Read Scheduled job
-Permission23102 = Create/update Scheduled job
-Permission23103 = Delete Scheduled job
-Permission23104 = Execute Scheduled job
+Permission23101 = Lees geplande taak
+Permission23102 = Maak/wijzig geplande taak
+Permission23103 = Verwijder geplande taak
+Permission23104 = Voer geplande taak uit
 # Admin
 CronSetup= Beheer taakplanning
 URLToLaunchCronJobs=URL to check and launch qualified cron jobs
@@ -17,14 +17,14 @@ CronMethodDoesNotExists=Class %s does not contains any method %s
 # Menu
 EnabledAndDisabled=Enabled and disabled
 # Page list
-CronLastOutput=Last run output
-CronLastResult=Last result code
+CronLastOutput=Latest run output
+CronLastResult=Latest result code
 CronCommand=Commando
-CronList=Scheduled jobs
+CronList=Geplande taken
 CronDelete=Delete scheduled jobs
-CronConfirmDelete=Are you sure you want to delete these scheduled jobs ?
+CronConfirmDelete=Are you sure you want to delete these scheduled jobs?
 CronExecute=Launch scheduled job
-CronConfirmExecute=Are you sure you want to execute these scheduled jobs now ?
+CronConfirmExecute=Are you sure you want to execute these scheduled jobs now?
 CronInfo=Scheduled job module allow to execute job that have been planned
 CronTask=Taak
 CronNone=Geen
@@ -33,13 +33,13 @@ CronDtEnd=Not after
 CronDtNextLaunch=Volgende uitvoering
 CronDtLastLaunch=Start date of latest execution
 CronDtLastResult=End date of latest execution
-CronFrequency=Frequency
+CronFrequency=Frequentie
 CronClass=Class
 CronMethod=Methode
 CronModule=Module
 CronNoJobs=Geen taken opgenomen
 CronPriority=Prioriteit
-CronLabel=Label
+CronLabel=Naam
 CronNbRun=Nb. launch
 CronMaxRun=Max nb. launch
 CronEach=Elke
@@ -65,7 +65,7 @@ CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of
 CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
 CronCommandHelp=The system command line to execute.
 CronCreateJob=Create new Scheduled Job
-CronFrom=From
+CronFrom=Van
 # Info
 # Common
 CronType=Job type
diff --git a/htdocs/langs/nl_NL/errors.lang b/htdocs/langs/nl_NL/errors.lang
index 5ec5dd79b29..b43b1ba0a06 100644
--- a/htdocs/langs/nl_NL/errors.lang
+++ b/htdocs/langs/nl_NL/errors.lang
@@ -11,6 +11,7 @@ ErrorLoginAlreadyExists=Inlog %s bestaat reeds.
 ErrorGroupAlreadyExists=Groep %s bestaat reeds.
 ErrorRecordNotFound=Tabelregel niet gevonden.
 ErrorFailToCopyFile=Kan bestand <b>'%s'</b> in <b>'%s'</b> te kopiëren.
+ErrorFailToCopyDir=Failed to copy directory '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToRenameFile=Kon het bestand '<b>%s</b>' niet hernoemen naar '<b>%s</b>'.
 ErrorFailToDeleteFile=Kon het bestand '<b>%s</b>' niet verwijderen.
 ErrorFailToCreateFile=Creëren van het bestand '<b>%s</b>' mislukt.
@@ -115,7 +116,7 @@ ErrorNoActivatedBarcode=Geen geactiveerde barcode soort
 ErrUnzipFails=uitpakken %s mislukt met ZipArchive
 ErrNoZipEngine=No engine to unzip %s file in this PHP
 ErrorFileMustBeADolibarrPackage=Het bestand %s moet een Dolibarr zip-pakket zijn
-ErrorFileRequired=It takes a package Dolibarr file
+ErrorModuleFileRequired=You must select a Dolibarr module package file
 ErrorPhpCurlNotInstalled=De PHP CURL is niet geïnstalleerd, dit is van essentieel belang met Paypal te communiceren
 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
@@ -170,14 +171,19 @@ ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
 ErrorFileMustHaveFormat=File must have format %s
 ErrorSupplierCountryIsNotDefined=Land voor deze leverancier is niet gedefinieerd. Corrigeer dit eerst.
 ErrorsThirdpartyMerge=Failed to merge the two records. Request canceled.
-ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enougth for product %s to add it into a new order.
-ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enougth for product %s to add it into a new invoice.
-ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enougth for product %s to add it into a new shipment.
-ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enougth for product %s to add it into a new proposal.
-ErrorFailedToLoadLoginFileForMode=Failed to get the login file for mode '%s'.
+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 bank 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>
 
 # 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.
diff --git a/htdocs/langs/nl_NL/holiday.lang b/htdocs/langs/nl_NL/holiday.lang
index 25889d8475c..bba9af03b44 100644
--- a/htdocs/langs/nl_NL/holiday.lang
+++ b/htdocs/langs/nl_NL/holiday.lang
@@ -76,8 +76,9 @@ BoxTitleLastLeaveRequests=Latest %s modified leave requests
 HolidaysMonthlyUpdate=Monthly update
 ManualUpdate=Manual update
 HolidaysCancelation=Leave request cancelation
-EmployeeLastname=Employee lastname
-EmployeeFirstname=Employee firstname
+EmployeeLastname=Employee last name
+EmployeeFirstname=Employee first name
+TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
 
 ## Configuration du Module ##
 LastUpdateCP=Latest automatic update of leaves allocation
diff --git a/htdocs/langs/nl_NL/ldap.lang b/htdocs/langs/nl_NL/ldap.lang
index 7e584c3fceb..3cacd8d5f7b 100644
--- a/htdocs/langs/nl_NL/ldap.lang
+++ b/htdocs/langs/nl_NL/ldap.lang
@@ -13,8 +13,8 @@ LDAPUsers=Gebruikers in LDAP database
 LDAPFieldStatus=Status
 LDAPFieldFirstSubscriptionDate=Eerste inschrijvingsdatum
 LDAPFieldFirstSubscriptionAmount=Eerste inschrijvingsbedrag
-LDAPFieldLastSubscriptionDate=Laatste inschrijvingsdatum
-LDAPFieldLastSubscriptionAmount=Laatste inschrijvingsbedrag
+LDAPFieldLastSubscriptionDate=Latest subscription date
+LDAPFieldLastSubscriptionAmount=Latest subscription amount
 LDAPFieldSkype=Skype id
 LDAPFieldSkypeExample=Example : skypeName
 UserSynchronized=Gebruiker gesynchroniseerd
diff --git a/htdocs/langs/nl_NL/mails.lang b/htdocs/langs/nl_NL/mails.lang
index 5cdc12d6cd2..4e2ef1a8822 100644
--- a/htdocs/langs/nl_NL/mails.lang
+++ b/htdocs/langs/nl_NL/mails.lang
@@ -35,7 +35,7 @@ MailingStatusSentPartialy=Gedeeltelijk verzonden
 MailingStatusSentCompletely=Volledig verzonden
 MailingStatusError=Fout
 MailingStatusNotSent=Niet verzonden
-MailSuccessfulySent=E-mail successvol verzonden (van %s naar %s)
+MailSuccessfulySent=Email successfully accepted for delivery (from %s to %s)
 MailingSuccessfullyValidated=Emailing succesvol gevalideerd
 MailUnsubcribe=Uitschrijven
 MailingStatusNotContact=Niet meer contacten
@@ -74,22 +74,28 @@ ResultOfMailSending=Result of mass EMail sending
 NbSelected=Nb selected
 NbIgnored=Nb ignored
 NbSent=Nb 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
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Regel %s in bestand
 RecipientSelectionModules=Gedefinieerde verzoeken om ontvangers te selecteren
 MailSelectedRecipients=Geselecteerde ontvangers
 MailingArea=EMailingsoverzicht
-LastMailings=Laatste %s EMailings
+LastMailings=Latest %s emailings
 TargetsStatistics=Geaddresseerdenstatistieken
 NbOfCompaniesContacts=Unieke contacten van bedrijven
 MailNoChangePossible=Ontvangers voor gevalideerde EMailings kunnen niet worden gewijzigd
 SearchAMailing=Zoek een EMailing
 SendMailing=Verzend EMailing
 SendMail=Verzend e-mail
-MailingNeedCommand=Uit veiligheidsoverwegingen is het sturen van een e-mailing is beter wanneer deze wordt uitgevoerd vanaf de command line. Als je er een hebt, vraagt ​​u uw serverbeheerder om de volgende opdracht te lanceren om de e-mailing sturen naar alle geadresseerden:
+SentBy=Verzonden door
+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=U kunt ze echter online verzenden door toevoeging van de parameter MAILING_LIMIT_SENDBYWEB met een waarde van het maximaal aantal e-mails dat u wilt verzenden per sessie.
-ConfirmSendingEmailing=If you can't or prefer sending them with your www browser, please confirm you are sure you want to send emailing now from your browser?
+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.
 TargetsReset=Lijst legen
 ToClearAllRecipientsClickHere=Klik hier om de lijst met ontvangers van deze EMailing te legen
@@ -144,3 +150,6 @@ AdvTgtCreateFilter=Create filter
 AdvTgtOrCreateNewFilter=Name of new filter
 NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
+OutGoingEmailSetup=Outgoing email setup
+InGoingEmailSetup=Incoming email setup
+
diff --git a/htdocs/langs/nl_NL/main.lang b/htdocs/langs/nl_NL/main.lang
index f8448f28313..20c2d3fa345 100644
--- a/htdocs/langs/nl_NL/main.lang
+++ b/htdocs/langs/nl_NL/main.lang
@@ -27,7 +27,7 @@ DatabaseConnection=Databaseverbinding
 NoTemplateDefined=No template defined for this email type
 AvailableVariables=Available substitution variables
 NoTranslation=Geen vertaling
-NoRecordFound=Geen record gevonden
+NoRecordFound=Geen item gevonden
 NoRecordDeleted=No record deleted
 NotEnoughDataYet=Not enough data
 NoError=Geen fout
@@ -37,8 +37,8 @@ ErrorFieldRequired=Veld '%s' is vereist
 ErrorFieldFormat=Veld '%s' heeft een incorrecte waarde
 ErrorFileDoesNotExists=Bestand %s bestaat niet
 ErrorFailedToOpenFile=Kan bestand %s niet openen
-ErrorCanNotCreateDir=Cannot create dir %s
-ErrorCanNotReadDir=Cannot read dir %s
+ErrorCanNotCreateDir=Kan map %s niet maken
+ErrorCanNotReadDir=Kan map %s niet lezen
 ErrorConstantNotDefined=Parameter %s is niet gedefinieerd
 ErrorUnknown=Onbekende fout
 ErrorSQL=SQL fout
@@ -46,11 +46,11 @@ ErrorLogoFileNotFound=Logobestand '%s' is niet gevonden
 ErrorGoToGlobalSetup=Ga naar het instellingscherm 'Bedrijf / Stichting' om dit te corrigeren
 ErrorGoToModuleSetup=Ga naar Moduleinstellingen om dit te corrigeren
 ErrorFailedToSendMail=Mail versturen mislukt (afzender=%s, ontvanger=%s)
-ErrorFileNotUploaded=Bestand is niet geüpload. Controleer of de grootte niet meer is dan maximaal toegestaan, of er vrije ruimte beschikbaar is op de schijf en of er niet al een bestand met dezelfde naam in deze map bestaat.
+ErrorFileNotUploaded=Bestand is niet geüploadet. Controleer of de grootte niet meer is dan maximaal toegestaan, of er vrije ruimte beschikbaar is op de schijf en of er niet al een bestand met dezelfde naam in deze map bestaat.
 ErrorInternalErrorDetected=Fout ontdekt
-ErrorWrongHostParameter=Verkeerde host instelling
+ErrorWrongHostParameter=Verkeerde host-instelling
 ErrorYourCountryIsNotDefined=Uw land is niet gedefinieerd. Corrigeer in Home->Instellingen-Bewerk en verstuur het formulier opnieuw.
-ErrorRecordIsUsedByChild=Tabelregel verwijderen mislukt. Deze tabelregel wordt gebruikt door ten minste een onderliggend tabelregel.
+ErrorRecordIsUsedByChild=Item verwijderen mislukt. Dit item wordt gebruikt door ten minste één onderliggend item.
 ErrorWrongValue=Verkeerde waarde
 ErrorWrongValueForParameterX=Verkeerde waarde voor de parameter %s
 ErrorNoRequestInError=Geen verzoek mislukt
@@ -63,30 +63,32 @@ ErrorNoVATRateDefinedForSellerCountry=Fout, geen BTW-tarieven voor land '%s'.
 ErrorNoSocialContributionForSellerCountry=Fout, geen sociale/fiscale belastingtypen gedefinieerd voor land '%s'.
 ErrorFailedToSaveFile=Fout, bestand opslaan mislukt.
 ErrorCannotAddThisParentWarehouse=You are trying to add a parent warehouse which is already a child of current one
+MaxNbOfRecordPerPage=Max nb of record per page
 NotAuthorized=U bent hiervoor niet bevoegd.
 SetDate=Stel datum in
 SelectDate=Selecteer een datum
 SeeAlso=Zie ook %s
 SeeHere=Zie hier
+Apply=Toepassen
 BackgroundColorByDefault=Standaard achtergrondkleur
 FileRenamed=The file was successfully renamed
 FileUploaded=Het bestand is geüpload
 FileGenerated=The file was successfully generated
-FileWasNotUploaded=Een bestand is geselecteerd als bijlage, maar is nog niet geupload. Klik hiervoor op "Bevestig dit bestand".
+FileWasNotUploaded=Een bestand is geselecteerd als bijlage, maar is nog niet geüploadet. Klik hiervoor op "Bevestig dit bestand".
 NbOfEntries=Aantal invoeringen
-GoToWikiHelpPage=Read online help (Internet access needed)
-GoToHelpPage=Contacteer helpdesk
-RecordSaved=Tabelregel opgeslagen
-RecordDeleted=Record verwijderd
+GoToWikiHelpPage=Lees de online hulptekst (internettoegang vereist)
+GoToHelpPage=Lees de hulptekst
+RecordSaved=Item opgeslagen
+RecordDeleted=Item verwijderd
 LevelOfFeature=Niveau van de functionaliteiten
 NotDefined=Niet gedefinieerd
 DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr authentication mode is set to <b>%s</b> in configuration file <b>conf.php</b>.<br>This means that the password database is external to Dolibarr, so changing this field may have no effect.
 Administrator=Beheerder
 Undefined=Ongedefineerd
-PasswordForgotten=Password forgotten?
+PasswordForgotten=Wachtwoord vergeten?
 SeeAbove=Zie hierboven
 HomeArea=Home
-LastConnexion=Laatste verbinding
+LastConnexion=Latest connection
 PreviousConnexion=Laatste keer ingelogd
 PreviousValue=Previous value
 ConnectedOnMultiCompany=Aangesloten bij Meervoudig bedrijf
@@ -236,7 +238,7 @@ DateCreation=Aanmaakdatum
 DateCreationShort=Aanmaakdatum
 DateModification=Wijzigingsdatum
 DateModificationShort=Wijzigingsdatum
-DateLastModification=Laatste wijzigingsdatum
+DateLastModification=Latest modification date
 DateValidation=Validatiedatum
 DateClosing=Sluitingsdatum
 DateDue=Vervaldatum
@@ -432,7 +434,7 @@ Reportings=Rapportage
 Draft=Concept
 Drafts=Concepten
 Validated=Gevalideerd
-Opened=Open
+Opened=Geopend
 New=Nieuw
 Discount=Korting
 Unknown=Onbekend
@@ -460,6 +462,7 @@ DeletePicture=Afbeelding verwijderen
 ConfirmDeletePicture=Bevestig verwijderen afbeelding
 Login=Login
 CurrentLogin=Huidige login
+EnterLoginDetail=Enter login details
 January=Januari
 February=Februari
 March=Maart
@@ -597,6 +600,8 @@ SessionName=Sessienaam
 Method=Methode
 Receive=Ontvangen
 CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
+ExpectedValue=Expected Value
+CurrentValue=Huidige waarde
 PartialWoman=Gedeeltelijke
 TotalWoman=Totaal
 NeverReceived=Nooit ontvangen
@@ -753,6 +758,8 @@ RemoveString=Remove string '%s'
 SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
 DirectDownloadLink=Direct download link
 Download=Download
+ActualizeCurrency=Update currency rate
+Fiscalyear=Boekjaar
 # Week day
 Monday=Maandag
 Tuesday=Dinsdag
@@ -787,8 +794,8 @@ SetRef=Stel ref in
 Select2ResultFoundUseArrows=Some results found. Use arrows to select.
 Select2NotFound=Geen resultaat gevonden
 Select2Enter=Enter
-Select2MoreCharacter=or more character
-Select2MoreCharacters=of meer karakters
+Select2MoreCharacter=or more characters<br /><br /><strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
+Select2MoreCharacters=or more characters<br /><br /><strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
 Select2LoadingMoreResults=Laad meer resultaten...
 Select2SearchInProgress=Zoeken...
 SearchIntoThirdparties=Thirdparties
@@ -809,3 +816,5 @@ SearchIntoContracts=Contracten
 SearchIntoCustomerShipments=Customer shipments
 SearchIntoExpenseReports=Onkostennota's 
 SearchIntoLeaves=Leaves
+
+BulkActions=Bulk actions
diff --git a/htdocs/langs/nl_NL/members.lang b/htdocs/langs/nl_NL/members.lang
index e91375b289b..1f8bd107720 100644
--- a/htdocs/langs/nl_NL/members.lang
+++ b/htdocs/langs/nl_NL/members.lang
@@ -45,7 +45,7 @@ MemberStatusDraft=Concept (moet worden gevalideerd)
 MemberStatusDraftShort=Concept
 MemberStatusActive=Gevalideerd (wachtend op abonnement)
 MemberStatusActiveShort=Gevalideerd
-MemberStatusActiveLate=Abonnement verlopen
+MemberStatusActiveLate=Subscription expired
 MemberStatusActiveLateShort=Verlopen
 MemberStatusPaid=Abonnement bijgewerkt
 MemberStatusPaidShort=Bijgewerkt
@@ -136,8 +136,8 @@ DocForAllMembersCards=Genereer visitekaartjes voor alle leden (Formaat voor de u
 DocForOneMemberCards=Genereer visitekaartjes voor een bepaald lid (Format voor de uitvoer zoals ingesteld: <b>%s</b>)
 DocForLabels=Genereer adresvellen (formaat voor de uitvoer zoals ingesteld: <b>%s</b>)
 SubscriptionPayment=Betaling van abonnement
-LastSubscriptionDate=Laatste abonnementsdatum
-LastSubscriptionAmount=Laatste abonnementsaantal
+LastSubscriptionDate=Latest subscription date
+LastSubscriptionAmount=Latest subscription amount
 MembersStatisticsByCountries=Leden statistieken per land
 MembersStatisticsByState=Leden statistieken per staat / provincie
 MembersStatisticsByTown=Leden van de statistieken per gemeente
@@ -149,7 +149,7 @@ MembersByStateDesc=Dit scherm tonen statistieken over de leden door de staat / p
 MembersByTownDesc=Dit scherm tonen statistieken over de leden per gemeente.
 MembersStatisticsDesc=Kies de statistieken die u wilt lezen ...
 MenuMembersStats=Statistiek
-LastMemberDate=Laatste lid datum
+LastMemberDate=Latest member date
 Nature=Natuur
 Public=Informatie zijn openbaar (no = prive)
 NewMemberbyWeb=Nieuw lid toegevoegd. In afwachting van goedkeuring
diff --git a/htdocs/langs/nl_NL/orders.lang b/htdocs/langs/nl_NL/orders.lang
index fe3ddfcfcdc..aa1a2e8f997 100644
--- a/htdocs/langs/nl_NL/orders.lang
+++ b/htdocs/langs/nl_NL/orders.lang
@@ -39,7 +39,7 @@ StatusOrderRefusedShort=Geweigerd
 StatusOrderBilledShort=Gefactureerd
 StatusOrderToProcessShort=Te verwerken
 StatusOrderReceivedPartiallyShort=Gedeeltelijk ontvangen
-StatusOrderReceivedAllShort=Alles ontvangen
+StatusOrderReceivedAllShort=Products received
 StatusOrderCanceled=Geannuleerd
 StatusOrderDraft=Concept (moet worden gevalideerd)
 StatusOrderValidated=Gevalideerd
@@ -51,7 +51,7 @@ StatusOrderApproved=Goedgekeurd
 StatusOrderRefused=Geweigerd
 StatusOrderBilled=Gefactureerd
 StatusOrderReceivedPartially=Gedeeltelijk ontvangen
-StatusOrderReceivedAll=Alles ontvangen
+StatusOrderReceivedAll=All products received
 ShippingExist=Een zending bestaat
 QtyOrdered=Aantal besteld
 ProductQtyInDraft=Hoeveelheid producten in de ontwerp bestellingen
diff --git a/htdocs/langs/nl_NL/other.lang b/htdocs/langs/nl_NL/other.lang
index 3e1fa8bb616..4b4627f0eac 100644
--- a/htdocs/langs/nl_NL/other.lang
+++ b/htdocs/langs/nl_NL/other.lang
@@ -2,6 +2,7 @@
 SecurityCode=Beveiligingscode
 NumberingShort=N°
 Tools=Gereedschap
+TMenuTools=Gereedschap
 ToolsDesc=All miscellaneous tools not included in other menu entries are collected here.<br /><br />All the tools can be reached in the left menu.
 Birthday=Verjaardag
 BirthdayDate=Birthday date
@@ -57,7 +58,7 @@ LinkedObject=Gekoppeld object
 NbOfActiveNotifications=Number of notifications (nb of recipient emails)
 PredefinedMailTest=Dit is een test e-mail.\nDe twee lijnen worden gescheiden door een harde return.
 PredefinedMailTestHtml=Dit is een <b>test</b> e-mail (het woord test moet vetgedrukt worden weergegeven).<br> De twee lijnen worden gescheiden door een harde return.
-PredefinedMailContentSendInvoice=__CONTACTCIVNAME__ \n\n Hierbij sturen wij u de factuur __FACREF__\n\n__PERSONALIZED__Met vriendelijke groeten,\n\n__SIGNATURE__
+PredefinedMailContentSendInvoice=Geachte __CONTACTCIVNAME__,\n\nGraag verwijzen wij u naar de bijlage van dit e-mail bericht, hierin treft u onze factuur met nummer __REF__ aan. Het PDF-bestand in de bijlage kunt u openen met Adobe Reader.\nMet vriendelijke groeten,
 PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice  __REF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendProposal=__CONTACTCIVNAME__Hierbij sturen wij u de offerte __PROPREF__\n\n__PERSONALIZED__Met vriendelijke groeten,\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
@@ -67,14 +68,15 @@ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__ Hierbij sturen wij u
 PredefinedMailContentSendShipping=__CONTACTCIVNAME__ Hier vindt u de verzendkosten __SHIPPINGREF__ __PERSONALIZED__Sincerely __SIGNATURE__
 PredefinedMailContentSendFichInter=__CONTACTCIVNAME__ Hier vindt u de tussenkomst __FICHINTERREF__ __PERSONALIZED__Sincerely __SIGNATURE_
 PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n__PERSONALIZED__\n\n__SIGNATURE__
-DemoDesc=Dolibarr is a compact ERP/CRM supporting several functional modules. A demo showcasing all modules makes no sense as this scenario never occurs. So, several demo profiles are available.
+DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
+ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
 DemoFundation=Ledenbeheer van een stichting
 DemoFundation2=Beheer van de leden en de bankrekening van een stichting
-DemoCompanyServiceOnly=Zelfstandige die alleen diensten aanbiedt
+DemoCompanyServiceOnly=Company or freelance selling service only
 DemoCompanyShopWithCashDesk=Beheren van een winkel met een kassa
-DemoCompanyProductAndStocks=Het beheren van een kleine of middelgrote onderneming met productverkopen
-DemoCompanyAll=Het beheren van een kleine of middelgrote onderneming met meerdere activiteiten (alle modules)
+DemoCompanyProductAndStocks=Company selling products with a shop
+DemoCompanyAll=Company with multiple activities (all main modules)
 CreatedBy=Gecreëerd door %s
 ModifiedBy=Gewijzigd door %s
 ValidatedBy=Gevalideerd door %s
diff --git a/htdocs/langs/nl_NL/products.lang b/htdocs/langs/nl_NL/products.lang
index 1297a720917..e630eca5031 100644
--- a/htdocs/langs/nl_NL/products.lang
+++ b/htdocs/langs/nl_NL/products.lang
@@ -5,6 +5,8 @@ ProductLabelTranslated=Translated product label
 ProductDescriptionTranslated=Translated product description
 ProductNoteTranslated=Translated product note
 ProductServiceCard=Producten / Dienstendetailkaart
+TMenuProducts=Producten
+TMenuServices=Diensten
 Products=Producten
 Services=Diensten
 Product=Product
@@ -58,7 +60,7 @@ SellingPrice=Verkoopprijs
 SellingPriceHT=Verkoopprijs (na aftrek belastingen)
 SellingPriceTTC=Verkoopprijs (inclusief belastingen)
 CostPriceDescription=This price (net of tax) can be used to store the average amount this product cost to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
-CostPriceUsage=In a future version, this value could be used for margin calculation.
+CostPriceUsage=This value could be used for margin calculation.
 SoldAmount=Sold amount
 PurchasedAmount=Purchased amount
 NewPrice=Nieuwe prijs
@@ -140,6 +142,7 @@ ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b>?
 CloneContentProduct=Kloon alle hoofdinformatie van het product / de dienst
 ClonePricesProduct=Kloon hoofdinformatie en prijzen
 CloneCompositionProduct=Clone packaged product/service
+CloneCombinationsProduct=Clone product variants
 ProductIsUsed=Dit product wordt gebruikt
 NewRefForClone=Referentie naar nieuw produkt / dienst
 SellingPrices=Selling prices
@@ -236,7 +239,7 @@ GlobalVariables=Globale variabelen
 VariableToUpdate=Variable to update
 GlobalVariableUpdaters=Globale variabele aanpassers
 UpdateInterval=Update-interval (minuten)
-LastUpdated=Laatst bijgewerkt
+LastUpdated=Latest update
 CorrectlyUpdated=Correct bijgewerkt
 PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
 PropalMergePdfProductChooseFile=Select PDF files
@@ -256,4 +259,41 @@ VolumeUnits=Volume unit
 SizeUnits=Size unit
 DeleteProductBuyPrice=Delete buying price
 ConfirmDeleteProductBuyPrice=Are you sure you want to delete this buying price?
+SubProduct=Sub product
 
+#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
+ProductCombinations=Variants
+HideProductCombinations=Hide products variant in the products selector
+ProductCombination=Variant
+NewProductCombination=New variant
+EditProductCombination=Editing variant
+ProductCombinationGenerator=Variants generator
+Features=Features
+PriceImpact=Price impact
+WeightImpact=Weight impact
+NewProductAttribute=Nieuwe attribuut
+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
+PercentageVariation=Percentage variation
+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 child products
+ConfirmCloneProductCombinations=Would you like to copy all the product variant to the 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
diff --git a/htdocs/langs/nl_NL/projects.lang b/htdocs/langs/nl_NL/projects.lang
index 5d6031f9405..1279279b1d3 100644
--- a/htdocs/langs/nl_NL/projects.lang
+++ b/htdocs/langs/nl_NL/projects.lang
@@ -29,9 +29,9 @@ DeleteAProject=Project verwijderen
 DeleteATask=Taak verwijderen
 ConfirmDeleteAProject=Are you sure you want to delete this project?
 ConfirmDeleteATask=Are you sure you want to delete this task?
-OpenedProjects=Open projects
-OpenedTasks=Open tasks
-OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
+OpenedProjects=Opened projects
+OpenedTasks=Opened tasks
+OpportunitiesStatusForOpenedProjects=Opportunities amount of opened projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=Toon project
 SetProject=Stel project in
@@ -47,7 +47,7 @@ TaskTimeSpent=Tijd besteed aan taken
 TaskTimeUser=Gebruiker
 TaskTimeNote=Notitie
 TaskTimeDate=Datum
-TasksOnOpenedProject=Tasks on open projects
+TasksOnOpenedProject=Taken op geopende projecten
 WorkloadNotDefined=Workload niet gedefinieerd
 NewTimeSpent=Nieuwe bestede tijd
 MyTimeSpent=Mijn bestede tijd
@@ -58,6 +58,7 @@ TaskDateEnd=Taak einddatum
 TaskDescription=Taakomschrijving
 NewTask=Nieuwe taak
 AddTask=Nieuwe taak
+AddTimeSpent=Create time spent
 Activity=Activiteit
 Activities=Taken / activiteiten
 MyActivities=Mijn taken / activiteiten
@@ -95,6 +96,7 @@ ValidateProject=Valideer project
 ConfirmValidateProject=Are you sure you want to validate this project?
 CloseAProject=Sluit project
 ConfirmCloseAProject=Are you sure you want to close this project?
+AlsoCloseAProject=Also close project (keep it open if you still need to follow production tasks on it)
 ReOpenAProject=Project heropenen
 ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=Projectcontacten
@@ -120,7 +122,7 @@ CloneProjectFiles=Kloon project samengevoegde bestanden
 CloneTaskFiles=Kloon taak(en) samengevoegde bestanden (als taak(en) gekloond)
 CloneMoveDate=Update project/tasks dates from now?
 ConfirmCloneProject=Are you sure to clone this project?
-ProjectReportDate=Wijziging datum taak volgens startdatum van het project
+ProjectReportDate=Change task dates according to new project start date
 ErrorShiftTaskDate=Onmogelijk taak datum te verschuiven volgens de nieuwe startdatum van het project
 ProjectsAndTasksLines=Projecten en taken
 ProjectCreatedInDolibarr=Project %s gecreëerd
@@ -177,9 +179,9 @@ ProjectsStatistics=Statistics on projects/leads
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 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.
-OpenedProjectsByThirdparties=Open projects by thirdparties
+OpenedProjectsByThirdparties=Opened projects by thirdparties
 OnlyOpportunitiesShort=Only opportunities
-OpenedOpportunitiesShort=Open opportunities
+OpenedOpportunitiesShort=Opened opportunities
 NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount
diff --git a/htdocs/langs/nl_NL/propal.lang b/htdocs/langs/nl_NL/propal.lang
index bcb51ae15e1..e32cd4cf50b 100644
--- a/htdocs/langs/nl_NL/propal.lang
+++ b/htdocs/langs/nl_NL/propal.lang
@@ -3,7 +3,7 @@ Proposals=Offertes
 Proposal=Offerte
 ProposalShort=Offerte
 ProposalsDraft=Conceptofferte
-ProposalsOpened=Geen open commerciële voorstellen
+ProposalsOpened=Geopende offertes
 Prop=Offertes
 CommercialProposal=Offerte
 ProposalCard=Offertedetailkaart
@@ -26,9 +26,9 @@ AmountOfProposalsByMonthHT=Bedrag per maand (exclusief belastingen)
 NbOfProposals=Aantal offertes
 ShowPropal=Toon offerte
 PropalsDraft=Concepten
-PropalsOpened=Open
+PropalsOpened=Geopend
 PropalStatusDraft=Concept (moet worden gevalideerd)
-PropalStatusValidated=Gevalideerd (Offerte staat open)
+PropalStatusValidated=Validated (proposal is opened)
 PropalStatusSigned=Ondertekend (te factureren)
 PropalStatusNotSigned=Niet ondertekend (gesloten)
 PropalStatusBilled=Gefactureerd
diff --git a/htdocs/langs/nl_NL/stocks.lang b/htdocs/langs/nl_NL/stocks.lang
index 541a532d390..1546dc8a067 100644
--- a/htdocs/langs/nl_NL/stocks.lang
+++ b/htdocs/langs/nl_NL/stocks.lang
@@ -22,13 +22,15 @@ Movements=Mutaties
 ErrorWarehouseRefRequired=Magazijnreferentienaam is verplicht
 ListOfWarehouses=Magazijnenlijst
 ListOfStockMovements=Voorraadmutatielijst
+StockMovementForId=Movement ID %d
+ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Magazijnen
 Location=Locatie
 LocationSummary=Korte naam locatie
 NumberOfDifferentProducts=Aantal verschillende producten
 NumberOfProducts=Totaal aantal producten
-LastMovement=Laatste mutatie
-LastMovements=Laatste mutaties
+LastMovement=Latest movement
+LastMovements=Latest movements
 Units=Eenheden
 Unit=Eenheid
 StockCorrection=Voorraadcorrectie
@@ -140,3 +142,4 @@ ProductStockWarehouseCreated=Stock limit for alert and desired optimal stock cor
 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
diff --git a/htdocs/langs/nl_NL/supplier_proposal.lang b/htdocs/langs/nl_NL/supplier_proposal.lang
index f51af7c13ca..0e140415f98 100644
--- a/htdocs/langs/nl_NL/supplier_proposal.lang
+++ b/htdocs/langs/nl_NL/supplier_proposal.lang
@@ -8,7 +8,7 @@ SearchRequest=Find a request
 DraftRequests=Draft requests
 SupplierProposalsDraft=Draft supplier proposals
 LastModifiedRequests=Latest %s modified price requests
-RequestsOpened=Open price requests
+RequestsOpened=Opened price requests
 SupplierProposalArea=Supplier proposals area
 SupplierProposalShort=Supplier proposal
 SupplierProposals=Leveranciersoffertes
@@ -23,7 +23,7 @@ ConfirmValidateAsk=Are you sure you want to validate this price request under na
 DeleteAsk=Delete request
 ValidateAsk=Validate request
 SupplierProposalStatusDraft=Concept (moet worden gevalideerd)
-SupplierProposalStatusValidated=Validated (request is open)
+SupplierProposalStatusValidated=Validated (request is opened)
 SupplierProposalStatusClosed=Gesloten
 SupplierProposalStatusSigned=Accepted
 SupplierProposalStatusNotSigned=Geweigerd
diff --git a/htdocs/langs/nl_NL/suppliers.lang b/htdocs/langs/nl_NL/suppliers.lang
index 0c969ce3fa3..b180484aba5 100644
--- a/htdocs/langs/nl_NL/suppliers.lang
+++ b/htdocs/langs/nl_NL/suppliers.lang
@@ -9,7 +9,7 @@ ShowSupplier=Toon leverancier
 OrderDate=Besteldatum
 BuyingPriceMin=Best buying price
 BuyingPriceMinShort=Best buying price
-TotalBuyingPriceMinShort=Total of subproducts buying prices
+TotalBuyingPriceMinShort=Totaal van aankoopprijzen subproducten
 TotalSellingPriceMinShort=Total of subproducts selling prices
 SomeSubProductHaveNoPrices=Sommige sub-producten hebben geen prijs ingevuld
 AddSupplierPrice=Add buying price
@@ -24,10 +24,10 @@ ExportDataset_fournisseur_1=Leveranciersfacturenlijst en factuurregels
 ExportDataset_fournisseur_2=Leveranciersfacturen en -betalingen
 ExportDataset_fournisseur_3=Leveranciersorders en orderlijnen
 ApproveThisOrder=Opdracht goedkeuren
-ConfirmApproveThisOrder=Weet u zeker dat u de Opdracht <b>%s</b> wilt goedkeuren?
+ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b>?
 DenyingThisOrder=Wijger deze bestelling
-ConfirmDenyingThisOrder=Weet u zeker dat u deze Opdracht <b>%s</b> wilt weigeren?
-ConfirmCancelThisOrder=Weet u zeker dat u deze Opdracht <b>%s</b> wilt annuleren?
+ConfirmDenyingThisOrder=Are you sure you want to deny this order <b>%s</b>?
+ConfirmCancelThisOrder=Are you sure you want to cancel this order <b>%s</b>?
 AddSupplierOrder=Voeg Leveranciersopdracht toe
 AddSupplierInvoice=Voeg leveranciersfactuur toe
 ListOfSupplierProductForSupplier=Lijst van producten en de prijzen van de leverancier <b>%s</b>
@@ -41,3 +41,4 @@ DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Wrong quality
 ReputationForThisProduct=Reputation
 BuyerName=Buyer name
+AllProductServicePrices=All product / service prices
diff --git a/htdocs/langs/nl_NL/withdrawals.lang b/htdocs/langs/nl_NL/withdrawals.lang
index 57eab1fecb9..1e5c2eac0d7 100644
--- a/htdocs/langs/nl_NL/withdrawals.lang
+++ b/htdocs/langs/nl_NL/withdrawals.lang
@@ -24,6 +24,7 @@ WithdrawStatistics=Direct debit payment statistics
 WithdrawRejectStatistics=Direct debit payment reject statistics
 LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
+WithdrawRequestsDone=%s direct debit payment requests recorded
 ThirdPartyBankCode=Bankcode van derde
 NoInvoiceCouldBeWithdrawed=Geen factuur met succes ingetrokken. Zorg ervoor dat de facturen op bedrijven staan met een geldig BAN (RIB).
 ClassCredited=Classificeer creditering
@@ -76,8 +77,8 @@ RUM=UMR
 RUMLong=Unique Mandate Reference
 RUMWillBeGenerated=UMR number will be generated once bank account information are saved
 WithdrawMode=Direct debit mode (FRST or RECUR)
-WithdrawRequestAmount=Withdraw request amount:
-WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil amount.
+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
diff --git a/htdocs/langs/pl_PL/accountancy.lang b/htdocs/langs/pl_PL/accountancy.lang
index f160d1a95e9..21ed2c370e3 100644
--- a/htdocs/langs/pl_PL/accountancy.lang
+++ b/htdocs/langs/pl_PL/accountancy.lang
@@ -194,6 +194,8 @@ ChangeBinding=Change the binding
 
 ## Admin
 ApplyMassCategories=Apply mass categories
+AddAccountFromBookKeepingWithNoCategories=Add acccount already used with no categories
+CategoryDeleted=Category for the accounting account has been removed
 
 ## Export
 Exports=Eksporty
@@ -209,6 +211,7 @@ Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution
 Modelcsv_quadratus=Export towards Quadratus QuadraCompta
 Modelcsv_ebp=Export towards EBP
 Modelcsv_cogilog=Export towards Cogilog
+ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
 InitAccountancy=Init accountancy
diff --git a/htdocs/langs/pl_PL/admin.lang b/htdocs/langs/pl_PL/admin.lang
index cf29d87f083..4f39e02cbac 100644
--- a/htdocs/langs/pl_PL/admin.lang
+++ b/htdocs/langs/pl_PL/admin.lang
@@ -9,14 +9,20 @@ VersionDevelopment=Rozwój
 VersionUnknown=Nieznany
 VersionRecommanded=Zalecana
 FileCheck=Files integrity checker
-FileCheckDesc=This tool allows you to check the integrity of files of your application, comparing each files with the official ones. You can use this tool to detect if some files were modified by a hacker for example.
+FileCheckDesc=This tool allows you to check the integrity of files and setup of your application, comparing each files with the official ones. 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.
+FileIntegrityIsStrictlyConformedWithReference=Files integrity is strictly conformed with the reference.
+FileIntegrityIsOkButFilesWereAdded=Files integrity check has passed, however some new files were added.
+FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified, removed or added.
+GlobalChecksum=Global checksum
 MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
 LocalSignature=Embedded local signature (less reliable)
 RemoteSignature=Remote distant signature (more reliable)
 FilesMissing=Brakujące pliki
 FilesUpdated=Aktualizacja plików
+FilesModified=Modified Files
+FilesAdded=Added Files
 FileCheckDolibarr=Check integrity of application files
-AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from a certified package
+AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from an official package
 XmlNotFound=Xml Integrity File of application not found
 SessionId=ID sesji
 SessionSaveHandler=Asystent zapisu sesji
@@ -185,7 +191,9 @@ BoxesDesc=Widgety są komponentami pokazującymi pewne informacje, które możes
 OnlyActiveElementsAreShown=Tylko elementy z <a href="%s">aktywnych modułów</a> są widoczne.
 ModulesDesc=Moduły Dolibarr określają funkcjonalności które są włączone w oprogramowaniu. Niektóre moduły wymagają pozwoleń, które musisz przyznać użytkownikom po włączeniu modułu. Kliknij na przycisk on/off w celu włączenia modułu.
 ModulesMarketPlaceDesc=Możesz znaleźć więcej modułów do pobrania na zewnętrznych stronach internetowych...
-ModulesMarketPlaces=Więcej modułów ...
+ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
+ModulesMarketPlaces=Find external modules...
+GoModuleSetupArea=To deploy/install a new module, go onto the Module setup area at <a href="%s">%s</a>.
 DoliStoreDesc=DoliStore, oficjalny kanał dystrybucji zewnętrznych modułów Dolibarr ERP / CRM
 DoliPartnersDesc=List of companies providing custom developed modules or features (Note: anyone experienced in PHP programming can provide custom development for an open source project)
 WebSiteDesc=Reference websites to find more modules...
@@ -276,21 +284,22 @@ ModuleFamilyInterface=Współpraca z systemami zewnętrznymi
 MenuHandlers=Menu obsługi
 MenuAdmin=Edytor menu
 DoNotUseInProduction=Nie używaj w produkcji
-ThisIsProcessToFollow=Jest to proces konfiguracji do:
-ThisIsAlternativeProcessToFollow=To jest alternatywna konfiguracja do procesu:
+ThisIsProcessToFollow=This is steps to process:
+ThisIsAlternativeProcessToFollow=This is an alternative setup to process manually:
 StepNb=Krok %s
 FindPackageFromWebSite=Odnajdź pakiet, który zapewnia wybraną przez Ciebię funkcję (np. na oficjalnej stronie internetowej %s).
 DownloadPackageFromWebSite=Download package (for example from official web site %s).
-UnpackPackageInDolibarrRoot=Unpack package file into Dolibarr server directory dedicated to external modules: <b>%s</b>
-SetupIsReadyForUse=Instalacja została zakończona. Dolibarr jest gotowy do użycia z nowym elementem.
-NotExistsDirect=Alternatywna ścieżka główna nie została zdefiniowana.<br>
-InfDirAlt=Od wersji 3, możliwe jest zdefiniowanie alternatywnego katalogu głównego.Pozwala to na przechowywanie wtyczek i szablonów niestandardowych. <br> Wystarczy utworzyć katalog w katalogu głównym Dolibarr (np: na zamówienie). <br>
-InfDirExample=<br> Następnie deklarowany w pliku conf.php  <br> $ Dolibarr_main_url_root_alt = "http: // myserver / custom" <br> $ Dolibarr_main_document_root_alt = "/ ścieżka / z / Dolibarr / htdocs / obyczaju" <br> * Linie te są skomentowane z "#", aby usunąć komentarz należy jedynie usunąć znak.
+UnpackPackageInDolibarrRoot=Unpack the packaged files into server directory dedicated to Dolibarr: <b>%s</b>
+UnpackPackageInModulesRoot=To deploy/install an external module, unpack the packaged files into the server directory dedicated to modules: <b>%s</b>
+SetupIsReadyForUse=Module deployment is finished. You must however enable and setup the module in your application by going on the page to setup modules: <a href="%s">%s</a>.
+NotExistsDirect=The alternative root directory is not defined to an existing directory.<br>
+InfDirAlt=Since version 3, it is possible to define an alternative root directory. This allows you to store, into a dedicated directory, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
+InfDirExample=<br>Then declare it in the file <strong>conf.php</strong><br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>If these lines are commented with "#", to enable them, just uncomment by removing the "#" character.
 YouCanSubmitFile=For this step, you can send package using this tool: Select module file
 CurrentVersion=Aktualna wersja Dolibarr
 CallUpdatePage=Przejdź na stronę, która pomoże w zaktualizować strukturę bazy danych i dane: %s.
 LastStableVersion=Ostatnia stabilna wersja
-LastActivationDate=Last activation date
+LastActivationDate=Latest activation date
 UpdateServerOffline=Aktualizacja serwera nieaktywny
 GenericMaskCodes=Można wpisać dowolną maskę numeracji. W tej masce, może stosować następujące tagi: <br> <b>{000000}</b> odpowiada liczbie, która jest zwiększona w każdym% s. Wprowadzić dowolną liczbę zer jako żądaną długość licznika. Licznik zostaną zakończone zerami z lewej, aby mieć jak najwięcej zer jak maski. <br> <b>{000000 + 000}</b> sama jak poprzednia, ale przesunięciem odpowiadającym numerem, na prawo od znaku + odnosi się począwszy od pierwszego% s. <br> <b>{000000} @ x,</b> ale sama jak poprzednia licznik jest wyzerowany, gdy miesiąc osiągnięciu x (x od 1 do 12 lub ​​0 do korzystania pierwszych miesiącach roku podatkowego określone w konfiguracji, lub 99 do wyzerowany co miesiąc ). Jeśli opcja ta jest używana, a x jest 2 lub więcej, wymagana jest również to ciąg {rr} {mm} lub {rrrr} {mm}. <br> <b>{Dd}</b> dni (01 do 31). <br> <b>{Mm}</b> miesięcy (01 do 12). <br> <b>{Rr}, {rrrr}</b> lub <b>{r}</b> roku ponad 2, 4 lub 1 liczb. <br>
 GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
@@ -373,11 +382,11 @@ ExtrafieldCheckBox=Pole wyboru
 ExtrafieldRadio=Przełącznik
 ExtrafieldCheckBoxFromList= Pole z tabeli
 ExtrafieldLink=Link do obiektu
-ExtrafieldParamHelpselect=Lista parametrów musi być zgodna z wartością klucza <br><br> Na przykład: <br> 1, wartość1 <br> 2, wartość2 <br> 3, wartość3 <br> ... <br><br> W celu uzyskania listy zależnej: <br> 1, wartość1 | parent_list_code: parent_key <br> 2, wartość2 | parent_list_code: parent_key
+ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list :<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list :<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=Parametry lista musi tak być, wartość klucza <br><br> Na przykład: <br> 1, wartosc1 <br> 2, wartość2 <br> 3, wartość3 <br> ...
 ExtrafieldParamHelpradio=Parametry lista musi tak być, wartość klucza <br><br> Na przykład: <br> 1, wartosc1 <br> 2, wartość2 <br> 3, wartość3 <br> ...
-ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
-ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
+ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parametry muszą być ObjectName: Classpath <br> Składnia: ObjectName: Classpath <br> Przykład: Societe: Societe / klasa / societe.class.php
 LibraryToBuildPDF=Biblioteka używana do generowania plików PDF
 WarningUsingFPDF=Uwaga: Twój <b>conf.php</b> zawiera dyrektywę <b>dolibarr_pdf_force_fpdf = 1.</b> Oznacza to, że korzystasz z biblioteki FPDF do generowania plików PDF. Ta biblioteka jest nieaktualna i nie obsługuje wielu funkcji (Unicode, przejrzystości obrazu, cyrylicy, czcionek arabskich oraz azjatyckich ...), więc mogą wystąpić błędy podczas generowania pliku PDF. <br> Aby rozwiązać ten problem i mieć pełne wsparcie przy generowaniu plików PDF, należy pobrać <a href="http://www.tcpdf.org/" target="_blank">bibliotekę TCPDF</a> , następnie linię umieścić wewnątrz komentarza lub usunąć <b>$ dolibarr_pdf_force_fpdf = 1,</b> i dodać zamiast <b>$ dolibarr_lib_TCPDF_PATH = "path_to_TCPDF_dir"</b>
@@ -411,10 +420,11 @@ ModuleCompanyCodePanicum=Wróć pusty rachunkowych kodu.
 ModuleCompanyCodeDigitaria=Księgowość kod zależy od trzeciej kodu. Kod składa się z charakterem "C" na pierwszej pozycji, po którym następuje pierwsze 5 znaków w kodzie kontrahenta.
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
-
+WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<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).
+ClickToShowDescription=Click to show description
 # Modules
 Module0Name=Użytkownicy i grupy
-Module0Desc=Zarządzanie użytkownikami oraz grupami
+Module0Desc=Users / Employees and Groups management
 Module1Name=Kontrahenci
 Module1Desc=Zarządzanie firmami oraz kontaktami (klienci, prospekty...)
 Module2Name=Reklama
@@ -515,8 +525,8 @@ Module2200Name=Dynamiczne Ceny
 Module2200Desc=Włącz użycie wyrażeń matematycznych dla cen
 Module2300Name=Cron
 Module2300Desc=Zaplanowane zarządzanie zadaniami
-Module2400Name=Agenda/Events
-Module2400Desc=Follow events or rendez-vous. Record manual events into Agendas or let application logs automatic events for tracking purposes.
+Module2400Name=Events/Agenda
+Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous.
 Module2500Name=Zarządzanie zawartością elektroniczną (ECM)
 Module2500Desc=Zapisz i udostępnij dokumenty
 Module2600Name=API services (Web services SOAP)
@@ -582,7 +592,7 @@ Permission34=Usuwanie produktów
 Permission36=Podejrzyj / zarządzaj ukrytymi produktami
 Permission38=Eksport produktów
 Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
-Permission42=Tworzenie / modyfikacja projektów (projekty współdzielone oraz projekty, w których biorę udział)
+Permission42=Create/modify projects (shared project and projects i'm contact for). Can also create tasks and assign users to project and tasks
 Permission44=Usuwanie projektów (projekty współdzielone oraz projekty, w których biorę udział)
 Permission45=Export projects
 Permission61=Czytaj interwencje
@@ -685,7 +695,7 @@ PermissionAdvanced253=Tworzenie / modyfikacja wewnętrznych / zewnętrznych uży
 Permission254=Tworzenie / modyfikacja jedynie zewnętrznych użytkowników
 Permission255=Modyfikacja haseł innych użytkowników
 Permission256=Usuń lub dezaktywuj innych użytkowników
-Permission262=Rozszerzenie dostępu do wszystkich stron trzecich (nie tylko tych związanych z użytkownikiem). Nie skuteczne dla użytkowników zewnętrznych (zawsze ograniczone do ich samych).
+Permission262=Extend access to all third parties (not only third parties that user is a sale representative).<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 assignement matters).
 Permission271=Czytaj CA
 Permission272=Czytaj faktury
 Permission273=Wystawienie faktur
@@ -887,7 +897,7 @@ Offset=Offset
 AlwaysActive=Zawsze aktywne
 Upgrade=Uaktualnij
 MenuUpgrade=Uaktualnij / Rozszerz
-AddExtensionThemeModuleOrOther=Dodaj rozszerzenie (temat, moduł, ...)
+AddExtensionThemeModuleOrOther=Deploy/install external module
 WebServer=Serwer sieciowy
 DocumentRootServer=Katalog główny serwera sieciowego
 DataRootServer=Katalogi plików danych
@@ -994,7 +1004,7 @@ TriggerAlwaysActive=Wyzwalacze w tym pliku są zawsze aktywne, niezależnie są
 TriggerActiveAsModuleActive=Wyzwalacze w tym pliku są aktywne jako <b>modułu %s</b> jest aktywny.
 GeneratedPasswordDesc=Określ tutaj reguły, które chcesz użyć do wygenerowania nowego hasła, jeśli zapyta się automatycznie wygenerowane hasło
 DictionaryDesc=Insert all reference data. You can add your values to the default.
-ConstDesc=This page allows you to edit all other parameters not available in previous pages. These are mostly reserved parameters for developers or advanced troubleshooting.
+ConstDesc=This page allows you to edit all other parameters not available in previous pages. These are mostly reserved parameters for developers or advanced troubleshooting. For a list of options <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">check here</a>.
 MiscellaneousDesc=All other security related parameters are defined here.
 LimitsSetup=Ograniczenia / Precision konfiguracji
 LimitsDesc=Można określić limity, doprecyzowanie i optymalizacje stosowane przez Dolibarr tutaj
@@ -1161,10 +1171,6 @@ FreeLegalTextOnOrders=Wolny tekst na zamówienie
 WatermarkOnDraftOrders=Znak wodny w sprawie projektów zamówień (brak jeśli pusty)
 ShippableOrderIconInList=Dodaj ikonę w liście zamówień, które wskazują, czy zamówienie jest shippable
 BANK_ASK_PAYMENT_BANK_DURING_ORDER=Zapytaj o rachunku bankowego przeznaczenia porządku
-##### Clicktodial #####
-ClickToDialSetup=Kliknij, aby Dial konfiguracji modułu
-ClickToDialUrlDesc=Url called when a click on phone picto is done.  Dans l'url, vous pouvez utiliser les balises<br><b>__PHONETO__</b> qui sera remplacé par le téléphone de l'appelé<br><b>__PHONEFROM__</b> qui sera remplacé par le téléphone de l'appelant (le votre)<br><b>__LOGIN__</b> qui sera remplacé par votre login clicktodial (défini sur votre fiche utilisateur)<br><b>__PASS__</b> qui sera remplacé par votre mot de passe clicktodial (défini sur votre fiche utilisateur).
-##### Bookmark4u #####
 ##### Interventions #####
 InterventionsSetup=Interwencje konfiguracji modułu
 FreeLegalTextOnInterventions=Darmowe tekst na dokumenty interwencji
@@ -1391,7 +1397,7 @@ SendingsSetup=Konfiguracja modułu wysyłek
 SendingsReceiptModel=Wysyłanie otrzymania modelu
 SendingsNumberingModules=Sendings numerowania modułów
 SendingsAbility=Obsługuj arkusze wysyłkowe dla dostaw do klientów
-NoNeedForDeliveryReceipts=W większości przypadków, sendings wpływy są wykorzystywane zarówno jako karty klienta dostaw (wykaz produktów wysłać) i arkusze, które są recevied i podpisana przez klienta. Więc produktu dostaw wpływów jest powielony funkcji i rzadko jest włączony.
+NoNeedForDeliveryReceipts=In most cases, shipping sheets are used both as sheets for customer deliveries (list of products to send) and sheets that is received and signed by customer. So product deliveries receipts is a duplicated feature and is rarely activated.
 FreeLegalTextOnShippings=Dowolny tekst sprawie przemieszczania
 ##### Deliveries #####
 DeliveryOrderNumberingModules=Produkty dostaw otrzymania numeracji modułu
@@ -1471,7 +1477,11 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Set automatically this default value for type of e
 AGENDA_DEFAULT_FILTER_TYPE=Ustaw automatycznie tego typu imprezy w filtrze wyszukiwania widzenia porządku obrad
 AGENDA_DEFAULT_FILTER_STATUS=Ustaw automatycznie tego stanu dla wydarzeń w filtrze wyszukiwania widzenia porządku obrad
 AGENDA_DEFAULT_VIEW=Która karta chcesz otworzyć domyślnie po wybraniu menu Agendę
-##### ClickToDial #####
+AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
+AGENDA_NOTIFICATION_SOUND=Enable sound notification
+##### Clicktodial #####
+ClickToDialSetup=Kliknij, aby Dial konfiguracji modułu
+ClickToDialUrlDesc=Url called when a click on phone picto is done.  Dans l'url, vous pouvez utiliser les balises<br><b>__PHONETO__</b> qui sera remplacé par le téléphone de l'appelé<br><b>__PHONEFROM__</b> qui sera remplacé par le téléphone de l'appelant (le votre)<br><b>__LOGIN__</b> qui sera remplacé par votre login clicktodial (défini sur votre fiche utilisateur)<br><b>__PASS__</b> qui sera remplacé par votre mot de passe clicktodial (défini sur votre fiche utilisateur).
 ClickToDialDesc=Moduł ten pozwala dodać ikonę po numer telefonu Dolibarr kontakty. Kliknięcie na tę ikonę, będzie połączenie z serveur z danego adresu URL można zdefiniować poniżej. Może to być wykorzystane, aby połączyć się z Call Center z systemu Dolibarr, że mogą dzwonić na numer telefonu SIP system przykład.
 ClickToDialUseTelLink=Używaj tylko łącza "tel:" na numery telefonów
 ClickToDialUseTelLinkDesc=Użyj tej metody, jeśli użytkownicy mają softphone lub interfejs oprogramowania zainstalowanego na tym samym komputerze, niż przeglądarce i nazywa się po kliknięciu na link w przeglądarce, które zaczynają się od "tel:". Jeśli potrzebujesz pełne rozwiązanie serwera (bez potrzeby instalacji oprogramowania lokalnego), należy ustawić na "Nie" i wypełnić następne pole.
@@ -1499,10 +1509,11 @@ EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint availa
 ##### API ####
 ApiSetup=API module setup
 ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
-ApiProductionMode=Enable production mode
+ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
 ApiExporerIs=You can explore the APIs at url
 OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
 ApiKey=Key for API
+WarningAPIExplorerDisabled=The API explorer has been disabled. API explorer is not required to provide API services. It is a tool for developer to find/test REST APIs. If you need this tool, go into setup of module API REST to activate it.
 ##### Bank #####
 BankSetupModule=Bank konfiguracji modułu
 FreeLegalTextOnChequeReceipts=Darmowy czek tekst na wpływy
@@ -1571,7 +1582,7 @@ 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:
 SomethingMakeInstallFromWebNotPossible2=Z tego powodu, proces uaktualnienia tutaj opisany jest jednie krokiem manualnym, który wykonać może uprawniony użytkownik.
 InstallModuleFromWebHasBeenDisabledByFile=Instalacja zewnętrznych modułów z poziomu aplikacji została wyłączona przez administratora. Musisz poprosić go o usunięcie pliku <strong>%s</strong> aby włączyć odpowiednią funkcję.
-ConfFileMuseContainCustom=Installing an external module from application save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to have option<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
+ConfFileMuseContainCustom=Installing an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
 HighlightLinesColor=Kolor podświetlenia linii przy najechaniu na nią myszą (pozostaw puste jeżeli ma nie być podświetlona)
 TextTitleColor=Kolor tytułu strony
@@ -1601,6 +1612,7 @@ FixTZ=Strefa czasowa fix
 FillFixTZOnlyIfRequired=Example: +2 (fill only if problem experienced)
 ExpectedChecksum=Expected Checksum
 CurrentChecksum=Current Checksum
+ForcedConstants=Required constant values
 MailToSendProposal=To send customer proposal
 MailToSendOrder=To send customer order
 MailToSendInvoice=To send customer invoice
@@ -1609,13 +1621,14 @@ MailToSendIntervention=To send intervention
 MailToSendSupplierRequestForQuotation=To send quotation request to supplier
 MailToSendSupplierOrder=To send supplier order
 MailToSendSupplierInvoice=To send supplier invoice
+MailToSendContract=To send a contract
 MailToThirdparty=To send email from third party page
 ByDefaultInList=Pokaż domyślnie w widoku listy
-YouUseLastStableVersion=Używasz ostatniej stabilej wersji
+YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=Przykład wiadomości można użyć, aby ogłosić to główne wydanie (prosimy używać go na swoich stronach internetowych)
 TitleExampleForMaintenanceRelease=Przykład wiadomości można użyć, aby ogłosić wydanie konserwacji (prosimy używać go na swoich stronach internetowych)
-ExampleOfNewsMessageForMajorRelease=Dolibarr ERP i CRM% s jest dostępna. Wersja% s jest głównym wydaniu z wielu nowych funkcji dla użytkowników i deweloperów. Można go pobrać z pobierania obszarze http://www.dolibarr.org Portal (podkatalogów wersji stabilnej). Możesz przeczytać <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> do pełnej listy zmian.
-ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP i CRM% s jest dostępna. Wersja% s jest wersja konserwacji, dlatego zawiera tylko poprawki robaki. Polecamy wszystkim, korzystasz ze starszej wersji uaktualnienia do tego. W każdym wydaniu konserwacji, bez nowych funkcji, ani zmiany struktury danych jest obecna w tej wersji. Można go pobrać z pobierania obszarze http://www.dolibarr.org Portal (podkatalogów wersji stabilnej). Możesz przeczytać <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> do pełnej listy zmian.
+ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. 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.
+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, nor data structure change is present into 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=Gdy opcja "Kilka poziom cen na produkt / usługę" jest włączone, można zdefiniować różne ceny (jeden na poziomie cen) dla każdego produktu. Aby zaoszczędzić czas, można wprowadzić tutaj rządzić mieć cenę każdego poziomu autocalculated według ceny pierwszym poziomie, więc trzeba będzie wprowadzić tylko cenę za pierwszego poziomu na każdym produkcie. Ta strona jest tutaj, aby zaoszczędzić czas i może być przydatne tylko wtedy, jeśli ceny każdego poziomó są w stosunku do pierwszego poziomu. Można zignorować tę stronę w większości przypadków.
 ModelModulesProduct=Templates for product documents
 ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
diff --git a/htdocs/langs/pl_PL/banks.lang b/htdocs/langs/pl_PL/banks.lang
index eb97d4ace2c..e22aa91fd65 100644
--- a/htdocs/langs/pl_PL/banks.lang
+++ b/htdocs/langs/pl_PL/banks.lang
@@ -74,13 +74,13 @@ Conciliate=Ugłaskać
 Conciliation=Rekoncyliacja
 ReconciliationLate=Reconciliation late
 IncludeClosedAccount=Dołącz zamknięte rachunki
-OnlyOpenedAccount=Tylko otwarte konta
+OnlyOpenedAccount=Tylko otworzyła rachunek
 AccountToCredit=Konto do kredytów
 AccountToDebit=Konto do obciążania
 DisableConciliation=Wyłącz funkcję rekoncyliacji dla tego konta
 ConciliationDisabled=Funkcja rekoncyliacji wyłączona
 LinkedToAConciliatedTransaction=Linked to a conciliated entry
-StatusAccountOpened=Otwórz
+StatusAccountOpened=Otwierany
 StatusAccountClosed=Zamknięte
 AccountIdShort=Liczba
 LineRecord=Transakcja
diff --git a/htdocs/langs/pl_PL/bills.lang b/htdocs/langs/pl_PL/bills.lang
index 73400231752..4bfd3aa7ca9 100644
--- a/htdocs/langs/pl_PL/bills.lang
+++ b/htdocs/langs/pl_PL/bills.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - bills
 Bill=Faktura
 Bills=Faktury
-BillsCustomers=Faktury klientów
-BillsCustomer=Faktura klientów
+BillsCustomers=Faktury klienta
+BillsCustomer=Faktura klienta
 BillsSuppliers=Faktury dostawców
-BillsCustomersUnpaid=Niezapłacone faktury klientów
-BillsCustomersUnpaidForCompany=Nie zapłacone faktury klientów dla %s
-BillsSuppliersUnpaid=Niezapłacone faktury dostawców
-BillsSuppliersUnpaidForCompany=Nie zapłacone faktury dostawców dla %s
+BillsCustomersUnpaid=Niezapłacone faktury klienta
+BillsCustomersUnpaidForCompany=Unpaid customer invoices for %s
+BillsSuppliersUnpaid=Niezapłacone faktury dostawcy
+BillsSuppliersUnpaidForCompany=Unpaid supplier invoices for %s
 BillsLate=Opóźnienia w płatnościach
 BillsStatistics=Statystyki faktur klientów
 BillsStatisticsSuppliers=Statystyki faktur dostawców
@@ -62,8 +62,8 @@ PaymentsBack=Zwroty płatności
 paymentInInvoiceCurrency=in invoices currency
 PaidBack=Spłacona
 DeletePayment=Usuń płatności
-ConfirmDeletePayment=Are you sure you want to delete this payment?
-ConfirmConvertToReduc=Do you want to convert this credit note or deposit 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.
+ConfirmDeletePayment=Czy na pewno 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.
 SupplierPayments=Płatności dostawców
 ReceivedPayments=Otrzymane płatności
 ReceivedCustomersPayments=Zaliczki otrzymane od klientów
@@ -78,6 +78,7 @@ PaymentMode=Typ płatności
 PaymentTypeDC=Debit/Credit Card
 PaymentTypePP=PayPal
 IdPaymentMode=Payment type (id)
+CodePaymentMode=Payment type (code)
 LabelPaymentMode=Payment type (label)
 PaymentModeShort=Typ płatności
 PaymentTerm=Zasady płatności
@@ -102,9 +103,10 @@ SearchACustomerInvoice=Szukaj faktury klienta
 SearchASupplierInvoice=Szukaj faktury dostawcy
 CancelBill=Anulowanie faktury
 SendRemindByMail=Wyślij przypomnienie / ponaglenie mailem
-DoPayment=Wykonaj płatność
-DoPaymentBack=Zwróć płatność
+DoPayment=Enter payment
+DoPaymentBack=Enter refund
 ConvertToReduc=Zamień na przyszły rabat
+ConvertExcessReceivedToReduc=Convert excess received into future discount
 EnterPaymentReceivedFromCustomer=Wprowadź płatności otrzymane od klienta
 EnterPaymentDueToCustomer=Dokonaj płatności dla klienta
 DisabledBecauseRemainderToPayIsZero=Nieaktywne, ponieważ upływająca nieopłacona kwota wynosi zero
@@ -113,22 +115,24 @@ BillStatus=Status faktury
 StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Projekt (musi zostać zatwierdzone)
 BillStatusPaid=Płatność
-BillStatusPaidBackOrConverted=Płatność lub konwersja do zniżki
+BillStatusPaidBackOrConverted=Refund or converted into discount
 BillStatusConverted=Płatność (gotowe do finalnej faktury)
 BillStatusCanceled=Opuszczony
 BillStatusValidated=Zatwierdzona (trzeba zapłacić)
 BillStatusStarted=Rozpoczęcie
 BillStatusNotPaid=Brak zapłaty
+BillStatusNotRefunded=Not refunded
 BillStatusClosedUnpaid=Zamknięte (nie zapłacone)
 BillStatusClosedPaidPartially=Opłacone (częściowo)
 BillShortStatusDraft=Szkic
 BillShortStatusPaid=Płatność
-BillShortStatusPaidBackOrConverted=Przetworzone
+BillShortStatusPaidBackOrConverted=Refund or converted
 BillShortStatusConverted=Przetworzone
 BillShortStatusCanceled=Opuszczone
 BillShortStatusValidated=Zatwierdzone
 BillShortStatusStarted=Rozpoczęcie
 BillShortStatusNotPaid=Brak wpłaty
+BillShortStatusNotRefunded=Not refunded
 BillShortStatusClosedUnpaid=Zamknięte
 BillShortStatusClosedPaidPartially=Opłacono (częściowo)
 PaymentStatusToValidShort=Do potwierdzenia
@@ -149,14 +153,14 @@ NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified
 FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
 NotARecurringInvoiceTemplate=Not a recurring template invoice
 NewBill=Nowa faktura
-LastBills=Ostatnia %s faktur
-LastCustomersBills=Ostatnia %s odbiorców faktur
-LastSuppliersBills=Ostatnie %s faktury dostawców
+LastBills=Latest %s invoices
+LastCustomersBills=Latest %s customer invoices
+LastSuppliersBills=Latest %s supplier invoices
 AllBills=Wszystkie faktury
 OtherBills=Inne faktury
 DraftBills=Projekt faktur
-CustomersDraftInvoices=Projekt faktury klienta
-SuppliersDraftInvoices=Projekt faktury dostawcy
+CustomersDraftInvoices=Customer draft invoices
+SuppliersDraftInvoices=Supplier draft invoices
 Unpaid=Należne wpłaty
 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>?
@@ -203,7 +207,7 @@ AlreadyPaidNoCreditNotesNoDeposits=Zapłacono (bez not kredytowych i depozytów)
 Abandoned=Porzucone
 RemainderToPay=Nieopłacone
 RemainderToTake=Pozostała kwota do podjęcia
-RemainderToPayBack=Pozostała kwota do zwrotu
+RemainderToPayBack=Remaining amount to refund
 Rest=W oczekiwaniu
 AmountExpected=Kwota twierdził
 ExcessReceived=Trop Peru
@@ -270,6 +274,7 @@ Deposit=Depozyt
 Deposits=Depozyty
 DiscountFromCreditNote=Rabat od kredytu pamiętać %s
 DiscountFromDeposit=Płatności z depozytu faktury %s
+DiscountFromExcessReceived=Payments from excess received of invoice %s
 AbsoluteDiscountUse=Tego rodzaju kredyt może być użyta na fakturze przed jej zatwierdzeniem
 CreditNoteDepositUse=Invoice must be validated to use this kind of credits
 NewGlobalDiscount=Nowe zniżki
@@ -277,8 +282,8 @@ NewRelativeDiscount=Nowe zniżki w stosunku
 NoteReason=Uwaga / Reason
 ReasonDiscount=Powód
 DiscountOfferedBy=Przyznane przez
-DiscountStillRemaining=Rabat nadal pozostały
-DiscountAlreadyCounted=Rabat już policzone
+DiscountStillRemaining=Discounts available
+DiscountAlreadyCounted=Discounts already consumed
 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.
@@ -331,10 +336,12 @@ 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
 # PaymentConditions
 Statut=Status
-PaymentConditionShortRECEP=Niezwłocznie
-PaymentConditionRECEP=Niezwłocznie
+PaymentConditionShortRECEP=Due Upon Receipt
+PaymentConditionRECEP=Due Upon Receipt
 PaymentConditionShort30D=30 dni
 PaymentCondition30D=30 dni
 PaymentConditionShort30DENDMONTH=30 days of month-end
@@ -349,6 +356,14 @@ PaymentConditionShortPT_ORDER=Zamówienie
 PaymentConditionPT_ORDER=Przy zamówieniu
 PaymentConditionShortPT_5050=50-50
 PaymentConditionPT_5050=50 %% z góry, 50%% przy dostawie
+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
 FixAmount=Kwota Fix
 VarAmount=Zmienna ilość (%% tot.)
 # PaymentType
@@ -418,7 +433,7 @@ ChequeDeposits=Czeki depozytów
 Cheques=Czeki
 DepositId=ID depozytu
 NbCheque=Ilość czeków
-CreditNoteConvertedIntoDiscount=Ta notatka została kredytu przeliczona na %s
+CreditNoteConvertedIntoDiscount=This %s has been converted into %s
 UsBillingContactAsIncoiveRecipientIfExist=Użyj rozliczeniowe klienta adres kontaktowy zamiast trzeciej adres odbiorcy za faktury
 ShowUnpaidAll=Pokaż wszystkie niezapłacone faktury
 ShowUnpaidLateOnly=Pokaż późno unpaid fakturze tylko
diff --git a/htdocs/langs/pl_PL/boxes.lang b/htdocs/langs/pl_PL/boxes.lang
index dc0df3c6450..42bb705b371 100644
--- a/htdocs/langs/pl_PL/boxes.lang
+++ b/htdocs/langs/pl_PL/boxes.lang
@@ -8,7 +8,7 @@ BoxLastCustomerBills=Ostatnie faktury klientów
 BoxOldestUnpaidCustomerBills=Najstarsze niezapłacone faktury klientów
 BoxOldestUnpaidSupplierBills=Najstarsze niezapłacone faktury dostawców
 BoxLastProposals=Latest commercial proposals
-BoxLastProspects=Latest modified prospects
+BoxLastProspects=Ostatnio zmodyfikowane perspektywy
 BoxLastCustomers=Ostatni modyfikowani klienci
 BoxLastSuppliers=Ostatni modyfikowani dostawcy
 BoxLastCustomerOrders=Ostatnie zamówienia klienta
@@ -19,21 +19,21 @@ BoxLastMembers=Ostatni członkowie
 BoxFicheInter=Ostatnie interwencje
 BoxCurrentAccounts=Otwórz bilans konta
 BoxTitleLastRssInfos=Ostatnie %s wiadomości z %s
-BoxTitleLastProducts=Ostatnie %s modyfikowanych produktów/usług
+BoxTitleLastProducts=Ostatnich %s modyfikowanych produktów/usług
 BoxTitleProductsAlertStock=Produkty w alercie magazynowym
 BoxTitleLastSuppliers=Latest %s recorded suppliers
 BoxTitleLastModifiedSuppliers=Ostatnie %s modyfikowanych dostawców
 BoxTitleLastModifiedCustomers=Ostatnie %s modyfikowanych klientów
-BoxTitleLastCustomersOrProspects=Latest %s customers or prospects
-BoxTitleLastCustomerBills=Ostatnie %s faktur klientów
-BoxTitleLastSupplierBills=Ostatnie %s faktur dostawców
-BoxTitleLastModifiedProspects=Latest %s modified prospects
+BoxTitleLastCustomersOrProspects=Ostatnich %s klientów lub potencjalnych klientów
+BoxTitleLastCustomerBills=Latest %s customer invoices
+BoxTitleLastSupplierBills=Latest %s supplier invoices
+BoxTitleLastModifiedProspects=Ostatnich %s zmodyfikowanych perspektyw
 BoxTitleLastModifiedMembers=Ostatnich %s członków
 BoxTitleLastFicheInter=Latest %s modified interventions
 BoxTitleOldestUnpaidCustomerBills=Najstarszych %s niezapłaconych faktur klienta
 BoxTitleOldestUnpaidSupplierBills=Najstarszych %s niezapłaconych faktur dostawcy
 BoxTitleCurrentAccounts=Bilans otwartych kont
-BoxTitleLastModifiedContacts=Ostatnie %s zmodyfikowanych kontaktów/adresów
+BoxTitleLastModifiedContacts=Ostatnich %s zmodyfikowanych kontaktów/adresów
 BoxMyLastBookmarks=My latest %s bookmarks
 BoxOldestExpiredServices=Najstarsze aktywne przeterminowane usługi
 BoxLastExpiredServices=Ostanich %s najstarszych kontaktów z aktywnymi upływającymi usługami
@@ -51,12 +51,12 @@ ClickToAdd=Kliknij tutaj, aby dodać.
 NoRecordedCustomers=Brak zarejestrowanych klientów
 NoRecordedContacts=Brak zapisanych kontaktów
 NoActionsToDo=Brak działań do wykonania
-NoRecordedOrders=Brak zarejestrowanych zamówień klientów
+NoRecordedOrders=No recorded customer orders
 NoRecordedProposals=Brak zarejestrowanych wniosków
-NoRecordedInvoices=Brak zarejestrowanych faktur klientów
-NoUnpaidCustomerBills=Brak niezapłaconych faktur
-NoUnpaidSupplierBills=Brak niezapłaconych faktur dostawców
-NoModifiedSupplierBills=Brak zarejestrowanych faktur dostawców
+NoRecordedInvoices=No recorded customer invoices
+NoUnpaidCustomerBills=No unpaid customer invoices
+NoUnpaidSupplierBills=No unpaid supplier invoices
+NoModifiedSupplierBills=No recorded supplier invoices
 NoRecordedProducts=Brak zarejestrowanych produktów / usług
 NoRecordedProspects=Brak potencjalnyc klientów
 NoContractedProducts=Brak produktów/usług zakontraktowanych
@@ -75,10 +75,10 @@ BoxProductDistributionFor=Dystrybucja z %s dla %s
 BoxTitleLastModifiedSupplierBills=Ostatnie %s zmodyfikowanych rachunków dostawców
 BoxTitleLatestModifiedSupplierOrders=Ostatnie %s zmodyfikowanych zamówień dostawców
 BoxTitleLastModifiedCustomerBills=Ostatnie %s zmodyfikowanych rachunków klientów
-BoxTitleLastModifiedCustomerOrders=Ostatnie %s zmodyfikowanych zamówień klientów
+BoxTitleLastModifiedCustomerOrders=Ostatnich %s modyfikowanych zamówień klientów
 BoxTitleLastModifiedPropals=Latest %s modified propals
 ForCustomersInvoices=Faktury Klientów
 ForCustomersOrders=Zamówienia klientów
 ForProposals=Oferty
 LastXMonthRolling=The latest %s month rolling
-ChooseBoxToAdd=Dodaj widget do swojej tablicy
+ChooseBoxToAdd=Dodaj widget do swojej tablicy...
diff --git a/htdocs/langs/pl_PL/companies.lang b/htdocs/langs/pl_PL/companies.lang
index 011aeff61c7..f9ace0a92cf 100644
--- a/htdocs/langs/pl_PL/companies.lang
+++ b/htdocs/langs/pl_PL/companies.lang
@@ -78,6 +78,10 @@ VATIsNotUsed=Nie jest płatnikiem VAT
 CopyAddressFromSoc=Fill address with third party address
 ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
 PaymentBankAccount=Payment bank account
+OverAllProposals=Total proposals
+OverAllOrders=Total orders
+OverAllInvoices=Total invoices
+OverAllSupplierProposals=Total price requests
 ##### Local Taxes #####
 LocalTax1IsUsed=Użyj drugiego podatku
 LocalTax1IsUsedES= RE jest używany
@@ -239,6 +243,10 @@ ProfId3RU=Prof Id 3 (KPP)
 ProfId4RU=Prof Id 4 (Okpo)
 ProfId5RU=-
 ProfId6RU=-
+ProfId1DZ=RC
+ProfId2DZ=Art.
+ProfId3DZ=NIF
+ProfId4DZ=NIS
 VATIntra=NIP
 VATIntraShort=NIP
 VATIntraSyntaxIsValid=Składnia jest poprawna
@@ -382,8 +390,9 @@ ListCustomersShort=Lista klientów
 ThirdPartiesArea=Zamówienie i konktakt 
 LastModifiedThirdParties=Ostatnich %s modyfikowanych kontrahentów
 UniqueThirdParties=Łącznie unikatowych kontrahentów
-InActivity=Otwarte
+InActivity=Otwierany
 ActivityCeased=Zamknięte
+ThirdPartyIsClosed=Third party is closed
 ProductsIntoElements=Lista produktów/usług w %s
 CurrentOutstandingBill=Biężący, niezapłacony rachunek
 OutstandingBill=Maksymalna kwota niezapłaconego rachunku
@@ -396,7 +405,7 @@ MergeThirdparties=Scal kontrahentów
 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 so you will be able to delete the duplicate one.
 ThirdpartiesMergeSuccess=Kontrahenci zostali scaleni
 SaleRepresentativeLogin=Login of sales representative
-SaleRepresentativeFirstname=Firstname of sales representative
-SaleRepresentativeLastname=Lastname of sales representative
+SaleRepresentativeFirstname=First name of sales representative
+SaleRepresentativeLastname=Last name of sales representative
 ErrorThirdpartiesMerge=Wystąpił błąd podczas usuwania kontrahenta. Sprawdź logi. Zmiany zostały cofnięte.
 NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/pl_PL/compta.lang b/htdocs/langs/pl_PL/compta.lang
index 72aadbcefd8..4fe290d65ce 100644
--- a/htdocs/langs/pl_PL/compta.lang
+++ b/htdocs/langs/pl_PL/compta.lang
@@ -16,7 +16,7 @@ Account=Konto
 Accountparent=Konto rodzic
 Accountsparent=Konta rodzica
 Income=Przychody
-Outcome=Rezultat
+Outcome=Rozchody
 ReportInOut=Przychody/Koszty
 ReportTurnover=Obrót
 PaymentsNotLinkedToInvoice=Płatność nie dowiązana do żadnej faktury, więc nie dowiązana do żadnego kontrahenta
@@ -65,6 +65,7 @@ PaymentSocialContribution=Płatność za ZUS/podatek
 PaymentVat=Zapłata podatku VAT
 ListPayment=Wykaz płatności
 ListOfCustomerPayments=Lista płatności klientów
+ListOfSupplierPayments=Lista płatności dostawców
 DateStartPeriod=Data początku okresu
 DateEndPeriod=Data końca okresu
 newLT1Payment=Nowa płatność podatku 2
@@ -81,7 +82,7 @@ LT2PaymentES=Płatność IRPF
 LT2PaymentsES=Płatności IRPF
 VATPayment=Sales tax payment
 VATPayments=Sales tax payments
-VATRefund=Sales tax refund Refund
+VATRefund=Sales tax refund
 Refund=Zwrot
 SocialContributionsPayments=Płatności za ZUS/podatki
 ShowVatPayment=Pokaż płatności za podatek VAT
@@ -194,7 +195,7 @@ CloneTax=Powiel opłatę za ZUS/podatek
 ConfirmCloneTax=Potwierdź powielenie płatności za ZUS/podatek
 CloneTaxForNextMonth=Powiel to na następny miesiąc
 SimpleReport=Prosty raport
-AddExtraReport=Raport rozszerzony
+AddExtraReport=Extra reports (add foreign and national customer report)
 OtherCountriesCustomersReport=Raport o klientach zagranicznych
 BasedOnTwoFirstLettersOfVATNumberBeingDifferentFromYourCompanyCountry=Oparty na dwóch pierwszych literach numeru VAT EU, które się różnią od kodu kraju , gdzie zarejetrowana jest Twoja firma.
 SameCountryCustomersWithVAT=Raport o klientach krajowych
diff --git a/htdocs/langs/pl_PL/cron.lang b/htdocs/langs/pl_PL/cron.lang
index d2bc42c37f6..9e2b50a7987 100644
--- a/htdocs/langs/pl_PL/cron.lang
+++ b/htdocs/langs/pl_PL/cron.lang
@@ -17,14 +17,14 @@ CronMethodDoesNotExists=Class %s does not contains any method %s
 # Menu
 EnabledAndDisabled=Enabled and disabled
 # Page list
-CronLastOutput=Ostatnie wyjście prowadzony
-CronLastResult=Ostatni kod wynikowy
+CronLastOutput=Latest run output
+CronLastResult=Latest result code
 CronCommand=Komenda
 CronList=Zaplanowane zadania
 CronDelete=Usuwanie zaplanowanych zadań
-CronConfirmDelete=Czy jesteś pewny, że chcesz usunąć te zaplanowane zadania?
+CronConfirmDelete=Are you sure you want to delete these scheduled jobs?
 CronExecute=Launch scheduled job
-CronConfirmExecute=Jesteś pewny, że chcesz teraz wykonać te zaplanowane zadania?
+CronConfirmExecute=Are you sure you want to execute these scheduled jobs now?
 CronInfo=Moduł zaplanowanych zadań pozwala na uruchamianie zadań, ktore były zaplanowane
 CronTask=Zadanie
 CronNone=Żaden
diff --git a/htdocs/langs/pl_PL/errors.lang b/htdocs/langs/pl_PL/errors.lang
index 172d087057d..320e6d4abd0 100644
--- a/htdocs/langs/pl_PL/errors.lang
+++ b/htdocs/langs/pl_PL/errors.lang
@@ -11,6 +11,7 @@ ErrorLoginAlreadyExists=Zaloguj %s już istnieje.
 ErrorGroupAlreadyExists=Grupa %s już istnieje.
 ErrorRecordNotFound=Rekord nie został znaleziony.
 ErrorFailToCopyFile=Nie udało się skopiować pliku '<b>%s</b>' do '<b>%s</b>'.
+ErrorFailToCopyDir=Failed to copy directory '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToRenameFile=Nie można zmienić nazwy pliku '<b>%s</b>' na '<b>%s</b>'.
 ErrorFailToDeleteFile=Nie można usunąć pliku '<b>%s</b>'.
 ErrorFailToCreateFile=Nie można utworzyć pliku '<b>%s</b>'.
@@ -115,7 +116,7 @@ ErrorNoActivatedBarcode=Nie Typ aktywny kodów kreskowych
 ErrUnzipFails=Nie udało się rozpakować% s ZipArchive
 ErrNoZipEngine=Brak silnika do rozpakowania pliku %s w PHP
 ErrorFileMustBeADolibarrPackage=Plik% s musi być pakiet zip Dolibarr
-ErrorFileRequired=To zajmuje plik pakietu Dolibarr
+ErrorModuleFileRequired=You must select a Dolibarr module package file
 ErrorPhpCurlNotInstalled=PHP CURL nie jest zainstalowany, to jest niezbędne, aby porozmawiać z Paypal
 ErrorFailedToAddToMailmanList=Nie udało się dodać% s do% s listy Mailman lub podstawy SPIP
 ErrorFailedToRemoveToMailmanList=Nie udało się usunąć rekord% s do% s listy Mailman lub podstawy SPIP
@@ -170,14 +171,19 @@ ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
 ErrorFileMustHaveFormat=File must have format %s
 ErrorSupplierCountryIsNotDefined=Kraj dla tego dostawcy nie jest zdefiniowany. Proszę to poprawić.
 ErrorsThirdpartyMerge=Failed to merge the two records. Request canceled.
-ErrorStockIsNotEnoughToAddProductOnOrder=Zapas dla artykułu %s jest niewystarczający, aby dodać go do nowego zamówienia
-ErrorStockIsNotEnoughToAddProductOnInvoice=Zapas dla artykułu %s jest niewystarczający, aby dodać go do nowej faktury
-ErrorStockIsNotEnoughToAddProductOnShipment=Zapas dla artykułu %s jest niewystarczający, aby dodać go do nowej dostawy
-ErrorStockIsNotEnoughToAddProductOnProposal=Zapas dla artykułu %s jest niewystarczający, aby dodać go do nowej propozycji handlowej
-ErrorFailedToLoadLoginFileForMode=Failed to get the login file for mode '%s'.
+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 bank 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>
 
 # 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.
diff --git a/htdocs/langs/pl_PL/holiday.lang b/htdocs/langs/pl_PL/holiday.lang
index 0eeb7e67eb6..53816dde284 100644
--- a/htdocs/langs/pl_PL/holiday.lang
+++ b/htdocs/langs/pl_PL/holiday.lang
@@ -76,8 +76,9 @@ BoxTitleLastLeaveRequests=Ostatnie %s modyfikowanych wniosków urlopowych
 HolidaysMonthlyUpdate=Miesięczna aktualizacja
 ManualUpdate=Ręczna aktualizacja
 HolidaysCancelation=Anulowanie wniosku urlopowego
-EmployeeLastname=Nazwisko pracownika
-EmployeeFirstname=Imię pracownika
+EmployeeLastname=Employee last name
+EmployeeFirstname=Employee first name
+TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
 
 ## Configuration du Module ##
 LastUpdateCP=Latest automatic update of leaves allocation
diff --git a/htdocs/langs/pl_PL/ldap.lang b/htdocs/langs/pl_PL/ldap.lang
index 044c8e8c414..0d27d367ccc 100644
--- a/htdocs/langs/pl_PL/ldap.lang
+++ b/htdocs/langs/pl_PL/ldap.lang
@@ -13,8 +13,8 @@ LDAPUsers=Użytkowników w bazie danych LDAP
 LDAPFieldStatus=Stan
 LDAPFieldFirstSubscriptionDate=Pierwsze subskrypcji daty
 LDAPFieldFirstSubscriptionAmount=Pierwsza subskrypcja kwoty
-LDAPFieldLastSubscriptionDate=Ostatnia data subskrypcji
-LDAPFieldLastSubscriptionAmount=Ostatnia kwota subskrypcji
+LDAPFieldLastSubscriptionDate=Latest subscription date
+LDAPFieldLastSubscriptionAmount=Latest subscription amount
 LDAPFieldSkype=Skype id
 LDAPFieldSkypeExample=Example : skypeName
 UserSynchronized=Użytkownik zsynchronizowany
diff --git a/htdocs/langs/pl_PL/mails.lang b/htdocs/langs/pl_PL/mails.lang
index cb9fb2ffadb..3672b44bbed 100644
--- a/htdocs/langs/pl_PL/mails.lang
+++ b/htdocs/langs/pl_PL/mails.lang
@@ -35,7 +35,7 @@ MailingStatusSentPartialy=Wysłane częściowo
 MailingStatusSentCompletely=Wysłane całkowicie
 MailingStatusError=Błąd
 MailingStatusNotSent=Nie wysłano
-MailSuccessfulySent=Mail wysłany prawidłowo (od %s do %s)
+MailSuccessfulySent=Email successfully accepted for delivery (from %s to %s)
 MailingSuccessfullyValidated=Mailing pomyślnie zweryfikowany
 MailUnsubcribe=Wypisz
 MailingStatusNotContact=Nie kontaktuj się więcej
@@ -74,22 +74,28 @@ ResultOfMailSending=Wynik masowego wysyłania EMail
 NbSelected=Wybrane nb
 NbIgnored=Nb ignorowane
 NbSent=Nb wysłany
+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
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Linia w pliku %s
 RecipientSelectionModules=Definiowane wnioski dla wybranych odbiorców
 MailSelectedRecipients=Wybrani odbiorcy
 MailingArea=Obszar mailingów
-LastMailings=Ostatnia %s Mailingów
+LastMailings=Latest %s emailings
 TargetsStatistics=Celów statystycznych
 NbOfCompaniesContacts=Unikalne kontakty firm
 MailNoChangePossible=Odbiorcy dla potwierdzonych mailingów nie mogą być zmienieni
 SearchAMailing=Szukaj mailingu
 SendMailing=Wyślij mailing
 SendMail=Wyślij mail
-MailingNeedCommand=Ze względów bezpieczeństwa, wysyłając e-maila jest lepiej, gdy wykonywane z linii poleceń. Jeśli masz, poproś administratora serwera, aby uruchomić następujące polecenie, aby wysłać e-maila do wszystkich odbiorców:
+SentBy=Wysłane przez
+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=Możesz jednak wysłać je w sieci poprzez dodanie parametru MAILING_LIMIT_SENDBYWEB o wartości max liczba wiadomości e-mail, który chcesz wysłać przez sesji.
-ConfirmSendingEmailing=If you can't or prefer sending them with your www browser, please confirm you are sure you want to send emailing now from your browser?
+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=Uwaga: Wysyłanie Emailings z interfejsu WWW jest wykonywana w kilku czasach ze względów bezpieczeństwa oraz limitu <b>czasu,% s</b> odbiorców jednocześnie dla każdej sesji wysyłającego.
 TargetsReset=Wyczyść listę
 ToClearAllRecipientsClickHere=Aby wyczyścić odbiorców tego e-maila na listę, kliknij przycisk
@@ -144,3 +150,6 @@ AdvTgtCreateFilter=Create filter
 AdvTgtOrCreateNewFilter=Name of new filter
 NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
+OutGoingEmailSetup=Outgoing email setup
+InGoingEmailSetup=Incoming email setup
+
diff --git a/htdocs/langs/pl_PL/main.lang b/htdocs/langs/pl_PL/main.lang
index ca28d18f0ad..590e09e868b 100644
--- a/htdocs/langs/pl_PL/main.lang
+++ b/htdocs/langs/pl_PL/main.lang
@@ -63,11 +63,13 @@ ErrorNoVATRateDefinedForSellerCountry=Błąd, nie określono stawki VAT dla kraj
 ErrorNoSocialContributionForSellerCountry=Błąd, brak określonej stopy podatkowej dla kraju '%s'.
 ErrorFailedToSaveFile=Błąd, nie udało się zapisać pliku.
 ErrorCannotAddThisParentWarehouse=You are trying to add a parent warehouse which is already a child of current one
+MaxNbOfRecordPerPage=Max nb of record per page
 NotAuthorized=Nie masz autoryzacji aby to zrobić
 SetDate=Ustaw datę
 SelectDate=Wybierz datę
 SeeAlso=Zobacz także %s
 SeeHere=Zobacz tutaj
+Apply=Zastosować
 BackgroundColorByDefault=domyślny kolor tła
 FileRenamed=The file was successfully renamed
 FileUploaded=Plik został pomyślnie przesłany
@@ -86,7 +88,7 @@ Undefined=Niezdefiniowano
 PasswordForgotten=Password forgotten?
 SeeAbove=Patrz wyżej
 HomeArea=Strona Startowa
-LastConnexion=Ostatnie połączenia
+LastConnexion=Latest connection
 PreviousConnexion=Poprzednie połączenia
 PreviousValue=Previous value
 ConnectedOnMultiCompany=Podłączono do środowiska
@@ -236,7 +238,7 @@ DateCreation=Data utworzenia
 DateCreationShort=Data utworzenia
 DateModification=Zmiana daty
 DateModificationShort=Data modyfikacji
-DateLastModification=Ostatnia zmiana daty
+DateLastModification=Latest modification date
 DateValidation=Zatwierdzenie daty
 DateClosing=Ostateczny termin
 DateDue=W trakcie terminu
@@ -432,7 +434,7 @@ Reportings=Raportowanie
 Draft=Szkic
 Drafts=Robocze
 Validated=Zatwierdzona
-Opened=Otwórz
+Opened=Otwierany
 New=Nowy
 Discount=Rabat
 Unknown=Nieznany
@@ -460,6 +462,7 @@ DeletePicture=Usuń obraz
 ConfirmDeletePicture=Potwierdzić usunięcie obrazka?
 Login=Login
 CurrentLogin=Aktualny login
+EnterLoginDetail=Enter login details
 January=Styczeń
 February=Luty
 March=Marzec
@@ -597,6 +600,8 @@ SessionName=Nazwa sesji
 Method=Metoda
 Receive=Odbiór
 CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
+ExpectedValue=Expected Value
+CurrentValue=Aktualna wartość
 PartialWoman=Część
 TotalWoman=Razem
 NeverReceived=Nigdy nie otrzymała
@@ -753,6 +758,8 @@ RemoveString=Remove string '%s'
 SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
 DirectDownloadLink=Direct download link
 Download=Download
+ActualizeCurrency=Update currency rate
+Fiscalyear=Rok podatkowy
 # Week day
 Monday=Poniedziałek
 Tuesday=Wtorek
@@ -787,8 +794,8 @@ SetRef=Ustaw referencję
 Select2ResultFoundUseArrows=Some results found. Use arrows to select.
 Select2NotFound=Nie znaleziono wyników
 Select2Enter=Enter
-Select2MoreCharacter=or more character
-Select2MoreCharacters=lub więcej znaków
+Select2MoreCharacter=or more characters<br /><br /><strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
+Select2MoreCharacters=or more characters<br /><br /><strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
 Select2LoadingMoreResults=Ładuję więcej wyników...
 Select2SearchInProgress=Wyszukiwanie w trakcie...
 SearchIntoThirdparties=Kontrahenci
@@ -809,3 +816,5 @@ SearchIntoContracts=Kontrakty
 SearchIntoCustomerShipments=Customer shipments
 SearchIntoExpenseReports=Zestawienia wydatków
 SearchIntoLeaves=Urlopy
+
+BulkActions=Bulk actions
diff --git a/htdocs/langs/pl_PL/members.lang b/htdocs/langs/pl_PL/members.lang
index 5a3c259784c..53fb5bf1c65 100644
--- a/htdocs/langs/pl_PL/members.lang
+++ b/htdocs/langs/pl_PL/members.lang
@@ -45,7 +45,7 @@ MemberStatusDraft=Projekt (musi zostać zatwierdzone)
 MemberStatusDraftShort=Aby potwierdzić
 MemberStatusActive=Zatwierdzona (oczekujących subskrypcji)
 MemberStatusActiveShort=Zatwierdzona
-MemberStatusActiveLate=Subskrypcja minął
+MemberStatusActiveLate=Subscription expired
 MemberStatusActiveLateShort=Minął
 MemberStatusPaid=Subskrypcja aktualne
 MemberStatusPaidShort=Aktualne
@@ -136,8 +136,8 @@ DocForAllMembersCards=Generowanie wizytówek dla wszystkich członków (Format w
 DocForOneMemberCards=Generowanie wizytówki dla danego użytkownika (Format wyjściowy rzeczywiście setup: <b>%s)</b>
 DocForLabels=Generowanie arkuszy adres (Format wyjściowy rzeczywiście setup: <b>%s)</b>
 SubscriptionPayment=Płatność Subskrypcja
-LastSubscriptionDate=Ostatnia data abonament
-LastSubscriptionAmount=Ostatnio kwota subskrypcji
+LastSubscriptionDate=Latest subscription date
+LastSubscriptionAmount=Latest subscription amount
 MembersStatisticsByCountries=Użytkownicy statystyki według kraju
 MembersStatisticsByState=Użytkownicy statystyki na State / Province
 MembersStatisticsByTown=Użytkownicy statystyki na miasto
@@ -149,7 +149,7 @@ MembersByStateDesc=Ten ekran pokazać Wam statystyki członkom przez stan / prow
 MembersByTownDesc=Ten ekran pokaże statystyki członkom przez miasto.
 MembersStatisticsDesc=Wybierz statystyki chcesz czytać ...
 MenuMembersStats=Statystyka
-LastMemberDate=Ostatnia data członkiem
+LastMemberDate=Latest member date
 Nature=Natura
 Public=Informacje są publiczne
 NewMemberbyWeb=Nowy członek dodaje. Oczekuje na zatwierdzenie
diff --git a/htdocs/langs/pl_PL/orders.lang b/htdocs/langs/pl_PL/orders.lang
index 06ecab52911..6ce53415cc6 100644
--- a/htdocs/langs/pl_PL/orders.lang
+++ b/htdocs/langs/pl_PL/orders.lang
@@ -39,7 +39,7 @@ StatusOrderRefusedShort=Odmowa
 StatusOrderBilledShort=Rozliczone
 StatusOrderToProcessShort=Aby proces
 StatusOrderReceivedPartiallyShort=Częściowo otrzymano
-StatusOrderReceivedAllShort=Wszystko otrzymane
+StatusOrderReceivedAllShort=Products received
 StatusOrderCanceled=Odwołane
 StatusOrderDraft=Projekt (musi zostać zatwierdzony)
 StatusOrderValidated=Zatwierdzone
@@ -51,7 +51,7 @@ StatusOrderApproved=Przyjęto
 StatusOrderRefused=Odrzucono
 StatusOrderBilled=Rozliczone
 StatusOrderReceivedPartially=Częściowo otrzymano
-StatusOrderReceivedAll=Otrzymano w całości
+StatusOrderReceivedAll=All products received
 ShippingExist=Przesyłka istnieje
 QtyOrdered=Zamówiona ilość
 ProductQtyInDraft=Ilość produktów w projektach zamówień
diff --git a/htdocs/langs/pl_PL/other.lang b/htdocs/langs/pl_PL/other.lang
index e2176cc1e7b..6869882df75 100644
--- a/htdocs/langs/pl_PL/other.lang
+++ b/htdocs/langs/pl_PL/other.lang
@@ -2,6 +2,7 @@
 SecurityCode=Kod zabezpieczający
 NumberingShort=N°
 Tools=Narzędzia
+TMenuTools=Narzędzia
 ToolsDesc=Wszystkie zestawy narzędzi nie ujęte w innych miejscach menu zebrano tutaj. <br /> <br /> Wszystkie narzędzia można znaleźć w menu po lewej stronie.
 Birthday=Urodziny
 BirthdayDate=Birthday date
@@ -67,14 +68,15 @@ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nZnajdziesz tu fak
 PredefinedMailContentSendShipping=__CONTACTCIVNAME__ Znajdziesz tu wysyłkę __SHIPPINGREF__ __PERSONALIZED__Sincerely __SIGNATURE__
 PredefinedMailContentSendFichInter=__CONTACTCIVNAME__ Znajdziesz tu interwencji __FICHINTERREF__ __PERSONALIZED__Sincerely __SIGNATURE__
 PredefinedMailContentThirdparty=__CONTACTCIVNAME__ __PERSONALIZED__ __SIGNATURE__
-DemoDesc=Dolibarr is a compact ERP/CRM supporting several functional modules. A demo showcasing all modules makes no sense as this scenario never occurs. So, several demo profiles are available.
+DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
+ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
 DemoFundation=Zarządzanie użytkowników o fundacji
 DemoFundation2=Zarządzanie członkami i kontami bankowymi fundacji
-DemoCompanyServiceOnly=Zarządzanie wolny działalności sprzedaży usług tylko
+DemoCompanyServiceOnly=Company or freelance selling service only
 DemoCompanyShopWithCashDesk=Zarządzanie sklepem z kasy
-DemoCompanyProductAndStocks=Zarządzanie małym lub średnim przedsiębiorstwem sprzedaży produktów
-DemoCompanyAll=Zarządzanie małym i średnim przedsiębiorstwem z wielu działalności (wszystkie główne moduły)
+DemoCompanyProductAndStocks=Company selling products with a shop
+DemoCompanyAll=Company with multiple activities (all main modules)
 CreatedBy=Utworzono %s
 ModifiedBy=Zmodyfikowane przez %s
 ValidatedBy=Zatwierdzona przez %s
diff --git a/htdocs/langs/pl_PL/products.lang b/htdocs/langs/pl_PL/products.lang
index ba2766cb13c..88d3ef02645 100644
--- a/htdocs/langs/pl_PL/products.lang
+++ b/htdocs/langs/pl_PL/products.lang
@@ -5,6 +5,8 @@ ProductLabelTranslated=Przetłumaczone na etykiecie produktu
 ProductDescriptionTranslated=Przetłumczony opis produktu
 ProductNoteTranslated=Przetłumaczona nota produktu
 ProductServiceCard=Karta Produktu / Usługi
+TMenuProducts=Produkty
+TMenuServices=Usługi
 Products=Produkty
 Services=Usługi
 Product=Produkt
@@ -58,7 +60,7 @@ SellingPrice=Cena sprzedaży
 SellingPriceHT=Cena sprzedaży (bez podatku)
 SellingPriceTTC=Cena sprzedaży (z podatkiem)
 CostPriceDescription=Cena ta (po odliczeniu podatku) może być używany do przechowywania średniej kwoty koszt ten produkt do swojej firmy. Może to być dowolny cena obliczyć samodzielnie, na przykład od średniej ceny zakupu powiększonej średniego kosztu produkcji i dystrybucji.
-CostPriceUsage=W przyszłej wersji, ta wartość może posłużyć do obliczenia marży.
+CostPriceUsage=This value could be used for margin calculation.
 SoldAmount=Sold amount
 PurchasedAmount=Purchased amount
 NewPrice=Nowa cena
@@ -140,6 +142,7 @@ ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b>?
 CloneContentProduct=Sklonuj wszystkie główne informacje dot. produktu / usługi
 ClonePricesProduct=Clone główne informacje i ceny
 CloneCompositionProduct=Powiel pakiet pruduktu/usługi
+CloneCombinationsProduct=Clone product variants
 ProductIsUsed=Ten produkt jest używany
 NewRefForClone=Ref. nowych produktów / usług
 SellingPrices=Cena sprzedaży
@@ -236,7 +239,7 @@ GlobalVariables=Zmienne globalne
 VariableToUpdate=Variable to update
 GlobalVariableUpdaters=Globalne zmienne updaters
 UpdateInterval=Aktualizacja co (min)
-LastUpdated=Ostatnia aktualizacja
+LastUpdated=Latest update
 CorrectlyUpdated=Poprawnie zaktualizowane
 PropalMergePdfProductActualFile=Pliki użyć, aby dodać do PDF Azur są / jest
 PropalMergePdfProductChooseFile=Wybież plik PDF
@@ -256,4 +259,41 @@ VolumeUnits=Volume unit
 SizeUnits=Size unit
 DeleteProductBuyPrice=Delete buying price
 ConfirmDeleteProductBuyPrice=Are you sure you want to delete this buying price?
+SubProduct=Sub product
 
+#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
+ProductCombinations=Variants
+HideProductCombinations=Hide products variant in the products selector
+ProductCombination=Variant
+NewProductCombination=New variant
+EditProductCombination=Editing variant
+ProductCombinationGenerator=Variants generator
+Features=Features
+PriceImpact=Price impact
+WeightImpact=Weight impact
+NewProductAttribute=Nowy atrybut
+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
+PercentageVariation=Percentage variation
+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 child products
+ConfirmCloneProductCombinations=Would you like to copy all the product variant to the 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
diff --git a/htdocs/langs/pl_PL/projects.lang b/htdocs/langs/pl_PL/projects.lang
index 6306ee8604b..6afa35d22e2 100644
--- a/htdocs/langs/pl_PL/projects.lang
+++ b/htdocs/langs/pl_PL/projects.lang
@@ -30,8 +30,8 @@ DeleteATask=Usuń zadanie
 ConfirmDeleteAProject=Czy usunąć ten projekt?
 ConfirmDeleteATask=Czy usunąć to zadanie?
 OpenedProjects=Otwarte projekty
-OpenedTasks=Otwarte zadania
-OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
+OpenedTasks=Opened tasks
+OpportunitiesStatusForOpenedProjects=Szanse ilość otwartych projektów przez statusu
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=Pokaż projekt
 SetProject=Ustaw projekt
@@ -47,7 +47,7 @@ TaskTimeSpent=Czas spędzony na zadaniach
 TaskTimeUser=Użytkownik
 TaskTimeNote=Uwaga
 TaskTimeDate=Data
-TasksOnOpenedProject=Zadania w otwartych projektach
+TasksOnOpenedProject=Zadania na otwartych projektach
 WorkloadNotDefined=Czas pracy nie zdefiniowany
 NewTimeSpent=Nowy czas spędzony
 MyTimeSpent=Mój czas spędzony
@@ -58,6 +58,7 @@ TaskDateEnd=Data zakończenia zadania
 TaskDescription=Opis zadania
 NewTask=Nowe zadania
 AddTask=Tworzenie zadania
+AddTimeSpent=Create time spent
 Activity=Aktywność
 Activities=Zadania / aktywności
 MyActivities=Moje zadania / aktywności
@@ -95,6 +96,7 @@ ValidateProject=Sprawdź projet
 ConfirmValidateProject=Czy zatwierdzić ten projekt?
 CloseAProject=Zamknij Projekt
 ConfirmCloseAProject=Czy zamknąć ten projekt?
+AlsoCloseAProject=Also close project (keep it open if you still need to follow production tasks on it)
 ReOpenAProject=Otwórz projekt
 ConfirmReOpenAProject=Czy otworzyć na nowo ten projekt?
 ProjectContact=Kontakty projektu
@@ -120,7 +122,7 @@ CloneProjectFiles=Sklonuj pliki przynależne do projektu
 CloneTaskFiles=Połączone pliki sklonowanych zadań (jeśli zadania sklonowano)
 CloneMoveDate=Zaktualizować daty w projekcie/zadaniach od teraz?
 ConfirmCloneProject=Czy powielić ten projekt?
-ProjectReportDate=Zmień datę zadana nawiązując do daty rozpoczęcia projektu
+ProjectReportDate=Change task dates according to new project start date
 ErrorShiftTaskDate=Niemożliwe do przesunięcia daty zadania według nowej daty rozpoczęcia projektu
 ProjectsAndTasksLines=Projekty i zadania
 ProjectCreatedInDolibarr=Projekt %s utworzony
@@ -177,9 +179,9 @@ ProjectsStatistics=Statystyki dotyczące projektów / przewodów
 TaskAssignedToEnterTime=Zadanie przypisanie. Wprowadzenie czasu na zadanie powinno być możliwe.
 IdTaskTime=Id razem zadaniem
 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.
-OpenedProjectsByThirdparties=Projekty otwarte przez kontrahentów
+OpenedProjectsByThirdparties=Projekty otwarte przez kontahentów
 OnlyOpportunitiesShort=Only opportunities
-OpenedOpportunitiesShort=Open opportunities
+OpenedOpportunitiesShort=Opened opportunities
 NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Szanse Całkowita ilość
 OpportunityPonderatedAmount=Ilość możliwości ważone
diff --git a/htdocs/langs/pl_PL/propal.lang b/htdocs/langs/pl_PL/propal.lang
index d465fbaf0f3..ed2fc40e7c7 100644
--- a/htdocs/langs/pl_PL/propal.lang
+++ b/htdocs/langs/pl_PL/propal.lang
@@ -3,7 +3,7 @@ Proposals=Oferty handlowe
 Proposal=Oferta handlowa
 ProposalShort=Oferta
 ProposalsDraft=Szkic ofert handlowych
-ProposalsOpened=Otwarte oferty handlowe
+ProposalsOpened=Czynny propozycji
 Prop=Oferty handlowe
 CommercialProposal=Oferta handlowa
 ProposalCard=Karta oferty
@@ -26,9 +26,9 @@ AmountOfProposalsByMonthHT=Kwota w miesiącu (po odliczeniu podatku)
 NbOfProposals=Liczba ofert handlowych
 ShowPropal=Pokaż oferty
 PropalsDraft=Szkice
-PropalsOpened=Otwórz
+PropalsOpened=Otwierany
 PropalStatusDraft=Szkic (musi zostać zatwierdzony)
-PropalStatusValidated=Zatwierdzona (oferta jest otwarta)
+PropalStatusValidated=Validated (proposal is opened)
 PropalStatusSigned=Podpisano (do rachunku)
 PropalStatusNotSigned=Nie podpisały (zamknięte)
 PropalStatusBilled=Billed
diff --git a/htdocs/langs/pl_PL/stocks.lang b/htdocs/langs/pl_PL/stocks.lang
index a7705ffbd5d..db078319271 100644
--- a/htdocs/langs/pl_PL/stocks.lang
+++ b/htdocs/langs/pl_PL/stocks.lang
@@ -2,7 +2,7 @@
 WarehouseCard=Karta magazynu
 Warehouse=Magazyn
 Warehouses=Magazyny
-ParentWarehouse=Parent warehouse
+ParentWarehouse=Magazyn nadrzędny
 NewWarehouse=Nowy magazyn / obszar magazynowania
 WarehouseEdit=Modyfikacja magazynu
 MenuNewWarehouse=Nowy magazyn
@@ -22,13 +22,15 @@ Movements=Ruchy
 ErrorWarehouseRefRequired=Nazwa referencyjna magazynu wymagana
 ListOfWarehouses=Lista magazynów
 ListOfStockMovements=Wykaz stanu magazynowego
+StockMovementForId=Movement ID %d
+ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Powierzchnia magazynów
 Location=Lokacja
 LocationSummary=Nazwa skrócona lokalizacji
 NumberOfDifferentProducts=Wiele różnych środków
 NumberOfProducts=Łączna liczba produktów
-LastMovement=Ostatni ruch
-LastMovements=Ostatnie ruchy
+LastMovement=Latest movement
+LastMovements=Latest movements
 Units=Jednostki
 Unit=Jednostka
 StockCorrection=Korekta zapasu
@@ -89,7 +91,7 @@ ThisWarehouseIsPersonalStock=Tym składzie przedstawia osobiste zasobów %s %s
 SelectWarehouseForStockDecrease=Wybierz magazyn użyć do zmniejszenia czas
 SelectWarehouseForStockIncrease=Wybierz magazyn użyć do zwiększenia czas
 NoStockAction=Brak akcji stock
-DesiredStock=Desired optimal stock
+DesiredStock=Pożądany zapas
 DesiredStockDesc=This stock amount will be the value used to fill the stock by replenishment feature.
 StockToBuy=Na zamówienie
 Replenishment=Uzupełnianie
@@ -124,7 +126,7 @@ StockMustBeEnoughForShipment= Stock level must be enough to add product/service
 MovementLabel=Etykieta ruchu
 InventoryCode=Kod inwentaryzacji
 IsInPackage=Zawarte w pakiecie
-WarehouseAllowNegativeTransfer=Stock can be negative
+WarehouseAllowNegativeTransfer=Zapas nie może być ujemny
 qtyToTranferIsNotEnough=You don't have enough stock from your source warehouse
 ShowWarehouse=Pokaż magazyn
 MovementCorrectStock=Korekta zapasu dla artykułu %s
@@ -140,3 +142,4 @@ ProductStockWarehouseCreated=Stock limit for alert and desired optimal stock cor
 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
diff --git a/htdocs/langs/pl_PL/supplier_proposal.lang b/htdocs/langs/pl_PL/supplier_proposal.lang
index b9ea2a0b6b6..269c1473c2f 100644
--- a/htdocs/langs/pl_PL/supplier_proposal.lang
+++ b/htdocs/langs/pl_PL/supplier_proposal.lang
@@ -8,7 +8,7 @@ SearchRequest=Znajdź zapytanie
 DraftRequests=Projekt zapytania
 SupplierProposalsDraft=Draft supplier proposals
 LastModifiedRequests=Ostatnie %s zapytań o cenę
-RequestsOpened=Otwórz zapytanie o cenę
+RequestsOpened=Opened price requests
 SupplierProposalArea=Obszar ofert dostawcy
 SupplierProposalShort=Oferta dostawcy
 SupplierProposals=Oferty dostawcy
@@ -23,7 +23,7 @@ ConfirmValidateAsk=Are you sure you want to validate this price request under na
 DeleteAsk=Usuń zapytanie
 ValidateAsk=Zatwierdź zapytanie
 SupplierProposalStatusDraft=Szkic (musi być zatwierdzony)
-SupplierProposalStatusValidated=Zatwierdzony (zapytanie jest otwarte)
+SupplierProposalStatusValidated=Validated (request is opened)
 SupplierProposalStatusClosed=Zamknięte
 SupplierProposalStatusSigned=Zaakceptowane
 SupplierProposalStatusNotSigned=Odrzucony
diff --git a/htdocs/langs/pl_PL/suppliers.lang b/htdocs/langs/pl_PL/suppliers.lang
index 7256633e8ae..7a5a8312c49 100644
--- a/htdocs/langs/pl_PL/suppliers.lang
+++ b/htdocs/langs/pl_PL/suppliers.lang
@@ -7,15 +7,15 @@ History=Historia
 ListOfSuppliers=Lista dostawców
 ShowSupplier=Pokaż dostawcę
 OrderDate=Data zamówienia
-BuyingPriceMin=Best buying price
-BuyingPriceMinShort=Best buying price
-TotalBuyingPriceMinShort=Total of subproducts buying prices
+BuyingPriceMin=Najlepsza cena zakupu
+BuyingPriceMinShort=Najlepsza cena zakupu
+TotalBuyingPriceMinShort=Suma cen zakupu podproduktów
 TotalSellingPriceMinShort=Total of subproducts selling prices
 SomeSubProductHaveNoPrices=Niektóre podprodukty nie mają zdefiniowanych cen
-AddSupplierPrice=Add buying price
-ChangeSupplierPrice=Change buying price
+AddSupplierPrice=Dodaj cenę zakupu
+ChangeSupplierPrice=Zmień cenę zakupu
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=Ten dostawca jest już powiązany z referencją: %s
-NoRecordedSuppliers=Nie zapisano żadnych dostawców
+NoRecordedSuppliers=Nie zarejestrowano żadnych dostawców
 SupplierPayment=Płatność dostawcy
 SuppliersArea=Strefa dostawców
 RefSupplierShort=Nr ref. dostawcy
@@ -24,10 +24,10 @@ ExportDataset_fournisseur_1=Faktury dostawcy i pozycje na fakturach
 ExportDataset_fournisseur_2=Faktury i płatności dostawcy
 ExportDataset_fournisseur_3=Zamówienia dostawcy i pozycje na zamówieniu
 ApproveThisOrder=Zatwierdź to zamówienie
-ConfirmApproveThisOrder=Czy na pewno chcesz zatwierdzić zamówienie <b>%s</b> ?
-DenyingThisOrder=Odmów tę kolejność
-ConfirmDenyingThisOrder=Czy na pewno chcesz odrzucić zamówienie <b>%s</b> ?
-ConfirmCancelThisOrder=Czy na pewno chcesz anulować zamówienie <b>%s</b> ?
+ConfirmApproveThisOrder=Czy zaakceptować zamówienie <b>%s</b>?
+DenyingThisOrder=Odrzuć to zamówienie
+ConfirmDenyingThisOrder=Czy odrzucić zamówienie <b>%s</b>?
+ConfirmCancelThisOrder=Czy anulować zamówienie <b>%s</b>?
 AddSupplierOrder=Stwórz zamówienie dla dostawcy
 AddSupplierInvoice=Stwórz fakturę dostawcy
 ListOfSupplierProductForSupplier=Wykaz produktów i cen dostawcy <b>%s</b>
@@ -36,8 +36,9 @@ ListOfSupplierOrders=Lista zleceń dostawca
 MenuOrdersSupplierToBill=Zamówienia dostawca do faktury
 NbDaysToDelivery=Opóźnienie dostawy w dniach
 DescNbDaysToDelivery=Największe opóźnienie dostawy wśród produktów z tego zamówienia
-SupplierReputation=Supplier reputation
-DoNotOrderThisProductToThisSupplier=Do not order
-NotTheGoodQualitySupplier=Wrong quality
+SupplierReputation=Reputacja dostawcy
+DoNotOrderThisProductToThisSupplier=Nie zamawiaj
+NotTheGoodQualitySupplier=Zła jakość
 ReputationForThisProduct=Reputation
-BuyerName=Buyer name
+BuyerName=Nazwa kupującego
+AllProductServicePrices=All product / service prices
diff --git a/htdocs/langs/pl_PL/users.lang b/htdocs/langs/pl_PL/users.lang
index 5b3ada7089b..248202753e8 100644
--- a/htdocs/langs/pl_PL/users.lang
+++ b/htdocs/langs/pl_PL/users.lang
@@ -36,7 +36,7 @@ AdministratorDesc=Administrator
 DefaultRights=Domyślne uprawnienia
 DefaultRightsDesc=Określ tutaj domyślne uprawnienia, które są przyznawane automatycznie utworzony nowy użytkownik.
 DolibarrUsers=Użytkownicy Dolibarr
-LastName=Last Name
+LastName=Nazwisko
 FirstName=Imię
 ListOfGroups=Lista grup
 NewGroup=Nowa grupa
diff --git a/htdocs/langs/pl_PL/withdrawals.lang b/htdocs/langs/pl_PL/withdrawals.lang
index 632eaaa025f..e21820435fa 100644
--- a/htdocs/langs/pl_PL/withdrawals.lang
+++ b/htdocs/langs/pl_PL/withdrawals.lang
@@ -24,6 +24,7 @@ WithdrawStatistics=Direct debit payment statistics
 WithdrawRejectStatistics=Direct debit payment reject statistics
 LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
+WithdrawRequestsDone=%s direct debit payment requests recorded
 ThirdPartyBankCode=Kod banku kontrahenta
 NoInvoiceCouldBeWithdrawed=Nr faktury withdrawed sukces. Sprawdź, czy faktura jest na spółki z ważnych BAN.
 ClassCredited=Klasyfikacja zapisane
@@ -76,8 +77,8 @@ RUM=UMR
 RUMLong=Unique Mandate Reference
 RUMWillBeGenerated=UMR number will be generated once bank account information are saved
 WithdrawMode=Direct debit mode (FRST or RECUR)
-WithdrawRequestAmount=Wycofać żądania kwoty:
-WithdrawRequestErrorNilAmount=Nie można utworzyć wycofać wniosek o kwocie zerowej.
+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
diff --git a/htdocs/langs/pt_BR/accountancy.lang b/htdocs/langs/pt_BR/accountancy.lang
index 7c7f6804e3a..25e6fd6c775 100644
--- a/htdocs/langs/pt_BR/accountancy.lang
+++ b/htdocs/langs/pt_BR/accountancy.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - accountancy
-ACCOUNTING_EXPORT_SEPARATORCSV=Separador de coluna para o arquivo de exportação
+ACCOUNTING_EXPORT_SEPARATORCSV=Separador de coluna para arquivo de exportação
 ACCOUNTING_EXPORT_DATE=Formato de data para arquivo de exportação
 ACCOUNTING_EXPORT_PIECE=Exportar a quantidade
 ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Exportação com conta global?
@@ -8,27 +8,28 @@ ACCOUNTING_EXPORT_AMOUNT=Exportar o montante?
 ACCOUNTING_EXPORT_DEVISE=Exportar Moedas
 Selectformat=Selecione o formato do arquivo
 ACCOUNTING_EXPORT_PREFIX_SPEC=Especifique o prefixo do nome do arquivo
+AccountancySetupDoneFromAccountancyMenu=A maioria das configurações da Contabilidade é feita a partir do menu %s
 ConfigAccountingExpert=Configuração do módulo específico de contabilidade
+Journalization=Lançamento no Livro
 Journaux=Diários
 JournalFinancial=Diários financeiros
+Chartofaccounts=Plano de contas
 AccountancyArea=Área da Contabilidade
 AccountancyAreaDescIntro=O uso do módulo Contabilidade é feito em diversas etapas:
 AccountancyAreaDescActionOnce=As ações a seguir são normalmente realizadas apenas uma vez, ou uma vez por ano...
 AccountancyAreaDescActionFreq=As ações a seguir são normalmente executadas a cada mês, semana ou dia para grandes empresas...
+AccountancyAreaDescChartModel=ETAPA %s: Criar um modelo de gráfico de conta a partir do menu %s
 AccountancyAreaDescChart=ETAPA %s: Criar ou verificar o conteúdo do seu gráfico de conta a partir do menu %s
-AccountancyAreaDescBank=ETAPA %s: Verifique se a vinculação entre as contas bancárias e a conta da Contabilidade foi feita. Conclua as vinculações faltantes. Isto fará com que você economize tempo no futuro para as próximas etapas pela sugestão da conta da Contabilidade padrão correta nas suas linhas de pagamento.<br>Para isto, vá até o cartão de cada conta financeira. Você pode iniciar a partir da página %s.
-AccountancyAreaDescVat=ETAPA %s: Verifique se a vinculação entre o pagamento do ICMS e a conta da Contabilidade foi feita. Conclua as vinculações faltantes. Isto fará com que você economize tempo no futuro para as próximas etapas pela sugestão da conta da Contabilidade padrão correta no registro relacionado aos pagamentos do ICMS.<br>Você pode definir as contas da Contabilidade para uso para cada ICMS a partir da página %s.
-AccountancyAreaDescSal=ETAPA %s: Verifique se a vinculação entre o pagamento dos salários e a conta da Contabilidade foi feita. Conclua as vinculações faltantes. Isto fará com que você economize tempo no futuro para as próximas etapas pela sugestão da conta da Contabilidade padrão correta no registro relacionado ao pagamento dos salários.<br>Para isto você pode usar a entrada do menu %s.
-AccountancyAreaDescContrib=ETAPA %s: Verifique se a vinculação entre as despesas especiais (taxas diversas) e a conta da Contabilidade foi feita. Conclua as vinculações faltantes. Isto fará com que você economize tempo no futuro para as próximas etapas pela sugestão da conta da Contabilidade padrão correta no registro relacionado ao pagamento das taxas.<br>Para isto você pode usar a entrada do menu %s.
-AccountancyAreaDescDonation=ETAPA %s: Verifique se a vinculação entre as doações e a conta da Contabilidade foi feita. Conclua as vinculações faltantes. Isto fará com que você economize tempo no futuro para as próximas etapas pela sugestão da conta da Contabilidade padrão correta no registro relacionado ao pagamento das doações.<br>Você pode definir a conta dedicada para isto a partir da entrada do menu %s.
-AccountancyAreaDescProd=ETAPA %s: Verifique se a vinculação entre os produtos/serviços e a conta da Contabilidade foi feita. Conclua as vinculações faltantes. Isto fará com que você economize tempo no futuro para as próximas etapas pela sugestão da conta da Contabilidade padrão correta nas linhas da sua fatura.<br>Para isto você pode usar a entrada do menu %s.
-AccountancyAreaDescCustomer=ETAPA %s: Verifique se a vinculação entre as linhas da fatura de um cliente existente e a conta da Contabilidade foi feita. Conclua as vinculações faltantes. Uma vez concluída a vinculação, o aplicativo será capaz de registrar as transações na Contabilidade geral em um clique.<br>Para isto você pode usar a entrada do menu %s.
-AccountancyAreaDescSupplier=ETAPA %s: Verifique se a vinculação entre as linhas da fatura de um fornecedor existente e a conta da Contabilidade foi feita. Conclua as vinculações faltantes. Uma vez concluída a vinculação, o aplicativo será capaz de registrar as transações na Contabilidade geral em um clique.<br>Para isto você pode usar a entrada do menu %s.
 AccountancyAreaDescWriteRecords=ETAPA %s: Grave as transações na Contabilidade Geral. Para isto, vá para cada Registro, e clique no botão "Registrar as transações na Contabilidade Geral".
+AccountancyAreaDescAnalyze=ETAPA %s: Adicionar ou editar as transações existentes, gerar os relatórios e exportar.
+AccountancyAreaDescClosePeriod=ETAPA %s: Fechar o período de forma que não possamos fazer modificações no futuro.
 Selectchartofaccounts=Selecione gráfico ativo de contas
+ChangeAndLoad=Alterar e carregar
 Addanaccount=Adicionar uma conta contábil
 AccountAccounting=Conta contábil
 AccountAccountingSuggest=Sugerir Conta de Contabilidade
+MenuDefaultAccounts=Contas padrão
+MenuProductsAccounts=Contas de produto
 ProductsBinding=Contas dos produtos
 Ventilation=Vinculando para as contas
 CustomersVentilation=Vinculando as faturas do cliente
@@ -46,6 +47,7 @@ Ventilate=Vincular
 EndProcessing=Processo foi finalizado.
 SelectedLines=Linhas selecionadas
 Lineofinvoice=Linha da fatura
+NoAccountSelected=Nenhuma conta da Contabilidade selecionada
 VentilatedinAccount=Vinculado a conta contábil com sucesso
 NotVentilatedinAccount=Não vinculado a conta contábil
 XLineSuccessfullyBinded=%s produtos/serviços vinculados com sucesso a uma conta da Contabilidade
@@ -63,26 +65,20 @@ ACCOUNTING_SELL_JOURNAL=Resumo diário das Vendas
 ACCOUNTING_PURCHASE_JOURNAL=Resumo diário das Compras
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Diário diversos
 ACCOUNTING_EXPENSEREPORT_JOURNAL=Diário de relatórios de despesas
-ACCOUNTING_ACCOUNT_TRANSFER_CASH=Conta de transferência
-ACCOUNTING_ACCOUNT_SUSPENSE=Conta de espera
-DONATION_ACCOUNTINGACCOUNT=Conta para o registro de doações
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Conta contábil por padrão para produtos comprados (se não for definido na listagem dos produtos)
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Conta contábil por padrão para os produtos vendidos (se não for definido na listagem dos produtos)
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Conta contábil por padrão para os serviços comprados (se não for definido na listagem de serviços)
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Conta contábil por padrão para os serviços vendidos (se não for definido na listagem de  serviços)
 Docref=Referência
 Code_tiers=Terceiro
 Labelcompte=Conta rótulo
 Sens=Significado
 NumPiece=Número da peça
+TransactionNumShort=Nº da transação
 AccountingCategory=Categoria contábil
+GroupByAccountAccounting=Agrupar pela conta da Contabilidade
 NotMatch=Não Definido
 DeleteMvt=Excluir as linhas da Contabilidade geral
 DelYear=Ano a ser deletado
 DelJournal=Resumo a ser deletado
 ConfirmDeleteMvt=Isto excluirá todas as linhas da Contabilidade geral para o ano e/ou de um registro específico. É exigido pelo menos um critério.
 ConfirmDeleteMvtPartial=Isto excluirá a(s) linha(s) selecionada(s) da Contabilidade geral
-DelBookKeeping=Excluir o registro da Contabilidade Geral
 FinanceJournal=Diário financeiro
 DescFinanceJournal=Diário financeiro incluindo todos os tipos de pagamentos por conta bancária
 DescJournalOnlyBindedVisible=Esta é uma visualização do registro que está vinculado à conta da Contabilidade dos produtos/serviços e que pode ser também registrado na Contabilidade Geral.
@@ -132,11 +128,10 @@ Modelcsv_ebp=Exportar para EBP
 Modelcsv_cogilog=Exportar para Cogilog
 InitAccountancy=Contabilidade Inicial
 InitAccountancyDesc=Esta página pode ser usada para inicializar uma conta da Contabilidade dos produtos e serviços que não possuem uma conta da Contabilidade definida para vendas e compras.
+DefaultBindingDesc=Esta página pode ser usada para definir a conta padrão a ser usada para conectar o registro das transações sobre o pagamento de salários, doações, taxas e o ICMS quando nenhuma conta da Contabilidade específica tiver sido definida.
 Options=Opções
 OptionModeProductSell=Modo vendas
 OptionModeProductBuy=Modo compras
-OptionModeProductSellDesc=Exibir todos os produtos sem uma conta da Contabilidade definida para vendas.
-OptionModeProductBuyDesc=Exibir todos os produtos sem uma conta da Contabilidade definida para compras.
 CleanFixHistory=Remover o código da Contabilidade das linhas que não existem nos gráficos da conta
 CleanHistory=Redefinir todas as vinculações para o ano selecionado
 Range=Faixa da conta da Contabilidade
diff --git a/htdocs/langs/pt_BR/admin.lang b/htdocs/langs/pt_BR/admin.lang
index 8d127e93dcd..69b398962a5 100644
--- a/htdocs/langs/pt_BR/admin.lang
+++ b/htdocs/langs/pt_BR/admin.lang
@@ -7,14 +7,12 @@ VersionDevelopment=Versão de Desenvolvimento
 VersionUnknown=Versão Desconhecida
 VersionRecommanded=Versão Recomendada
 FileCheck=Verificador da integridade dos arquivos
-FileCheckDesc=Esta ferramenta permite que você verifique a integridade dos arquivos do seu aplicativo, comparar cada arquivo com os oficiais. Você pode usar esta ferramenta para detectar se alguns arquivos foram modificados por um hacker, por exemplo.
 MakeIntegrityAnalysisFrom=Realizar a análise da integridade dos arquivos do aplicativo em
 LocalSignature=Assinatura local integrada (menos confiável)
 RemoteSignature=Assinatura remota distante (mais confiável)
 FilesMissing=Arquivos ausentes
 FilesUpdated=Arquivos atualizados
 FileCheckDolibarr=Verificar a integridade dos arquivos do aplicativo
-AvailableOnlyOnPackagedVersions=O arquivo local para verificação da integridade só está disponível quando o aplicativo é instalado a partir de um pacote certificado
 XmlNotFound=Não encontrado o Arquivo Xml da integridade
 SessionId=ID da sessão
 SessionSaveHandler=Manipulador para salvar sessão
@@ -54,8 +52,6 @@ ErrorCodeCantContainZero=A variável não pode conter valor "0" (zero)
 DisableJavascript=Desativar as funções Javascript e Ajax
 UseSearchToSelectCompanyTooltip=Além disso, se você tem um grande número de terceiros (> 100 000), você pode aumentar a velocidade, definindo COMPANY_DONOTSEARCH_ANYWHERE constante a 1 em Setup-> Outro. Busca, então, ser limitada até o início da string.
 UseSearchToSelectContactTooltip=Além disso, se você tem um grande número de terceiros (> 100 000), você pode aumentar a velocidade, definindo CONTACT_DONOTSEARCH_ANYWHERE constante a 1 em Setup-> Outro. Busca, então, ser limitada até o início da string.
-DelaiedFullListToSelectCompany=Aguardar você pressionar uma tecla antes de carregar o conteúdo da lista combo dos terceiros (Isto pode aumentar o desempenho se você tiver um grande número de terceiros)
-DelaiedFullListToSelectContact=Aguardar você pressionar uma tecla antes de carregar o conteúdo da lista combo dos contatos (Isto pode aumentar o desempenho se você tiver um grande número de contatos)
 NumberOfKeyToSearch='Nbr' dos caracteres para 'trigger search': %s
 NotAvailableWhenAjaxDisabled=Indisponível quando o Ajax esta desativado
 AllowToSelectProjectFromOtherCompany=No documento de um terceiro, pode-se escolher um projeto conectado a outro terceiro
@@ -160,7 +156,6 @@ BoxesDesc=Os widgets são componentes que exibem alguma informação que você p
 OnlyActiveElementsAreShown=Somente elementos de <a href="%s">módulos ativos</a> são mostrado.
 ModulesDesc=Os módulos do Dolibarr definem qual funcionalidade está habilitada no aplicativo. Alguns módulos exigem permissões que você deve garantir aos usuários, após a habilitação do código. Clique no botão on/off para habilitar um módulo/funcionalidade.
 ModulesMarketPlaceDesc=Você pode encontrar mais módulos para download em sites externos na Internet ...
-ModulesMarketPlaces=Mais módulos...
 DoliStoreDesc=DoliStore, o site oficial para baixar módulos externos.
 DoliPartnersDesc=Lista das empresas que realizam o serviço de desenvolvimento de módulos ou funcionalidades personalizadas (Nota: qualquer pessoa com experiência na programação em PHP pode realizar o desenvolvimento personalizado para um projeto com código fonte aberto)
 WebSiteDesc=Sites de referência para encontrar mais módulos ...
@@ -211,6 +206,9 @@ MAIN_MAIL_EMAIL_STARTTLS=Use criptografia TLS (STARTTLS)
 MAIN_DISABLE_ALL_SMS=Desabilitar todos envios de SMS (Para testes ou demo)
 MAIN_SMS_SENDMODE=Método usado para enviar SMS
 MAIN_MAIL_SMS_FROM=Número de telefone padrão para o envio de SMS
+MAIN_MAIL_DEFAULT_FROMTYPE=Remetente do e-mail como padrão para envios manuais (e-mail do usuário ou e-mail da empresa)
+UserEmail=E-mail do usuário
+CompanyEmail=E-mail da empresa
 FeatureNotAvailableOnLinux=Função não disponível para sistemas tipo Unix. Teste de envio local.
 SubmitTranslation=Se a tradução deste idioma não estiver completa ou se encontrar erros, você poderá corrigir editando os arquivos no diretório <b>langs/%s</b> e submeter sua alteração em www.transifex.com/dolibarr-association/dolibarr/
 SubmitTranslationENUS=Se a tradução para este idioma não está completa ou você encontrar erros, você pode corrigir pela edição dos arquivos no diretório <b>langs/%s</b> e enviar os arquivos modificados para dolibarr.org/forum ou para os desenvolvedores em github.com/Dolibarr/dolibarr.
@@ -230,19 +228,11 @@ ModuleFamilyInterface=Interfaces com sistemas externos
 MenuHandlers=Gestor de Menus
 MenuAdmin=Editor menus
 DoNotUseInProduction=Não utilizar em produção
-ThisIsProcessToFollow=Esse é o processo de configuração:
-ThisIsAlternativeProcessToFollow=Esta é uma configuração alternativa para o processo:
 FindPackageFromWebSite=Achar um pacote que possue as funções desejadas (por exemplo no site oficial %s).
 DownloadPackageFromWebSite=Baixar pacote.
-UnpackPackageInDolibarrRoot=Descompactar pacote dentro do diretório raiz do Dolibarr <b>%s</b>
-SetupIsReadyForUse=Instalação terminada e o Dolibarr está pronto para usar esse novo componente.
-NotExistsDirect=O diretório raiz alternativo não está definido.<br>
-InfDirAlt=Desde a versão 3 é possivel definir um diretório raiz alternativo. Isso permite armazenar, em outro lugar os plug-ins e os templates costomizados.<br>Simplesmente criando um diretório root do Dolibarr.<br>
-InfDirExample=<br>Então declara o arquivo conf.php<br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>*Linhas com "#" são comentários, para descomentar somente remova os "#".
 YouCanSubmitFile=Selecione o módulo:
 CurrentVersion=Versão atual do Dolibarr
 CallUpdatePage=Vá para a página que atualiza a estrutura de banco de dados e os dados:% s.
-LastActivationDate=Última data de ativação
 UpdateServerOffline=Atualização de servidor off-line
 GenericMaskCodes=Você pode criar suas próprias mascaras para gerar as referências automáticas.<br> Como exemplo inicial a mascara <b>'CLI{000}'</b> vai gerar a ref. <b>CLI001</b>,<b>CLI002</b>,<b>...</b> as mascaras são:<br>Mascara de contagem <b>{0000}</b>, essa mascara vai contar para cada nova ref. ex:<b>0001</b>,<b>0002</b>,<b>0003</b>,<b>...</b><br>Mascara de número inicial ex:<b>{000+100}</b> -> <b>101</b>,<b>102</b>,<b>103</b>,<b>...</b> ex2:<b>{0000+123}</b> -> <b>0124</b>,<b>0125</b>,<b>...</b><br>Mascara da data <b>{dd}</b> dias (01 a 31), <b>{mm}</b> mês (01 a 12), <b>{yy} {yyyy}</b> para anos ex:<b>{dd}/{mm}/{yy}</b> -> <b>28/07/15</b><br>
 GenericMaskCodes2=<b>{cccc}</b> o código do cliente nos caracteres<br><b>{cccc000}</b> o código do cliente nos caracteres é seguido por um contador dedicado ao cliente. Este contador dedicado ao cliente é redefinido ao mesmo tempo que o contador global.<br><b>{tttt}</b> O código do tipo de terceiros em n caracteres (veja o dicionário-tipos de terceiros).<br>
@@ -314,11 +304,8 @@ ExtrafieldCheckBox=Caixa de seleção
 ExtrafieldRadio=Botão de Rádio
 ExtrafieldCheckBoxFromList=Caixa de seleção da tabela
 ExtrafieldLink=Link para um objeto
-ExtrafieldParamHelpselect=Lista de parâmetros tem que ser tipo chave,valor<br><br> Por exemplo: <br>1,valor1<br>2,valor2<br>3,valor3<br>...<br><br>A ordem da lista tem que depender da outra:<br>1,valor1|parent_list_code:parent_key<br>2,valor2|parent_list_code:parent_key
 ExtrafieldParamHelpcheckbox=Lista de parâmetros tem que ser tipo chave,valor<br><br> por exemplo: <br>1,valor1<br>2,valor2<br>3,valor3<br>...
 ExtrafieldParamHelpradio=Lista de parâmetros tem que ser do tipo chave,valor<br><br> por exemplo: <br>1,valor1<br>2,valor2<br>3,valor3<br>...
-ExtrafieldParamHelpsellist=A lista de parâmetros é de uma tabela<br>Sintaxe : table_name:label_field:id_field::filter<br>Exemplo : c_typent:libelle:id::filter<br><br>o filtro pode ser um teste simples (p.ex. ativo=1) para exibir somente valor ativo<br>Você também pode usar $ID$ no filtro o qual é a ID do objeto atual<br>Para realizar uma SELEÇÃO no filtro, use $SEL$<br>se você deseja filtrar nos campos adicionais, use syntaxt extra.fieldcode=... (onde o código do campo é o código do campo adicional)<br><br>A fim de ter a lista dependendo de uma outra :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
-ExtrafieldParamHelpchkbxlst=A lista de parâmetros é de uma tabela<br>Sintaxe : table_name:label_field:id_field::filter<br>Exemplo : c_typent:libelle:id::filter<br><br>o filtro pode ser um teste simples (p.ex. ativo=1) para exibir somente valor ativo<br>Você também pode usar $ID$ no filtro o qual é a ID do objeto atual<br>Para realizar uma SELEÇÃO no filtro, use $SEL$<br>se você deseja filtrar nos campos adicionais, use syntaxt extra.fieldcode=... (onde o código do campo é o código do campo adicional)<br><br>A fim de ter a lista dependendo de uma outra :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
 ExtrafieldParamHelplink=Os parâmetros devem ser ObjectName:Classpath<br>Sintaxe : ObjectName:Classpath<br>Exemplo : Sociedade:sociedade/class/sociedade.class.php
 LibraryToBuildPDF=Biblioteca usada para a geração de PDF
 WarningUsingFPDF=Aviso: Sua <b>conf.php</b> Contém diretrize <b>dolibarr_pdf_force_fpdf=1</b>. Isso significa que você usa a biblioteca FPDF para gerar arquivos em PDF. Essa biblioteca é velha e não suporta muitas novas funções (Unicode, imagem transparente, cyrillic, línguas arábicas e asiáticas,...), portanto pode ocorrer alguns erros durante a geração de PDF.<br>Para corrigir esse problema e ter todo o suporte na geração de PDF, baixe <a href="http://www.tcpdf.org/" target="_blank">Biblioteca TCPDF</a>, então comente ou remova essa linha <b>$dolibarr_pdf_force_fpdf=1</b>, e adicione essa <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
@@ -348,10 +335,8 @@ EnableAndSetupModuleCron=Se você deseja ter esta fatura recorrente sendo gerada
 ModuleCompanyCodeAquarium=Retorna código de contabilidade construido por:<br>%s seguido pelo código do fornecedor terceiro pelo código de contabilidade do fornecedor, <br>%s seguido pelo código do cliente terceiro pelo código de contabilidade do cliente.
 ModuleCompanyCodePanicum=Retorna um código de contabilidade vazio.
 ModuleCompanyCodeDigitaria=Código de contabilidade depende do código do terceiro. O Código é composto pelo caractere "C" na primeira posição seguido pelos 5 primeiros caracteres do código do terceiro.
-Use3StepsApproval=Como padrão, as Ordens de Compra precisam ser criadas e aprovadas por 2 usuários diferentes (uma etapa/usuário para criar e outra etapa/usuário para aprovar. Note que se o usuário tem as permissões para criar e aprovar, uma etapa/usuário será suficiente). Você pode usar esta opção para introduzir uma terceira etapa/usuário para aprovação, se o valor é superior do que um valor dedicado (assim 3 etapas serão necessárias: 1=validação, 2=primeira aprovação e 3=segunda aprovação se o valor for suficiente).<br>Defina isto como vazio se uma aprovação (2 etapas) é suficiente, e defina isto para um valor muito baixo (0.1) se uma segunda aprovação é sempre exigida.
 UseDoubleApproval=Usar uma aprovação de 3 etapas quando o valor (sem taxa) é maior do que ...
 Module0Name=Usuários e grupos
-Module0Desc=Gerenciamento de usuários e grupos
 Module1Desc=Gerenciamento de empresas e contatos (clientes, prospecção, etc.)
 Module2Desc=Gestor Comercial
 Module10Desc=Relatório de Contabilidade Simples (jornais, rotação de estoque) baseado no conteúdo do banco de dados.
@@ -428,8 +413,6 @@ Module2000Desc=Permitir editar alguma área do texto usando um editor avançado
 Module2200Name=Preços dinâmicos
 Module2200Desc=Habilitar o uso de expressões matemáticas para os preços
 Module2300Desc=Gestor de Tarefas Agendadas
-Module2400Name=Agenda/Eventos
-Module2400Desc=Siga eventos ou encontros. Registre manualmente os eventos  nas Agendas ou deixe que o aplicativo grave automaticamente os eventos para fins de monitoramento.
 Module2500Name=Gerenciamento de Conteúdo Eletrônico
 Module2500Desc=Salve e compartilhe documentos
 Module2600Name=Serviços API/Web (Servidor SOAP)
@@ -477,7 +460,6 @@ Permission32=Criar/Modificar Produtos
 Permission34=Deletar Produtos
 Permission36=Ver/Gerenciar Produtos Ocultos
 Permission41=Ler Projetos (Projetos Compartilhados e Projetos que eu contratei para)
-Permission42=Criar/Modificar Projetos (Projetos Compartilhados e Projetos que eu contratei para)
 Permission44=Deletar Projetos (Projetos Compartilhados e Projetos que eu contratei para)
 Permission45=Exportar projetos
 Permission61=Ler Intervenções
@@ -573,7 +555,6 @@ PermissionAdvanced253=Criar/Modificar Usuários internos/externos e suas Permiss
 Permission254=Criar/Modificar Usuários Externos
 Permission255=Modificar Senha de Outros Usuários
 Permission256=Deletar ou Desativar Outros Usuários
-Permission262=Acesso Extendido para Todos os Terceiros (não apenas aqueles usuários vinculados). Não é efetivo para usuários externos (sempre são limitados a eles mesmos)
 Permission272=Ler Faturas
 Permission273=Emitir Fatura
 Permission281=Ler Contatos
@@ -755,18 +736,22 @@ AtEndOfMonth=No fim de mês
 CurrentNext=Atual/Próxima
 Offset=Compensar
 AlwaysActive=Sempre ativo
+Upgrade=Atualizar
 MenuUpgrade=Atualizar / Ampliar
-AddExtensionThemeModuleOrOther=Adicionar extensão (tema, módulo, ...)
 DocumentRootServer=Diretório raiz do servidor web
 DataRootServer=Diretório raiz dos dados
 VirtualServerName=Nome virtual do servidor
 Browser=Navegador
+Server=Servidor
 Database=Banco de Dados
+DatabaseServer=Servidor do Banco de Dados
+DatabaseName=Nome do Banco de Dados
 DatabasePort=Porta do Banco de Dados
 DatabaseUser=Usuário do Banco de Dados
 DatabasePassword=Senha do Banco de Dados
 TableName=Nome da Tabela
 NbOfRecord=Núm de gravações
+DriverType=Tipo de Driver
 SummarySystem=Resumo de informações do sistema
 SummaryConst=Lista de todos os parâmetros de configurações do Dolibarr
 MenuCompanySetup=Empresa
@@ -785,6 +770,7 @@ EnableMultilangInterface=Habilitar interface multi-idioma
 EnableShowLogo=Exibir logo no menu esquerdo
 CompanyInfo=Informação da empresa/fundação
 CompanyIds=Identificações da empresa/fundação
+CompanyName=Nome
 CompanyAddress=Endereço
 CompanyZip=CEP
 CompanyTown=Município
@@ -844,7 +830,6 @@ TriggerAlwaysActive=Triggers neste arquivo está sempre ativo, não importando o
 TriggerActiveAsModuleActive=Triggers neste arquivo são ativos quando módulo <b>%s</b> está ativado.
 GeneratedPasswordDesc=Defina aqui qual regra você deseja para gerar uma nova senha se você perguntar para ter uma geração automática de senhas
 DictionaryDesc=Inserir todos os dados de referência. Você pode adicionar seus valores ao padrão.
-ConstDesc=Esta página permite que você edite todos os outros parâmetros não disponíveis nas páginas anteriores. Eles são na maioria parâmetros reservados a desenvolvedores ou para a solução avançada de problemas.
 MiscellaneousDesc=Todos os outros parâmetros relacionados com a segurança são definidos aqui.
 LimitsSetup=Configurações de Limites/Precisões
 LimitsDesc=Você pode definir limites, precisões e otimizações utilizadas pelo Dolibarr aqui
@@ -913,7 +898,6 @@ TotalNumberOfActivatedModules=Número total de módulos ativados em destaque: <b
 YouMustEnableOneModule=Você pelo menos deve ativar 1 módulo
 ClassNotFoundIntoPathWarning=Classe %s não achado dentro o caminho PHP
 YesInSummer=Sim em verão
-OnlyFollowingModulesAreOpenedToExternalUsers=Note, somente seguintes módulos é aberto para usuários externos (qualquer que seja as permissões de tal usuário):
 SuhosinSessionEncrypt=Sessão armazenada criptografada pelo Suhosin
 ConditionIsCurrently=Condição é atualmente %s
 YouUseBestDriver=Você usa o driver %s que é o melhor driver disponível atualmente.
@@ -984,8 +968,6 @@ OrdersModelModule=Modelos de documentos de pedidos
 WatermarkOnDraftOrders=Marca d'água no rascunho de pedidos (nenhum para vazio)
 ShippableOrderIconInList=Adicionar um ícone na lista de pedidos que indicam se a ordem é shippable
 BANK_ASK_PAYMENT_BANK_DURING_ORDER=Informar conta bancária de destino da ordem
-ClickToDialSetup=Configurações do módulo clique para discar
-ClickToDialUrlDesc=Chamada URL quando se dá um clique na imagem do telefone. Na URL, você pode usar as tags<br><b>__TELEFONEPARA__</b> que será substituido com o número telefônico da pessoa a telefonar<br><b>__TELEFONEDE__ que será substituido com o número da pessoa que se telefona (seus)<br><b>__LOGIN__</b> que será substituido com o seu usuário do seu clique para discar (definido com o seu cartão de usuário)<br><b>__SENHA__</b> que será substituido pela sua senha do clique para discar (definida pelo seu cartão de usuário)
 InterventionsSetup=Configurações do módulo intervenções
 FreeLegalTextOnInterventions=Texto livre nos documentos de intervenção
 FicheinterNumberingModules=Modelos de numeração de intervenção
@@ -1111,7 +1093,6 @@ ViewProductDescInFormAbility=Visualização das descrições do produto nos form
 MergePropalProductCard=Ativar na aba Arquivos Anexos ao produto/serviço uma opção para mesclar o documento PDF do produto à proposta PDF se o produto/serviço estiver na proposta
 ViewProductDescInThirdpartyLanguageAbility=Visualização das descrições dos produtos no idioma do terceiro
 UseSearchToSelectProductTooltip=Além disso, se você tem um grande número de produtos (> 100 000), você pode aumentar a velocidade, definindo PRODUCT_DONOTSEARCH_ANYWHERE constante a 1 em Setup Outro. Busca, então, ser limitada até o início da string.
-UseSearchToSelectProduct=Usar um formulário de pesquisa para escolher um produto (ao invés de listá-los).<br> Também se tiver um grande número de produtos (> 100 000), você pode aumentar a velocidade alterando a constante PRODUCT_DONOTSEARCH_ANYWHERE para 1 no Configuração->Outros. A pesquisa será limitada para o começo da string.
 SetDefaultBarcodeTypeProducts=Tipo de código de barras default para usar nós produtos
 SetDefaultBarcodeTypeThirdParties=Tipo de código de barras default para usar nós terceiros
 UseUnits=Definir uma unidade de medida para a Quantidade durante a edição das linhas do pedido, proposta ou fatura
@@ -1159,7 +1140,6 @@ SendingsSetup=Configurações do módulo de envios
 SendingsReceiptModel=Modelo de recibo do envio
 SendingsNumberingModules=Módulos de númeração de envios
 SendingsAbility=Suporte para folhas de envios, para entregas de cliente
-NoNeedForDeliveryReceipts=Na maioria dos casos, recibos de envios são usados em duas folhas pela entrega de clientes (lista de produtos a enviar) e folhas que é recebida e assinado pelo cliente. Então o recibo de entrega do produto é duplicado e é raramente ativado.
 FreeLegalTextOnShippings=Texto livre para envios
 DeliveryOrderNumberingModules=Módulo de numeração de recibos de produtos entregues
 DeliveryOrderModel=Modelo de recibo de produtos entregues
@@ -1214,6 +1194,7 @@ Buy=Compra
 Sell=Venda
 InvoiceDateUsed=Data usada na fatura
 YourCompanyDoesNotUseVAT=Sua empresa está definido para não usar ICMS (Home->Configuração->Empresa), então não há nenhuma opção de configuração do ICMS.
+AccountancyCode=Código de contabilidade
 AccountancyCodeSell=Código de contas de vendas
 AccountancyCodeBuy=Código de contas de compras
 AgendaSetup=Configurações do módulo de eventos e agenda
@@ -1224,6 +1205,8 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Definido automaticamente esse valor padrão para o
 AGENDA_DEFAULT_FILTER_TYPE=Use automaticamente este tipo de evento no filtro de busca da agenda
 AGENDA_DEFAULT_FILTER_STATUS=Use automaticamente este estado no filtro das buscas da agenda
 AGENDA_DEFAULT_VIEW=Qual aba voçê quer abrir por padrão quando o menu Agenda e selecionado
+ClickToDialSetup=Configurações do módulo clique para discar
+ClickToDialUrlDesc=Chamada URL quando se dá um clique na imagem do telefone. Na URL, você pode usar as tags<br><b>__TELEFONEPARA__</b> que será substituido com o número telefônico da pessoa a telefonar<br><b>__TELEFONEDE__ que será substituido com o número da pessoa que se telefona (seus)<br><b>__LOGIN__</b> que será substituido com o seu usuário do seu clique para discar (definido com o seu cartão de usuário)<br><b>__SENHA__</b> que será substituido pela sua senha do clique para discar (definida pelo seu cartão de usuário)
 ClickToDialDesc=Esto modo permite tornar os números telefônicos em link. Um clique neste ícone fará com que o seu telefone ligue para o número exibido. Isto pode ser usado para ligar para um sistema de Call Center do Dolibarr, o qual poderá ligar para um número em um sistema SIP, por exemplo.
 ClickToDialUseTelLink=Use apenas o link "tel." para os números de telefone
 ClickToDialUseTelLinkDesc=Use este método se os seus usuários possuírem um softphone ou uma interface de programa instalada no mesmo computador do navegador, e usado para ligar quando você clica em um link no seu navegador que inicia com "tel.". Se você precisar de uma solução de um servidor completo (sem a necessidade de instalação de um programa local), você deve definir isto para "Não" e preencher o próximo campo.
@@ -1246,7 +1229,6 @@ WSDLCanBeDownloadedHere=Arquivos descritor WSDL que fornece serviços que podem
 EndPointIs=Os clientes SOAP devem enviar suas solicitações para o destinatário Dolibarr disponível na URL
 ApiSetup=Instalação de módulo de API
 ApiDesc=Ao ativar este módulo, Dolibarr se tornar um servidor REST para fornecer serviços de web diversos.
-ApiProductionMode=Habilitar o modo produção (isto ativará o uso de caches para o gerenciamento dos serviços)
 ApiExporerIs=Você pode explorar as APIs no URL
 OnlyActiveElementsAreExposed=Somente elementos de módulos habilitados são expostos
 ApiKey=Chave para API
@@ -1275,6 +1257,8 @@ ProjectsModelModule=Modelo de documento de relatório de projeto
 TasksNumberingModules=Modelo de numeração de tarefas
 TaskModelModule=Modelo de numeração de relatório de tarefas
 UseSearchToSelectProject=Use campos de completação automática para escolher projeto (em vez de usar uma caixa de lista)
+AccountingPeriods=Períodos de contabilidade
+AccountingPeriodCard=Período de contabilidade
 NewFiscalYear=Novo período de contabilidade
 OpenFiscalYear=Período da contabilidade em aberto
 CloseFiscalYear=Período da contabilidade fechada
@@ -1304,12 +1288,10 @@ BackupDumpWizard=Assistente para construir arquivo de despejo de backup do banco
 SomethingMakeInstallFromWebNotPossible=A instalação do módulo externo não é possível a partir da interface web pelo seguinte motivo:
 SomethingMakeInstallFromWebNotPossible2=Por esta razão, o processo de atualização descrito aqui é apenas manual de passos que um usuário privilegiado pode fazer.
 InstallModuleFromWebHasBeenDisabledByFile=A instalação do módulo externo do aplicativo foi desabilitada pelo seu Administrador. Você deve pedir que ele remova o arquivo <strong>%s</strong> para permitir esta funcionalidade.
-ConfFileMuseContainCustom=A instalação de um módulo externo do aplicativo salvou os arquivos do módulo no diretório <strong>%s</strong>. Para ter este diretório processado pelo Dolibarr, você deve configurar o seu <strong>conf/conf.php</strong> para ter a opção<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Destacar linhas de tabela quando o mouse passar sobre elas
 HighlightLinesColor=Cor de realce da linha quando o mouse passa sobre ela (manter vazio para nenhum realce)
 TextTitleColor=Cor do título da página
 LinkColor=Cor dos linques
-PressF5AfterChangingThis=Pressione F5 no teclado depois de mudar este valor para tê-lo eficaz
 NotSupportedByAllThemes=Trabalhará com os temas principais, pode não ser suportado por temas externos
 TopMenuBackgroundColor=Cor de fundo para o menu de topo
 TopMenuDisableImages=Ocultar imagens no menu Superior
@@ -1341,11 +1323,9 @@ MailToSendSupplierRequestForQuotation=Para enviar a solicitação de cotação p
 MailToSendSupplierOrder=Para enviar ordem fornecedor
 MailToSendSupplierInvoice=Para enviar fatura do fornecedor
 MailToThirdparty=Para enviar e-mail de uma página de terceiro
-YouUseLastStableVersion=Você está usando a última versão estável
+ByDefaultInList=Exibir como padrão na visualização em lista
 TitleExampleForMajorRelease=Exemplo de mensagem que você pode usar para anunciar esta importante versão (sinta-se à vontade para usar isso nos seus websites)
 TitleExampleForMaintenanceRelease=Exemplo de mensagem que você pode usar para anunciar esta versão de manutenção (sinta-se à vontade para usar isso nos seus websites)
-ExampleOfNewsMessageForMajorRelease=O ERP e CRM Dolibarr %s está disponível. A versão %s é importante com uma série de novas funcionalidades para os usuários e desenvolvedores. Você pode baixá-la da área de download do portal http://www.dolibarr.org (no sub-diretório das versões Estáveis). Você pode ler o <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">Registro de Mudanças</a> com a lista completa de mudanças.
-ExampleOfNewsMessageForMaintenanceRelease=O ERP e CRM Dolibarr %s está disponível. A versão %s é uma versão de manutenção, desta forma ela contém somente a correção de alguns bugs. Recomendamos que todos utilizem uma versão anterior para atualizar para esta última. Como qualquer versão de manutenção, nenhuma nova funcionalidade e nem uma nova estrutura de dados está presente nesta versão. Você pode baixá-la da área de download do portal http://www.dolibarr.org (sub-diretório das versões estáveis). Você pode ler o <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">Registro de Mudanças</a> com a lista completa de mudanças.
 MultiPriceRuleDesc=Quando a opção "Diversos níveis de preço por produto/serviço" estiver habilitada, você pode definir diferentes preços (um por nível de preço) para cada produto. Para ganhar tempo, você pode inserir aqui a regra para ter um preço para cada nível sendo calculada automaticamente de acordo com o preço do primeiro nível, desta forma você precisará apenas inserir o preço do primeiro nível para cada produto. Está página existe apenas para lhe ajudar a ganhar tempo e pode ser útil somente se os seus preços para cada nível estão relacionados ao primeiro nível. Você pode ignorar esta página na maioria das vezes.
 ModelModulesProduct=Temas para os documentos do produto
 ToGenerateCodeDefineAutomaticRuleFirst=Para estar apto a gerar códigos automaticamente, você deve definir primeiro um gerente para definir automaticamente o número do código de barras.
@@ -1366,12 +1346,10 @@ AddOtherPagesOrServices=Adicionar outras páginas ou serviços
 AddModels=Adicionar temas de documentos ou de numeração
 AddSubstitutions=Adicionar substituições de chaves
 DetectionNotPossible=Não foi possível a detecção
-UrlToGetKeyToUseAPIs=URL para obter um token para usar a API (uma vez que o token tenha sido recebido ele é salvo na tabela de usuário no banco de dados e será conferido em cada acesso futuro)
 ListOfAvailableAPIs=Lista de API's disponíveis
 activateModuleDependNotSatisfied=O módulo "%s" depende do módulo "%s" que está faltando, assim o módulo "%1$s" pode não funcionar corretamente. Favor instalar o módulo "%2$s" ou desabilitar o módulo "%1$s" se você deseja estar livre de qualquer surpresa.
 CommandIsNotInsideAllowedCommands=O comando que você tenta 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 de destino
 SamePriceAlsoForSharedCompanies=Se você usa um módulo de múltiplas empresas, com a escolha de "Preço único", o preço será também o mesmo para todas as empresas se os produtos são compartilhados entre os ambientes.
-ModuleEnabledAdminMustCheckRights=O módulo foi ativado. As permissões para o(s) módulo(s) ativado(s) foram enviadas somente aos usuários administradores. Você pode ter que garantir manualmente permissões para outros usuários, se necessário.
 UserHasNoPermissions=Este usuário não possui permissões definidas
 TypeCdr=Use "Nenhum" se a data do prazo de pagamento da fatura mais um delta em dias (delta é o campo "Nº de dias")<br>Use "No fim do mês", se, após o delta, a data deve ser aumentada para alcançar o fim do mês (+ um "Prazo" opcional em dias)<br>Use "Atual/Próximo" para ter a data do prazo de pagamento sendo o primeiro Nº do mês (N é armazenado no campo "Nº de dias")
diff --git a/htdocs/langs/pt_BR/banks.lang b/htdocs/langs/pt_BR/banks.lang
index 668d886150b..a06dc7619cd 100644
--- a/htdocs/langs/pt_BR/banks.lang
+++ b/htdocs/langs/pt_BR/banks.lang
@@ -52,18 +52,16 @@ IdTransaction=ID da transação
 BankTransactions=Transações bancárias
 ListTransactions=Listar transações
 ListTransactionsByCategory=Listar transações/categorias
-TransactionsToConciliate=Transações para reconciliação
+TransactionsToConciliate=Transações a reconciliar
 Conciliable=Pode ser reconciliado
 Conciliate=Reconciliar
 Conciliation=Reconciliação
 IncludeClosedAccount=Incluir contas inativas
-OnlyOpenedAccount=Apenas contas ativas
+OnlyOpenedAccount=Somente Contas Abertas
 AccountToCredit=Conta para crédito
 AccountToDebit=Conta para débito
 DisableConciliation=Desativar função de reconciliação dessa conta
 ConciliationDisabled=Função de reconciliação desativada
-LinkedToAConciliatedTransaction=Vinculado a uma transação conciliada
-StatusAccountOpened=Ativa
 StatusAccountClosed=Inativa
 LineRecord=Transação
 AddBankRecord=Adicionar transação
@@ -86,11 +84,10 @@ ConfirmDeleteCheckReceipt=Você tem certeza que deseja excluir este comprovante
 BankChecks=Cheques do banco
 BankChecksToReceipt=Cheques aguardando depósito
 ShowCheckReceipt=Mostrar recibo de depósito do cheque
-DeleteTransaction=Eliminar transação
+DeleteTransaction=Excluir transação
 ConfirmDeleteTransaction=Você tem certeza que deseja excluir esta transação?
-ThisWillAlsoDeleteBankRecord=Isto eliminará também as transações bancárias geradas
+ThisWillAlsoDeleteBankRecord=Isto também excluirá as transações geradas
 PlannedTransactions=Transações planejadas
-ExportDataset_banque_1=Transações bancárias e extrato da conta
 ExportDataset_banque_2=Comprovante de depósito
 TransactionOnTheOtherAccount=Transação de outra conta
 PaymentNumberUpdateSucceeded=Número de pagamentos atualizado com sucesso
@@ -98,7 +95,6 @@ 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=Transação Bancária
 AllAccounts=Todas contas bancária/caixa
 BackToAccount=Voltar para conta
 ShowAllAccounts=Mostrar todas as contas
diff --git a/htdocs/langs/pt_BR/bills.lang b/htdocs/langs/pt_BR/bills.lang
index 3451e7b0ef4..8de71f62d6b 100644
--- a/htdocs/langs/pt_BR/bills.lang
+++ b/htdocs/langs/pt_BR/bills.lang
@@ -1,12 +1,10 @@
 # Dolibarr language file - Source file is en_US - bills
 Bills=Faturas
-BillsCustomers=Faturas de cliente
+BillsCustomers=Faturas a clientes
 BillsCustomer=Fatura de cliente
-BillsSuppliers=Faturas de Fornecedores
-BillsCustomersUnpaid=Faturas de clientes não pago
-BillsCustomersUnpaidForCompany=Faturas de cliente não pago por %s
-BillsSuppliersUnpaid=Faturas de fornecedores não pago
-BillsSuppliersUnpaidForCompany=Faturas de fornecedor não pago por %s
+BillsSuppliers=Faturas de fornecedores
+BillsCustomersUnpaid=Faturas de clientes não pagos
+BillsSuppliersUnpaid=Faturas de fornecedores não pagos
 BillsLate=Pagamentos atrasados
 BillsStatistics=Estatísticas de faturas de clientes
 BillsStatisticsSuppliers=Estatísticas faturas de Fornecedores
@@ -39,7 +37,6 @@ UsedByInvoice=Usado para pagar fatura %s
 NotConsumed=Não consumida
 NoReplacableInvoice=Nenhuma fatura substituida
 NoInvoiceToCorrect=Nenhuma fatura para corrigir
-InvoiceHasAvoir=Corrigida por uma ou várias faturas
 CardBill=Ficha da fatura
 PredefinedInvoices=Faturas predefinidas
 Invoice=Fatura
@@ -58,8 +55,7 @@ PaymentsBack=Reembolsos de pagamentos
 paymentInInvoiceCurrency=na moeda das faturas
 PaidBack=Reembolso pago
 DeletePayment=Deletar pagamento
-ConfirmDeletePayment=Você tem certeza que deseja excluir este pagamento?
-ConfirmConvertToReduc=Você deseja converter esta nota de crédito ou depósito em um desconto absoluto?<br>A quantia será então salva entre todos os descontos e poderá ser usada como um desconto para uma fatura atual ou futura para este cliente.
+ConfirmDeletePayment=Você tem certeza que deseja deletar esse pagamento?
 SupplierPayments=Pagamentos a fornecedores
 ReceivedCustomersPayments=Pagamentos recebidos de cliente
 PayedSuppliersPayments=Pagamentos pago ao fornecedores
@@ -91,8 +87,6 @@ SearchACustomerInvoice=Procurar fatura de cliente
 SearchASupplierInvoice=Procurar fatura de fornecedor
 CancelBill=Cancelar uma fatura
 SendRemindByMail=Enviar Lembrete por e-mail
-DoPayment=Realizar pagamento
-DoPaymentBack=Realizar reembolso
 ConvertToReduc=Converter em um desconto futuro
 EnterPaymentReceivedFromCustomer=Entrar pagamento recebido de cliente
 EnterPaymentDueToCustomer=Realizar pagamento devido para cliente
@@ -102,7 +96,6 @@ BillStatus=Status de fatura
 StatusOfGeneratedInvoices=Situação das faturas geradas
 BillStatusDraft=Rascunho (precisa ser validada)
 BillStatusPaid=Pago
-BillStatusPaidBackOrConverted=Pago ou convertido em desconto
 BillStatusConverted=Pago (pronto para fatura final)
 BillStatusValidated=Validado (precisa ser pago)
 BillStatusStarted=Iniciado
@@ -110,7 +103,6 @@ BillStatusNotPaid=Não pago
 BillStatusClosedUnpaid=Fechado (não pago)
 BillStatusClosedPaidPartially=Pago (parcialmente)
 BillShortStatusPaid=Pago
-BillShortStatusPaidBackOrConverted=Processado
 BillShortStatusConverted=Processado
 BillShortStatusCanceled=Abandonado
 BillShortStatusValidated=Validado
@@ -136,14 +128,9 @@ NoQualifiedRecurringInvoiceTemplateFound=Nenhum tema de fatura recorrente qualif
 FoundXQualifiedRecurringInvoiceTemplate=Encontrado(s) %s tema(s) de fatura(s) recorrente(s) qualificado(s) para a geração.
 NotARecurringInvoiceTemplate=Não é um tema de fatura recorrente
 NewBill=Nova fatura
-LastBills=Última faturas: %s
-LastCustomersBills=Última faturas de clientes: %s
-LastSuppliersBills=Última faturas de fornecedores: %s
 AllBills=Todas faturas
 OtherBills=Outras faturas
 DraftBills=Rascunho de faturas
-CustomersDraftInvoices=Rascunho de faturas de clientes
-SuppliersDraftInvoices=Rascunho de faturas de fornecedores
 Unpaid=Não pago
 ConfirmDeleteBill=Você tem certeza que deseja excluir esta fatura?
 ConfirmValidateBill=Você tem certeza que deseja validar esta fatura com referência <b>%s</b>?
@@ -188,13 +175,14 @@ AlreadyPaidBack=Já está estornado
 AlreadyPaidNoCreditNotesNoDeposits=Já está pago (sem notas de crédito e depósitos)
 RemainderToPay=Restante para pagar
 RemainderToTake=Restante para pegar
-RemainderToPayBack=Restante para estornar
 Rest=Pedente
 AmountExpected=Quantidade reivindicada
 ExcessReceived=Excesso recebido
 EscompteOffered=Desconto oferecido (pagamento antes do prazo)
 SendBillRef=Enviar fatura %s
 SendReminderBillRef=Enviar fatura %s (restante)
+StandingOrders=Pedidos com Débito direto
+StandingOrder=Ordem de débito direto
 NoDraftBills=Nenhum rascunho de faturas
 NoOtherDraftBills=Nenhum outro rascunho de faturas
 NoDraftInvoices=Nenhum rascunho de faturas
@@ -247,8 +235,6 @@ CreditNoteDepositUse=A fatura deve ser validada para utilizar este tipo de créd
 NewGlobalDiscount=Novo desconto fixo
 NewRelativeDiscount=Novo desconto relativo
 DiscountOfferedBy=Concedido por
-DiscountStillRemaining=Descontos ainda remanescente
-DiscountAlreadyCounted=Desconto já foram aplicados
 BillAddress=Endereço de cobrança
 HelpEscompte=Esse desconto é um desconto concedido para cliente porque o pagamento foi feito antes do prazo.
 HelpAbandonBadCustomer=Essa quantia foi abandonada (cliente mencionou a ser um mau cliente) e é considerado uma perca excepcional.
@@ -290,7 +276,6 @@ 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
-toolTipFrequency=Exemplos:<br /><b>Definir 7 / dia</b>: criar uma nova fatura a cada 7 dias<br /><b>Definir 3 / mês</b>: criar uma nova fatura a cada 3 meses
 NextDateToExecution=Data para a próxima geração de fatura
 DateLastGeneration=Data da última geração
 MaxPeriodNumber=Nº máximo de geração de faturas
@@ -300,8 +285,6 @@ 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
-PaymentConditionShortRECEP=Imediato
-PaymentConditionRECEP=Imediato
 PaymentCondition30D=30 dias
 PaymentConditionShort30DENDMONTH=30 dias do fim do mês
 PaymentCondition30DENDMONTH=Dentro de 30 dias após o fim do mês
@@ -334,6 +317,7 @@ BankAccountNumber=Número da conta
 BankAccountNumberKey=Chave
 Residence=Débito automático
 IBANNumber=Número da agencia
+IBAN=Agencia
 BICNumber=Número BIC/SWIFT
 ExtraInfos=Informações extras
 RegulatedOn=Regulamentado em
@@ -368,7 +352,6 @@ ChequesArea=Área de cheques depositados
 ChequeDeposits=depósitos de cheques
 DepositId=Depósito Id
 NbCheque=Número de cheques
-CreditNoteConvertedIntoDiscount=Essa nota de crédito ou fatura de depósito foi convertida 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
 ShowUnpaidLateOnly=Mostrar todas as faturas atrasadas não pagas
diff --git a/htdocs/langs/pt_BR/boxes.lang b/htdocs/langs/pt_BR/boxes.lang
index 8171800da60..49419f61306 100644
--- a/htdocs/langs/pt_BR/boxes.lang
+++ b/htdocs/langs/pt_BR/boxes.lang
@@ -20,8 +20,6 @@ BoxTitleLastSuppliers=Últimos %s fornecedores registrados
 BoxTitleLastModifiedSuppliers=Últimos %s fornecedores modificados
 BoxTitleLastModifiedCustomers=Últimos %s clientes modificados
 BoxTitleLastCustomersOrProspects=Últimos %s clientes ou prospectos de cliente
-BoxTitleLastCustomerBills=Últimas %s faturas de cliente
-BoxTitleLastSupplierBills=Últimas %s faturas de fornecedor
 BoxTitleLastModifiedProspects=Últimos %s prospectos de cliente modificados
 BoxTitleLastModifiedMembers=Últimos %s membros
 BoxTitleLastFicheInter=Últimas %s intervenções modificadas
@@ -44,12 +42,7 @@ LastRefreshDate=Ultima data atualizacao
 NoRecordedBookmarks=Nenhum marcador definido.
 NoRecordedContacts=Nenhum contato registrado
 NoActionsToDo=Nenhuma ação para fazer
-NoRecordedOrders=Nenhum pedido de cliente registrado
 NoRecordedProposals=Nenhum possível cliente registrado
-NoRecordedInvoices=Nenhuma fatura de cliente registrado
-NoUnpaidCustomerBills=Nenhuma fatura de cliente não pago registrado
-NoUnpaidSupplierBills=Nenhuma fatura de fornecedores não pago
-NoModifiedSupplierBills=Nenhum registro de faturas de fornecedores
 NoRecordedProducts=Nenhum registro de produtos/serviços
 NoRecordedProspects=Nenhum registro de possíveis clientes
 NoContractedProducts=Nenhum produtos/serviços contratados
diff --git a/htdocs/langs/pt_BR/companies.lang b/htdocs/langs/pt_BR/companies.lang
index 15d98b3a4cb..b88d0b8859d 100644
--- a/htdocs/langs/pt_BR/companies.lang
+++ b/htdocs/langs/pt_BR/companies.lang
@@ -59,6 +59,7 @@ VATIsUsed=Sujeito a ICMS
 VATIsNotUsed=Não sujeito a ICMS
 CopyAddressFromSoc=Preencher o endereço com os dados do terceiro
 ThirdpartyNotCustomerNotSupplierSoNoRef=Terceiro sem ser cliente ou fornecedor, nenhum objeto de referência disponível
+PaymentBankAccount=Pagamento conta bancária
 LocalTax1IsUsed=Utilizar segundo imposto
 LocalTax1IsUsedES=É usado RE
 LocalTax1IsNotUsedES=Não é usado RE
@@ -99,11 +100,11 @@ ProfId4IN=ID prof. 4
 ProfId5IN=ID prof. 5
 ProfId1LU=Id. prof. 1 (R.C.S. Luxemburgo)
 ProfId2LU=Id. prof. 2 (Permissão para negócios)
-ProfId5MA=Id prof. 5 (I.C.E.)
 VATIntra=Número ICMS
 VATIntraShort=Núm ICMS
 VATIntraSyntaxIsValid=Sintaxe é válida
 ProspectCustomer=Possível cliente / Cliente
+Prospect=Prospecto de cliente
 CustomerCard=Ficha do cliente
 CustomerRelativeDiscount=Desconto relativo do cliente
 CustomerRelativeDiscountShort=Desconto relativo
@@ -221,7 +222,6 @@ ListProspectsShort=Lista de prospectos de cliente
 ThirdPartiesArea=Área de terceiros
 LastModifiedThirdParties=Últimos %s terceiros modificados
 UniqueThirdParties=Total de terceiros
-InActivity=Ativo
 ActivityCeased=Inativo
 ProductsIntoElements=Lista de produtos/serviços em %s
 CurrentOutstandingBill=Notas aberta correntes
@@ -235,7 +235,5 @@ MergeThirdparties=Mesclar terceiros
 ConfirmMergeThirdparties=Você tem certeza que deseja mesclar este terceiro ao atual? Todos os objetos conectados (faturas, pedidos, etc.) serão movidos para o terceiro atual. Desta forma você será capaz de excluir o que estiver duplicado.
 ThirdpartiesMergeSuccess=Terceiros foram mesclados
 SaleRepresentativeLogin=Login para o representante de vendas
-SaleRepresentativeFirstname=Primeiro nome do representante de vendas
-SaleRepresentativeLastname=Sobrenome do representante de vendas
 ErrorThirdpartiesMerge=Houve um erro ao excluir os terceiros. Por favor, verifique o log. As alterações foram revertidas.
 NewCustomerSupplierCodeProposed=Código sugerido para o novo cliente ou fornecedor está duplicado
diff --git a/htdocs/langs/pt_BR/compta.lang b/htdocs/langs/pt_BR/compta.lang
index eae84df5baa..1b5ee09e148 100644
--- a/htdocs/langs/pt_BR/compta.lang
+++ b/htdocs/langs/pt_BR/compta.lang
@@ -67,7 +67,6 @@ LT2PaymentES=Pagamento de IRPF
 LT2PaymentsES=Pagamentos de IRPF
 VATPayment=Pagamento da taxa de venda
 VATPayments=Pagamentos da taxa de venda
-VATRefund=Reembolso da taxa de venda
 Refund=Reembolso
 SocialContributionsPayments=Pagamentos de impostos sociais / fiscais
 ShowVatPayment=Ver Pagamentos ICMS
@@ -158,20 +157,15 @@ CalculationRuleDescSupplier=De acordo com o fornecedor, escolher o método adequ
 TurnoverPerProductInCommitmentAccountingNotRelevant=Relatório Volume de negócios por produto, quando se usa um modo de <b>contabilidade de caixa</b> não é relevante. Este relatório está disponível somente quando utilizar o modo de <b>contabilidade engajamento</b> (ver configuração do módulo de contabilidade).
 CalculationMode=Forma de cálculo
 AccountancyJournal=Codigo do jornal fiscal
-ACCOUNTING_VAT_SOLD_ACCOUNT=Conta da contabilidade padrão para o recolhimento de ICMS (nas vendas)
-ACCOUNTING_VAT_BUY_ACCOUNT=Conta padrão da contabilidade para o ICMS (VAT) recuperado (nas compras)
 ACCOUNTING_VAT_PAY_ACCOUNT=Conta da contabilidade padrão para o pagamento de ICMS
-ACCOUNTING_ACCOUNT_CUSTOMER=Conta da contabilidade padrão para os clientes terceiros
-ACCOUNTING_ACCOUNT_SUPPLIER=Conta da contabilidade padrão para fornecedores terceiros.
 CloneTax=Clonar uma taxa social / fiscal
 ConfirmCloneTax=Confirme o clone de um pagamento de taxa social / fiscal
 CloneTaxForNextMonth=Clonar para o proximo mes
-AddExtraReport=Relatórios extra
 OtherCountriesCustomersReport=Relação de clientes estrangeiros
 BasedOnTwoFirstLettersOfVATNumberBeingDifferentFromYourCompanyCountry=Com base nas duas primeiras letras do número de IVA sendo diferente do código de país da sua própria empresa
 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=Importar contribuições fiscais/sociais
-ImportDataset_tax_vat=Importar valores pagos de ICMS
+ImportDataset_tax_contrib=Contribuições fiscais/sociais
 ErrorBankAccountNotFound=Erro: conta bancária não encontrada
+FiscalPeriod=Período de contabilidade
diff --git a/htdocs/langs/pt_BR/cron.lang b/htdocs/langs/pt_BR/cron.lang
index 667d88d4112..9c4de0bc30d 100644
--- a/htdocs/langs/pt_BR/cron.lang
+++ b/htdocs/langs/pt_BR/cron.lang
@@ -12,8 +12,6 @@ CronExplainHowToRunUnix=No ambiente Unix você deve usar a seguinte entrada cron
 CronExplainHowToRunWin=Em ambiente Microsoft (tm)  Windows,  Você PODE USAR Ferramentas de Tarefa agendada Para executar a Linha de Comando de Cada 5 Minutos
 CronMethodDoesNotExists=A classe %s não contém método %s algum
 EnabledAndDisabled=Ativado e desativado
-CronLastOutput=Saída do último acionamento
-CronLastResult=Código do último resultado
 CronList=As tarefas agendadas
 CronDelete=Excluir tarefas agendadas
 CronConfirmDelete=Você tem certeza que deseja excluir esses cron jobs agendados?
diff --git a/htdocs/langs/pt_BR/errors.lang b/htdocs/langs/pt_BR/errors.lang
index 2ede6f11a9c..6ad94dddc47 100644
--- a/htdocs/langs/pt_BR/errors.lang
+++ b/htdocs/langs/pt_BR/errors.lang
@@ -103,7 +103,6 @@ ErrorNoActivatedBarcode=Nenhum tipo de código de barras foi ativado
 ErrUnzipFails=Houve uma falha ao descompactar %s com ZipArchive
 ErrNoZipEngine=Não esta instaladoo programa para descompactar o arquivo% s neste PHP
 ErrorFileMustBeADolibarrPackage=O arquivo %s deve ser um pacote zipado do Dolibarr
-ErrorFileRequired=É preciso um arquivo de pacote 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
@@ -119,7 +118,6 @@ ErrorWarehouseMustDiffers=A conta origem e destino devem ser diferentes
 ErrorBadFormat=Formato ruim!
 ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Erro, este membro não está ainda conectado a qualquer terceiro. Conectar o membro a um terceiro existente ou criar um novo terceiro antes de criar uma assinatura com fatura.
 ErrorThereIsSomeDeliveries=Erro, há algumas entregas ligados a este envio. Supressão recusou.
-ErrorCantDeletePaymentReconciliated=Não posso deletar o pagamento que gerou uma transação bancaria conciliada.
 ErrorCantDeletePaymentSharedWithPayedInvoice=Não e possivel cancelar o pagamento condiviso para pelo menos uma fatura com estado Pago
 ErrorPriceExpression1=Não é possível atribuir a constante %s'
 ErrorPriceExpression2=Não é possível redefinir a função built-in '%s'
@@ -158,12 +156,8 @@ ErrorWarehouseRequiredIntoShipmentLine=É exigido um armazém na linha para a re
 ErrorFileMustHaveFormat=O arquivo deve ter o formato %s
 ErrorSupplierCountryIsNotDefined=Este fornecedor não possui o país definido. Corrija isto primeiro.
 ErrorsThirdpartyMerge=Falha em mesclar os dois registros. Solicitação cancelada.
-ErrorStockIsNotEnoughToAddProductOnOrder=O estoque não é suficiente para o produto %s a fim de adicioná-lo a um novo pedido.
-ErrorStockIsNotEnoughToAddProductOnInvoice=O estoque não é suficiente para o produto %s para adicioná-lo a uma nova fatura.
-ErrorStockIsNotEnoughToAddProductOnShipment=O estoque não é suficiente para o produto %s para adicioná-lo a uma nova remessa.
-ErrorStockIsNotEnoughToAddProductOnProposal=O estoque não é suficiente para o produto %s para adicioná-lo a uma nova proposta.
-ErrorFailedToLoadLoginFileForMode=Falha para recuperar o arquivo de login para o modo '%s'.
 ErrorModuleNotFound=O arquivo do módulo não foi encontrado.
+ErrorFieldAccountNotDefinedForBankLine=O valor para a conta da Contabilidade não foi definido para a linha do banco de origem %s
 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>
diff --git a/htdocs/langs/pt_BR/holiday.lang b/htdocs/langs/pt_BR/holiday.lang
index a201f268953..1ba33b79912 100644
--- a/htdocs/langs/pt_BR/holiday.lang
+++ b/htdocs/langs/pt_BR/holiday.lang
@@ -62,8 +62,7 @@ BoxTitleLastLeaveRequests=Últimas %s solicitações de licença modificadas
 HolidaysMonthlyUpdate=Atualização mensal
 ManualUpdate=Atualização manual
 HolidaysCancelation=Cancelamento da solicitação de licença
-EmployeeLastname=Sobrenome do funcionário
-EmployeeFirstname=Nome do funcionário
+TypeWasDisabledOrRemoved=A licença do tipo (id %s) foi desabilitada ou removida
 LastUpdateCP=Última atualização automática de fixação de licenças
 MonthOfLastMonthlyUpdate=Mês da última atualização automática de fixação de licenças
 UpdateConfCPOK=Atualizado com sucesso.
diff --git a/htdocs/langs/pt_BR/ldap.lang b/htdocs/langs/pt_BR/ldap.lang
index 3f290642a4b..ea11ca3ce03 100644
--- a/htdocs/langs/pt_BR/ldap.lang
+++ b/htdocs/langs/pt_BR/ldap.lang
@@ -6,8 +6,6 @@ LDAPInformationsForThisContact=Informação da base de dados LDAP deste contato
 LDAPInformationsForThisUser=Informação da base de dados LDAP deste usuário
 LDAPUsers=Usuário na base de dados LDAP
 LDAPFieldFirstSubscriptionAmount=Valor da Primeira Adesão
-LDAPFieldLastSubscriptionDate=Data da Última Adesão
-LDAPFieldLastSubscriptionAmount=Valor Última Adesão
 LDAPFieldSkypeExample=Exemplo : nomeskype
 UserSynchronized=Usuário Sincronizado
 ErrorFailedToReadLDAP=Erro na leitura do anuário LDAP. Verificar a configuração do módulo LDAP e a acessibilidade do anuário.
diff --git a/htdocs/langs/pt_BR/mails.lang b/htdocs/langs/pt_BR/mails.lang
index c4743f7b3ed..cfd022f516a 100644
--- a/htdocs/langs/pt_BR/mails.lang
+++ b/htdocs/langs/pt_BR/mails.lang
@@ -11,7 +11,6 @@ TestMailing=Testar email
 MailingStatusSentPartialy=Enviado parcialmente
 MailingStatusSentCompletely=Enviado completamente
 MailingStatusNotSent=Não enviado
-MailSuccessfulySent=E-mail enviado corretamente (de %s a %s)
 MailingSuccessfullyValidated=Emailins validado com sucesso
 MailUnsubcribe=Desenscrever
 MailingStatusNotContact=Nao contactar mais
@@ -50,9 +49,7 @@ MailSelectedRecipients=Destinatários selecionados
 TargetsStatistics=Estatísticas destinatários
 NbOfCompaniesContacts=Contatos únicos de empresas
 MailNoChangePossible=Destinatários de um mailing validado não modificaveis
-MailingNeedCommand=Para razões de segurança, o envio de um mailing em massa e melhor quando feito da linha de comando. Se voce tem uma, pergunte ao seu administrador de serviço de executar o comando seguinte para enviar o mailing em massa a todos os destinatarios:
 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=Se você não pode ou prefere enviá-los por meio do seu navegador, favor confirmar que você tem certeza que deseja enviar o e-mail para a lista de e-mails agora a partir do seu navegador.
 LimitSendingEmailing=Observação: Envios de mailings em massa da interface web são feitas em varias vezes por causa de segurança e tempo limite, <b>%s</b> destinatarios por sessão de envio.
 ToClearAllRecipientsClickHere=Para limpar a lista dos destinatários deste mailing, faça click ao botão
 ToAddRecipientsChooseHere=Para Adicionar destinatários, escoja os que figuran em listas a continuação
diff --git a/htdocs/langs/pt_BR/main.lang b/htdocs/langs/pt_BR/main.lang
index ff9aa9eb271..11a0534f5ba 100644
--- a/htdocs/langs/pt_BR/main.lang
+++ b/htdocs/langs/pt_BR/main.lang
@@ -23,6 +23,7 @@ DatabaseConnection=Login à Base de Dados
 NoTemplateDefined=Nenhum tema definido para este tipo de e-mail
 AvailableVariables=Variáveis de substituição disponíveis
 NoRecordFound=Nenhum registro encontrado
+NoRecordDeleted=Nenhum registro foi deletado
 NotEnoughDataYet=Sem dados suficientes
 NoError=Sem erro
 ErrorFieldFormat=O campo '%s' tem um valor incorreto
@@ -51,6 +52,7 @@ SeeHere=veja aqui
 BackgroundColorByDefault=Cor do fundo padrão
 FileRenamed=O arquivo foi renomeado com sucesso
 FileUploaded=O arquivo foi carregado com sucesso
+FileGenerated=O arquivo foi gerado com sucesso
 FileWasNotUploaded=O arquivo foi selecionado, mas nao foi ainda enviado. Clique no "Anexar arquivo" para proceder.
 NbOfEntries=Nr. de entradas
 GoToWikiHelpPage=Ler a ajuda online (necessário acesso a Internet)
@@ -60,7 +62,6 @@ LevelOfFeature=Nível de funções
 DolibarrInHttpAuthenticationSoPasswordUseless=Modo de autenticação do Dolibarr está definido como <b>%s</b> no arquivo de configuração<b>conf.php</b>.<br>Isso significa que o banco de dados das senhas é externo ao Dolibarr, assim mudar este campo, pode não ter efeito.
 PasswordForgotten=Esqueceu a senha?
 SeeAbove=Mencionar anteriormente
-LastConnexion=último login
 PreviousConnexion=último login
 PreviousValue=Valor anterior
 ConnectedOnMultiCompany=Conectado no ambiente
@@ -120,7 +121,6 @@ PersonalValue=Valor Personalizado
 CurrentValue=Valor atual
 MultiLanguage=Multi Idioma
 RefOrLabel=Ref. da etiqueta
-DefaultModel=Modelo Padrão
 Action=Ação
 About=Acerca de
 NumberByMonth=Numero por mes
@@ -137,7 +137,6 @@ DateEnd=Data de término
 DateCreationShort=Data Criação
 DateModification=Data Modificação
 DateModificationShort=Data Modif.
-DateLastModification=Data última Modificação
 DateValidation=Data Validação
 DateDue=Data Vencimento
 DateValue=Data Valor
@@ -147,6 +146,7 @@ DateOperationShort=Data Op.
 DateLimit=Data Límite
 DateRequest=Data Consulta
 DateProcess=Data Processo
+UserCreation=Criado por
 UserModification=Alterado por
 UserCreationShort=Criado por
 UserModificationShort=Modif. por
@@ -226,7 +226,6 @@ Categories=Tags / categorias
 Category=Tag / categoria
 to=para
 ApprovedBy2=Aprovado pelo (segunda aprovação)
-Opened=Aberto
 Topic=Assunto
 ByUsers=Por usuário
 LateDesc=O atraso na definição se o registro é tardio ou não, depende da sua configuração. Peça ao seu Administrador para alterar o atraso no menu Início - Configuração - Alertas.
@@ -267,6 +266,7 @@ SupplierPreview=Historico Fornecedor
 ShowCustomerPreview=Ver Historico Cliente
 ShowSupplierPreview=Ver Historico Fornecedor
 SendByMail=Enviado por e-mail
+Email=E-mail
 NoMobilePhone=Sem celular
 Owner=Proprietário
 Refresh=Atualizar
@@ -274,6 +274,7 @@ CanBeModifiedIfOk=Pode modificarse se é valido
 CanBeModifiedIfKo=Pode modificarse senão é valido
 ValueIsValid=Valor é válido
 ValueIsNotValid=Valor inválido
+RecordCreatedSuccessfully=Registro criado com sucesso
 RecordsModified=%s registros modificados
 RecordsDeleted=%s registro excluido
 FeatureDisabled=Função Desativada
@@ -298,7 +299,6 @@ Merge=Fusão
 PrintContentArea=Mostrar pagina a se imprimir na area principal
 MenuManager=Administração do menu
 WarningYouAreInMaintenanceMode=Atenção, voce esta no modo de manutenção, somente o login <b>%s</b> tem permissões para uso da aplicação no momento.
-CoreErrorMessage=Occoreu erro. Verifique os arquivos de log ou contate seu administrador de sistema.
 CreditCard=Cartão de credito
 FieldsWithAreMandatory=Campos com <b>%s</b> são obrigatorios
 FieldsWithIsForPublic=Campos com <b>%s</b> são mostrados na lista publica de membros. Se não deseja isto, deselecione a caixa "publico".
@@ -351,7 +351,6 @@ PublicUrl=URL pública
 AddBox=Adicionar caixa
 SelectElementAndClickRefresh=Selecionar um elemento e clickar atualizar
 PrintFile=Imprimir arquivo %s
-ShowTransaction=Mostrar transação na conta bancária
 GoIntoSetupToChangeLogo=Vá para casa - Configuração - Empresa de mudar logotipo ou ir para casa - Setup - Display para esconder.
 Denied=Negado
 Gender=Gênero
@@ -370,15 +369,20 @@ ClickHere=Clickque aqui
 FrontOffice=Frente do escritório
 BackOffice=Fundo do escritório
 View=Visão
-SomeTranslationAreUncomplete=Algumas línguas pode ter sido parcialmente traduzida ou conter erros. Se você detectar algum, você pode corrigir <b>.lang</b> nos arquivos de texto no diretório <b>htdocs/langs</b> e submeter ele no fórum no <a href="http://www.dolibarr.org/forum" target="_blank">http://www.dolibarr.org</a>.
+Exports=Exportações
+ExportFilteredList=Exportar lista filtrada
+ExportList=Exportar lista
+Miscellaneous=Variados
+Calendar=Calendário
+GroupBy=Agrupar por
+ViewFlatList=Visão da lista resumida
 Saturday=Sabado
 SaturdayMin=Sab
 SelectMailModel=Escolha um modelo de e-mail
 SetRef=Escolher referência
+Select2ResultFoundUseArrows=Alguns resultados encontrados. Use as setas para selecionar.
 Select2NotFound=Nenhum resultado encontrado
 Select2Enter=Forneça
-Select2MoreCharacter=ou mais caracteres
-Select2MoreCharacters=ou mais caracteres
 Select2LoadingMoreResults=Carregando mais resultados...
 Select2SearchInProgress=Busca em andamento...
 SearchIntoThirdparties=Terceiros
diff --git a/htdocs/langs/pt_BR/members.lang b/htdocs/langs/pt_BR/members.lang
index 6bb6167741b..4cd63795762 100644
--- a/htdocs/langs/pt_BR/members.lang
+++ b/htdocs/langs/pt_BR/members.lang
@@ -11,7 +11,6 @@ MembersTickets=Etiquetas de associado
 FundationMembers=Membros da fundação
 ErrorMemberIsAlreadyLinkedToThisThirdParty=Outro membro  já está vinculado a um terceiro. Remover este link em primeiro lugar porque um terceiro não pode ser ligado a apenas um membro (e vice-versa).
 ErrorUserPermissionAllowsToLinksToItselfOnly=Por razões de segurança, você deve ter permissões para editar todos os usuários sejam capazes de ligar um membro a um usuário que não é seu.
-ThisIsContentOfYourCard=Este é os detalhes do seu cartão
 CardContent=Conteúdo da sua ficha de membro
 SetLinkToThirdParty=Link para um fornecedor Dolibarr
 MembersListUpToDate=Lista dos Membros válidos ao día de adesão
@@ -26,7 +25,6 @@ EndSubscription=fim filiação
 SubscriptionId=Id adesão
 MemberId=Id adesão
 MemberStatusDraft=rascunho (a Confirmar)
-MemberStatusActiveLate=filiação não à día
 MemberStatusActiveLateShort=não à día
 MemberStatusPaid=Assinatura em dia
 MemberStatusPaidShort=Até à data
@@ -76,8 +74,6 @@ LinkToGeneratedPagesDesc=Esta tela permite gerar arquivos PDF com cartões de vi
 DocForAllMembersCards=Gerar cartões de visita para todos os membros
 DocForOneMemberCards=Gerar cartões de visita para um determinado membro
 DocForLabels=Gerar folhas de endereço
-LastSubscriptionDate=Data da Última Adesão
-LastSubscriptionAmount=Valor Última Adesão
 MembersStatisticsByRegion=Membros por região estatísticas
 NoValidatedMemberYet=Nenhum membro validados encontrado
 MembersByCountryDesc=Esta tela mostrará estatísticas sobre usuários por países. Gráfico depende, contudo, do Google serviço gráfico on-line e está disponível apenas se uma conexão à Internet é está funcionando.
@@ -85,7 +81,7 @@ MembersByStateDesc=Esta tela mostrará estatísticas sobre usuários por estado
 MembersByTownDesc=Esta tela mostrará estatísticas sobre usuários por cidade.
 MembersStatisticsDesc=Escolha as estatísticas que você quer ler ...
 MenuMembersStats=Estatísticas
-LastMemberDate=Data do membro
+Nature=Tipo de produto
 Public=Informações são públicas
 NewMemberbyWeb=Novo membro adicionado. Aguardando aprovação
 NewMemberForm=Formulário para novo membro
diff --git a/htdocs/langs/pt_BR/orders.lang b/htdocs/langs/pt_BR/orders.lang
index 17d1246f2ea..376677a88a5 100644
--- a/htdocs/langs/pt_BR/orders.lang
+++ b/htdocs/langs/pt_BR/orders.lang
@@ -8,6 +8,7 @@ CustomerOrder=Pedido de Cliente
 CustomersOrders=Pedidos de clientes
 CustomersOrdersRunning=Pedidos dos clientes atuais
 CustomersOrdersAndOrdersLines=Pedidos de clientes e linhas de pedidos
+OrdersDeliveredToBill=Pedidos de clientes entregues na conta
 OrdersToBill=Pedidos dos clientes entregue
 OrdersInProcess=Pedidos de cliente em processo
 OrdersToProcess=Pedidos de cliente a processar
@@ -53,6 +54,7 @@ ClassifyShipped=Clasificar entregue
 DraftSuppliersOrders=Rascunho de pedidos para fornecedor
 RefCustomerOrder=Ref. pedido por cliente
 RefOrderSupplier=Ref. ordem por fonecedor
+RefOrderSupplierShort=Ref. Encomendar fornecedor
 ActionsOnOrder=Ações sobre o pedido
 NoArticleOfTypeProduct=Não existe artigos de tipo 'produto' e por tanto expedidos neste pedido
 UserWithApproveOrderGrant=Usuários autorizados a aprovar os pedidos.
@@ -89,3 +91,4 @@ OrderFail=Um erro ocorreu durante a criação de seus pedidos
 CreateOrders=Criar pedidos
 ToBillSeveralOrderSelectCustomer=Para criar uma nota fiscal para várias encomendas, clique primeiro no cliente, em seguida, escolha "%s".
 CloseReceivedSupplierOrdersAutomatically=Fechar automaticamente o pedido como "%s" se todos os produtos foram recebidos.
+SetShippingMode=Definir modo de envio
diff --git a/htdocs/langs/pt_BR/other.lang b/htdocs/langs/pt_BR/other.lang
index 3f0dfdacf68..9e8e942fd7e 100644
--- a/htdocs/langs/pt_BR/other.lang
+++ b/htdocs/langs/pt_BR/other.lang
@@ -61,14 +61,10 @@ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nVocê encontrará
 PredefinedMailContentSendShipping=__CONTACTCIVNAME__ Você vai encontrar aqui o envio __ SHIPPINGREF__ __ PERSONALIZED__Sincerely __ SIGNATURE__
 PredefinedMailContentSendFichInter=__NOMEDECONTATO__\n\nVocê vai encontrar aqui a intervenção __FICHINTERREF__\n\n__PERSONALIZADO__Sinceramente\n\n__Assinatura__
 PredefinedMailContentThirdparty=__NOMEDECONTATO__\n\n__PERSONALIZADO__\n\n__ASSINATURA__
-DemoDesc=O Dolibarr é um ERP/CRM que suporta diversos módulos funcionais. Uma demonstração de todos os módulos não faz sentido, pois este cenário nunca acontece. Desta forma, diversos perfis de demonstração estão disponíveis.
 ChooseYourDemoProfil=Escolha o perfil de demonstração que melhor se enquadra nas suas necessidades...
 DemoFundation=Administração de Membros de uma associação
 DemoFundation2=Administração de Membros e tesouraria de uma associação
-DemoCompanyServiceOnly=Administração de um trabalhador por conta propia realizando serviços
 DemoCompanyShopWithCashDesk=Administração de uma loja com Caixa
-DemoCompanyProductAndStocks=Administração de uma PYME com venda de produtos
-DemoCompanyAll=Administração de uma PYME com Atividades multiplos (todos Os módulos principais)
 ClosedBy=Encerrado por %s
 CreatedById=Id usuario que criou
 ModifiedById=ID do usuário que fez a última mudança
@@ -140,6 +136,8 @@ ForgetIfNothing=Se voce nao pediu esta mudanca, simplismente esquece deste email
 IfAmountHigherThan=Se a quantia mais elevada do que <strong>%s</strong>
 SourcesRepository=Repositório de fontes
 Chart=Gráfico
+LibraryUsed=Biblioteca usada
+LibraryVersion=Versão da biblioteca
 NoExportableData=não existe dados exportáveis (sem módulos com dados exportáveis gastodos, necessitam de permissões)
 WebsiteSetup=Configuração do módulo website
 WEBSITE_PAGEURL=URL da página
diff --git a/htdocs/langs/pt_BR/products.lang b/htdocs/langs/pt_BR/products.lang
index e7b2153e055..4243b299105 100644
--- a/htdocs/langs/pt_BR/products.lang
+++ b/htdocs/langs/pt_BR/products.lang
@@ -41,11 +41,11 @@ 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.
-CostPriceUsage=Numa futura versão, este valor não poderá ser usado para cálculo de margem.
 SoldAmount=Total vendido
 PurchasedAmount=Total comprado
 MinPrice=Preço de venda min.
 CantBeLessThanMinPrice=O preço de venda não deve ser inferior ao mínimo para este produto (%s ICMS)
+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.
@@ -54,17 +54,17 @@ 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)
 MultiPricesNumPrices=Número de preços
-AssociatedProductsAbility=Ative o recurso pacote
-AssociatedProducts=Pacote produto
-AssociatedProductsNumber=Número de produtos a compor este produto pacote
+AssociatedProductsAbility=Ativar o recurso para gerenciar produto virtual
+AssociatedProductsNumber=N� de produtos associados
 ParentProductsNumber=Numero de pacotes pais do produto
 ParentProducts=Produtos pai
-IfZeroItIsNotAVirtualProduct=Se for 0, este produto não é um produto pacote
-IfZeroItIsNotUsedByVirtualProduct=Se 0, este produto não é usado por qualquer produto do pacote
+IfZeroItIsNotAVirtualProduct=Se 0, este produto não e produto virtual
+IfZeroItIsNotUsedByVirtualProduct=Se 0, este produto nao e usado por nenhum produto virtual
 KeywordFilter=Filtro por palavra-chave
 CategoryFilter=Filtro por categoria
+ListOfProductsServices=Lista de produtos/serviços
 ProductAssociationList=Lista dos produtos / serviços que são componente deste produto / pacote virtual
-ProductParentList=Lista de pacote produtos/serviços com este produto como componente
+ProductParentList=Lista de produtos/servicos virtuais com este produto como componente
 ErrorAssociationIsFatherOfThis=Um dos produtos selecionados é pai do produto em curso
 ConfirmDeleteProduct=? Tem certeza que quer eliminar este produto/serviço?
 ConfirmDeleteProductLine=Tem certeza que quer eliminar esta linha de produto?
@@ -163,7 +163,6 @@ AddUpdater=Adicionar atualizador
 GlobalVariables=As variáveis ​​globais
 VariableToUpdate=Variável para atualizar
 GlobalVariableUpdaters=Updaters variáveis ​​globais
-LastUpdated=Ultima atualização
 PropalMergePdfProductActualFile=Usar arquivos para adicionar em PDF Azur são / é
 PropalMergePdfProductChooseFile=Selecione os arquivos PDF
 IncludingProductWithTag=Incluindo produto/serviço com tag
diff --git a/htdocs/langs/pt_BR/projects.lang b/htdocs/langs/pt_BR/projects.lang
index 7674cc90718..7a16aa7591c 100644
--- a/htdocs/langs/pt_BR/projects.lang
+++ b/htdocs/langs/pt_BR/projects.lang
@@ -16,17 +16,12 @@ OnlyOpenedProject=Só os projetos abertos são visíveis (projetos em fase de pr
 ClosedProjectsAreHidden=Projetos encerrados não são visíveis.
 TasksPublicDesc=Essa exibição apresenta todos os projetos e tarefas que você tem permissão para ler.
 TasksDesc=Essa exibição apresenta todos os projetos e tarefas (suas permissões de usuário concede-lhe ver tudo).
-AllTaskVisibleButEditIfYouAreAssigned=Todas as tarefas para tal projeto estão visíveis, mas você só pode inserir o horário para a tarefa à qual você está designado. Atribua a tarefa a você se desejas inserir o horário nela.
-OnlyYourTaskAreVisible=Apenas as tarefas que estão atribuídas a você são visíveis. Atribuir tarefa para você, se você deseja inserir tempo com isso.
 NewProject=Novo projeto
 AddProject=Criar projeto
 DeleteAProject=Excluir um projeto
 DeleteATask=Excluir uma tarefa
 ConfirmDeleteAProject=Você tem certeza que deseja excluir este projeto?
 ConfirmDeleteATask=Você tem certeza que deseja excluir esta tarefa?
-OpenedProjects=Projetos em andamento
-OpenedTasks=Tarefas em andamento
-OpportunitiesStatusForOpenedProjects=Montante de oportunidades de projetos abertos de acordo com a situação
 OpportunitiesStatusForProjects=Montante de oportunidades dos projetos pela situação
 ShowProject=Mostrar projeto
 NoProject=Nenhum Projeto Definido
@@ -38,7 +33,6 @@ TimesSpent=Dispêndio de tempo
 RefTask=Ref. da tarefa
 TaskTimeSpent=Dispêndio de tempo com tarefas
 TaskTimeUser=Usuário
-TasksOnOpenedProject=Tarefas em projetos abertos
 NewTimeSpent=Novo dispêndio de tempo
 MyTimeSpent=Meu dispêndio de tempo
 TaskDateEnd=Data final da tarefa
@@ -89,6 +83,7 @@ CloneContacts=Copiar contatos
 CloneNotes=Copiar notas
 CloneProjectFiles=Copiar arquivos do projetos
 CloneTaskFiles=Copia(s) do(s) arquivo(s) do projeto(s) finalizado
+CloneMoveDate=Atualizar as datas do projeto/tarefas a partir de agora?
 ConfirmCloneProject=Você tem certeza que deseja clonar este projeto?
 ErrorShiftTaskDate=Impossível mudar data da tarefa de acordo com a nova data de início do projeto
 ProjectModifiedInDolibarr=Projeto %s modificado
@@ -137,9 +132,8 @@ ProjectsStatistics=As estatísticas sobre projetos / leads
 TaskAssignedToEnterTime=Tarefa atribuída. Entrando tempo nesta tarefa deve ser possível.
 IdTaskTime=Horário do ID da tarefa
 YouCanCompleteRef=Se você deseja completar a referência com alguma informação (para usar como filtro de busca), recomenda-se a adição do carácter "-" para separação, desta forma a numeração automática ainda funcionará corretamente para os próximos projetos. Por exemplo: %s-ABC. Você também pode preferir adicionar chaves de busca no rótulo. Mas a melhor prática pode ser adicionar um campo dedicado, também chamado de atributos complementares.
-OpenedProjectsByThirdparties=Projetos em andamento por terceiros
+OpenedProjectsByThirdparties=Projetos abertos pelo thirdparties
 OnlyOpportunitiesShort=Somente oportunidades
-OpenedOpportunitiesShort=Oportunidades em andamento
 NotAnOpportunityShort=Não é uma oportunidade
 OpportunityTotalAmount=Montante total de oportunidades
 OpportunityPonderatedAmount=Montante de oportunidades ponderadas
diff --git a/htdocs/langs/pt_BR/propal.lang b/htdocs/langs/pt_BR/propal.lang
index 1e451132e38..bb3ae47ef10 100644
--- a/htdocs/langs/pt_BR/propal.lang
+++ b/htdocs/langs/pt_BR/propal.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - propal
-ProposalsOpened=Propostas comerciais abertas
 ProposalCard=Cartao de proposta
 AddProp=Criar proposta
 ConfirmDeleteProp=Tem certeza que quer apagar esta proposta comercial?
@@ -8,7 +7,6 @@ LastPropals=Últimas %s propostas
 LastModifiedProposals=Últimas %s propostas modificadas
 NoProposal=Sem propostas
 AmountOfProposalsByMonthHT=Valor por Mês (sem ICMS)
-PropalsOpened=Aberto
 PropalStatusSigned=Assinado (A Faturar)
 PropalStatusNotSigned=Sem Assinar (Encerrado)
 PropalStatusBilled=Faturado
diff --git a/htdocs/langs/pt_BR/stocks.lang b/htdocs/langs/pt_BR/stocks.lang
index efb8c11b766..afbf3a0d70b 100644
--- a/htdocs/langs/pt_BR/stocks.lang
+++ b/htdocs/langs/pt_BR/stocks.lang
@@ -21,8 +21,6 @@ ListOfStockMovements=Lista de movimentações de estoque
 StocksArea=Setor de armazenagem
 NumberOfDifferentProducts=Número de produtos diferentes
 NumberOfProducts=Número total de produtos
-LastMovement=Última movimentação
-LastMovements=Últimas movimentações
 StockCorrection=Corrigir estoque
 StockTransfer=Tranferencia de Estoque
 MassStockTransferShort=Transferência de estoque em massa
@@ -34,7 +32,6 @@ StockTooLow=Estoque muito baixo
 StockLowerThanLimit=Estoque mais baixo do que o limite de alerta
 EnhancedValueOfWarehouses=Valor de estoques
 UserWarehouseAutoCreate=Criar existencias automaticamente na criação de um usuário
-AllowAddLimitStockByWarehouse=Permitir a adição de limite e estoque desejado por produto e armazém
 IndependantSubProductStock=Estoque de produtos e estoque subproduto são independentes
 QtyDispatched=Quantidade despachada
 QtyDispatchedShort=Qtde despachada
@@ -119,8 +116,6 @@ 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
-OpenInternal=Aberto para ações internas
-UseDispatchStatus=Usar a situação do despacho (aprovado/recusado)
 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/supplier_proposal.lang b/htdocs/langs/pt_BR/supplier_proposal.lang
index 99118f2f586..5feee372351 100644
--- a/htdocs/langs/pt_BR/supplier_proposal.lang
+++ b/htdocs/langs/pt_BR/supplier_proposal.lang
@@ -8,7 +8,6 @@ SearchRequest=Procurar uma solicitação
 DraftRequests=Minutas de solicitação
 SupplierProposalsDraft=Minutas de propostas a fornecedor
 LastModifiedRequests=Últimas %s solicitações de preço modificadas
-RequestsOpened=Solicitações de preço em aberto
 SupplierProposalArea=Área de propostas a fornecedor
 SupplierProposalShort=Proposta a fornecedor
 SupplierProposals=Propostas a fornecedor
@@ -23,7 +22,6 @@ ConfirmValidateAsk=Você tem certeza que deseja validar esta solicitação de pr
 DeleteAsk=Excluir solicitação
 ValidateAsk=Validar solicitação
 SupplierProposalStatusDraft=Minuta (requer confirmação)
-SupplierProposalStatusValidated=Confirmada (a solicitação está aberta)
 SupplierProposalStatusClosed=Fechada
 SupplierProposalStatusSigned=Aceita
 SupplierProposalStatusNotSigned=Recusada
@@ -50,5 +48,5 @@ ListOfSupplierProposal=Lista de solicitações de proposta a fornecedor
 ListSupplierProposalsAssociatedProject=Lista de propostas de fornecedores associadas ao projeto
 SupplierProposalsToClose=Propostas a fornecedor a encerrar
 SupplierProposalsToProcess=Propostas a fornecedor a tratar
-LastSupplierProposals=Últimas solicitações de preço
+LastSupplierProposals=Últimos %s preços solicitados
 AllPriceRequests=Todas as solicitações
diff --git a/htdocs/langs/pt_BR/users.lang b/htdocs/langs/pt_BR/users.lang
index b04a5032a6f..d0087d2d529 100644
--- a/htdocs/langs/pt_BR/users.lang
+++ b/htdocs/langs/pt_BR/users.lang
@@ -6,7 +6,7 @@ EditPassword=Alterar senha
 SendNewPassword=Enviar nova senha
 ReinitPassword=Gerar nova senha
 PasswordChangedTo=Senha alterada em: %s
-SubjectNewPassword=Sua nova senha para o Dolibarr
+SubjectNewPassword=Sua nova senha para %s
 GroupRights=Permissões do grupo
 UserRights=Permissões do usuário
 UserGUISetup=Interface do usuário
@@ -23,6 +23,7 @@ ConfirmEnableUser=Tem certeza que deseja ativar o usuário <b>%s</b>?
 ConfirmReinitPassword=Tem certeza que deseja gerar uma nova senha para o usuário <b>%s</b>?
 ConfirmSendNewPassword=Tem certeza que deseja gerar e enviar uma nova senha para o usuário <b>%s</b>?
 NewUser=Novo usuário
+CreateUser=Criar usuário
 LoginNotDefined=O usuário não está definido
 NameNotDefined=O nome não está definido
 ListOfUsers=Lista de usuário
diff --git a/htdocs/langs/pt_BR/withdrawals.lang b/htdocs/langs/pt_BR/withdrawals.lang
index 0da54b70f29..712fbc298e5 100644
--- a/htdocs/langs/pt_BR/withdrawals.lang
+++ b/htdocs/langs/pt_BR/withdrawals.lang
@@ -19,7 +19,7 @@ ResponsibleUser=Usuário Responsável dos Débitos Diretos
 WithdrawStatistics=Estatísticas do pagamento por Débito direto
 WithdrawRejectStatistics=Estatísticas de recusa do pagamento por Débito direto
 LastWithdrawalReceipt=Últimos %s recibos de Débito direto
-MakeWithdrawRequest=Realizar um Pedido de Débito Direto
+MakeWithdrawRequest=Efetuar um pedido de débito direto
 ThirdPartyBankCode=Código Banco do Fornecedor
 NoInvoiceCouldBeWithdrawed=Não há fatura de débito direto com sucesso. Verifique se a fatura da empresa tem um válido IBAN.
 ClassCredited=Classificar Acreditados
@@ -61,8 +61,6 @@ StatisticsByLineStatus=Estatísticas por situação de linhas
 RUMLong=Unique Mandate Reference (Referência Única de Mandato)
 RUMWillBeGenerated=Número UMR a ser gerado uma vez salva a informação da conta bancária
 WithdrawMode=Modo de Débito direto (FRST ou RECUR)
-WithdrawRequestAmount=Retirar montante pedido:
-WithdrawRequestErrorNilAmount=Não é possível retirar pedido de montante zerado ou sem valor.
 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
diff --git a/htdocs/langs/pt_PT/accountancy.lang b/htdocs/langs/pt_PT/accountancy.lang
index 6f6ce231f46..9fe84202b60 100644
--- a/htdocs/langs/pt_PT/accountancy.lang
+++ b/htdocs/langs/pt_PT/accountancy.lang
@@ -194,6 +194,8 @@ ChangeBinding=Change the binding
 
 ## Admin
 ApplyMassCategories=Apply mass categories
+AddAccountFromBookKeepingWithNoCategories=Add acccount already used with no categories
+CategoryDeleted=Category for the accounting account has been removed
 
 ## Export
 Exports=Exportados
@@ -209,6 +211,7 @@ Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution
 Modelcsv_quadratus=Export towards Quadratus QuadraCompta
 Modelcsv_ebp=Export towards EBP
 Modelcsv_cogilog=Export towards Cogilog
+ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
 InitAccountancy=Init accountancy
diff --git a/htdocs/langs/pt_PT/admin.lang b/htdocs/langs/pt_PT/admin.lang
index c174f6b6dda..932fb08d12e 100644
--- a/htdocs/langs/pt_PT/admin.lang
+++ b/htdocs/langs/pt_PT/admin.lang
@@ -9,14 +9,20 @@ VersionDevelopment=Desenvolvimento
 VersionUnknown=Desconhecido
 VersionRecommanded=Recomendada
 FileCheck=Files integrity checker
-FileCheckDesc=This tool allows you to check the integrity of files of your application, comparing each files with the official ones. You can use this tool to detect if some files were modified by a hacker for example.
+FileCheckDesc=This tool allows you to check the integrity of files and setup of your application, comparing each files with the official ones. 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.
+FileIntegrityIsStrictlyConformedWithReference=Files integrity is strictly conformed with the reference.
+FileIntegrityIsOkButFilesWereAdded=Files integrity check has passed, however some new files were added.
+FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified, removed or added.
+GlobalChecksum=Global checksum
 MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
 LocalSignature=Embedded local signature (less reliable)
 RemoteSignature=Remote distant signature (more reliable)
 FilesMissing=Ficheiros em Falta
 FilesUpdated=Ficheiros Atualizados
+FilesModified=Modified Files
+FilesAdded=Added Files
 FileCheckDolibarr=Check integrity of application files
-AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from a certified package
+AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from an official package
 XmlNotFound=Xml Integrity File of application not found
 SessionId=Id. da Sessão
 SessionSaveHandler=Gestor para guardar as sessões
@@ -185,7 +191,9 @@ BoxesDesc=Widgets are components showing some information that you can add to pe
 OnlyActiveElementsAreShown=Só os elementos de <a href
 ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
-ModulesMarketPlaces=mais módulos...
+ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
+ModulesMarketPlaces=Find external modules...
+GoModuleSetupArea=To deploy/install a new module, go onto the Module setup area at <a href="%s">%s</a>.
 DoliStoreDesc=DoliStore, o mercado oficial para Dolibarr ERP / CRM módulos externos
 DoliPartnersDesc=List of companies providing custom developed modules or features (Note: anyone experienced in PHP programming can provide custom development for an open source project)
 WebSiteDesc=Indique sites de referência para encontrar mais módulos...
@@ -276,21 +284,22 @@ ModuleFamilyInterface=Interfaces with external systems
 MenuHandlers=Gestores de menu
 MenuAdmin=Editor de menu
 DoNotUseInProduction=Não utilizar em ambiente de produção
-ThisIsProcessToFollow=Procedimento a seguir:
-ThisIsAlternativeProcessToFollow=This is an alternative setup to process:
+ThisIsProcessToFollow=This is steps to process:
+ThisIsAlternativeProcessToFollow=This is an alternative setup to process manually:
 StepNb=Passo %s
 FindPackageFromWebSite=Encontre um pacote que fornece a funcionalidade desejada (por exemplo, %s site oficial).
 DownloadPackageFromWebSite=Transfira o pacote (por exemplo, do site da Web oficial %s).
-UnpackPackageInDolibarrRoot=Descompactar o ficheiro do pacote para a diretoria do servidor Dolibarr dedicado, para os módulos externos: <b>%s</b>
-SetupIsReadyForUse=A Instalação está finalizada e o ERP/CRM está disponivel com o novo componente.
-NotExistsDirect=A diretoria raiz alternativa não está definida.<br>
-InfDirAlt=Since version 3 it is possible to define an alternative root directory.This allows you to store, same place, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
-InfDirExample=<br>Then declare it in the file conf.php<br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>*These lines are commented with "#", to uncomment only remove the character.
+UnpackPackageInDolibarrRoot=Unpack the packaged files into server directory dedicated to Dolibarr: <b>%s</b>
+UnpackPackageInModulesRoot=To deploy/install an external module, unpack the packaged files into the server directory dedicated to modules: <b>%s</b>
+SetupIsReadyForUse=Module deployment is finished. You must however enable and setup the module in your application by going on the page to setup modules: <a href="%s">%s</a>.
+NotExistsDirect=The alternative root directory is not defined to an existing directory.<br>
+InfDirAlt=Since version 3, it is possible to define an alternative root directory. This allows you to store, into a dedicated directory, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
+InfDirExample=<br>Then declare it in the file <strong>conf.php</strong><br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>If these lines are commented with "#", to enable them, just uncomment by removing the "#" character.
 YouCanSubmitFile=For this step, you can send package using this tool: Select module file
 CurrentVersion=Versão actual do ERP/CRM
 CallUpdatePage=Go to the page that updates the database structure and data: %s.
 LastStableVersion=Última versão estável
-LastActivationDate=Last activation date
+LastActivationDate=Latest activation date
 UpdateServerOffline=Update server offline
 GenericMaskCodes=Pode introduzir qualquer máscara numérica. Nesta máscara, pode utilizar as seguintes etiquetas:<br><b>{000000} </b> corresponde a um número que se incrementa em cada um de %s. Introduza tantos zeros como longitude que deseja mostrar. O contador completar-se-á a partir de zeros pela esquerda com o fim de ter tantos zeros como a máscara. <br> <b> {000000+000}</ b> Igual que o anterior, com uma compensação correspondente ao número da direita do sinal + aplica-se a partir do primeiro %s. <br> <b> {000000@x}</b> igual que o anterior, mas o contador restablece-se a zero quando se chega a x meses (x entre 1 e 12). Se esta opção se utiliza e x é de 2 ou superior, então a sequência {yy}{mm} ou {yyyy}{mm} também é necessário. <br> <b> {dd} </b> días (01 a 31). <br><b> {mm}</b> mês (01 a 12). <br><b>{yy}</b>, <b>{yyyy}</b> ou <b>{e}</b> ano em 2, 4 ou 1 figura.<br>
 GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
@@ -373,11 +382,11 @@ ExtrafieldCheckBox=Caixa de verificação
 ExtrafieldRadio=Botão
 ExtrafieldCheckBoxFromList= Checkbox from table
 ExtrafieldLink=Link to an object
-ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>In order to have the list depending on another :<br>1,value1|parent_list_code:parent_key<br>2,value2|parent_list_code:parent_key
+ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list :<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list :<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
-ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
+ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Example : Societe:societe/class/societe.class.php
 LibraryToBuildPDF=Biblioteca utilizada para gerar PDF
 WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
@@ -411,10 +420,11 @@ ModuleCompanyCodePanicum=Devolve um código contabilistico vazio.
 ModuleCompanyCodeDigitaria=Devolve um código contabilistico composto por o código do Terceiro. O código está formado por caracter ' C ' na primeira posição seguido dos 5 primeiros caracteres do código do Terceiro.
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
-
+WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<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).
+ClickToShowDescription=Click to show description
 # Modules
 Module0Name=Utilizadores e Grupos
-Module0Desc=Gestão de Utilizadores e Grupos
+Module0Desc=Users / Employees and Groups management
 Module1Name=Terceiros
 Module1Desc=Gestão de Terceiros (Empresas, Particulares) e Contactos
 Module2Name=Comercial
@@ -515,8 +525,8 @@ Module2200Name=Preços Dinamicos
 Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
 Module2300Desc=Gestão de trabalho agendado
-Module2400Name=Agenda/Events
-Module2400Desc=Follow events or rendez-vous. Record manual events into Agendas or let application logs automatic events for tracking purposes.
+Module2400Name=Events/Agenda
+Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous.
 Module2500Name=Gestão Electrónica de Documentos
 Module2500Desc=Permite administrar uma base de documentos
 Module2600Name=Serviços API/Web (servidor SOAP)
@@ -582,7 +592,7 @@ Permission34=Eliminar produtos/serviços
 Permission36=Exportar produtos/serviços
 Permission38=Exportar Produtos
 Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
-Permission42=Criar/Modificar projectos
+Permission42=Create/modify projects (shared project and projects i'm contact for). Can also create tasks and assign users to project and tasks
 Permission44=Eliminar projectos
 Permission45=Export projects
 Permission61=Consultar Intervenções
@@ -685,7 +695,7 @@ PermissionAdvanced253=Criar / modificar usuários internos / externos e permiss
 Permission254=Eliminar ou desactivar outros utilizadores
 Permission255=Modificar a palavra-passe de outros utilizadores
 Permission256=Modificar a sua propia palavra-passe
-Permission262=Consultar todas as empresas (somente utilizadores internos. Os externos estão limitados a eles mesmos)
+Permission262=Extend access to all third parties (not only third parties that user is a sale representative).<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 assignement matters).
 Permission271=Ler CA
 Permission272=Ler Facturas
 Permission273=Emitir Factura
@@ -887,7 +897,7 @@ Offset=Deslocado
 AlwaysActive=Sempre Activo
 Upgrade=Actualização
 MenuUpgrade=Upgrade / Ampliar
-AddExtensionThemeModuleOrOther=Ajustar extensão (tema, módulo, etc.)
+AddExtensionThemeModuleOrOther=Deploy/install external module
 WebServer=Servidor web
 DocumentRootServer=Pasta raiz das páginas web
 DataRootServer=Pasta raiz dos ficheiros de dados
@@ -994,7 +1004,7 @@ TriggerAlwaysActive=Triggers deste Ficheiro sempre activos, já que os módulos
 TriggerActiveAsModuleActive=Triggers deste Ficheiro activos já que o módulo <b>%s</b> está activado
 GeneratedPasswordDesc=Indique aqui que norma quer utilizar para gerar as palavras-passe.
 DictionaryDesc=Insert all reference data. You can add your values to the default.
-ConstDesc=This page allows you to edit all other parameters not available in previous pages. These are mostly reserved parameters for developers or advanced troubleshooting.
+ConstDesc=This page allows you to edit all other parameters not available in previous pages. These are mostly reserved parameters for developers or advanced troubleshooting. For a list of options <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">check here</a>.
 MiscellaneousDesc=All other security related parameters are defined here.
 LimitsSetup=Configuração de límites e precisões
 LimitsDesc=Pode definir aqui os límites e precisões utilizados pelo ERP/CRM
@@ -1161,10 +1171,6 @@ FreeLegalTextOnOrders=Texto livre em pedidos
 WatermarkOnDraftOrders=Marca d'água nas encomendas provisórias (nenhuma se em branco)
 ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable
 BANK_ASK_PAYMENT_BANK_DURING_ORDER=Ask for bank account destination of order
-##### Clicktodial #####
-ClickToDialSetup=Configuração do módulo Click To Dial
-ClickToDialUrlDesc=Efectue uma chamada, fazendo click no icon (URL) do telefone . <br>a 'url completa da chamada será: URL?login
-##### Bookmark4u #####
 ##### Interventions #####
 InterventionsSetup=Configuração do módulo Intervenções
 FreeLegalTextOnInterventions=Texto livre em  documentos de intervenção
@@ -1391,7 +1397,7 @@ SendingsSetup=Configuração do módulos envíos
 SendingsReceiptModel=Modelo da ficha de expedição
 SendingsNumberingModules=Envios módulos numerados
 SendingsAbility=Support shipping sheets for customer deliveries
-NoNeedForDeliveryReceipts=Na maioria dos casos, as entregas utilizam a nota de entregas ao cliente (lista de produtos a enviar), quando recebido assinam pelo cliente. Portanto, a hora de entregas de produtos é uma operação duplicada sendo rara a vez que é ativada.
+NoNeedForDeliveryReceipts=In most cases, shipping sheets are used both as sheets for customer deliveries (list of products to send) and sheets that is received and signed by customer. So product deliveries receipts is a duplicated feature and is rarely activated.
 FreeLegalTextOnShippings=Texto livre nas expedições
 ##### Deliveries #####
 DeliveryOrderNumberingModules=Módulo de numeração dos envios a clientes
@@ -1471,7 +1477,11 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Set automatically this default value for type of e
 AGENDA_DEFAULT_FILTER_TYPE=Set automatically this type of event into search filter of agenda view
 AGENDA_DEFAULT_FILTER_STATUS=Set automatically this status for events into search filter of agenda view
 AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
-##### ClickToDial #####
+AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
+AGENDA_NOTIFICATION_SOUND=Enable sound notification
+##### Clicktodial #####
+ClickToDialSetup=Configuração do módulo Click To Dial
+ClickToDialUrlDesc=Efectue uma chamada, fazendo click no icon (URL) do telefone . <br>a 'url completa da chamada será: URL?login
 ClickToDialDesc=This module allows to make phone numbers clickable. A click on this icon will call make your phone to 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.
 ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
 ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on same computer than the browser, and called when you click on a link in your browser that start 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.
@@ -1499,10 +1509,11 @@ EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint availa
 ##### API ####
 ApiSetup=Configurar módulo API
 ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
-ApiProductionMode=Enable production mode (this will activate use of a caches for services management)
+ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
 ApiExporerIs=Pode explorar as APIs na url
 OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
 ApiKey=Chave para a API
+WarningAPIExplorerDisabled=The API explorer has been disabled. API explorer is not required to provide API services. It is a tool for developer to find/test REST APIs. If you need this tool, go into setup of module API REST to activate it.
 ##### Bank #####
 BankSetupModule=Banco módulo de configuração
 FreeLegalTextOnChequeReceipts=Texto livre em recibos dos cheques
@@ -1571,7 +1582,7 @@ BackupDumpWizard=Wizard to build database backup dump file
 SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
 SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is only manual steps a privileged user can do.
 InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
-ConfFileMuseContainCustom=Installing an external module from application save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to have option<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
+ConfFileMuseContainCustom=Installing an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
 HighlightLinesColor=Highlight color of the line when the mouse passes over (keep empty for no highlight)
 TextTitleColor=Color of page title
@@ -1601,6 +1612,7 @@ FixTZ=Corrigir Fuso Horário
 FillFixTZOnlyIfRequired=Example: +2 (fill only if problem experienced)
 ExpectedChecksum=Expected Checksum
 CurrentChecksum=Current Checksum
+ForcedConstants=Required constant values
 MailToSendProposal=To send customer proposal
 MailToSendOrder=To send customer order
 MailToSendInvoice=To send customer invoice
@@ -1609,13 +1621,14 @@ MailToSendIntervention=To send intervention
 MailToSendSupplierRequestForQuotation=To send quotation request to supplier
 MailToSendSupplierOrder=To send supplier order
 MailToSendSupplierInvoice=To send supplier invoice
+MailToSendContract=To send a contract
 MailToThirdparty=To send email from third party page
 ByDefaultInList=Show by default on list view
-YouUseLastStableVersion=You use the last stable version
+YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
 TitleExampleForMaintenanceRelease=Example of message you can use to announce this maintenance release (feel free to use it on your web sites)
-ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. You can download it from the download area of http://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.
-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, nor data structure change is present into this version. You can download it from the download area of http://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.
+ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. 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.
+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, nor data structure change is present into 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, you can enter here rule to have price for each level autocalculated according to price of first level, so you will have to enter only price for first level on each product. This page is here to save you time and can be usefull only if your prices for each leve are relative to first level. You can ignore this page in most cases.
 ModelModulesProduct=Templates for product documents
 ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
diff --git a/htdocs/langs/pt_PT/banks.lang b/htdocs/langs/pt_PT/banks.lang
index 426a4328828..36c274408d8 100644
--- a/htdocs/langs/pt_PT/banks.lang
+++ b/htdocs/langs/pt_PT/banks.lang
@@ -74,13 +74,13 @@ Conciliate=Conciliar
 Conciliation=Conciliação
 ReconciliationLate=Reconciliation late
 IncludeClosedAccount=Incluir Contas fechadas
-OnlyOpenedAccount=Apenas contas abertas
+OnlyOpenedAccount=Somente 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
-StatusAccountOpened=Abrir
+StatusAccountOpened=Aberto
 StatusAccountClosed=Fechada
 AccountIdShort=Número
 LineRecord=Registo
diff --git a/htdocs/langs/pt_PT/bills.lang b/htdocs/langs/pt_PT/bills.lang
index d6048df6467..397079541da 100644
--- a/htdocs/langs/pt_PT/bills.lang
+++ b/htdocs/langs/pt_PT/bills.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - bills
 Bill=Fatura
 Bills=Facturas
-BillsCustomers=Facturas de Clientes
-BillsCustomer=Fatura do Cliente
-BillsSuppliers=Facturas de Fornecedores
-BillsCustomersUnpaid=Facturas de Clientes a Receber
-BillsCustomersUnpaidForCompany=Faturas de clientes não pagas para %s
-BillsSuppliersUnpaid=Faturas de fornecedores não pagas
-BillsSuppliersUnpaidForCompany=Faturas de fornecedores não pagas para %s
+BillsCustomers=Customer invoices
+BillsCustomer=Fatura de Cliente
+BillsSuppliers=Supplier invoices
+BillsCustomersUnpaid=Faturas a receber de clientes
+BillsCustomersUnpaidForCompany=Unpaid customer invoices for %s
+BillsSuppliersUnpaid=Faturas a pagar de fornecedores
+BillsSuppliersUnpaidForCompany=Unpaid supplier invoices for %s
 BillsLate=Pagamentos em atraso
 BillsStatistics=Estatísticas das faturas de clientes
 BillsStatisticsSuppliers=Estatísticas das faturas de fornecedores
@@ -63,7 +63,7 @@ paymentInInvoiceCurrency=in invoices currency
 PaidBack=Reembolsada
 DeletePayment=Eliminar pagamento
 ConfirmDeletePayment=Tem a certeza que deseja eliminar este pagamento?
-ConfirmConvertToReduc=Do you want to convert this credit note or deposit 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.
+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.
 SupplierPayments=Pagamentos a Fornecedores
 ReceivedPayments=Pagamentos recebidos
 ReceivedCustomersPayments=Pagamentos recebidos dos clientes
@@ -78,6 +78,7 @@ PaymentMode=Tipo de Pagamento
 PaymentTypeDC=Debit/Credit Card
 PaymentTypePP=PayPal
 IdPaymentMode=Payment type (id)
+CodePaymentMode=Payment type (code)
 LabelPaymentMode=Payment type (label)
 PaymentModeShort=Tipo de Pagamento
 PaymentTerm=Tipo de Pagamento
@@ -102,9 +103,10 @@ SearchACustomerInvoice=Procurar por uma fatura de cliente
 SearchASupplierInvoice=Procurar por uma factura de fornecedor
 CancelBill=Anular uma Factura
 SendRemindByMail=Enviar lembrete por E-mail
-DoPayment=Emitir pagamento
-DoPaymentBack=Emitir reembolso
+DoPayment=Enter payment
+DoPaymentBack=Enter refund
 ConvertToReduc=Converter em desconto futuro
+ConvertExcessReceivedToReduc=Convert excess received into future discount
 EnterPaymentReceivedFromCustomer=Adicionar pagamento recebido de cliente
 EnterPaymentDueToCustomer=Realizar pagamento de recibos à cliente
 DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
@@ -113,22 +115,24 @@ BillStatus=Estado da factura
 StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=rascunho (a Confirmar)
 BillStatusPaid=paga
-BillStatusPaidBackOrConverted=Reembolsada o convertida em redução
+BillStatusPaidBackOrConverted=Refund or converted into discount
 BillStatusConverted=Converter em Desconto
 BillStatusCanceled=Abandonada
 BillStatusValidated=Validada (a pagar)
 BillStatusStarted=Paga parcialmente
 BillStatusNotPaid=Pendente de pagamento
+BillStatusNotRefunded=Not refunded
 BillStatusClosedUnpaid=Fechada (Pendente de pagamento)
 BillStatusClosedPaidPartially=Paga (parcialmente)
 BillShortStatusDraft=Rascunho
 BillShortStatusPaid=Paga
-BillShortStatusPaidBackOrConverted=Processada
+BillShortStatusPaidBackOrConverted=Refund or converted
 BillShortStatusConverted=Transformados
 BillShortStatusCanceled=Abandonada
 BillShortStatusValidated=Validada
 BillShortStatusStarted=Iniciada
 BillShortStatusNotPaid=Pendente de cobrança
+BillShortStatusNotRefunded=Not refunded
 BillShortStatusClosedUnpaid=Fechada por pagar
 BillShortStatusClosedPaidPartially=Pagamento (parcial)
 PaymentStatusToValidShort=A Confirmar
@@ -149,14 +153,14 @@ NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified
 FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
 NotARecurringInvoiceTemplate=Not a recurring template invoice
 NewBill=Nova factura
-LastBills=as %s últimas facturas
-LastCustomersBills=as %s últimas facturas a clientes
-LastSuppliersBills=as %s últimas facturas de Fornecedores
+LastBills=Latest %s invoices
+LastCustomersBills=Latest %s customer invoices
+LastSuppliersBills=Latest %s supplier invoices
 AllBills=Todas as facturas
 OtherBills=Outras facturas
 DraftBills=Facturas rascunho
-CustomersDraftInvoices=Rascunho de Facturas de Clientes
-SuppliersDraftInvoices=Rascunho de Facturas de Fornecedores
+CustomersDraftInvoices=Customer draft invoices
+SuppliersDraftInvoices=Supplier draft invoices
 Unpaid=Pendentes
 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>?
@@ -203,7 +207,7 @@ AlreadyPaidNoCreditNotesNoDeposits=Já pagas (sem notas de crédito e depósitos
 Abandoned=Abandonada
 RemainderToPay=Restante a receber
 RemainderToTake=Remaining amount to take
-RemainderToPayBack=Remaining amount to pay back
+RemainderToPayBack=Remaining amount to refund
 Rest=Pendente
 AmountExpected=Montante reclamado
 ExcessReceived=Recebido em excesso
@@ -270,6 +274,7 @@ Deposit=Depósito
 Deposits=Depósitos
 DiscountFromCreditNote=Desconto resultante do deposito %s
 DiscountFromDeposit=Pagamentos a partir de depósito na factura %s
+DiscountFromExcessReceived=Payments from excess received of invoice %s
 AbsoluteDiscountUse=Este tipo de crédito pode ser usado na factura antes da sua validação
 CreditNoteDepositUse=Invoice must be validated to use this kind of credits
 NewGlobalDiscount=Novo Desconto fixo
@@ -277,8 +282,8 @@ NewRelativeDiscount=Nova parente desconto
 NoteReason=Nota/Motivo
 ReasonDiscount=Motivo
 DiscountOfferedBy=Acordado por
-DiscountStillRemaining=Descontos fixos Pendentes
-DiscountAlreadyCounted=Descontos fixos já aplicados
+DiscountStillRemaining=Discounts available
+DiscountAlreadyCounted=Discounts already consumed
 BillAddress=Morada de facturação
 HelpEscompte=Um <b>Desconto</b> é um desconto acordado sobre uma factura dada, a um cliente que realizou o seu pagamento muito antes do vencimento.
 HelpAbandonBadCustomer=Este Montante é deixado (cliente julgado como devedor) e se considera como uma perda excepcional.
@@ -331,10 +336,12 @@ 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
 # PaymentConditions
 Statut=Estado
-PaymentConditionShortRECEP=Pronto Pagamento
-PaymentConditionRECEP=Pronto Pagamento
+PaymentConditionShortRECEP=Due Upon Receipt
+PaymentConditionRECEP=Due Upon Receipt
 PaymentConditionShort30D=30 dias
 PaymentCondition30D=pagamento a 30 dias
 PaymentConditionShort30DENDMONTH=30 days of month-end
@@ -349,6 +356,14 @@ PaymentConditionShortPT_ORDER=Pedido
 PaymentConditionPT_ORDER=On order
 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
 FixAmount=Valor fixo
 VarAmount=Quantidade variável (%% total.)
 # PaymentType
@@ -418,7 +433,7 @@ ChequeDeposits=Depósito de cheques
 Cheques=Cheques
 DepositId=Id deposit
 NbCheque=Number of checks
-CreditNoteConvertedIntoDiscount=Este deposito converteu-se em %s
+CreditNoteConvertedIntoDiscount=This %s has been converted into %s
 UsBillingContactAsIncoiveRecipientIfExist=Utilizar a morada do contacto de cliente de facturação da factura em vez da morada do Terceiro como destinatário das facturas
 ShowUnpaidAll=Mostrar todas as facturas não pagas
 ShowUnpaidLateOnly=Mostrar tarde factura única por pagar.
diff --git a/htdocs/langs/pt_PT/boxes.lang b/htdocs/langs/pt_PT/boxes.lang
index 29784a8451a..060f311dd64 100644
--- a/htdocs/langs/pt_PT/boxes.lang
+++ b/htdocs/langs/pt_PT/boxes.lang
@@ -25,8 +25,8 @@ BoxTitleLastSuppliers=Latest %s recorded suppliers
 BoxTitleLastModifiedSuppliers=Latest %s modified suppliers
 BoxTitleLastModifiedCustomers=Latest %s modified customers
 BoxTitleLastCustomersOrProspects=Latest %s customers or prospects
-BoxTitleLastCustomerBills=Latest %s customer's invoices
-BoxTitleLastSupplierBills=Latest %s supplier's invoices
+BoxTitleLastCustomerBills=Latest %s customer invoices
+BoxTitleLastSupplierBills=Latest %s supplier invoices
 BoxTitleLastModifiedProspects=Latest %s modified prospects
 BoxTitleLastModifiedMembers=Latest %s members
 BoxTitleLastFicheInter=Latest %s modified interventions
@@ -51,12 +51,12 @@ ClickToAdd=Clique aqui para adicionar.
 NoRecordedCustomers=Nenhum cliente registado
 NoRecordedContacts=Não há contatos gravados
 NoActionsToDo=Sem acções a realizar
-NoRecordedOrders=Sem pedidos de clientes registados
+NoRecordedOrders=No recorded customer orders
 NoRecordedProposals=Sem Orçamentos registados
-NoRecordedInvoices=Sem facturas a clientes registados
-NoUnpaidCustomerBills=Sem facturas a clientes Pendentes de pagamento
-NoUnpaidSupplierBills=Sem facturas de Fornecedores Pendentes de Pagamento
-NoModifiedSupplierBills=Nenhuma factura de fornecedor registada
+NoRecordedInvoices=No recorded customer invoices
+NoUnpaidCustomerBills=No unpaid customer invoices
+NoUnpaidSupplierBills=No unpaid supplier invoices
+NoModifiedSupplierBills=No recorded supplier invoices
 NoRecordedProducts=Não gravados produtos / serviços
 NoRecordedProspects=Não gravadas perspectivas
 NoContractedProducts=Não contractados produtos / serviços
diff --git a/htdocs/langs/pt_PT/companies.lang b/htdocs/langs/pt_PT/companies.lang
index cf91bacd4bb..6dcae58c45f 100644
--- a/htdocs/langs/pt_PT/companies.lang
+++ b/htdocs/langs/pt_PT/companies.lang
@@ -78,6 +78,10 @@ VATIsNotUsed=Não Sujeito a IVA
 CopyAddressFromSoc=Fill address with third party address
 ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
 PaymentBankAccount=Payment bank account
+OverAllProposals=Total proposals
+OverAllOrders=Total orders
+OverAllInvoices=Total invoices
+OverAllSupplierProposals=Total price requests
 ##### Local Taxes #####
 LocalTax1IsUsed=Utilizar um segundo imposto
 LocalTax1IsUsedES= RE é usado
@@ -239,6 +243,10 @@ ProfId3RU=Prof Id 3 (KPP)
 ProfId4RU=Prof Id 4 (OKPO)
 ProfId5RU=-
 ProfId6RU=-
+ProfId1DZ=RC
+ProfId2DZ=Art.
+ProfId3DZ=NIF
+ProfId4DZ=NIS
 VATIntra=CNPJ
 VATIntraShort=CNPJ
 VATIntraSyntaxIsValid=Sintaxe Válida
@@ -384,6 +392,7 @@ LastModifiedThirdParties=Latest %s modified third parties
 UniqueThirdParties=Total de originais terceiros
 InActivity=Aberto
 ActivityCeased=Fechado
+ThirdPartyIsClosed=Third party is closed
 ProductsIntoElements=List of products/services into %s
 CurrentOutstandingBill=Current outstanding bill
 OutstandingBill=Max. for outstanding bill
@@ -396,7 +405,7 @@ MergeThirdparties=Merge third parties
 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 so you will be able to delete the duplicate one.
 ThirdpartiesMergeSuccess=Thirdparties have been merged
 SaleRepresentativeLogin=Login of sales representative
-SaleRepresentativeFirstname=Firstname of sales representative
-SaleRepresentativeLastname=Lastname of sales representative
+SaleRepresentativeFirstname=First name of sales representative
+SaleRepresentativeLastname=Last name of sales representative
 ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
 NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/pt_PT/compta.lang b/htdocs/langs/pt_PT/compta.lang
index 55adae37164..88326c6bcd0 100644
--- a/htdocs/langs/pt_PT/compta.lang
+++ b/htdocs/langs/pt_PT/compta.lang
@@ -65,6 +65,7 @@ PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=Pagamento IVA
 ListPayment=Lista de pagamentos
 ListOfCustomerPayments=Lista de pagamentos de clientes
+ListOfSupplierPayments=Lista de pagamentos a Fornecedores
 DateStartPeriod=Date start period
 DateEndPeriod=Date end period
 newLT1Payment=New tax 2 payment
@@ -81,7 +82,7 @@ LT2PaymentES=Pagamento IRPF
 LT2PaymentsES=Pagamentos IRPF
 VATPayment=Sales tax payment
 VATPayments=Sales tax payments
-VATRefund=Sales tax refund Refund
+VATRefund=Sales tax refund
 Refund=Refund
 SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Ver Pagamentos IVA
@@ -194,7 +195,7 @@ CloneTax=Clone a social/fiscal tax
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
 CloneTaxForNextMonth=Cloná-la para o mês seguinte
 SimpleReport=Relatório simples
-AddExtraReport=Relatórios extras
+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
diff --git a/htdocs/langs/pt_PT/cron.lang b/htdocs/langs/pt_PT/cron.lang
index b2764b1d58d..1869af8b0b5 100644
--- a/htdocs/langs/pt_PT/cron.lang
+++ b/htdocs/langs/pt_PT/cron.lang
@@ -17,8 +17,8 @@ CronMethodDoesNotExists=Class %s does not contains any method %s
 # Menu
 EnabledAndDisabled=Enabled and disabled
 # Page list
-CronLastOutput=Resultado da última execução
-CronLastResult=Last result code
+CronLastOutput=Latest run output
+CronLastResult=Latest result code
 CronCommand=Comando
 CronList=Tarefas agendadas
 CronDelete=Delete scheduled jobs
diff --git a/htdocs/langs/pt_PT/errors.lang b/htdocs/langs/pt_PT/errors.lang
index 257300adc23..6a885acb6fa 100644
--- a/htdocs/langs/pt_PT/errors.lang
+++ b/htdocs/langs/pt_PT/errors.lang
@@ -11,6 +11,7 @@ ErrorLoginAlreadyExists=O login %s já existe.
 ErrorGroupAlreadyExists=O grupo %s já existe.
 ErrorRecordNotFound=Registro não foi encontrado.
 ErrorFailToCopyFile=Falha ao copiar <b>&quot;%s&quot;</b> arquivo para <b>&quot;%s&quot;.</b>
+ErrorFailToCopyDir=Failed to copy directory '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToRenameFile=Falha ao renomear <b>&quot;%s&quot;</b> arquivo para <b>&quot;%s&quot;.</b>
 ErrorFailToDeleteFile=Erro à eliminar o Ficheiro '<b>%s</b>'.
 ErrorFailToCreateFile=Erro ao criar o ficheiro '<b<%s</b>'
@@ -115,7 +116,7 @@ ErrorNoActivatedBarcode=Nenhum tipo de código de barras ativado
 ErrUnzipFails=Falha ao extrair %s com o ZipArchive
 ErrNoZipEngine=Não existe nenhum mecanismo para extrair o ficheiro %s neste PHP
 ErrorFileMustBeADolibarrPackage=O ficheiro %s deve ser um pacote Dolibarr no formato zip
-ErrorFileRequired=It takes a package Dolibarr file
+ErrorModuleFileRequired=You must select a Dolibarr module package file
 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
@@ -170,14 +171,19 @@ ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
 ErrorFileMustHaveFormat=File must have format %s
 ErrorSupplierCountryIsNotDefined=O país deste fornecedor não está definido, corrija na sua ficha
 ErrorsThirdpartyMerge=Failed to merge the two records. Request canceled.
-ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enougth for product %s to add it into a new order.
-ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enougth for product %s to add it into a new invoice.
-ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enougth for product %s to add it into a new shipment.
-ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enougth for product %s to add it into a new proposal.
-ErrorFailedToLoadLoginFileForMode=Failed to get the login file for mode '%s'.
+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 bank 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>
 
 # 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.
diff --git a/htdocs/langs/pt_PT/holiday.lang b/htdocs/langs/pt_PT/holiday.lang
index 00b8105756b..a44d0d23823 100644
--- a/htdocs/langs/pt_PT/holiday.lang
+++ b/htdocs/langs/pt_PT/holiday.lang
@@ -76,8 +76,9 @@ BoxTitleLastLeaveRequests=Latest %s modified leave requests
 HolidaysMonthlyUpdate=Actualização Mensal
 ManualUpdate=Actualização Manual
 HolidaysCancelation=Leave request cancelation
-EmployeeLastname=Employee lastname
-EmployeeFirstname=Employee firstname
+EmployeeLastname=Employee last name
+EmployeeFirstname=Employee first name
+TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
 
 ## Configuration du Module ##
 LastUpdateCP=Latest automatic update of leaves allocation
diff --git a/htdocs/langs/pt_PT/ldap.lang b/htdocs/langs/pt_PT/ldap.lang
index 65c1e6574d5..22afadff2ee 100644
--- a/htdocs/langs/pt_PT/ldap.lang
+++ b/htdocs/langs/pt_PT/ldap.lang
@@ -13,8 +13,8 @@ LDAPUsers=Utilizadores na base de dados LDAP
 LDAPFieldStatus=Estatuto
 LDAPFieldFirstSubscriptionDate=Data primeira adesão
 LDAPFieldFirstSubscriptionAmount=Montante primeira adesão
-LDAPFieldLastSubscriptionDate=Data da última adesão
-LDAPFieldLastSubscriptionAmount=Montante última adesão
+LDAPFieldLastSubscriptionDate=Latest subscription date
+LDAPFieldLastSubscriptionAmount=Latest subscription amount
 LDAPFieldSkype=Skype id
 LDAPFieldSkypeExample=Example : skypeName
 UserSynchronized=Utilizador sincronizado
diff --git a/htdocs/langs/pt_PT/mails.lang b/htdocs/langs/pt_PT/mails.lang
index db9822bff60..36fa413d9f6 100644
--- a/htdocs/langs/pt_PT/mails.lang
+++ b/htdocs/langs/pt_PT/mails.lang
@@ -35,7 +35,7 @@ MailingStatusSentPartialy=Enviado Parcialmente
 MailingStatusSentCompletely=Enviado Completamente
 MailingStatusError=Erro
 MailingStatusNotSent=Não Enviado
-MailSuccessfulySent=E-mail enviado correctamente (de %s a %s)
+MailSuccessfulySent=Email successfully accepted for delivery (from %s to %s)
 MailingSuccessfullyValidated=Mailing validado com sucesso
 MailUnsubcribe=Cancelar Subscrição
 MailingStatusNotContact=Não efectuar mais contatos
@@ -74,22 +74,28 @@ ResultOfMailSending=Result of mass EMail sending
 NbSelected=Nb selecionado
 NbIgnored=Nb ignorado
 NbSent=Nb enviado
+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
 
 # 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=Os %s últimos mailings
+LastMailings=Latest %s emailings
 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
 SendMail=Enviar e-mail
-MailingNeedCommand=For security reason, sending an emailing is better when performed from command line. If you have one, ask your server administrator to launch the following command to send the emailing to all recipients:
+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 can't or prefer sending them with your www browser, please confirm you are sure you want to send emailing now from your browser?
+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.
 TargetsReset=Limpar lista
 ToClearAllRecipientsClickHere=Para limpar a lista dos destinatarios deste mailing, faça click ao botão
@@ -144,3 +150,6 @@ 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
+
diff --git a/htdocs/langs/pt_PT/main.lang b/htdocs/langs/pt_PT/main.lang
index ca7f0d44bc9..88854136c89 100644
--- a/htdocs/langs/pt_PT/main.lang
+++ b/htdocs/langs/pt_PT/main.lang
@@ -63,11 +63,13 @@ ErrorNoVATRateDefinedForSellerCountry=Erro, nenhum tipo de IVA definido para o p
 ErrorNoSocialContributionForSellerCountry=Error, no social/fiscal taxes type defined for country '%s'.
 ErrorFailedToSaveFile=Erro, o registo do ficheiro falhou.
 ErrorCannotAddThisParentWarehouse=You are trying to add a parent warehouse which is already a child of current one
+MaxNbOfRecordPerPage=Max nb of record per page
 NotAuthorized=You are not authorized to do that.
 SetDate=Definir data
 SelectDate=Seleccionar uma data
 SeeAlso=Ver também %s
 SeeHere=Veja aqui
+Apply=Aplicar
 BackgroundColorByDefault=Cor de fundo por omissão
 FileRenamed=The file was successfully renamed
 FileUploaded=O ficheiro foi enviado com sucesso
@@ -86,7 +88,7 @@ Undefined=Não Definido
 PasswordForgotten=Password forgotten?
 SeeAbove=Ver acima
 HomeArea=Área Principal
-LastConnexion=Ultima Ligação
+LastConnexion=Latest connection
 PreviousConnexion=Ligação Anterior
 PreviousValue=Previous value
 ConnectedOnMultiCompany=Conectado sobre entidade
@@ -236,7 +238,7 @@ DateCreation=Data de Criação
 DateCreationShort=Creat. date
 DateModification=Data de Modificação
 DateModificationShort=Data de Modif.
-DateLastModification=Data da última modificação
+DateLastModification=Latest modification date
 DateValidation=Data de Validação
 DateClosing=Data de Encerramento
 DateDue=Data de Vencimento
@@ -432,7 +434,7 @@ Reportings=Relatórios
 Draft=Rascunho
 Drafts=Rascunhos
 Validated=Validado
-Opened=Abrir
+Opened=Aberto
 New=Novo
 Discount=Desconto
 Unknown=Desconhecido
@@ -460,6 +462,7 @@ DeletePicture=Apagar Imagem
 ConfirmDeletePicture=Confirmar eliminação da imagem?
 Login=Iniciar Sessão
 CurrentLogin=Login actual
+EnterLoginDetail=Enter login details
 January=Janeiro
 February=Fevereiro
 March=Março
@@ -597,6 +600,8 @@ SessionName=Nome Sessão
 Method=Método
 Receive=Recepção
 CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
+ExpectedValue=Expected Value
+CurrentValue=Valor actual
 PartialWoman=Parcial
 TotalWoman=Total
 NeverReceived=Nunca Recebido
@@ -753,6 +758,8 @@ RemoveString=Remove string '%s'
 SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
 DirectDownloadLink=Direct download link
 Download=Download
+ActualizeCurrency=Update currency rate
+Fiscalyear=Ano Fiscal
 # Week day
 Monday=Segunda-feira
 Tuesday=Terça-feira
@@ -787,8 +794,8 @@ SetRef=Set ref
 Select2ResultFoundUseArrows=Some results found. Use arrows to select.
 Select2NotFound=No result found
 Select2Enter=Enter
-Select2MoreCharacter=or more character
-Select2MoreCharacters=or more characters
+Select2MoreCharacter=or more characters<br /><br /><strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
+Select2MoreCharacters=or more characters<br /><br /><strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
 Select2LoadingMoreResults=Loading more results...
 Select2SearchInProgress=Search in progress...
 SearchIntoThirdparties=Thirdparties
@@ -809,3 +816,5 @@ SearchIntoContracts=contractos
 SearchIntoCustomerShipments=Customer shipments
 SearchIntoExpenseReports=Relatórios de despesas
 SearchIntoLeaves=Licenças
+
+BulkActions=Bulk actions
diff --git a/htdocs/langs/pt_PT/members.lang b/htdocs/langs/pt_PT/members.lang
index d7aa3d44dd3..8a739554dc2 100644
--- a/htdocs/langs/pt_PT/members.lang
+++ b/htdocs/langs/pt_PT/members.lang
@@ -45,7 +45,7 @@ MemberStatusDraft=Rascunho (a Confirmar)
 MemberStatusDraftShort=A Confirmar
 MemberStatusActive=Validado (em espera de filiação )
 MemberStatusActiveShort=Validado
-MemberStatusActiveLate=Filiação não actualizada
+MemberStatusActiveLate=Subscription expired
 MemberStatusActiveLateShort=Não actualizada
 MemberStatusPaid=Subscrição em dia
 MemberStatusPaidShort=Em dia
@@ -136,8 +136,8 @@ DocForAllMembersCards=Gerar cartões de visita para todos os membros (Formato de
 DocForOneMemberCards=Gerar cartões de visita para um determinado membro (Formato de saída realmente configuração: <b>%s)</b>
 DocForLabels=Gerar folhas de endereço (Formato de saída realmente configuração: <b>%s)</b>
 SubscriptionPayment=Pagamento Assinatura
-LastSubscriptionDate=Última data de subscrição
-LastSubscriptionAmount=Montante de subscrição Última
+LastSubscriptionDate=Latest subscription date
+LastSubscriptionAmount=Latest subscription amount
 MembersStatisticsByCountries=Membros estatísticas por país
 MembersStatisticsByState=Membros estatísticas por estado / província
 MembersStatisticsByTown=Membros estatísticas por cidade
@@ -149,7 +149,7 @@ MembersByStateDesc=Esta tela mostrar-lhe as estatísticas sobre os membros por e
 MembersByTownDesc=Esta tela mostrará estatísticas sobre membros por cidade.
 MembersStatisticsDesc=Escolha as estatísticas que você deseja ler ...
 MenuMembersStats=Estatística
-LastMemberDate=Data de último membro
+LastMemberDate=Latest member date
 Nature=Natureza
 Public=As informações são públicas
 NewMemberbyWeb=Novo membro acrescentou. Aguardando aprovação
diff --git a/htdocs/langs/pt_PT/orders.lang b/htdocs/langs/pt_PT/orders.lang
index d1c19613337..81e1b8bd889 100644
--- a/htdocs/langs/pt_PT/orders.lang
+++ b/htdocs/langs/pt_PT/orders.lang
@@ -39,7 +39,7 @@ StatusOrderRefusedShort=Reprovado
 StatusOrderBilledShort=Faturado
 StatusOrderToProcessShort=A Processar
 StatusOrderReceivedPartiallyShort=Recebido Parcialmente
-StatusOrderReceivedAllShort=Recebido
+StatusOrderReceivedAllShort=Products received
 StatusOrderCanceled=Anulado
 StatusOrderDraft=Rascunho (a Confirmar)
 StatusOrderValidated=Validado
@@ -51,7 +51,7 @@ StatusOrderApproved=Aprovado
 StatusOrderRefused=Reprovado
 StatusOrderBilled=Faturado
 StatusOrderReceivedPartially=Recebido Parcialmente
-StatusOrderReceivedAll=Recebido
+StatusOrderReceivedAll=All products received
 ShippingExist=Um existe um envio
 QtyOrdered=Quant. Pedida
 ProductQtyInDraft=Product quantity into draft orders
diff --git a/htdocs/langs/pt_PT/other.lang b/htdocs/langs/pt_PT/other.lang
index fa9b652e2c5..dd9a9eee46e 100644
--- a/htdocs/langs/pt_PT/other.lang
+++ b/htdocs/langs/pt_PT/other.lang
@@ -2,6 +2,7 @@
 SecurityCode=Código segurança
 NumberingShort=N°
 Tools=Utilidades
+TMenuTools=Ferramentas
 ToolsDesc=All miscellaneous tools not included in other menu entries are collected here.<br /><br />All the tools can be reached in the left menu.
 Birthday=Aniversario
 BirthdayDate=Birthday date
@@ -67,14 +68,15 @@ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find her
 PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nYou will find here the shipping __SHIPPINGREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nYou will find here the intervention __FICHINTERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n__PERSONALIZED__\n\n__SIGNATURE__
-DemoDesc=Dolibarr is a compact ERP/CRM supporting several functional modules. A demo showcasing all modules makes no sense as this scenario never occurs. So, several demo profiles are available.
+DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
+ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
 DemoFundation=Gestão de Membros de uma associação
 DemoFundation2=Gestão de Membros e tesouraria de uma associação
-DemoCompanyServiceOnly=Gestão de um trabalhador por conta propria realizando serviços
+DemoCompanyServiceOnly=Company or freelance selling service only
 DemoCompanyShopWithCashDesk=Gestão de uma loja com Caixa
-DemoCompanyProductAndStocks=Gestão de uma PME com venda de produtos
-DemoCompanyAll=Gestão de uma PME com Actividades multiplos (todos Os módulos principais)
+DemoCompanyProductAndStocks=Company selling products with a shop
+DemoCompanyAll=Company with multiple activities (all main modules)
 CreatedBy=Criado por %s
 ModifiedBy=Modificado por %s
 ValidatedBy=Validado por %s
diff --git a/htdocs/langs/pt_PT/products.lang b/htdocs/langs/pt_PT/products.lang
index 7f651f9108f..1e88a18047c 100644
--- a/htdocs/langs/pt_PT/products.lang
+++ b/htdocs/langs/pt_PT/products.lang
@@ -5,6 +5,8 @@ ProductLabelTranslated=Translated product label
 ProductDescriptionTranslated=Translated product description
 ProductNoteTranslated=Translated product note
 ProductServiceCard=Ficha Produto/Serviço
+TMenuProducts=Produtos
+TMenuServices=Serviços
 Products=Produtos
 Services=Serviços
 Product=Produto
@@ -58,7 +60,7 @@ SellingPrice=Preço de venda
 SellingPriceHT=Preço de venda (líquido de impostos)
 SellingPriceTTC=Preço de venda (inc. IVA)
 CostPriceDescription=This price (net of tax) can be used to store the average amount this product cost to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
-CostPriceUsage=In a future version, this value could be used for margin calculation.
+CostPriceUsage=This value could be used for margin calculation.
 SoldAmount=Sold amount
 PurchasedAmount=Purchased amount
 NewPrice=Novo preço
@@ -140,6 +142,7 @@ ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b>?
 CloneContentProduct=Copie todas as principais informações do produto / serviço
 ClonePricesProduct=Copie principais informações e preços
 CloneCompositionProduct=Clone packaged product/service
+CloneCombinationsProduct=Clone product variants
 ProductIsUsed=Este produto é utilizado
 NewRefForClone=Ref. do novo produto / serviço
 SellingPrices=Selling prices
@@ -236,7 +239,7 @@ GlobalVariables=Variáveis globais
 VariableToUpdate=Variable to update
 GlobalVariableUpdaters=Global variable updaters
 UpdateInterval=Intervalo de atualização (minutos)
-LastUpdated=Última atualização
+LastUpdated=Latest update
 CorrectlyUpdated=Corretamente atualizado
 PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
 PropalMergePdfProductChooseFile=Selecionar ficheiros PDF
@@ -256,4 +259,41 @@ VolumeUnits=Volume unit
 SizeUnits=Size unit
 DeleteProductBuyPrice=Delete buying price
 ConfirmDeleteProductBuyPrice=Are you sure you want to delete this buying price?
+SubProduct=Sub product
 
+#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
+ProductCombinations=Variants
+HideProductCombinations=Hide products variant in the products selector
+ProductCombination=Variant
+NewProductCombination=New variant
+EditProductCombination=Editing variant
+ProductCombinationGenerator=Variants generator
+Features=Features
+PriceImpact=Price impact
+WeightImpact=Weight impact
+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
+PercentageVariation=Percentage variation
+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 child products
+ConfirmCloneProductCombinations=Would you like to copy all the product variant to the 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
diff --git a/htdocs/langs/pt_PT/projects.lang b/htdocs/langs/pt_PT/projects.lang
index b2f47226817..0e79a52bfed 100644
--- a/htdocs/langs/pt_PT/projects.lang
+++ b/htdocs/langs/pt_PT/projects.lang
@@ -29,9 +29,9 @@ DeleteAProject=Apagar um Projeto
 DeleteATask=Apagar uma Tarefa
 ConfirmDeleteAProject=Are you sure you want to delete this project?
 ConfirmDeleteATask=Are you sure you want to delete this task?
-OpenedProjects=Open projects
-OpenedTasks=Open tasks
-OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
+OpenedProjects=Projetos abertos
+OpenedTasks=Tarefas abertas
+OpportunitiesStatusForOpenedProjects=Opportunities amount of opened projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=Mostrar Projeto
 SetProject=Definir Projeto
@@ -47,7 +47,7 @@ TaskTimeSpent=Tempo despendido nas tarefas
 TaskTimeUser=Utilizador
 TaskTimeNote=Nota
 TaskTimeDate=Data
-TasksOnOpenedProject=Tasks on open projects
+TasksOnOpenedProject=Tarefas nos projetos abertos
 WorkloadNotDefined=Carga de trabalho não definida
 NewTimeSpent=Novo Tempo Dispendido
 MyTimeSpent=Meu Tempo Dispendido
@@ -58,6 +58,7 @@ TaskDateEnd=Data do fim da tarefa
 TaskDescription=Descrição da tarefa
 NewTask=Nova Tarefa
 AddTask=Criar Tarefa
+AddTimeSpent=Create time spent
 Activity=Atividade
 Activities=Tarefas/Atividades
 MyActivities=As Minhas Tarefas/Atividades
@@ -95,6 +96,7 @@ ValidateProject=Validar Projeto
 ConfirmValidateProject=Are you sure you want to validate this project?
 CloseAProject=Fechar projeto
 ConfirmCloseAProject=Are you sure you want to close this project?
+AlsoCloseAProject=Also close project (keep it open if you still need to follow production tasks on it)
 ReOpenAProject=Abrir Projeto
 ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=contatos do Projeto
@@ -120,7 +122,7 @@ CloneProjectFiles=Clone project joined files
 CloneTaskFiles=Clone task(s) joined files (if task(s) cloned)
 CloneMoveDate=Update project/tasks dates from now?
 ConfirmCloneProject=Are you sure to clone this project?
-ProjectReportDate=Alterar a data da tarefa de acordo com a data de início do projeto
+ProjectReportDate=Change task dates according to new project start date
 ErrorShiftTaskDate=Impossible to shift task date according to new project start date
 ProjectsAndTasksLines=Projetos e tarefas
 ProjectCreatedInDolibarr=Projeto %s criado
@@ -177,9 +179,9 @@ ProjectsStatistics=Statistics on projects/leads
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 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.
-OpenedProjectsByThirdparties=Open projects by thirdparties
+OpenedProjectsByThirdparties=Opened projects by thirdparties
 OnlyOpportunitiesShort=Apenas oportunidades
-OpenedOpportunitiesShort=Open opportunities
+OpenedOpportunitiesShort=Oportunidades abertas
 NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount
diff --git a/htdocs/langs/pt_PT/propal.lang b/htdocs/langs/pt_PT/propal.lang
index c4db461e523..d19cf3638b9 100644
--- a/htdocs/langs/pt_PT/propal.lang
+++ b/htdocs/langs/pt_PT/propal.lang
@@ -3,7 +3,7 @@ Proposals=Orçamentos
 Proposal=Orçamento
 ProposalShort=Proposta
 ProposalsDraft=Orçamentos Rascunho
-ProposalsOpened=Open commercial proposals
+ProposalsOpened=Orçamentos Abertos
 Prop=Orçamentos
 CommercialProposal=Orçamento
 ProposalCard=Cartão de Proposta
@@ -26,9 +26,9 @@ AmountOfProposalsByMonthHT=Montante por Mês (sem IVA)
 NbOfProposals=Número Orçamentos
 ShowPropal=Ver Orçamento
 PropalsDraft=Rascunho
-PropalsOpened=Abrir
+PropalsOpened=Aberto
 PropalStatusDraft=Rascunho (a Confirmar)
-PropalStatusValidated=Validado (Orçamento Aberto)
+PropalStatusValidated=Validated (proposal is opened)
 PropalStatusSigned=Assinado (a facturar)
 PropalStatusNotSigned=Sem Assinar (Fechado)
 PropalStatusBilled=Facturado
diff --git a/htdocs/langs/pt_PT/stocks.lang b/htdocs/langs/pt_PT/stocks.lang
index 151dec4d64a..5630b4d42c8 100644
--- a/htdocs/langs/pt_PT/stocks.lang
+++ b/htdocs/langs/pt_PT/stocks.lang
@@ -22,13 +22,15 @@ Movements=Movimentos
 ErrorWarehouseRefRequired=O nome de referencia do armazem é obrigatório
 ListOfWarehouses=Lista de Armazens
 ListOfStockMovements=Lista de movimentos de stock
+StockMovementForId=Movement ID %d
+ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Warehouses area
 Location=Localização
 LocationSummary=Nome abreviado da localização
 NumberOfDifferentProducts=Number of different products
 NumberOfProducts=Numero total de produtos
-LastMovement=Último movimento
-LastMovements=Últimos movimentos
+LastMovement=Latest movement
+LastMovements=Latest movements
 Units=Unidades
 Unit=Unidade
 StockCorrection=Correcção stock
@@ -140,3 +142,4 @@ ProductStockWarehouseCreated=Stock limit for alert and desired optimal stock cor
 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
diff --git a/htdocs/langs/pt_PT/supplier_proposal.lang b/htdocs/langs/pt_PT/supplier_proposal.lang
index 98b050ab7d1..82fe49a342b 100644
--- a/htdocs/langs/pt_PT/supplier_proposal.lang
+++ b/htdocs/langs/pt_PT/supplier_proposal.lang
@@ -8,7 +8,7 @@ SearchRequest=Encontrar um pedido
 DraftRequests=Pedidos rascunho
 SupplierProposalsDraft=Draft supplier proposals
 LastModifiedRequests=Latest %s modified price requests
-RequestsOpened=Abrir pedidos de preço
+RequestsOpened=Opened price requests
 SupplierProposalArea=Supplier proposals area
 SupplierProposalShort=Supplier proposal
 SupplierProposals=Supplier proposals
@@ -23,7 +23,7 @@ ConfirmValidateAsk=Are you sure you want to validate this price request under na
 DeleteAsk=Eliminar pedido
 ValidateAsk=Validar pedido
 SupplierProposalStatusDraft=Rascunho (a Confirmar)
-SupplierProposalStatusValidated=Validated (request is open)
+SupplierProposalStatusValidated=Validated (request is opened)
 SupplierProposalStatusClosed=Fechado
 SupplierProposalStatusSigned=Aceite
 SupplierProposalStatusNotSigned=Recusado
diff --git a/htdocs/langs/pt_PT/suppliers.lang b/htdocs/langs/pt_PT/suppliers.lang
index 22783e29d0e..41b427fc33b 100644
--- a/htdocs/langs/pt_PT/suppliers.lang
+++ b/htdocs/langs/pt_PT/suppliers.lang
@@ -9,7 +9,7 @@ ShowSupplier=Mostrar Fornecedor
 OrderDate=Data Pedido
 BuyingPriceMin=Best buying price
 BuyingPriceMinShort=Best buying price
-TotalBuyingPriceMinShort=Total of subproducts buying prices
+TotalBuyingPriceMinShort=Total dos preços de compra dos subprodutos
 TotalSellingPriceMinShort=Total of subproducts selling prices
 SomeSubProductHaveNoPrices=Alguns sub-produtos não têm preço definido
 AddSupplierPrice=Add buying price
@@ -24,10 +24,10 @@ ExportDataset_fournisseur_1=Facturas de Fornecedores e Linhas de Factura
 ExportDataset_fournisseur_2=Facturas Fornecedores e Pagamentos
 ExportDataset_fournisseur_3=Pedidos a fornecedores e linhas de pedido
 ApproveThisOrder=Aprovar este Pedido
-ConfirmApproveThisOrder=Está seguro de querer aprovar este pedido?
+ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b>?
 DenyingThisOrder=Negar esta encomenda
-ConfirmDenyingThisOrder=Está seguro de querer negar este pedido?
-ConfirmCancelThisOrder=Está seguro de querer cancelar este pedido?
+ConfirmDenyingThisOrder=Are you sure you want to deny this order <b>%s</b>?
+ConfirmCancelThisOrder=Are you sure you want to cancel this order <b>%s</b>?
 AddSupplierOrder=Criar Pedido a Fornecedor
 AddSupplierInvoice=Criar Factura do Fornecedor
 ListOfSupplierProductForSupplier=Lista de produtos e preços do fornecedor <b>%s</b>
@@ -41,3 +41,4 @@ DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Wrong quality
 ReputationForThisProduct=Reputation
 BuyerName=Buyer name
+AllProductServicePrices=All product / service prices
diff --git a/htdocs/langs/pt_PT/users.lang b/htdocs/langs/pt_PT/users.lang
index fd8864c6a66..adae4ff27ca 100644
--- a/htdocs/langs/pt_PT/users.lang
+++ b/htdocs/langs/pt_PT/users.lang
@@ -36,7 +36,7 @@ AdministratorDesc=Administrador
 DefaultRights=Permissões Predefinidas
 DefaultRightsDesc=Defina aqui as permissões <u>predefinidas</u> que são atribuídas automaticamente a um <u>novo utilizador</u> criado (Vá a 'ficha de utilizador' para alterar a permissão de um utilizador existente).
 DolibarrUsers=Utilizadores do Dolibarr
-LastName=Last Name
+LastName=Apelidos
 FirstName=Nome
 ListOfGroups=Lista de Grupos
 NewGroup=Novo Grupo
diff --git a/htdocs/langs/pt_PT/withdrawals.lang b/htdocs/langs/pt_PT/withdrawals.lang
index f85528ba3f1..68e79c29e0d 100644
--- a/htdocs/langs/pt_PT/withdrawals.lang
+++ b/htdocs/langs/pt_PT/withdrawals.lang
@@ -24,6 +24,7 @@ WithdrawStatistics=Direct debit payment statistics
 WithdrawRejectStatistics=Direct debit payment reject statistics
 LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
+WithdrawRequestsDone=%s direct debit payment requests recorded
 ThirdPartyBankCode=Código Banco do Terceiro
 NoInvoiceCouldBeWithdrawed=Não há factura de débito directo com sucesso. Verifique se a factura da empresa tem um válido IBAN.
 ClassCredited=Classificar creditados
@@ -76,8 +77,8 @@ RUM=UMR
 RUMLong=Unique Mandate Reference
 RUMWillBeGenerated=UMR number will be generated once bank account information are saved
 WithdrawMode=Direct debit mode (FRST or RECUR)
-WithdrawRequestAmount=Withdraw request amount:
-WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil amount.
+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
diff --git a/htdocs/langs/ro_RO/accountancy.lang b/htdocs/langs/ro_RO/accountancy.lang
index e9fee4d8b17..1e898fa8f06 100644
--- a/htdocs/langs/ro_RO/accountancy.lang
+++ b/htdocs/langs/ro_RO/accountancy.lang
@@ -194,6 +194,8 @@ ChangeBinding=Change the binding
 
 ## Admin
 ApplyMassCategories=Aplica categorii bulk
+AddAccountFromBookKeepingWithNoCategories=Add acccount already used with no categories
+CategoryDeleted=Category for the accounting account has been removed
 
 ## Export
 Exports=Exporturi
@@ -209,6 +211,7 @@ Modelcsv_ciel=Export către  Sage Ciel Compta sau Compta Evolution
 Modelcsv_quadratus=Export către Quadratus QuadraCompta
 Modelcsv_ebp=Export către EBP
 Modelcsv_cogilog=Export towards Cogilog
+ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
 InitAccountancy=Init contabilitate
diff --git a/htdocs/langs/ro_RO/admin.lang b/htdocs/langs/ro_RO/admin.lang
index 3ee1c838752..aba2ea0e7ec 100644
--- a/htdocs/langs/ro_RO/admin.lang
+++ b/htdocs/langs/ro_RO/admin.lang
@@ -9,14 +9,20 @@ VersionDevelopment=Dezvoltare
 VersionUnknown=Necunoscut
 VersionRecommanded=Recomandat
 FileCheck=Files integrity checker
-FileCheckDesc=This tool allows you to check the integrity of files of your application, comparing each files with the official ones. You can use this tool to detect if some files were modified by a hacker for example.
+FileCheckDesc=This tool allows you to check the integrity of files and setup of your application, comparing each files with the official ones. 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.
+FileIntegrityIsStrictlyConformedWithReference=Files integrity is strictly conformed with the reference.
+FileIntegrityIsOkButFilesWereAdded=Files integrity check has passed, however some new files were added.
+FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified, removed or added.
+GlobalChecksum=Global checksum
 MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
 LocalSignature=Embedded local signature (less reliable)
 RemoteSignature=Remote distant signature (more reliable)
 FilesMissing= Fișiere Lipsa
 FilesUpdated= Fișiere Actualizate
+FilesModified=Modified Files
+FilesAdded=Added Files
 FileCheckDolibarr=Check integrity of application files
-AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from a certified package
+AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from an official package
 XmlNotFound=Xml Integrity File of application not found
 SessionId=ID Sesiune
 SessionSaveHandler=Handler pentru a salva sesiunile
@@ -185,7 +191,9 @@ BoxesDesc=Widgets are components showing some information that you can add to pe
 OnlyActiveElementsAreShown=Numai elementele din <a href="%s"> module activate </a> sunt afişate.
 ModulesDesc=Modulele Dolibarr definesc care funcționalitatea este activată în software. Unele module necesită permisiuni pe care trebuie să le acordați utilizatorilor, după activarea modulului. Faceți clic pe butonul de pornire/oprire pentru a activa un modul/caracteristică.
 ModulesMarketPlaceDesc=Puteți descărca mai multe module de pe site-uri externe de pe Internet ...
-ModulesMarketPlaces=Module mai multe ...
+ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
+ModulesMarketPlaces=Find external modules...
+GoModuleSetupArea=To deploy/install a new module, go onto the Module setup area at <a href="%s">%s</a>.
 DoliStoreDesc=DoliStore, market place oficial  pentru  module externe Dolibarr ERP / CRM
 DoliPartnersDesc=List of companies providing custom developed modules or features (Note: anyone experienced in PHP programming can provide custom development for an open source project)
 WebSiteDesc=Site-uri web de referință pentru a găsi mai multe module ...
@@ -276,21 +284,22 @@ ModuleFamilyInterface=Interfaces with external systems
 MenuHandlers=Manager Meniu
 MenuAdmin=Editor Meniu
 DoNotUseInProduction=Nu utilizaţi în producţie
-ThisIsProcessToFollow=Acesta este procesul de configurare pentru a:
-ThisIsAlternativeProcessToFollow=This is an alternative setup to process:
+ThisIsProcessToFollow=This is steps to process:
+ThisIsAlternativeProcessToFollow=This is an alternative setup to process manually:
 StepNb=Pasul %s
 FindPackageFromWebSite=Găsiţi un pachet care ofera facilitate dorit (de exemplu, pe site-ul web %s).
 DownloadPackageFromWebSite=Download package (for example from official web site %s).
-UnpackPackageInDolibarrRoot=Unpack package file into Dolibarr server directory dedicated to external modules: <b>%s</b>
-SetupIsReadyForUse=Instalarea este terminat şi Dolibarr este gata pentru a fi utilizate cu această nouă componentă.
-NotExistsDirect=Nu este  definit directorroot  alternativ.<br>
-InfDirAlt=Începând cu versiunea 3, este posibil să se definească un director radacina alternativ.Director rădăcină vă permite să stocați, în același loc, plug-in-uri și template-uri personalizate. <br> Doar creaţi un director de la rădăcină Dolibarr (de exemplu: custom). <br>
-InfDirExample=<br> Apoi, declaraţi l  fișierul în conf.php <br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br * Aceste linii sunt comentate cu "#", pentru a decomenta doar elimina caracterul.
+UnpackPackageInDolibarrRoot=Unpack the packaged files into server directory dedicated to Dolibarr: <b>%s</b>
+UnpackPackageInModulesRoot=To deploy/install an external module, unpack the packaged files into the server directory dedicated to modules: <b>%s</b>
+SetupIsReadyForUse=Module deployment is finished. You must however enable and setup the module in your application by going on the page to setup modules: <a href="%s">%s</a>.
+NotExistsDirect=The alternative root directory is not defined to an existing directory.<br>
+InfDirAlt=Since version 3, it is possible to define an alternative root directory. This allows you to store, into a dedicated directory, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
+InfDirExample=<br>Then declare it in the file <strong>conf.php</strong><br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>If these lines are commented with "#", to enable them, just uncomment by removing the "#" character.
 YouCanSubmitFile=La acest pas, puteți trimite pachetul utilizand acest instrument: Selectați modulul fișier 
 CurrentVersion=Dolibarr versiunea curentă
 CallUpdatePage=Go to the page that updates the database structure and data: %s.
 LastStableVersion=Ultima versiune stabilă
-LastActivationDate=Last activation date
+LastActivationDate=Latest activation date
 UpdateServerOffline=Update server offline
 GenericMaskCodes=Puteți introduce orice mască de numerotare. În această mască, ar putea fi folosit următoarele etichete: <br> <b>{000000}</b> corespunde unui număr care va fi incrementat pe fiecare% s. Introduceți cât mai multe zerouri ca lungimea dorită a contra. Contorul va fi completat cu zerouri la stânga, în scopul de a avea cât mai multe zerouri ca masca. <br> <b>{000000} +000</b> fel ca și anterior, dar o compensare corespunzător cu numărul din dreapta semnului + se aplică începând cu prima% s. <br> <b>{000000 @ x}</b> fel ca și anterior, dar contorul este resetat la zero atunci când se ajunge la o lună x (x între 1 și 12, sau 0 pentru a folosi primele luni ale anului fiscal definite în configurația dvs., sau 99 pentru a reseta la zero în fiecare lună ). Dacă această opțiune este folosită și x este 2 sau mai mare, atunci secvența {aa} {mm} sau {AAAA} {mm} este de asemenea necesară. <br> <b>{Dd}</b> zi (01 la 31). <br> <b>{Mm}</b> luni (01 la 12). <br> <b>{AA}, {AAAA}</b> sau <b>{y}</b> an peste 2, 4 sau 1 numere. <br>
 GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
@@ -373,11 +382,11 @@ ExtrafieldCheckBox=Checkbox
 ExtrafieldRadio=Radio buton
 ExtrafieldCheckBoxFromList= Checkbox din tabel
 ExtrafieldLink=Link către un obiect
-ExtrafieldParamHelpselect=Lista de parametri trebuie să fie ca cheie, valoare <br><br> pentru exemplul: <br> 1, valoare1 <br> 2, valoare2 <br> 3, value3 <br> ... <br><br> Pentru a avea listă în funcție de o alta:<br>1,value1|parent_list_code:parent_key<br>2,value2|parent_list_code:parent_key
+ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list :<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list :<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=Lista de parametri trebuie să fie de tip cheie, valoare <br><br> pentru exemplul: <br> 1, valoare1 <br> 2, valoare2 <br> 3, value3 <br> ...
 ExtrafieldParamHelpradio=Lista de parametri trebuie să fie de tip  cheie, valoare <br><br> pentru exemplul: <br> 1, valoare1 <br> 2, valoare2 <br> 3, value3 <br> ...
-ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
-ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
+ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Example : Societe:societe/class/societe.class.php
 LibraryToBuildPDF=Library used for PDF generation
 WarningUsingFPDF=Atenție: <b>conf.php</b> contine Directiva <b>dolibarr_pdf_force_fpdf = 1.</b> Acest lucru înseamnă că utilizați biblioteca FPDF pentru a genera fișiere PDF. Această bibliotecă este vechi și nu suportă o mulțime de caracteristici (Unicode, transparența imagine, cu litere chirilice, limbi arabe și asiatice, ...), astfel încât este posibil să apară erori în timpul generație PDF. <br> Pentru a rezolva acest lucru și au un suport complet de generare PDF, vă rugăm să descărcați <a href="http://www.tcpdf.org/" target="_blank">biblioteca TCPDF</a> , atunci comentariu sau elimina linia <b>$ dolibarr_pdf_force_fpdf = 1,</b> și se adaugă în schimb <b>$ dolibarr_lib_TCPDF_PATH = &#39;path_to_TCPDF_dir&#39;</b>
@@ -411,10 +420,11 @@ ModuleCompanyCodePanicum=Întoarceţi-vă un gol de contabilitate cod.
 ModuleCompanyCodeDigitaria=Contabilitate cod depinde de o terţă parte de cod. Acest cod este format din caractere "C" în prima poziţie, urmat de primele 5 caractere de-a treia parte de cod.
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
-
+WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<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).
+ClickToShowDescription=Click to show description
 # Modules
 Module0Name=Utilizatori & grupuri
-Module0Desc=Utilizatori şi grupuri de management
+Module0Desc=Users / Employees and Groups management
 Module1Name=Terţi
 Module1Desc=Managementul terţilor (societăţi, particulari) şi contactelor
 Module2Name=Comercial
@@ -515,8 +525,8 @@ Module2200Name=Preţuri dinamice
 Module2200Desc=Activați utilizarea expresii matematice pentru prețuri
 Module2300Name=Cron
 Module2300Desc=Scheduled job management
-Module2400Name=Agenda/Evenimente
-Module2400Desc=Follow events or rendez-vous. Record manual events into Agendas or let application logs automatic events for tracking purposes.
+Module2400Name=Events/Agenda
+Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous.
 Module2500Name=Electronic Content Management
 Module2500Desc=Salvaţi şi partaja documente
 Module2600Name=API/Web services (SOAP server)
@@ -582,7 +592,7 @@ Permission34=Ştergere produse / servicii
 Permission36=Exportul de produse / servicii
 Permission38=Exportul de produse
 Permission41=Citește proiecte și sarcini (proiecte comune și proiecte la care sunt persoana de contact). Se poate introduce, de asemenea, timpul consumat cu privire la sarcinile atribuite (pontajul)
-Permission42=Creare / Modificare de proiecte, pentru a edita sarcinile mele de proiecte
+Permission42=Create/modify projects (shared project and projects i'm contact for). Can also create tasks and assign users to project and tasks
 Permission44=Ştergere proiecte
 Permission45=Export proiecte
 Permission61=Citeşte intervenţii
@@ -685,7 +695,7 @@ PermissionAdvanced253=Crearea / modificarea utilizatorii interni / externi şi p
 Permission254=Ştergere sau dezactiva alţi utilizatori
 Permission255=Creaţi / modifica propriile informaţii de utilizator
 Permission256=Modificare propria parolă
-Permission262=Extinderea accesului la toate terţe părţi (nu numai cele legate de utilizator). Nu este eficient pentru utilizatorii externi (întotdeauna limitat la propriu).
+Permission262=Extend access to all third parties (not only third parties that user is a sale representative).<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 assignement matters).
 Permission271=Citeşte CA
 Permission272=Citeşte facturi
 Permission273=Problema facturilor
@@ -887,7 +897,7 @@ Offset=Decalaj
 AlwaysActive=Întotdeauna activ
 Upgrade=Upgrade
 MenuUpgrade=Upgrade / Extinde
-AddExtensionThemeModuleOrOther=Adăugare extensie (tema, module, ...)
+AddExtensionThemeModuleOrOther=Deploy/install external module
 WebServer=Server Web
 DocumentRootServer=Server Web este directorul rădăcină
 DataRootServer=Directorul de fişiere de date
@@ -994,7 +1004,7 @@ TriggerAlwaysActive=Declanşările în acest dosar sunt întotdeauna activ, ce s
 TriggerActiveAsModuleActive=Declanşările în acest dosar sunt active ca <b>modul %s</b> este activată.
 GeneratedPasswordDesc=Definiţi aici regulă care doriţi să-l utilizaţi pentru a genera o parolă nouă, dacă vă întrebaţi de a avea auto generate parola
 DictionaryDesc=Insert all reference data. You can add your values to the default.
-ConstDesc=Această pagină vă permite să editați toți ceilalți parametri care nu sunt disponibili în paginile anterioare. Aceștia sunt în principal parametrii rezervați pentru dezvoltatori sau pentru depanare avansată.
+ConstDesc=This page allows you to edit all other parameters not available in previous pages. These are mostly reserved parameters for developers or advanced troubleshooting. For a list of options <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">check here</a>.
 MiscellaneousDesc=Toți ceilalți parametri legați de securitate sunt definiți aici.
 LimitsSetup=Limitele / Precizie
 LimitsDesc=Puteţi defini limitele, preciziile şi optimizarile utilizate de către Dolibarr aici
@@ -1161,10 +1171,6 @@ FreeLegalTextOnOrders=Free text de pe ordinele de
 WatermarkOnDraftOrders=Filigranul pe comenzile schiţă (niciunul daca e gol)
 ShippableOrderIconInList=Adaugă un icon în lista Comenzilor care indica daca comanda este expediabilă
 BANK_ASK_PAYMENT_BANK_DURING_ORDER=Cere contul bancar destinație al comenzii
-##### Clicktodial #####
-ClickToDialSetup=Click pentru a Dial modul setup
-ClickToDialUrlDesc=Url called when a click on phone picto is done.  Dans l'url, vous pouvez utiliser les balises<br><b>__PHONETO__</b> qui sera remplac� par le t�l�phone de l'appel�<br><b>__PHONEFROM__</b> qui sera remplac� par le t�l�phone de l'appelant (le votre)<br><b>__LOGIN__</b> qui sera remplac� par votre login clicktodial (d�fini sur votre fiche utilisateur)<br><b>__PASS__</b> qui sera remplac� par votre mot de passe clicktodial (d�fini sur votre fiche utilisateur).
-##### Bookmark4u #####
 ##### Interventions #####
 InterventionsSetup=Intervenţii de modul de configurare
 FreeLegalTextOnInterventions=Textul gratuit pe documente de intervenţie
@@ -1391,7 +1397,7 @@ SendingsSetup=Trimiterea de modul de configurare
 SendingsReceiptModel=Trimiterea primirea model
 SendingsNumberingModules=Trimiteri de numerotare module
 SendingsAbility=Foi de transport suport pentru livrările către clienți.
-NoNeedForDeliveryReceipts=În cele mai multe cazuri, sendings încasări sunt utilizate atât ca foi de client pentru livrări (lista de produse pentru a trimite) şi foi de faptul că este recevied şi semnat de către client. Deci, livrările de produse încasări este un duplicat caracteristică şi este rareori activat.
+NoNeedForDeliveryReceipts=In most cases, shipping sheets are used both as sheets for customer deliveries (list of products to send) and sheets that is received and signed by customer. So product deliveries receipts is a duplicated feature and is rarely activated.
 FreeLegalTextOnShippings=Text liber pe livrari
 ##### Deliveries #####
 DeliveryOrderNumberingModules=Produse livrările primirea modul de numerotare
@@ -1471,7 +1477,11 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Set automatically this default value for type of e
 AGENDA_DEFAULT_FILTER_TYPE=Setați automat acest tip de eveniment în filtrul de căutare al vederii agenda
 AGENDA_DEFAULT_FILTER_STATUS=Setați automat acest statut în filtrul de căutare al vederii agenda
 AGENDA_DEFAULT_VIEW=Care tab doriţi să deschideţi când selectaţi meniul Agenda
-##### ClickToDial #####
+AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
+AGENDA_NOTIFICATION_SOUND=Enable sound notification
+##### Clicktodial #####
+ClickToDialSetup=Click pentru a Dial modul setup
+ClickToDialUrlDesc=Url called when a click on phone picto is done.  Dans l'url, vous pouvez utiliser les balises<br><b>__PHONETO__</b> qui sera remplac� par le t�l�phone de l'appel�<br><b>__PHONEFROM__</b> qui sera remplac� par le t�l�phone de l'appelant (le votre)<br><b>__LOGIN__</b> qui sera remplac� par votre login clicktodial (d�fini sur votre fiche utilisateur)<br><b>__PASS__</b> qui sera remplac� par votre mot de passe clicktodial (d�fini sur votre fiche utilisateur).
 ClickToDialDesc=This module allows to make phone numbers clickable. A click on this icon will call make your phone to 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.
 ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
 ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on same computer than the browser, and called when you click on a link in your browser that start 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.
@@ -1499,10 +1509,11 @@ EndPointIs=Clienții SOAP trebuie să își trimită cererile la punctul final D
 ##### API ####
 ApiSetup=Configurare Modul API
 ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
-ApiProductionMode=Enable production mode (this will activate use of a caches for services management)
+ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
 ApiExporerIs=You can explore the APIs at url
 OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
 ApiKey=Cheie pentru API
+WarningAPIExplorerDisabled=The API explorer has been disabled. API explorer is not required to provide API services. It is a tool for developer to find/test REST APIs. If you need this tool, go into setup of module API REST to activate it.
 ##### Bank #####
 BankSetupModule=Banca modul de configurare
 FreeLegalTextOnChequeReceipts=Free text pe cec încasări
@@ -1571,7 +1582,7 @@ BackupDumpWizard=Wizard to build database backup dump file
 SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
 SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is only manual steps a privileged user can do.
 InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
-ConfFileMuseContainCustom=Installing an external module from application save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to have option<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
+ConfFileMuseContainCustom=Installing an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
 HighlightLinesColor=Highlight color of the line when the mouse passes over (keep empty for no highlight)
 TextTitleColor=Culoare titlu pagina
@@ -1601,6 +1612,7 @@ FixTZ=Fixează TimeZone
 FillFixTZOnlyIfRequired=Example: +2 (fill only if problem experienced)
 ExpectedChecksum=Checksum așteptat
 CurrentChecksum=Checksum curent
+ForcedConstants=Required constant values
 MailToSendProposal=To send customer proposal
 MailToSendOrder=To send customer order
 MailToSendInvoice=To send customer invoice
@@ -1609,13 +1621,14 @@ MailToSendIntervention=To send intervention
 MailToSendSupplierRequestForQuotation=To send quotation request to supplier
 MailToSendSupplierOrder=To send supplier order
 MailToSendSupplierInvoice=To send supplier invoice
+MailToSendContract=To send a contract
 MailToThirdparty=To send email from third party page
 ByDefaultInList=Show by default on list view
-YouUseLastStableVersion=Folositi ultima versiune stabilă
+YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
 TitleExampleForMaintenanceRelease=Example of message you can use to announce this maintenance release (feel free to use it on your web sites)
-ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. You can download it from the download area of http://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.
-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, nor data structure change is present into this version. You can download it from the download area of http://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.
+ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. 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.
+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, nor data structure change is present into 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, you can enter here rule to have price for each level autocalculated according to price of first level, so you will have to enter only price for first level on each product. This page is here to save you time and can be usefull only if your prices for each leve are relative to first level. You can ignore this page in most cases.
 ModelModulesProduct=Templates for product documents
 ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
diff --git a/htdocs/langs/ro_RO/banks.lang b/htdocs/langs/ro_RO/banks.lang
index f5b79a527d6..ce964a1bb6a 100644
--- a/htdocs/langs/ro_RO/banks.lang
+++ b/htdocs/langs/ro_RO/banks.lang
@@ -74,7 +74,7 @@ Conciliate=Deconteaza
 Conciliation=Conciliere
 ReconciliationLate=Reconciliation late
 IncludeClosedAccount=Includeţi conturile închise
-OnlyOpenedAccount=Numai conturile deschise 
+OnlyOpenedAccount=Numai conturile deschise
 AccountToCredit=Cont de credit
 AccountToDebit=Cont de debit
 DisableConciliation=Dezactivaţi reconcilierea pentru acest cont
diff --git a/htdocs/langs/ro_RO/bills.lang b/htdocs/langs/ro_RO/bills.lang
index 145e1dd8222..c06f5c0d0ff 100644
--- a/htdocs/langs/ro_RO/bills.lang
+++ b/htdocs/langs/ro_RO/bills.lang
@@ -2,12 +2,12 @@
 Bill=Factură
 Bills=Facturi
 BillsCustomers=Facturi Clienţi
-BillsCustomer=Factura Client
+BillsCustomer=Factură Client
 BillsSuppliers=Facturi Furnizori
 BillsCustomersUnpaid=Facturi clienţi neîncasate
-BillsCustomersUnpaidForCompany=Facturi Clienţi Neîncasate pentru %s
-BillsSuppliersUnpaid=Facturi Furnizori Neachitate
-BillsSuppliersUnpaidForCompany=Facturi Furnizori Neachitate  pentru %s
+BillsCustomersUnpaidForCompany=Unpaid customer invoices for %s
+BillsSuppliersUnpaid=Facturi furnizori neplătite
+BillsSuppliersUnpaidForCompany=Unpaid supplier invoices for %s
 BillsLate=Plăţi întârziate
 BillsStatistics=Statistici Facturi Clienţi
 BillsStatisticsSuppliers=Statistici Facturi Furnizori
@@ -63,7 +63,7 @@ paymentInInvoiceCurrency=in moneda facturii
 PaidBack=Restituit
 DeletePayment=Ştergere plată
 ConfirmDeletePayment=Sunteţi sigur că doriţi să ştergeţi această plată?
-ConfirmConvertToReduc=Doriţi să transformați această nota de credit sau avans într-o reducere absolută? <br> Valoarea va fi salvată alături de reducerile existente şi va putea fi folosită ca o reducere intr-o factură curentă sau viitoare pentru acest client.
+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.
 SupplierPayments=Plăţi Furnizori
 ReceivedPayments=Încasări primite
 ReceivedCustomersPayments=Încasări  Clienţi
@@ -78,6 +78,7 @@ PaymentMode=Tip de plată
 PaymentTypeDC=Debit/Credit Card
 PaymentTypePP=PayPal
 IdPaymentMode=Tip de plată (id)
+CodePaymentMode=Payment type (code)
 LabelPaymentMode=Tip de plată (etichetă)
 PaymentModeShort=Tip de plată
 PaymentTerm=Condiţii de plată
@@ -102,9 +103,10 @@ SearchACustomerInvoice=Caută o factură client
 SearchASupplierInvoice=Caută o factură  furnizor
 CancelBill=Anulează o factură
 SendRemindByMail=EMail memento
-DoPayment=Emite plata
-DoPaymentBack=Emite restituire plata
+DoPayment=Enter payment
+DoPaymentBack=Enter refund
 ConvertToReduc=Transformă în viitor discount
+ConvertExcessReceivedToReduc=Convert excess received into future discount
 EnterPaymentReceivedFromCustomer=Introduceţi o încasare de la client
 EnterPaymentDueToCustomer=Introduceţi o plată restituire pentru client
 DisabledBecauseRemainderToPayIsZero=Dezactivată  pentru că restul de plată este zero
@@ -113,22 +115,24 @@ BillStatus=Status Factura
 StatusOfGeneratedInvoices=Status factură generată
 BillStatusDraft=Schiţă (de validat)
 BillStatusPaid=Plătite
-BillStatusPaidBackOrConverted=Plătite sau transformate în reducere
+BillStatusPaidBackOrConverted=Refund or converted into discount
 BillStatusConverted=Plătită ( gata pentru factura finală)
 BillStatusCanceled=Abandonate
 BillStatusValidated=Validate (de plată)
 BillStatusStarted=Începută
 BillStatusNotPaid=Neplătită
+BillStatusNotRefunded=Not refunded
 BillStatusClosedUnpaid=Închisă (neplătită)
 BillStatusClosedPaidPartially=Platite (parţial)
 BillShortStatusDraft=Schiţă
 BillShortStatusPaid=Platite
-BillShortStatusPaidBackOrConverted=Prelucrate
+BillShortStatusPaidBackOrConverted=Refund or converted
 BillShortStatusConverted=Prelucrate
 BillShortStatusCanceled=Abandonată
 BillShortStatusValidated=Validată
 BillShortStatusStarted=Începută
 BillShortStatusNotPaid=Neplatită
+BillShortStatusNotRefunded=Not refunded
 BillShortStatusClosedUnpaid=Închisă
 BillShortStatusClosedPaidPartially=Platită (parţial)
 PaymentStatusToValidShort=De validat
@@ -149,14 +153,14 @@ NoQualifiedRecurringInvoiceTemplateFound=Nu există un model de factură potrivi
 FoundXQualifiedRecurringInvoiceTemplate=Au fost găsite %s modele de facturi recurente potrivite pentru generare.
 NotARecurringInvoiceTemplate=Nu este un model de factură recurentă.
 NewBill=Factură nouă
-LastBills=Ultimele %s facturi
-LastCustomersBills=Ultimele %s facturi clienţi
-LastSuppliersBills=Ultimele %s facturi furnizori
+LastBills=Latest %s invoices
+LastCustomersBills=Latest %s customer invoices
+LastSuppliersBills=Latest %s supplier invoices
 AllBills=Toate facturile
 OtherBills=Alte facturi
 DraftBills=Facturi schiţă
-CustomersDraftInvoices=Facturi schiţă Clienţi
-SuppliersDraftInvoices=Facturi schiţă Furnizori
+CustomersDraftInvoices=Customer draft invoices
+SuppliersDraftInvoices=Supplier draft invoices
 Unpaid=Neachitate
 ConfirmDeleteBill=Sunteţi sigur că doriţi să ştergeţi această factură?
 ConfirmValidateBill=Sigur doriţi să validaţi această factură cu referinţa<b>%s</b>?
@@ -203,7 +207,7 @@ AlreadyPaidNoCreditNotesNoDeposits=Deja plătite (fără note de credit şi avan
 Abandoned=Abandonată
 RemainderToPay=Rest de plată
 RemainderToTake=Rest de încasat
-RemainderToPayBack=Rest de rambursat
+RemainderToPayBack=Remaining amount to refund
 Rest=Creanţă
 AmountExpected=Suma reclamată
 ExcessReceived=Primit în plus
@@ -270,6 +274,7 @@ Deposit=Avans
 Deposits=Avansuri
 DiscountFromCreditNote=Reducere de la nota de credit %s
 DiscountFromDeposit=Plăţi efectuate din factura  de avans%s
+DiscountFromExcessReceived=Payments from excess received of invoice %s
 AbsoluteDiscountUse=Acest tip de credit poate fi utilizat pe factură înainte de validarea acesteia
 CreditNoteDepositUse=Factura trebuie validată pentru a utiliza acest tip de credite
 NewGlobalDiscount=Discount absolut nou
@@ -277,8 +282,8 @@ NewRelativeDiscount=Discount  relativ nou
 NoteReason=Notă / Motiv
 ReasonDiscount=Motiv
 DiscountOfferedBy=Acordate de
-DiscountStillRemaining=Discounturi rămase în curs
-DiscountAlreadyCounted=Discounturi deja aplicate
+DiscountStillRemaining=Discounts available
+DiscountAlreadyCounted=Discounts already consumed
 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ă.
@@ -331,10 +336,12 @@ InvoiceAutoValidate=Validare automată facturi
 GeneratedFromRecurringInvoice=Generate din model factura recurentă %s
 DateIsNotEnough=Incă nu este data setată
 InvoiceGeneratedFromTemplate=Factură %s generată din model factură recurentă %s
+WarningInvoiceDateInFuture=Warning, the invoice date is higher than current date
+WarningInvoiceDateTooFarInFuture=Warning, the invoice date is too far from current date
 # PaymentConditions
 Statut=Status
-PaymentConditionShortRECEP=Imediat
-PaymentConditionRECEP=Imediat
+PaymentConditionShortRECEP=Due Upon Receipt
+PaymentConditionRECEP=Due Upon Receipt
 PaymentConditionShort30D=30 zile
 PaymentCondition30D=30 zile
 PaymentConditionShort30DENDMONTH=30 zile la sfarsitul lunii
@@ -349,6 +356,14 @@ PaymentConditionShortPT_ORDER=Comanda
 PaymentConditionPT_ORDER=Pe comandă
 PaymentConditionShortPT_5050=50-50
 PaymentConditionPT_5050=50%% în avans, 50%% la livrare
+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
 FixAmount=Valoare fixă
 VarAmount=Valoare variabilă (%% tot.)
 # PaymentType
@@ -418,7 +433,7 @@ ChequeDeposits=Cecuri remise
 Cheques=Cecuri
 DepositId=Depozit id
 NbCheque=Număr cecuri
-CreditNoteConvertedIntoDiscount=Această notă de credit a fost convertită în %s
+CreditNoteConvertedIntoDiscount=This %s has been converted into %s
 UsBillingContactAsIncoiveRecipientIfExist=Utilizaţi , adresa  de facturare a contactului  clientului în loc de o adresa terţului  ca adresa a destinatarului pentru facturi
 ShowUnpaidAll=Afişează toate facturile neachitate
 ShowUnpaidLateOnly=Afişează numai facturile întârziate la plată
diff --git a/htdocs/langs/ro_RO/boxes.lang b/htdocs/langs/ro_RO/boxes.lang
index bcbb4b9232e..c042b97d48f 100644
--- a/htdocs/langs/ro_RO/boxes.lang
+++ b/htdocs/langs/ro_RO/boxes.lang
@@ -25,8 +25,8 @@ BoxTitleLastSuppliers=Ultimii %s furnizori înregistraţi
 BoxTitleLastModifiedSuppliers=Ultimii %s furnizori modificaţi
 BoxTitleLastModifiedCustomers=Ultimii %s clienţi modificaţi
 BoxTitleLastCustomersOrProspects=Ultimii %s clienti sau prospecţi
-BoxTitleLastCustomerBills=Ultimele %s facturi clienţi
-BoxTitleLastSupplierBills=Ultimele %s facturi furnizori 
+BoxTitleLastCustomerBills=Latest %s customer invoices
+BoxTitleLastSupplierBills=Latest %s supplier invoices
 BoxTitleLastModifiedProspects=Ultimii %s prospecţi modificaţi
 BoxTitleLastModifiedMembers=Ultimii %s membri
 BoxTitleLastFicheInter=Ultimele %s intervenţii modificate
@@ -51,12 +51,12 @@ ClickToAdd=Click aici pentru a adăuga.
 NoRecordedCustomers=Niciun client înregistrat
 NoRecordedContacts=Niciun contact înregistrat
 NoActionsToDo=Nicio  acţiune de realizat
-NoRecordedOrders=Nicio comandă client înregistrată
+NoRecordedOrders=No recorded customer orders
 NoRecordedProposals=Nicio ofertă înregistrată
-NoRecordedInvoices=Nicio factură clienţi înregistrată
-NoUnpaidCustomerBills=Nicio factură clienţi neîncasată
-NoUnpaidSupplierBills=Nicio factură furnizori neplătită
-NoModifiedSupplierBills=Nicio factură furnizori înregistrată
+NoRecordedInvoices=No recorded customer invoices
+NoUnpaidCustomerBills=No unpaid customer invoices
+NoUnpaidSupplierBills=No unpaid supplier invoices
+NoModifiedSupplierBills=No recorded supplier invoices
 NoRecordedProducts=Niciun produs / serviciu înregistrat
 NoRecordedProspects=Niciun prospect înregistrat
 NoContractedProducts=Niciun  produs / serviciu contractat
@@ -73,9 +73,9 @@ NoTooLowStockProducts=Niciun produs sub stocul de siguranţă
 BoxProductDistribution=Distribuţie Produse / Servicii
 BoxProductDistributionFor=Distribuţia de %s  pe  %s
 BoxTitleLastModifiedSupplierBills=Latest %s modified supplier bills
-BoxTitleLatestModifiedSupplierOrders=Latest %s modified supplier orders
+BoxTitleLatestModifiedSupplierOrders=Ultimele %s comenzi clienţi modificate
 BoxTitleLastModifiedCustomerBills=Latest %s modified customer bills
-BoxTitleLastModifiedCustomerOrders=Latest %s modified customer orders
+BoxTitleLastModifiedCustomerOrders=Ultimele %s comenzi clienţi validate
 BoxTitleLastModifiedPropals=Latest %s modified propals
 ForCustomersInvoices=Facturi clienţi
 ForCustomersOrders=Comenzi clienți
diff --git a/htdocs/langs/ro_RO/companies.lang b/htdocs/langs/ro_RO/companies.lang
index 391995e47a8..d442e21181f 100644
--- a/htdocs/langs/ro_RO/companies.lang
+++ b/htdocs/langs/ro_RO/companies.lang
@@ -78,6 +78,10 @@ VATIsNotUsed=Nu utilizează TVA-ul
 CopyAddressFromSoc=Fill address with third party address
 ThirdpartyNotCustomerNotSupplierSoNoRef=Terţii nu sunt clienţi sau furnizori, nu sunt obiecte asociate disponibile
 PaymentBankAccount=Payment bank account
+OverAllProposals=Total proposals
+OverAllOrders=Total orders
+OverAllInvoices=Total invoices
+OverAllSupplierProposals=Total price requests
 ##### Local Taxes #####
 LocalTax1IsUsed=Utilizează taxa secundă
 LocalTax1IsUsedES= RE este utilizat
@@ -239,6 +243,10 @@ ProfId3RU=Prof. ID 3 (KPP)
 ProfId4RU=Prof. Id-ul 4 (OKPO)
 ProfId5RU=-
 ProfId6RU=-
+ProfId1DZ=RC
+ProfId2DZ=Art.
+ProfId3DZ=NIF
+ProfId4DZ=NIS
 VATIntra=Codul de TVA
 VATIntraShort=Codul de TVA
 VATIntraSyntaxIsValid=Sintaxa este validă
@@ -384,6 +392,7 @@ LastModifiedThirdParties=Ultimii %s parteneri  modificați
 UniqueThirdParties=Total terţi unici
 InActivity=Deschis
 ActivityCeased=Închis
+ThirdPartyIsClosed=Third party is closed
 ProductsIntoElements=Ultimele produse / servicii in %s
 CurrentOutstandingBill=Facturi in suspensie curente
 OutstandingBill=Max. limită credit
@@ -396,7 +405,7 @@ MergeThirdparties=Imbina terti
 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 so you will be able to delete the duplicate one.
 ThirdpartiesMergeSuccess=Tertii au fost imbinati
 SaleRepresentativeLogin=Autentificare reprezentant vânzări
-SaleRepresentativeFirstname=Prenume reprezentant vânzări
-SaleRepresentativeLastname=Nume reprezentant vânzări
+SaleRepresentativeFirstname=First name of sales representative
+SaleRepresentativeLastname=Last name of sales representative
 ErrorThirdpartiesMerge=A apărut o eroare laștergerea terților. Vă rugăm să verificați logurile. Modificările au fost anulate.
 NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/ro_RO/compta.lang b/htdocs/langs/ro_RO/compta.lang
index 12b7ffeb59b..dda1589b5c3 100644
--- a/htdocs/langs/ro_RO/compta.lang
+++ b/htdocs/langs/ro_RO/compta.lang
@@ -65,6 +65,7 @@ PaymentSocialContribution=Plata taxe sociale sau fiscale
 PaymentVat=Plată TVA
 ListPayment=Listă plăţi
 ListOfCustomerPayments=Listă plăţi clienţi
+ListOfSupplierPayments=Listă plăţi  furnizori
 DateStartPeriod=Dată început perioadă
 DateEndPeriod=Dată sfârşit perioadă
 newLT1Payment=Plată taxă nouă 2
@@ -81,7 +82,7 @@ LT2PaymentES=IRPF de plata
 LT2PaymentsES=Plăţi IRPF 
 VATPayment=Sales tax payment
 VATPayments=Sales tax payments
-VATRefund=Sales tax refund Refund
+VATRefund=Sales tax refund
 Refund=Rambursare
 SocialContributionsPayments=Plata taxe sociale sau fiscale
 ShowVatPayment=Arata plata TVA
@@ -194,7 +195,7 @@ CloneTax=Cloneaza o taxa sociala / fiscala
 ConfirmCloneTax= Confirmare duplicare plată taxă. 
 CloneTaxForNextMonth=Clonaţi-o pentru luna următoare
 SimpleReport=Raport simplu
-AddExtraReport=Rapoarte  adiţionale
+AddExtraReport=Extra reports (add foreign and national customer report)
 OtherCountriesCustomersReport=Raport clienţi externi
 BasedOnTwoFirstLettersOfVATNumberBeingDifferentFromYourCompanyCountry=Pe baza primelor două litere ale codului de TVA ca fiind diferit de codul de țară al companiei dumneavoastră
 SameCountryCustomersWithVAT=Raport clienţi interni
diff --git a/htdocs/langs/ro_RO/cron.lang b/htdocs/langs/ro_RO/cron.lang
index 29ffc75d264..5c69dd88a17 100644
--- a/htdocs/langs/ro_RO/cron.lang
+++ b/htdocs/langs/ro_RO/cron.lang
@@ -17,14 +17,14 @@ CronMethodDoesNotExists= Clasa %s nu conține metoda %s
 # Menu
 EnabledAndDisabled=Activat și dezactivat
 # Page list
-CronLastOutput=Ieşirea ultimei rulări
-CronLastResult=Codul ultimului rezultat
+CronLastOutput=Latest run output
+CronLastResult=Latest result code
 CronCommand=Comandă
 CronList=Joburi programate
 CronDelete=Şterge Joburi programate
-CronConfirmDelete=Sunteţi sigur că doriţi să ştergeţi aceaste job-uri ?
+CronConfirmDelete=Are you sure you want to delete these scheduled jobs?
 CronExecute=Launch scheduled job
-CronConfirmExecute=Sunteţi sigur că doriţi să executati  aceaste job-uri programate  acum ?
+CronConfirmExecute=Are you sure you want to execute these scheduled jobs now?
 CronInfo=Modul de joburi programate permite să  se execute  job-uri  care au fost planificate
 CronTask=Job
 CronNone=Niciunul
@@ -39,7 +39,7 @@ CronMethod=Metoda
 CronModule=Modulul
 CronNoJobs=Niciun job înregistrat
 CronPriority=Prioritate
-CronLabel=Label
+CronLabel=Etichetă
 CronNbRun=Nr. lansări
 CronMaxRun=Nr. max. lansări
 CronEach=Fiecare
diff --git a/htdocs/langs/ro_RO/errors.lang b/htdocs/langs/ro_RO/errors.lang
index 12e7968a8d2..8b6acb43154 100644
--- a/htdocs/langs/ro_RO/errors.lang
+++ b/htdocs/langs/ro_RO/errors.lang
@@ -11,6 +11,7 @@ ErrorLoginAlreadyExists=Login %s există deja.
 ErrorGroupAlreadyExists=Grupul %s există deja.
 ErrorRecordNotFound=Înregistrarea nu a fost găsit.
 ErrorFailToCopyFile=Nu a reuşit să copiaţi fişierul <b>&quot;%s&quot;</b> în <b>&quot;%s&quot;.</b>
+ErrorFailToCopyDir=Failed to copy directory '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToRenameFile=Nu a reuşit să redenumiţi fişierul <b>&quot;%s&quot;</b> în <b>&quot;%s&quot;.</b>
 ErrorFailToDeleteFile=Nu a reuşit să eliminaţi fişierul <b>" %s".</b>
 ErrorFailToCreateFile=Nu a reuşit să creeze fişierul <b>" %s".</b>
@@ -115,7 +116,7 @@ ErrorNoActivatedBarcode=Niciun tip de coduri de bare activat
 ErrUnzipFails=Eşec la dezarhivarea fişierului %s cu ZipArchive
 ErrNoZipEngine=Niciun motor pentru dezarhivarea fișierului %s în acest PHP
 ErrorFileMustBeADolibarrPackage=Fșierul %s  trebuie să fie un pachet zip Dolibarr
-ErrorFileRequired=Este nevoie de un fișier pachet Dolibarr
+ErrorModuleFileRequired=You must select a Dolibarr module package file
 ErrorPhpCurlNotInstalled=PHP CURLnu este instalat, acest lucru este esențial pentru comunicarea cu Paypal
 ErrorFailedToAddToMailmanList=Eşec la adăugarea  %s la lista de Mailman % s sau la baza SPIP
 ErrorFailedToRemoveToMailmanList=Eşec la înlăturarea  %s din lista de Mailman % s sau din baza SPIP
@@ -170,14 +171,19 @@ ErrorWarehouseRequiredIntoShipmentLine=Depozitul este obligatoriu pe linie pentr
 ErrorFileMustHaveFormat=Fisierul trebuie sa aiba format '%s'
 ErrorSupplierCountryIsNotDefined=Țara nu este definită pentru acest furnizor. 
 ErrorsThirdpartyMerge=Failed to merge the two records. Request canceled.
-ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enougth for product %s to add it into a new order.
-ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enougth for product %s to add it into a new invoice.
-ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enougth for product %s to add it into a new shipment.
-ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enougth for product %s to add it into a new proposal.
-ErrorFailedToLoadLoginFileForMode=Failed to get the login file for mode '%s'.
+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 bank 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>
 
 # 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. 
diff --git a/htdocs/langs/ro_RO/holiday.lang b/htdocs/langs/ro_RO/holiday.lang
index ee1f9e6fbc4..175ba09177d 100644
--- a/htdocs/langs/ro_RO/holiday.lang
+++ b/htdocs/langs/ro_RO/holiday.lang
@@ -76,8 +76,9 @@ BoxTitleLastLeaveRequests=Latest %s modified leave requests
 HolidaysMonthlyUpdate=Actualizare lunară
 ManualUpdate=Actualizare manuală
 HolidaysCancelation=Anulare cerere concediu
-EmployeeLastname=Employee lastname
-EmployeeFirstname=Employee firstname
+EmployeeLastname=Employee last name
+EmployeeFirstname=Employee first name
+TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
 
 ## Configuration du Module ##
 LastUpdateCP=Latest automatic update of leaves allocation
diff --git a/htdocs/langs/ro_RO/ldap.lang b/htdocs/langs/ro_RO/ldap.lang
index 0e2d4bdf069..14faf66bf36 100644
--- a/htdocs/langs/ro_RO/ldap.lang
+++ b/htdocs/langs/ro_RO/ldap.lang
@@ -13,8 +13,8 @@ LDAPUsers=Utilizatorii din baza de date LDAP
 LDAPFieldStatus=Statut
 LDAPFieldFirstSubscriptionDate=Prima data de abonament
 LDAPFieldFirstSubscriptionAmount=Pumn de abonament suma
-LDAPFieldLastSubscriptionDate=Ultima data de abonament
-LDAPFieldLastSubscriptionAmount=Ultima abonament suma
+LDAPFieldLastSubscriptionDate=Latest subscription date
+LDAPFieldLastSubscriptionAmount=Latest subscription amount
 LDAPFieldSkype=Skype id
 LDAPFieldSkypeExample=Example : skypeName
 UserSynchronized=Utilizator sincronizate
diff --git a/htdocs/langs/ro_RO/mails.lang b/htdocs/langs/ro_RO/mails.lang
index b656e55ea2f..2d1eaf7dd6d 100644
--- a/htdocs/langs/ro_RO/mails.lang
+++ b/htdocs/langs/ro_RO/mails.lang
@@ -35,7 +35,7 @@ MailingStatusSentPartialy=Trimis parţial
 MailingStatusSentCompletely=Trimis complet
 MailingStatusError=Eroare
 MailingStatusNotSent=Nu trimis
-MailSuccessfulySent=Email trimis cu succes (din %s în %s)
+MailSuccessfulySent=Email successfully accepted for delivery (from %s to %s)
 MailingSuccessfullyValidated=EMail validat cu succes
 MailUnsubcribe=Dezabonare
 MailingStatusNotContact=Nu mă mai contacta
@@ -74,22 +74,28 @@ ResultOfMailSending=Result of mass EMail sending
 NbSelected=Nr selectat
 NbIgnored=Nr  ignorat
 NbSent=Nr trimis
+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
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Linia %s în fişierul
 RecipientSelectionModules=Definit pentru cererile beneficiarilor de selecţie
 MailSelectedRecipients=Selectat destinatarii
 MailingArea=EMailings 
-LastMailings=Ultima %s emailings
+LastMailings=Latest %s emailings
 TargetsStatistics=Ţinte statistici
 NbOfCompaniesContacts=Unic de contact din companii
 MailNoChangePossible=Destinatari validate de email-uri nu poate fi schimbat
 SearchAMailing=Căutare de e-mail
 SendMailing=Trimite email-uri
 SendMail=Trimite un email
-MailingNeedCommand=Din motive de securitate, trimiterea unui email-uri este mai bine cand este efectuată de la linia de comandă. Dacă aveți unul, întrebați administratorul pentru a lansa următoarea comandă pentru a trimite email-uri la toți destinatarii:
+SentBy=Trimis de
+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=Puteţi, totuşi, trimite-le on-line, prin adăugarea parametrului MAILING_LIMIT_SENDBYWEB cu valoare de numărul maxim de mesaje de poştă electronică pe care doriţi să o trimiteţi prin sesiuni.
-ConfirmSendingEmailing=If you can't or prefer sending them with your www browser, please confirm you are sure you want to send emailing now from your browser?
+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=Notă: Trimiterea de emailurilor din interfata web se face de mai multe ori din motive de securitate și pauze, <b>%s</b> beneficiari la un moment dat pentru fiecare sesiune trimitere.
 TargetsReset=Cer senin lista
 ToClearAllRecipientsClickHere=Pentru a goli beneficiarilor lista pentru acest email-uri, faceţi clic pe butonul
@@ -144,3 +150,6 @@ AdvTgtCreateFilter=Creare filtru
 AdvTgtOrCreateNewFilter=Numele noului filtru
 NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
+OutGoingEmailSetup=Outgoing email setup
+InGoingEmailSetup=Incoming email setup
+
diff --git a/htdocs/langs/ro_RO/main.lang b/htdocs/langs/ro_RO/main.lang
index 3eb153d3bb8..8c7ed17df5d 100644
--- a/htdocs/langs/ro_RO/main.lang
+++ b/htdocs/langs/ro_RO/main.lang
@@ -63,11 +63,13 @@ ErrorNoVATRateDefinedForSellerCountry=Eroare,  nici o cota de TVA definită pent
 ErrorNoSocialContributionForSellerCountry=Eroare, niciun tip taxa sociala /fiscala definit pentru ţara '%s'.
 ErrorFailedToSaveFile=Eroare,  salvarea fişierului eşuată.
 ErrorCannotAddThisParentWarehouse=You are trying to add a parent warehouse which is already a child of current one
+MaxNbOfRecordPerPage=Max nb of record per page
 NotAuthorized=Dvs nu aveti dreptusa faceti aceasta.
 SetDate=setează data
 SelectDate=selectează data
 SeeAlso=Vezi şi %s
 SeeHere=Vezi aici
+Apply=Aplică
 BackgroundColorByDefault=Culoarea de fundal implicită
 FileRenamed=The file was successfully renamed
 FileUploaded=Fişierul a fost încărcat cu succes
@@ -86,7 +88,7 @@ Undefined=Nedefinit
 PasswordForgotten=Parola uitata ?
 SeeAbove=Vezi mai sus
 HomeArea=Acasă
-LastConnexion=Ultima conexiune
+LastConnexion=Latest connection
 PreviousConnexion=Conexiunea precedentă
 PreviousValue=Previous value
 ConnectedOnMultiCompany=Conectat la entitatea
@@ -236,7 +238,7 @@ DateCreation=Dată creare
 DateCreationShort=Data Creare
 DateModification=Dată modificarea
 DateModificationShort=Dată modif.
-DateLastModification=Data ultimei modificări
+DateLastModification=Latest modification date
 DateValidation=Dată validare
 DateClosing=Dată închidere
 DateDue=Dată scadenţă
@@ -460,6 +462,7 @@ DeletePicture=Şterge Foto
 ConfirmDeletePicture=Confirmaţi ştergere foto ?
 Login=Login
 CurrentLogin=Login curent
+EnterLoginDetail=Enter login details
 January=Ianuarie
 February=Februarie
 March=Martie
@@ -597,6 +600,8 @@ SessionName=Nume Sesiune
 Method=Metoda
 Receive=Recepţionează
 CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
+ExpectedValue=Expected Value
+CurrentValue=Valoarea curentă
 PartialWoman=Parţial
 TotalWoman=Total
 NeverReceived=Niciodată primit
@@ -753,6 +758,8 @@ RemoveString=Remove string '%s'
 SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
 DirectDownloadLink=Direct download link
 Download=Download
+ActualizeCurrency=Update currency rate
+Fiscalyear=An fiscal
 # Week day
 Monday=Luni
 Tuesday=Marţi
@@ -787,8 +794,8 @@ SetRef=Set ref
 Select2ResultFoundUseArrows=Some results found. Use arrows to select.
 Select2NotFound=Niciun rezultat gasit
 Select2Enter=Introduce
-Select2MoreCharacter=sau mai multe caractere
-Select2MoreCharacters=sau mai multe caractere
+Select2MoreCharacter=or more characters<br /><br /><strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
+Select2MoreCharacters=or more characters<br /><br /><strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
 Select2LoadingMoreResults=Se incarca mai multe rezultate...
 Select2SearchInProgress=Cautare in progres...
 SearchIntoThirdparties=Terţi
@@ -809,3 +816,5 @@ SearchIntoContracts=Contracte
 SearchIntoCustomerShipments=Livrări Client
 SearchIntoExpenseReports=Rapoarte Cheltuieli
 SearchIntoLeaves=Concedii
+
+BulkActions=Bulk actions
diff --git a/htdocs/langs/ro_RO/members.lang b/htdocs/langs/ro_RO/members.lang
index d75048f7230..65f7879b4ec 100644
--- a/htdocs/langs/ro_RO/members.lang
+++ b/htdocs/langs/ro_RO/members.lang
@@ -45,7 +45,7 @@ MemberStatusDraft=Schiţă(trebuie să fie validat)
 MemberStatusDraftShort=Schiţă
 MemberStatusActive=Validat (în aşteptareacotizatiei)
 MemberStatusActiveShort=Validat
-MemberStatusActiveLate=Adeziune  expirată
+MemberStatusActiveLate=Subscription expired
 MemberStatusActiveLateShort=Expirat
 MemberStatusPaid=Adeziuni la zi
 MemberStatusPaidShort=La zi
@@ -136,8 +136,8 @@ DocForAllMembersCards=Generaţi cărţi de vizita  pentru toţi membrii
 DocForOneMemberCards=Generaţi cărţi de vizită pentru un anumit membru
 DocForLabels=Generaţi etichete adrese
 SubscriptionPayment=Plată cotizaţie
-LastSubscriptionDate=Data ultimei cotizaţii
-LastSubscriptionAmount=Valoarea ultimei cotizaţii
+LastSubscriptionDate=Latest subscription date
+LastSubscriptionAmount=Latest subscription amount
 MembersStatisticsByCountries=Statistici Membri după ţară
 MembersStatisticsByState=Statistici Membri  după regiune / judeţ
 MembersStatisticsByTown=Statistici Membri după oraşe
@@ -149,7 +149,7 @@ MembersByStateDesc=Acest ecran vă arată statisticile cu privire la membrii  du
 MembersByTownDesc=Acest ecran vă arată statisticile cu privire la membrii după oraşe.
 MembersStatisticsDesc=Alege statisticile pe care doriţi să le citiţi ...
 MenuMembersStats=Statistici
-LastMemberDate=Data ultimului membru
+LastMemberDate=Latest member date
 Nature=Personalitate juridică
 Public=Profil public
 NewMemberbyWeb=Membru nou adăugat. În aşteptarea validării
diff --git a/htdocs/langs/ro_RO/orders.lang b/htdocs/langs/ro_RO/orders.lang
index 8594a49666b..55e7dacadc1 100644
--- a/htdocs/langs/ro_RO/orders.lang
+++ b/htdocs/langs/ro_RO/orders.lang
@@ -39,7 +39,7 @@ StatusOrderRefusedShort=Refuzată
 StatusOrderBilledShort=Facturat
 StatusOrderToProcessShort=De procesat
 StatusOrderReceivedPartiallyShort=Parţial recepţionată
-StatusOrderReceivedAllShort=Integral recepţionată
+StatusOrderReceivedAllShort=Products received
 StatusOrderCanceled=Anulată
 StatusOrderDraft=Schiţă (de validat)
 StatusOrderValidated=Validată
@@ -51,7 +51,7 @@ StatusOrderApproved=Aprobată
 StatusOrderRefused=Refuzată
 StatusOrderBilled=Facturat
 StatusOrderReceivedPartially=Parţial recepţionată
-StatusOrderReceivedAll=Integral recepţionată
+StatusOrderReceivedAll=All products received
 ShippingExist=O expediţie există
 QtyOrdered=Cant. comandată
 ProductQtyInDraft=Cantitate produs in comenzi draft
diff --git a/htdocs/langs/ro_RO/other.lang b/htdocs/langs/ro_RO/other.lang
index 4e9cdf04ac3..be0572ae809 100644
--- a/htdocs/langs/ro_RO/other.lang
+++ b/htdocs/langs/ro_RO/other.lang
@@ -2,6 +2,7 @@
 SecurityCode=Cod de securitate
 NumberingShort=N°
 Tools=Instrumente
+TMenuTools=Instrumente
 ToolsDesc=All miscellaneous tools not included in other menu entries are collected here.<br /><br />All the tools can be reached in the left menu.
 Birthday=Zi de naştere
 BirthdayDate=Data naştere
@@ -67,14 +68,15 @@ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find her
 PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nVeţi găsi aici livrarea __SHIPPINGREF__\n\n__PERSONALIZED__Cu respect\n\n__SIGNATURE__
 PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nVeţi găsi aici intervenţia__FICHINTERREF__\n\n__PERSONALIZED__Cu respect\n\n__SIGNATURE__
 PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n__PERSONALIZED__\n\n__SIGNATURE__
-DemoDesc=Dolibarr is a compact ERP/CRM supporting several functional modules. A demo showcasing all modules makes no sense as this scenario never occurs. So, several demo profiles are available.
+DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
+ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
 DemoFundation=Gestionare membrii unui Fundaţia
 DemoFundation2=Gestionaţi membri şi un cont bancar de Fundaţia
-DemoCompanyServiceOnly=Gestionaţi o independenţi activitate vânzarea de servicii numai
+DemoCompanyServiceOnly=Company or freelance selling service only
 DemoCompanyShopWithCashDesk=Gestionaţi-un magazin cu o casă de marcat
-DemoCompanyProductAndStocks=Gestionaţi o companie mici sau medii de vânzare a produselor
-DemoCompanyAll=Gestionaţi o companie mici sau medii cu mai multe activitati (toate principalele module)
+DemoCompanyProductAndStocks=Company selling products with a shop
+DemoCompanyAll=Company with multiple activities (all main modules)
 CreatedBy=Creat de %s
 ModifiedBy=Modificat de %s
 ValidatedBy=Validate de  %s
diff --git a/htdocs/langs/ro_RO/products.lang b/htdocs/langs/ro_RO/products.lang
index bceecaf17a4..b253d655b66 100644
--- a/htdocs/langs/ro_RO/products.lang
+++ b/htdocs/langs/ro_RO/products.lang
@@ -5,6 +5,8 @@ ProductLabelTranslated=Translated product label
 ProductDescriptionTranslated=Translated product description
 ProductNoteTranslated=Translated product note
 ProductServiceCard=Fişe Produse / Servicii
+TMenuProducts=Produse
+TMenuServices=Servicii
 Products=Produse
 Services=Servicii
 Product=Produs
@@ -58,7 +60,7 @@ SellingPrice=Preţul de vânzare
 SellingPriceHT=Preţul de vânzare (net)
 SellingPriceTTC=Preţul de vânzare (incl. taxe)
 CostPriceDescription=This price (net of tax) can be used to store the average amount this product cost to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
-CostPriceUsage=In a future version, this value could be used for margin calculation.
+CostPriceUsage=This value could be used for margin calculation.
 SoldAmount=Sold amount
 PurchasedAmount=Purchased amount
 NewPrice=Preţ nou
@@ -140,6 +142,7 @@ ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b>?
 CloneContentProduct=Clone toate principalele informatii de produs / serviciu
 ClonePricesProduct=Clone principalele informatii si preturi
 CloneCompositionProduct=Clone packaged product/service
+CloneCombinationsProduct=Clone product variants
 ProductIsUsed=Acest produs este utilizat
 NewRefForClone=Ref. de produs / serviciu nou
 SellingPrices=Preţuri vânzare
@@ -236,7 +239,7 @@ GlobalVariables=Global variables
 VariableToUpdate=Variable to update
 GlobalVariableUpdaters=Global variable updaters
 UpdateInterval=Update interval (minutes)
-LastUpdated=Last updated
+LastUpdated=Latest update
 CorrectlyUpdated=Correctly updated
 PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
 PropalMergePdfProductChooseFile=Selectați fișiere PDF
@@ -256,4 +259,41 @@ VolumeUnits=Volume unit
 SizeUnits=Size unit
 DeleteProductBuyPrice=Delete buying price
 ConfirmDeleteProductBuyPrice=Are you sure you want to delete this buying price?
+SubProduct=Sub product
 
+#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
+ProductCombinations=Variants
+HideProductCombinations=Hide products variant in the products selector
+ProductCombination=Variant
+NewProductCombination=New variant
+EditProductCombination=Editing variant
+ProductCombinationGenerator=Variants generator
+Features=Features
+PriceImpact=Price impact
+WeightImpact=Weight impact
+NewProductAttribute=Atribut nou
+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
+PercentageVariation=Percentage variation
+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 child products
+ConfirmCloneProductCombinations=Would you like to copy all the product variant to the 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
diff --git a/htdocs/langs/ro_RO/projects.lang b/htdocs/langs/ro_RO/projects.lang
index f8f9219921b..b6f2f5e1326 100644
--- a/htdocs/langs/ro_RO/projects.lang
+++ b/htdocs/langs/ro_RO/projects.lang
@@ -29,9 +29,9 @@ DeleteAProject=Şterge  proiect
 DeleteATask=Şterge task
 ConfirmDeleteAProject=Are you sure you want to delete this project?
 ConfirmDeleteATask=Are you sure you want to delete this task?
-OpenedProjects=Open projects
-OpenedTasks=Open tasks
-OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
+OpenedProjects=Opened projects
+OpenedTasks=Opened tasks
+OpportunitiesStatusForOpenedProjects=Opportunities amount of opened projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=Afişează proiect
 SetProject=Setare proiect
@@ -47,7 +47,7 @@ TaskTimeSpent=Timp consumat pe task
 TaskTimeUser=Utilizator
 TaskTimeNote=Nota
 TaskTimeDate=Data
-TasksOnOpenedProject=Tasks on open projects
+TasksOnOpenedProject=Sarcini la proiectele deschise
 WorkloadNotDefined=Volumul de muncă nu este definit
 NewTimeSpent=Timp nou consumat
 MyTimeSpent=Timpul meu consumat
@@ -58,6 +58,7 @@ TaskDateEnd=Data de final task
 TaskDescription=Descriere task
 NewTask=Task nou
 AddTask=Creare sarcină 
+AddTimeSpent=Create time spent
 Activity=Activitate
 Activities=Activităţi / Taskuri
 MyActivities=Activităţile / Taskurile mele
@@ -95,6 +96,7 @@ ValidateProject=Validează proiect
 ConfirmValidateProject=Are you sure you want to validate this project?
 CloseAProject=Inchide proiect
 ConfirmCloseAProject=Are you sure you want to close this project?
+AlsoCloseAProject=Also close project (keep it open if you still need to follow production tasks on it)
 ReOpenAProject=Redeschide Proiect
 ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=Contacte Proiect
@@ -120,7 +122,7 @@ CloneProjectFiles=Clonează proiect fişiere ataşate
 CloneTaskFiles=Clonează task(uri)  fişiere ataşate (dacă task (urile)  clonate)
 CloneMoveDate=Update project/tasks dates from now?
 ConfirmCloneProject=Are you sure to clone this project?
-ProjectReportDate=Schimbă data taskului conform cu data de debut a proiectului
+ProjectReportDate=Change task dates according to new project start date
 ErrorShiftTaskDate=Imposibil de schimbat data taskului conform cu noua data de debut a proiectului
 ProjectsAndTasksLines=Proiecte şi taskuri
 ProjectCreatedInDolibarr=Proiect %s creat
@@ -177,9 +179,9 @@ ProjectsStatistics=Statistics on projects/leads
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 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.
-OpenedProjectsByThirdparties=Open projects by thirdparties
+OpenedProjectsByThirdparties=Opened projects by thirdparties
 OnlyOpportunitiesShort=Only opportunities
-OpenedOpportunitiesShort=Open opportunities
+OpenedOpportunitiesShort=Opened opportunities
 NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount
diff --git a/htdocs/langs/ro_RO/propal.lang b/htdocs/langs/ro_RO/propal.lang
index 7bb7522e3ce..c259bc7060e 100644
--- a/htdocs/langs/ro_RO/propal.lang
+++ b/htdocs/langs/ro_RO/propal.lang
@@ -3,7 +3,7 @@ Proposals=Oferte Comerciale
 Proposal=Ofertă  Comercială
 ProposalShort=Ofertă 
 ProposalsDraft=Oferte Comerciale schiţă
-ProposalsOpened=Open commercial proposals
+ProposalsOpened=Oferte comerciale deschise
 Prop=Oferte Comerciale
 CommercialProposal=Ofertă Comercială
 ProposalCard=Fişă Ofertă 
@@ -28,7 +28,7 @@ ShowPropal=Afişează oferta
 PropalsDraft=Schiţe
 PropalsOpened=Deschis
 PropalStatusDraft=Schiţă (de validat)
-PropalStatusValidated=Validată (oferta e deschisă)
+PropalStatusValidated=Validated (proposal is opened)
 PropalStatusSigned=Semnată (de facturat)
 PropalStatusNotSigned=Nesemnată (inchisă)
 PropalStatusBilled=Facturată
diff --git a/htdocs/langs/ro_RO/stocks.lang b/htdocs/langs/ro_RO/stocks.lang
index 1d04de7b04b..963416d0452 100644
--- a/htdocs/langs/ro_RO/stocks.lang
+++ b/htdocs/langs/ro_RO/stocks.lang
@@ -22,13 +22,15 @@ Movements=Mişcări
 ErrorWarehouseRefRequired=Referința  Depozit este obligatorie
 ListOfWarehouses=Lista  depozite
 ListOfStockMovements=Lista mişcări de stoc
+StockMovementForId=Movement ID %d
+ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Depozite
 Location=Locație
 LocationSummary=Nume scurt locaţie
 NumberOfDifferentProducts=Numărul de produse diferite
 NumberOfProducts=Număr total produse
-LastMovement=Ultima mişcare
-LastMovements=Ultimele mişcări
+LastMovement=Latest movement
+LastMovements=Latest movements
 Units=Unităţi
 Unit=Unitate
 StockCorrection=Corectează stoc
@@ -140,3 +142,4 @@ ProductStockWarehouseCreated=Stock limit for alert and desired optimal stock cor
 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
diff --git a/htdocs/langs/ro_RO/supplier_proposal.lang b/htdocs/langs/ro_RO/supplier_proposal.lang
index cba2bae0ce4..4ddfe4a033d 100644
--- a/htdocs/langs/ro_RO/supplier_proposal.lang
+++ b/htdocs/langs/ro_RO/supplier_proposal.lang
@@ -8,7 +8,7 @@ SearchRequest=Cauta o cerere
 DraftRequests=Cereri schiţă
 SupplierProposalsDraft=Ofertă  Furnizor Schiţă
 LastModifiedRequests=Latest %s modified price requests
-RequestsOpened=Deschide Cereri Preţ 
+RequestsOpened=Opened price requests
 SupplierProposalArea=Oferte Furnizori
 SupplierProposalShort=Oferta Furnizor
 SupplierProposals=Oferte Furnizori
@@ -23,7 +23,7 @@ ConfirmValidateAsk=Are you sure you want to validate this price request under na
 DeleteAsk=Şterge cerere
 ValidateAsk=Validează cererre
 SupplierProposalStatusDraft=Schiţă (cererea tebuie validata)
-SupplierProposalStatusValidated=Validata(cererea este deschisa)
+SupplierProposalStatusValidated=Validated (request is opened)
 SupplierProposalStatusClosed=Închis
 SupplierProposalStatusSigned=Acceptat
 SupplierProposalStatusNotSigned=Refuzat
diff --git a/htdocs/langs/ro_RO/suppliers.lang b/htdocs/langs/ro_RO/suppliers.lang
index 7d191f12989..8b239203f85 100644
--- a/htdocs/langs/ro_RO/suppliers.lang
+++ b/htdocs/langs/ro_RO/suppliers.lang
@@ -9,7 +9,7 @@ ShowSupplier=Afişează furnizor
 OrderDate=Data comandă
 BuyingPriceMin=Best buying price
 BuyingPriceMinShort=Best buying price
-TotalBuyingPriceMinShort=Total of subproducts buying prices
+TotalBuyingPriceMinShort=Total prețuri de cumpărare  subproduse
 TotalSellingPriceMinShort=Total of subproducts selling prices
 SomeSubProductHaveNoPrices=Unele sub-produse nu au un preț definit
 AddSupplierPrice=Add buying price
@@ -24,10 +24,10 @@ ExportDataset_fournisseur_1=Facturi furnizori şi linii facturi
 ExportDataset_fournisseur_2=Facturi Furnizor  şi plăţi
 ExportDataset_fournisseur_3=Comenzi furnizori si lini comenzi
 ApproveThisOrder=Aprobă  această comandă
-ConfirmApproveThisOrder=Sigur doriţi să aprobaţi această comandă   <b>%s</b>?
+ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b>?
 DenyingThisOrder=Refuză aceasta comanda
-ConfirmDenyingThisOrder=Sigur doriţi să refuzaţi această comandă   <b>%s</b>?
-ConfirmCancelThisOrder=Sigur doriţi să anulaţi această comandă   <b>%s</b>?
+ConfirmDenyingThisOrder=Are you sure you want to deny this order <b>%s</b>?
+ConfirmCancelThisOrder=Are you sure you want to cancel this order <b>%s</b>?
 AddSupplierOrder=Crează comandă furnizor
 AddSupplierInvoice=Crează  factură furnizor
 ListOfSupplierProductForSupplier=Lista  produse şi preţuri pentru furnizorul  <b>%s</b>
@@ -41,3 +41,4 @@ DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Wrong quality
 ReputationForThisProduct=Reputation
 BuyerName=Buyer name
+AllProductServicePrices=All product / service prices
diff --git a/htdocs/langs/ro_RO/withdrawals.lang b/htdocs/langs/ro_RO/withdrawals.lang
index c77a4873283..fc3970a7e79 100644
--- a/htdocs/langs/ro_RO/withdrawals.lang
+++ b/htdocs/langs/ro_RO/withdrawals.lang
@@ -24,6 +24,7 @@ WithdrawStatistics=Direct debit payment statistics
 WithdrawRejectStatistics=Direct debit payment reject statistics
 LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
+WithdrawRequestsDone=%s direct debit payment requests recorded
 ThirdPartyBankCode=Cod terţ bancă
 NoInvoiceCouldBeWithdrawed=Nu withdrawed factură cu succes. Verificaţi dacă factura sunt pe companii cu un valide BAN.
 ClassCredited=Clasifica creditat
@@ -76,8 +77,8 @@ RUM=UMR
 RUMLong=Unique Mandate Reference
 RUMWillBeGenerated=UMR number will be generated once bank account information are saved
 WithdrawMode=Direct debit mode (FRST or RECUR)
-WithdrawRequestAmount=Withdraw request amount:
-WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil amount.
+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
diff --git a/htdocs/langs/ru_RU/accountancy.lang b/htdocs/langs/ru_RU/accountancy.lang
index aacedda79a3..174d88cdfd1 100644
--- a/htdocs/langs/ru_RU/accountancy.lang
+++ b/htdocs/langs/ru_RU/accountancy.lang
@@ -194,6 +194,8 @@ ChangeBinding=Change the binding
 
 ## Admin
 ApplyMassCategories=Apply mass categories
+AddAccountFromBookKeepingWithNoCategories=Add acccount already used with no categories
+CategoryDeleted=Category for the accounting account has been removed
 
 ## Export
 Exports=Экспорт
@@ -209,6 +211,7 @@ Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution
 Modelcsv_quadratus=Export towards Quadratus QuadraCompta
 Modelcsv_ebp=Export towards EBP
 Modelcsv_cogilog=Export towards Cogilog
+ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
 InitAccountancy=Init accountancy
diff --git a/htdocs/langs/ru_RU/admin.lang b/htdocs/langs/ru_RU/admin.lang
index 3c844477c9f..8563fcec8e2 100644
--- a/htdocs/langs/ru_RU/admin.lang
+++ b/htdocs/langs/ru_RU/admin.lang
@@ -3,26 +3,32 @@ Foundation=Фонд
 Version=Версия
 VersionProgram=Версия программы
 VersionLastInstall=Начальная версия установки
-VersionLastUpgrade=Latest version upgrade
+VersionLastUpgrade=Последнее обновление версии
 VersionExperimental=Экспериментальная
 VersionDevelopment=Разработка
 VersionUnknown=Неизвестно
 VersionRecommanded=Рекомендуемые
 FileCheck=Files integrity checker
-FileCheckDesc=This tool allows you to check the integrity of files of your application, comparing each files with the official ones. You can use this tool to detect if some files were modified by a hacker for example.
+FileCheckDesc=This tool allows you to check the integrity of files and setup of your application, comparing each files with the official ones. 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.
+FileIntegrityIsStrictlyConformedWithReference=Files integrity is strictly conformed with the reference.
+FileIntegrityIsOkButFilesWereAdded=Files integrity check has passed, however some new files were added.
+FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified, removed or added.
+GlobalChecksum=Global checksum
 MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
 LocalSignature=Embedded local signature (less reliable)
 RemoteSignature=Remote distant signature (more reliable)
 FilesMissing=Отсутсвующие файлы
 FilesUpdated=Обновлённые файлы
+FilesModified=Modified Files
+FilesAdded=Added Files
 FileCheckDolibarr=Check integrity of application files
-AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from a certified package
+AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from an official package
 XmlNotFound=Xml Integrity File of application not found
 SessionId=ID сессии
 SessionSaveHandler=Обработчик для сохранения сессий
 SessionSavePath=Хранение сессии локализации
 PurgeSessions=Очистка сессий
-ConfirmPurgeSessions=Do you really want to purge all sessions? This will disconnect every user (except yourself).
+ConfirmPurgeSessions=Вы хотите завершить все сессии? Это действие отключит всех пользователей (кроме вас).
 NoSessionListWithThisHandler=Обработчик сохранения сессий, настроенный в вашем PHP, не позволяет получать список всех открытых сессий.
 LockNewSessions=Заблокировать новые подключения
 ConfirmLockNewSessions=Вы уверены, что хотите ограничить любые новые подключения Dolibarr к себе? Только пользователь <b>%s</b>  будет иметь возможность подключиться после этого.
@@ -40,7 +46,7 @@ InternalUser=Внутренний пользователь
 ExternalUser=Внешний пользователь
 InternalUsers=Внутренние пользователи
 ExternalUsers=Внешние пользователи
-GUISetup=Показать
+GUISetup=Внешний вид
 SetupArea=Раздел настроек
 FormToTestFileUploadForm=Форма для проверки загрузки файлов (в зависимости от настройки)
 IfModuleEnabled=Примечание: "Да" влияет только тогда, когда модуль <b>%s</b> включен
@@ -118,13 +124,13 @@ DaylingSavingTime=Летнее время (пользователь)
 CurrentHour=Время PHP (на PHP-сервере)
 CurrentSessionTimeOut=Тайм-аут текущей сессии
 YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htacces with a line like this "SetEnv TZ Europe/Paris"
-Box=Widget
-Boxes=Widgets
-MaxNbOfLinesForBoxes=Max number of lines for widgets
+Box=Виджет
+Boxes=Виджеты
+MaxNbOfLinesForBoxes=Максимальное количество строк для виджетов
 PositionByDefault=Стандартный порядок
 Position=Позиция
-MenusDesc=Menu managers set content of the two menu bars (horizontal and vertical).
-MenusEditorDesc=The menu editor allows you to define custom menu entries. Use it carefully to avoid instability and permanently unreachable menu entries.<br />Some modules add menu entries (in menu <b>All</b> mostly). If you remove some of these entries by mistake, you can restore them disabling and reenabling the module.
+MenusDesc=Менеджеры меню позволяют настраивать обе панели меню (горизонтальную и вертикальную).
+MenusEditorDesc=Редактор меню позволяет создать собственные пункты в меню. Используйте его осторожно во избежание нестабильной работы dolibar или даже полной недоступности меню. <br />Некоторые модули добавляют собственные пункты меню (В меню <b>Все</b>). Если вы удалили некоторые из пунктов меню по ошибке, вы можете восстановить их путем отключения, и повторного включение модуля.
 MenuForUsers=Меню для пользователей
 LangFile=.lang файл
 System=Система
@@ -132,16 +138,16 @@ SystemInfo=Информация о системе
 SystemToolsArea=Раздел системных настроек
 SystemToolsAreaDesc=Этот раздел предоставляет административные функции. Используйте меню для выбора необходимой функции.
 Purge=Очистить
-PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
-PurgeDeleteLogFile=Delete log file <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data)
+PurgeAreaDesc=Эта страница позволяет вам удалить все файлы созданные или хранящиеся в Dolibarr (временные файлы или все файлы в папке <b>%s</b>). Использование этой возможности не является обязательным. Она полезна при размещении Dolibarr на серверах не позволяющих удалять файлы созданные веб-сервером.
+PurgeDeleteLogFile=Удалить файл с логами <b>%s</b> являющегося системным журналом Dolibarr (без риска потери данных)
+PurgeDeleteTemporaryFiles=Удалить все временные файлы (без риска потери данных)
 PurgeDeleteTemporaryFilesShort=Delete temporary files
-PurgeDeleteAllFilesInDocumentsDir=Удалить все файлы в каталоге <b>%s</b>. Временные файлы, автоархивы базы данных, а также файлы, прикрепленные к элементам (третьими сторонами, счета-фактуры, ...) и загруженные в модуль ECM будут удалены.
+PurgeDeleteAllFilesInDocumentsDir=Удалить все файлы в каталоге <b>%s</b>. Временные файлы, резервные копии базы данных, а также файлы, прикрепленные к элементам (контрагенты, счета-фактуры, ...) и загруженные в модуль ECM (модуль электронного документооборота) будут удалены.
 PurgeRunNow=Очистить сейчас
-PurgeNothingToDelete=No directory or files to delete.
+PurgeNothingToDelete=Нет директории или файла для удаления.
 PurgeNDirectoriesDeleted=Удалено <b>%s</b> файлов или каталогов.
 PurgeAuditEvents=Очистить все события безопасности
-ConfirmPurgeAuditEvents=Are you sure you want to purge all security events? All security logs will be deleted, no other data will be removed.
+ConfirmPurgeAuditEvents=Вы хотите очистить все события связанные с безопасностью? Все журналы безопасности будут удалены, другие данные не будут удалены.
 GenerateBackup=Создать резервную копию
 Backup=Резервное копирование
 Restore=Восстановить
@@ -164,7 +170,7 @@ CommandsToDisableForeignKeysForImportWarning=Обязательно, если в
 ExportCompatibility=Совместимость генерируемого файла экспорта
 MySqlExportParameters=MySQL - параметры экспорта
 PostgreSqlExportParameters= PostgreSQL - параметры экспорта
-UseTransactionnalMode=Использование режима транзакций
+UseTransactionnalMode=Использовать режим транзакций
 FullPathToMysqldumpCommand=Полный путь к команде mysqldump
 FullPathToPostgreSQLdumpCommand=Полный путь к команде pg_dump
 ExportOptions=Настройки экспорта
@@ -173,26 +179,28 @@ AddDropTable=Добавить команду DROP TABLE
 ExportStructure=Структура
 NameColumn=Название столбцов
 ExtendedInsert=Расширенный INSERT
-NoLockBeforeInsert=Нет блокировки команды вокруг INSERT
+NoLockBeforeInsert=Не блокировать команды во время выполнения INSERT
 DelayedInsert=Отложенная вставка
 EncodeBinariesInHexa=Кодировать двоичные данные в шестнадцатеричные
-IgnoreDuplicateRecords=Ignore errors of duplicate record (INSERT IGNORE)
+IgnoreDuplicateRecords= Игнорировать ошибки дублирующихся записей (INSERT IGNORE)
 AutoDetectLang=Автоопределение (язык браузера)
 FeatureDisabledInDemo=Функция отключена в демо -
 FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 Rights=Права
-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 dustbin to disable it.
+BoxesDesc=Виджеты компонентов отображают такую же информацию которую вы можете добавить к персонализированным страницам. Вы можете выбрать между показом виджета или не выбирая целевую страницу нажать "Активировать", или выбрать корзину для отключения.
 OnlyActiveElementsAreShown=Показаны только элементы из <a href="%s">включенных модулей</a>
-ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
-ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
-ModulesMarketPlaces=Еще модули ...
+ModulesDesc=Модули Dolibarr определяют какая функциональность будет доступна в программе. Так же модулям необходимы разрешения которые необходимо предоставить пользователям после включения модуля. Нажмите на on/off для включения или отключения модуля.
+ModulesMarketPlaceDesc=В интернете вы можете найти больше модулей для загрузки...
+ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
+ModulesMarketPlaces=Find external modules...
+GoModuleSetupArea=To deploy/install a new module, go onto the Module setup area at <a href="%s">%s</a>.
 DoliStoreDesc=DoliStore, официальный магазин внешних модулей Dolibarr ERP / CRM
 DoliPartnersDesc=List of companies providing custom developed modules or features (Note: anyone experienced in PHP programming can provide custom development for an open source project)
-WebSiteDesc=Reference websites to find more modules...
+WebSiteDesc=Сайты для поиска дополнительных модулей...
 URL=Ссылка
-BoxesAvailable=Widgets available
-BoxesActivated=Widgets activated
-ActivateOn=Активация по
+BoxesAvailable=Доступные виджеты
+BoxesActivated=Включенные виджеты
+ActivateOn=Активировать
 ActiveOn=Активирован
 SourceFile=Исходный файл
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=Доступно, только если JavaScript не отключен
@@ -200,25 +208,25 @@ Required=Обязательный
 UsedOnlyWithTypeOption=Used by some agenda option only
 Security=Безопасность
 Passwords=Пароли
-DoNotStoreClearPassword=Не хранить пароли в чистом виде в базе данных - хранить зашифрованные значения (Рекомендуем)
+DoNotStoreClearPassword=Не хранить пароли в открытом виде в базе данных - хранить зашифрованные значения (Рекомендуем)
 MainDbPasswordFileConfEncrypted=Зашифровать пароль к базе в conf.php (Рекомендуется)
-InstrucToEncodePass=To have password encoded into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="...";</b><br>by<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
-InstrucToClearPass=To have password decoded (clear) into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="crypted:...";</b><br>by<br><b>$dolibarr_main_db_pass="%s";</b>
-ProtectAndEncryptPdfFiles=Защита генерируемых PDF файлов (НЕ РЕКОМЕНДУЕТСЯ при массовом создании PDF)
-ProtectAndEncryptPdfFilesDesc=Защита PDF документа оставляет его доступным для чтения и печати PDF любым браузером. Вместе с тем, редактирование и копирование запрещается. Заметим, что, использование этой опции делает создание глобального аккумулированного PDF перестает работать (как, неоплаченные счета-фактуры).
-Feature=Особенность
+InstrucToEncodePass=Чтобы поместить зашифрованный пароль в <b>conf.php</b> файл, замените строку <br><b>$dolibarr_main_db_pass ="..."</b><br>на<br><b>$dolibarr_main_db_pass"=crypted:%s"</b>
+InstrucToClearPass=Чтобы поместить не зашифрованный пароль в <b>conf.php</b> файл, замените строку <br><b>$dolibarr_main_db_pass="crypted:..."</b><br>на<br><b>$dolibarr_main_db_pass="%s"</b>
+ProtectAndEncryptPdfFiles=Защита создаваемых PDF файлов (НЕ РЕКОМЕНДУЕТСЯ при массовом создании PDF)
+ProtectAndEncryptPdfFilesDesc=Защита PDF документа оставляет его доступным для чтения и печати PDF любым браузером. Вместе с тем, редактирование и копирование запрещается. Заметим, что из-за использования этой опции создание глобального аккумулированного PDF перестает работать (например неоплаченные счета-фактуры).
+Feature=Возможность
 DolibarrLicense=Лицензия
-Developpers=Разработчики / помощники
+Developpers=Разработчики / авторы
 OfficialWebSite=Международный официальный веб-сайт
 OfficialWebSiteLocal=Local web site (%s)
-OfficialWiki=Dolibarr Wiki
-OfficialDemo=Dolibarr Online Demo
-OfficialMarketPlace=Официальный рынок внешних модулей / дополнений
-OfficialWebHostingService=Связанные сервисы веб-хостинга (облачный хостинг)
+OfficialWiki=Документация Dolibarr на Wiki
+OfficialDemo=Демонстрация возможностей Dolibarr в интернете
+OfficialMarketPlace=Официальный магазин внешних модулей / дополнений
+OfficialWebHostingService=Рекомендуемые сервисы веб-хостинга (облачный хостинг)
 ReferencedPreferredPartners=Предпочитаемые партнёры
 OtherResources=Другие ресурсы
-ForDocumentationSeeWiki=Для документации пользователя или разработчика (Doc, FAQs...),<br> взгляните на Dolibarr Wiki:<br><b><a href="%s" target="_blank">%s</a></b>
-ForAnswersSeeForum=Для любых других вопросов / помощи, вы можете использовать Dolibarr форум:<br><b><a href="%s" target="_blank">%s</b></a>
+ForDocumentationSeeWiki=Для получения документации пользователя или разработчика (документация, часто задаваемые вопросы...),<br> посетите Dolibarr Wiki:<br><b><a href="%s" target="_blank">%s</a></b>
+ForAnswersSeeForum=Для любых других вопросов / помощи, вы можете использовать форум Dolibarr:<br><b><a href="%s" target="_blank">%s</b></a>
 HelpCenterDesc1=Этот раздел может помочь вам получить помощь службы поддержки по Dolibarr.
 HelpCenterDesc2=Некоторые части этого сервиса доступны <b>только на английском языке.</b>
 CurrentMenuHandler=Обработчик текущего меню
@@ -236,69 +244,70 @@ NewByMonth=New by month
 Emails=Электронная почта
 EMailsSetup=Настройки Электронной почты
 EMailsDesc=Эта страница позволяет вам переписать ваши PHP параметры отправки электронной почты. В большинстве случаев на Unix / Linux OS, ваши настройки PHP является правильным, и эти параметры бесполезны.
-MAIN_MAIL_SMTP_PORT=SMTP/SMTPS Порт (По умолчанию в php.ini: <b>%s</b>)
-MAIN_MAIL_SMTP_SERVER=SMTP/SMTPS Host (по умолчанию в php.ini: <b>%s</b>)
+MAIN_MAIL_SMTP_PORT=SMTP/SMTPS порт (По умолчанию в php.ini: <b>%s</b>)
+MAIN_MAIL_SMTP_SERVER=SMTP/SMTPS сервер (по умолчанию в php.ini: <b>%s</b>)
 MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP/SMTPS Порт (Не определен в PHP на Unix-подобных системах)
-MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS Host (Не определен в PHP на Unix-подобных системах)
-MAIN_MAIL_EMAIL_FROM=Отправитель электронной почты для автоматических писем (по умолчанию в php.ini: <b>%s</b>)
-MAIN_MAIL_ERRORS_TO=Отправитель электронной почты, используемый для ошибки возвращает письма, отправленные
-MAIN_MAIL_AUTOCOPY_TO= Отправить систематически скрытые отсылать копии всех послал письма на
-MAIN_DISABLE_ALL_MAILS=Отключение всех сообщений электронной почты отправок (для испытательных целей или Demos)
-MAIN_MAIL_SENDMODE=Метод, используемый для передачи сообщения электронной почты
+MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS сервер (Не определен в PHP на Unix-подобных системах)
+MAIN_MAIL_EMAIL_FROM=Отправитель электронной почты при автоматической отправке писем (по умолчанию в php.ini: <b>%s</b>)
+MAIN_MAIL_ERRORS_TO=Отправитель электронной почты, используемый для возврата ошибочно отправленных писем
+MAIN_MAIL_AUTOCOPY_TO= Скрыто отправлять копии всех отправляемых писем на 
+MAIN_DISABLE_ALL_MAILS=Отключить отправку всей электронной почты (для тестирования или демонстраций)
+MAIN_MAIL_SENDMODE=Метод, используемый для отправки электронной почты
 MAIN_MAIL_SMTPS_ID=SMTP ID, если требуется проверка подлинности
 MAIN_MAIL_SMTPS_PW=SMTP пароль, если требуется проверка подлинности
-MAIN_MAIL_EMAIL_TLS= Использовать TLS (SSL) шифрует
+MAIN_MAIL_EMAIL_TLS= Использовать TLS (SSL) шифрование
 MAIN_MAIL_EMAIL_STARTTLS= Use TLS (STARTTLS) encrypt
-MAIN_DISABLE_ALL_SMS=Отключить все посылки SMS (для тестовых целей или демо)
+MAIN_DISABLE_ALL_SMS=Отключить отправку всех SMS (для тестирования или демонстрации)
 MAIN_SMS_SENDMODE=Метод, используемый для передачи SMS
-MAIN_MAIL_SMS_FROM=По умолчанию отправителю номер телефона для отправки смс
+MAIN_MAIL_SMS_FROM=Номер отправителя для отправки SMS
 MAIN_MAIL_DEFAULT_FROMTYPE=Sender e-mail by default for manual sendings (User email or Company email)
 UserEmail=User email
 CompanyEmail=Company email
-FeatureNotAvailableOnLinux=Функция недоступна на Unix подобных систем. Проверьте ваш Sendmail программы на местном уровне.
-SubmitTranslation=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit your change to www.transifex.com/dolibarr-association/dolibarr/
+FeatureNotAvailableOnLinux=Функция недоступна на Unix подобных систем. Проверьте вашу программу для отправки почты локально.
+SubmitTranslation=Если перевод на этот язык не завершен или вы нашли ошибки, вы можете исправить их отредактировав файлы в папке <b>langs/%s</b> и отправив внесенные изменения на www.transifex.com/dolibarr-association/dolibarr/
 SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or for developers on github.com/Dolibarr/dolibarr.
-ModuleSetup=Модуль установки
+ModuleSetup=Настройка модуля
 ModulesSetup=Настройка модулей
 ModuleFamilyBase=Система
-ModuleFamilyCrm=Клиент Ressource Management (CRM)
+ModuleFamilyCrm=Управление взаимоотношениями с клиентами (CRM)
 ModuleFamilySrm=Supplier Relation Management (SRM)
-ModuleFamilyProducts=Products Management (PM)
-ModuleFamilyHr=Human Resource Management (HR)
+ModuleFamilyProducts=Управление продукцией (PM)
+ModuleFamilyHr=Управление персоналом (HR)
 ModuleFamilyProjects=Проекты / Совместная работа
-ModuleFamilyOther=Другой
-ModuleFamilyTechnic=Multi-модулей инструменты
-ModuleFamilyExperimental=Экспериментальный модуль
+ModuleFamilyOther=Другое
+ModuleFamilyTechnic=Инструменты для массовых модулей
+ModuleFamilyExperimental=Экспериментальные модули
 ModuleFamilyFinancial=Финансовые модули (Бухгалтерия / Казначейство)
-ModuleFamilyECM=ECM
+ModuleFamilyECM=Управление электронным содержимым (ECM)
 ModuleFamilyPortal=Web sites and other frontal application
 ModuleFamilyInterface=Interfaces with external systems
-MenuHandlers=Меню погрузчиков
-MenuAdmin=Меню редактора
-DoNotUseInProduction=Не используйте на Production-версии
-ThisIsProcessToFollow=Это установка для обработки:
-ThisIsAlternativeProcessToFollow=This is an alternative setup to process:
+MenuHandlers=Обработчики меню
+MenuAdmin=Редактор меню
+DoNotUseInProduction=Не используйте в производстве
+ThisIsProcessToFollow=Это шаги для процесса:
+ThisIsAlternativeProcessToFollow=This is an alternative setup to process manually:
 StepNb=Шаг %s
-FindPackageFromWebSite=Найти пакет, который обеспечивает функции вы хотите (например, на официальном веб-сайте %s).
-DownloadPackageFromWebSite=Download package (for example from official web site %s).
-UnpackPackageInDolibarrRoot=Unpack package file into Dolibarr server directory dedicated to external modules: <b>%s</b>
-SetupIsReadyForUse=Установка закончена, и Dolibarr готов к использованию с этого нового компонента.
-NotExistsDirect=Альтернативная root директория не определена.<br>
-InfDirAlt=Начиная с версии 3 стало возможным определение альтернативной root директории. Это позволяет вам хранить в одном и том же месте плагины и пользовательские шаблоны.<br>Просто создайте директорию в root директории Dolibarr (например, custom).<br>
-InfDirExample=<br>затем объявите в файле conf.php<br>$dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='path/of/dolibarr/htdocs/custom'<br>*Эти строки закомментированы с помощью символа "#". Чтобы раскомментировать - просто удалите этот служебный символ.
-YouCanSubmitFile=For this step, you can send package using this tool: Select module file
+FindPackageFromWebSite=Найдите пакет, который обеспечивает функции которые вы хотите (например, на официальном веб-сайте %s).
+DownloadPackageFromWebSite=Скачайте пакет (например, на официальном веб-сайте %s).
+UnpackPackageInDolibarrRoot=Unpack the packaged files into server directory dedicated to Dolibarr: <b>%s</b>
+UnpackPackageInModulesRoot=To deploy/install an external module, unpack the packaged files into the server directory dedicated to modules: <b>%s</b>
+SetupIsReadyForUse=Module deployment is finished. You must however enable and setup the module in your application by going on the page to setup modules: <a href="%s">%s</a>.
+NotExistsDirect=The alternative root directory is not defined to an existing directory.<br>
+InfDirAlt=Since version 3, it is possible to define an alternative root directory. This allows you to store, into a dedicated directory, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
+InfDirExample=<br>Then declare it in the file <strong>conf.php</strong><br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>If these lines are commented with "#", to enable them, just uncomment by removing the "#" character.
+YouCanSubmitFile=На этом шаге вы можете отправить пакет используя этот инструмент: Выберите файл модуля
 CurrentVersion=Текущая версия Dolibarr
-CallUpdatePage=Go to the page that updates the database structure and data: %s.
-LastStableVersion=Latest stable version
-LastActivationDate=Last activation date
+CallUpdatePage=Перейдите на страницу, где вы сможете обновить структуру базы данных и данные: %s.
+LastStableVersion=Последняя стабильная версия
+LastActivationDate=Latest activation date
 UpdateServerOffline=Сервер обновления недоступен
-GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s. <br><b>{000000@x}</b> same as previous but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
+GenericMaskCodes=Вы можете ввести любую цифровую маску. В этой маске можно использовать следующие тэги:<br><b>{000000}</b> соответствующий номер будет увеличиваться для каждого %s. Введите столько нулей сколько соответствует длине счетчика. Счетчик будет заполнен слева нулями в таком количестве как указано в маске. <br><b>{000000+000}</b> как предыдущая, но со смещением на количество справа + знаки начиная с первого %s. <br><b>{000000@x}</b> то же что и предыдущее, но счетчик будет обнулен когда наступит месяц Х (x может быть от 1 до 12, or 0 для использования заранее или налоговый год определен в вашей конфигурации, или 99 для обнуления каждый месяц). Если эта опция используется и х равен 2 или более чем последовательность {yy}{mm} или {yyyy}{mm} это тоже необходимо. <br><b>{dd}</b> день (от 01 до 31).<br><b>{mm}</b> месяц (от 01 до 12).<br><b>{yy}</b>, <b>{yyyy}</b> или <b>{y}</b> год указывается 2, 4 или 1 цифрами. <br>
 GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
-GenericMaskCodes3=Все другие символы в маске останутся нетронутыми. <br> Пространства, не допускается. <br>
-GenericMaskCodes4a=<u>Пример на 99-м% х третья сторона TheCompany сделали 2007-01-31:</u> <br>
-GenericMaskCodes4b=<u>Пример на сторонних из 2007-03-01:</u> <br>
-GenericMaskCodes4c=<u>Например, товар созданный 2007-03-01:</u><br>
-GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> will give <b>0199-ZZZ/31/XXX</b>
+GenericMaskCodes3=Все другие символы в маске останутся нетронутыми. <br>Пробелы не допускается. <br>
+GenericMaskCodes4a=<u>Пример 99-й %s компании контрагента созданной 2007-01-31:</u> <br>
+GenericMaskCodes4b=<u>Пример контрагента созданного 2007-03-01:</u> <br>
+GenericMaskCodes4c=<u>Пример товара созданного 2007-03-01:</u><br>
+GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> получится <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> получится <b>0199-ZZZ/31/XXX</b>
 GenericNumRefModelDesc=Возвращает настраиваемое число в соответствии с заданной маской.
 ServerAvailableOnIPOrPort=Сервер доступен по адресу <b>%s</b> порт <b>%s</b>
 ServerNotAvailableOnIPOrPort=Сервер не доступен по адресу <b>%s</b> порт <b>%s</b>
@@ -306,56 +315,56 @@ DoTestServerAvailability=Тест соединения с сервером
 DoTestSend=Тест отправки
 DoTestSendHTML=Тест отправки HTML
 ErrorCantUseRazIfNoYearInMask=Error, can't use option @ to reset counter each year if sequence {yy} or {yyyy} is not in mask.
-ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Ошибка, не могу использовать опцию @ если последовательность {гг}{мм} или {гггг}{мм} не в маске.
-UMask=UMask параметр для новых файлов на Unix / Linux / BSD файловых системах.
-UMaskExplanation=Этот параметр позволяет определить набор прав по умолчанию для файлов, созданных Dolibarr на сервере (при загрузке, например).<br> Это должно быть восьмеричное значение (например, 0666 означает, читать и писать по каждому). <br> Этот параметр бесполезен на Windows-сервере.
-SeeWikiForAllTeam=Взгляните на вики-странице на полный список всех участников и их организации
+ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Ошибка, не возможно использовать опцию @ если последовательность {yy}{mm} или {yyyy}{mm} не в маске.
+UMask=UMask параметр для новых файлов в файловых системах Unix / Linux / BSD.
+UMaskExplanation=Этот параметр позволяет определить набор прав по умолчанию для файлов, созданных Dolibarr на сервере (при загрузке, например).<br> Это должно быть восьмеричное значение (например, 0666 означает, читать и записывать сможет каждый). <br> Этот параметр бесполезен на Windows-сервере.
+SeeWikiForAllTeam=Посмотрите на вики-странице на полный список всех участников и их организации
 UseACacheDelay= Задержка для кэширования при экспорте в секундах (0 или пусто для отключения кэширования)
-DisableLinkToHelpCenter=Скрыть ссылку <b>"нужна помощь или поддержка"</b> на странице входа
-DisableLinkToHelp=Hide link to online help "<b>%s</b>"
-AddCRIfTooLong=Автоматические переносы отсутсвуют, так что если строка слишком длинная, вы должны самостоятельно ввести перевод строки в textarea.
-ConfirmPurge=Are you sure you want to execute this purge?<br>This will delete definitely all your data files with no way to restore them (ECM files, attached files...).
+DisableLinkToHelpCenter=Скрыть ссылку <b>"нужна помощь или поддержка"</b> на странице авторизации
+DisableLinkToHelp=Скрыть ссылку интернет-справки "<b>%s</b>"
+AddCRIfTooLong=Автоматические переносы отсутствуют, по этому если строка в документе слишком длинная, вы должны самостоятельно выполнить перевод строки в текстовом поле.
+ConfirmPurge=Вы уверены что хотите выполнить эту очистку?<br> Это действие удалит все ваши файлы с данными без возможности восстановления (ECM файлы, прикрепленные файлы...).
 MinLength=Минимальная длина
-LanguageFilesCachedIntoShmopSharedMemory=Файлы .lang, загружены в общей памяти
-ExamplesWithCurrentSetup=Примеры с текущего запуска программы установки
+LanguageFilesCachedIntoShmopSharedMemory=Файлы .lang, загружены в общую памяти
+ExamplesWithCurrentSetup=Примеры с текущими настройками
 ListOfDirectories=Список каталогов с шаблонами OpenDocument
-ListOfDirectoriesForModelGenODT=List of directories containing templates files with OpenDocument format.<br><br>Put here full path of directories.<br>Add a carriage return between eah directory.<br>To add a directory of the GED module, add here <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br>Files in those directories must end with <b>.odt</b> or <b>.ods</b>.
-NumberOfModelFilesFound=Количество найденных файлов-шаблонов в форматах ODT/ODS , найденных в этих папках
-ExampleOfDirectoriesForModelGen=Примеры синтаксиса: <br> C: \\ MYDIR <br> / Главная / MYDIR <br> DOL_DATA_ROOT / рэп / ecmdir
-FollowingSubstitutionKeysCanBeUsed=<br> Чтобы узнать, как создать свой ODT шаблоны документов, прежде чем хранение их в этих каталогах, прочитать вики документации:
+ListOfDirectoriesForModelGenODT=Список каталогов содержащих файлы шаблонов в форматеOpenDocument. <br><br>Укажите здесь полный пусть к каталогу.<br>Каждый каталог с новой строки.<br>Для добавления каталога GED-модулей, добавьте здесь <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br>Файлы в этих каталогах должны заканчиваться символами <b>.odt</b> или <b>.ods</b>.
+NumberOfModelFilesFound=Количество шаблонов в форматах ODT/ODS, найденных в этих папках
+ExampleOfDirectoriesForModelGen=Примеры синтаксиса: <br> C: \\ MYDIR <br> / home / mydir <br> DOL_DATA_ROOT / ecm / ecmdir
+FollowingSubstitutionKeysCanBeUsed=<br> Прежде чем сохранить шаблоны в этих каталогах прочитайте документацию на Wiki чтобы узнать, как создать свой шаблоны ODT документов:
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
-FirstnameNamePosition=Позиция Имя / название
-DescWeather=Следующие фотографии будут показаны на приборной панели, когда число конце действия достигают следующих значений:
-KeyForWebServicesAccess=Ключ к использованию веб-служб (параметр &quot;dolibarrkey&quot; в веб-сервисы)
-TestSubmitForm=Форма входного теста
-ThisForceAlsoTheme=С помощью этого меню менеджера будет также использовать свои собственные темы все, что выбор пользователя. Также в этом меню, менеджер специализируется на смартфонах не работает на всех смартфонов. С помощью другого меню менеджера, если у вас возникли проблемы с вашим.
-ThemeDir=Скины каталог
-ConnectionTimeout=Connexion тайм-аут
+FirstnameNamePosition=Расположение Имени / Фамилиии
+DescWeather=Следующие изображения будут показаны на приборной панели, когда количество последних действий достигнет следующих значений:
+KeyForWebServicesAccess=Ключ к использованию веб-служб (параметр &quot;dolibarrkey&quot; в веб-службах)
+TestSubmitForm=Форма теста ввода
+ThisForceAlsoTheme=Используя этот менеджер меню будет использоваться тема выбранная пользователем. Также этот менеджер меню для смартфонах работает не на всех смартфонах. Используйте другой менеджер меню если у вас возникли проблемы.
+ThemeDir=Каталог тем
+ConnectionTimeout=Время ожидания подключения
 ResponseTimeout=Время ожидания ответа
-SmsTestMessage=Испытание сообщение от __PHONEFROM__ к ​​__PHONETO__
-ModuleMustBeEnabledFirst=Module <b>%s</b> must be enabled first if you need this feature.
+SmsTestMessage=Пробное сообщение от __PHONEFROM__ к ​​__PHONETO__
+ModuleMustBeEnabledFirst=Для использования этой функции необходимо сначала включить модуль <b>%s</b>
 SecurityToken=Ключ для шифрования URL-адресов
-NoSmsEngine=Нет менеджер SMS отправителя доступны. SMS Sender менеджер не установлены по умолчанию распределение (потому что они зависят от внешних поставщиков), но вы можете найти на http://www.dolistore.com
+NoSmsEngine=Нет доступного менеджера SMS-рассылки. По умолчанию менеджер SMS-рассылки не установливаются (потому что они зависят от внешних поставщиков), но вы можете найти его на %s
 PDF=PDF
-PDFDesc=Вы можете настроить каждый глобальные опции, связанные с PDF поколения
-PDFAddressForging=Правила подделать адрес коробки
-HideAnyVATInformationOnPDF=Скрыть все информацию, связанную с НДС на создаваемых PDF
-HideDescOnPDF=Скрыть описания продуктов в генерируемом PDF
-HideRefOnPDF=Скрывать артикул товара на созданном PDF файле
-HideDetailsOnPDF=Hide product lines details on generated PDF
+PDFDesc=Вы можете настроить каждую глобальную опции для создания PDF-файлов
+PDFAddressForging=Правила придумывания почтовых ящиков
+HideAnyVATInformationOnPDF=Скрывать все информацию о НДС в создаваемых PDF-файлах
+HideDescOnPDF=Скрывать описания продуктов в создаваемых PDF-файлах
+HideRefOnPDF=Скрывать артикул товара в создаваемых PDF-файлах
+HideDetailsOnPDF=Скрывать строки с деталями продукции в создаваемых PDF-файлах
 PlaceCustomerAddressToIsoLocation=Use french standard position (La Poste) for customer address position
 Library=Библиотека
-UrlGenerationParameters=Параметры для обеспечения адресов
-SecurityTokenIsUnique=Используйте уникальный параметр securekey для каждого URL
+UrlGenerationParameters=Параметры безопасных URL`ов
+SecurityTokenIsUnique=Использовать уникальный параметр securekey для каждого URL
 EnterRefToBuildUrl=Введите ссылку на объект %s
-GetSecuredUrl=Получить рассчитывается URL
-ButtonHideUnauthorized=Hide buttons to non admin users for unauthorized actions instead of showing greyed disabled buttons
+GetSecuredUrl=Получить рассчитанный URL
+ButtonHideUnauthorized=Скрыть кнопки у пользователей не являющихся администраторами вместо отображения их в отключенном виде
 OldVATRates=Предыдущее значение НДС
 NewVATRates=Новое значение НДС
-PriceBaseTypeToChange=Изменить цены с базой их эталонного значения, определенной на
+PriceBaseTypeToChange=Изменять базовые цены на определенную величину
 MassConvert=Запустить массовое преобразование
-String=String
-TextLong=Текст
+String=Строка
+TextLong=Длинный текст
 Int=Целое
 Float=С плавающей запятой
 DateAndTime=Дата и время
@@ -365,31 +374,31 @@ ExtrafieldPhone = Телефон
 ExtrafieldPrice = Цена
 ExtrafieldMail = Адрес электронной почты
 ExtrafieldUrl = Url
-ExtrafieldSelect = Выбрать список
+ExtrafieldSelect = Выбрать из списка
 ExtrafieldSelectList = Выбрать из таблицы
 ExtrafieldSeparator=Разделитель
 ExtrafieldPassword=Пароль
-ExtrafieldCheckBox=флажок
+ExtrafieldCheckBox=Флажок
 ExtrafieldRadio=Переключатель
 ExtrafieldCheckBoxFromList= Checkbox from table
 ExtrafieldLink=Ссылка на объект
-ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>In order to have the list depending on another :<br>1,value1|parent_list_code:parent_key<br>2,value2|parent_list_code:parent_key
-ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpradio=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
-ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
+ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list :<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list :<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
+ExtrafieldParamHelpcheckbox=Параметры списка имеют ключи, значение<br><br> например : <br>1,значение1<br>2,значение2<br>3,значение3<br>...
+ExtrafieldParamHelpradio=Параметры списка имеют ключи, значение<br><br> например : <br>1,значение1<br>2,значение2<br>3,значение3<br>...
+ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Example : Societe:societe/class/societe.class.php
-LibraryToBuildPDF=Library used for PDF generation
-WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
-LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
+LibraryToBuildPDF=Библиотека используемая для создания PDF-файлов
+WarningUsingFPDF=Осторожно: Ваш <b>conf.php</b> содержит директиву <b>dolibarr_pdf_force_fpdf=1</b>. Это означает что вы используете библиотеку FPDF для создания PDF-файлов. Эта библиотека устарела и не поддерживает часть возможностей (Unicode, прозрачность изображений, кирилиуц, арабские и азиатские языки, ...), таким образом вы можете разочароваться в создании PDF-файлов.<br>Для устранения этого и полной поддержки создания PDF-файлов, скачайте пожалуйста <a href="http://www.tcpdf.org/" target="_blank">библиотеку TCPDF</a>, затем закомментируйте или удалите строку <b>$dolibarr_pdf_force_fpdf=1</b>, и добавьте вместо нее <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
+LocalTaxDesc=Некоторые страны взымают по 2 или 3 налога за каждую позицию в счете. Если у вас это так то выберите второй и третий налог и их ставку. Возможные варианты:<br>1 : местный налог взымается с продукции и услуг без НДС (местный налог вычисляется от суммы до начисления налогов)<br>2 : местный налог взымается с продукции и услуг включая НДС (местный налог вычисляется от суммы + основной налог)<br>3 : местный налог взымается с продукции без НДС (местный налог вычисляется от суммы до начисления налогов)<br>4 : местный налог взымается с продукции включая НДС (местный налог вычисляется от суммы + основной НДС)<br>5: местный налог взымается с услуг без НДС (местный налог вычисляется от суммы до начисления налогов)<br>6: местный налог взымается с услуг включая НДС (местный налог вычисляется от суммы + налог)
 SMS=SMS
-LinkToTestClickToDial=Введите номер телефона для ссылки с целью тестирования ClickToDial  пользователя <strong>%s</strong>
+LinkToTestClickToDial=Введите номер телефона для отображения ссылки с целью проверки ClickToDial-адреса пользователя <strong>%s</strong>
 RefreshPhoneLink=Обновить ссылку
 LinkToTest=Ссылка создана для пользователя <strong>%s</strong> (нажмите на телефонный номер, чтобы протестировать)
 KeepEmptyToUseDefault=Оставьте пустым для использования значения по умолчанию
 DefaultLink=Ссылка по умолчанию
 SetAsDefault=Set as default
-ValueOverwrittenByUserSetup=Предупреждение: это значение может быть перезаписано в настройках пользователя (каждый пользователь может задать свои настройки ссылки clicktodial)
+ValueOverwrittenByUserSetup=Предупреждение: это значение может быть перезаписано в настройках пользователя (каждый пользователь может задать свои настройки ссылки ClickToDial)
 ExternalModule=Внешний модуль - установлен в директорию %s
 BarcodeInitForThirdparties=Массовое создание штрих-кодов для Контрагентов
 BarcodeInitForProductsOrServices=Массовое создание или удаление штрих-кода для Товаров или Услуг
@@ -411,145 +420,146 @@ ModuleCompanyCodePanicum=Возврат порожних бухгалтерск
 ModuleCompanyCodeDigitaria=Бухгалтерия код зависит от третьей стороны кода. Код состоит из символов "С" в первой позиции следуют первые 5 символов сторонних код.
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
-
+WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<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).
+ClickToShowDescription=Click to show description
 # Modules
 Module0Name=Пользователи и группы
-Module0Desc=Управление пользователями и группами 
-Module1Name=Третьи стороны
-Module1Desc=Фирмы и контакты управления
+Module0Desc=Users / Employees and Groups management
+Module1Name=Контрагенты
+Module1Desc=Компании и управление контактами (клиенты, перспективы...)
 Module2Name=Коммерческие
 Module2Desc=Коммерческое управление
 Module10Name=Бухгалтерия
-Module10Desc=Простое управление бухгалтерского учета (счета-фактуры и платежные диспетчерского)
+Module10Desc=Основные бухгалтерские отчеты (журналы, оборот) основанные на содержимом базы данных. Без диспетчеризации.
 Module20Name=Предложения
-Module20Desc=Коммерческие предложения управления
-Module22Name=E-рассылок
-Module22Desc=E-рассылок управления
+Module20Desc=Управление коммерческими предложеними
+Module22Name=Почтовые рассылки
+Module22Desc=Управление почтовыми рассылками
 Module23Name=Энергия
 Module23Desc=Мониторинг потребления энергии
-Module25Name=Приказы клиентов
-Module25Desc=Клиент заказов управления
+Module25Name=Заказы клиентов
+Module25Desc=Управление заказами клиентов
 Module30Name=Счета-фактуры
-Module30Desc=Счета и кредитных нот управления для клиентов. Счета управления для поставщиков
+Module30Desc=Управелние счет-фактурами и кредитными заметками клиентов. Управелние счет-фактурами поставщиков
 Module40Name=Поставщики
-Module40Desc=Поставщики управления и покупки (заказы и счета-фактуры)
+Module40Desc=Управление поставщиками и закупками (заказы и счета-фактуры)
 Module42Name=Журналы
-Module42Desc=Логгинг объекты (журнале)
+Module42Desc=Средства журналирования (файлы, системный журнал, ...)
 Module49Name=Редакторы
-Module49Desc=Редакторы управления
-Module50Name=Продукты
-Module50Desc=Управление продуктами
+Module49Desc=Управления редактором
+Module50Name=Продукция
+Module50Desc=Управление продукцией
 Module51Name=Массовые рассылки
-Module51Desc=Массовые рассылки бумаге управления
+Module51Desc=Управление массовыми бумажными отправлениями
 Module52Name=Акции
-Module52Desc=Акции 'управлению продуктами
+Module52Desc=Управление акциями (продукция)
 Module53Name=Услуги
-Module53Desc=Услуги по управлению
+Module53Desc=Управление услугами
 Module54Name=Контакты/Подписки
 Module54Desc=Управление договорами (услугами или связанными подписками)
 Module55Name=Штрих-коды
-Module55Desc=Штрих-коды управления
+Module55Desc=Управление штрих-кодами
 Module56Name=Телефония
-Module56Desc=Телефония интеграции
-Module57Name=Direct bank payment orders
-Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for european countries.
+Module56Desc=Интеграция телефонии
+Module57Name=Прямые банковские поручения
+Module57Desc=Управление прямыми дебиторскими платежными поручениями. Включая создание SEPA-файлов для европейских стран.
 Module58Name=ClickToDial
-Module58Desc=ClickToDial интеграции
+Module58Desc=Интерация ClickToDial
 Module59Name=Bookmark4u
-Module59Desc=Добавить функцию для создания Bookmark4u внимание со счета Dolibarr
+Module59Desc=Добавить функцию для создания учетных записей Bookmark4u из учетной записи Dolibarr
 Module70Name=Мероприятия
-Module70Desc=Выступления руководства
-Module75Name=Расходы и поездок отмечает
-Module75Desc=Расходы и поездок отмечает управление
-Module80Name=Отправок
-Module80Desc=Отправка и доставка заказов управления
-Module85Name=Банки и денежные
-Module85Desc=Управление банковских счетов или наличными
-Module100Name=ExternalSite
-Module100Desc=Включите любой внешний веб-сайт в меню Dolibarr и просмотреть его в рамку Dolibarr
-Module105Name=Mailman и Sip
-Module105Desc=Mailman или SPIP интерфейс для члена модуля
+Module70Desc=Управление мероприятиями
+Module75Name=Транспортные расходы
+Module75Desc=Управление транспортными расходами
+Module80Name=Отгрузки
+Module80Desc=Управление отгрузкой и доставкой заказов
+Module85Name=Банки и наличные
+Module85Desc=Управление банковскими счетами или наличными
+Module100Name=Внешний сайт
+Module100Desc=Этот модуль добавляет внешний сайт или страницу в меню Dolibarr и отображает его небольшом окне
+Module105Name=Mailman и SPIP
+Module105Desc=Модуль интерфейса для рассылок Mailman или SPIP
 Module200Name=LDAP
 Module200Desc=Синхронизация каталогов LDAP
 Module210Name=PostNuke
-Module210Desc=PostNuke интеграции
+Module210Desc=Интергация с PostNuke
 Module240Name=Экспорт данных
-Module240Desc=Tool to export Dolibarr data (with assistants)
+Module240Desc=Инструмент для экспорта данных Dolibarr  (с ассистентами)
 Module250Name=Импорт данных
-Module250Desc=Tool to import data in Dolibarr  (with assistants)
-Module310Name=Члены
-Module310Desc=Члены фонда управления
-Module320Name=RSS Подача
-Module320Desc=Добавить RSS канал внутри Dolibarr экране страниц
+Module250Desc=Инструмент для импорта данных Dolibarr  (с ассистентами)
+Module310Name=Участники
+Module310Desc=Управление участниками фонда
+Module320Name=RSS-канал
+Module320Desc=Добавление RSS-каналов на страницах Dolibarr
 Module330Name=Закладки
 Module330Desc=Управление закладками
-Module400Name=Проекты/Возможности/Покупка
-Module400Desc=Управление проектами, возможностями или потенциальными клиентами. Вы можете назначить какой-либо элемент (счет, заказ, предложение, посредничество, ...) к проекту и получить вид  в представлении проекта.
-Module410Name=Webcalendar
-Module410Desc=Webcalendar интеграции
+Module400Name=Проекты/Возможности/Потенциальные клиенты
+Module400Desc=Управление проектами, возможностями или потенциальными клиентами. Вы можете назначить какой-либо элемент (счет, заказ, предложение, посредничество, ...) к проекту и видеть в срезе представления проекта.
+Module410Name=Веб-календарь
+Module410Desc=Интеграция веб-календаря
 Module500Name=Специальные расходы
-Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
+Module500Desc=Управление специальными расходами (налоги, социальные или налоговые отчисления, дивиденды)
 Module510Name=Employee contracts and salaries
 Module510Desc=Management of employees contracts, salaries and payments
 Module520Name=Ссуда
 Module520Desc=Управление ссудами
 Module600Name=Уведомления
-Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each third party) or fixed emails
+Module600Desc=Отправка электронных уведомлений (срабатывают при определенных бизнес-событиях) пользователям (настраивается отдельно для каждого пользователя), контрагентам (настраивается для каждого контаргента) или определенных писем
 Module700Name=Пожертвования
-Module700Desc=Пожертвования управления
+Module700Desc=Управление пожертвованиями
 Module770Name=Отчёты о затратах
 Module770Desc=Управление и утверждение отчётов о затратах (на транспорт, еду)
 Module1120Name=Коммерческое предложение поставщика
 Module1120Desc=Запросить у поставщика коммерческое предложение и цены
 Module1200Name=Mantis
-Module1200Desc=Mantis интеграции
-Module1400Name=Бухгалтерия эксперт
-Module1400Desc=Бухгалтерия управления для экспертов (двойная сторон)
+Module1200Desc=Интеграция с Mantis
+Module1400Name=Бухгалтерия
+Module1400Desc=Управление бухгалтерией (двойная бухгалтерия)
 Module1520Name=Создание документов
 Module1520Desc=Mass mail document generation
 Module1780Name=Теги/Категории
-Module1780Desc=Создание  тегов/категорий (товаров, клиентов, поставщиков, контактов или участников)
-Module2000Name=FCKeditor
-Module2000Desc=Allow to edit some text area using an advanced editor (Based on CKEditor)
+Module1780Desc=Создание  тегов/категорий (продукции, клиентов, поставщиков, контактов или участников)
+Module2000Name=Текстовый редактор WYSIWYG
+Module2000Desc=Позволяет редаткировать некоторые текстовые области использую расширенный редактор (основанный на CKEditor)
 Module2200Name=Динамическое ценообразование
 Module2200Desc=Разрешить использовать математические операции для цен
 Module2300Name=Планировщик Cron
 Module2300Desc=Управление запланированными задачами
-Module2400Name=Agenda/Events
-Module2400Desc=Follow events or rendez-vous. Record manual events into Agendas or let application logs automatic events for tracking purposes.
+Module2400Name=События/Повестка дня
+Module2400Desc=Завершенные и предстоящие события. Приложение для автоматического отслеживания событий или записи событий вручную или рандеву.
 Module2500Name=Электронное управление
-Module2500Desc=Сохранение и обмен документами
-Module2600Name=API/Web services (SOAP server)
-Module2600Desc=Enable the Dolibarr SOAP server providing API services
+Module2500Desc=Хранение и обмен документами
+Module2600Name=API/Веб-службы (SOAP-сервер)
+Module2600Desc=Включение Dolibarr SOAP сервера предоставляющего API-сервис
 Module2610Name=API/Web services (REST server)
 Module2610Desc=Enable the Dolibarr REST server providing API services
 Module2660Name=Call WebServices (SOAP client)
 Module2660Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=Gravatar
-Module2700Desc=Использование онлайн Gravatar службы (www.gravatar.com), чтобы показать фото пользователей / участников (нашли с их электронной почты). Необходимость доступа в Интернет
-Module2800Desc=Клиент FTP
+Module2700Desc=Использование интернет-сервиса Gravatar (www.gravatar.com), для отображения фото пользователей / участников (связанных с их электронной почтой). Необходим доступ в Интернет
+Module2800Desc=FTP-клиент
 Module2900Name=GeoIPMaxmind
-Module2900Desc=GeoIP MaxMind возможности преобразования
+Module2900Desc=Подключение к службе GeoIP MaxMind для преобразования IP-адреса в название страны
 Module3100Name=Skype
 Module3100Desc=Add a Skype button into users / third parties / contacts / members cards
 Module4000Name=Отдел кадров
 Module4000Desc=Human resources management
-Module5000Name=Multi-компании
-Module5000Desc=Позволяет управлять несколькими компаниями
+Module5000Name=Группы компаний
+Module5000Desc=Управление группами компаний
 Module6000Name=Бизнес-Процесс
 Module6000Desc=Управление рабочим процессом
 Module10000Name=Websites
 Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server to point to the dedicated directory to have it online on the Internet.
-Module20000Name=Управляение Заявлениями на отпуск
-Module20000Desc=Объявление и проверка заявлений на отпуск работников
+Module20000Name=Заявления на отпуск
+Module20000Desc=Управление заявлениями на отпуск и соблюдение графика отпусков работниками
 Module39000Name=Product lot
 Module39000Desc=Lot or serial number, eat-by and sell-by date management on products
 Module50000Name=PayBox
-Module50000Desc=Модуль предлагает онлайн страницу оплаты с помощью кредитной карты с PayBox
-Module50100Name=Кассовое
-Module50100Desc=Point of sales module (POS).
+Module50000Desc=Модуль предлагает страницу онлайн-оплаты кредитной картой с помощью PayBox
+Module50100Name=Точка продаж
+Module50100Desc=Модуль точки продаж (POS).
 Module50200Name=Paypal
-Module50200Desc=Модуль предлагает онлайн страницу оплаты с помощью кредитной карты с Paypal
+Module50200Desc=Модуль предлагает страницу онлайн-оплаты кредитной картой с помощью Paypal
 Module50400Name=Accounting (advanced)
 Module50400Desc=Бухгалтерия управления для экспертов (двойная сторон)
 Module54000Name=Модуль PrintIPP
@@ -558,137 +568,137 @@ Module55000Name=Poll, Survey or Vote
 Module55000Desc=Module to make online polls, surveys or votes (like Doodle, Studs, Rdvz, ...)
 Module59000Name=Наценки
 Module59000Desc=Модуль управления наценками
-Module60000Name=Комиссионные
-Module60000Desc=Модуль для управления комиссионными
+Module60000Name=Комиссии
+Module60000Desc=Модуль управления комиссиями
 Module63000Name=Ресурсы
 Module63000Desc=Manage resources (printers, cars, room, ...) you can then share into events
-Permission11=Читать счета
+Permission11=Просмотр счетов-фактур клиентов
 Permission12=Создание/Изменение счета-фактуры
-Permission13=Unvalidate счетов
+Permission13=Аннулирование счетов-фактур
 Permission14=Проверка счета-фактуры
 Permission15=Отправить по почте счета-фактуры
-Permission16=Создать оплаты счетов-фактур
+Permission16=Создать платежи счетов-фактур
 Permission19=Удаление счета
-Permission21=Читать коммерческих предложений
-Permission22=Создать / изменить коммерческих предложений
-Permission24=Проверка коммерческих предложений
-Permission25=Отправить коммерческих предложений
-Permission26=Закрыть коммерческих предложений
+Permission21=Просмотр коммерческих предложений
+Permission22=Создать / изменить коммерческие предложения
+Permission24=Проверенные коммерческие предложения
+Permission25=Отправленные коммерческие предложения
+Permission26=Закрые коммерческие предложения
 Permission27=Удалить коммерческих предложений
 Permission28=Экспорт коммерческих предложений
-Permission31=Читать продукции / услуг
-Permission32=Создать / изменить продукцию / услуги
-Permission34=Исключить продукты / услуги
-Permission36=Экспорт товаров / услуг
+Permission31=Просмотр продукции / услуг
+Permission32=Создание / изменение продукции / услуг
+Permission34=Удаленные продукция / услуги
+Permission36=Просмотр / управление скрытой продукцией / услугами
 Permission38=Экспорт продукции
-Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
-Permission42=Создать / изменить проекты, редактировать задачи, для моих проектов
-Permission44=Удаление проектов
+Permission41=Просмотр проектов и задач (общие и мои проекты). Можно так же указать расход времени на поставленные задачи (расписание)
+Permission42=Создание / изменение проектов и задач (общие и мои проекты). Можно так же создать задачи и назначить пользователей для выполнения проекта и задач
+Permission44=Удаление проектов (общих и моих проектов)
 Permission45=Export projects
-Permission61=Читать мероприятий
-Permission62=Создать / изменить мероприятий
-Permission64=Удалить мероприятий
+Permission61=Смотреть мероприятия
+Permission62=Создание / измение мероприятий
+Permission64=Удаление мероприятий
 Permission67=Экспорт мероприятий
-Permission71=Читать участники
-Permission72=Создать / изменить участники
-Permission74=Удалить участники
+Permission71=Смотреть участников
+Permission72=Создать / изменить участников
+Permission74=Удалить участников
 Permission75=Настройка типов участия
-Permission76=Export data
+Permission76=Экспорт данных
 Permission78=Читать подписки
-Permission79=Создать / изменить подписку
-Permission81=Читать заказов клиентов
-Permission82=Создать / изменить заказов клиентов
-Permission84=Проверка клиентов заказы
-Permission86=Отправить заказов клиентов
-Permission87=Закрыть заказов клиентов
+Permission79=Создать / изменить подписки
+Permission81=Читать заказы клиентов
+Permission82=Создать / изменить заказы клиентов
+Permission84=Проверка заказов клиентов
+Permission86=Отправка заказов клиентов
+Permission87=Закрытые заказы клиентов
 Permission88=Отмена заказов клиентов
-Permission89=Удалить заказов клиентов
-Permission91=Read social or fiscal taxes and vat
-Permission92=Create/modify social or fiscal taxes and vat
-Permission93=Delete social or fiscal taxes and vat
-Permission94=Export social or fiscal taxes
-Permission95=Читать сообщения
-Permission101=Читать отправок
-Permission102=Создать / изменить отправок
+Permission89=Удалить заказы клиентов
+Permission91=Смотреть социальные или фискальные отчисления и НДС
+Permission92=Создать / изменить социальные или фискальные отчисления и НДС
+Permission93=Удалить социальные или фискальные отчисления и НДС
+Permission94=Экспорт социальных и фискальных отчислений
+Permission95=Смотреть отчеты
+Permission101=Смотреть отправки
+Permission102=Создать / изменить отправки
 Permission104=Проверка отправок
-Permission106=Экспортировать настройки
-Permission109=Удалить отправок
-Permission111=Читать финансовой отчетности
-Permission112=Создать / изменить / удалить и сравнить сделок
+Permission106=Экспортировать отправки
+Permission109=Удалить отправки
+Permission111=Читать финансовую отчетность
+Permission112=Создать / изменить / удалить и сравнить сделоки
 Permission113=Настройка финансовых учётных записей (создание, изменение категорий)
 Permission114=Согласовать транзакции
-Permission115=Экспортные операции и выписки со счета
+Permission115=Экспорт операций и выписок со счета
 Permission116=Перераспределение средств между счетами
-Permission117=Управление чеки диспетчерского
-Permission121=Читать третьей стороны, связанных с пользователем
-Permission122=Создать / изменить третьих сторон, связанных с пользователем
-Permission125=Удалить третьей стороны, связанных с пользователем
-Permission126=Экспорт третьей стороны
-Permission141=Read all projects and tasks (also private projects i am not contact for)
-Permission142=Create/modify all projects and tasks (also private projects i am not contact for)
-Permission144=Delete all projects and tasks (also private projects i am not contact for)
-Permission146=Читать провайдеров
-Permission147=Читайте статистику
-Permission151=Read direct debit payment orders
-Permission152=Create/modify a direct debit payment orders
-Permission153=Send/Transmit direct debit payment orders
-Permission154=Record Credits/Rejects of direct debit payment orders
-Permission161=Открыть котракты/подписки
+Permission117=Управление диспетчеризацией чеков
+Permission121=Просмотр контрагентов, связанных с пользователем
+Permission122=Создать / изменить контрагентов, связанных с пользователем
+Permission125=Удалить контрагентов, связанных с пользователем
+Permission126=Экспорт контрагентов
+Permission141=Просмотр всех проектов и задач (так же частные проекты в которых я не контактное лицо)
+Permission142=Создать / изменить все проекты и задачи (так же частные проекты в которых я не контактное лицо)
+Permission144=Удалить все проекты и задачи (так же частные проекты в которых я не контактное лицо)
+Permission146=Посмотреть провайдеров
+Permission147=Посмотреть статистику
+Permission151=Посмотреть заказанные прямые дебетные платежи
+Permission152=Создать / изменить заказанные прямые дебетные платежи
+Permission153=Отправка / Передача заказанных прямых дебетовых платежей
+Permission154=Запись Кредитных / Отклоненных прямых дебетовых платежей
+Permission161=Посмотреть котракты/подписки
 Permission162=Создать/изменить котракты/подписки
-Permission163=Активировать усгулу/подписку на контракте
-Permission164=Отключить услугу/подписку на контракте
+Permission163=Активировать услугу/подписку в контракте
+Permission164=Отключить услугу/подписку в контракте
 Permission165=Удалить контракты/подписки
 Permission167=Export contracts
-Permission171=Read trips and expenses (yours and your subordinates)
-Permission172=Создать/изменить поездки и расходы
-Permission173=Удалить поездки и расходы
+Permission171=Посмотреть транспортные расходы (ваши и ваших подчиненных)
+Permission172=Создать/изменить транспортные расходы
+Permission173=Удалить транспортные расходы
 Permission174=Просмотр поездок и расходов
-Permission178=Экспорт поездок и расходов
-Permission180=Читать поставщиков
-Permission181=Читать поставщик заказов
-Permission182=Создать / изменить поставщика заказы
-Permission183=Проверка поставщиком заказов
-Permission184=Одобрить поставщик заказов
-Permission185=Поставновка в заказа или отмена заказов поставщиков
-Permission186=Прием заказов поставщику
-Permission187=Закрыть поставщик заказов
+Permission178=Экспорт транспортных расходов
+Permission180=Посмотреть поставщиков
+Permission181=Посмотреть заказы поставщику
+Permission182=Создать / изменить заказы поставщику
+Permission183=Проверка заказов поставщику
+Permission184=Одобрить заказы поставщику
+Permission185=Заказ или отмена заказов поставщику
+Permission186=Прием заказов поставщика
+Permission187=Закрыть заказы поставщика
 Permission188=Отмена заказов поставщику
-Permission192=Создание линий
-Permission193=Отмена строки
-Permission194=Ознакомьтесь с пропускной способностью линий
+Permission192=Создать строки
+Permission193=Отмена строк
+Permission194=Посмотреть пропускную способность линий
 Permission202=Создать ADSL соединения
 Permission203=Заказ соединения заказов
-Permission204=Заказать подключение
-Permission205=Управление соединениями
-Permission206=Читать соединений
-Permission211=Читать Телефония
-Permission212=Заказ линии
+Permission204=Заказ подключений
+Permission205=Управление подключениями
+Permission206=Посмотреть соединения
+Permission211=Посмотреть Телефонию
+Permission212=Заказ линий
 Permission213=Включить строки
 Permission214=Настройка телефонии
 Permission215=Настройка провайдеров
-Permission221=Читать emailings
-Permission222=Создать / изменить emailings (тема, получателей ...)
-Permission223=Проверка emailings (позволяет посылать)
-Permission229=Удалить emailings
-Permission237=Просмотреть получателей и информацию
+Permission221=Посмотреть отправки электронной почты
+Permission222=Создать / изменить отправки электронной почты (тема, получатели ...)
+Permission223=Проверка отправки электронной почты (разрешение на отправку)
+Permission229=Удалить отправки электронной почты
+Permission237=Посмотреть получателей и информацию
 Permission238=Ручная отправка почты
 Permission239=Удалить почту после подтверждения или отправки
-Permission241=Читать категорий
-Permission242=Создать / изменить категорий
-Permission243=Удаление категории
+Permission241=Посмотреть категории
+Permission242=Создать / изменить категории
+Permission243=Удаление категорий
 Permission244=Посмотреть содержание скрытых категорий
-Permission251=Просмотреть других пользователей и группы
-PermissionAdvanced251=Читайте другие пользователи
-Permission252=Создать / изменить другими пользователями, группами и ваш permisssions
-Permission253=Изменение пароля другого пользователя
+Permission251=Посмотреть других пользователей и группы
+PermissionAdvanced251=Посмотреть других пользователей
+Permission252=Посмотреть права доступа других пользователей
+Permission253=Создание / Изменение других пользователей, групп и прав доступа
 PermissionAdvanced253=Создать / изменить внутренних / внешних пользователей и права доступа
-Permission254=Удалить или запретить другим пользователям
-Permission255=Создать / изменить свою собственную информацию о пользователе
-Permission256=Измените свой собственный пароль
-Permission262=Расширить доступ для всех третьих сторон (не только тех, которые связаны с пользователем). Не эффективны для внешних пользователей (всегда только себя).
+Permission254=Создать / изменить только внешних пользователей
+Permission255=Изменить пароли других пользователей
+Permission256=Удалить или отключить других пользователей
+Permission262=Extend access to all third parties (not only third parties that user is a sale representative).<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 assignement matters).
 Permission271=Читать CA
 Permission272=Читать счета
-Permission273=Номер счета
+Permission273=Выпуск счетов
 Permission281=Читать контакты
 Permission282=Создать / изменить контакты
 Permission283=Удалить контакты
@@ -701,21 +711,21 @@ Permission301=Создать / изменить штрих-коды
 Permission302=Удалить штрих-коды
 Permission311=Читать услуги
 Permission312=Назначить услугу/подписку договору
-Permission331=Читать закладок
+Permission331=Читать закладки
 Permission332=Создать / изменить закладки
 Permission333=Удаление закладок
-Permission341=Прочитайте его собственные разрешения
-Permission342=Создать / изменить свою информацию о пользователях
+Permission341=Посмотреть его собственные разрешения
+Permission342=Создать / изменить собственную информацию о пользователе
 Permission343=Изменить свой пароль
 Permission344=Изменить свои собственные разрешения
-Permission351=Прочитано групп
-Permission352=Прочитано группы разрешений
-Permission353=Создать / изменить групп
-Permission354=Удалить или отключить групп
+Permission351=Посмотреть группы
+Permission352=Посмотреть права доступа групп
+Permission353=Создать / изменить группы
+Permission354=Удалить или отключить группы
 Permission358=Экспорт пользователей
 Permission401=Читать скидки
 Permission402=Создать / изменить скидки
-Permission403=Проверить скидку
+Permission403=Проверить скидки
 Permission404=Удалить скидки
 Permission510=Открыть Зарплаты
 Permission512=Создать/изменить зарплаты
@@ -727,11 +737,11 @@ Permission524=Удалить ссуды
 Permission525=Доступ к калькулятору ссуды
 Permission527=Экспорт ссуд
 Permission531=Читать услуги
-Permission532=Создать / изменить услуг
-Permission534=Удаление услуги
-Permission536=See / Управлять скрытых сервисов
+Permission532=Создать / изменить услуги
+Permission534=Удаление услуг
+Permission536=See / Управлять скрытыми услугами
 Permission538=Экспорт услуг
-Permission701=Читать пожертвований
+Permission701=Читать пожертвования
 Permission702=Создать / изменить пожертвований
 Permission703=Удалить пожертвований
 Permission771=Read expense reports (yours and your subordinates)
@@ -887,7 +897,7 @@ Offset=Сдвиг
 AlwaysActive=Всегда активный
 Upgrade=Обновление
 MenuUpgrade=Обновление / Расширение
-AddExtensionThemeModuleOrOther=Добавить расширение (темы, модули, ...)
+AddExtensionThemeModuleOrOther=Deploy/install external module
 WebServer=Веб-сервер
 DocumentRootServer=Корневой каталог Веб-сервера
 DataRootServer=Каталог фалов данных
@@ -994,7 +1004,7 @@ TriggerAlwaysActive=Триггеры в этом файле, всегда акт
 TriggerActiveAsModuleActive=Триггеры в этом файле действуют как <b>модуль %s</b> включен.
 GeneratedPasswordDesc=Определить здесь правила, которые вы хотите использовать для создания нового пароля если вы спросите иметь Auto сгенерированного пароля
 DictionaryDesc=Insert all reference data. You can add your values to the default.
-ConstDesc=This page allows you to edit all other parameters not available in previous pages. These are mostly reserved parameters for developers or advanced troubleshooting.
+ConstDesc=This page allows you to edit all other parameters not available in previous pages. These are mostly reserved parameters for developers or advanced troubleshooting. For a list of options <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">check here</a>.
 MiscellaneousDesc=All other security related parameters are defined here.
 LimitsSetup=Пределы / Точная настройка
 LimitsDesc=Вы можете определить лимиты, уточнения и optimisations используемой Dolibarr здесь
@@ -1161,10 +1171,6 @@ FreeLegalTextOnOrders=Свободный текст распоряжения
 WatermarkOnDraftOrders=Водяные знаки на черновиках Заказов ("Нет" если пусто)
 ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable
 BANK_ASK_PAYMENT_BANK_DURING_ORDER=Ask for bank account destination of order
-##### Clicktodial #####
-ClickToDialSetup=Нажмите для набора модуля настройки
-ClickToDialUrlDesc=Url called when a click on phone picto is done.  Dans l'url, vous pouvez utiliser les balises<br><b>__PHONETO__</b> qui sera remplacé par le téléphone de l'appelé<br><b>__PHONEFROM__</b> qui sera remplacé par le téléphone de l'appelant (le votre)<br><b>__LOGIN__</b> qui sera remplacé par votre login clicktodial (défini sur votre fiche utilisateur)<br><b>__PASS__</b> qui sera remplacé par votre mot de passe clicktodial (défini sur votre fiche utilisateur).
-##### Bookmark4u #####
 ##### Interventions #####
 InterventionsSetup=Выступления модуль настройки
 FreeLegalTextOnInterventions=Дополнительный текст на документах посредничества
@@ -1296,7 +1302,7 @@ LDAPFieldCompanyExample=Пример: O
 LDAPFieldSid=SID
 LDAPFieldSidExample=Пример: objectsid
 LDAPFieldEndLastSubscription=Дата окончания подписки
-LDAPFieldTitle=Job position
+LDAPFieldTitle=Должность
 LDAPFieldTitleExample=Например, заголовок
 LDAPSetupNotComplete=Установка не завершена (переход на другие вкладки)
 LDAPNoUserOrPasswordProvidedAccessIsReadOnly=Нет администратора или пароль предусмотрено. LDAP доступ будет анонимным и в режиме только для чтения.
@@ -1391,7 +1397,7 @@ SendingsSetup=Отправка модуля настройки
 SendingsReceiptModel=Отправка получения модели
 SendingsNumberingModules=Отправки нумерации модулей
 SendingsAbility=Support shipping sheets for customer deliveries
-NoNeedForDeliveryReceipts=В большинстве случаев отправок поступления используются как бюллетени для заказчика поставки (перечень продуктов для передачи), и бюллетени, которые recevied и подписывается заказчиком. Поэтому поставки продукции квитанции является дублирует функции и редко активирована.
+NoNeedForDeliveryReceipts=In most cases, shipping sheets are used both as sheets for customer deliveries (list of products to send) and sheets that is received and signed by customer. So product deliveries receipts is a duplicated feature and is rarely activated.
 FreeLegalTextOnShippings=Дополнительный текст для поставок
 ##### Deliveries #####
 DeliveryOrderNumberingModules=Продукция Поставки получения нумерации модуль
@@ -1471,7 +1477,11 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Set automatically this default value for type of e
 AGENDA_DEFAULT_FILTER_TYPE=Устанавливать автоматически этот тип события в фильтр поиска для просмотра повестки дня
 AGENDA_DEFAULT_FILTER_STATUS=Устанавливать автоматически этот статус события в фильтр поиска для просмотра повестки дня
 AGENDA_DEFAULT_VIEW=Какую вкладку вы хотите открывать по умолчанию, когда выбираете из меню Повестку дня
-##### ClickToDial #####
+AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
+AGENDA_NOTIFICATION_SOUND=Enable sound notification
+##### Clicktodial #####
+ClickToDialSetup=Нажмите для набора модуля настройки
+ClickToDialUrlDesc=Url called when a click on phone picto is done.  Dans l'url, vous pouvez utiliser les balises<br><b>__PHONETO__</b> qui sera remplacé par le téléphone de l'appelé<br><b>__PHONEFROM__</b> qui sera remplacé par le téléphone de l'appelant (le votre)<br><b>__LOGIN__</b> qui sera remplacé par votre login clicktodial (défini sur votre fiche utilisateur)<br><b>__PASS__</b> qui sera remplacé par votre mot de passe clicktodial (défini sur votre fiche utilisateur).
 ClickToDialDesc=This module allows to make phone numbers clickable. A click on this icon will call make your phone to 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.
 ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
 ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on same computer than the browser, and called when you click on a link in your browser that start 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.
@@ -1499,10 +1509,11 @@ EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint availa
 ##### API ####
 ApiSetup=API module setup
 ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
-ApiProductionMode=Enable production mode (this will activate use of a caches for services management)
+ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
 ApiExporerIs=You can explore the APIs at url
 OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
 ApiKey=Key for API
+WarningAPIExplorerDisabled=The API explorer has been disabled. API explorer is not required to provide API services. It is a tool for developer to find/test REST APIs. If you need this tool, go into setup of module API REST to activate it.
 ##### Bank #####
 BankSetupModule=Банк модуль настройки
 FreeLegalTextOnChequeReceipts=Свободный текст на чеке расписки
@@ -1571,7 +1582,7 @@ BackupDumpWizard=Мастер создания резервной копии б
 SomethingMakeInstallFromWebNotPossible=Установка внешних модулей через веб-интерфейс не возможна по следующей причине:
 SomethingMakeInstallFromWebNotPossible2=По этой причине, описанный здесь процесс апрейгда  - это только шаги, которые может выполнить пользователь с соответствующими правами доступа.
 InstallModuleFromWebHasBeenDisabledByFile=Установка внешних модулей из приложения отключена вашим администратором. Вы должны попросить его удалить файл <strong>%s</strong>, чтобы использовать эту функцию.
-ConfFileMuseContainCustom=Installing an external module from application save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to have option<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
+ConfFileMuseContainCustom=Installing an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
 HighlightLinesColor=Highlight color of the line when the mouse passes over (keep empty for no highlight)
 TextTitleColor=Color of page title
@@ -1601,6 +1612,7 @@ FixTZ=Исправление часового пояса
 FillFixTZOnlyIfRequired=Example: +2 (fill only if problem experienced)
 ExpectedChecksum=Expected Checksum
 CurrentChecksum=Current Checksum
+ForcedConstants=Required constant values
 MailToSendProposal=To send customer proposal
 MailToSendOrder=To send customer order
 MailToSendInvoice=To send customer invoice
@@ -1609,13 +1621,14 @@ MailToSendIntervention=To send intervention
 MailToSendSupplierRequestForQuotation=To send quotation request to supplier
 MailToSendSupplierOrder=To send supplier order
 MailToSendSupplierInvoice=To send supplier invoice
+MailToSendContract=To send a contract
 MailToThirdparty=To send email from third party page
 ByDefaultInList=Show by default on list view
-YouUseLastStableVersion=You use the last stable version
+YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
 TitleExampleForMaintenanceRelease=Example of message you can use to announce this maintenance release (feel free to use it on your web sites)
-ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. You can download it from the download area of http://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.
-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, nor data structure change is present into this version. You can download it from the download area of http://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.
+ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. 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.
+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, nor data structure change is present into 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, you can enter here rule to have price for each level autocalculated according to price of first level, so you will have to enter only price for first level on each product. This page is here to save you time and can be usefull only if your prices for each leve are relative to first level. You can ignore this page in most cases.
 ModelModulesProduct=Templates for product documents
 ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
diff --git a/htdocs/langs/ru_RU/banks.lang b/htdocs/langs/ru_RU/banks.lang
index 340189f6a75..b8f5fd5414c 100644
--- a/htdocs/langs/ru_RU/banks.lang
+++ b/htdocs/langs/ru_RU/banks.lang
@@ -74,13 +74,13 @@ Conciliate=Согласительной
 Conciliation=Согласительная
 ReconciliationLate=Reconciliation late
 IncludeClosedAccount=Включите закрытые счета
-OnlyOpenedAccount=Only open accounts
+OnlyOpenedAccount=Только открыли счета
 AccountToCredit=Счета к кредитам
 AccountToDebit=Счет дебетовать
 DisableConciliation=Отключите функцию примирения для этой учетной записи
 ConciliationDisabled=Согласительный функция отключена
 LinkedToAConciliatedTransaction=Linked to a conciliated entry
-StatusAccountOpened=Открытые
+StatusAccountOpened=Открыты
 StatusAccountClosed=Закрытые
 AccountIdShort=Количество
 LineRecord=Транзакция
diff --git a/htdocs/langs/ru_RU/bills.lang b/htdocs/langs/ru_RU/bills.lang
index ae7b8acb58f..869f56db695 100644
--- a/htdocs/langs/ru_RU/bills.lang
+++ b/htdocs/langs/ru_RU/bills.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - bills
 Bill=Счёт
 Bills=Счета
-BillsCustomers=Счета клиентов
-BillsCustomer=Счёт клиентов
-BillsSuppliers=Счета поставщиков
-BillsCustomersUnpaid=Неоплаченные счета клиентов
-BillsCustomersUnpaidForCompany=Неоплаченные счета-фактуры Покупателю для %s
-BillsSuppliersUnpaid=Неоплаченные счетов-фактуры Поставщиков
-BillsSuppliersUnpaidForCompany=Неоплаченные счета-фактуры поставщика для %s
+BillsCustomers=Счета клиента
+BillsCustomer=Счёт клиента
+BillsSuppliers=Счета поставщика
+BillsCustomersUnpaid=Неоплаченные счета клиента
+BillsCustomersUnpaidForCompany=Unpaid customer invoices for %s
+BillsSuppliersUnpaid=Не оплаченные счета  поставщица
+BillsSuppliersUnpaidForCompany=Unpaid supplier invoices for %s
 BillsLate=Просроченные платежи
 BillsStatistics=Статистика счетов клиентов
 BillsStatisticsSuppliers=Статистика счетов поставщиков
@@ -62,8 +62,8 @@ PaymentsBack=Возвраты платежа
 paymentInInvoiceCurrency=in invoices currency
 PaidBack=Возврат платежа
 DeletePayment=Удалить платеж
-ConfirmDeletePayment=Are you sure you want to delete this payment?
-ConfirmConvertToReduc=Do you want to convert this credit note or deposit 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.
+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.
 SupplierPayments=Платежи Поставщикам
 ReceivedPayments=Полученные платежи
 ReceivedCustomersPayments=Платежи, полученные от покупателей
@@ -78,6 +78,7 @@ PaymentMode=Тип платежа
 PaymentTypeDC=Debit/Credit Card
 PaymentTypePP=PayPal
 IdPaymentMode=Payment type (id)
+CodePaymentMode=Payment type (code)
 LabelPaymentMode=Payment type (label)
 PaymentModeShort=Тип платежа
 PaymentTerm=Условия платежа
@@ -102,9 +103,10 @@ SearchACustomerInvoice=Поиск счета-фактуры Покупателю
 SearchASupplierInvoice=Поиск счета-фактуры Поставщика
 CancelBill=Отменить счет-фактуру
 SendRemindByMail=Отправить напоминание по EMail
-DoPayment=Совершить платеж
-DoPaymentBack=Возвратить платеж
+DoPayment=Enter payment
+DoPaymentBack=Enter refund
 ConvertToReduc=Преобразовать в будущую скидку
+ConvertExcessReceivedToReduc=Convert excess received into future discount
 EnterPaymentReceivedFromCustomer=Ввести платеж, полученный от покупателя
 EnterPaymentDueToCustomer=Произвести платеж за счет Покупателя
 DisabledBecauseRemainderToPayIsZero=Отключено, потому что оставшаяся оплата нулевая
@@ -113,22 +115,24 @@ BillStatus=Статус счета-фактуры
 StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Проект (должен быть подтвержден)
 BillStatusPaid=Оплачен
-BillStatusPaidBackOrConverted=Оплачен или конвертирован в скидку
+BillStatusPaidBackOrConverted=Refund or converted into discount
 BillStatusConverted=Преобразован в скидку
 BillStatusCanceled=Аннулирован
 BillStatusValidated=Подтвержден (необходимо оплатить)
 BillStatusStarted=Начат
 BillStatusNotPaid=Неоплачен
+BillStatusNotRefunded=Not refunded
 BillStatusClosedUnpaid=Закрыт (неоплачен)
 BillStatusClosedPaidPartially=Оплачен (частично)
 BillShortStatusDraft=Проект
 BillShortStatusPaid=Оплачен
-BillShortStatusPaidBackOrConverted=Обработан
+BillShortStatusPaidBackOrConverted=Refund or converted
 BillShortStatusConverted=Обработан
 BillShortStatusCanceled=Аннулирован
 BillShortStatusValidated=Подтвержден
 BillShortStatusStarted=Начат
 BillShortStatusNotPaid=Неоплачен
+BillShortStatusNotRefunded=Not refunded
 BillShortStatusClosedUnpaid=Закрыт
 BillShortStatusClosedPaidPartially=Оплачен (частично)
 PaymentStatusToValidShort=На подтверждении
@@ -149,14 +153,14 @@ NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified
 FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
 NotARecurringInvoiceTemplate=Not a recurring template invoice
 NewBill=Новый счёт
-LastBills=Последние %s счетов-фактур
-LastCustomersBills=Последние %s счетов-фактур Покупателям
-LastSuppliersBills=Последние %s счетов-фактур Поставщиков
+LastBills=Latest %s invoices
+LastCustomersBills=Latest %s customer invoices
+LastSuppliersBills=Latest %s supplier invoices
 AllBills=Все счета-фактуры
 OtherBills=Другие счета-фактуры
 DraftBills=Проекты счетов-фактур
-CustomersDraftInvoices=Проекты счетов-фактур Покупателям
-SuppliersDraftInvoices=Проекты счетов-фактур Поставщиков
+CustomersDraftInvoices=Customer draft invoices
+SuppliersDraftInvoices=Supplier draft invoices
 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>?
@@ -203,7 +207,7 @@ AlreadyPaidNoCreditNotesNoDeposits=Уже оплачен (без кредито
 Abandoned=Брошен
 RemainderToPay=Оставить неоплаченным
 RemainderToTake=Remaining amount to take
-RemainderToPayBack=Remaining amount to pay back
+RemainderToPayBack=Remaining amount to refund
 Rest=В ожидании
 AmountExpected=Заявленная сумма
 ExcessReceived=Полученный излишек
@@ -270,6 +274,7 @@ Deposit=Взнос
 Deposits=Взносы
 DiscountFromCreditNote=Скидка из кредитового авизо %s
 DiscountFromDeposit=Платежи с депозитного счета-фактуры %s
+DiscountFromExcessReceived=Payments from excess received of invoice %s
 AbsoluteDiscountUse=Такой тип кредита может быть использован по счету-фактуре до его подтверждения
 CreditNoteDepositUse=Invoice must be validated to use this kind of credits
 NewGlobalDiscount=Новая фиксированная скидка
@@ -277,8 +282,8 @@ NewRelativeDiscount=Новая относительная скидку
 NoteReason=Примечание / Основание
 ReasonDiscount=Основание
 DiscountOfferedBy=Предоставлена
-DiscountStillRemaining=Остаток скидки
-DiscountAlreadyCounted=Скидка уже рассчитана
+DiscountStillRemaining=Discounts available
+DiscountAlreadyCounted=Discounts already consumed
 BillAddress=Адрес выставления
 HelpEscompte=Эта скидка предоставлена Покупателю за досрочный платеж.
 HelpAbandonBadCustomer=От этой суммы отказался Покупатель (считается плохим клиентом) и она считается чрезвычайной потерей.
@@ -331,10 +336,12 @@ 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
 # PaymentConditions
 Statut=Статус
-PaymentConditionShortRECEP=Немедленно
-PaymentConditionRECEP=Немедленно
+PaymentConditionShortRECEP=Due Upon Receipt
+PaymentConditionRECEP=Due Upon Receipt
 PaymentConditionShort30D=30 дней
 PaymentCondition30D=30 дней
 PaymentConditionShort30DENDMONTH=30 days of month-end
@@ -349,6 +356,14 @@ 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
 FixAmount=Фиксированное значение
 VarAmount=Произвольное значение (%% от суммы)
 # PaymentType
@@ -418,7 +433,7 @@ ChequeDeposits=Оплаты чеками
 Cheques=Чеки
 DepositId=Id deposit
 NbCheque=Number of checks
-CreditNoteConvertedIntoDiscount=Это кредитовое авизо (счет-фактура) было преобразована в %s
+CreditNoteConvertedIntoDiscount=This %s has been converted into %s
 UsBillingContactAsIncoiveRecipientIfExist=Использовать в качестве получателя счета платежный контактный адрес клиента вместо адреса контрагента
 ShowUnpaidAll=Показать все неоплаченные счета-фактуры
 ShowUnpaidLateOnly=Показать только просроченные неоплаченные счета-фактуры
diff --git a/htdocs/langs/ru_RU/boxes.lang b/htdocs/langs/ru_RU/boxes.lang
index 32176c00cd9..ee6f27b91f8 100644
--- a/htdocs/langs/ru_RU/boxes.lang
+++ b/htdocs/langs/ru_RU/boxes.lang
@@ -25,8 +25,8 @@ BoxTitleLastSuppliers=Latest %s recorded suppliers
 BoxTitleLastModifiedSuppliers=Latest %s modified suppliers
 BoxTitleLastModifiedCustomers=Latest %s modified customers
 BoxTitleLastCustomersOrProspects=Latest %s customers or prospects
-BoxTitleLastCustomerBills=Latest %s customer's invoices
-BoxTitleLastSupplierBills=Latest %s supplier's invoices
+BoxTitleLastCustomerBills=Latest %s customer invoices
+BoxTitleLastSupplierBills=Latest %s supplier invoices
 BoxTitleLastModifiedProspects=Latest %s modified prospects
 BoxTitleLastModifiedMembers=Latest %s members
 BoxTitleLastFicheInter=Latest %s modified interventions
@@ -51,12 +51,12 @@ ClickToAdd=Нажмите здесь, чтобы добавить.
 NoRecordedCustomers=Нет зарегистрированных клиентов
 NoRecordedContacts=Нет введенных контактов
 NoActionsToDo=Нет действий для выполнения
-NoRecordedOrders=Нет зарегистрированных заказы покупателей
+NoRecordedOrders=No recorded customer orders
 NoRecordedProposals=Нет зарегистрированных предложений
-NoRecordedInvoices=Нет зарегистрированных счетов-фактур покупателям
-NoUnpaidCustomerBills=Нет неоплаченных счетов-фактур покупателям
-NoUnpaidSupplierBills=Нет неоплаченных счетов-фактур поставщиков
-NoModifiedSupplierBills=Нет введенных счетов-фактур поставщиков
+NoRecordedInvoices=No recorded customer invoices
+NoUnpaidCustomerBills=No unpaid customer invoices
+NoUnpaidSupplierBills=No unpaid supplier invoices
+NoModifiedSupplierBills=No recorded supplier invoices
 NoRecordedProducts=Нет зарегистрированных товаров / услуг
 NoRecordedProspects=Нет зарегистрированных потенциальных клиентов
 NoContractedProducts=Нет законтрактованных товаров / услуг
diff --git a/htdocs/langs/ru_RU/cashdesk.lang b/htdocs/langs/ru_RU/cashdesk.lang
index 32019fcd1c3..d57bc80cda1 100644
--- a/htdocs/langs/ru_RU/cashdesk.lang
+++ b/htdocs/langs/ru_RU/cashdesk.lang
@@ -25,7 +25,7 @@ Difference=Разница
 TotalTicket=Всего билет
 NoVAT=Нет НДС за эту продажу
 Change=Превышение получил
-BankToPay=Пополнять счета
+BankToPay=Account for payment
 ShowCompany=Показать компании
 ShowStock=Показать склад
 DeleteArticle=Нажмите, чтобы удалить эту статью
diff --git a/htdocs/langs/ru_RU/companies.lang b/htdocs/langs/ru_RU/companies.lang
index eeca1816e80..fbb74804e84 100644
--- a/htdocs/langs/ru_RU/companies.lang
+++ b/htdocs/langs/ru_RU/companies.lang
@@ -2,9 +2,9 @@
 ErrorCompanyNameAlreadyExists=Название компании %s уже существует. Выберите другое.
 ErrorSetACountryFirst=Сначала установите страну
 SelectThirdParty=Выберите контрагента
-ConfirmDeleteCompany=Are you sure you want to delete this company and all inherited information?
+ConfirmDeleteCompany=Вы хотите удалить компанию и всю связанную с ней информацию?
 DeleteContact=Удалить контакт
-ConfirmDeleteContact=Are you sure you want to delete this contact and all inherited information?
+ConfirmDeleteContact=Удалить этот контакт и всю связанную с ним информацию?
 MenuNewThirdParty=Новый контрагент
 MenuNewCustomer=Новый покупатель
 MenuNewProspect=Новый потенциальный клиент
@@ -13,8 +13,8 @@ MenuNewPrivateIndividual=Новое физическое лицо
 NewCompany=Новая компания (проспект, покупатель, поставщик)
 NewThirdParty=Новые третьей стороне (проспект, клиента, поставщика)
 CreateDolibarrThirdPartySupplier=Создать контрагента (поставщика)
-CreateThirdPartyOnly=Create thirdpary
-CreateThirdPartyAndContact=Create a third party + a child contact
+CreateThirdPartyOnly=Создать контрагента
+CreateThirdPartyAndContact=Создать контрагента и связанный контакт
 ProspectionArea=Область потенциальных клиентов
 IdThirdParty=Код контрагента
 IdCompany=Код компании
@@ -24,8 +24,8 @@ ThirdPartyContacts=Контакты контрагента
 ThirdPartyContact=Контакт контрагента
 Company=Компания
 CompanyName=Название компании
-AliasNames=Alias name (commercial, trademark, ...)
-AliasNameShort=Alias name
+AliasNames=Название псевдонима (коммерческий, торговая марка, ...)
+AliasNameShort=Название псевдонима
 Companies=Компании
 CountryIsInEEC=Страна входит в состав Европейского экономического сообщества
 ThirdPartyName=Наименование контрагента
@@ -40,7 +40,7 @@ ThirdPartySuppliers=Поставщики
 ThirdPartyType=Тип контрагента
 Company/Fundation=Организация
 Individual=Физическое лицо
-ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
+ToCreateContactWithSameName=Будет автоматически создан контакт/адрес с той информацией которая связывает контрагента с контрагентом. В большинстве случаев, даже если контрагент является физическим лицом, достаточно создать одного контрагента.
 ParentCompany=Материнская компания
 Subsidiaries=Филиалы
 ReportByCustomers=Отчет по клиентам
@@ -49,11 +49,11 @@ CivilityCode=Код корректности
 RegisteredOffice=Зарегистрированный офис
 Lastname=Фамилия
 Firstname=Имя
-PostOrFunction=Job position
+PostOrFunction=Должность
 UserTitle=Название
 Address=Адрес
 State=Штат/Провинция
-StateShort=State
+StateShort=Штат
 Region=Регион
 Country=Страна
 CountryCode=Код страны
@@ -66,7 +66,7 @@ Chat=Чат
 PhonePro=Раб. телефон
 PhonePerso=Личн. телефон
 PhoneMobile=Мобильный
-No_Email=Refuse mass e-mailings
+No_Email=Отклоненные почтовые рассылки
 Fax=Факс
 Zip=Почтовый индекс
 Town=Город
@@ -75,9 +75,13 @@ Poste= Должность
 DefaultLang=Язык по умолчанию
 VATIsUsed=НДС используется
 VATIsNotUsed=НДС не используется
-CopyAddressFromSoc=Fill address with third party address
-ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
-PaymentBankAccount=Payment bank account
+CopyAddressFromSoc=Заполнить адрес из адреса контрагента
+ThirdpartyNotCustomerNotSupplierSoNoRef=Контрагенты не имеющие клиентов или связей, пустые контрагенты
+PaymentBankAccount=Банковские реквизиты
+OverAllProposals=Общее количество предложений
+OverAllOrders=Общее количество заказов
+OverAllInvoices=Общее количество счетов
+OverAllSupplierProposals=Total price requests
 ##### Local Taxes #####
 LocalTax1IsUsed=Использовать второй налог
 LocalTax1IsUsedES= RE используется
@@ -100,7 +104,7 @@ ProfId2Short=Идентификационный номер налогоплат
 ProfId3Short=Код причины постановки на учет
 ProfId4Short=Код общероссийского классификатора предприятий и организаций
 ProfId5Short=Код 5
-ProfId6Short=Prof. id 6
+ProfId6Short=Код 6
 ProfId1=Профессиональный ID 1
 ProfId2=Профессиональный ID 2
 ProfId3=Профессиональный ID 3
@@ -192,7 +196,7 @@ ProfId4IN=Проф Id 4
 ProfId5IN=Проф Id 5
 ProfId6IN=-
 ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
-ProfId2LU=Id. prof. 2 (Business permit)
+ProfId2LU=Id. prof. 2 (Разрешенный бизнес)
 ProfId3LU=-
 ProfId4LU=-
 ProfId5LU=-
@@ -201,7 +205,7 @@ ProfId1MA=Id проф. 1 (RC)
 ProfId2MA=Id проф. 2 (Patente)
 ProfId3MA=Id проф. 3 (IF)
 ProfId4MA=Id проф. 4 (НКСО)
-ProfId5MA=Id. prof. 5 (I.C.E.)
+ProfId5MA=Id проф. 5 (I.C.E.)
 ProfId6MA=-
 ProfId1MX=Проф Id 1 (RFC).
 ProfId2MX=Проф Id 2 (R.. P. ИМСС)
@@ -239,6 +243,10 @@ ProfId3RU=Prof Id 3 (КПП)
 ProfId4RU=Prof Id 4 (ОКПО)
 ProfId5RU=-
 ProfId6RU=-
+ProfId1DZ=RC
+ProfId2DZ=Art.
+ProfId3DZ=NIF
+ProfId4DZ=NIS
 VATIntra=Номер НДС
 VATIntraShort=Номер НДС
 VATIntraSyntaxIsValid=Синтаксис корректен
@@ -263,9 +271,9 @@ AddContactAddress=Создать контакт/адрес
 EditContact=Изменить контакт / адреса
 EditContactAddress=Редактировать контакт/адрес
 Contact=Контакт
-ContactId=Contact id
+ContactId=Идентификатор контакта
 ContactsAddresses=Контакты/Адреса
-FromContactName=Name:
+FromContactName=Имя:
 NoContactDefinedForThirdParty=Не задан контакт для этого контрагента
 NoContactDefined=У этого контрагента не указаны контакты
 DefaultContact=Контакт по умолчанию
@@ -288,17 +296,17 @@ CompanyDeleted=Компания " %s" удалена из базы данных.
 ListOfContacts=Список контактов/адресов
 ListOfContactsAddresses=Список контактов/адресов
 ListOfThirdParties=Список контрагентов
-ShowCompany=Show third party
+ShowCompany=Показать контрагента
 ShowContact=Показать контакт
 ContactsAllShort=Все (без фильтра)
 ContactType=Вид контакт
 ContactForOrders=Контакт заказа
-ContactForOrdersOrShipments=Order's or shipment's contact
+ContactForOrdersOrShipments=Контакты заказов или отгрузок
 ContactForProposals=Контакт потенциального клиента
 ContactForContracts=Контакт договора
 ContactForInvoices=Контакт счета-фактуры
 NoContactForAnyOrder=Этот контакт не является контактом заказа
-NoContactForAnyOrderOrShipments=This contact is not a contact for any order or shipment
+NoContactForAnyOrderOrShipments=Этот контакт не связан с контактом каким-либо заказом или отгрузкой
 NoContactForAnyProposal=Этот контакт не является контактом коммерческого предложения
 NoContactForAnyContract=Этот контакт не является контактом договора
 NoContactForAnyInvoice=Этот контакт не является контактом счета-фактуры
@@ -316,7 +324,7 @@ VATIntraCheckableOnEUSite=Проверка НДС на сайте Европей
 VATIntraManualCheck=Вы также можете проверить его вручную а сайте европейской комиссии <a href="%s" target="_blank">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Проверка невозможна. Сервис проверки не предоставляется государством-членом ЕС (%s).
 NorProspectNorCustomer=Ни потенциальный клиент, ни покупатель
-JuridicalStatus=Legal form
+JuridicalStatus=Организационно-правовая форма
 Staff=Персонал
 ProspectLevelShort=Потенциальный
 ProspectLevel=Потенциальный клиент
@@ -343,12 +351,12 @@ TE_PRIVATE=Физическое лицо
 TE_OTHER=Другое
 StatusProspect-1=Не контактировать
 StatusProspect0=Никогда не общались
-StatusProspect1=To be contacted
+StatusProspect1=Связаться в будущем
 StatusProspect2=Контакт в работе
 StatusProspect3=Контакт осуществлен
 ChangeDoNotContact=Изменить статус на 'Не контактировать'
 ChangeNeverContacted=Изменить статус на 'Никогда не общались'
-ChangeToContact=Change status to 'To be contacted'
+ChangeToContact=Изменить статус на "Связаться в будущем"
 ChangeContactInProcess=Изменить статус на 'Контакт в работе'
 ChangeContactDone=Изменить статус на 'Контакт осуществлен'
 ProspectsByStatus=Потенциальные клиенты по статусу
@@ -357,46 +365,47 @@ ExportCardToFormat=Экспорт карточки в формате
 ContactNotLinkedToCompany=Контакт не связан с каким-либо контрагентом
 DolibarrLogin=Имя пользователя Dolibarr
 NoDolibarrAccess=Нет доступа к Dolibarr
-ExportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
+ExportDataset_company_1=Контрагенты (компании, фонды, физические лица) и свойства
 ExportDataset_company_2=Контакты и свойства
-ImportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
+ImportDataset_company_1=Контрагенты (компании, фонды, физические лица) и свойства
 ImportDataset_company_2=Контакты/Адреса (контрагенты и другие) и атрибуты
 ImportDataset_company_3=Банковские реквизиты
-ImportDataset_company_4=Third parties/Sales representatives (Affect sales representatives users to companies)
+ImportDataset_company_4=Контрагенты/торговые представители (Торговые представители влияющие на компании)
 PriceLevel=Уровень цен
 DeliveryAddress=Адрес доставки
 AddAddress=Добавить адрес
 SupplierCategory=Категория поставщика
-JuridicalStatus200=Independent
+JuridicalStatus200=Независимый
 DeleteFile=Удалить файл
 ConfirmDeleteFile=Вы уверены, что хотите удалить этот файл?
-AllocateCommercial=Assigned to sales representative
+AllocateCommercial=Назначить торгового представителя
 Organization=Организация
 FiscalYearInformation=Информация о финансовом годе
 FiscalMonthStart=Первый месяц финансового года
-YouMustAssignUserMailFirst=You must create email for this user first to be able to add emails notifications for him.
-YouMustCreateContactFirst=To be able to add email notifications, you must first define contacts with valid emails for the third party
+YouMustAssignUserMailFirst=Вы должны создать электронную почту для этого пользователя, тогда вы сможете отправлять ему почтовые уведомления.
+YouMustCreateContactFirst=Для добавления электронных уведомлений вы должны сначала указать действующий email контрагента 
 ListSuppliersShort=Список поставщиков
 ListProspectsShort=Список потенц. клиентов
 ListCustomersShort=Список покупателей
 ThirdPartiesArea=Область контрагентов и контактов
-LastModifiedThirdParties=Latest %s modified third parties
+LastModifiedThirdParties=Недавно изменено %s контрагентов
 UniqueThirdParties=Всего уникальных контрагентов
-InActivity=Открыто
+InActivity=Открыты
 ActivityCeased=Закрыто
-ProductsIntoElements=List of products/services into %s
+ThirdPartyIsClosed=Закрывшиеся контрагенты
+ProductsIntoElements=Список товаров/услуг в %s
 CurrentOutstandingBill=Валюта неуплаченного счёта
 OutstandingBill=Максимальный неуплаченный счёт
-OutstandingBillReached=Max. for outstanding bill reached
+OutstandingBillReached=Достигнут максимум не оплаченных счетов
 MonkeyNumRefModelDesc=Вернуть номер с форматом %syymm-NNNN для кода покупателя и %syymm NNNN-код для кода поставщиков, где yy - это год, мм - месяц и NNNN - непрерывная последовательность без возврата к 0.
 LeopardNumRefModelDesc=Код покупателю/поставщику не присваивается. Он может быть изменен в любое время.
 ManagingDirectors=Имя управляющего или управляющих (Коммерческого директора, директора, президента...)
-MergeOriginThirdparty=Duplicate third party (third party you want to delete)
-MergeThirdparties=Merge third parties
-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 so you will be able to delete the duplicate one.
-ThirdpartiesMergeSuccess=Thirdparties have been merged
-SaleRepresentativeLogin=Login of sales representative
-SaleRepresentativeFirstname=Firstname of sales representative
-SaleRepresentativeLastname=Lastname of sales representative
-ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
-NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
+MergeOriginThirdparty=Копия контрагента (контрагент которого вы хотите удалить)
+MergeThirdparties=Объединить контрагентов
+ConfirmMergeThirdparties=Объединить этих контрагентов в одного? Все связанные объекты (счета, заказы, ...) будут перемещены к текущему контрагенту и можно будет удалить дубликаты.
+ThirdpartiesMergeSuccess=Контрагенты объединены
+SaleRepresentativeLogin=Логин торгового представителя
+SaleRepresentativeFirstname=First name of sales representative
+SaleRepresentativeLastname=Last name of sales representative
+ErrorThirdpartiesMerge=При удалении контрагента возникла ошибка. Пожалуйста проверьте технические отчеты. Изменения отменены.
+NewCustomerSupplierCodeProposed=Код нового клиента или поставщика дублируется.
diff --git a/htdocs/langs/ru_RU/compta.lang b/htdocs/langs/ru_RU/compta.lang
index 268817f7486..cc0699b8b10 100644
--- a/htdocs/langs/ru_RU/compta.lang
+++ b/htdocs/langs/ru_RU/compta.lang
@@ -65,6 +65,7 @@ PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=НДС платеж
 ListPayment=Список платежей
 ListOfCustomerPayments=Список клиентов платежи
+ListOfSupplierPayments=Список поставщиков платежей
 DateStartPeriod=Дата начала периода
 DateEndPeriod=Дата окончания периода
 newLT1Payment=New tax 2 payment
@@ -81,7 +82,7 @@ LT2PaymentES=IRPF оплаты
 LT2PaymentsES=IRPF платежей
 VATPayment=Sales tax payment
 VATPayments=Sales tax payments
-VATRefund=Sales tax refund Refund
+VATRefund=Sales tax refund
 Refund=Refund
 SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Показать оплате НДС
@@ -177,7 +178,7 @@ InvoiceLinesToDispatch=Строки счёта для отправки
 ByProductsAndServices=По продуктам и услугам
 RefExt=Внешняя ссылка
 ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click onto button "%s".
-LinkedOrder=Link to order
+LinkedOrder=Ссылка для заказа
 Mode1=Метод 1
 Mode2=Метод 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>.
@@ -194,7 +195,7 @@ CloneTax=Clone a social/fiscal tax
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
 CloneTaxForNextMonth=Клонировать для следующего месяца
 SimpleReport=Simple report
-AddExtraReport=Extra reports
+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
diff --git a/htdocs/langs/ru_RU/cron.lang b/htdocs/langs/ru_RU/cron.lang
index f8670b91b7e..5ebd75c5fdf 100644
--- a/htdocs/langs/ru_RU/cron.lang
+++ b/htdocs/langs/ru_RU/cron.lang
@@ -1,10 +1,10 @@
 # Dolibarr language file - Source file is en_US - cron
 # About page
 # Right
-Permission23101 = Read Scheduled job
-Permission23102 = Create/update Scheduled job
-Permission23103 = Delete Scheduled job
-Permission23104 = Execute Scheduled job
+Permission23101 = Просмотр Запланированных задач
+Permission23102 = Создать/обновить Запланированную задачу
+Permission23103 = Удалить Запланированную задачу
+Permission23104 = Выполнить запланированную задачу
 # Admin
 CronSetup= Настройки запланированных заданий
 URLToLaunchCronJobs=URL to check and launch qualified cron jobs
@@ -17,14 +17,14 @@ CronMethodDoesNotExists=Class %s does not contains any method %s
 # Menu
 EnabledAndDisabled=Enabled and disabled
 # Page list
-CronLastOutput=Последний вывод команды
-CronLastResult=Последний код возврата команды
+CronLastOutput=Latest run output
+CronLastResult=Latest result code
 CronCommand=Команда
-CronList=Scheduled jobs
+CronList=Запланированные задания
 CronDelete=Удалить запланированные задания
-CronConfirmDelete=Are you sure you want to delete these scheduled jobs ?
+CronConfirmDelete=Are you sure you want to delete these scheduled jobs?
 CronExecute=Launch scheduled job
-CronConfirmExecute=Are you sure you want to execute these scheduled jobs now ?
+CronConfirmExecute=Are you sure you want to execute these scheduled jobs now?
 CronInfo=Модуль запланированных задач позволяет выполнять запланированные задачи
 CronTask=Задание
 CronNone=Никакой
@@ -33,13 +33,13 @@ CronDtEnd=Not after
 CronDtNextLaunch=Следующий запуск
 CronDtLastLaunch=Start date of latest execution
 CronDtLastResult=End date of latest execution
-CronFrequency=Frequency
+CronFrequency=Частота
 CronClass=Class
 CronMethod=Метод
 CronModule=Модуль
 CronNoJobs=Нет зарегистрированных заданий
 CronPriority=Приоритет
-CronLabel=Label
+CronLabel=Наименование
 CronNbRun=Кол-во запусков
 CronMaxRun=Max nb. launch
 CronEach=Каждый
@@ -65,7 +65,7 @@ CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of
 CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
 CronCommandHelp=Команда для выполнения
 CronCreateJob=Создать новое запланированное задание
-CronFrom=From
+CronFrom=От
 # Info
 # Common
 CronType=Job type
diff --git a/htdocs/langs/ru_RU/errors.lang b/htdocs/langs/ru_RU/errors.lang
index 59f789261d6..7f03c4c6803 100644
--- a/htdocs/langs/ru_RU/errors.lang
+++ b/htdocs/langs/ru_RU/errors.lang
@@ -11,6 +11,7 @@ ErrorLoginAlreadyExists=Логин %s уже существует.
 ErrorGroupAlreadyExists=Группа %s уже существует.
 ErrorRecordNotFound=Запись не найдена.
 ErrorFailToCopyFile=Не удалось скопировать файл '<b>%s</b>' в '<b>%s</b>'.
+ErrorFailToCopyDir=Failed to copy directory '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToRenameFile=Не удалось переименовать файл '<b>%s</b>' в '<b>%s</b>'.
 ErrorFailToDeleteFile=Не удается удалить файл '<b>%s</b>'.
 ErrorFailToCreateFile=Не удалось создать файл '<b>%s</b>'
@@ -115,7 +116,7 @@ ErrorNoActivatedBarcode=Нет штрих-кодов типа активиров
 ErrUnzipFails=Невозможно распаковать %s с помощью  ZipArchive
 ErrNoZipEngine=Нет доступного модуля в PHP для распаковки файла %s
 ErrorFileMustBeADolibarrPackage=Файл %s  должен быть архивом zip системы Dolibarr 
-ErrorFileRequired=It takes a package Dolibarr file
+ErrorModuleFileRequired=You must select a Dolibarr module package file
 ErrorPhpCurlNotInstalled=Модуль CURL для PHP  не установлен, он необходим для работы с PayPal
 ErrorFailedToAddToMailmanList=Невозможно добавить запись %s в список %s  системы Mailman или в базу  SPIP
 ErrorFailedToRemoveToMailmanList=Невозможно удалить  запись %s из  списка %s  системы Mailman или  базы  SPIP
@@ -170,14 +171,19 @@ ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
 ErrorFileMustHaveFormat=File must have format %s
 ErrorSupplierCountryIsNotDefined=Страна для данного поставщика не определена. Сначала исправьте это.
 ErrorsThirdpartyMerge=Failed to merge the two records. Request canceled.
-ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enougth for product %s to add it into a new order.
-ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enougth for product %s to add it into a new invoice.
-ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enougth for product %s to add it into a new shipment.
-ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enougth for product %s to add it into a new proposal.
-ErrorFailedToLoadLoginFileForMode=Failed to get the login file for mode '%s'.
+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 bank 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>
 
 # 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.
diff --git a/htdocs/langs/ru_RU/holiday.lang b/htdocs/langs/ru_RU/holiday.lang
index 99c0ae0f19d..e117a2c6e5d 100644
--- a/htdocs/langs/ru_RU/holiday.lang
+++ b/htdocs/langs/ru_RU/holiday.lang
@@ -76,8 +76,9 @@ BoxTitleLastLeaveRequests=Latest %s modified leave requests
 HolidaysMonthlyUpdate=Ежемесячное обновление
 ManualUpdate=Ручное обновление
 HolidaysCancelation=Отмена заявления на отпуск
-EmployeeLastname=Employee lastname
-EmployeeFirstname=Employee firstname
+EmployeeLastname=Employee last name
+EmployeeFirstname=Employee first name
+TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
 
 ## Configuration du Module ##
 LastUpdateCP=Latest automatic update of leaves allocation
diff --git a/htdocs/langs/ru_RU/ldap.lang b/htdocs/langs/ru_RU/ldap.lang
index 83dccfb9bf3..34d3bb4b751 100644
--- a/htdocs/langs/ru_RU/ldap.lang
+++ b/htdocs/langs/ru_RU/ldap.lang
@@ -13,8 +13,8 @@ LDAPUsers=Пользователи в базе данных LDAP
 LDAPFieldStatus=Статус
 LDAPFieldFirstSubscriptionDate=Дата первой подписки
 LDAPFieldFirstSubscriptionAmount=Размер первой подписки
-LDAPFieldLastSubscriptionDate=Дата последней подписки
-LDAPFieldLastSubscriptionAmount=Размер последней подписки
+LDAPFieldLastSubscriptionDate=Latest subscription date
+LDAPFieldLastSubscriptionAmount=Latest subscription amount
 LDAPFieldSkype=Skype id
 LDAPFieldSkypeExample=Example : skypeName
 UserSynchronized=Пользователь синхронизирован
diff --git a/htdocs/langs/ru_RU/mails.lang b/htdocs/langs/ru_RU/mails.lang
index 5c193460d01..6a1f3a68005 100644
--- a/htdocs/langs/ru_RU/mails.lang
+++ b/htdocs/langs/ru_RU/mails.lang
@@ -35,7 +35,7 @@ MailingStatusSentPartialy=Отправлено частично
 MailingStatusSentCompletely=Отправлено полностью
 MailingStatusError=Ошибка
 MailingStatusNotSent=Не отправлено
-MailSuccessfulySent=Электронная почта успешно отправлено (% от S в %s)
+MailSuccessfulySent=Email successfully accepted for delivery (from %s to %s)
 MailingSuccessfullyValidated=Электронная почта успешно подтверждена 
 MailUnsubcribe=Отказаться от рассылки
 MailingStatusNotContact=Не писать
@@ -74,22 +74,28 @@ ResultOfMailSending=Result of mass EMail sending
 NbSelected=Nb selected
 NbIgnored=Nb ignored
 NbSent=Nb 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
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Линия %s в файл
 RecipientSelectionModules=Определяется запросы для получателей выбор
 MailSelectedRecipients=Отобранные получатели
 MailingArea=EMailings области
-LastMailings=Последнее %s emailings
+LastMailings=Latest %s emailings
 TargetsStatistics=Цели статистика
 NbOfCompaniesContacts=Уникальный контактов компаний
 MailNoChangePossible=Получатели для подтверждена электронной почте не может быть изменен
 SearchAMailing=Поиск рассылку
 SendMailing=Отправить по электронной почте
 SendMail=Отправить письмо
-MailingNeedCommand=For security reason, sending an emailing is better when performed from command line. If you have one, ask your server administrator to launch the following command to send the emailing to all recipients:
+SentBy=Прислал
+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=Однако вы можете отправить их в Интернете, добавив параметр MAILING_LIMIT_SENDBYWEB с величиной максимальное количество писем вы хотите отправить на сессии.
-ConfirmSendingEmailing=If you can't or prefer sending them with your www browser, please confirm you are sure you want to send emailing now from your browser?
+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.
 TargetsReset=Очистить список
 ToClearAllRecipientsClickHere=Чтобы очистить получателей список для этого адреса, нажмите кнопку
@@ -144,3 +150,6 @@ AdvTgtCreateFilter=Create filter
 AdvTgtOrCreateNewFilter=Name of new filter
 NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
+OutGoingEmailSetup=Outgoing email setup
+InGoingEmailSetup=Incoming email setup
+
diff --git a/htdocs/langs/ru_RU/main.lang b/htdocs/langs/ru_RU/main.lang
index a2c53c866b4..8488151612d 100644
--- a/htdocs/langs/ru_RU/main.lang
+++ b/htdocs/langs/ru_RU/main.lang
@@ -24,12 +24,12 @@ FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p
 FormatDateHourTextShort=%d %b %Y %H:%M
 FormatDateHourText=%d %B %Y %H:%M
 DatabaseConnection=Подключение к базе данных
-NoTemplateDefined=No template defined for this email type
-AvailableVariables=Available substitution variables
+NoTemplateDefined=Нет шаблона для этого типа писем
+AvailableVariables=Доступны переменные для замены
 NoTranslation=Нет перевода
 NoRecordFound=Запись не найдена
-NoRecordDeleted=No record deleted
-NotEnoughDataYet=Not enough data
+NoRecordDeleted=Нет удаленных записей
+NotEnoughDataYet=Недостаточно данных
 NoError=Нет ошибки
 Error=Ошибка
 Errors=Ошибки
@@ -37,8 +37,8 @@ ErrorFieldRequired=Поле '%s' обязательно для заполнен
 ErrorFieldFormat=Поле '%s' имеет неверное значение
 ErrorFileDoesNotExists=Файл %s не существует
 ErrorFailedToOpenFile=Не удалось открыть файл %s
-ErrorCanNotCreateDir=Cannot create dir %s
-ErrorCanNotReadDir=Cannot read dir %s
+ErrorCanNotCreateDir=Не удалось создать папку %s
+ErrorCanNotReadDir=Не удалось прочитать папку %s
 ErrorConstantNotDefined=Параметр s% не определен
 ErrorUnknown=Неизвестная ошибка
 ErrorSQL=Ошибка SQL
@@ -60,45 +60,47 @@ ErrorSomeErrorWereFoundRollbackIsDone=Были обнаружены некото
 ErrorConfigParameterNotDefined=Параметр <b>%s</b> не определен внутри конфигурационного файла Dolibarr <b>conf.php</b>.
 ErrorCantLoadUserFromDolibarrDatabase=Не удалось найти пользователя <b>%s</b> в базе данных Dolibarr.
 ErrorNoVATRateDefinedForSellerCountry=Ошибка, ставки НДС не установлены для страны '%s'.
-ErrorNoSocialContributionForSellerCountry=Error, no social/fiscal taxes type defined for country '%s'.
+ErrorNoSocialContributionForSellerCountry=Ошибка, не определен тип социальных/налоговых взносов для страны %s.
 ErrorFailedToSaveFile=Ошибка, не удалось сохранить файл.
-ErrorCannotAddThisParentWarehouse=You are trying to add a parent warehouse which is already a child of current one
-NotAuthorized=You are not authorized to do that.
+ErrorCannotAddThisParentWarehouse=Вы пытаетесь добавить родительский склад который является дочерним
+MaxNbOfRecordPerPage=Максимум nb записей на странице
+NotAuthorized=Вы не авторизованы чтобы сделать это.
 SetDate=Установить дату
 SelectDate=Выбрать дату
 SeeAlso=Смотрите также %s
 SeeHere=Посмотрите сюда
+Apply=Применить
 BackgroundColorByDefault=Цвет фона по умолчанию
-FileRenamed=The file was successfully renamed
+FileRenamed=Файл успешно переименован
 FileUploaded=Файл успешно загружен
-FileGenerated=The file was successfully generated
+FileGenerated=Файл успешно создан
 FileWasNotUploaded=Файл выбран как вложение, но пока не загружен. Для этого нажмите "Вложить файл".
 NbOfEntries=Кол-во записей
-GoToWikiHelpPage=Read online help (Internet access needed)
+GoToWikiHelpPage=Читать интернет-справку (необходим доступ к Интернету)
 GoToHelpPage=Читать помощь
 RecordSaved=Запись сохранена
 RecordDeleted=Запись удалена
 LevelOfFeature=Уровень возможностей
 NotDefined=Неопределено
-DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr authentication mode is set to <b>%s</b> in configuration file <b>conf.php</b>.<br>This means that the password database is external to Dolibarr, so changing this field may have no effect.
+DolibarrInHttpAuthenticationSoPasswordUseless=Режим аутентификации Dolibarr установлен в <b>%s</b> в файле конфигурации <b>conf.php</b>. <br>Это означает, что Dolibarr хранит пароли во внешней базе, поэтому изменение этого поля может не помочь.
 Administrator=Администратор
 Undefined=Неопределено
-PasswordForgotten=Password forgotten?
+PasswordForgotten=Забыли пароль?
 SeeAbove=См. выше
 HomeArea=Начальная область
-LastConnexion=Последнее подключение
+LastConnexion=Latest connection
 PreviousConnexion=Предыдущий вход
-PreviousValue=Previous value
+PreviousValue=Предыдущее значение
 ConnectedOnMultiCompany=Подключено к объекту
 ConnectedSince=Подключено с
-AuthenticationMode=Authentication mode
-RequestedUrl=Requested URL
+AuthenticationMode=Режим аутентификации
+RequestedUrl=Запрашиваемый Url
 DatabaseTypeManager=Менеджер типов баз данных
-RequestLastAccessInError=Latest database access request error
-ReturnCodeLastAccessInError=Return code for latest database access request error
-InformationLastAccessInError=Information for latest database access request error
+RequestLastAccessInError=Ошибка при последнем запросе доступа к базе данных
+ReturnCodeLastAccessInError=Код ошибки при последнем запросе доступа к базе данных
+InformationLastAccessInError=Информация по ошибкам при последнем запросе доступа к базе данных
 DolibarrHasDetectedError=Dolibarr обнаружил техническую ошибку
-InformationToHelpDiagnose=This information can be useful for diagnostic purposes
+InformationToHelpDiagnose=Эта информация может помочь при диагностике
 MoreInformation=Подробнее
 TechnicalInformation=Техническая информация
 TechnicalID=Технический идентификатор
@@ -107,7 +109,7 @@ NotePrivate=Примечание (частное)
 PrecisionUnitIsLimitedToXDecimals=Dolibarr был настроен на ограничение точности цены единицы до <b>%s</b> десятых.
 DoTest=Проверка
 ToFilter=Фильтр
-NoFilter=No filter
+NoFilter=Нет фильтра
 WarningYouHaveAtLeastOneTaskLate=Внимание, у вас есть по крайней мере один элемент, который превысил допустимую задержку.
 yes=да
 Yes=Да
@@ -118,7 +120,7 @@ Home=Главная
 Help=Помощь
 OnlineHelp=Он-лайн помощь
 PageWiki=Страница Wiki
-MediaBrowser=Media browser
+MediaBrowser=Обозреватель медиа
 Always=Всегда
 Never=Никогда
 Under=под
@@ -128,7 +130,7 @@ Activate=Активировать
 Activated=Активированный
 Closed=Закрыто
 Closed2=Закрыто
-NotClosed=Not closed
+NotClosed=Не закрыто
 Enabled=Включено
 Deprecated=Устарело
 Disable=Выключить
@@ -136,15 +138,15 @@ Disabled=Выключено
 Add=Добавить
 AddLink=Добавить ссылку
 RemoveLink=Удалить ссылку
-AddToDraft=Add to draft
+AddToDraft=Добавить к черновику
 Update=Обновить
 Close=Закрыть
-CloseBox=Remove widget from your dashboard
+CloseBox=Удалить виджет с главного экрана
 Confirm=Подтвердить
-ConfirmSendCardByMail=Do you really want to send content of this card by mail to <b>%s</b>?
+ConfirmSendCardByMail=Отправить эту карточку на <b>%s</b>?
 Delete=Удалить
 Remove=Удалить
-Resiliate=Terminate
+Resiliate=Завершить
 Cancel=Отмена
 Modify=Изменить
 Edit=Редактировать
@@ -162,7 +164,7 @@ Go=Выполнить
 Run=Выполнить
 CopyOf=Копия
 Show=Показать
-Hide=Hide
+Hide=Скрытый
 ShowCardHere=Показать карточку
 Search=Поиск
 SearchOf=Поиск
@@ -205,8 +207,8 @@ Info=Журнал
 Family=Семья
 Description=Описание
 Designation=Описание
-Model=Doc template
-DefaultModel=Default doc template
+Model=Шаблон документа
+DefaultModel=Шаблон документа по-умолчанию
 Action=Действие
 About=О
 Number=Номер
@@ -220,23 +222,23 @@ NoLogoutProcessWithAuthMode=Нет возможности разрыва сое
 Connection=Войти
 Setup=Настройка
 Alert=Оповещение
-Previous=Предыдущий
-Next=Следующий
+Previous=Назад
+Next=Дальше
 Cards=Карточки
 Card=Карточка
 Now=Сейчас
 HourStart=Час начала
 Date=Дата
 DateAndHour=Дата и час
-DateToday=Today's date
-DateReference=Reference date
+DateToday=Сегодняшняя дата
+DateReference=Рекомендованная дата
 DateStart=Дата начала
 DateEnd=Дата окончания
 DateCreation=Дата создания
-DateCreationShort=Creat. date
+DateCreationShort=Дата создания
 DateModification=Дата изменения
 DateModificationShort=Дата изм.
-DateLastModification=Дата последнего изменения
+DateLastModification=Latest modification date
 DateValidation=Дата проверки
 DateClosing=Дата закрытия
 DateDue=Срок выполнения
@@ -251,10 +253,10 @@ DateBuild=Дата формирования отчета
 DatePayment=Дата оплаты
 DateApprove=Дата утверждения
 DateApprove2=Дата утверждения (повторного)
-UserCreation=Creation user
-UserModification=Modification user
-UserCreationShort=Creat. user
-UserModificationShort=Modif. user
+UserCreation=Создание пользователя
+UserModification=Изменение пользователя
+UserCreationShort=Создан. пользователь
+UserModificationShort=Измен. пользователь
 DurationYear=год
 DurationMonth=месяц
 DurationWeek=неделя
@@ -289,7 +291,7 @@ MonthOfDay=Месяц дня
 HourShort=ч
 MinuteShort=мин.
 Rate=Курс
-CurrencyRate=Currency conversion rate
+CurrencyRate=Текущий уровень конверсии
 UseLocalTax=Включить налог
 Bytes=Байт
 KiloBytes=Килобайт
@@ -312,8 +314,8 @@ UnitPriceHT=Цена за единицу (нетто)
 UnitPriceTTC=Цена за единицу
 PriceU=Цена ед.
 PriceUHT=Цена ед. (нетто)
-PriceUHTCurrency=U.P (currency)
-PriceUTTC=U.P. (inc. tax)
+PriceUHTCurrency=цена (текущая)
+PriceUTTC=Цена ед. (с тарой)
 Amount=Сумма
 AmountInvoice=Сумма счета-фактуры
 AmountPayment=Сумма платежа
@@ -322,12 +324,12 @@ AmountTTCShort=Сумма (вкл-я налог)
 AmountHT=Сумма (без налога)
 AmountTTC=Сумма (вкл-я налог)
 AmountVAT=Сумма НДС
-MulticurrencyAlreadyPaid=Already payed, original currency
-MulticurrencyRemainderToPay=Remain to pay, original currency
-MulticurrencyPaymentAmount=Payment amount, original currency
-MulticurrencyAmountHT=Amount (net of tax), original currency
-MulticurrencyAmountTTC=Amount (inc. of tax), original currency
-MulticurrencyAmountVAT=Amount tax, original currency
+MulticurrencyAlreadyPaid=Уже оплачено, в исходной валюте
+MulticurrencyRemainderToPay=Осталось оплатить, в оригинальной валюте
+MulticurrencyPaymentAmount=Сумма платежа, в оригинальной валюте
+MulticurrencyAmountHT=Сумма (нетто), в исходной валюте
+MulticurrencyAmountTTC=Сумма (брутто), в исходной валюте
+MulticurrencyAmountVAT=Сумма налога, в исходной валюте
 AmountLT1=Сумма налога 2
 AmountLT2=Сумма налога 3
 AmountLT1ES=Сумма RE
@@ -339,11 +341,11 @@ Percentage=Процент
 Total=Всего
 SubTotal=Итого
 TotalHTShort=Всего (без налога)
-TotalHTShortCurrency=Total (net in currency)
+TotalHTShortCurrency=Итого (нетто в текущей валюте)
 TotalTTCShort=Всего (вкл-я налог)
 TotalHT=Всего (без налога)
 TotalHTforthispage=Итог (с вычетом налогов) для этой страницы
-Totalforthispage=Total for this page
+Totalforthispage=Итого для этой страницы
 TotalTTC=Всего (вкл-я налог)
 TotalTTCToYourCredit=Всего (вкл-я налог) с Вашей кредитной
 TotalVAT=Всего НДС
@@ -371,7 +373,7 @@ Status=Статус
 Favorite=Любимые
 ShortInfo=Инфо
 Ref=Ref.
-ExternalRef=Ref. extern
+ExternalRef=Внешний источник
 RefSupplier=Ref. поставщика
 RefPayment=Ref. оплаты
 CommercialProposalsShort=Коммерческие предложения
@@ -382,7 +384,7 @@ ActionsToDoShort=Что сделать
 ActionsDoneShort=Завершены
 ActionNotApplicable=Не применяется
 ActionRunningNotStarted=Не начато
-ActionRunningShort=In progress
+ActionRunningShort=Выполняется
 ActionDoneShort=Завершено
 ActionUncomplete=Не завершено
 CompanyFoundation=Компания/Организация
@@ -394,7 +396,7 @@ ActionsOnMember=События об этом члене
 NActionsLate=% с опозданием
 RequestAlreadyDone=Запрос уже зарегистрован
 Filter=Фильтр
-FilterOnInto=Search criteria '<strong>%s</strong>' into fields %s
+FilterOnInto=Найти критерий '<strong>%s</strong>' в полях %s
 RemoveFilter=Удалить фильтр
 ChartGenerated=Диаграмма сгенерирована
 ChartNotGenerated=Диаграмма не сгенерирована
@@ -432,7 +434,7 @@ Reportings=Отчеты
 Draft=Черновик
 Drafts=Черновики
 Validated=Подтверждено
-Opened=Открытые
+Opened=Открыты
 New=Новый
 Discount=Скидка
 Unknown=Неизвестно
@@ -452,7 +454,7 @@ Datas=Данные
 None=Никакой
 NoneF=Никакой
 Late=Поздно
-LateDesc=Delay to define if a record is late or not depends on your setup. Ask your admin to change delay from menu Home - Setup - Alerts.
+LateDesc=Появится ваша запись с задержкой или без задержки определяется в настройках. Попросите вашего администратора изменить задержку из меню Главная - Настройка - Предупреждения
 Photo=Изображение
 Photos=Изображения
 AddPhoto=Добавить изображение
@@ -460,6 +462,7 @@ DeletePicture=Удалить изображение
 ConfirmDeletePicture=Подтверждаете удаление изображения?
 Login=Войти
 CurrentLogin=Текущий вход
+EnterLoginDetail=Введите данные для входа
 January=Январь
 February=Февраль
 March=Март
@@ -517,8 +520,8 @@ ReportName=Имя отчета
 ReportPeriod=Отчетный период
 ReportDescription=Описание
 Report=Отчет
-Keyword=Keyword
-Origin=Origin
+Keyword=Ключевое слово
+Origin=Оригинальный
 Legend=Легенда
 Fill=Заполнить
 Reset=Сбросить
@@ -534,8 +537,8 @@ FindBug=Сообщить об ошибке
 NbOfThirdParties=Количество контрагентов
 NbOfLines=Количество строк
 NbOfObjects=Количество объектов
-NbOfObjectReferers=Number of related items
-Referers=Related items
+NbOfObjectReferers=Количество связанных элементов
+Referers=Связанные объекты
 TotalQuantity=Общее количество
 DateFromTo=С %s по %s
 DateFrom=С %s
@@ -570,7 +573,7 @@ Priority=Приоритет
 SendByMail=Отправить по электронной почте
 MailSentBy=Отправлено по Email
 TextUsedInTheMessageBody=Текст Email
-SendAcknowledgementByMail=Send confirmation email
+SendAcknowledgementByMail=Отправить подтверждение на электронную почту
 EMail=Электронная почта
 NoEMail=Нет Email
 Email=Адрес электронной почты
@@ -583,26 +586,28 @@ GoBack=Назад
 CanBeModifiedIfOk=Может быть изменено, если корректно
 CanBeModifiedIfKo=Может быть изменено, если ненекорректно
 ValueIsValid=Значение корректено
-ValueIsNotValid=Value is not valid
-RecordCreatedSuccessfully=Record created successfully
+ValueIsNotValid=Значение не действительно
+RecordCreatedSuccessfully=Запись успешно создана
 RecordModifiedSuccessfully=Запись успешно изменена
-RecordsModified=%s record modified
-RecordsDeleted=%s record deleted
+RecordsModified=Изменено %s записей
+RecordsDeleted=%s запись удалена
 AutomaticCode=Автоматический код
 FeatureDisabled=Функция отключена
-MoveBox=Move widget
+MoveBox=Переместить виджет
 Offered=Предложено
 NotEnoughPermissions=У вас нет разрешений на это действие
 SessionName=Имя Сессии
 Method=Метод
 Receive=Получить
-CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
+CompleteOrNoMoreReceptionExpected=Завершено или ничего больше не ожидается
+ExpectedValue=Expected Value
+CurrentValue=Текущее значение
 PartialWoman=Частичное
 TotalWoman=Всего
 NeverReceived=Никогда не получено
 Canceled=Отменено
 YouCanChangeValuesForThisListFromDictionarySetup=Вы можете изменить значения для этого списка из меню Настройки->Словарь
-YouCanSetDefaultValueInModuleSetup=You can set the default value used when creating a new record into module setup
+YouCanSetDefaultValueInModuleSetup=Вы можете настроить значение по-умолчанию используемое при создании новой записи в модуле Настройка
 Color=Цвет
 Documents=Связанные файлы
 Documents2=Документы
@@ -617,13 +622,13 @@ CurrentUserLanguage=Текущий язык
 CurrentTheme=Текущая тема
 CurrentMenuManager=Менеджер текущего меню
 Browser=Браузер
-Layout=Layout
-Screen=Screen
+Layout=Макет
+Screen=Экран
 DisabledModules=Отключенные модули
 For=Для
 ForCustomer=Для клиента
 Signature=Подпись
-DateOfSignature=Date of signature
+DateOfSignature=Дата подписи
 HidePassword=Показать команду со скрытым паролем
 UnHidePassword=Показать реальную команду с открытым паролем
 Root=Корень
@@ -641,7 +646,7 @@ PrintContentArea=Показать страницу для печати обла
 MenuManager=Менеджер меню
 WarningYouAreInMaintenanceMode=Внимание, вы находитесь в режиме обслуживания, так что только пользователю <b>%s</b> разрешено использовать приложение в данный момент.
 CoreErrorTitle=Системная ошибка
-CoreErrorMessage=Sorry, an error occurred. Contact your system administrator to check the logs or disable $dolibarr_main_prod=1 to get more information.
+CoreErrorMessage=Извините, произошла ошибка. Для получения большей информации свяжитесь с системным администратором для проверки технических событий или отключения $dolibarr_main_prod=1.
 CreditCard=Кредитная карта
 FieldsWithAreMandatory=Поля с <b>%s</b> являются обязательными
 FieldsWithIsForPublic=Поля с <b>%s</b> показаны для публичного списка членов. Если вы не хотите этого, проверить поле "публичный".
@@ -667,15 +672,15 @@ NewAttribute=Новый атрибут
 AttributeCode=Код атрибута
 URLPhoto=Адрес фотографии/логотипа
 SetLinkToAnotherThirdParty=Ссылка на другой третьей стороне
-LinkTo=Link to
-LinkToProposal=Link to proposal
-LinkToOrder=Link to order
-LinkToInvoice=Link to invoice
-LinkToSupplierOrder=Link to supplier order
-LinkToSupplierProposal=Link to supplier proposal
-LinkToSupplierInvoice=Link to supplier invoice
-LinkToContract=Link to contract
-LinkToIntervention=Link to intervention
+LinkTo=Ссылка к
+LinkToProposal=Ссылка для предложения
+LinkToOrder=Ссылка для заказа
+LinkToInvoice=Ссылка для счета
+LinkToSupplierOrder=Ссылка для заказа поставщику
+LinkToSupplierProposal=Ссылка для предложения поставщику
+LinkToSupplierInvoice=Ссылка для счета поставщику
+LinkToContract=Ссылка на контакт
+LinkToIntervention=Ссылка на мероприятие
 CreateDraft=Создать проект
 SetToDraft=Назад к черновику
 ClickToEdit=Нажмите, чтобы изменить
@@ -690,19 +695,19 @@ ByDay=Днем
 BySalesRepresentative=По торговым представителем
 LinkedToSpecificUsers=Связан с особым контактом пользователя
 NoResults=Нет результатов
-AdminTools=Admin tools
+AdminTools=Инструменты администратора
 SystemTools=Системные инструменты
 ModulesSystemTools=Настройки модулей
 Test=Тест
 Element=Элемент
 NoPhotoYet=Пока недо доступных изображений
-Dashboard=Dashboard
-MyDashboard=My dashboard
+Dashboard=Начальная страница
+MyDashboard=Моя главная страница
 Deductible=Подлежащий вычету
 from=от
 toward=к
 Access=Доступ
-SelectAction=Select action
+SelectAction=Выбор действия
 HelpCopyToClipboard=Для копировани в буфер обмена используйте Ctrl+C
 SaveUploadedFileWithMask=Сохранить файл на сервер под именем "<strong>%s</strong>" (иначе "%s")
 OriginFileName=Изначальное имя файла
@@ -715,7 +720,7 @@ PublicUrl=Публичная ссылка
 AddBox=Добавить бокс
 SelectElementAndClickRefresh=Выберите элемент и нажмите обновить
 PrintFile=Печать файл %s
-ShowTransaction=Show entry on bank account
+ShowTransaction=Показать транзакцию на банковском счете
 GoIntoSetupToChangeLogo=Используйте Главная-Настройки-Компании для изменения логотипа или  Главная-Настройки-Отображение для того, чтобы его скрыть.
 Deny=Запретить
 Denied=Запрещено
@@ -728,31 +733,33 @@ Mandatory=Обязательно
 Hello=Здравствуйте
 Sincerely=С уважением,
 DeleteLine=Удалить строки
-ConfirmDeleteLine=Are you sure you want to delete this line?
-NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
-TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s records.
-NoRecordSelected=No record selected
-MassFilesArea=Area for files built by mass actions
-ShowTempMassFilesArea=Show area of files built by mass actions
-RelatedObjects=Related Objects
+ConfirmDeleteLine=Вы точно хотите удалить эту строку?
+NoPDFAvailableForDocGenAmongChecked=Нет доступных PDF среди проверяемых записей для создания документов
+TooManyRecordForMassAction=Выделено слишком много записей для массового действия. Массовое действие запрещено для списка из более %s записей.
+NoRecordSelected=Нет выделенных записей
+MassFilesArea=Пространство для массовых действий с файлами
+ShowTempMassFilesArea=Показать область для массовых действий с файлами
+RelatedObjects=Связанные объекты
 ClassifyBilled=Классифицировать счета
 Progress=Прогресс
 ClickHere=Нажмите здесь
-FrontOffice=Front office
+FrontOffice=Дирекция
 BackOffice=Бэк-офис
-View=View
+View=Вид
 Export=Экспорт
 Exports=Экспорт
-ExportFilteredList=Export filtered list
-ExportList=Export list
+ExportFilteredList=Экспорт списка фильтров
+ExportList=Экспорт списка
 Miscellaneous=Разное
 Calendar=Календарь
-GroupBy=Group by...
-ViewFlatList=View flat list
-RemoveString=Remove string '%s'
-SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
-DirectDownloadLink=Direct download link
-Download=Download
+GroupBy=Группировка по...
+ViewFlatList=Вид плоским списком
+RemoveString=Удалить строку '%s'
+SomeTranslationAreUncomplete=Некоторые языки могут быть переведены частично или могут содержать ошибки. Если вы обнаружите их, вы можете исправить языковые файлы зарегистрировавшись на <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
+DirectDownloadLink=Прямая ссылка для загрузки
+Download=Загрузка
+ActualizeCurrency=Обновить текущий курс
+Fiscalyear=Финансовый год
 # Week day
 Monday=Понедельник
 Tuesday=Вторник
@@ -783,29 +790,31 @@ ShortFriday=Пт
 ShortSaturday=Сб
 ShortSunday=Вс
 SelectMailModel=Выбрать шаблон электронного письма
-SetRef=Set ref
-Select2ResultFoundUseArrows=Some results found. Use arrows to select.
-Select2NotFound=No result found
-Select2Enter=Enter
-Select2MoreCharacter=or more character
-Select2MoreCharacters=or more characters
-Select2LoadingMoreResults=Loading more results...
-Select2SearchInProgress=Search in progress...
-SearchIntoThirdparties=Thirdparties
+SetRef=Настроить источник
+Select2ResultFoundUseArrows=Найдено несколько результатов. Используйте стрелки для выбора.
+Select2NotFound=Ничего не найдено
+Select2Enter=Ввод/вход
+Select2MoreCharacter=или больше символов<br /><br /><strong>Синтаксис поиска:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Любые символы</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Начать с</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> Закончить символами</kbd> (ab$)<br />
+Select2MoreCharacters=или больше символов<br /><br /><strong>Синтаксис поиска:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Любые символы</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Начать с</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> Закончить символами</kbd> (ab$)<br />
+Select2LoadingMoreResults=Загрузка результатов...
+Select2SearchInProgress=Поиск в процессе...
+SearchIntoThirdparties=Контрагенты
 SearchIntoContacts=Контакты
 SearchIntoMembers=Участники
 SearchIntoUsers=Пользователи
-SearchIntoProductsOrServices=Products or services
+SearchIntoProductsOrServices=Продукты или услуги
 SearchIntoProjects=Проекты
 SearchIntoTasks=Задание
-SearchIntoCustomerInvoices=Customer invoices
-SearchIntoSupplierInvoices=Supplier invoices
-SearchIntoCustomerOrders=Customer orders
-SearchIntoSupplierOrders=Supplier orders
-SearchIntoCustomerProposals=Customer proposals
-SearchIntoSupplierProposals=Supplier proposals
+SearchIntoCustomerInvoices=Счета клиента
+SearchIntoSupplierInvoices=Счета поставщика
+SearchIntoCustomerOrders=Заказы клиента
+SearchIntoSupplierOrders=Заказы поставщику
+SearchIntoCustomerProposals=Предложения клиенту
+SearchIntoSupplierProposals=Предложения поставщику
 SearchIntoInterventions=Мероприятия
 SearchIntoContracts=Договоры
-SearchIntoCustomerShipments=Customer shipments
+SearchIntoCustomerShipments=Отгрузки клиентам
 SearchIntoExpenseReports=Отчёты о затратах
 SearchIntoLeaves=Отпуска
+
+BulkActions=Bulk actions
diff --git a/htdocs/langs/ru_RU/members.lang b/htdocs/langs/ru_RU/members.lang
index 854b2ba3b63..5fb39e6617e 100644
--- a/htdocs/langs/ru_RU/members.lang
+++ b/htdocs/langs/ru_RU/members.lang
@@ -45,7 +45,7 @@ MemberStatusDraft=Проект (должно быть подтверждено)
 MemberStatusDraftShort=Чтобы проверить
 MemberStatusActive=Удостоверенная (ожидания по подписке)
 MemberStatusActiveShort=Подтвержденные
-MemberStatusActiveLate=срок подписки истек
+MemberStatusActiveLate=Subscription expired
 MemberStatusActiveLateShort=Истек
 MemberStatusPaid=Подписка до даты
 MemberStatusPaidShort=До даты
@@ -136,8 +136,8 @@ DocForAllMembersCards=Создание визитной карточки для
 DocForOneMemberCards=Создание визитной карточки для конкретного члена (формат для вывода на самом деле установки: <b>%s)</b>
 DocForLabels=Создание листов адрес (формат для вывода на самом деле установки: <b>%s)</b>
 SubscriptionPayment=Абонентская плата
-LastSubscriptionDate=Последний день подписки
-LastSubscriptionAmount=Последняя сумма подписки
+LastSubscriptionDate=Latest subscription date
+LastSubscriptionAmount=Latest subscription amount
 MembersStatisticsByCountries=Члены статистику по странам
 MembersStatisticsByState=Члены статистики штата / провинции
 MembersStatisticsByTown=Члены статистики города
@@ -149,7 +149,7 @@ MembersByStateDesc=Этот экран покажет вам статистик
 MembersByTownDesc=Этот экран покажет вам статистику пользователей, город.
 MembersStatisticsDesc=Выберите статистику вы хотите прочитать ...
 MenuMembersStats=Статистика
-LastMemberDate=Дата последнего члена
+LastMemberDate=Latest member date
 Nature=Природа
 Public=Информационные общественности (нет = частных)
 NewMemberbyWeb=Новый участник добавил. В ожидании утверждения
diff --git a/htdocs/langs/ru_RU/orders.lang b/htdocs/langs/ru_RU/orders.lang
index 239a4ae52c8..1c62640e54f 100644
--- a/htdocs/langs/ru_RU/orders.lang
+++ b/htdocs/langs/ru_RU/orders.lang
@@ -16,7 +16,7 @@ SupplierOrder=Для поставщиков
 SuppliersOrders=Поставщики заказ
 SuppliersOrdersRunning=Текущие поставщиков заказов
 CustomerOrder=Для клиентов
-CustomersOrders=Customer orders
+CustomersOrders=Заказы клиента
 CustomersOrdersRunning=Current customer orders
 CustomersOrdersAndOrdersLines=Customer orders and order lines
 OrdersDeliveredToBill=Customer orders delivered to bill
@@ -39,7 +39,7 @@ StatusOrderRefusedShort=Отказался
 StatusOrderBilledShort=Billed
 StatusOrderToProcessShort=Для обработки
 StatusOrderReceivedPartiallyShort=Частично получил
-StatusOrderReceivedAllShort=Все полученные
+StatusOrderReceivedAllShort=Products received
 StatusOrderCanceled=Отменен
 StatusOrderDraft=Проект (должно быть подтверждено)
 StatusOrderValidated=Подтвержденные
@@ -51,7 +51,7 @@ StatusOrderApproved=Утверждено
 StatusOrderRefused=Отказался
 StatusOrderBilled=Billed
 StatusOrderReceivedPartially=Частично получил
-StatusOrderReceivedAll=Все полученные
+StatusOrderReceivedAll=All products received
 ShippingExist=Отгрузки существует
 QtyOrdered=Количество заказанных
 ProductQtyInDraft=Количество товаров в проектах заказов
diff --git a/htdocs/langs/ru_RU/other.lang b/htdocs/langs/ru_RU/other.lang
index 21b85db1173..28a79aa2881 100644
--- a/htdocs/langs/ru_RU/other.lang
+++ b/htdocs/langs/ru_RU/other.lang
@@ -2,6 +2,7 @@
 SecurityCode=Защитный код
 NumberingShort=N°
 Tools=Инструменты
+TMenuTools=Инструменты
 ToolsDesc=All miscellaneous tools not included in other menu entries are collected here.<br /><br />All the tools can be reached in the left menu.
 Birthday=День рождения
 BirthdayDate=Birthday date
@@ -67,14 +68,15 @@ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find her
 PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nYou will find here the shipping __SHIPPINGREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nYou will find here the intervention __FICHINTERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n__PERSONALIZED__\n\n__SIGNATURE__
-DemoDesc=Dolibarr is a compact ERP/CRM supporting several functional modules. A demo showcasing all modules makes no sense as this scenario never occurs. So, several demo profiles are available.
+DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
+ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
 DemoFundation=Управление членов Фонда
 DemoFundation2=Управление членами и банковские счета Фонда
-DemoCompanyServiceOnly=Управление внештатным деятельности службы только в продаже
+DemoCompanyServiceOnly=Company or freelance selling service only
 DemoCompanyShopWithCashDesk=Работа магазина в кассу
-DemoCompanyProductAndStocks=Управление небольшой или средней компании продавать продукцию
-DemoCompanyAll=Управление небольшой или средней компании с несколькими деятельности (все основные модули)
+DemoCompanyProductAndStocks=Company selling products with a shop
+DemoCompanyAll=Company with multiple activities (all main modules)
 CreatedBy=Создан %s
 ModifiedBy=Модифицированное% по S
 ValidatedBy=Подтверждено %s
diff --git a/htdocs/langs/ru_RU/products.lang b/htdocs/langs/ru_RU/products.lang
index c825493d37c..375102352f6 100644
--- a/htdocs/langs/ru_RU/products.lang
+++ b/htdocs/langs/ru_RU/products.lang
@@ -5,6 +5,8 @@ ProductLabelTranslated=Translated product label
 ProductDescriptionTranslated=Translated product description
 ProductNoteTranslated=Translated product note
 ProductServiceCard=Карточка Товаров/Услуг
+TMenuProducts=Товары
+TMenuServices=Услуги
 Products=Товары
 Services=Услуги
 Product=Товар
@@ -58,7 +60,7 @@ SellingPrice=Продажная цена
 SellingPriceHT=Продажная цена (за вычетом налогов)
 SellingPriceTTC=Продажная цена (вкл. налоги)
 CostPriceDescription=This price (net of tax) can be used to store the average amount this product cost to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
-CostPriceUsage=In a future version, this value could be used for margin calculation.
+CostPriceUsage=This value could be used for margin calculation.
 SoldAmount=Sold amount
 PurchasedAmount=Purchased amount
 NewPrice=Новая цена
@@ -140,6 +142,7 @@ ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b>?
 CloneContentProduct=Клон все основные данные о продукции / услуг
 ClonePricesProduct=Клон основные данные и цены
 CloneCompositionProduct=Clone packaged product/service
+CloneCombinationsProduct=Clone product variants
 ProductIsUsed=Этот продукт используется
 NewRefForClone=Ссылка нового продукта / услуги
 SellingPrices=Selling prices
@@ -236,7 +239,7 @@ GlobalVariables=Глобальные переменные
 VariableToUpdate=Variable to update
 GlobalVariableUpdaters=Обновители глобальных переменных
 UpdateInterval=Интервал обновления (в минутах)
-LastUpdated=Последнее обновление
+LastUpdated=Latest update
 CorrectlyUpdated=Правильно обновлено
 PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
 PropalMergePdfProductChooseFile=Select PDF files
@@ -256,4 +259,41 @@ VolumeUnits=Volume unit
 SizeUnits=Size unit
 DeleteProductBuyPrice=Delete buying price
 ConfirmDeleteProductBuyPrice=Are you sure you want to delete this buying price?
+SubProduct=Sub product
 
+#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
+ProductCombinations=Variants
+HideProductCombinations=Hide products variant in the products selector
+ProductCombination=Variant
+NewProductCombination=New variant
+EditProductCombination=Editing variant
+ProductCombinationGenerator=Variants generator
+Features=Features
+PriceImpact=Price impact
+WeightImpact=Weight impact
+NewProductAttribute=Новый атрибут
+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
+PercentageVariation=Percentage variation
+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 child products
+ConfirmCloneProductCombinations=Would you like to copy all the product variant to the 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
diff --git a/htdocs/langs/ru_RU/projects.lang b/htdocs/langs/ru_RU/projects.lang
index 552e6e23c16..52985ce2487 100644
--- a/htdocs/langs/ru_RU/projects.lang
+++ b/htdocs/langs/ru_RU/projects.lang
@@ -29,9 +29,9 @@ DeleteAProject=Удаление проекта
 DeleteATask=Удалить задание
 ConfirmDeleteAProject=Are you sure you want to delete this project?
 ConfirmDeleteATask=Are you sure you want to delete this task?
-OpenedProjects=Open projects
-OpenedTasks=Open tasks
-OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
+OpenedProjects=Opened projects
+OpenedTasks=Opened tasks
+OpportunitiesStatusForOpenedProjects=Opportunities amount of opened projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=Показать проекта
 SetProject=Комплекс проектов
@@ -47,7 +47,7 @@ TaskTimeSpent=Время, потраченное на задачи
 TaskTimeUser=Пользователь
 TaskTimeNote=Заметка
 TaskTimeDate=Дата
-TasksOnOpenedProject=Tasks on open projects
+TasksOnOpenedProject=Задачи на открытых проектах
 WorkloadNotDefined=Рабочая нагрузка не задана
 NewTimeSpent=Новое время
 MyTimeSpent=Мое время
@@ -58,6 +58,7 @@ TaskDateEnd=Дата завершения задачи
 TaskDescription=Описание задачи
 NewTask=Новые задачи
 AddTask=Создать задачу
+AddTimeSpent=Create time spent
 Activity=Мероприятие
 Activities=Задачи / мероприятия
 MyActivities=Мои задачи / мероприятия
@@ -95,6 +96,7 @@ ValidateProject=Проверка Projet
 ConfirmValidateProject=Are you sure you want to validate this project?
 CloseAProject=Закрыть проект
 ConfirmCloseAProject=Are you sure you want to close this project?
+AlsoCloseAProject=Also close project (keep it open if you still need to follow production tasks on it)
 ReOpenAProject=Открытый проект
 ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=Проект контакты
@@ -120,7 +122,7 @@ CloneProjectFiles=Дублировать файлы, связанные с пр
 CloneTaskFiles=Клонировать задачу (задачи), объединять файлы (если задача клонирована)
 CloneMoveDate=Update project/tasks dates from now?
 ConfirmCloneProject=Are you sure to clone this project?
-ProjectReportDate=Изменить дату задачи в соответствии с датой начала проекта
+ProjectReportDate=Change task dates according to new project start date
 ErrorShiftTaskDate=Невозможно сдвинуть дату задачи по причине новой даты начала проекта
 ProjectsAndTasksLines=Проекты и задачи
 ProjectCreatedInDolibarr=Проект %s создан
@@ -153,7 +155,7 @@ DocumentModelBeluga=Project template for linked objects overview
 DocumentModelBaleine=Project report template for tasks
 PlannedWorkload=Запланированная нагрузка
 PlannedWorkloadShort=Рабочая нагрузка
-ProjectReferers=Related items
+ProjectReferers=Связанные элементы
 ProjectMustBeValidatedFirst=Проект должен быть сначала подтверждён
 FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
 InputPerDay=Ввод по дням
@@ -177,9 +179,9 @@ ProjectsStatistics=Statistics on projects/leads
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 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.
-OpenedProjectsByThirdparties=Open projects by thirdparties
+OpenedProjectsByThirdparties=Opened projects by thirdparties
 OnlyOpportunitiesShort=Only opportunities
-OpenedOpportunitiesShort=Open opportunities
+OpenedOpportunitiesShort=Opened opportunities
 NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount
diff --git a/htdocs/langs/ru_RU/propal.lang b/htdocs/langs/ru_RU/propal.lang
index 484239fd55a..112f28d1ba5 100644
--- a/htdocs/langs/ru_RU/propal.lang
+++ b/htdocs/langs/ru_RU/propal.lang
@@ -3,7 +3,7 @@ Proposals=Коммерческие предложения
 Proposal=Коммерческое предложение
 ProposalShort=Предложение
 ProposalsDraft=Проект коммерческого предложения
-ProposalsOpened=Открытые коммерческие предложения
+ProposalsOpened=Открытие коммерческих предложений
 Prop=Коммерческие предложения
 CommercialProposal=Коммерческое предложение
 ProposalCard=Карточка предложения
@@ -26,9 +26,9 @@ AmountOfProposalsByMonthHT=Сумма в месяц (за вычетом нал
 NbOfProposals=Количество коммерческих предложений
 ShowPropal=Показать предложение
 PropalsDraft=Черновики
-PropalsOpened=Открытые
+PropalsOpened=Открыты
 PropalStatusDraft=Проект (должно быть подтверждено)
-PropalStatusValidated=Удостоверенная (предложение открыто)
+PropalStatusValidated=Validated (proposal is opened)
 PropalStatusSigned=Подпись (в законопроекте)
 PropalStatusNotSigned=Не подписал (закрытые)
 PropalStatusBilled=Billed
diff --git a/htdocs/langs/ru_RU/stocks.lang b/htdocs/langs/ru_RU/stocks.lang
index 079d498bd60..c7a62bb6072 100644
--- a/htdocs/langs/ru_RU/stocks.lang
+++ b/htdocs/langs/ru_RU/stocks.lang
@@ -22,13 +22,15 @@ Movements=Перевозкой
 ErrorWarehouseRefRequired=Склад ссылкой зовут требуется
 ListOfWarehouses=Список складов
 ListOfStockMovements=Список акций движения
+StockMovementForId=Movement ID %d
+ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Раздел "Склад"
 Location=Вместо
 LocationSummary=Сокращенное наименование расположение
 NumberOfDifferentProducts=Кол-во различных продуктов
 NumberOfProducts=Общее количество продукции
-LastMovement=Последнее движение
-LastMovements=Последние движения
+LastMovement=Latest movement
+LastMovements=Latest movements
 Units=Единицы
 Unit=Единица
 StockCorrection=Правильно запас
@@ -140,3 +142,4 @@ ProductStockWarehouseCreated=Stock limit for alert and desired optimal stock cor
 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
diff --git a/htdocs/langs/ru_RU/supplier_proposal.lang b/htdocs/langs/ru_RU/supplier_proposal.lang
index 28fb8cb6986..7cdd3f63d85 100644
--- a/htdocs/langs/ru_RU/supplier_proposal.lang
+++ b/htdocs/langs/ru_RU/supplier_proposal.lang
@@ -8,11 +8,11 @@ SearchRequest=Find a request
 DraftRequests=Draft requests
 SupplierProposalsDraft=Draft supplier proposals
 LastModifiedRequests=Latest %s modified price requests
-RequestsOpened=Open price requests
+RequestsOpened=Opened price requests
 SupplierProposalArea=Supplier proposals area
 SupplierProposalShort=Supplier proposal
-SupplierProposals=Supplier proposals
-SupplierProposalsShort=Supplier proposals
+SupplierProposals=Предложения поставщику
+SupplierProposalsShort=Предложения поставщику
 NewAskPrice=New price request
 ShowSupplierProposal=Show price request
 AddSupplierProposal=Create a price request
@@ -23,7 +23,7 @@ ConfirmValidateAsk=Are you sure you want to validate this price request under na
 DeleteAsk=Delete request
 ValidateAsk=Validate request
 SupplierProposalStatusDraft=Проект (должно быть подтверждено)
-SupplierProposalStatusValidated=Validated (request is open)
+SupplierProposalStatusValidated=Validated (request is opened)
 SupplierProposalStatusClosed=Закрыты
 SupplierProposalStatusSigned=Accepted
 SupplierProposalStatusNotSigned=Отклонено
diff --git a/htdocs/langs/ru_RU/suppliers.lang b/htdocs/langs/ru_RU/suppliers.lang
index 7e7b69bd496..8fe818f1dec 100644
--- a/htdocs/langs/ru_RU/suppliers.lang
+++ b/htdocs/langs/ru_RU/suppliers.lang
@@ -9,7 +9,7 @@ ShowSupplier=Показать поставщика
 OrderDate=Дата заказа
 BuyingPriceMin=Best buying price
 BuyingPriceMinShort=Best buying price
-TotalBuyingPriceMinShort=Total of subproducts buying prices
+TotalBuyingPriceMinShort=Итог закупочных цен субтоваров
 TotalSellingPriceMinShort=Total of subproducts selling prices
 SomeSubProductHaveNoPrices=Для субтоваров  товаров не указана цена
 AddSupplierPrice=Add buying price
@@ -24,10 +24,10 @@ ExportDataset_fournisseur_1=Список счетов поставщика  и 
 ExportDataset_fournisseur_2=Поставщиком счета-фактуры и платежи
 ExportDataset_fournisseur_3=Заказы поставщика и строки заказа
 ApproveThisOrder=Утвердить этот заказ
-ConfirmApproveThisOrder=Вы уверены, что хотите утвердить этот заказ <b>%s</b> ?
+ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b>?
 DenyingThisOrder=Отменить этот заказ
-ConfirmDenyingThisOrder=Вы уверены, что хотите отменить этот заказ  <b>%s</b> ?
-ConfirmCancelThisOrder=Вы уверены, что хотите отменить этот заказ?
+ConfirmDenyingThisOrder=Are you sure you want to deny this order <b>%s</b>?
+ConfirmCancelThisOrder=Are you sure you want to cancel this order <b>%s</b>?
 AddSupplierOrder=Создать поставщиком порядка
 AddSupplierInvoice=Создать поставщику счет-фактуру
 ListOfSupplierProductForSupplier=Перечень продукции и цен для <b>поставщиков %s</b>
@@ -41,3 +41,4 @@ DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Wrong quality
 ReputationForThisProduct=Reputation
 BuyerName=Buyer name
+AllProductServicePrices=All product / service prices
diff --git a/htdocs/langs/ru_RU/trips.lang b/htdocs/langs/ru_RU/trips.lang
index 46c02918efd..7f4dbf15eb3 100644
--- a/htdocs/langs/ru_RU/trips.lang
+++ b/htdocs/langs/ru_RU/trips.lang
@@ -21,7 +21,17 @@ ListToApprove=Ждёт утверждения
 ExpensesArea=Поле отчётов о затратах
 ClassifyRefunded=Classify 'Refunded'
 ExpenseReportWaitingForApproval=Новый отчёт о затратах направлен на утверждение
-ExpenseReportWaitingForApprovalMessage=Новый отчёт отчёт о затратах отправлен и ждёт утверждения. \nОт пользователя %s\nЗа период %s\nНажмите для проверки: %s
+ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n - User: %s\n - Period: %s\nClick here to validate: %s
+ExpenseReportWaitingForReApproval=An expense report has been submitted for re-approval
+ExpenseReportWaitingForReApprovalMessage=An expense report has been submitted and is waiting for re-approval.\nThe %s, you refused to approve the expense report for this reason: %s.\nA new version has been proposed and waiting for your approval.\n - User: %s\n - Period: %s\nClick here to validate: %s
+ExpenseReportApproved=An expense report was approved
+ExpenseReportApprovedMessage=The expense report %s was approved.\n - User: %s\n - Approved by: %s\nClick here to show the expense report: %s
+ExpenseReportRefused=An expense report was refused
+ExpenseReportRefusedMessage=The expense report %s was refused.\n - User: %s\n - Refused by: %s\n - Motive for refusal: %s\nClick here to show the expense report: %s
+ExpenseReportCanceled=An expense report was canceled
+ExpenseReportCanceledMessage=The expense report %s was canceled.\n - User: %s\n - Canceled by: %s\n - Motive for cancellation: %s\nClick here to show the expense report: %s
+ExpenseReportPaid=An expense report was paid
+ExpenseReportPaidMessage=The expense report %s was paid.\n - User: %s\n - Paid by: %s\nClick here to show the expense report: %s
 TripId=ID отчёта о затратах
 AnyOtherInThisListCanValidate=Кого уведомлять для подтверждения.
 TripSociete=Информация о компании
@@ -59,31 +69,23 @@ DATE_REFUS=Дата отклонения
 DATE_SAVE=Дата проверки
 DATE_CANCEL=Дата отмены
 DATE_PAIEMENT=Дата платежа
-
 BROUILLONNER=Открыть заново
 ValidateAndSubmit=Проверить и отправить запрос на утверждение
 ValidatedWaitingApproval=Validated (waiting for approval)
-
 NOT_AUTHOR=Вы не автор этого отчёта о затратах. Операция отменена.
-
 ConfirmRefuseTrip=Are you sure you want to deny this expense report?
-
 ValideTrip=Одобрить отчёт о затратах
 ConfirmValideTrip=Are you sure you want to approve this expense report?
-
 PaidTrip=Оплатить отчёт о затратах
 ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid"?
-
 ConfirmCancelTrip=Are you sure you want to cancel this expense report?
-
 BrouillonnerTrip=Move back expense report to status "Draft"
 ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft"?
-
 SaveTrip=Проверить отчёт о завтратах
 ConfirmSaveTrip=Are you sure you want to validate this expense report?
-
 NoTripsToExportCSV=Нет отчёта о затратах за этот период.
 ExpenseReportPayment=Expense report payment
-
 ExpenseReportsToApprove=Expense reports to approve
 ExpenseReportsToPay=Expense reports to pay
+CloneExpenseReport=Clone expese report
+ConfirmCloneExpenseReport=Are you sure you want to clone this expense report ?
diff --git a/htdocs/langs/ru_RU/users.lang b/htdocs/langs/ru_RU/users.lang
index 373d2a2e0a1..4a752f3f53f 100644
--- a/htdocs/langs/ru_RU/users.lang
+++ b/htdocs/langs/ru_RU/users.lang
@@ -36,7 +36,7 @@ AdministratorDesc=Администратор
 DefaultRights=Права доступа по умолчанию
 DefaultRightsDesc=Определить здесь умолчанию разрешения, что автоматически предоставляются новые созданные пользователем.
 DolibarrUsers=Пользователи Dolibarr
-LastName=Last Name
+LastName=Фамилия
 FirstName=Имя
 ListOfGroups=Список групп
 NewGroup=Новая группа
diff --git a/htdocs/langs/ru_RU/withdrawals.lang b/htdocs/langs/ru_RU/withdrawals.lang
index aaef5815c3a..aee438538f9 100644
--- a/htdocs/langs/ru_RU/withdrawals.lang
+++ b/htdocs/langs/ru_RU/withdrawals.lang
@@ -24,6 +24,7 @@ WithdrawStatistics=Direct debit payment statistics
 WithdrawRejectStatistics=Direct debit payment reject statistics
 LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
+WithdrawRequestsDone=%s direct debit payment requests recorded
 ThirdPartyBankCode=Третьей стороной банковский код
 NoInvoiceCouldBeWithdrawed=Нет счета withdrawed с успехом. Убедитесь в том, что счета-фактуры на компании с действительным запрета.
 ClassCredited=Классифицировать зачисленных
@@ -76,8 +77,8 @@ RUM=UMR
 RUMLong=Unique Mandate Reference
 RUMWillBeGenerated=UMR number will be generated once bank account information are saved
 WithdrawMode=Direct debit mode (FRST or RECUR)
-WithdrawRequestAmount=Withdraw request amount:
-WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil amount.
+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
diff --git a/htdocs/langs/sk_SK/accountancy.lang b/htdocs/langs/sk_SK/accountancy.lang
index 306ad840584..5f31b6e2b2d 100644
--- a/htdocs/langs/sk_SK/accountancy.lang
+++ b/htdocs/langs/sk_SK/accountancy.lang
@@ -194,6 +194,8 @@ ChangeBinding=Change the binding
 
 ## Admin
 ApplyMassCategories=Použiť hromadne kategóriu
+AddAccountFromBookKeepingWithNoCategories=Add acccount already used with no categories
+CategoryDeleted=Category for the accounting account has been removed
 
 ## Export
 Exports=Exports
@@ -209,6 +211,7 @@ Modelcsv_ciel=Exportovať pre Sage Ciel Compta alebo Compta Evolution
 Modelcsv_quadratus=Exportovať pre Quadratus QuadraCompta
 Modelcsv_ebp=Exportovať pre EBP
 Modelcsv_cogilog=Exportovať pre Cogilog
+ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
 InitAccountancy=Načítať účtovníctvo
diff --git a/htdocs/langs/sk_SK/admin.lang b/htdocs/langs/sk_SK/admin.lang
index 74e585e5ac3..1afae207e19 100644
--- a/htdocs/langs/sk_SK/admin.lang
+++ b/htdocs/langs/sk_SK/admin.lang
@@ -9,14 +9,20 @@ VersionDevelopment=Vývojárska
 VersionUnknown=Neznáma
 VersionRecommanded=Odporúčaná
 FileCheck=Kontrola integrity súborov
-FileCheckDesc=This tool allows you to check the integrity of files of your application, comparing each files with the official ones. You can use this tool to detect if some files were modified by a hacker for example.
+FileCheckDesc=This tool allows you to check the integrity of files and setup of your application, comparing each files with the official ones. 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.
+FileIntegrityIsStrictlyConformedWithReference=Files integrity is strictly conformed with the reference.
+FileIntegrityIsOkButFilesWereAdded=Files integrity check has passed, however some new files were added.
+FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified, removed or added.
+GlobalChecksum=Global checksum
 MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
 LocalSignature=Embedded local signature (less reliable)
 RemoteSignature=Remote distant signature (more reliable)
 FilesMissing=Chýbajúce súbory
 FilesUpdated=Aktualizované súbory
+FilesModified=Modified Files
+FilesAdded=Added Files
 FileCheckDolibarr=Skontrolovať integritu aplikačných súborov
-AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from a certified package
+AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from an official package
 XmlNotFound=Integrita XML súboru aplikácie nenájdená
 SessionId=ID relácie
 SessionSaveHandler=Handler pre uloženie sedenia
@@ -185,7 +191,9 @@ BoxesDesc=Widgets are components showing some information that you can add to pe
 OnlyActiveElementsAreShown=Iba prvky z <a href="%s">povolených modulov</a> sú uvedené.
 ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
 ModulesMarketPlaceDesc=Viac modulov na stiahnutie môžete nájst na internete
-ModulesMarketPlaces=Viac moduly ...
+ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
+ModulesMarketPlaces=Find external modules...
+GoModuleSetupArea=To deploy/install a new module, go onto the Module setup area at <a href="%s">%s</a>.
 DoliStoreDesc=DoliStore, oficiálny trh pre Dolibarr ERP / CRM externých modulov
 DoliPartnersDesc=List of companies providing custom developed modules or features (Note: anyone experienced in PHP programming can provide custom development for an open source project)
 WebSiteDesc=Referenčná stránka pre nájdenie viacero modulov
@@ -276,21 +284,22 @@ ModuleFamilyInterface=Interfaces with external systems
 MenuHandlers=Menu manipulátory
 MenuAdmin=Menu Editor
 DoNotUseInProduction=Nepoužívajte vo výrobe
-ThisIsProcessToFollow=To je nastavený tak, aby proces:
-ThisIsAlternativeProcessToFollow=Toto je alternatívne nastavenie pre postup:
+ThisIsProcessToFollow=This is steps to process:
+ThisIsAlternativeProcessToFollow=This is an alternative setup to process manually:
 StepNb=Krok %s
 FindPackageFromWebSite=Nájsť balíčka, ktorý obsahuje funkciu, ktorú chcete (napr. na oficiálnych webových stránkach %s).
 DownloadPackageFromWebSite=Stiahnúť  balíček ( napr. z oficiálnej stránky %s ).
-UnpackPackageInDolibarrRoot=Rozbaľte balíček na server do priečinka určeného na externé moduly:  <b>%s</b>
-SetupIsReadyForUse=Inštalácia je dokončená a Dolibarr je pripravený na použitie s touto nový komponent.
-NotExistsDirect=Alternatívne koreňový adresár nie je definovaná. <br>
-InfDirAlt=Od verzie 3 je možné definovať alternatívny koreň directory.This umožňuje ukladať, rovnaké miesto, plug-iny a vlastné šablóny. <br> Stačí vytvoriť adresár v koreňovom adresári Dolibarr (napr.: vlastné). <br>
-InfDirExample=<br> Potom vyhlásiť ju v súbore conf.php <br> $ Dolibarr_main_url_root_alt = 'http://myserver/custom &quot; <br> $ Dolibarr_main_document_root_alt = '/ cesta / of / Dolibarr / htdocs / vlastný &quot; <br> * Tieto riadky sú okomentované znakom &quot;#&quot;, odkomentovať odobrať iba charakter.
+UnpackPackageInDolibarrRoot=Unpack the packaged files into server directory dedicated to Dolibarr: <b>%s</b>
+UnpackPackageInModulesRoot=To deploy/install an external module, unpack the packaged files into the server directory dedicated to modules: <b>%s</b>
+SetupIsReadyForUse=Module deployment is finished. You must however enable and setup the module in your application by going on the page to setup modules: <a href="%s">%s</a>.
+NotExistsDirect=The alternative root directory is not defined to an existing directory.<br>
+InfDirAlt=Since version 3, it is possible to define an alternative root directory. This allows you to store, into a dedicated directory, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
+InfDirExample=<br>Then declare it in the file <strong>conf.php</strong><br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>If these lines are commented with "#", to enable them, just uncomment by removing the "#" character.
 YouCanSubmitFile=V tomto kroku, môžete poslať balíček použitím tohto nástroja: Vybrať modul
 CurrentVersion=Dolibarr aktuálna verzia
 CallUpdatePage=Choďte na stránku úpravý databázobej štruktúry a dát. %s
 LastStableVersion= Najnovšia stabilná verzia
-LastActivationDate=Posledný baktívny dátum
+LastActivationDate=Latest activation date
 UpdateServerOffline=Aktualizovať server offline
 GenericMaskCodes=Môžete zadať akékoľvek masku číslovanie. V tejto maske, by mohli byť použité nasledovné značky: <br> <b>{000000}</b> zodpovedá množstvu, ktoré sa zvýšia na každej %s. Vložiť počet núl na požadovanú dĺžku pultu. Počítadlo sa vyplní nulami zľava, aby sa čo najviac nuly ako maska. <br> <b>{000000} 000</b> rovnako ako predchádzajúce, ale posun zodpovedá číslu na pravej strane znamienko + je aplikovaný začína na prvej %s. <br> <b>{000000 @ x}</b> rovnaká ako predchádzajúca, ale počítadlo sa resetuje na nulu, keď je mesiac x hodnoty (x medzi 1 a 12 alebo 0, používať prvých mesiacoch fiškálneho roka definované v konfigurácii, alebo 99 pre resetovanie na nulu každý mesiac ). Ak je táto voľba sa používa, a x je 2 alebo vyššia, potom postupnosť {yy} {mm} alebo {yyyy} {} mm je tiež potrebné. <br> <b>{Dd}</b> deň (01 až 31). <br> <b>{Mm}</b> mesiac (01 až 12). <br> <b>{Yy}, {RRRR}</b> alebo <b>{y}</b> ročne po dobu 2, 4 alebo 1 číslice. <br>
 GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
@@ -373,11 +382,11 @@ ExtrafieldCheckBox=Zaškrtávacie políčko
 ExtrafieldRadio=Prepínač
 ExtrafieldCheckBoxFromList= Checkbox from table
 ExtrafieldLink=Odkaz na objekt
-ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>In order to have the list depending on another :<br>1,value1|parent_list_code:parent_key<br>2,value2|parent_list_code:parent_key
+ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list :<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list :<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=Zoznam kľúčových hodnôt <br><br> napríklad : <br>1,hodnota1<br>2,hodnota2<br>3,hodnota3<br>...
 ExtrafieldParamHelpradio=Zoznam kľúčových hodnôt <br><br> napríklad : <br>1,hodnota1<br>2,hodnota2<br>3,hodnota3<br>...
-ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
-ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
+ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Example : Societe:societe/class/societe.class.php
 LibraryToBuildPDF=Knižnica používaná pre generovanie PDF
 WarningUsingFPDF=Upozornenie: Váš <b>conf.php</b> obsahuje direktívu <b>dolibarr_pdf_force_fpdf = 1.</b> To znamená, že môžete používať knižnicu FPDF pre generovanie PDF súborov. Táto knižnica je stará a nepodporuje mnoho funkcií (Unicode, obraz transparentnosť, azbuka, arabské a ázijské jazyky, ...), takže môže dôjsť k chybám pri generovaní PDF. <br> Ak chcete vyriešiť tento a majú plnú podporu generovanie PDF, stiahnite si <a href="http://www.tcpdf.org/" target="_blank">TCPDF knižnice</a> , potom komentár alebo odstrániť riadok <b>$ dolibarr_pdf_force_fpdf = 1,</b> a namiesto neho doplniť <b>$ dolibarr_lib_TCPDF_PATH = 'path_to_TCPDF_dir &quot;</b>
@@ -411,10 +420,11 @@ ModuleCompanyCodePanicum=Späť prázdny evidencia kód.
 ModuleCompanyCodeDigitaria=Účtovníctvo kód závisí na kóde tretích strán. Kód sa skladá zo znaku &quot;C&quot; na prvom mieste nasleduje prvých 5 znakov kódu tretích strán.
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Použiť 3 krokové povolenie ked cena ( bez DPH ) je väčšia ako...
-
+WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<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).
+ClickToShowDescription=Click to show description
 # Modules
 Module0Name=Používatelia a skupiny
-Module0Desc=Používatelia a skupiny riadenia
+Module0Desc=Users / Employees and Groups management
 Module1Name=Tretie strany
 Module1Desc=Firmy a správu kontaktov (zákazníci, vyhliadky ...)
 Module2Name=Obchodné
@@ -515,8 +525,8 @@ Module2200Name=Dynamická cena
 Module2200Desc=Zapnúť používanie matematických výrazov pre ceny
 Module2300Name=Cron
 Module2300Desc=Správa plánovaných úloh
-Module2400Name=Agenda/Udalosti
-Module2400Desc=Follow events or rendez-vous. Record manual events into Agendas or let application logs automatic events for tracking purposes.
+Module2400Name=Events/Agenda
+Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous.
 Module2500Name=Elektronický Redakčný
 Module2500Desc=Uložiť a zdieľať dokumenty
 Module2600Name=API/Webové služby ( SOAP server )
@@ -582,7 +592,7 @@ Permission34=Odstrániť produkty
 Permission36=Pozri / správa skryté produkty
 Permission38=Export produktov
 Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
-Permission42=Vytvoriť / upraviť projektov (spoločné projekty, projekt a ja som kontakt pre)
+Permission42=Create/modify projects (shared project and projects i'm contact for). Can also create tasks and assign users to project and tasks
 Permission44=Odstrániť projektov (spoločné projekty, projekt a ja som kontakt pre)
 Permission45=Export projects
 Permission61=Prečítajte intervencie
@@ -685,7 +695,7 @@ PermissionAdvanced253=Vytvoriť / upraviť interné / externé užívateľa a op
 Permission254=Vytvoriť / upraviť externí používatelia iba
 Permission255=Upraviť ostatným používateľom heslo
 Permission256=Odstrániť alebo zakázať ostatným užívateľom
-Permission262=Rozšíriť prístup ku všetkým tretím stranám (nielen tých, ktoré súvisia s užívateľom). Neplatí pre externých používateľov (vždy iba na seba).
+Permission262=Extend access to all third parties (not only third parties that user is a sale representative).<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 assignement matters).
 Permission271=Prečítajte CA
 Permission272=Prečítajte si faktúry
 Permission273=Vydanie faktúry
@@ -887,7 +897,7 @@ Offset=Ofset
 AlwaysActive=Vždy aktívny
 Upgrade=Vylepšiť
 MenuUpgrade=Aktualizujte / predĺžiť
-AddExtensionThemeModuleOrOther=Pridať príponu (tému, modul, ...)
+AddExtensionThemeModuleOrOther=Deploy/install external module
 WebServer=Webový server
 DocumentRootServer=Webového servera koreňový adresár
 DataRootServer=Dat adresára súborov
@@ -994,7 +1004,7 @@ TriggerAlwaysActive=Trigger v tomto súbore sú vždy aktívne, či už sú akti
 TriggerActiveAsModuleActive=Trigger v tomto súbore sú aktívne ako modul <b>%s</b> je povolené.
 GeneratedPasswordDesc=Definujte tu pravidlo, ktoré chcete použiť na vytvorenie nového hesla, ak sa spýtate mať automaticky generované heslo
 DictionaryDesc=Vložte referenčné data. Môžete pridať vaše hodnoty ako základ
-ConstDesc=This page allows you to edit all other parameters not available in previous pages. These are mostly reserved parameters for developers or advanced troubleshooting.
+ConstDesc=This page allows you to edit all other parameters not available in previous pages. These are mostly reserved parameters for developers or advanced troubleshooting. For a list of options <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">check here</a>.
 MiscellaneousDesc=Ostatné bezpečnostné parametre sú definované tu.
 LimitsSetup=Limity / Presné nastavenie
 LimitsDesc=Môžete definovať limity, upresnenie a optimalizácia používané Dolibarr tu
@@ -1161,10 +1171,6 @@ FreeLegalTextOnOrders=Voľný text o objednávkach
 WatermarkOnDraftOrders=Vodoznak na konceptoch objednávok (ak žiadny prázdny)
 ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable
 BANK_ASK_PAYMENT_BANK_DURING_ORDER=Ask for bank account destination of order
-##### Clicktodial #####
-ClickToDialSetup=Kliknite pre Dial Nastavenie modulu
-ClickToDialUrlDesc=Url volaná, keď sa vykonáva kliknutím na tel Piktogram. Do poľa URL môžete použiť značky <br> <b>__PHONETO__</b> Ktorý bude nahradený s telefónnym číslom osoby volať <br> <b>__PHONEFROM__</b> Ktorý bude nahradený telefónne číslo volajúceho (vaše) <br> <b>__LOGIN__</b> Ktorý bude nahradený s clicktodial prihlásenie (definované na karte užívateľa) <br> <b>__PASS__</b> Ktorý bude nahradený s clicktodial heslo (definované na karte užívateľa).
-##### Bookmark4u #####
 ##### Interventions #####
 InterventionsSetup=Intervencie modul nastavenia
 FreeLegalTextOnInterventions=Voľný text na intervenčnú dokumentov
@@ -1391,7 +1397,7 @@ SendingsSetup=Odoslanie Nastavenie modulu
 SendingsReceiptModel=Odoslanie potvrdenky modelu
 SendingsNumberingModules=Sendings číslovanie moduly
 SendingsAbility=Support shipping sheets for customer deliveries
-NoNeedForDeliveryReceipts=Vo väčšine prípadov sú sendings príjmy použité ako listov pre dodávky zákazníkom (zoznam výrobkov na odoslanie) a na hárkoch, ktoré je recevied a podpísaný zákazníkom. Takže dodávok výrobkov príjmy je duplicitné funkcie a je zriedka aktivovaný.
+NoNeedForDeliveryReceipts=In most cases, shipping sheets are used both as sheets for customer deliveries (list of products to send) and sheets that is received and signed by customer. So product deliveries receipts is a duplicated feature and is rarely activated.
 FreeLegalTextOnShippings=Pozámka pre doručovateľa
 ##### Deliveries #####
 DeliveryOrderNumberingModules=Produkty dodávky príjem číslovanie modul
@@ -1471,7 +1477,11 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Set automatically this default value for type of e
 AGENDA_DEFAULT_FILTER_TYPE=Set automatically this type of event into search filter of agenda view
 AGENDA_DEFAULT_FILTER_STATUS=Set automatically this status for events into search filter of agenda view
 AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
-##### ClickToDial #####
+AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
+AGENDA_NOTIFICATION_SOUND=Enable sound notification
+##### Clicktodial #####
+ClickToDialSetup=Kliknite pre Dial Nastavenie modulu
+ClickToDialUrlDesc=Url volaná, keď sa vykonáva kliknutím na tel Piktogram. Do poľa URL môžete použiť značky <br> <b>__PHONETO__</b> Ktorý bude nahradený s telefónnym číslom osoby volať <br> <b>__PHONEFROM__</b> Ktorý bude nahradený telefónne číslo volajúceho (vaše) <br> <b>__LOGIN__</b> Ktorý bude nahradený s clicktodial prihlásenie (definované na karte užívateľa) <br> <b>__PASS__</b> Ktorý bude nahradený s clicktodial heslo (definované na karte užívateľa).
 ClickToDialDesc=This module allows to make phone numbers clickable. A click on this icon will call make your phone to 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.
 ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
 ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on same computer than the browser, and called when you click on a link in your browser that start 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.
@@ -1499,10 +1509,11 @@ EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint availa
 ##### API ####
 ApiSetup=Nastavenie API modulu
 ApiDesc=Zapnutím tohto modulu získate rôzne služby REST servra
-ApiProductionMode=Enable production mode (this will activate use of a caches for services management)
+ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
 ApiExporerIs=API možete preskúmať na adrese
 OnlyActiveElementsAreExposed=Iba prvky zapnutého modulu sú odhalené
 ApiKey=Kľúč pre API
+WarningAPIExplorerDisabled=The API explorer has been disabled. API explorer is not required to provide API services. It is a tool for developer to find/test REST APIs. If you need this tool, go into setup of module API REST to activate it.
 ##### Bank #####
 BankSetupModule=Bankové modul nastavenia
 FreeLegalTextOnChequeReceipts=Voľný text na kontroly príjmov
@@ -1571,7 +1582,7 @@ BackupDumpWizard=Pomocník pre databázovú zálohu
 SomethingMakeInstallFromWebNotPossible=Inštalácia externého modulu z webu nie je možná kôli : 
 SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is only manual steps a privileged user can do.
 InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
-ConfFileMuseContainCustom=Installing an external module from application save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to have option<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
+ConfFileMuseContainCustom=Installing an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Zvýrazniť riadok pre prechode kurzora
 HighlightLinesColor=Highlight color of the line when the mouse passes over (keep empty for no highlight)
 TextTitleColor=Color of page title
@@ -1601,6 +1612,7 @@ FixTZ=Oprava časovej zóny
 FillFixTZOnlyIfRequired=Príklad: +2 ( vyplňte iba ak máte problém )
 ExpectedChecksum=Expected Checksum
 CurrentChecksum=Current Checksum
+ForcedConstants=Required constant values
 MailToSendProposal=Zákaznícka ponuka na poslanie
 MailToSendOrder=Zákaznícka objednávka na poslanie
 MailToSendInvoice=Zákaznícka faktúra na poslanie
@@ -1609,13 +1621,14 @@ MailToSendIntervention=To send intervention
 MailToSendSupplierRequestForQuotation=Citácia pre dodávateľa na poslanie
 MailToSendSupplierOrder=Dodávateľska objednávka na poslanie
 MailToSendSupplierInvoice=Dodávateľská faktúra na poslanie
+MailToSendContract=To send a contract
 MailToThirdparty=To send email from third party page
 ByDefaultInList=Show by default on list view
-YouUseLastStableVersion=You use the last stable version
+YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
 TitleExampleForMaintenanceRelease=Example of message you can use to announce this maintenance release (feel free to use it on your web sites)
-ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. You can download it from the download area of http://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.
-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, nor data structure change is present into this version. You can download it from the download area of http://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.
+ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. 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.
+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, nor data structure change is present into 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, you can enter here rule to have price for each level autocalculated according to price of first level, so you will have to enter only price for first level on each product. This page is here to save you time and can be usefull only if your prices for each leve are relative to first level. You can ignore this page in most cases.
 ModelModulesProduct=Templates for product documents
 ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
diff --git a/htdocs/langs/sk_SK/banks.lang b/htdocs/langs/sk_SK/banks.lang
index 152a740ec18..968dc0c90ca 100644
--- a/htdocs/langs/sk_SK/banks.lang
+++ b/htdocs/langs/sk_SK/banks.lang
@@ -80,7 +80,7 @@ AccountToDebit=Účet na vrub
 DisableConciliation=Zakázať zmierenie funkciu pre tento účet
 ConciliationDisabled=Odsúhlasenie funkcia vypnutá
 LinkedToAConciliatedTransaction=Linked to a conciliated entry
-StatusAccountOpened=Otvorení
+StatusAccountOpened=Otvorené
 StatusAccountClosed=Zatvorené
 AccountIdShort=Číslo
 LineRecord=Transakcie
diff --git a/htdocs/langs/sk_SK/bills.lang b/htdocs/langs/sk_SK/bills.lang
index 1d560ac910e..1cbc4b74637 100644
--- a/htdocs/langs/sk_SK/bills.lang
+++ b/htdocs/langs/sk_SK/bills.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - bills
 Bill=Faktúra
 Bills=Faktúry
-BillsCustomers=Zákaznícke faktúrý
-BillsCustomer=Zákaznícke faktúrý
-BillsSuppliers=Dodávateľské faktúrý
-BillsCustomersUnpaid=Nezaplatené zákaznícke faktúrý
-BillsCustomersUnpaidForCompany=Nezaplatené faktúry pre zákazníka %s
-BillsSuppliersUnpaid=Nezaplatené faktúry dodávateľa
-BillsSuppliersUnpaidForCompany=Nezaplatené faktúry dodávateľa pre %s
+BillsCustomers=Customer invoices
+BillsCustomer=Zákazník faktúra
+BillsSuppliers=Supplier invoices
+BillsCustomersUnpaid=Nezaplatené zákaznické faktúry
+BillsCustomersUnpaidForCompany=Unpaid customer invoices for %s
+BillsSuppliersUnpaid=Nezaplatené dodávatelské faktúry
+BillsSuppliersUnpaidForCompany=Unpaid supplier invoices for %s
 BillsLate=Oneskorené platby
 BillsStatistics=Štatistiky zákazníckych faktúr
 BillsStatisticsSuppliers=Štatistiky dodávateľskych faktúr
@@ -62,8 +62,8 @@ PaymentsBack=Platby späť
 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 credit note or deposit 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.
+ConfirmDeletePayment=Ste si istí, že chcete zmazať túto platbu?
+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.
 SupplierPayments=Dodávatelia platby
 ReceivedPayments=Prijaté platby
 ReceivedCustomersPayments=Platby prijaté od zákazníkov
@@ -78,6 +78,7 @@ PaymentMode=Typ platby
 PaymentTypeDC=Debit/Credit Card
 PaymentTypePP=PayPal
 IdPaymentMode=Typ platby (id)
+CodePaymentMode=Payment type (code)
 LabelPaymentMode=Typ platby (názov)
 PaymentModeShort=Typ platby
 PaymentTerm=Termín vyplatenia
@@ -102,9 +103,10 @@ SearchACustomerInvoice=Hľadať zákazníckej faktúre
 SearchASupplierInvoice=Hľadať na dodávateľskej faktúry
 CancelBill=Storno faktúry
 SendRemindByMail=Poslať pripomienku EMail
-DoPayment=Do platbu
-DoPaymentBack=Do platobnej chrbát
+DoPayment=Enter payment
+DoPaymentBack=Enter refund
 ConvertToReduc=Prevod do budúcnosti zľavou
+ConvertExcessReceivedToReduc=Convert excess received into future discount
 EnterPaymentReceivedFromCustomer=Zadajte platby, ktoré obdržal od zákazníka
 EnterPaymentDueToCustomer=Vykonať platbu zo strany zákazníka
 DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
@@ -113,22 +115,24 @@ BillStatus=Stav faktúry
 StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Návrh (musí byť overená)
 BillStatusPaid=Platený
-BillStatusPaidBackOrConverted=Platené alebo prevedené na zľavu
+BillStatusPaidBackOrConverted=Refund or converted into discount
 BillStatusConverted=Platená (pripravená pre záverečné faktúre)
 BillStatusCanceled=Opustený
 BillStatusValidated=Overené (potrebné venovať)
 BillStatusStarted=Začíname
 BillStatusNotPaid=Nezaplatil
+BillStatusNotRefunded=Not refunded
 BillStatusClosedUnpaid=Uzavretá (neplatené)
 BillStatusClosedPaidPartially=Platené (čiastočne)
 BillShortStatusDraft=Návrh
 BillShortStatusPaid=Platený
-BillShortStatusPaidBackOrConverted=Spracované
+BillShortStatusPaidBackOrConverted=Refund or converted
 BillShortStatusConverted=Spracované
 BillShortStatusCanceled=Opustený
 BillShortStatusValidated=Overené
 BillShortStatusStarted=Začíname
 BillShortStatusNotPaid=Nezaplatil
+BillShortStatusNotRefunded=Not refunded
 BillShortStatusClosedUnpaid=Zatvorené
 BillShortStatusClosedPaidPartially=Platené (čiastočne)
 PaymentStatusToValidShort=Ak chcete overiť
@@ -149,14 +153,14 @@ NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified
 FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
 NotARecurringInvoiceTemplate=Not a recurring template invoice
 NewBill=Nová faktúra
-LastBills=Posledný %s faktúry
-LastCustomersBills=Posledné %s zákazníkom faktúry
-LastSuppliersBills=Posledné %s dodávateľov faktúry
+LastBills=Latest %s invoices
+LastCustomersBills=Latest %s customer invoices
+LastSuppliersBills=Latest %s supplier invoices
 AllBills=Všetky faktúry
 OtherBills=Ostatné faktúry
 DraftBills=Návrhy faktúry
-CustomersDraftInvoices=Zákazníci návrh faktúry
-SuppliersDraftInvoices=Dodávatelia návrh faktúry
+CustomersDraftInvoices=Customer draft invoices
+SuppliersDraftInvoices=Supplier draft invoices
 Unpaid=Nezaplatený
 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>?
@@ -203,7 +207,7 @@ AlreadyPaidNoCreditNotesNoDeposits=Už zaplatená (bez dobropisov a vklady)
 Abandoned=Opustený
 RemainderToPay=Zostávajúce nezaplatené
 RemainderToTake=Zostávajúce suma na prebratie
-RemainderToPayBack=Zostávajúca suma na vrátenie
+RemainderToPayBack=Remaining amount to refund
 Rest=Až do
 AmountExpected=Nárokovanej čiastky
 ExcessReceived=Nadbytok obdržal
@@ -270,6 +274,7 @@ Deposit=Záloha
 Deposits=Vklady
 DiscountFromCreditNote=Zľava z %s dobropisu
 DiscountFromDeposit=Platby z %s zálohovú faktúru
+DiscountFromExcessReceived=Payments from excess received of invoice %s
 AbsoluteDiscountUse=Tento druh úveru je možné použiť na faktúre pred jeho overenie
 CreditNoteDepositUse=Invoice must be validated to use this kind of credits
 NewGlobalDiscount=Nový absolútny zľava
@@ -277,8 +282,8 @@ NewRelativeDiscount=Nový relatívna zľava
 NoteReason=Poznámka / príčina
 ReasonDiscount=Dôvod
 DiscountOfferedBy=Poskytnuté
-DiscountStillRemaining=Zľavy ešte zostávajúce
-DiscountAlreadyCounted=Zľavy už počíta
+DiscountStillRemaining=Discounts available
+DiscountAlreadyCounted=Discounts already consumed
 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é.
@@ -331,10 +336,12 @@ InvoiceAutoValidate=Overiť faktúrý automaticky
 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
 # PaymentConditions
 Statut=Postavenie
-PaymentConditionShortRECEP=Bezprostredný
-PaymentConditionRECEP=Bezprostredný
+PaymentConditionShortRECEP=Due Upon Receipt
+PaymentConditionRECEP=Due Upon Receipt
 PaymentConditionShort30D=30 dní
 PaymentCondition30D=30 dní
 PaymentConditionShort30DENDMONTH=30 days of month-end
@@ -349,6 +356,14 @@ PaymentConditionShortPT_ORDER=Objednávka
 PaymentConditionPT_ORDER=Na objednávku
 PaymentConditionShortPT_5050=50-50
 PaymentConditionPT_5050=50%% vopred, 50%% pri dodaní
+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
 FixAmount=Fix množstvo
 VarAmount=Variabilná čiastka (%% celk.)
 # PaymentType
@@ -418,7 +433,7 @@ ChequeDeposits=Kontroly vklady
 Cheques=Kontroly
 DepositId=Id deposit
 NbCheque=Number of checks
-CreditNoteConvertedIntoDiscount=Tento dobropis alebo zálohovej faktúry bol premenený %s
+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
 ShowUnpaidAll=Zobraziť všetky neuhradené faktúry
 ShowUnpaidLateOnly=Zobraziť neskoré neuhradené faktúry len
diff --git a/htdocs/langs/sk_SK/boxes.lang b/htdocs/langs/sk_SK/boxes.lang
index 5c6a9eaecf6..e27f00cb7db 100644
--- a/htdocs/langs/sk_SK/boxes.lang
+++ b/htdocs/langs/sk_SK/boxes.lang
@@ -1,62 +1,62 @@
 # Dolibarr language file - Source file is en_US - boxes
 BoxLastRssInfos=Rss informácie
-BoxLastProducts=Latest %s products/services
-BoxProductsAlertStock=Stock alerts for products
-BoxLastProductsInContract=Latest %s contracted products/services
-BoxLastSupplierBills=Latest supplier invoices
-BoxLastCustomerBills=Latest customer invoices
-BoxOldestUnpaidCustomerBills=Oldest unpaid customer invoices
-BoxOldestUnpaidSupplierBills=Oldest unpaid supplier invoices
-BoxLastProposals=Latest commercial proposals
-BoxLastProspects=Latest modified prospects
-BoxLastCustomers=Latest modified customers
-BoxLastSuppliers=Latest modified suppliers
-BoxLastCustomerOrders=Latest customer orders
-BoxLastActions=Latest actions
-BoxLastContracts=Latest contracts
-BoxLastContacts=Latest contacts/addresses
-BoxLastMembers=Latest members
-BoxFicheInter=Latest interventions
-BoxCurrentAccounts=Open accounts balance
-BoxTitleLastRssInfos=Latest %s news from %s
-BoxTitleLastProducts=Latest %s modified products/services
+BoxLastProducts=Najnovšie %s produkty/služby
+BoxProductsAlertStock=Upozornenia skladu pre produkt
+BoxLastProductsInContract=Najnovšie %s zazmluvnené produkty/služby
+BoxLastSupplierBills=Najnovšie dodávateľské faktúry
+BoxLastCustomerBills=Najnovšie zákaznícke faktúry
+BoxOldestUnpaidCustomerBills=Najstaršie nezaplatené zákaznícke faktúry
+BoxOldestUnpaidSupplierBills=Najstaršie nezaplatené dodávateľské faktúry
+BoxLastProposals=Najnovšie komerčné ponuky
+BoxLastProspects=Najnovšie upravené vyhľiadky
+BoxLastCustomers=Najnovšie upravení zákazníci
+BoxLastSuppliers=Najnovšie upravení dodávatelia
+BoxLastCustomerOrders=Najnovšie upravené objednávky
+BoxLastActions=Najnovšie akcie
+BoxLastContracts=Najnovšie zmluvy
+BoxLastContacts=Najnovšie kontakty/adresy
+BoxLastMembers=Najnovší užívatelia
+BoxFicheInter=Najnovšie zásahy
+BoxCurrentAccounts=Otvoriť zostatok na účte
+BoxTitleLastRssInfos=Najnovšie %s novinky z %s
+BoxTitleLastProducts=Naposledy %s upravené produkty/služby
 BoxTitleProductsAlertStock=Produkty skladom pohotovosti
-BoxTitleLastSuppliers=Latest %s recorded suppliers
-BoxTitleLastModifiedSuppliers=Latest %s modified suppliers
-BoxTitleLastModifiedCustomers=Latest %s modified customers
-BoxTitleLastCustomersOrProspects=Latest %s customers or prospects
-BoxTitleLastCustomerBills=Latest %s customer's invoices
-BoxTitleLastSupplierBills=Latest %s supplier's invoices
-BoxTitleLastModifiedProspects=Latest %s modified prospects
-BoxTitleLastModifiedMembers=Latest %s members
-BoxTitleLastFicheInter=Latest %s modified interventions
-BoxTitleOldestUnpaidCustomerBills=Oldest %s unpaid customer invoices
-BoxTitleOldestUnpaidSupplierBills=Oldest %s unpaid supplier invoices
-BoxTitleCurrentAccounts=Open accounts balances
-BoxTitleLastModifiedContacts=Latest %s modified contacts/addresses
-BoxMyLastBookmarks=My latest %s bookmarks
+BoxTitleLastSuppliers=Najnovšie %s pridaný dodávatelia
+BoxTitleLastModifiedSuppliers=Najnovšie %s upravení dodávatelia
+BoxTitleLastModifiedCustomers=Najnovšie %s upravení zákazníci
+BoxTitleLastCustomersOrProspects=Najnovší %s zákazníci alebo prospekty
+BoxTitleLastCustomerBills=Latest %s customer invoices
+BoxTitleLastSupplierBills=Latest %s supplier invoices
+BoxTitleLastModifiedProspects=Najnovšie %s upravené prospekty
+BoxTitleLastModifiedMembers=Najnovší %s užívatelia
+BoxTitleLastFicheInter=Najnovšie %s upravené zásahy
+BoxTitleOldestUnpaidCustomerBills=Najstaršie %s nezaplatené zákaznícke faktúry
+BoxTitleOldestUnpaidSupplierBills=Najstaršie %s nezaplatené dodávatelské faktúry
+BoxTitleCurrentAccounts=Otvoriť zostatky na účtoch
+BoxTitleLastModifiedContacts=Najnovšie %s upravené kontakty/adresy
+BoxMyLastBookmarks=Moje najnovšie %s záložky
 BoxOldestExpiredServices=Najstarší aktívny vypršala služby
-BoxLastExpiredServices=Latest %s oldest contacts with active expired services
-BoxTitleLastActionsToDo=Latest %s actions to do
-BoxTitleLastContracts=Latest %s modified contracts
-BoxTitleLastModifiedDonations=Latest %s modified donations
-BoxTitleLastModifiedExpenses=Latest %s modified expense reports
+BoxLastExpiredServices=Najnovšie %s najstaršie zmluvy s aktívnym expirovaním služby
+BoxTitleLastActionsToDo=Najnovšie %s úlohy na dokončenie
+BoxTitleLastContracts=Najnovšie %s upravené zmluvy
+BoxTitleLastModifiedDonations=Najnovšie %s upravené príspevky
+BoxTitleLastModifiedExpenses=Najnovšie %s upravené správy o výdavkoch
 BoxGlobalActivity=Globálna aktivita (faktúry, návrhy, objednávky)
-BoxGoodCustomers=Good customers
-BoxTitleGoodCustomers=%s Good customers
-FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Latest successfull refresh date: %s
-LastRefreshDate=Latest refresh date
+BoxGoodCustomers=Top zákazníci
+BoxTitleGoodCustomers=%s Top zákazníkov
+FailedToRefreshDataInfoNotUpToDate=Aktualizácia RSS zlyhala. Naposledy úspešne aktualizované : %s
+LastRefreshDate=Najnovší čas obnovenia
 NoRecordedBookmarks=Žiadne záložky definované.
 ClickToAdd=Klikni pre pridanie.
 NoRecordedCustomers=Žiadne zaznamenané zákazníkmi
 NoRecordedContacts=Zaznamenané žiadne kontakty
 NoActionsToDo=Žiadne akcie robiť
-NoRecordedOrders=Žiadne zaznamenané zákazníkovej objednávky
+NoRecordedOrders=No recorded customer orders
 NoRecordedProposals=Zaznamenané žiadne návrhy
-NoRecordedInvoices=Žiadne zaznamenané zákazníka faktúry
-NoUnpaidCustomerBills=Bez neplatených zákazníka faktúry
-NoUnpaidSupplierBills=Bez neplatených dodávateľských faktúr
-NoModifiedSupplierBills=Žiadne zaznamenané dodávateľských faktúr
+NoRecordedInvoices=No recorded customer invoices
+NoUnpaidCustomerBills=No unpaid customer invoices
+NoUnpaidSupplierBills=No unpaid supplier invoices
+NoModifiedSupplierBills=No recorded supplier invoices
 NoRecordedProducts=Žiadne zaznamenané produkty / služby
 NoRecordedProspects=Zaznamenané žiadne vyhliadky
 NoContractedProducts=Žiadne produkty / služby zmluvne
@@ -72,13 +72,13 @@ BoxProposalsPerMonth=Návrhy za mesiac
 NoTooLowStockProducts=Žiadny výrobok na základe nízkeho limitu skladom
 BoxProductDistribution=Produkty / služby distribúcie
 BoxProductDistributionFor=Distribúcia %s pre %s
-BoxTitleLastModifiedSupplierBills=Latest %s modified supplier bills
-BoxTitleLatestModifiedSupplierOrders=Latest %s modified supplier orders
-BoxTitleLastModifiedCustomerBills=Latest %s modified customer bills
-BoxTitleLastModifiedCustomerOrders=Latest %s modified customer orders
-BoxTitleLastModifiedPropals=Latest %s modified propals
+BoxTitleLastModifiedSupplierBills=Najnovšie %s upravené dodávatelské účtenky
+BoxTitleLatestModifiedSupplierOrders=Najnovšie %s upravené dodávatelské objednávky
+BoxTitleLastModifiedCustomerBills=Najnovšie %s upravené zákaznícke účtenky
+BoxTitleLastModifiedCustomerOrders=Najnovšie %s upravené zákaznícke objednávky
+BoxTitleLastModifiedPropals=Najnovšie %s upravené ponuky
 ForCustomersInvoices=Zákazníci faktúry
 ForCustomersOrders=Zákazníci objednávky
 ForProposals=Návrhy
-LastXMonthRolling=The latest %s month rolling
-ChooseBoxToAdd=Add widget to your dashboard
+LastXMonthRolling=Posledný %s mesiac postupu
+ChooseBoxToAdd=Pridať blok na nástenku
diff --git a/htdocs/langs/sk_SK/companies.lang b/htdocs/langs/sk_SK/companies.lang
index 17d274b28c7..6e3749b17a4 100644
--- a/htdocs/langs/sk_SK/companies.lang
+++ b/htdocs/langs/sk_SK/companies.lang
@@ -78,6 +78,10 @@ VATIsNotUsed=DPH sa nepoužíva
 CopyAddressFromSoc=Fill address with third party address
 ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
 PaymentBankAccount=Payment bank account
+OverAllProposals=Total proposals
+OverAllOrders=Total orders
+OverAllInvoices=Total invoices
+OverAllSupplierProposals=Total price requests
 ##### Local Taxes #####
 LocalTax1IsUsed=Použitie druhej dane
 LocalTax1IsUsedES= RE sa používa
@@ -239,6 +243,10 @@ ProfId3RU=Prof ID 3 (KPP)
 ProfId4RU=Prof Id 4 (Okpo)
 ProfId5RU=-
 ProfId6RU=-
+ProfId1DZ=RC
+ProfId2DZ=Art.
+ProfId3DZ=NIF
+ProfId4DZ=NIS
 VATIntra=Daňové identifikačné číslo
 VATIntraShort=Daňové identifikačné číslo
 VATIntraSyntaxIsValid=Syntax je platná
@@ -384,6 +392,7 @@ LastModifiedThirdParties=Latest %s modified third parties
 UniqueThirdParties=Celkom jedinečné tretích strán
 InActivity=Otvorené
 ActivityCeased=Zatvorené
+ThirdPartyIsClosed=Third party is closed
 ProductsIntoElements=List of products/services into %s
 CurrentOutstandingBill=Current outstanding bill
 OutstandingBill=Max. za vynikajúce účet
@@ -396,7 +405,7 @@ MergeThirdparties=Merge third parties
 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 so you will be able to delete the duplicate one.
 ThirdpartiesMergeSuccess=Thirdparties have been merged
 SaleRepresentativeLogin=Login of sales representative
-SaleRepresentativeFirstname=Firstname of sales representative
-SaleRepresentativeLastname=Lastname of sales representative
+SaleRepresentativeFirstname=First name of sales representative
+SaleRepresentativeLastname=Last name of sales representative
 ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
 NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/sk_SK/compta.lang b/htdocs/langs/sk_SK/compta.lang
index 2237058025d..2d35bf37a41 100644
--- a/htdocs/langs/sk_SK/compta.lang
+++ b/htdocs/langs/sk_SK/compta.lang
@@ -65,6 +65,7 @@ PaymentSocialContribution=Platba sociálnej/fiškálnej dane
 PaymentVat=DPH platba
 ListPayment=Zoznam platieb
 ListOfCustomerPayments=Zoznam zákazníckych platieb
+ListOfSupplierPayments=Zoznam platieb dodávateľom
 DateStartPeriod=Date start period
 DateEndPeriod=Date end period
 newLT1Payment=New tax 2 payment
@@ -81,7 +82,7 @@ LT2PaymentES=IRPF platby
 LT2PaymentsES=IRPF Platby
 VATPayment=Sales tax payment
 VATPayments=Sales tax payments
-VATRefund=Sales tax refund Refund
+VATRefund=Sales tax refund
 Refund=Refund
 SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Zobraziť DPH platbu
@@ -194,7 +195,7 @@ CloneTax=Clone a social/fiscal tax
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
 CloneTaxForNextMonth=Clone it for next month
 SimpleReport=Simple report
-AddExtraReport=Extra reports
+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
diff --git a/htdocs/langs/sk_SK/cron.lang b/htdocs/langs/sk_SK/cron.lang
index 9d39f51d062..343b69e2325 100644
--- a/htdocs/langs/sk_SK/cron.lang
+++ b/htdocs/langs/sk_SK/cron.lang
@@ -1,10 +1,10 @@
 # Dolibarr language file - Source file is en_US - cron
 # About page
 # Right
-Permission23101 = Read Scheduled job
-Permission23102 = Create/update Scheduled job
-Permission23103 = Delete Scheduled job
-Permission23104 = Execute Scheduled job
+Permission23101 = Ukázať naplánovanú úlohu
+Permission23102 = Vytvoriť / upraviť naplánovanú úlohu
+Permission23103 = Odstrániť naplánovanú úlohu
+Permission23104 = Spustiť naplánovanú úlohu
 # Admin
 CronSetup= Naplánované úlohy správy Nastavenie
 URLToLaunchCronJobs=URL to check and launch qualified cron jobs
@@ -17,14 +17,14 @@ CronMethodDoesNotExists=Class %s does not contains any method %s
 # Menu
 EnabledAndDisabled=Enabled and disabled
 # Page list
-CronLastOutput=Posledný beh výstup
-CronLastResult=Posledný kód výsledku
+CronLastOutput=Latest run output
+CronLastResult=Latest result code
 CronCommand=Príkaz
-CronList=Scheduled jobs
+CronList=Naplánované úlohy
 CronDelete=Delete scheduled jobs
-CronConfirmDelete=Are you sure you want to delete these scheduled jobs ?
+CronConfirmDelete=Are you sure you want to delete these scheduled jobs?
 CronExecute=Launch scheduled job
-CronConfirmExecute=Are you sure you want to execute these scheduled jobs now ?
+CronConfirmExecute=Are you sure you want to execute these scheduled jobs now?
 CronInfo=Scheduled job module allow to execute job that have been planned
 CronTask=Práca
 CronNone=Nikto
@@ -33,13 +33,13 @@ CronDtEnd=Not after
 CronDtNextLaunch=Ďalšie prevedenie
 CronDtLastLaunch=Start date of latest execution
 CronDtLastResult=End date of latest execution
-CronFrequency=Frequency
+CronFrequency=Frekvencia
 CronClass=Class
 CronMethod=Metóda
 CronModule=Modul
 CronNoJobs=Žiadny registrovaný práce
 CronPriority=Priorita
-CronLabel=Label
+CronLabel=Štítok
 CronNbRun=Nb. začať
 CronMaxRun=Max nb. launch
 CronEach=Každý
@@ -65,7 +65,7 @@ CronMethodHelp=Objekt spôsob štartu. <BR> Napr načítať metódy objektu výr
 CronArgsHelp=Metóda argumenty. <BR> Napr načítať metódy objektu výrobku Dolibarr / htdocs / produktu / trieda / product.class.php, môže byť hodnota paramters byť <i>0, ProductRef</i>
 CronCommandHelp=Systém príkazového riadka spustiť.
 CronCreateJob=Create new Scheduled Job
-CronFrom=From
+CronFrom=Z
 # Info
 # Common
 CronType=Job type
diff --git a/htdocs/langs/sk_SK/errors.lang b/htdocs/langs/sk_SK/errors.lang
index 9755abc13d5..1370f0edf3a 100644
--- a/htdocs/langs/sk_SK/errors.lang
+++ b/htdocs/langs/sk_SK/errors.lang
@@ -11,6 +11,7 @@ ErrorLoginAlreadyExists=Prihlásenie %s už existuje.
 ErrorGroupAlreadyExists=Skupina %s už existuje.
 ErrorRecordNotFound=Záznam nie je nájdený.
 ErrorFailToCopyFile=Nepodarilo sa skopírovať súbor <b>&quot;%s&quot;</b> na <b>&quot;%s&quot;.</b>
+ErrorFailToCopyDir=Failed to copy directory '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToRenameFile=Nepodarilo sa premenovať súbor <b>&quot;%s&quot;</b> na <b>&quot;%s&quot;.</b>
 ErrorFailToDeleteFile=Nepodarilo sa odstrániť súbor <b>&quot;%s&quot;.</b>
 ErrorFailToCreateFile=Nepodarilo sa vytvoriť súbor <b>&quot;%s&quot;.</b>
@@ -115,7 +116,7 @@ ErrorNoActivatedBarcode=Žiaden čiarový kód aktivovaný typ
 ErrUnzipFails=Nepodarilo sa rozbaliť %s s ZipArchive
 ErrNoZipEngine=No motor rozbaliť %s súbor v tomto PHP
 ErrorFileMustBeADolibarrPackage=Súborov %s musí byť zips Dolibarr balíček
-ErrorFileRequired=Trvá balíček Dolibarr súbor
+ErrorModuleFileRequired=You must select a Dolibarr module package file
 ErrorPhpCurlNotInstalled=PHP CURL nie je nainštalovaný, je to nevyhnutné hovoriť s Paypal
 ErrorFailedToAddToMailmanList=Nepodarilo sa pridať záznam do %s %s poštár zoznamu alebo SPIP základne
 ErrorFailedToRemoveToMailmanList=Nepodarilo sa odstrániť záznam %s %s na zoznam poštár alebo SPIP základne
@@ -170,14 +171,19 @@ ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
 ErrorFileMustHaveFormat=File must have format %s
 ErrorSupplierCountryIsNotDefined=Krajina tohto dodávateľa nie je definovaná. Najprv to to treba opraviť.
 ErrorsThirdpartyMerge=Failed to merge the two records. Request canceled.
-ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enougth for product %s to add it into a new order.
-ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enougth for product %s to add it into a new invoice.
-ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enougth for product %s to add it into a new shipment.
-ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enougth for product %s to add it into a new proposal.
-ErrorFailedToLoadLoginFileForMode=Failed to get the login file for mode '%s'.
+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 bank 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>
 
 # 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.
diff --git a/htdocs/langs/sk_SK/holiday.lang b/htdocs/langs/sk_SK/holiday.lang
index 5c5cf955158..31691d35d02 100644
--- a/htdocs/langs/sk_SK/holiday.lang
+++ b/htdocs/langs/sk_SK/holiday.lang
@@ -76,8 +76,9 @@ BoxTitleLastLeaveRequests=Latest %s modified leave requests
 HolidaysMonthlyUpdate=Mesačná aktualizácia
 ManualUpdate=Manuálna aktualizácia
 HolidaysCancelation=Leave request cancelation
-EmployeeLastname=Employee lastname
-EmployeeFirstname=Employee firstname
+EmployeeLastname=Employee last name
+EmployeeFirstname=Employee first name
+TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
 
 ## Configuration du Module ##
 LastUpdateCP=Latest automatic update of leaves allocation
diff --git a/htdocs/langs/sk_SK/ldap.lang b/htdocs/langs/sk_SK/ldap.lang
index 95f2fbfc644..8a00ee6572a 100644
--- a/htdocs/langs/sk_SK/ldap.lang
+++ b/htdocs/langs/sk_SK/ldap.lang
@@ -13,8 +13,8 @@ LDAPUsers=Užívatelia v LDAP databáze
 LDAPFieldStatus=Postavenie
 LDAPFieldFirstSubscriptionDate=Prvý dátum predplatné
 LDAPFieldFirstSubscriptionAmount=Prvý úpisu
-LDAPFieldLastSubscriptionDate=Posledný dátum predplatné
-LDAPFieldLastSubscriptionAmount=Posledný úpisu
+LDAPFieldLastSubscriptionDate=Latest subscription date
+LDAPFieldLastSubscriptionAmount=Latest subscription amount
 LDAPFieldSkype=Skype ID
 LDAPFieldSkypeExample=Príklad" skypeMeno
 UserSynchronized=Užívateľ synchronizované
diff --git a/htdocs/langs/sk_SK/mails.lang b/htdocs/langs/sk_SK/mails.lang
index beb0858ca13..ebc1a5b2900 100644
--- a/htdocs/langs/sk_SK/mails.lang
+++ b/htdocs/langs/sk_SK/mails.lang
@@ -35,7 +35,7 @@ MailingStatusSentPartialy=Odoslané čiastočne
 MailingStatusSentCompletely=Odoslané úplne
 MailingStatusError=Chyba
 MailingStatusNotSent=Neposlal
-MailSuccessfulySent=E-mail úspešne odoslaný (od %s na %s)
+MailSuccessfulySent=Email successfully accepted for delivery (from %s to %s)
 MailingSuccessfullyValidated=E-mailom úspešne overená
 MailUnsubcribe=Odhlásiť
 MailingStatusNotContact=Nedotýkajte sa už
@@ -74,22 +74,28 @@ ResultOfMailSending=Result of mass EMail sending
 NbSelected=Nb selected
 NbIgnored=Nb ignored
 NbSent=Nb 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
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Linka %s v súbore
 RecipientSelectionModules=Definované požiadavky na výber príjemcov
 MailSelectedRecipients=Vybrané príjemcovi
 MailingArea=EMailings oblasť
-LastMailings=Posledný %s emailings
+LastMailings=Latest %s emailings
 TargetsStatistics=Ciele štatistiky
 NbOfCompaniesContacts=Unikátny kontakty / adresy
 MailNoChangePossible=Príjemcovia pre validované rozosielanie nemožno zmeniť
 SearchAMailing=Hľadať mailing
 SendMailing=Poslať e-mailom
 SendMail=Odoslať e-mail
-MailingNeedCommand=Z bezpečnostných dôvodov, odosielanie e-mailom, je lepšie, keď vykonáva z príkazového riadku. Ak máte jeden, požiadajte správcu servera spustiť nasledujúci príkaz pre odoslanie e-mailom všetkým príjemcom:
+SentBy=Odosielateľ:
+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=Však môžete zaslať on-line pridaním parametra MAILING_LIMIT_SENDBYWEB s hodnotou max počet e-mailov, ktoré chcete poslať zasadnutí. K tomu, prejdite na doma - Nastavenie - Ostatné.
-ConfirmSendingEmailing=If you can't or prefer sending them with your www browser, please confirm you are sure you want to send emailing now from your browser?
+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.
 TargetsReset=Vymazať zoznam
 ToClearAllRecipientsClickHere=Kliknite tu pre vymazanie zoznamu príjemcov tohto rozosielanie
@@ -144,3 +150,6 @@ AdvTgtCreateFilter=Create filter
 AdvTgtOrCreateNewFilter=Name of new filter
 NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
+OutGoingEmailSetup=Outgoing email setup
+InGoingEmailSetup=Incoming email setup
+
diff --git a/htdocs/langs/sk_SK/main.lang b/htdocs/langs/sk_SK/main.lang
index eb36b21b1fb..c862c55ded6 100644
--- a/htdocs/langs/sk_SK/main.lang
+++ b/htdocs/langs/sk_SK/main.lang
@@ -63,11 +63,13 @@ ErrorNoVATRateDefinedForSellerCountry=Chyba, žiadne sadzby DPH stanovenej pre k
 ErrorNoSocialContributionForSellerCountry=Error, no social/fiscal taxes type defined for country '%s'.
 ErrorFailedToSaveFile=Chyba sa nepodarilo uložiť súbor.
 ErrorCannotAddThisParentWarehouse=You are trying to add a parent warehouse which is already a child of current one
+MaxNbOfRecordPerPage=Max nb of record per page
 NotAuthorized=You are not authorized to do that.
 SetDate=Nastaviť dátum
 SelectDate=Vybrať dátum
 SeeAlso=Pozri tiež %s
 SeeHere=Viď tu
+Apply=Platiť
 BackgroundColorByDefault=Predvolené farba pozadia
 FileRenamed=The file was successfully renamed
 FileUploaded=Súbor sa úspešne nahral
@@ -86,7 +88,7 @@ Undefined=Undefined
 PasswordForgotten=Password forgotten?
 SeeAbove=Pozri vyššie
 HomeArea=Hlavná oblasť
-LastConnexion=Posledné pripojenie
+LastConnexion=Latest connection
 PreviousConnexion=Predchádzajúca pripojenie
 PreviousValue=Previous value
 ConnectedOnMultiCompany=Pripojené na životné prostredie
@@ -236,7 +238,7 @@ DateCreation=Dátum vytvorenia
 DateCreationShort=Creat. date
 DateModification=Dátum zmeny
 DateModificationShort=Modify. dátum
-DateLastModification=Dátum poslednej modifikácie
+DateLastModification=Latest modification date
 DateValidation=Dátum overenia
 DateClosing=Uzávierka
 DateDue=Dátum splatnosti
@@ -432,7 +434,7 @@ Reportings=Hlásenie
 Draft=Návrh
 Drafts=Dáma
 Validated=Overené
-Opened=Otvorení
+Opened=Otvorené
 New=Nový
 Discount=Zľava
 Unknown=Neznámy
@@ -460,6 +462,7 @@ DeletePicture=Picture delete
 ConfirmDeletePicture=Confirm picture deletion?
 Login=Prihlásenie
 CurrentLogin=Aktuálne login
+EnterLoginDetail=Enter login details
 January=Január
 February=Február
 March=Marec
@@ -597,6 +600,8 @@ SessionName=Názov relácie
 Method=Metóda
 Receive=Prijať
 CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
+ExpectedValue=Expected Value
+CurrentValue=Súčasná hodnota
 PartialWoman=Čiastočný
 TotalWoman=Celkový
 NeverReceived=Nikdy nedostal
@@ -753,6 +758,8 @@ RemoveString=Remove string '%s'
 SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
 DirectDownloadLink=Direct download link
 Download=Download
+ActualizeCurrency=Update currency rate
+Fiscalyear=Fiškálny rok
 # Week day
 Monday=Pondelok
 Tuesday=Utorok
@@ -787,8 +794,8 @@ SetRef=Set ref
 Select2ResultFoundUseArrows=Some results found. Use arrows to select.
 Select2NotFound=No result found
 Select2Enter=Enter
-Select2MoreCharacter=or more character
-Select2MoreCharacters=or more characters
+Select2MoreCharacter=or more characters<br /><br /><strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
+Select2MoreCharacters=or more characters<br /><br /><strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
 Select2LoadingMoreResults=Loading more results...
 Select2SearchInProgress=Search in progress...
 SearchIntoThirdparties=Thirdparties
@@ -809,3 +816,5 @@ SearchIntoContracts=Zmluvy
 SearchIntoCustomerShipments=Customer shipments
 SearchIntoExpenseReports=Expense reports
 SearchIntoLeaves=Leaves
+
+BulkActions=Bulk actions
diff --git a/htdocs/langs/sk_SK/members.lang b/htdocs/langs/sk_SK/members.lang
index 8809e28d8ad..cf66b353aff 100644
--- a/htdocs/langs/sk_SK/members.lang
+++ b/htdocs/langs/sk_SK/members.lang
@@ -45,7 +45,7 @@ MemberStatusDraft=Návrh (musí byť overená)
 MemberStatusDraftShort=Návrh
 MemberStatusActive=Overené (čaká predplatné)
 MemberStatusActiveShort=Overené
-MemberStatusActiveLate=predplatné vypršalo
+MemberStatusActiveLate=Subscription expired
 MemberStatusActiveLateShort=Vypršala
 MemberStatusPaid=Zasielanie noviniek aktuálnej
 MemberStatusPaidShort=Až do dnešného dňa
@@ -136,8 +136,8 @@ DocForAllMembersCards=Vytvoriť vizitky pre všetkých členov
 DocForOneMemberCards=Vytvoriť vizitky pre konkrétny člena
 DocForLabels=Vytvoriť adresy listy
 SubscriptionPayment=Zasielanie noviniek platba
-LastSubscriptionDate=Posledný dátum predplatné
-LastSubscriptionAmount=Posledný úpisu
+LastSubscriptionDate=Latest subscription date
+LastSubscriptionAmount=Latest subscription amount
 MembersStatisticsByCountries=Členovia Štatistiky podľa krajiny
 MembersStatisticsByState=Členovia štatistika štát / provincia
 MembersStatisticsByTown=Členovia štatistika podľa mesta
@@ -149,7 +149,7 @@ MembersByStateDesc=Táto obrazovka vám ukáže štatistiku členov podľa štá
 MembersByTownDesc=Táto obrazovka vám ukáže štatistiku členom mesta.
 MembersStatisticsDesc=Zvoľte štatistík, ktoré chcete čítať ...
 MenuMembersStats=Štatistika
-LastMemberDate=Posledný člen Dátum
+LastMemberDate=Latest member date
 Nature=Príroda
 Public=Informácie sú verejné
 NewMemberbyWeb=Nový užívateľ pridaný. Čaká na schválenie
diff --git a/htdocs/langs/sk_SK/orders.lang b/htdocs/langs/sk_SK/orders.lang
index c419955f5f6..7602a984ec0 100644
--- a/htdocs/langs/sk_SK/orders.lang
+++ b/htdocs/langs/sk_SK/orders.lang
@@ -39,7 +39,7 @@ StatusOrderRefusedShort=Odmietol
 StatusOrderBilledShort=Účtované
 StatusOrderToProcessShort=Ak chcete spracovať
 StatusOrderReceivedPartiallyShort=Čiastočne uložený
-StatusOrderReceivedAllShort=Všetko, čo dostal
+StatusOrderReceivedAllShort=Products received
 StatusOrderCanceled=Zrušený
 StatusOrderDraft=Návrh (musí byť overená)
 StatusOrderValidated=Overené
@@ -51,7 +51,7 @@ StatusOrderApproved=Schválený
 StatusOrderRefused=Odmietol
 StatusOrderBilled=Účtované
 StatusOrderReceivedPartially=Čiastočne uložený
-StatusOrderReceivedAll=Všetko, čo dostal
+StatusOrderReceivedAll=All products received
 ShippingExist=Zásielka existuje
 QtyOrdered=Množstvo objednať
 ProductQtyInDraft=Product quantity into draft orders
diff --git a/htdocs/langs/sk_SK/other.lang b/htdocs/langs/sk_SK/other.lang
index 18549188bc6..d246e62180c 100644
--- a/htdocs/langs/sk_SK/other.lang
+++ b/htdocs/langs/sk_SK/other.lang
@@ -2,6 +2,7 @@
 SecurityCode=Bezpečnostný kód
 NumberingShort=N°
 Tools=Nástroje
+TMenuTools=Nástroje
 ToolsDesc=All miscellaneous tools not included in other menu entries are collected here.<br /><br />All the tools can be reached in the left menu.
 Birthday=Narodeniny
 BirthdayDate=Birthday date
@@ -67,14 +68,15 @@ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find her
 PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nYou will find here the shipping __SHIPPINGREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nYou will find here the intervention __FICHINTERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n__PERSONALIZED__\n\n__SIGNATURE__
-DemoDesc=Dolibarr is a compact ERP/CRM supporting several functional modules. A demo showcasing all modules makes no sense as this scenario never occurs. So, several demo profiles are available.
+DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
+ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
 DemoFundation=Správa členov nadácie
 DemoFundation2=Správa členov a bankový účet nadácie
-DemoCompanyServiceOnly=Spravovanie voľnej nohe činnosť predajnú činnosť iba
+DemoCompanyServiceOnly=Company or freelance selling service only
 DemoCompanyShopWithCashDesk=Správa obchod s pokladňou
-DemoCompanyProductAndStocks=Spravovanie malý alebo stredný podnik, ktorý predáva výrobky
-DemoCompanyAll=Správa malú alebo strednú firmu s viacerými činnosťami (všetky hlavné moduly)
+DemoCompanyProductAndStocks=Company selling products with a shop
+DemoCompanyAll=Company with multiple activities (all main modules)
 CreatedBy=Vytvoril %s
 ModifiedBy=Zmenil %s
 ValidatedBy=Overená %s
diff --git a/htdocs/langs/sk_SK/products.lang b/htdocs/langs/sk_SK/products.lang
index ff6541d21d1..6905ba7d843 100644
--- a/htdocs/langs/sk_SK/products.lang
+++ b/htdocs/langs/sk_SK/products.lang
@@ -5,6 +5,8 @@ ProductLabelTranslated=Preložený názov produktu
 ProductDescriptionTranslated=Preložený popis produktu
 ProductNoteTranslated=Preložená poznámka produktu
 ProductServiceCard=Produkty / služby karty
+TMenuProducts=Produkty
+TMenuServices=Služby
 Products=Produkty
 Services=Služby
 Product=Produkt
@@ -58,7 +60,7 @@ SellingPrice=Predajná cena
 SellingPriceHT=Predajná cena (bez DPH)
 SellingPriceTTC=Predajná cena (s DPH)
 CostPriceDescription=Táto cena (  po odpočítani daňe ) môže byť použitá pri výpočte nákladov  na tento produkt. Može to byt hocijaká cena ktorú vypočítate. Napr. priemerná nákupná cena plus priemerná cena produkcie a distribúcie.
-CostPriceUsage=V budúcej verzii môže byť táto hodnota použitá pre kalkuláciu tržby
+CostPriceUsage=This value could be used for margin calculation.
 SoldAmount=Predané množstvo
 PurchasedAmount=Kúpené množstvo
 NewPrice=Nová cena
@@ -140,6 +142,7 @@ ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b>?
 CloneContentProduct=Klon všetky hlavné informácie o produkte / služby
 ClonePricesProduct=Klonovať hlavné informácie a ceny
 CloneCompositionProduct=Duplikovať balík produktov/služieb
+CloneCombinationsProduct=Clone product variants
 ProductIsUsed=Tento produkt sa používa
 NewRefForClone=Ref nového produktu / služby
 SellingPrices=Predajné ceny
@@ -236,7 +239,7 @@ GlobalVariables=Globálna premenná
 VariableToUpdate=Premenná pre úpravu
 GlobalVariableUpdaters=Upravovač globálnej premennej
 UpdateInterval=Upraviť interval (minúty)
-LastUpdated=Naposledy upravené
+LastUpdated=Latest update
 CorrectlyUpdated=Správne upravené
 PropalMergePdfProductActualFile=Súbor na pridanie do PDF Azur sú/je
 PropalMergePdfProductChooseFile=Vybrať PDF súbory
@@ -256,4 +259,41 @@ VolumeUnits=Jednotka objemu
 SizeUnits=Jednotka veľkosti
 DeleteProductBuyPrice=Zmazat nákupnú cenu
 ConfirmDeleteProductBuyPrice=Určite chcete zmazať túto nákupnú cenu ?
+SubProduct=Sub product
 
+#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
+ProductCombinations=Variants
+HideProductCombinations=Hide products variant in the products selector
+ProductCombination=Variant
+NewProductCombination=New variant
+EditProductCombination=Editing variant
+ProductCombinationGenerator=Variants generator
+Features=Features
+PriceImpact=Price impact
+WeightImpact=Weight impact
+NewProductAttribute=Nový atribút
+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
+PercentageVariation=Percentage variation
+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 child products
+ConfirmCloneProductCombinations=Would you like to copy all the product variant to the 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
diff --git a/htdocs/langs/sk_SK/projects.lang b/htdocs/langs/sk_SK/projects.lang
index 7a7fabc5eca..128849d06e3 100644
--- a/htdocs/langs/sk_SK/projects.lang
+++ b/htdocs/langs/sk_SK/projects.lang
@@ -29,9 +29,9 @@ DeleteAProject=Odstránenie projektu
 DeleteATask=Ak chcete úlohu
 ConfirmDeleteAProject=Are you sure you want to delete this project?
 ConfirmDeleteATask=Are you sure you want to delete this task?
-OpenedProjects=Open projects
-OpenedTasks=Open tasks
-OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
+OpenedProjects=Opened projects
+OpenedTasks=Opened tasks
+OpportunitiesStatusForOpenedProjects=Opportunities amount of opened projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=Zobraziť projektu
 SetProject=Nastavenie projektu
@@ -47,7 +47,7 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=Užívateľ
 TaskTimeNote=Poznámka
 TaskTimeDate=Date
-TasksOnOpenedProject=Tasks on open projects
+TasksOnOpenedProject=Tasks on opened projects
 WorkloadNotDefined=Workload not defined
 NewTimeSpent=Nový čas strávený
 MyTimeSpent=Môj čas strávený
@@ -58,6 +58,7 @@ TaskDateEnd=Task end date
 TaskDescription=Task description
 NewTask=Nová úloha
 AddTask=Create task
+AddTimeSpent=Create time spent
 Activity=Činnosť
 Activities=Úlohy / aktivity
 MyActivities=Moje úlohy / činnosti
@@ -95,6 +96,7 @@ ValidateProject=Overiť Projet
 ConfirmValidateProject=Are you sure you want to validate this project?
 CloseAProject=Zatvoriť projekt
 ConfirmCloseAProject=Are you sure you want to close this project?
+AlsoCloseAProject=Also close project (keep it open if you still need to follow production tasks on it)
 ReOpenAProject=Otvoriť projekt
 ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=Projekt kontakty
@@ -120,7 +122,7 @@ CloneProjectFiles=Clone projektu pripojil súbory
 CloneTaskFiles=Clone úloha (y) sa pripojil súbory (ak je úloha (y) klonovať)
 CloneMoveDate=Update project/tasks dates from now?
 ConfirmCloneProject=Are you sure to clone this project?
-ProjectReportDate=Zmena úlohy termíne podľa dátumu začatia projektu
+ProjectReportDate=Change task dates according to new project start date
 ErrorShiftTaskDate=Nemožno presunúť úloha termín podľa nový dátum začatia projektu
 ProjectsAndTasksLines=Projekty a úlohy
 ProjectCreatedInDolibarr=Projekt vytvoril %s
@@ -177,9 +179,9 @@ ProjectsStatistics=Statistics on projects/leads
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 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.
-OpenedProjectsByThirdparties=Open projects by thirdparties
+OpenedProjectsByThirdparties=Opened projects by thirdparties
 OnlyOpportunitiesShort=Only opportunities
-OpenedOpportunitiesShort=Open opportunities
+OpenedOpportunitiesShort=Opened opportunities
 NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount
diff --git a/htdocs/langs/sk_SK/propal.lang b/htdocs/langs/sk_SK/propal.lang
index d70368d15b0..dd16d67b4a2 100644
--- a/htdocs/langs/sk_SK/propal.lang
+++ b/htdocs/langs/sk_SK/propal.lang
@@ -3,7 +3,7 @@ Proposals=Komerčné návrhy
 Proposal=Komerčné návrh
 ProposalShort=Návrh
 ProposalsDraft=Navrhnúť obchodné návrhy
-ProposalsOpened=Otvoriť komerčnú ponuku
+ProposalsOpened=Otvorené obchodné návrhy
 Prop=Komerčné návrhy
 CommercialProposal=Komerčné návrh
 ProposalCard=Návrh karty
@@ -13,8 +13,8 @@ Prospect=Vyhliadka
 DeleteProp=Zmazať obchodné návrh
 ValidateProp=Overiť obchodné návrh
 AddProp=Vytvoriť komerčnú ponuku
-ConfirmDeleteProp=Ste si istí, že chcete zmazať tento obchodný návrh?
-ConfirmValidateProp=Ste si istí, že chcete overiť túto obchodnú návrh pod názvom <b>%s?</b>
+ConfirmDeleteProp=Určite chcete zmazať túto komerčnú ponuku ?
+ConfirmValidateProp=Určite chcete overiť túto komerčnú ponuku s týmto menom <b>%s</b>?
 LastPropals=Najnovšie %s ponuky
 LastModifiedProposals=Nedávno %s upravené ponuky
 AllPropals=Všetky návrhy
@@ -26,9 +26,9 @@ AmountOfProposalsByMonthHT=Suma, o mesiac (bez DPH)
 NbOfProposals=Počet obchodných návrhov
 ShowPropal=Zobraziť návrhu
 PropalsDraft=Dáma
-PropalsOpened=Otvoriť
+PropalsOpened=Otvorené
 PropalStatusDraft=Návrh (musí byť overená)
-PropalStatusValidated=Overené (Návrh je v prevádzke)
+PropalStatusValidated=Validated (proposal is opened)
 PropalStatusSigned=Podpis (potreby fakturácia)
 PropalStatusNotSigned=Nie ste prihlásený (uzavretý)
 PropalStatusBilled=Účtované
@@ -56,8 +56,8 @@ CreateEmptyPropal=Vytvorte prázdny obchodné návrhy vierge alebo zo zoznamu pr
 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
 ClonePropal=Klon obchodné návrh
-ConfirmClonePropal=Ste si istí, že chcete klonovať komerčné návrhu <b>%s?</b>
-ConfirmReOpenProp=Ste si istí, že chcete otvoriť späť komerčné návrhu <b>%s?</b>
+ConfirmClonePropal=Určite chcete duplikovať komerčnú ponuku <b>%s</b>?
+ConfirmReOpenProp=Určite chcete znova otvoriť komerčnú ponuku <b>%s</b>?
 ProposalsAndProposalsLines=Komerčné návrh a vedenie
 ProposalLine=Návrh linky
 AvailabilityPeriod=Dostupnosť meškanie
diff --git a/htdocs/langs/sk_SK/stocks.lang b/htdocs/langs/sk_SK/stocks.lang
index 61625fb9a40..a5d08dbb5b5 100644
--- a/htdocs/langs/sk_SK/stocks.lang
+++ b/htdocs/langs/sk_SK/stocks.lang
@@ -22,13 +22,15 @@ Movements=Pohyby
 ErrorWarehouseRefRequired=Referenčné meno skladu je povinné
 ListOfWarehouses=Zoznam skladov
 ListOfStockMovements=Zoznam skladových pohybov
+StockMovementForId=Movement ID %d
+ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Oblasť skladov
 Location=Umiestnenie
 LocationSummary=Krátky názov umiestnenia
 NumberOfDifferentProducts=Počet rôznych výrobkov
 NumberOfProducts=Celkový počet produktov
-LastMovement=Posledný pohyb
-LastMovements=Posledné pohyby
+LastMovement=Latest movement
+LastMovements=Latest movements
 Units=Jednotky
 Unit=Jednotka
 StockCorrection=Opraviť zásoby
@@ -140,3 +142,4 @@ ProductStockWarehouseCreated=Limit zásob pre upozornenie a optimálne požadova
 ProductStockWarehouseUpdated=Limit zásob pre upozornenie a optimálne požadované zásoby správne upravené
 ProductStockWarehouseDeleted=Limit zásob pre upozornenie a optimálne požadované zásoby správne zmazané
 AddNewProductStockWarehouse=Zadajte nový limit pre upozornenie a optimálne požadované zásoby
+AddStockLocationLine=Decrease quantity then click to add another warehouse for this product
diff --git a/htdocs/langs/sk_SK/supplier_proposal.lang b/htdocs/langs/sk_SK/supplier_proposal.lang
index e9915dc3ec4..aa3ec673180 100644
--- a/htdocs/langs/sk_SK/supplier_proposal.lang
+++ b/htdocs/langs/sk_SK/supplier_proposal.lang
@@ -8,7 +8,7 @@ SearchRequest=Nájsť požiadávku
 DraftRequests=Návrh požiadávky
 SupplierProposalsDraft=Návrh dodávatelskej ponuky
 LastModifiedRequests=Najnovšie %s upravené cenové požiadavky
-RequestsOpened=Otvorené cenoé požiadávky
+RequestsOpened=Opened price requests
 SupplierProposalArea=Oblasť dodávateľských ponúk
 SupplierProposalShort=Dodávatelská ponuka
 SupplierProposals=Dodávatelské ponuky
@@ -23,7 +23,7 @@ ConfirmValidateAsk=Určite chcete overiť túto cenovú požiadávku pod menom <
 DeleteAsk=Zmazať požiadávku
 ValidateAsk=Overiť požiadávku
 SupplierProposalStatusDraft=Návrh (musí byť overená)
-SupplierProposalStatusValidated=Overené ( žiadosť je otvorená )
+SupplierProposalStatusValidated=Validated (request is opened)
 SupplierProposalStatusClosed=Zatvorené
 SupplierProposalStatusSigned=Akceptované
 SupplierProposalStatusNotSigned=Odmietol
diff --git a/htdocs/langs/sk_SK/suppliers.lang b/htdocs/langs/sk_SK/suppliers.lang
index 83444baefe4..e057be022f6 100644
--- a/htdocs/langs/sk_SK/suppliers.lang
+++ b/htdocs/langs/sk_SK/suppliers.lang
@@ -1,19 +1,19 @@
 # Dolibarr language file - Source file is en_US - suppliers
 Suppliers=Dodávatelia
 SuppliersInvoice=Dodávateľská faktúra
-ShowSupplierInvoice=Show Supplier Invoice
+ShowSupplierInvoice=Zobraziť dodávatelskú faktúru
 NewSupplier=Nový dodávateľ
 History=História
 ListOfSuppliers=Zoznam dodávateľov
 ShowSupplier=Zobraziť dodávateľa
 OrderDate=Dátum objednávky
-BuyingPriceMin=Best buying price
-BuyingPriceMinShort=Best buying price
-TotalBuyingPriceMinShort=Total of subproducts buying prices
-TotalSellingPriceMinShort=Total of subproducts selling prices
+BuyingPriceMin=Najlepšia nákupná cena
+BuyingPriceMinShort=Najlepšia nákupná cena
+TotalBuyingPriceMinShort=Celková nákupná cena podradených výrobkov
+TotalSellingPriceMinShort=Celková predajná cena podprodukrov
 SomeSubProductHaveNoPrices=Niektoré podradené výrobky nemajú určenú cenu.
-AddSupplierPrice=Add buying price
-ChangeSupplierPrice=Change buying price
+AddSupplierPrice=Pridať nákupnú cenu
+ChangeSupplierPrice=Zmeniť nákupnú cenu
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=Tento odkaz Dodávateľ je už spojená s odkazom: %s
 NoRecordedSuppliers=Žiadni zaznamenaní dodávatelia
 SupplierPayment=Dodávateľská platba
@@ -24,10 +24,10 @@ ExportDataset_fournisseur_1=Zoznam dodávateľských faktúr a položiek
 ExportDataset_fournisseur_2=Dodávateľské faktúry a platby
 ExportDataset_fournisseur_3=Dodávateľské objednávky a položky
 ApproveThisOrder=Schváliť túto objednávku
-ConfirmApproveThisOrder=Ste si istí, že chcete schváliť objednávku <b>%s</b>?
+ConfirmApproveThisOrder=Určite chcete potvrdiť objednávku <b>%s</b>?
 DenyingThisOrder=Odmietnuť objednávku
-ConfirmDenyingThisOrder=Ste si istí, že chcete odmietnuť objednávku <b>%s</b>?
-ConfirmCancelThisOrder=Ste si istí, že chcete zrušiť túto objednávku <b>%s</b>?
+ConfirmDenyingThisOrder=Určite chcete zamietnúť objednávku <b>%s</b>?
+ConfirmCancelThisOrder=Určite chcete zrušiť objednávku <b>%s</b>?
 AddSupplierOrder=Vytvoriť dodávateľskú objednávku
 AddSupplierInvoice=Vytvoriť dodávateľskú faktúru
 ListOfSupplierProductForSupplier=Zoznam výrobkov a cien dodávateľa <b>%s</b>
@@ -35,9 +35,10 @@ SentToSuppliers=Odoslané dodávateľom
 ListOfSupplierOrders=Zoznam dodávateľských objednávok
 MenuOrdersSupplierToBill=Vytvoriť faktúru z dodávateľskej objednávky
 NbDaysToDelivery=Zdržanie dodávky v dňoch
-DescNbDaysToDelivery=The biggest deliver delay of the products from this order
-SupplierReputation=Supplier reputation
-DoNotOrderThisProductToThisSupplier=Do not order
-NotTheGoodQualitySupplier=Wrong quality
-ReputationForThisProduct=Reputation
-BuyerName=Buyer name
+DescNbDaysToDelivery=Nejväčšie oneskorenie doručenia produktu z tejto objednávky
+SupplierReputation=Reputácia dodávateľa
+DoNotOrderThisProductToThisSupplier=Neobjednávať
+NotTheGoodQualitySupplier=Zlý počet
+ReputationForThisProduct=Reputácia
+BuyerName=Meno kupcu
+AllProductServicePrices=All product / service prices
diff --git a/htdocs/langs/sk_SK/withdrawals.lang b/htdocs/langs/sk_SK/withdrawals.lang
index 41ea9549fa9..ba1f35f731f 100644
--- a/htdocs/langs/sk_SK/withdrawals.lang
+++ b/htdocs/langs/sk_SK/withdrawals.lang
@@ -24,6 +24,7 @@ WithdrawStatistics=Direct debit payment statistics
 WithdrawRejectStatistics=Direct debit payment reject statistics
 LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
+WithdrawRequestsDone=%s direct debit payment requests recorded
 ThirdPartyBankCode=Treťou stranou kód banky
 NoInvoiceCouldBeWithdrawed=Nie faktúra withdrawed s úspechom. Skontrolujte, že faktúry sú na firmy s platným BAN.
 ClassCredited=Klasifikovať pripísaná
@@ -76,8 +77,8 @@ RUM=UMR
 RUMLong=Unique Mandate Reference
 RUMWillBeGenerated=UMR number will be generated once bank account information are saved
 WithdrawMode=Direct debit mode (FRST or RECUR)
-WithdrawRequestAmount=Withdraw request amount:
-WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil amount.
+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
diff --git a/htdocs/langs/sl_SI/accountancy.lang b/htdocs/langs/sl_SI/accountancy.lang
index d5e415c1396..606f39ed6af 100644
--- a/htdocs/langs/sl_SI/accountancy.lang
+++ b/htdocs/langs/sl_SI/accountancy.lang
@@ -194,6 +194,8 @@ ChangeBinding=Change the binding
 
 ## Admin
 ApplyMassCategories=Apply mass categories
+AddAccountFromBookKeepingWithNoCategories=Add acccount already used with no categories
+CategoryDeleted=Category for the accounting account has been removed
 
 ## Export
 Exports=Izvoz
@@ -209,6 +211,7 @@ Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution
 Modelcsv_quadratus=Export towards Quadratus QuadraCompta
 Modelcsv_ebp=Export towards EBP
 Modelcsv_cogilog=Export towards Cogilog
+ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
 InitAccountancy=Init accountancy
diff --git a/htdocs/langs/sl_SI/admin.lang b/htdocs/langs/sl_SI/admin.lang
index 5cc8aa7e833..b17722f2338 100644
--- a/htdocs/langs/sl_SI/admin.lang
+++ b/htdocs/langs/sl_SI/admin.lang
@@ -9,14 +9,20 @@ VersionDevelopment=Razvojna
 VersionUnknown=Neznana
 VersionRecommanded=Priporočena
 FileCheck=Files integrity checker
-FileCheckDesc=This tool allows you to check the integrity of files of your application, comparing each files with the official ones. You can use this tool to detect if some files were modified by a hacker for example.
+FileCheckDesc=This tool allows you to check the integrity of files and setup of your application, comparing each files with the official ones. 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.
+FileIntegrityIsStrictlyConformedWithReference=Files integrity is strictly conformed with the reference.
+FileIntegrityIsOkButFilesWereAdded=Files integrity check has passed, however some new files were added.
+FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified, removed or added.
+GlobalChecksum=Global checksum
 MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
 LocalSignature=Embedded local signature (less reliable)
 RemoteSignature=Remote distant signature (more reliable)
 FilesMissing=Manjkajoče datoteke
 FilesUpdated=Posodobljene datoteke
+FilesModified=Modified Files
+FilesAdded=Added Files
 FileCheckDolibarr=Check integrity of application files
-AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from a certified package
+AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from an official package
 XmlNotFound=Xml Integrity File of application not found
 SessionId=ID seje
 SessionSaveHandler=Rutina za shranjevanje seje
@@ -185,7 +191,9 @@ BoxesDesc=Widgets are components showing some information that you can add to pe
 OnlyActiveElementsAreShown=Prikazani so samo elementi <a href="%s">omogočenih modulov </a>.
 ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
-ModulesMarketPlaces=Več modulov...
+ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
+ModulesMarketPlaces=Find external modules...
+GoModuleSetupArea=To deploy/install a new module, go onto the Module setup area at <a href="%s">%s</a>.
 DoliStoreDesc=DoliStore, uradna tržnica za Dolibarr ERP/CRM zunanje module
 DoliPartnersDesc=List of companies providing custom developed modules or features (Note: anyone experienced in PHP programming can provide custom development for an open source project)
 WebSiteDesc=Reference websites to find more modules...
@@ -276,21 +284,22 @@ ModuleFamilyInterface=Interfaces with external systems
 MenuHandlers=Menijski vmesniki
 MenuAdmin=Urejevalnik menijev
 DoNotUseInProduction=Ne uporabljajte v proizvodnji
-ThisIsProcessToFollow=To je nastavitev za proces:
-ThisIsAlternativeProcessToFollow=To je alternativna nastavitev za proces:
+ThisIsProcessToFollow=This is steps to process:
+ThisIsAlternativeProcessToFollow=This is an alternative setup to process manually:
 StepNb=Korak %s
 FindPackageFromWebSite=Poiščite paket, ki omogoča funkcijo, ki jo želite (na primer na spletni strani %s).
 DownloadPackageFromWebSite=Prenesite paket (na primer z uradne spletne strani %s).
-UnpackPackageInDolibarrRoot=Razširite paketno datoteko v mapo na Dolibarr strežniku, ki je namenjena zunanjim modulom: <b>%s</b>
-SetupIsReadyForUse=Instalacija je zaključena in Dolibarr je pripravljen na uporabo s to novo komponento.
-NotExistsDirect=Ni definirana alternativna korenska mapa.<br>
-InfDirAlt=Od 3. različice dalje je možno definirati alternativno korensko mapo. To omogoča shranjevanje vtičnikov in uporabniških predlog na isto mesto.<br>Ustvariti je potrebno samo mapo v korenu Dolibarr (npr: custom).<br>
-InfDirExample=<br>Nato jo določite v datoteki conf.php<br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>*Te vrstice so označene kot komentar z znakom "#", če želite, da bodo vrstice izvedene, odstranite ta znak.
+UnpackPackageInDolibarrRoot=Unpack the packaged files into server directory dedicated to Dolibarr: <b>%s</b>
+UnpackPackageInModulesRoot=To deploy/install an external module, unpack the packaged files into the server directory dedicated to modules: <b>%s</b>
+SetupIsReadyForUse=Module deployment is finished. You must however enable and setup the module in your application by going on the page to setup modules: <a href="%s">%s</a>.
+NotExistsDirect=The alternative root directory is not defined to an existing directory.<br>
+InfDirAlt=Since version 3, it is possible to define an alternative root directory. This allows you to store, into a dedicated directory, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
+InfDirExample=<br>Then declare it in the file <strong>conf.php</strong><br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>If these lines are commented with "#", to enable them, just uncomment by removing the "#" character.
 YouCanSubmitFile=V tem koraku lahko pošljete paket s pomočjo tega orodja: Izberite datoteko modula
 CurrentVersion=Trenutna različica Dolibarr
 CallUpdatePage=Go to the page that updates the database structure and data: %s.
 LastStableVersion=Latest stable version
-LastActivationDate=Last activation date
+LastActivationDate=Latest activation date
 UpdateServerOffline=Posodobitev strežnika brez povezave
 GenericMaskCodes=Vnesete lahko kakršnokoli številčno masko. V tej maski lahko uporabite naslednje oznake:<br><b>{000000}</b> ustreza številki, ki se poveča pri vsakem %s. Vnesite toliko ničel, kot je želena dolžina števca. Števec se bo zapolnil z ničlami na levi strani, da bi velikost ustrezala maski. <br><b>{000000+000}</b> enako kot prej, vendar je desno od znaka + odmik, ki je uporabljen na prvi %s. <br><b>{000000@x}</b> enako kot prej, vendar se števec resetira na 0, ko se doseže mesec x (x je med 1 in 12). Če je uporabljena ta opcija, ,in je x enak ali večji od 2, je zahtevana tudi sekvenca {yy}{mm} ali {yyyy}{mm}. <br><b>{dd}</b> dan (01 do 31).<br><b>{mm}</b> mesec (01 do 12).<br><b>{yy}</b>, <b>{yyyy}</b> ali <b>{y}</b> leto, izraženo z 2, 4 ali 1 številko. <br>
 GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
@@ -373,11 +382,11 @@ ExtrafieldCheckBox=Potrditveno polje
 ExtrafieldRadio=Radijski gumb
 ExtrafieldCheckBoxFromList= Potrditveno polje iz tabele
 ExtrafieldLink=Poveži z objektom
-ExtrafieldParamHelpselect=Seznam parametrov mora biti kot ključ,vrednost<br><br> na primer : <br>1,vrednost1<br>2,vrednost2<br>3,vrednost3<br>...<br><br>Če želite imeti seznam odvisen od drugega :<br>1,vrednost1|parent_list_code:parent_key<br>2,vrednost2|parent_list_code:parent_key
+ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list :<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list :<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=Seznam parametrov mora biti kot ključ,vrednost<br><br> na primer : <br>1,vrednost1<br>2,vrednost2<br>3,vrednost3<br>...
 ExtrafieldParamHelpradio=Seznam parametrov mora biti kot ključ,vrednost<br><br> na primer : <br>1,vrednost1<br>2,vrednost2<br>3,vrednost3<br>...
-ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
-ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
+ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Example : Societe:societe/class/societe.class.php
 LibraryToBuildPDF=Library used for PDF generation
 WarningUsingFPDF=Pozor: vaš <b>conf.php</b> vsebuje direktivo <b>dolibarr_pdf_force_fpdf=1</b>. To pomeni, da uporabljate knjižnico FPDF za generiranje PDF datotek. Ta knjižnica je stara in ne podpira številnih značilnosti (Unicode, transparentnost slike, cirilico, arabske in azijske jezike, ...), zado lahko med generiranjem PDF pride do napak.<br>Za rešitev tega problema in polno podporo PDF generiranja, prosimo da naložite <a href="http://www.tcpdf.org/" target="_blank">TCPDF knjižnico</a>, nato označite kot komentar ali odstranite vrstico <b>$dolibarr_pdf_force_fpdf=1</b>, in namesto nje dodajte <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
@@ -411,10 +420,11 @@ ModuleCompanyCodePanicum=Predlaga prazno računovodsko kodo.
 ModuleCompanyCodeDigitaria=Računovodska koda je odvisna od kode partnerja. Koda je sestavljena iz črke "C" prvih 5 znakov kode partnerja.
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
-
+WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<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).
+ClickToShowDescription=Click to show description
 # Modules
 Module0Name=Uporabniki & skupine
-Module0Desc=Upravljanje uporabnikov in skupin
+Module0Desc=Users / Employees and Groups management
 Module1Name=Partnerji
 Module1Desc=Upravljanje podjetij in kontaktov
 Module2Name=Komerciala
@@ -515,8 +525,8 @@ Module2200Name=Dinamične cene
 Module2200Desc=Omogoči uporabo matematičnih formul za izračun cen
 Module2300Name=Periodično opravilo
 Module2300Desc=Načrtovano upravljanje del
-Module2400Name=Agenda/Events
-Module2400Desc=Follow events or rendez-vous. Record manual events into Agendas or let application logs automatic events for tracking purposes.
+Module2400Name=Events/Agenda
+Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous.
 Module2500Name=Upravljanje elektronskih vsebin
 Module2500Desc=Shranjevanje dokumentov in dajanje v skupno rabo
 Module2600Name=API/Web services (SOAP server)
@@ -582,7 +592,7 @@ Permission34=Brisanje proizvodov
 Permission36=Pregled/upravljanje skritih proizvodov
 Permission38=Izvoz proizvodov
 Permission41=Beri projekte in naloge (za katere sem jaz kontaktna oseba). Lahko se vnese porabljen čas za dodeljeno nalogo (časovnica)
-Permission42=Kreiranje/spreminjanje projektov, urejanje nalog v mojih projektih
+Permission42=Create/modify projects (shared project and projects i'm contact for). Can also create tasks and assign users to project and tasks
 Permission44=Brisanje projektov
 Permission45=Export projects
 Permission61=Branje intervencij
@@ -685,7 +695,7 @@ PermissionAdvanced253=Kreiranje/spreminjanje notranjih/zunanjih uporabnikov in d
 Permission254=Brisanje ali onemogočenje ostalih uporabnikov
 Permission255=Kreiranje/spreminjanje lastnih uporabniških informacij
 Permission256=Spreminjanje lastnega gesla
-Permission262=Razširjen dostop do vseh partnerjev (ne samo tistih, ki so povezani z uporabnikom). Ne velja za zunanje uporabnike (vedno omejeni samo na njihove partnerje).
+Permission262=Extend access to all third parties (not only third parties that user is a sale representative).<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 assignement matters).
 Permission271=Branje CA
 Permission272=Branje računov
 Permission273=Izdaja računov
@@ -887,7 +897,7 @@ Offset=Odmik
 AlwaysActive=Vedno aktiven
 Upgrade=Nadgradnja
 MenuUpgrade=Nadgradnja/razširitev
-AddExtensionThemeModuleOrOther=Dodaj razširitev (tema, modul, ...)
+AddExtensionThemeModuleOrOther=Deploy/install external module
 WebServer=Spletni strežnik
 DocumentRootServer=Korenska mapa spletnega strežnika
 DataRootServer=Mapa s podatkovnimi datotekami
@@ -994,7 +1004,7 @@ TriggerAlwaysActive=Prožilci v tej datoteki so aktivni vedno, ne glede na aktiv
 TriggerActiveAsModuleActive=Prožilci v tej datoteki so aktivni, ker je omogočen modul <b>%s</b> .
 GeneratedPasswordDesc=Tukaj določite, katero pravilo želite uporabiti za generiranje novega gesla, če ste zahtevali avtomatsko generiranje gesla
 DictionaryDesc=Insert all reference data. You can add your values to the default.
-ConstDesc=This page allows you to edit all other parameters not available in previous pages. These are mostly reserved parameters for developers or advanced troubleshooting.
+ConstDesc=This page allows you to edit all other parameters not available in previous pages. These are mostly reserved parameters for developers or advanced troubleshooting. For a list of options <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">check here</a>.
 MiscellaneousDesc=All other security related parameters are defined here.
 LimitsSetup=Nastavitve omejitev/natančnosti
 LimitsDesc=Tukaj lahko definirate omejitve, natančnost in optimizacije, ki jih uporablja Dolibarr
@@ -1161,10 +1171,6 @@ FreeLegalTextOnOrders=Poljubno besedilo na naročilih
 WatermarkOnDraftOrders=Vodni tisk na osnutkih naročil (brez, če je prazno)
 ShippableOrderIconInList=Dodaj ikono na seznamnaročil, ki označuje, če je naročilo pripravljeno za odpremo
 BANK_ASK_PAYMENT_BANK_DURING_ORDER=Vprašaj za končni bančni račun naročila
-##### Clicktodial #####
-ClickToDialSetup=Nastavitve modula za klicanje s klikom
-ClickToDialUrlDesc=Po kliku na piktogram se izvede klic na Url.  Na url lahko uporabite ikono<br><b>__PHONETO__</b> ki predstavlja telefon klicanega<br><b>__PHONEFROM__</b> ki predstavlja telefon klicatelja (vaša številka)<br><b>__LOGIN__</b> ki predstavlja vašo prijavo na klicanje s klikom (določena z vašo uporabniško kodo)<br><b>__PASS__</b> ki predstavlja vaše geslo za klicanje s klikom (določena z vašo uporabniško kodo).
-##### Bookmark4u #####
 ##### Interventions #####
 InterventionsSetup=Nastavitve modula za intervence
 FreeLegalTextOnInterventions=Poljubno besedilo na dokumentih za intervencijo
@@ -1391,7 +1397,7 @@ SendingsSetup=Nastavitev modula za pošiljanje
 SendingsReceiptModel=Obrazci odpremnic
 SendingsNumberingModules=Moduli za številčenje pošiljk
 SendingsAbility=Podpora poslanih dokumentov za dobavo kupcem
-NoNeedForDeliveryReceipts=V večini primerov se dobavnice uporabljajo tako kot dokument za dostavo kupcem (seznam proizvodov, ki jih je potrebno poslati), kakor tudi kot dokument, ki ga dobi in podpiše kupec. Zato je odpremnica podvojena funkcija, ki je redko aktivirana.
+NoNeedForDeliveryReceipts=In most cases, shipping sheets are used both as sheets for customer deliveries (list of products to send) and sheets that is received and signed by customer. So product deliveries receipts is a duplicated feature and is rarely activated.
 FreeLegalTextOnShippings=Prosti tekst na pošiljkah
 ##### Deliveries #####
 DeliveryOrderNumberingModules=Modul za številčenje dobavnic
@@ -1471,7 +1477,11 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Set automatically this default value for type of e
 AGENDA_DEFAULT_FILTER_TYPE=Avtomatsko nastavi ta tip aktivnosti v iskalni filter v pogledu dnevnega reda
 AGENDA_DEFAULT_FILTER_STATUS=Avtomatsko nastavi ta status aktivnosti v iskalni filter v pogledu dnevnega reda
 AGENDA_DEFAULT_VIEW=Kateri zavihek naj se privzeto odpre ko izberete meni Dnevni red
-##### ClickToDial #####
+AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
+AGENDA_NOTIFICATION_SOUND=Enable sound notification
+##### Clicktodial #####
+ClickToDialSetup=Nastavitve modula za klicanje s klikom
+ClickToDialUrlDesc=Po kliku na piktogram se izvede klic na Url.  Na url lahko uporabite ikono<br><b>__PHONETO__</b> ki predstavlja telefon klicanega<br><b>__PHONEFROM__</b> ki predstavlja telefon klicatelja (vaša številka)<br><b>__LOGIN__</b> ki predstavlja vašo prijavo na klicanje s klikom (določena z vašo uporabniško kodo)<br><b>__PASS__</b> ki predstavlja vaše geslo za klicanje s klikom (določena z vašo uporabniško kodo).
 ClickToDialDesc=This module allows to make phone numbers clickable. A click on this icon will call make your phone to 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.
 ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
 ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on same computer than the browser, and called when you click on a link in your browser that start 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.
@@ -1499,10 +1509,11 @@ EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint availa
 ##### API ####
 ApiSetup=Nastavitev modula API
 ApiDesc=Z omogočenjem tega modula postane Dolibarr REST strežnik za zagotavljanje različnih spletnih storitev.
-ApiProductionMode=Enable production mode (this will activate use of a caches for services management)
+ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
 ApiExporerIs=You can explore the APIs at url
 OnlyActiveElementsAreExposed=Izpostavljeni so samo elementi omogočenih modulov
 ApiKey=Ključ za API
+WarningAPIExplorerDisabled=The API explorer has been disabled. API explorer is not required to provide API services. It is a tool for developer to find/test REST APIs. If you need this tool, go into setup of module API REST to activate it.
 ##### Bank #####
 BankSetupModule=Nastavitev modula za banke
 FreeLegalTextOnChequeReceipts=Poljubno besedilo na potrdilu za ček
@@ -1571,7 +1582,7 @@ BackupDumpWizard=Čarovnik za ustvarjanje datoteke z varnostnimi kopijami podatk
 SomethingMakeInstallFromWebNotPossible=Instalacija eksternega modula s spletnega vmesnika ni možna zaradi naslednjega razloga:
 SomethingMakeInstallFromWebNotPossible2=Zaradi tega razloga je tukaj opisan postopek samo ročnih korakov, ki jih lahko naredi le uporabnik z dovoljenjem.
 InstallModuleFromWebHasBeenDisabledByFile=Instalacijo zunanjega modula iz aplikacije je onemogočil vaš administrator. Prositi ga morate, naj odstrani datoteko <strong>%s</strong>, da bi omogočil to funkcijo.
-ConfFileMuseContainCustom=Installing an external module from application save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to have option<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
+ConfFileMuseContainCustom=Installing an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Osvetli vrstice tabele, preko katerih je šla miška
 HighlightLinesColor=Highlight color of the line when the mouse passes over (keep empty for no highlight)
 TextTitleColor=Color of page title
@@ -1601,6 +1612,7 @@ FixTZ=Fiksiranje časovne cone
 FillFixTZOnlyIfRequired=Primer: +2 (uporabite samo, če se pojavijo težave)
 ExpectedChecksum=Pričakovana kontrolna vsota
 CurrentChecksum=Trenutna kontrolna vsota
+ForcedConstants=Required constant values
 MailToSendProposal=Za pošiljanje ponudbe stranki
 MailToSendOrder=Za pošiljanje naročila kupca
 MailToSendInvoice=Za pošiljanje računa za kupca
@@ -1609,13 +1621,14 @@ MailToSendIntervention=Za pošiljanje intervencije
 MailToSendSupplierRequestForQuotation=Za pošiljanje zahteve za ponudbo dobavitelju
 MailToSendSupplierOrder=Za pošiljanje naročila pri dobavitelju
 MailToSendSupplierInvoice=Za pošiljanje računa dobavitelja
+MailToSendContract=To send a contract
 MailToThirdparty=To send email from third party page
 ByDefaultInList=Show by default on list view
-YouUseLastStableVersion=You use the last stable version
+YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
 TitleExampleForMaintenanceRelease=Example of message you can use to announce this maintenance release (feel free to use it on your web sites)
-ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. You can download it from the download area of http://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.
-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, nor data structure change is present into this version. You can download it from the download area of http://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.
+ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. 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.
+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, nor data structure change is present into 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, you can enter here rule to have price for each level autocalculated according to price of first level, so you will have to enter only price for first level on each product. This page is here to save you time and can be usefull only if your prices for each leve are relative to first level. You can ignore this page in most cases.
 ModelModulesProduct=Templates for product documents
 ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
diff --git a/htdocs/langs/sl_SI/banks.lang b/htdocs/langs/sl_SI/banks.lang
index 8b4325eea06..46e514cbfa4 100644
--- a/htdocs/langs/sl_SI/banks.lang
+++ b/htdocs/langs/sl_SI/banks.lang
@@ -80,7 +80,7 @@ AccountToDebit=Debetni konto
 DisableConciliation=Onemogoči funkcijo usklajevanja za ta konto
 ConciliationDisabled=Funkcija usklajevanja onemogočena
 LinkedToAConciliatedTransaction=Linked to a conciliated entry
-StatusAccountOpened=Odpri
+StatusAccountOpened=Odprt
 StatusAccountClosed=Zaprt
 AccountIdShort=Številka
 LineRecord=Transakcija
diff --git a/htdocs/langs/sl_SI/bills.lang b/htdocs/langs/sl_SI/bills.lang
index c49337de748..f0d1e77f086 100644
--- a/htdocs/langs/sl_SI/bills.lang
+++ b/htdocs/langs/sl_SI/bills.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - bills
 Bill=Račun
 Bills=Računi
-BillsCustomers=Računi za kupce
-BillsCustomer=Račun za kupce
-BillsSuppliers=Računi dobaviteljev
-BillsCustomersUnpaid=Neplačani računi kupcev
-BillsCustomersUnpaidForCompany=Neplačani računi kupcev za %s
-BillsSuppliersUnpaid=Neplačani računi dobaviteljev
-BillsSuppliersUnpaidForCompany=Neplačani računi dobaviteljev za %s
+BillsCustomers=Računi za kupca
+BillsCustomer=Račun za kupca
+BillsSuppliers=Računi dobavitelja
+BillsCustomersUnpaid=Neplačani računi stranke
+BillsCustomersUnpaidForCompany=Unpaid customer invoices for %s
+BillsSuppliersUnpaid=Neplačani računi dobavitelja
+BillsSuppliersUnpaidForCompany=Unpaid supplier invoices for %s
 BillsLate=Zamujena plačila
 BillsStatistics=Statistika računov za kupce
 BillsStatisticsSuppliers=Statistika računov dobaviteljev
@@ -62,8 +62,8 @@ PaymentsBack=Vrnitev plačil
 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 credit note or deposit 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.
+ConfirmDeletePayment=Ali zares želite zbrisati to plačilo ?
+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.
 SupplierPayments=Plačila dobaviteljem
 ReceivedPayments=Prejeta plačila
 ReceivedCustomersPayments=Prejeta plačila od kupcev
@@ -78,6 +78,7 @@ PaymentMode=Način plačila
 PaymentTypeDC=Debit/Credit Card
 PaymentTypePP=PayPal
 IdPaymentMode=Payment type (id)
+CodePaymentMode=Payment type (code)
 LabelPaymentMode=Payment type (label)
 PaymentModeShort=Način plačila
 PaymentTerm=Rok plačila
@@ -102,9 +103,10 @@ SearchACustomerInvoice=Iskanje računa za kupca
 SearchASupplierInvoice=Iskanje računa dobavitelja
 CancelBill=Preklic računa
 SendRemindByMail=Pošlji opomin po E-Mailu
-DoPayment=Izvrši plačilo
-DoPaymentBack=Izvrši vračilo
+DoPayment=Enter payment
+DoPaymentBack=Enter refund
 ConvertToReduc=Pretvori v bodoči popust
+ConvertExcessReceivedToReduc=Convert excess received into future discount
 EnterPaymentReceivedFromCustomer=Vnesi prejeto plačilo od kupca
 EnterPaymentDueToCustomer=Vnesi rok plačila za kupca
 DisabledBecauseRemainderToPayIsZero=Onemogočeno, ker je neplačan opomin enako nič
@@ -113,22 +115,24 @@ BillStatus=Status računa
 StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Osnutek (potrebna potrditev)
 BillStatusPaid=Plačano
-BillStatusPaidBackOrConverted=Plačano ali spremenjeno v popust
+BillStatusPaidBackOrConverted=Refund or converted into discount
 BillStatusConverted=Spremenjeno v popust
 BillStatusCanceled=Opuščeno
 BillStatusValidated=Potrjeno (potrebno plačilo)
 BillStatusStarted=Začeto
 BillStatusNotPaid=Ni plačano
+BillStatusNotRefunded=Not refunded
 BillStatusClosedUnpaid=Zaključeno (neplačano)
 BillStatusClosedPaidPartially=Plačano (delno)
 BillShortStatusDraft=Osnutek
 BillShortStatusPaid=Plačano
-BillShortStatusPaidBackOrConverted=Izvršeno
+BillShortStatusPaidBackOrConverted=Refund or converted
 BillShortStatusConverted=Spremenjeno
 BillShortStatusCanceled=Opuščeno
 BillShortStatusValidated=Potrjeno
 BillShortStatusStarted=Začeto
 BillShortStatusNotPaid=Neplačano
+BillShortStatusNotRefunded=Not refunded
 BillShortStatusClosedUnpaid=Zaključeno
 BillShortStatusClosedPaidPartially=Plačano (delno)
 PaymentStatusToValidShort=Za potrditev
@@ -149,14 +153,14 @@ NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified
 FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
 NotARecurringInvoiceTemplate=Not a recurring template invoice
 NewBill=Nov račun
-LastBills=Zadnjih %s računov
-LastCustomersBills=Zadnjih %s računov za kupce
-LastSuppliersBills=Zadnjih %s računov dobaviteljev
+LastBills=Latest %s invoices
+LastCustomersBills=Latest %s customer invoices
+LastSuppliersBills=Latest %s supplier invoices
 AllBills=Vsi računi
 OtherBills=Ostali računi
 DraftBills=Osnutki računov
-CustomersDraftInvoices=Osnutki računov za stranke
-SuppliersDraftInvoices=Osnutki računov dobaviteljev
+CustomersDraftInvoices=Customer draft invoices
+SuppliersDraftInvoices=Supplier draft invoices
 Unpaid=Neplačano
 ConfirmDeleteBill=Ste prepričani da želite izbrisati ta račun?
 ConfirmValidateBill=Are you sure you want to validate this invoice with reference <b>%s</b>?
@@ -203,7 +207,7 @@ AlreadyPaidNoCreditNotesNoDeposits=Že plačano (brez dobropisa in avansa)
 Abandoned=Opuščeno
 RemainderToPay=Neplačan preostanek
 RemainderToTake=Preostanek vrednosti za odtegljaj
-RemainderToPayBack=Preostanek vrednosti za vrnitev
+RemainderToPayBack=Remaining amount to refund
 Rest=Na čakanju
 AmountExpected=Reklamiran znesek
 ExcessReceived=Prejet presežek
@@ -270,6 +274,7 @@ Deposit=Avans
 Deposits=Avansi
 DiscountFromCreditNote=Popust z dobropisa %s
 DiscountFromDeposit=Plačilo z računa za avans %s
+DiscountFromExcessReceived=Payments from excess received of invoice %s
 AbsoluteDiscountUse=Ta način dobropisa se lahko uporabi na računu pred njegovo potrditvijo
 CreditNoteDepositUse=Invoice must be validated to use this kind of credits
 NewGlobalDiscount=Nov fiksni popust
@@ -277,8 +282,8 @@ NewRelativeDiscount=Nov relativni popust
 NoteReason=Opomba/Razlog
 ReasonDiscount=Razlog
 DiscountOfferedBy=Odobril
-DiscountStillRemaining=Popust še vedno ostaja
-DiscountAlreadyCounted=Popust je bil že upoštevan
+DiscountStillRemaining=Discounts available
+DiscountAlreadyCounted=Discounts already consumed
 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.
@@ -331,10 +336,12 @@ 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
 # PaymentConditions
 Statut=Status
-PaymentConditionShortRECEP=Takoj
-PaymentConditionRECEP=Takoj
+PaymentConditionShortRECEP=Due Upon Receipt
+PaymentConditionRECEP=Due Upon Receipt
 PaymentConditionShort30D=30 dni
 PaymentCondition30D=30 dni
 PaymentConditionShort30DENDMONTH=30 days of month-end
@@ -349,6 +356,14 @@ PaymentConditionShortPT_ORDER=Naročilo
 PaymentConditionPT_ORDER=Naročeno
 PaymentConditionShortPT_5050=50-50
 PaymentConditionPT_5050=50%% vnaprej, 50%% ob dobavi
+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
 FixAmount=Fiksni znesek
 VarAmount=Variabilni znesek (%% tot.)
 # PaymentType
@@ -418,7 +433,7 @@ ChequeDeposits=Polog čekov
 Cheques=Čeki
 DepositId=ID depozita
 NbCheque=Število čekov
-CreditNoteConvertedIntoDiscount=Ta dobropis ali avansni račun je bil spremenjen v %s
+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
 ShowUnpaidAll=Prikaži vse neplačane račune
 ShowUnpaidLateOnly=Prikaži samo zapadle neplačane račune
diff --git a/htdocs/langs/sl_SI/boxes.lang b/htdocs/langs/sl_SI/boxes.lang
index 55450222c48..e6313df1d58 100644
--- a/htdocs/langs/sl_SI/boxes.lang
+++ b/htdocs/langs/sl_SI/boxes.lang
@@ -25,8 +25,8 @@ BoxTitleLastSuppliers=Zadnji %s zabeleženi dobavitelji
 BoxTitleLastModifiedSuppliers=Zadnji %s spremenjeni dobavitelji
 BoxTitleLastModifiedCustomers=Zadnji %s spremenjeni kupci
 BoxTitleLastCustomersOrProspects=Najnovejše %s stranke in možne stranke
-BoxTitleLastCustomerBills=Zadnji %s računi kupcev
-BoxTitleLastSupplierBills=Zadnji %s računi dobaviteljev
+BoxTitleLastCustomerBills=Latest %s customer invoices
+BoxTitleLastSupplierBills=Latest %s supplier invoices
 BoxTitleLastModifiedProspects=Zadnje %s spremenjene možne stranke
 BoxTitleLastModifiedMembers=Zadnji %s člani
 BoxTitleLastFicheInter=Zadnje %s spremenjene intervencije
@@ -51,12 +51,12 @@ ClickToAdd=Kliknite tukaj za dodajanje.
 NoRecordedCustomers=Ni vnesenih kupcev
 NoRecordedContacts=Ni vnesenih kontaktov
 NoActionsToDo=Ni planiranih aktivnosti
-NoRecordedOrders=Ni vnesenih naročil kupca
+NoRecordedOrders=No recorded customer orders
 NoRecordedProposals=Ni vnesenih ponudb
-NoRecordedInvoices=Ni vnesenih računov kupca
-NoUnpaidCustomerBills=Ni neplačanih računov kupca
-NoUnpaidSupplierBills=Ni neplačanih računov dobavitelja
-NoModifiedSupplierBills=Ni vnesenih računov dobavitelja
+NoRecordedInvoices=No recorded customer invoices
+NoUnpaidCustomerBills=No unpaid customer invoices
+NoUnpaidSupplierBills=No unpaid supplier invoices
+NoModifiedSupplierBills=No recorded supplier invoices
 NoRecordedProducts=Ni vnesenih proizvodov/storitev
 NoRecordedProspects=Ni vnesenih ponudb
 NoContractedProducts=Ni pogodbenih proizvodov/storitev
diff --git a/htdocs/langs/sl_SI/companies.lang b/htdocs/langs/sl_SI/companies.lang
index d57f810bbe5..a68f81e5c65 100644
--- a/htdocs/langs/sl_SI/companies.lang
+++ b/htdocs/langs/sl_SI/companies.lang
@@ -78,6 +78,10 @@ VATIsNotUsed=Ni davčni zavezanec
 CopyAddressFromSoc=Fill address with third party address
 ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
 PaymentBankAccount=Payment bank account
+OverAllProposals=Total proposals
+OverAllOrders=Total orders
+OverAllInvoices=Total invoices
+OverAllSupplierProposals=Total price requests
 ##### Local Taxes #####
 LocalTax1IsUsed=Uporabi drugi davek
 LocalTax1IsUsedES= RE je uporabljen
@@ -239,6 +243,10 @@ ProfId3RU=Prof Id 3 (KPP)
 ProfId4RU=Prof Id 4 (OKPO)
 ProfId5RU=-
 ProfId6RU=-
+ProfId1DZ==
+ProfId2DZ=Art.
+ProfId3DZ=NIF
+ProfId4DZ=NIS
 VATIntra=Davčna številka
 VATIntraShort=Davčna številka
 VATIntraSyntaxIsValid=Ime zavezanca veljavno
@@ -382,8 +390,9 @@ ListCustomersShort=Seznam kupcev
 ThirdPartiesArea=Področje partnerjev in kontaktov
 LastModifiedThirdParties=Latest %s modified third parties
 UniqueThirdParties=Skupno število partnerjev
-InActivity=Aktiven
+InActivity=Odprt
 ActivityCeased=Neaktiven
+ThirdPartyIsClosed=Third party is closed
 ProductsIntoElements=Seznam proizvodov/storitev v %s
 CurrentOutstandingBill=Trenutni neplačan račun
 OutstandingBill=Max. za neplačan račun
@@ -396,7 +405,7 @@ MergeThirdparties=Združi partnerje
 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 so you will be able to delete the duplicate one.
 ThirdpartiesMergeSuccess=Partnerja sta bila združena
 SaleRepresentativeLogin=Login of sales representative
-SaleRepresentativeFirstname=Firstname of sales representative
-SaleRepresentativeLastname=Lastname of sales representative
+SaleRepresentativeFirstname=First name of sales representative
+SaleRepresentativeLastname=Last name of sales representative
 ErrorThirdpartiesMerge=Pri brisanju partnerja je prišlo do napake. Prosimo, preverite dnevnik. Spremembe so bile preklicane.
 NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/sl_SI/compta.lang b/htdocs/langs/sl_SI/compta.lang
index 47f2478efe9..3f37d21ffd9 100644
--- a/htdocs/langs/sl_SI/compta.lang
+++ b/htdocs/langs/sl_SI/compta.lang
@@ -65,6 +65,7 @@ PaymentSocialContribution=Plačilo socialnega/fiskalnega davka
 PaymentVat=Plačilo DDV
 ListPayment=Seznam plačil
 ListOfCustomerPayments=Seznam plačil kupcev
+ListOfSupplierPayments=Seznam plačil dobaviteljem
 DateStartPeriod=Začetni datum obdobja
 DateEndPeriod=Končni datum obdobja
 newLT1Payment=New tax 2 payment
@@ -81,7 +82,7 @@ LT2PaymentES=IRPF Plačilo
 LT2PaymentsES=Plačila IRPF
 VATPayment=Sales tax payment
 VATPayments=Sales tax payments
-VATRefund=Sales tax refund Refund
+VATRefund=Sales tax refund
 Refund=Refund
 SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Prikaži plačilo DDV
@@ -194,7 +195,7 @@ CloneTax=Clone a social/fiscal tax
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
 CloneTaxForNextMonth=Clone it for next month
 SimpleReport=Simple report
-AddExtraReport=Extra reports
+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
diff --git a/htdocs/langs/sl_SI/cron.lang b/htdocs/langs/sl_SI/cron.lang
index af896f43b6b..ff381bf9d15 100644
--- a/htdocs/langs/sl_SI/cron.lang
+++ b/htdocs/langs/sl_SI/cron.lang
@@ -17,8 +17,8 @@ CronMethodDoesNotExists=Class %s does not contains any method %s
 # Menu
 EnabledAndDisabled=Enabled and disabled
 # Page list
-CronLastOutput=Last run output
-CronLastResult=Last result code
+CronLastOutput=Latest run output
+CronLastResult=Latest result code
 CronCommand=Ukaz
 CronList=Scheduled jobs
 CronDelete=Delete scheduled jobs
diff --git a/htdocs/langs/sl_SI/errors.lang b/htdocs/langs/sl_SI/errors.lang
index 72456560be3..21953a5bcfe 100644
--- a/htdocs/langs/sl_SI/errors.lang
+++ b/htdocs/langs/sl_SI/errors.lang
@@ -11,6 +11,7 @@ ErrorLoginAlreadyExists=Uporabniško ime %s že obstaja.
 ErrorGroupAlreadyExists=Skupina %s že obstaja.
 ErrorRecordNotFound=Ne najdem zapisa.
 ErrorFailToCopyFile=Ni kopirati Datoteka <b>'%s</b> &quot;nadomesti z&quot; <b>%s</b> &quot;.
+ErrorFailToCopyDir=Failed to copy directory '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToRenameFile=Napaka pri preimenovanju datoteke '<b>%s</b>' v '<b>%s</b>'.
 ErrorFailToDeleteFile=Napaka pri odstranitvi datoteke '<b>%s</b>'.
 ErrorFailToCreateFile=Napaka pri kreiranju datoteke '<b>%s</b>'.
@@ -115,7 +116,7 @@ ErrorNoActivatedBarcode=Noben tip črtne kode ni aktiviran
 ErrUnzipFails=Failed to unzip %s with ZipArchive
 ErrNoZipEngine=No engine to unzip %s file in this PHP
 ErrorFileMustBeADolibarrPackage=The file %s must be a Dolibarr zip package
-ErrorFileRequired=It takes a package Dolibarr file
+ErrorModuleFileRequired=You must select a Dolibarr module package file
 ErrorPhpCurlNotInstalled=The PHP CURL is not installed, this is essential to talk with 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
@@ -170,14 +171,19 @@ ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
 ErrorFileMustHaveFormat=File must have format %s
 ErrorSupplierCountryIsNotDefined=Država tega dobavitelja ni določena. Najprej popravite to.
 ErrorsThirdpartyMerge=Failed to merge the two records. Request canceled.
-ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enougth for product %s to add it into a new order.
-ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enougth for product %s to add it into a new invoice.
-ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enougth for product %s to add it into a new shipment.
-ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enougth for product %s to add it into a new proposal.
-ErrorFailedToLoadLoginFileForMode=Failed to get the login file for mode '%s'.
+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 bank 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>
 
 # 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.
diff --git a/htdocs/langs/sl_SI/holiday.lang b/htdocs/langs/sl_SI/holiday.lang
index 7b2bb630714..fad0dc11101 100644
--- a/htdocs/langs/sl_SI/holiday.lang
+++ b/htdocs/langs/sl_SI/holiday.lang
@@ -76,8 +76,9 @@ BoxTitleLastLeaveRequests=Latest %s modified leave requests
 HolidaysMonthlyUpdate=Mesečna posodobitev
 ManualUpdate=Ročna posodobitev
 HolidaysCancelation=Preklic zahtevka za dopust
-EmployeeLastname=Employee lastname
-EmployeeFirstname=Employee firstname
+EmployeeLastname=Employee last name
+EmployeeFirstname=Employee first name
+TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
 
 ## Configuration du Module ##
 LastUpdateCP=Latest automatic update of leaves allocation
diff --git a/htdocs/langs/sl_SI/ldap.lang b/htdocs/langs/sl_SI/ldap.lang
index 178ef3075b6..0e7fcc242d8 100644
--- a/htdocs/langs/sl_SI/ldap.lang
+++ b/htdocs/langs/sl_SI/ldap.lang
@@ -13,8 +13,8 @@ LDAPUsers=Uporabniki v LDAP bazi podatkov
 LDAPFieldStatus=Status
 LDAPFieldFirstSubscriptionDate=Datum prve naročnine
 LDAPFieldFirstSubscriptionAmount=Znesek prve naročnine
-LDAPFieldLastSubscriptionDate=Datum zadnje naročnine
-LDAPFieldLastSubscriptionAmount=Znesek zadnje naročnine
+LDAPFieldLastSubscriptionDate=Latest subscription date
+LDAPFieldLastSubscriptionAmount=Latest subscription amount
 LDAPFieldSkype=Skype id
 LDAPFieldSkypeExample=Example : skypeName
 UserSynchronized=Uporabnik sinhroniziran
diff --git a/htdocs/langs/sl_SI/mails.lang b/htdocs/langs/sl_SI/mails.lang
index 757f35cccdd..5f170b58fb4 100644
--- a/htdocs/langs/sl_SI/mails.lang
+++ b/htdocs/langs/sl_SI/mails.lang
@@ -35,7 +35,7 @@ MailingStatusSentPartialy=Delno poslano
 MailingStatusSentCompletely=Poslano v celoti
 MailingStatusError=Napaka
 MailingStatusNotSent=Ni poslano
-MailSuccessfulySent=E-pošta uspešno poslana (od %s za %s)
+MailSuccessfulySent=Email successfully accepted for delivery (from %s to %s)
 MailingSuccessfullyValidated=E-pošiljanje uspešno potrjeno
 MailUnsubcribe=Odjava
 MailingStatusNotContact=Ne kontaktiraj več
@@ -74,22 +74,28 @@ ResultOfMailSending=Rezultati masovnega e-poštnega pošiljanja
 NbSelected=Št. izbranih
 NbIgnored=Št. ignoriranih
 NbSent=Št. poslanih
+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
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=%s vrstica v datoteki
 RecipientSelectionModules=Določitev zahtev za izbiro prejemnikov
 MailSelectedRecipients=Izbrani prejemniki
 MailingArea=Področje e-pošte
-LastMailings=Zadnjih %s e-sporočil
+LastMailings=Latest %s emailings
 TargetsStatistics=Ciljna statistika
 NbOfCompaniesContacts=Enolični kontakti podjetij
 MailNoChangePossible=Prejemnikov za potrjeno e-sporočilo ne morete spremeniti
 SearchAMailing=Iskanje e-pošte
 SendMailing=Pošiljanje e-pošte
 SendMail=Pošlji e-pošto
-MailingNeedCommand=Zaradi varnostnih razlogov je pošiljanje e-pošte boljše, če se izvrši iz ukazne vrstice. Če imate to potrebo, prosite vašega administratorja za zagon naslednjega ukaza za pošiljanje e-pošte vsem prejemnikom:
+SentBy=Poslal
+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=Lahko jih seveda pošljete tudi »online«, če dodate parameter MAILING_LIMIT_SENDBYWEB z največjim številom e-sporočil, ki jih želite poslati v eni seji.
-ConfirmSendingEmailing=If you can't or prefer sending them with your www browser, please confirm you are sure you want to send emailing now from your browser?
+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=Opomba: Pošiljanje e-pošte preko spletnega vmesnika je večkrat izvršeno zaradi varnostnih razlogov in časovnih omejitev, <b>%s</b> prejemnikov naenkrat za vsako pošiljanje.
 TargetsReset=Prekliči seznam
 ToClearAllRecipientsClickHere=Kliknite tukaj za preklic seznama prejemnikov te e-pošte
@@ -144,3 +150,6 @@ AdvTgtCreateFilter=Create filter
 AdvTgtOrCreateNewFilter=Name of new filter
 NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
+OutGoingEmailSetup=Outgoing email setup
+InGoingEmailSetup=Incoming email setup
+
diff --git a/htdocs/langs/sl_SI/main.lang b/htdocs/langs/sl_SI/main.lang
index 9fb16951d3b..98a5f99628e 100644
--- a/htdocs/langs/sl_SI/main.lang
+++ b/htdocs/langs/sl_SI/main.lang
@@ -63,11 +63,13 @@ ErrorNoVATRateDefinedForSellerCountry=Napaka, za državo '%s' niso definirane da
 ErrorNoSocialContributionForSellerCountry=Napaka, za državo '%s' niso definirane stopnje socialnega/fiskalnega davka.
 ErrorFailedToSaveFile=Napaka, datoteka ni bila shranjena.
 ErrorCannotAddThisParentWarehouse=You are trying to add a parent warehouse which is already a child of current one
+MaxNbOfRecordPerPage=Max nb of record per page
 NotAuthorized=Nimate dovoljenja za to.
 SetDate=Nastavi datum
 SelectDate=Izberi datum
 SeeAlso=Glejte tudi %s
 SeeHere=Glej tukaj
+Apply=Uporabi
 BackgroundColorByDefault=Privzeta barva ozadja
 FileRenamed=The file was successfully renamed
 FileUploaded=Datoteka je bila uspešno naložena
@@ -86,7 +88,7 @@ Undefined=Nedefinirano
 PasswordForgotten=Password forgotten?
 SeeAbove=Glejte zgoraj
 HomeArea=Domače področje
-LastConnexion=Zadnja prijava
+LastConnexion=Latest connection
 PreviousConnexion=Prejšnja prijava
 PreviousValue=Previous value
 ConnectedOnMultiCompany=Prijava na entiteto
@@ -236,7 +238,7 @@ DateCreation=Datum kreiranja
 DateCreationShort=Datum ustvarjanja
 DateModification=Datum spremembe
 DateModificationShort=Dat.spr.
-DateLastModification=Datum zadnje spremembe
+DateLastModification=Latest modification date
 DateValidation=Datum potrditve
 DateClosing=Datum zaključka
 DateDue=Datum zapadlosti
@@ -432,7 +434,7 @@ Reportings=Poročila
 Draft=Osnutek
 Drafts=Osnutki
 Validated=Potrjen
-Opened=Odpri
+Opened=Odprt
 New=Nov
 Discount=Popust
 Unknown=Neznan
@@ -460,6 +462,7 @@ DeletePicture=Izbriši sliko
 ConfirmDeletePicture=Potrdi izbris slike?
 Login=Uporabniško ime
 CurrentLogin=Trenutna prijava
+EnterLoginDetail=Enter login details
 January=Januar
 February=Februar
 March=Marec
@@ -597,6 +600,8 @@ SessionName=Ime seje
 Method=Metoda
 Receive=Prejeto
 CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
+ExpectedValue=Expected Value
+CurrentValue=Trenutna vrednost
 PartialWoman=Delni
 TotalWoman=Skupna
 NeverReceived=Nikoli prejeto
@@ -753,6 +758,8 @@ RemoveString=Remove string '%s'
 SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
 DirectDownloadLink=Direct download link
 Download=Download
+ActualizeCurrency=Update currency rate
+Fiscalyear=Fiskalno leto
 # Week day
 Monday=Ponedeljek
 Tuesday=Torek
@@ -787,8 +794,8 @@ SetRef=Nastavi referenco
 Select2ResultFoundUseArrows=Some results found. Use arrows to select.
 Select2NotFound=Ni najdenega rezultata
 Select2Enter=Potrdi
-Select2MoreCharacter=or more character
-Select2MoreCharacters=ali več znakov
+Select2MoreCharacter=or more characters<br /><br /><strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
+Select2MoreCharacters=or more characters<br /><br /><strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
 Select2LoadingMoreResults=Naloži več rezultatov...
 Select2SearchInProgress=Iskanje v teku...
 SearchIntoThirdparties=Partnerji
@@ -809,3 +816,5 @@ SearchIntoContracts=Pogodbe
 SearchIntoCustomerShipments=Customer shipments
 SearchIntoExpenseReports=Stroškovna poročila
 SearchIntoLeaves=Dopusti
+
+BulkActions=Bulk actions
diff --git a/htdocs/langs/sl_SI/members.lang b/htdocs/langs/sl_SI/members.lang
index 63e894a1458..439d0c32740 100644
--- a/htdocs/langs/sl_SI/members.lang
+++ b/htdocs/langs/sl_SI/members.lang
@@ -45,7 +45,7 @@ MemberStatusDraft=Predlagan (potrebna je potrditev)
 MemberStatusDraftShort=Predlagan
 MemberStatusActive=Potrjen (čaka vpis)
 MemberStatusActiveShort=Potrjen
-MemberStatusActiveLate=Pretečeno članstvo
+MemberStatusActiveLate=Subscription expired
 MemberStatusActiveLateShort=Pretečen
 MemberStatusPaid=Posodobljena članarina
 MemberStatusPaidShort=Posodobljen
@@ -136,8 +136,8 @@ DocForAllMembersCards=Ustvari vizitke za vse člane (Format za izhod dejanske na
 DocForOneMemberCards=Ustvari vizitke za določenega člana (Format za izhod dejanske nastavitve: <b>%s)</b>
 DocForLabels=Ustvari seznam naslovov (Format za izhod dejanske nastavitve: <b>%s)</b>
 SubscriptionPayment=Plačilo naročnine
-LastSubscriptionDate=Zadnji datum članarine
-LastSubscriptionAmount=Zadnji znesek članarine
+LastSubscriptionDate=Latest subscription date
+LastSubscriptionAmount=Latest subscription amount
 MembersStatisticsByCountries=Statistika članov po državah
 MembersStatisticsByState=Statistika članov po deželah
 MembersStatisticsByTown=Statistika članov po mestih
@@ -149,7 +149,7 @@ MembersByStateDesc=Na tem zaslonu je prikazana statistika članov po državah/de
 MembersByTownDesc=Na tem zaslonu je prikazana statistika članov po mestih.
 MembersStatisticsDesc=Izberite statistiko, ki jo želite prebrati...
 MenuMembersStats=Statistika
-LastMemberDate=Datum zadnjega članstva
+LastMemberDate=Latest member date
 Nature=Narava
 Public=Informacija je javna (ne=zasebno)
 NewMemberbyWeb=Dodan je nov član. Čaka potrditev.
diff --git a/htdocs/langs/sl_SI/orders.lang b/htdocs/langs/sl_SI/orders.lang
index b63ad167c87..9855d34cb9d 100644
--- a/htdocs/langs/sl_SI/orders.lang
+++ b/htdocs/langs/sl_SI/orders.lang
@@ -39,7 +39,7 @@ StatusOrderRefusedShort=Zavrnjeno
 StatusOrderBilledShort=Fakturirana
 StatusOrderToProcessShort=Za obdelavo
 StatusOrderReceivedPartiallyShort=Delno prejeto
-StatusOrderReceivedAllShort=Prejeto v celoti
+StatusOrderReceivedAllShort=Products received
 StatusOrderCanceled=Preklicano
 StatusOrderDraft=Osnutek (potrebno potrditi)
 StatusOrderValidated=Potrjeno
@@ -51,7 +51,7 @@ StatusOrderApproved=Odobreno
 StatusOrderRefused=Zavrnjeno
 StatusOrderBilled=Fakturirana
 StatusOrderReceivedPartially=Delno prejeto
-StatusOrderReceivedAll=Prejeto v celoti
+StatusOrderReceivedAll=All products received
 ShippingExist=Pošiljka ne obstaja
 QtyOrdered=Naročena količina
 ProductQtyInDraft=Količina proizvoda v osnutkih naročil
diff --git a/htdocs/langs/sl_SI/other.lang b/htdocs/langs/sl_SI/other.lang
index e47e9604cd8..91ef2e2eebd 100644
--- a/htdocs/langs/sl_SI/other.lang
+++ b/htdocs/langs/sl_SI/other.lang
@@ -2,6 +2,7 @@
 SecurityCode=Varnostna koda
 NumberingShort=N°
 Tools=Orodja
+TMenuTools=Orodja
 ToolsDesc=All miscellaneous tools not included in other menu entries are collected here.<br /><br />All the tools can be reached in the left menu.
 Birthday=Rojstni dan
 BirthdayDate=Birthday date
@@ -67,14 +68,15 @@ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find her
 PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nV prilogi je pošiljka __SHIPPINGREF__\n\n__PERSONALIZED__S spoštovanjem\n\n__SIGNATURE__
 PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nV prilogi je intervencija __FICHINTERREF__\n\n__PERSONALIZED__S spoštovanjem\n\n__SIGNATURE__
 PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n__PERSONALIZED__\n\n__SIGNATURE__
-DemoDesc=Dolibarr is a compact ERP/CRM supporting several functional modules. A demo showcasing all modules makes no sense as this scenario never occurs. So, several demo profiles are available.
+DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
+ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
 DemoFundation=Urejanje članov ustanove
 DemoFundation2=Urejanje članov in bančnih računov ustanove
-DemoCompanyServiceOnly=Urejanje aktivnosti svobodnjakov samo za servisne storitve
+DemoCompanyServiceOnly=Company or freelance selling service only
 DemoCompanyShopWithCashDesk=Urejanje trgovine z blagajno
-DemoCompanyProductAndStocks=Urejanje majhnih ali srednjih prodajnih podjetij
-DemoCompanyAll=Urejanje majhnih ali srednjih podjetij z različnimi aktivnostmi (vsi glavni moduli)
+DemoCompanyProductAndStocks=Company selling products with a shop
+DemoCompanyAll=Company with multiple activities (all main modules)
 CreatedBy=Kreiral %s
 ModifiedBy=Spremenil %s
 ValidatedBy=Potrdil %s
diff --git a/htdocs/langs/sl_SI/products.lang b/htdocs/langs/sl_SI/products.lang
index d47c40f8cb8..c108fe669e6 100644
--- a/htdocs/langs/sl_SI/products.lang
+++ b/htdocs/langs/sl_SI/products.lang
@@ -5,6 +5,8 @@ ProductLabelTranslated=Translated product label
 ProductDescriptionTranslated=Translated product description
 ProductNoteTranslated=Translated product note
 ProductServiceCard=Kartica proizvoda/storitve
+TMenuProducts=Proizvodi
+TMenuServices=Storitve
 Products=Proizvodi
 Services=Storitve
 Product=Proizvod
@@ -58,7 +60,7 @@ SellingPrice=Prodajna cena
 SellingPriceHT=Prodajne cene (brez DDV)
 SellingPriceTTC=Prodajne cene (z DDV)
 CostPriceDescription=This price (net of tax) can be used to store the average amount this product cost to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
-CostPriceUsage=In a future version, this value could be used for margin calculation.
+CostPriceUsage=This value could be used for margin calculation.
 SoldAmount=Sold amount
 PurchasedAmount=Purchased amount
 NewPrice=Nova cena
@@ -140,6 +142,7 @@ ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b>?
 CloneContentProduct=Klonirajte vse osnovne podatke proizvoda/storitve
 ClonePricesProduct=Klonirajte osnovne podatke in cene
 CloneCompositionProduct=Kloniraj paketni proizvod/stroitev
+CloneCombinationsProduct=Clone product variants
 ProductIsUsed=Ta proizvod je rabljen
 NewRefForClone=Ref. novega proizvoda/storitve
 SellingPrices=Selling prices
@@ -236,7 +239,7 @@ GlobalVariables=Globalne spremenljivke
 VariableToUpdate=Variable to update
 GlobalVariableUpdaters=Posodobitve globalnih spremenljivk
 UpdateInterval=Interval posodobitve (minute)
-LastUpdated=Nazadnje posodobljeno
+LastUpdated=Latest update
 CorrectlyUpdated=Pravilno posodobljeno
 PropalMergePdfProductActualFile=Datoteke za dodatek k PDF Azur so/je
 PropalMergePdfProductChooseFile=Izberi PDF datoteke
@@ -256,4 +259,41 @@ VolumeUnits=Volume unit
 SizeUnits=Size unit
 DeleteProductBuyPrice=Delete buying price
 ConfirmDeleteProductBuyPrice=Are you sure you want to delete this buying price?
+SubProduct=Sub product
 
+#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
+ProductCombinations=Variants
+HideProductCombinations=Hide products variant in the products selector
+ProductCombination=Variant
+NewProductCombination=New variant
+EditProductCombination=Editing variant
+ProductCombinationGenerator=Variants generator
+Features=Features
+PriceImpact=Price impact
+WeightImpact=Weight impact
+NewProductAttribute=Nov atribut
+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
+PercentageVariation=Percentage variation
+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 child products
+ConfirmCloneProductCombinations=Would you like to copy all the product variant to the 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
diff --git a/htdocs/langs/sl_SI/projects.lang b/htdocs/langs/sl_SI/projects.lang
index 160ad565bf4..b4cdec94699 100644
--- a/htdocs/langs/sl_SI/projects.lang
+++ b/htdocs/langs/sl_SI/projects.lang
@@ -29,9 +29,9 @@ DeleteAProject=Izbriši projekt
 DeleteATask=Izbriši nalogo
 ConfirmDeleteAProject=Are you sure you want to delete this project?
 ConfirmDeleteATask=Are you sure you want to delete this task?
-OpenedProjects=Open projects
-OpenedTasks=Open tasks
-OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
+OpenedProjects=Opened projects
+OpenedTasks=Opened tasks
+OpportunitiesStatusForOpenedProjects=Opportunities amount of opened projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=Prikaži projekt
 SetProject=Nastavi projekt
@@ -47,7 +47,7 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=Uporabnik
 TaskTimeNote=Beležka
 TaskTimeDate=Datum
-TasksOnOpenedProject=Tasks on open projects
+TasksOnOpenedProject=Tasks on opened projects
 WorkloadNotDefined=Workload not defined
 NewTimeSpent=Nov porabljen čas
 MyTimeSpent=Moj porabljen čas
@@ -58,6 +58,7 @@ TaskDateEnd=Datum konca naloge
 TaskDescription=Opis naloge
 NewTask=Nova naloga
 AddTask=Ustvari nalogo
+AddTimeSpent=Create time spent
 Activity=Aktivnost
 Activities=Naloge/aktivnosti
 MyActivities=Moje naloge/aktivnosti
@@ -95,6 +96,7 @@ ValidateProject=Potrdite projekt
 ConfirmValidateProject=Are you sure you want to validate this project?
 CloseAProject=Zaprite projekt
 ConfirmCloseAProject=Are you sure you want to close this project?
+AlsoCloseAProject=Also close project (keep it open if you still need to follow production tasks on it)
 ReOpenAProject=Odprite projekt
 ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=Kontakti za projekt
@@ -120,7 +122,7 @@ CloneProjectFiles=Kloniraj skupne datoteke projekta
 CloneTaskFiles=Kloniraj skupno(e) datoteko(e) naloge (če je bila naloga klonirana)
 CloneMoveDate=Update project/tasks dates from now?
 ConfirmCloneProject=Are you sure to clone this project?
-ProjectReportDate=Spremenite datum naloge glede na začetni datum projekta
+ProjectReportDate=Change task dates according to new project start date
 ErrorShiftTaskDate=Nemogoče je spremeniti datum naloge glede na nov začetni datum projekta
 ProjectsAndTasksLines=Projekti in naloge
 ProjectCreatedInDolibarr=Projekt %s je bil ustvarjen
@@ -177,9 +179,9 @@ ProjectsStatistics=Statistics on projects/leads
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 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.
-OpenedProjectsByThirdparties=Open projects by thirdparties
+OpenedProjectsByThirdparties=Opened projects by thirdparties
 OnlyOpportunitiesShort=Only opportunities
-OpenedOpportunitiesShort=Open opportunities
+OpenedOpportunitiesShort=Opened opportunities
 NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount
diff --git a/htdocs/langs/sl_SI/propal.lang b/htdocs/langs/sl_SI/propal.lang
index cf8f6ed23c4..4c39e9216aa 100644
--- a/htdocs/langs/sl_SI/propal.lang
+++ b/htdocs/langs/sl_SI/propal.lang
@@ -26,9 +26,9 @@ AmountOfProposalsByMonthHT=Znesek po mesecih(brez DDV)
 NbOfProposals=Število komercialnih ponudb
 ShowPropal=Prikaži ponudbo
 PropalsDraft=Osnutki
-PropalsOpened=Odpri
+PropalsOpened=Odprt
 PropalStatusDraft=Osnutek (potrebno potrditi)
-PropalStatusValidated=Potrjena (ponudba je odprta)
+PropalStatusValidated=Validated (proposal is opened)
 PropalStatusSigned=Podpisana (potrebno fakturirati)
 PropalStatusNotSigned=Nepodpisana (zaprta)
 PropalStatusBilled=Fakturirana
diff --git a/htdocs/langs/sl_SI/stocks.lang b/htdocs/langs/sl_SI/stocks.lang
index 94be5c452e7..69c7ce1b964 100644
--- a/htdocs/langs/sl_SI/stocks.lang
+++ b/htdocs/langs/sl_SI/stocks.lang
@@ -22,13 +22,15 @@ Movements=Gibanja
 ErrorWarehouseRefRequired=Obvezno je referenčno ime skladišča
 ListOfWarehouses=Spisek skladišč
 ListOfStockMovements=Seznam gibanja zaloge
+StockMovementForId=Movement ID %d
+ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Področje skladišč
 Location=Lokacija
 LocationSummary=Kratko ime lokacije
 NumberOfDifferentProducts=Število različnih proizvodov
 NumberOfProducts=Skupno število proizvodov
-LastMovement=Zadnja sprememba
-LastMovements=Zadnje spremembe
+LastMovement=Latest movement
+LastMovements=Latest movements
 Units=Enote
 Unit=Enota
 StockCorrection=Popravek zaloge
@@ -140,3 +142,4 @@ ProductStockWarehouseCreated=Stock limit for alert and desired optimal stock cor
 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
diff --git a/htdocs/langs/sl_SI/supplier_proposal.lang b/htdocs/langs/sl_SI/supplier_proposal.lang
index 9fe074d47fe..9f9d579fb32 100644
--- a/htdocs/langs/sl_SI/supplier_proposal.lang
+++ b/htdocs/langs/sl_SI/supplier_proposal.lang
@@ -8,7 +8,7 @@ SearchRequest=Find a request
 DraftRequests=Draft requests
 SupplierProposalsDraft=Draft supplier proposals
 LastModifiedRequests=Latest %s modified price requests
-RequestsOpened=Open price requests
+RequestsOpened=Opened price requests
 SupplierProposalArea=Supplier proposals area
 SupplierProposalShort=Supplier proposal
 SupplierProposals=Ponudbe dobavitelja
@@ -23,7 +23,7 @@ ConfirmValidateAsk=Are you sure you want to validate this price request under na
 DeleteAsk=Delete request
 ValidateAsk=Validate request
 SupplierProposalStatusDraft=Osnutek (potrebno potrditi)
-SupplierProposalStatusValidated=Validated (request is open)
+SupplierProposalStatusValidated=Validated (request is opened)
 SupplierProposalStatusClosed=Zaključeno
 SupplierProposalStatusSigned=Accepted
 SupplierProposalStatusNotSigned=Zavrnjeno
diff --git a/htdocs/langs/sl_SI/suppliers.lang b/htdocs/langs/sl_SI/suppliers.lang
index d0cac687e5f..2610bf0e263 100644
--- a/htdocs/langs/sl_SI/suppliers.lang
+++ b/htdocs/langs/sl_SI/suppliers.lang
@@ -9,7 +9,7 @@ ShowSupplier=Prikaži dobavitelja
 OrderDate=Datum naročila
 BuyingPriceMin=Best buying price
 BuyingPriceMinShort=Best buying price
-TotalBuyingPriceMinShort=Total of subproducts buying prices
+TotalBuyingPriceMinShort=Seštevek nabavnih cen pod-proizvodov
 TotalSellingPriceMinShort=Total of subproducts selling prices
 SomeSubProductHaveNoPrices=Nekateri pod-proizvodi nimajo določenih cen
 AddSupplierPrice=Add buying price
@@ -24,10 +24,10 @@ ExportDataset_fournisseur_1=Seznam računov dobavitelja in vrstic računa
 ExportDataset_fournisseur_2=Računi dobaviteljev in plačila
 ExportDataset_fournisseur_3=Naročila pri dobaviteljih in vrstice naročila
 ApproveThisOrder=Odobri to naročilo
-ConfirmApproveThisOrder=Ali zares želite odobriti to naročilo ?
+ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b>?
 DenyingThisOrder=Zavrni to naročilo
-ConfirmDenyingThisOrder=Ali zares želite zavrniti to naročilo?
-ConfirmCancelThisOrder=Ali zares želite preklicati to naročilo?
+ConfirmDenyingThisOrder=Are you sure you want to deny this order <b>%s</b>?
+ConfirmCancelThisOrder=Are you sure you want to cancel this order <b>%s</b>?
 AddSupplierOrder=Kreirajte naročilo pri dobavitelju
 AddSupplierInvoice=Kreirajte račun dobavitelja
 ListOfSupplierProductForSupplier=Seznam proizvodov in cen dobavitelja <b>%s</b>
@@ -41,3 +41,4 @@ DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Wrong quality
 ReputationForThisProduct=Reputation
 BuyerName=Buyer name
+AllProductServicePrices=All product / service prices
diff --git a/htdocs/langs/sl_SI/users.lang b/htdocs/langs/sl_SI/users.lang
index 310be00c1da..200ecbedea2 100644
--- a/htdocs/langs/sl_SI/users.lang
+++ b/htdocs/langs/sl_SI/users.lang
@@ -36,7 +36,7 @@ AdministratorDesc=Administrator
 DefaultRights=Privzeta dovoljenja
 DefaultRightsDesc=Tukaj določite <u>privzeta</u> dovoljenja, ki se avtomatsko dodelijo <u>novo kreiranemu</u> uporabniku (Dovoljenja obstoječega uporabnika spremenite preko kartice uporabnika).
 DolibarrUsers=Dolibarr uporabniki
-LastName=Last Name
+LastName=Priimek
 FirstName=Ime
 ListOfGroups=Seznam skupin
 NewGroup=Nova skupina
diff --git a/htdocs/langs/sl_SI/withdrawals.lang b/htdocs/langs/sl_SI/withdrawals.lang
index f219a724241..592a566c482 100644
--- a/htdocs/langs/sl_SI/withdrawals.lang
+++ b/htdocs/langs/sl_SI/withdrawals.lang
@@ -24,6 +24,7 @@ WithdrawStatistics=Direct debit payment statistics
 WithdrawRejectStatistics=Direct debit payment reject statistics
 LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
+WithdrawRequestsDone=%s direct debit payment requests recorded
 ThirdPartyBankCode=Bančna koda partnerja
 NoInvoiceCouldBeWithdrawed=Noben račun ni bil uspešno nakazan. Preverite, če imajo izdajatelji računov veljaven BAN.
 ClassCredited=Označi kot prejeto
@@ -76,8 +77,8 @@ RUM=UMR
 RUMLong=Unique Mandate Reference
 RUMWillBeGenerated=UMR number will be generated once bank account information are saved
 WithdrawMode=Direct debit mode (FRST or RECUR)
-WithdrawRequestAmount=Želen znesek dviga:
-WithdrawRequestErrorNilAmount=Ni možno ustvariti zahteve za dvig zneska nič.
+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
diff --git a/htdocs/langs/sq_AL/accountancy.lang b/htdocs/langs/sq_AL/accountancy.lang
index 5de95948fbf..b087433178a 100644
--- a/htdocs/langs/sq_AL/accountancy.lang
+++ b/htdocs/langs/sq_AL/accountancy.lang
@@ -194,6 +194,8 @@ ChangeBinding=Change the binding
 
 ## Admin
 ApplyMassCategories=Apply mass categories
+AddAccountFromBookKeepingWithNoCategories=Add acccount already used with no categories
+CategoryDeleted=Category for the accounting account has been removed
 
 ## Export
 Exports=Exports
@@ -209,12 +211,13 @@ Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution
 Modelcsv_quadratus=Export towards Quadratus QuadraCompta
 Modelcsv_ebp=Export towards EBP
 Modelcsv_cogilog=Export towards Cogilog
+ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
 InitAccountancy=Init accountancy
 InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accountancy account defined for sales and purchases.
 DefaultBindingDesc=This page can be used to set a default account to use to link transactions record about payment salaries, donation, taxes and vat when no specific accounting account were already set.
-Options=Options
+Options=Mundësi
 OptionModeProductSell=Mode sales
 OptionModeProductBuy=Mode purchases
 OptionModeProductSellDesc=Show all products with accounting account for sales.
diff --git a/htdocs/langs/sq_AL/admin.lang b/htdocs/langs/sq_AL/admin.lang
index 13f97aa1262..199c059b680 100644
--- a/htdocs/langs/sq_AL/admin.lang
+++ b/htdocs/langs/sq_AL/admin.lang
@@ -9,14 +9,20 @@ VersionDevelopment=Development
 VersionUnknown=Unknown
 VersionRecommanded=Recommended
 FileCheck=Files integrity checker
-FileCheckDesc=This tool allows you to check the integrity of files of your application, comparing each files with the official ones. You can use this tool to detect if some files were modified by a hacker for example.
+FileCheckDesc=This tool allows you to check the integrity of files and setup of your application, comparing each files with the official ones. 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.
+FileIntegrityIsStrictlyConformedWithReference=Files integrity is strictly conformed with the reference.
+FileIntegrityIsOkButFilesWereAdded=Files integrity check has passed, however some new files were added.
+FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified, removed or added.
+GlobalChecksum=Global checksum
 MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
 LocalSignature=Embedded local signature (less reliable)
 RemoteSignature=Remote distant signature (more reliable)
 FilesMissing=Missing Files
 FilesUpdated=Updated Files
+FilesModified=Modified Files
+FilesAdded=Added Files
 FileCheckDolibarr=Check integrity of application files
-AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from a certified package
+AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from an official package
 XmlNotFound=Xml Integrity File of application not found
 SessionId=Session ID
 SessionSaveHandler=Handler to save sessions
@@ -48,7 +54,7 @@ RemoveLock=Remove file <b>%s</b> if it exists to allow usage of the update tool.
 RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any usage of update tool.
 SecuritySetup=Security setup
 SecurityFilesDesc=Define here options related to security about uploading files.
-ErrorModuleRequirePHPVersion=Error, this module requires PHP version %s or higher
+ErrorModuleRequirePHPVersion=Gabim, ky modul kërkon PHP version %s ose më të lartë
 ErrorModuleRequireDolibarrVersion=Error, this module requires Dolibarr version %s or higher
 ErrorDecimalLargerThanAreForbidden=Error, a precision higher than <b>%s</b> is not supported.
 DictionarySetup=Dictionary setup
@@ -72,8 +78,8 @@ CurrentTimeZone=TimeZone PHP (server)
 MySQLTimeZone=TimeZone MySql (database)
 TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submited string. The timezone has effect only when using UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered).
 Space=Space
-Table=Table
-Fields=Fields
+Table=Tabelë
+Fields=Fushat
 Index=Index
 Mask=Mask
 NextValue=Next value
@@ -97,7 +103,7 @@ MenuIdParent=Parent menu ID
 DetailMenuIdParent=ID of parent menu (empty for a top menu)
 DetailPosition=Sort number to define menu position
 AllMenus=Të gjitha
-NotConfigured=Module not configured
+NotConfigured=Modul i pakonfiguruar
 Active=Aktiv
 SetupShort=Setup
 OtherOptions=Other options
@@ -108,7 +114,7 @@ Destination=Destination
 IdModule=Module ID
 IdPermissions=Permissions ID
 Modules=Modulet
-LanguageBrowserParameter=Parameter %s
+LanguageBrowserParameter=Parametër %s
 LocalisationDolibarrParameters=Localisation parameters
 ClientTZ=Client Time Zone (user)
 ClientHour=Client time (user)
@@ -126,7 +132,7 @@ Position=Position
 MenusDesc=Menu managers set content of the two menu bars (horizontal and vertical).
 MenusEditorDesc=The menu editor allows you to define custom menu entries. Use it carefully to avoid instability and permanently unreachable menu entries.<br />Some modules add menu entries (in menu <b>All</b> mostly). If you remove some of these entries by mistake, you can restore them disabling and reenabling the module.
 MenuForUsers=Menu for users
-LangFile=.lang file
+LangFile=Skedari .lang
 System=System
 SystemInfo=System information
 SystemToolsArea=System tools area
@@ -185,7 +191,9 @@ BoxesDesc=Widgets are components showing some information that you can add to pe
 OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
 ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
-ModulesMarketPlaces=More modules...
+ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
+ModulesMarketPlaces=Find external modules...
+GoModuleSetupArea=To deploy/install a new module, go onto the Module setup area at <a href="%s">%s</a>.
 DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules
 DoliPartnersDesc=List of companies providing custom developed modules or features (Note: anyone experienced in PHP programming can provide custom development for an open source project)
 WebSiteDesc=Reference websites to find more modules...
@@ -276,21 +284,22 @@ ModuleFamilyInterface=Interfaces with external systems
 MenuHandlers=Menu handlers
 MenuAdmin=Menu editor
 DoNotUseInProduction=Do not use in production
-ThisIsProcessToFollow=This is setup to process:
-ThisIsAlternativeProcessToFollow=This is an alternative setup to process:
+ThisIsProcessToFollow=This is steps to process:
+ThisIsAlternativeProcessToFollow=This is an alternative setup to process manually:
 StepNb=Step %s
 FindPackageFromWebSite=Find a package that provides feature you want (for example on official web site %s).
 DownloadPackageFromWebSite=Download package (for example from official web site %s).
-UnpackPackageInDolibarrRoot=Unpack package file into Dolibarr server directory dedicated to external modules: <b>%s</b>
-SetupIsReadyForUse=Install is finished and Dolibarr is ready to use with this new component.
-NotExistsDirect=The alternative root directory is not defined.<br>
-InfDirAlt=Since version 3 it is possible to define an alternative root directory.This allows you to store, same place, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
-InfDirExample=<br>Then declare it in the file conf.php<br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>*These lines are commented with "#", to uncomment only remove the character.
+UnpackPackageInDolibarrRoot=Unpack the packaged files into server directory dedicated to Dolibarr: <b>%s</b>
+UnpackPackageInModulesRoot=To deploy/install an external module, unpack the packaged files into the server directory dedicated to modules: <b>%s</b>
+SetupIsReadyForUse=Module deployment is finished. You must however enable and setup the module in your application by going on the page to setup modules: <a href="%s">%s</a>.
+NotExistsDirect=The alternative root directory is not defined to an existing directory.<br>
+InfDirAlt=Since version 3, it is possible to define an alternative root directory. This allows you to store, into a dedicated directory, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
+InfDirExample=<br>Then declare it in the file <strong>conf.php</strong><br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>If these lines are commented with "#", to enable them, just uncomment by removing the "#" character.
 YouCanSubmitFile=For this step, you can send package using this tool: Select module file
 CurrentVersion=Dolibarr current version
 CallUpdatePage=Go to the page that updates the database structure and data: %s.
 LastStableVersion=Latest stable version
-LastActivationDate=Last activation date
+LastActivationDate=Latest activation date
 UpdateServerOffline=Update server offline
 GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s. <br><b>{000000@x}</b> same as previous but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
 GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
@@ -373,11 +382,11 @@ ExtrafieldCheckBox=Checkbox
 ExtrafieldRadio=Radio button
 ExtrafieldCheckBoxFromList= Checkbox from table
 ExtrafieldLink=Link to an object
-ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>In order to have the list depending on another :<br>1,value1|parent_list_code:parent_key<br>2,value2|parent_list_code:parent_key
+ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list :<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list :<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
-ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
+ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Example : Societe:societe/class/societe.class.php
 LibraryToBuildPDF=Library used for PDF generation
 WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
@@ -411,10 +420,11 @@ ModuleCompanyCodePanicum=Return an empty accountancy code.
 ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party code.
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
-
+WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<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).
+ClickToShowDescription=Click to show description
 # Modules
 Module0Name=Users & groups
-Module0Desc=Users and groups management
+Module0Desc=Users / Employees and Groups management
 Module1Name=Third parties
 Module1Desc=Companies and contact management (customers, prospects...)
 Module2Name=Commercial
@@ -429,7 +439,7 @@ Module23Name=Energy
 Module23Desc=Monitoring the consumption of energies
 Module25Name=Customer Orders
 Module25Desc=Customer order management
-Module30Name=Invoices
+Module30Name=Faturat
 Module30Desc=Invoice and credit note management for customers. Invoice management for suppliers
 Module40Name=Furnitorët
 Module40Desc=Supplier management and buying (orders and invoices)
@@ -515,8 +525,8 @@ Module2200Name=Dynamic Prices
 Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
 Module2300Desc=Scheduled job management
-Module2400Name=Agenda/Events
-Module2400Desc=Follow events or rendez-vous. Record manual events into Agendas or let application logs automatic events for tracking purposes.
+Module2400Name=Events/Agenda
+Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous.
 Module2500Name=Electronic Content Management
 Module2500Desc=Save and share documents
 Module2600Name=API/Web services (SOAP server)
@@ -582,7 +592,7 @@ Permission34=Delete products
 Permission36=See/manage hidden products
 Permission38=Export products
 Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
-Permission42=Create/modify projects (shared project and projects i'm contact for)
+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)
 Permission45=Export projects
 Permission61=Read interventions
@@ -685,7 +695,7 @@ PermissionAdvanced253=Create/modify internal/external users and permissions
 Permission254=Create/modify external users only
 Permission255=Modify other users password
 Permission256=Delete or disable other users
-Permission262=Extend access to all third parties (not only those linked to user). Not effective for external users (always limited to themselves).
+Permission262=Extend access to all third parties (not only third parties that user is a sale representative).<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 assignement matters).
 Permission271=Read CA
 Permission272=Read invoices
 Permission273=Issue invoices
@@ -887,7 +897,7 @@ Offset=Offset
 AlwaysActive=Always active
 Upgrade=Upgrade
 MenuUpgrade=Upgrade / Extend
-AddExtensionThemeModuleOrOther=Add extension (theme, module, ...)
+AddExtensionThemeModuleOrOther=Deploy/install external module
 WebServer=Web server
 DocumentRootServer=Web server's root directory
 DataRootServer=Data files directory
@@ -994,7 +1004,7 @@ TriggerAlwaysActive=Triggers in this file are always active, whatever are the ac
 TriggerActiveAsModuleActive=Triggers in this file are active as module <b>%s</b> is enabled.
 GeneratedPasswordDesc=Define here which rule you want to use to generate new password if you ask to have auto generated password
 DictionaryDesc=Insert all reference data. You can add your values to the default.
-ConstDesc=This page allows you to edit all other parameters not available in previous pages. These are mostly reserved parameters for developers or advanced troubleshooting.
+ConstDesc=This page allows you to edit all other parameters not available in previous pages. These are mostly reserved parameters for developers or advanced troubleshooting. For a list of options <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">check here</a>.
 MiscellaneousDesc=All other security related parameters are defined here.
 LimitsSetup=Limits/Precision setup
 LimitsDesc=You can define limits, precisions and optimisations used by Dolibarr here
@@ -1161,10 +1171,6 @@ FreeLegalTextOnOrders=Free text on orders
 WatermarkOnDraftOrders=Watermark on draft orders (none if empty)
 ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable
 BANK_ASK_PAYMENT_BANK_DURING_ORDER=Ask for bank account destination of order
-##### Clicktodial #####
-ClickToDialSetup=Click To Dial module setup
-ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with your clicktodial login (defined on your user card)<br><b>__PASS__</b> that will be replaced with your clicktodial password (defined on your user card).
-##### Bookmark4u #####
 ##### Interventions #####
 InterventionsSetup=Interventions module setup
 FreeLegalTextOnInterventions=Free text on intervention documents
@@ -1391,7 +1397,7 @@ SendingsSetup=Sending module setup
 SendingsReceiptModel=Sending receipt model
 SendingsNumberingModules=Sendings numbering modules
 SendingsAbility=Support shipping sheets for customer deliveries
-NoNeedForDeliveryReceipts=In most cases, sendings receipts are used both as sheets for customer deliveries (list of products to send) and sheets that is recevied and signed by customer. So product deliveries receipts is a duplicated feature and is rarely activated.
+NoNeedForDeliveryReceipts=In most cases, shipping sheets are used both as sheets for customer deliveries (list of products to send) and sheets that is received and signed by customer. So product deliveries receipts is a duplicated feature and is rarely activated.
 FreeLegalTextOnShippings=Free text on shipments
 ##### Deliveries #####
 DeliveryOrderNumberingModules=Products deliveries receipt numbering module
@@ -1455,8 +1461,8 @@ OnPayment=On payment
 OnInvoice=On invoice
 SupposedToBePaymentDate=Payment date used
 SupposedToBeInvoiceDate=Invoice date used
-Buy=Buy
-Sell=Sell
+Buy=Bli
+Sell=Shit
 InvoiceDateUsed=Invoice date used
 YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Foundation), so there is no VAT options to setup.
 AccountancyCode=Accountancy Code
@@ -1471,7 +1477,11 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Set automatically this default value for type of e
 AGENDA_DEFAULT_FILTER_TYPE=Set automatically this type of event into search filter of agenda view
 AGENDA_DEFAULT_FILTER_STATUS=Set automatically this status for events into search filter of agenda view
 AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
-##### ClickToDial #####
+AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
+AGENDA_NOTIFICATION_SOUND=Enable sound notification
+##### Clicktodial #####
+ClickToDialSetup=Click To Dial module setup
+ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with your clicktodial login (defined on your user card)<br><b>__PASS__</b> that will be replaced with your clicktodial password (defined on your user card).
 ClickToDialDesc=This module allows to make phone numbers clickable. A click on this icon will call make your phone to 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.
 ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
 ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on same computer than the browser, and called when you click on a link in your browser that start 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.
@@ -1499,17 +1509,18 @@ EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint availa
 ##### API ####
 ApiSetup=API module setup
 ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
-ApiProductionMode=Enable production mode (this will activate use of a caches for services management)
+ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
 ApiExporerIs=You can explore the APIs at url
 OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
 ApiKey=Key for API
+WarningAPIExplorerDisabled=The API explorer has been disabled. API explorer is not required to provide API services. It is a tool for developer to find/test REST APIs. If you need this tool, go into setup of module API REST to activate it.
 ##### Bank #####
 BankSetupModule=Bank module setup
 FreeLegalTextOnChequeReceipts=Free text on cheque receipts
 BankOrderShow=Display order of bank accounts for countries using "detailed bank number"
 BankOrderGlobal=General
 BankOrderGlobalDesc=General display order
-BankOrderES=Spanish
+BankOrderES=Spanjisht
 BankOrderESDesc=Spanish display order
 ChequeReceiptsNumberingModule=Cheque Receipts Numbering module
 
@@ -1571,7 +1582,7 @@ BackupDumpWizard=Wizard to build database backup dump file
 SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
 SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is only manual steps a privileged user can do.
 InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
-ConfFileMuseContainCustom=Installing an external module from application save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to have option<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
+ConfFileMuseContainCustom=Installing an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
 HighlightLinesColor=Highlight color of the line when the mouse passes over (keep empty for no highlight)
 TextTitleColor=Color of page title
@@ -1601,6 +1612,7 @@ FixTZ=TimeZone fix
 FillFixTZOnlyIfRequired=Example: +2 (fill only if problem experienced)
 ExpectedChecksum=Expected Checksum
 CurrentChecksum=Current Checksum
+ForcedConstants=Required constant values
 MailToSendProposal=To send customer proposal
 MailToSendOrder=To send customer order
 MailToSendInvoice=To send customer invoice
@@ -1609,13 +1621,14 @@ MailToSendIntervention=To send intervention
 MailToSendSupplierRequestForQuotation=To send quotation request to supplier
 MailToSendSupplierOrder=To send supplier order
 MailToSendSupplierInvoice=To send supplier invoice
+MailToSendContract=To send a contract
 MailToThirdparty=To send email from third party page
 ByDefaultInList=Show by default on list view
-YouUseLastStableVersion=You use the last stable version
+YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
 TitleExampleForMaintenanceRelease=Example of message you can use to announce this maintenance release (feel free to use it on your web sites)
-ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. You can download it from the download area of http://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.
-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, nor data structure change is present into this version. You can download it from the download area of http://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.
+ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. 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.
+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, nor data structure change is present into 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, you can enter here rule to have price for each level autocalculated according to price of first level, so you will have to enter only price for first level on each product. This page is here to save you time and can be usefull only if your prices for each leve are relative to first level. You can ignore this page in most cases.
 ModelModulesProduct=Templates for product documents
 ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
diff --git a/htdocs/langs/sq_AL/banks.lang b/htdocs/langs/sq_AL/banks.lang
index 9e6e1a77785..42382ff9d77 100644
--- a/htdocs/langs/sq_AL/banks.lang
+++ b/htdocs/langs/sq_AL/banks.lang
@@ -1,9 +1,9 @@
 # Dolibarr language file - Source file is en_US - banks
 Bank=Bank
 MenuBankCash=Bank/Cash
-BankName=Bank name
-FinancialAccount=Account
-BankAccount=Bank account
+BankName=Emri i Bankës
+FinancialAccount=Llogari
+BankAccount=Llogari bankare
 BankAccounts=Bank accounts
 ShowAccount=Show Account
 AccountRef=Financial account ref
@@ -56,7 +56,7 @@ BankType1=Current or credit card account
 BankType2=Cash account
 AccountsArea=Accounts area
 AccountCard=Account card
-DeleteAccount=Delete account
+DeleteAccount=Fshi llogari
 ConfirmDeleteAccount=Are you sure you want to delete this account?
 Account=Account
 BankTransactionByCategories=Bank entries by categories
@@ -74,13 +74,13 @@ Conciliate=Reconcile
 Conciliation=Reconciliation
 ReconciliationLate=Reconciliation late
 IncludeClosedAccount=Include closed accounts
-OnlyOpenedAccount=Only open accounts
+OnlyOpenedAccount=Only opened accounts
 AccountToCredit=Account to credit
 AccountToDebit=Account to debit
 DisableConciliation=Disable reconciliation feature for this account
 ConciliationDisabled=Reconciliation feature disabled
 LinkedToAConciliatedTransaction=Linked to a conciliated entry
-StatusAccountOpened=Hapur
+StatusAccountOpened=Opened
 StatusAccountClosed=Mbyllur
 AccountIdShort=Number
 LineRecord=Transaction
diff --git a/htdocs/langs/sq_AL/bills.lang b/htdocs/langs/sq_AL/bills.lang
index 651d07a4445..176155532a5 100644
--- a/htdocs/langs/sq_AL/bills.lang
+++ b/htdocs/langs/sq_AL/bills.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - bills
-Bill=Invoice
-Bills=Invoices
-BillsCustomers=Customers invoices
-BillsCustomer=Customers invoice
-BillsSuppliers=Suppliers invoices
-BillsCustomersUnpaid=Unpaid customers invoices
-BillsCustomersUnpaidForCompany=Unpaid customer's invoices for %s
-BillsSuppliersUnpaid=Unpaid supplier's invoices
-BillsSuppliersUnpaidForCompany=Unpaid supplier's invoices for %s
+Bill=Faturë
+Bills=Faturat
+BillsCustomers=Customer invoices
+BillsCustomer=Customer invoice
+BillsSuppliers=Supplier invoices
+BillsCustomersUnpaid=Unpaid customer invoices
+BillsCustomersUnpaidForCompany=Unpaid customer invoices for %s
+BillsSuppliersUnpaid=Unpaid supplier invoices
+BillsSuppliersUnpaidForCompany=Unpaid supplier invoices for %s
 BillsLate=Late payments
 BillsStatistics=Customers invoices statistics
 BillsStatisticsSuppliers=Suppliers invoices statistics
@@ -44,8 +44,8 @@ NoInvoiceToCorrect=No invoice to correct
 InvoiceHasAvoir=Was source of one or several credit notes
 CardBill=Invoice card
 PredefinedInvoices=Predefined Invoices
-Invoice=Invoice
-Invoices=Invoices
+Invoice=Faturë
+Invoices=Faturat
 InvoiceLine=Invoice line
 InvoiceCustomer=Customer invoice
 CustomerInvoice=Customer invoice
@@ -62,8 +62,8 @@ PaymentsBack=Payments back
 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 credit note or deposit 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.
+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.
 SupplierPayments=Suppliers payments
 ReceivedPayments=Received payments
 ReceivedCustomersPayments=Payments received from customers
@@ -78,6 +78,7 @@ PaymentMode=Payment type
 PaymentTypeDC=Debit/Credit Card
 PaymentTypePP=PayPal
 IdPaymentMode=Payment type (id)
+CodePaymentMode=Payment type (code)
 LabelPaymentMode=Payment type (label)
 PaymentModeShort=Payment type
 PaymentTerm=Payment term
@@ -102,9 +103,10 @@ SearchACustomerInvoice=Search for a customer invoice
 SearchASupplierInvoice=Search for a supplier invoice
 CancelBill=Cancel an invoice
 SendRemindByMail=Send reminder by EMail
-DoPayment=Do payment
-DoPaymentBack=Do payment back
+DoPayment=Enter payment
+DoPaymentBack=Enter refund
 ConvertToReduc=Convert into future discount
+ConvertExcessReceivedToReduc=Convert excess received into future discount
 EnterPaymentReceivedFromCustomer=Enter payment received from customer
 EnterPaymentDueToCustomer=Make payment due to customer
 DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
@@ -113,22 +115,24 @@ BillStatus=Invoice status
 StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Draft (needs to be validated)
 BillStatusPaid=Paid
-BillStatusPaidBackOrConverted=Paid or converted into discount
+BillStatusPaidBackOrConverted=Refund or converted into discount
 BillStatusConverted=Paid (ready for final invoice)
 BillStatusCanceled=Abandoned
 BillStatusValidated=Validated (needs to be paid)
 BillStatusStarted=Started
 BillStatusNotPaid=Not paid
+BillStatusNotRefunded=Not refunded
 BillStatusClosedUnpaid=Closed (unpaid)
 BillStatusClosedPaidPartially=Paid (partially)
 BillShortStatusDraft=Draft
 BillShortStatusPaid=Paid
-BillShortStatusPaidBackOrConverted=Processed
+BillShortStatusPaidBackOrConverted=Refund or converted
 BillShortStatusConverted=Processed
 BillShortStatusCanceled=Abandoned
 BillShortStatusValidated=Validated
 BillShortStatusStarted=Started
 BillShortStatusNotPaid=Not paid
+BillShortStatusNotRefunded=Not refunded
 BillShortStatusClosedUnpaid=Mbyllur
 BillShortStatusClosedPaidPartially=Paid (partially)
 PaymentStatusToValidShort=To validate
@@ -149,14 +153,14 @@ NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified
 FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
 NotARecurringInvoiceTemplate=Not a recurring template invoice
 NewBill=New invoice
-LastBills=Last %s invoices
-LastCustomersBills=Last %s customers invoices
-LastSuppliersBills=Last %s suppliers invoices
+LastBills=Latest %s invoices
+LastCustomersBills=Latest %s customer invoices
+LastSuppliersBills=Latest %s supplier invoices
 AllBills=All invoices
 OtherBills=Other invoices
 DraftBills=Draft invoices
-CustomersDraftInvoices=Customers draft invoices
-SuppliersDraftInvoices=Suppliers draft invoices
+CustomersDraftInvoices=Customer draft invoices
+SuppliersDraftInvoices=Supplier draft invoices
 Unpaid=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>?
@@ -203,12 +207,12 @@ AlreadyPaidNoCreditNotesNoDeposits=Already paid (without credit notes and deposi
 Abandoned=Abandoned
 RemainderToPay=Remaining unpaid
 RemainderToTake=Remaining amount to take
-RemainderToPayBack=Remaining amount to pay back
+RemainderToPayBack=Remaining amount to refund
 Rest=Pending
 AmountExpected=Amount claimed
 ExcessReceived=Excess received
 EscompteOffered=Discount offered (payment before term)
-EscompteOfferedShort=Discount
+EscompteOfferedShort=Ulje
 SendBillRef=Submission of invoice %s
 SendReminderBillRef=Submission of invoice %s (reminder)
 StandingOrders=Direct debit orders
@@ -270,6 +274,7 @@ Deposit=Deposit
 Deposits=Deposits
 DiscountFromCreditNote=Discount from credit note %s
 DiscountFromDeposit=Payments from deposit invoice %s
+DiscountFromExcessReceived=Payments from excess received of invoice %s
 AbsoluteDiscountUse=This kind of credit can be used on invoice before its validation
 CreditNoteDepositUse=Invoice must be validated to use this kind of credits
 NewGlobalDiscount=New absolute discount
@@ -277,8 +282,8 @@ NewRelativeDiscount=New relative discount
 NoteReason=Note/Reason
 ReasonDiscount=Reason
 DiscountOfferedBy=Granted by
-DiscountStillRemaining=Discounts still remaining
-DiscountAlreadyCounted=Discounts already counted
+DiscountStillRemaining=Discounts available
+DiscountAlreadyCounted=Discounts already consumed
 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.
@@ -318,9 +323,9 @@ PaymentOnDifferentThirdBills=Allow payments on different thirdparties bills but
 PaymentNote=Payment note
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
-FrequencyPer_d=Every %s days
-FrequencyPer_m=Every %s months
-FrequencyPer_y=Every %s years
+FrequencyPer_d=Çdo %s ditë
+FrequencyPer_m=Çdo %s muaj
+FrequencyPer_y=Çdo %s vjet
 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
 DateLastGeneration=Date of latest generation
@@ -331,10 +336,12 @@ 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
 # PaymentConditions
 Statut=Statusi
-PaymentConditionShortRECEP=Immediate
-PaymentConditionRECEP=Immediate
+PaymentConditionShortRECEP=Due Upon Receipt
+PaymentConditionRECEP=Due Upon Receipt
 PaymentConditionShort30D=30 days
 PaymentCondition30D=30 days
 PaymentConditionShort30DENDMONTH=30 days of month-end
@@ -349,6 +356,14 @@ PaymentConditionShortPT_ORDER=Order
 PaymentConditionPT_ORDER=On order
 PaymentConditionShortPT_5050=50-50
 PaymentConditionPT_5050=50%% in advance, 50%% on delivery
+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
 FixAmount=Fix amount
 VarAmount=Variable amount (%% tot.)
 # PaymentType
@@ -418,7 +433,7 @@ ChequeDeposits=Checks deposits
 Cheques=Checks
 DepositId=Id deposit
 NbCheque=Number of checks
-CreditNoteConvertedIntoDiscount=This credit note or deposit invoice has been converted into %s
+CreditNoteConvertedIntoDiscount=This %s has been converted into %s
 UsBillingContactAsIncoiveRecipientIfExist=Use customer billing contact address instead of third party address as recipient for invoices
 ShowUnpaidAll=Show all unpaid invoices
 ShowUnpaidLateOnly=Show late unpaid invoices only
@@ -438,7 +453,7 @@ ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contrib
 AllCompletelyPayedInvoiceWillBeClosed=All invoice with no remain to pay will be automatically closed to status "Paid".
 ToMakePayment=Pay
 ToMakePaymentBack=Pay back
-ListOfYourUnpaidInvoices=List of unpaid invoices
+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
diff --git a/htdocs/langs/sq_AL/boxes.lang b/htdocs/langs/sq_AL/boxes.lang
index 98970318e85..54ef5f48de3 100644
--- a/htdocs/langs/sq_AL/boxes.lang
+++ b/htdocs/langs/sq_AL/boxes.lang
@@ -25,8 +25,8 @@ BoxTitleLastSuppliers=Latest %s recorded suppliers
 BoxTitleLastModifiedSuppliers=Latest %s modified suppliers
 BoxTitleLastModifiedCustomers=Latest %s modified customers
 BoxTitleLastCustomersOrProspects=Latest %s customers or prospects
-BoxTitleLastCustomerBills=Latest %s customer's invoices
-BoxTitleLastSupplierBills=Latest %s supplier's invoices
+BoxTitleLastCustomerBills=Latest %s customer invoices
+BoxTitleLastSupplierBills=Latest %s supplier invoices
 BoxTitleLastModifiedProspects=Latest %s modified prospects
 BoxTitleLastModifiedMembers=Latest %s members
 BoxTitleLastFicheInter=Latest %s modified interventions
@@ -42,8 +42,8 @@ BoxTitleLastContracts=Latest %s modified contracts
 BoxTitleLastModifiedDonations=Latest %s modified donations
 BoxTitleLastModifiedExpenses=Latest %s modified expense reports
 BoxGlobalActivity=Global activity (invoices, proposals, orders)
-BoxGoodCustomers=Good customers
-BoxTitleGoodCustomers=%s Good customers
+BoxGoodCustomers=Blerës të mirë
+BoxTitleGoodCustomers=%s Blerës të mirë
 FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Latest successfull refresh date: %s
 LastRefreshDate=Latest refresh date
 NoRecordedBookmarks=No bookmarks defined.
@@ -51,12 +51,12 @@ ClickToAdd=Click here to add.
 NoRecordedCustomers=No recorded customers
 NoRecordedContacts=No recorded contacts
 NoActionsToDo=No actions to do
-NoRecordedOrders=No recorded customer's orders
+NoRecordedOrders=No recorded customer orders
 NoRecordedProposals=No recorded proposals
-NoRecordedInvoices=No recorded customer's invoices
-NoUnpaidCustomerBills=No unpaid customer's invoices
-NoUnpaidSupplierBills=No unpaid supplier's invoices
-NoModifiedSupplierBills=No recorded supplier's invoices
+NoRecordedInvoices=No recorded customer invoices
+NoUnpaidCustomerBills=No unpaid customer invoices
+NoUnpaidSupplierBills=No unpaid supplier invoices
+NoModifiedSupplierBills=No recorded supplier invoices
 NoRecordedProducts=No recorded products/services
 NoRecordedProspects=No recorded prospects
 NoContractedProducts=No products/services contracted
diff --git a/htdocs/langs/sq_AL/companies.lang b/htdocs/langs/sq_AL/companies.lang
index c3d60b4481b..e93e8ee6fbe 100644
--- a/htdocs/langs/sq_AL/companies.lang
+++ b/htdocs/langs/sq_AL/companies.lang
@@ -78,6 +78,10 @@ VATIsNotUsed=Nuk përdoret T.V.SH
 CopyAddressFromSoc=Fill address with third party address
 ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
 PaymentBankAccount=Payment bank account
+OverAllProposals=Total proposals
+OverAllOrders=Total orders
+OverAllInvoices=Total invoices
+OverAllSupplierProposals=Total price requests
 ##### Local Taxes #####
 LocalTax1IsUsed=Use second tax
 LocalTax1IsUsedES= RE is used
@@ -239,6 +243,10 @@ ProfId3RU=Prof Id 3 (KPP)
 ProfId4RU=Prof Id 4 (OKPO)
 ProfId5RU=-
 ProfId6RU=-
+ProfId1DZ=RC
+ProfId2DZ=Art.
+ProfId3DZ=NIF
+ProfId4DZ=NIS
 VATIntra=VAT number
 VATIntraShort=VAT number
 VATIntraSyntaxIsValid=Syntax is valid
@@ -382,8 +390,9 @@ ListCustomersShort=List of customers
 ThirdPartiesArea=Third parties and contact area
 LastModifiedThirdParties=Latest %s modified third parties
 UniqueThirdParties=Total of unique third parties
-InActivity=Hapur
+InActivity=Opened
 ActivityCeased=Mbyllur
+ThirdPartyIsClosed=Third party is closed
 ProductsIntoElements=List of products/services into %s
 CurrentOutstandingBill=Current outstanding bill
 OutstandingBill=Max. for outstanding bill
@@ -396,7 +405,7 @@ MergeThirdparties=Merge third parties
 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 so you will be able to delete the duplicate one.
 ThirdpartiesMergeSuccess=Thirdparties have been merged
 SaleRepresentativeLogin=Login of sales representative
-SaleRepresentativeFirstname=Firstname of sales representative
-SaleRepresentativeLastname=Lastname of sales representative
+SaleRepresentativeFirstname=First name of sales representative
+SaleRepresentativeLastname=Last name of sales representative
 ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
 NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/sq_AL/compta.lang b/htdocs/langs/sq_AL/compta.lang
index 17f2bb4e98f..5e9814369ec 100644
--- a/htdocs/langs/sq_AL/compta.lang
+++ b/htdocs/langs/sq_AL/compta.lang
@@ -65,6 +65,7 @@ PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=VAT payment
 ListPayment=List of payments
 ListOfCustomerPayments=List of customer payments
+ListOfSupplierPayments=List of supplier payments
 DateStartPeriod=Date start period
 DateEndPeriod=Date end period
 newLT1Payment=New tax 2 payment
@@ -81,7 +82,7 @@ LT2PaymentES=IRPF Payment
 LT2PaymentsES=IRPF Payments
 VATPayment=Sales tax payment
 VATPayments=Sales tax payments
-VATRefund=Sales tax refund Refund
+VATRefund=Sales tax refund
 Refund=Refund
 SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Show VAT payment
@@ -194,7 +195,7 @@ CloneTax=Clone a social/fiscal tax
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
 CloneTaxForNextMonth=Clone it for next month
 SimpleReport=Simple report
-AddExtraReport=Extra reports
+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
diff --git a/htdocs/langs/sq_AL/cron.lang b/htdocs/langs/sq_AL/cron.lang
index cb68b31c80f..2101c395149 100644
--- a/htdocs/langs/sq_AL/cron.lang
+++ b/htdocs/langs/sq_AL/cron.lang
@@ -17,14 +17,14 @@ CronMethodDoesNotExists=Class %s does not contains any method %s
 # Menu
 EnabledAndDisabled=Enabled and disabled
 # Page list
-CronLastOutput=Last run output
-CronLastResult=Last result code
+CronLastOutput=Latest run output
+CronLastResult=Latest result code
 CronCommand=Command
 CronList=Scheduled jobs
 CronDelete=Delete scheduled jobs
-CronConfirmDelete=Are you sure you want to delete these scheduled jobs ?
+CronConfirmDelete=Are you sure you want to delete these scheduled jobs?
 CronExecute=Launch scheduled job
-CronConfirmExecute=Are you sure you want to execute these scheduled jobs now ?
+CronConfirmExecute=Are you sure you want to execute these scheduled jobs now?
 CronInfo=Scheduled job module allow to execute job that have been planned
 CronTask=Job
 CronNone=None
@@ -38,7 +38,7 @@ CronClass=Class
 CronMethod=Method
 CronModule=Module
 CronNoJobs=No jobs registered
-CronPriority=Priority
+CronPriority=Prioriteti
 CronLabel=Label
 CronNbRun=Nb. launch
 CronMaxRun=Max nb. launch
@@ -49,12 +49,12 @@ CronAdd= Add jobs
 CronEvery=Execute job each
 CronObject=Instance/Object to create
 CronArgs=Parameters
-CronSaveSucess=Save successfully
-CronNote=Comment
+CronSaveSucess=Ruajtur me sukses
+CronNote=Koment
 CronFieldMandatory=Fields %s is mandatory
 CronErrEndDateStartDt=End date cannot be before start date
-CronStatusActiveBtn=Enable
-CronStatusInactiveBtn=Disable
+CronStatusActiveBtn=Aktivizo
+CronStatusInactiveBtn=Çaktivizo
 CronTaskInactive=This job is disabled
 CronId=Id
 CronClassFile=Classes (filename.class.php)
diff --git a/htdocs/langs/sq_AL/errors.lang b/htdocs/langs/sq_AL/errors.lang
index f935ce72d41..9e2eb6817ef 100644
--- a/htdocs/langs/sq_AL/errors.lang
+++ b/htdocs/langs/sq_AL/errors.lang
@@ -11,6 +11,7 @@ ErrorLoginAlreadyExists=Login %s already exists.
 ErrorGroupAlreadyExists=Group %s already exists.
 ErrorRecordNotFound=Record not found.
 ErrorFailToCopyFile=Failed to copy file '<b>%s</b>' into '<b>%s</b>'.
+ErrorFailToCopyDir=Failed to copy directory '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToRenameFile=Failed to rename file '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToDeleteFile=Failed to remove file '<b>%s</b>'.
 ErrorFailToCreateFile=Failed to create file '<b>%s</b>'.
@@ -115,7 +116,7 @@ ErrorNoActivatedBarcode=No barcode type activated
 ErrUnzipFails=Failed to unzip %s with ZipArchive
 ErrNoZipEngine=No engine to unzip %s file in this PHP
 ErrorFileMustBeADolibarrPackage=The file %s must be a Dolibarr zip package
-ErrorFileRequired=It takes a package Dolibarr file
+ErrorModuleFileRequired=You must select a Dolibarr module package file
 ErrorPhpCurlNotInstalled=The PHP CURL is not installed, this is essential to talk with 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
@@ -170,14 +171,19 @@ ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
 ErrorFileMustHaveFormat=File must have format %s
 ErrorSupplierCountryIsNotDefined=Country for this supplier is not defined. Correct this first.
 ErrorsThirdpartyMerge=Failed to merge the two records. Request canceled.
-ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enougth for product %s to add it into a new order.
-ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enougth for product %s to add it into a new invoice.
-ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enougth for product %s to add it into a new shipment.
-ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enougth for product %s to add it into a new proposal.
-ErrorFailedToLoadLoginFileForMode=Failed to get the login file for mode '%s'.
+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 bank 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>
 
 # 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.
diff --git a/htdocs/langs/sq_AL/holiday.lang b/htdocs/langs/sq_AL/holiday.lang
index 939a26aef37..400ba054946 100644
--- a/htdocs/langs/sq_AL/holiday.lang
+++ b/htdocs/langs/sq_AL/holiday.lang
@@ -12,7 +12,7 @@ DateCreateCP=Creation date
 DraftCP=Draft
 ToReviewCP=Awaiting approval
 ApprovedCP=Miratuar
-CancelCP=Canceled
+CancelCP=Anulluar
 RefuseCP=Refuzuar
 ValidatorCP=Approbator
 ListeCP=List of leaves
@@ -76,8 +76,9 @@ BoxTitleLastLeaveRequests=Latest %s modified leave requests
 HolidaysMonthlyUpdate=Monthly update
 ManualUpdate=Manual update
 HolidaysCancelation=Leave request cancelation
-EmployeeLastname=Mbiemri i punonjësit
-EmployeeFirstname=Emri i punonjësit
+EmployeeLastname=Employee last name
+EmployeeFirstname=Employee first name
+TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
 
 ## Configuration du Module ##
 LastUpdateCP=Latest automatic update of leaves allocation
diff --git a/htdocs/langs/sq_AL/ldap.lang b/htdocs/langs/sq_AL/ldap.lang
index a17019d00fb..4832b6e92ad 100644
--- a/htdocs/langs/sq_AL/ldap.lang
+++ b/htdocs/langs/sq_AL/ldap.lang
@@ -10,11 +10,11 @@ LDAPAttributes=LDAP attributes
 LDAPCard=LDAP card
 LDAPRecordNotFound=Record not found in LDAP database
 LDAPUsers=Users in LDAP database
-LDAPFieldStatus=Status
+LDAPFieldStatus=Statusi
 LDAPFieldFirstSubscriptionDate=First subscription date
 LDAPFieldFirstSubscriptionAmount=First subscription amount
-LDAPFieldLastSubscriptionDate=Last subscription date
-LDAPFieldLastSubscriptionAmount=Last subscription amount
+LDAPFieldLastSubscriptionDate=Latest subscription date
+LDAPFieldLastSubscriptionAmount=Latest subscription amount
 LDAPFieldSkype=Skype id
 LDAPFieldSkypeExample=Example : skypeName
 UserSynchronized=User synchronized
diff --git a/htdocs/langs/sq_AL/mails.lang b/htdocs/langs/sq_AL/mails.lang
index 25dc19c5c48..636c68bb17f 100644
--- a/htdocs/langs/sq_AL/mails.lang
+++ b/htdocs/langs/sq_AL/mails.lang
@@ -35,7 +35,7 @@ MailingStatusSentPartialy=Sent partialy
 MailingStatusSentCompletely=Sent completely
 MailingStatusError=Gabim
 MailingStatusNotSent=Not sent
-MailSuccessfulySent=Email successfully sent (from %s to %s)
+MailSuccessfulySent=Email successfully accepted for delivery (from %s to %s)
 MailingSuccessfullyValidated=EMailing successfully validated
 MailUnsubcribe=Unsubscribe
 MailingStatusNotContact=Don't contact anymore
@@ -74,22 +74,28 @@ ResultOfMailSending=Result of mass EMail sending
 NbSelected=Nb selected
 NbIgnored=Nb ignored
 NbSent=Nb 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
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Line %s in file
 RecipientSelectionModules=Defined requests for recipient's selection
 MailSelectedRecipients=Selected recipients
 MailingArea=EMailings area
-LastMailings=Last %s emailings
+LastMailings=Latest %s emailings
 TargetsStatistics=Targets statistics
 NbOfCompaniesContacts=Unique contacts/addresses
 MailNoChangePossible=Recipients for validated emailing can't be changed
 SearchAMailing=Search mailing
 SendMailing=Send emailing
 SendMail=Send email
-MailingNeedCommand=For security reason, sending an emailing is better when performed from command line. If you have one, ask your server administrator to launch the following command to send the emailing to all recipients:
+SentBy=Sent by
+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=You can however send them online by adding parameter MAILING_LIMIT_SENDBYWEB with value of max number of emails you want to send by session. For this, go on Home - Setup - Other.
-ConfirmSendingEmailing=If you can't or prefer sending them with your www browser, please confirm you are sure you want to send emailing now from your browser?
+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.
 TargetsReset=Clear list
 ToClearAllRecipientsClickHere=Click here to clear the recipient list for this emailing
@@ -144,3 +150,6 @@ AdvTgtCreateFilter=Create filter
 AdvTgtOrCreateNewFilter=Name of new filter
 NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
+OutGoingEmailSetup=Outgoing email setup
+InGoingEmailSetup=Incoming email setup
+
diff --git a/htdocs/langs/sq_AL/main.lang b/htdocs/langs/sq_AL/main.lang
index a00767ce690..eab60ef530e 100644
--- a/htdocs/langs/sq_AL/main.lang
+++ b/htdocs/langs/sq_AL/main.lang
@@ -63,11 +63,13 @@ ErrorNoVATRateDefinedForSellerCountry=Error, no vat rates defined for country '%
 ErrorNoSocialContributionForSellerCountry=Error, no social/fiscal taxes type defined for country '%s'.
 ErrorFailedToSaveFile=Error, failed to save file.
 ErrorCannotAddThisParentWarehouse=You are trying to add a parent warehouse which is already a child of current one
+MaxNbOfRecordPerPage=Max nb of record per page
 NotAuthorized=You are not authorized to do that.
 SetDate=Set date
 SelectDate=Select a date
 SeeAlso=See also %s
 SeeHere=See here
+Apply=Apply
 BackgroundColorByDefault=Default background color
 FileRenamed=The file was successfully renamed
 FileUploaded=The file was successfully uploaded
@@ -86,7 +88,7 @@ Undefined=Undefined
 PasswordForgotten=Password forgotten?
 SeeAbove=See above
 HomeArea=Home area
-LastConnexion=Last connection
+LastConnexion=Latest connection
 PreviousConnexion=Previous connection
 PreviousValue=Previous value
 ConnectedOnMultiCompany=Connected on environment
@@ -228,7 +230,7 @@ Now=Now
 HourStart=Start hour
 Date=Date
 DateAndHour=Date and hour
-DateToday=Today's date
+DateToday=Data e sotme
 DateReference=Reference date
 DateStart=Start date
 DateEnd=End date
@@ -236,7 +238,7 @@ DateCreation=Creation date
 DateCreationShort=Creat. date
 DateModification=Modification date
 DateModificationShort=Modif. date
-DateLastModification=Last modification date
+DateLastModification=Latest modification date
 DateValidation=Validation date
 DateClosing=Closing date
 DateDue=Due date
@@ -375,7 +377,7 @@ ExternalRef=Ref. extern
 RefSupplier=Ref. supplier
 RefPayment=Ref. payment
 CommercialProposalsShort=Commercial proposals
-Comment=Comment
+Comment=Koment
 Comments=Comments
 ActionsToDo=Events to do
 ActionsToDoShort=To do
@@ -432,9 +434,9 @@ Reportings=Reporting
 Draft=Draft
 Drafts=Drafts
 Validated=Validated
-Opened=Hapur
+Opened=Opened
 New=New
-Discount=Discount
+Discount=Ulje
 Unknown=Unknown
 General=General
 Size=Size
@@ -460,6 +462,7 @@ DeletePicture=Picture delete
 ConfirmDeletePicture=Confirm picture deletion?
 Login=Login
 CurrentLogin=Current login
+EnterLoginDetail=Enter login details
 January=January
 February=February
 March=March
@@ -566,7 +569,7 @@ Reason=Reason
 FeatureNotYetSupported=Feature not yet supported
 CloseWindow=Close window
 Response=Response
-Priority=Priority
+Priority=Prioriteti
 SendByMail=Send by EMail
 MailSentBy=Email sent by
 TextUsedInTheMessageBody=Email body
@@ -597,10 +600,12 @@ SessionName=Session name
 Method=Method
 Receive=Receive
 CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
+ExpectedValue=Expected Value
+CurrentValue=Current value
 PartialWoman=Partial
 TotalWoman=Total
 NeverReceived=Never received
-Canceled=Canceled
+Canceled=Anulluar
 YouCanChangeValuesForThisListFromDictionarySetup=You can change values for this list from menu setup - dictionary
 YouCanSetDefaultValueInModuleSetup=You can set the default value used when creating a new record into module setup
 Color=Color
@@ -720,7 +725,7 @@ GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into
 Deny=Deny
 Denied=Denied
 ListOfTemplates=List of templates
-Gender=Gender
+Gender=Gjinia
 Genderman=Man
 Genderwoman=Woman
 ViewList=List view
@@ -753,6 +758,8 @@ RemoveString=Remove string '%s'
 SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
 DirectDownloadLink=Direct download link
 Download=Download
+ActualizeCurrency=Update currency rate
+Fiscalyear=Fiscal year
 # Week day
 Monday=Monday
 Tuesday=Tuesday
@@ -787,8 +794,8 @@ SetRef=Set ref
 Select2ResultFoundUseArrows=Some results found. Use arrows to select.
 Select2NotFound=No result found
 Select2Enter=Enter
-Select2MoreCharacter=or more character
-Select2MoreCharacters=or more characters
+Select2MoreCharacter=or more characters<br /><br /><strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
+Select2MoreCharacters=or more characters<br /><br /><strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
 Select2LoadingMoreResults=Loading more results...
 Select2SearchInProgress=Search in progress...
 SearchIntoThirdparties=Thirdparties
@@ -809,3 +816,5 @@ SearchIntoContracts=Contracts
 SearchIntoCustomerShipments=Customer shipments
 SearchIntoExpenseReports=Expense reports
 SearchIntoLeaves=Lejet
+
+BulkActions=Bulk actions
diff --git a/htdocs/langs/sq_AL/members.lang b/htdocs/langs/sq_AL/members.lang
index a4a9c8b9bff..800c5752db9 100644
--- a/htdocs/langs/sq_AL/members.lang
+++ b/htdocs/langs/sq_AL/members.lang
@@ -45,7 +45,7 @@ MemberStatusDraft=Draft (needs to be validated)
 MemberStatusDraftShort=Draft
 MemberStatusActive=Validated (waiting subscription)
 MemberStatusActiveShort=Validated
-MemberStatusActiveLate=subscription expired
+MemberStatusActiveLate=Subscription expired
 MemberStatusActiveLateShort=Expired
 MemberStatusPaid=Subscription up to date
 MemberStatusPaidShort=Up to date
@@ -136,8 +136,8 @@ DocForAllMembersCards=Generate business cards for all members
 DocForOneMemberCards=Generate business cards for a particular member
 DocForLabels=Generate address sheets
 SubscriptionPayment=Subscription payment
-LastSubscriptionDate=Last subscription date
-LastSubscriptionAmount=Last subscription amount
+LastSubscriptionDate=Latest subscription date
+LastSubscriptionAmount=Latest subscription amount
 MembersStatisticsByCountries=Members statistics by country
 MembersStatisticsByState=Members statistics by state/province
 MembersStatisticsByTown=Members statistics by town
@@ -149,7 +149,7 @@ MembersByStateDesc=This screen show you statistics on members by state/provinces
 MembersByTownDesc=This screen show you statistics on members by town.
 MembersStatisticsDesc=Choose statistics you want to read...
 MenuMembersStats=Statistics
-LastMemberDate=Last member date
+LastMemberDate=Latest member date
 Nature=Nature
 Public=Information are public
 NewMemberbyWeb=New member added. Awaiting approval
diff --git a/htdocs/langs/sq_AL/orders.lang b/htdocs/langs/sq_AL/orders.lang
index 143159d4ce2..851613e7959 100644
--- a/htdocs/langs/sq_AL/orders.lang
+++ b/htdocs/langs/sq_AL/orders.lang
@@ -24,7 +24,7 @@ OrdersToBill=Customer orders delivered
 OrdersInProcess=Customer orders in process
 OrdersToProcess=Customer orders to process
 SuppliersOrdersToProcess=Supplier orders to process
-StatusOrderCanceledShort=Canceled
+StatusOrderCanceledShort=Anulluar
 StatusOrderDraftShort=Draft
 StatusOrderValidatedShort=Validated
 StatusOrderSentShort=In process
@@ -39,8 +39,8 @@ StatusOrderRefusedShort=Refuzuar
 StatusOrderBilledShort=Billed
 StatusOrderToProcessShort=To process
 StatusOrderReceivedPartiallyShort=Partially received
-StatusOrderReceivedAllShort=Everything received
-StatusOrderCanceled=Canceled
+StatusOrderReceivedAllShort=Products received
+StatusOrderCanceled=Anulluar
 StatusOrderDraft=Draft (needs to be validated)
 StatusOrderValidated=Validated
 StatusOrderOnProcess=Ordered - Standby reception
@@ -51,7 +51,7 @@ StatusOrderApproved=Miratuar
 StatusOrderRefused=Refuzuar
 StatusOrderBilled=Billed
 StatusOrderReceivedPartially=Partially received
-StatusOrderReceivedAll=Everything received
+StatusOrderReceivedAll=All products received
 ShippingExist=A shipment exists
 QtyOrdered=Qty ordered
 ProductQtyInDraft=Product quantity into draft orders
diff --git a/htdocs/langs/sq_AL/other.lang b/htdocs/langs/sq_AL/other.lang
index 70e742aa5ce..49ed25e0ec8 100644
--- a/htdocs/langs/sq_AL/other.lang
+++ b/htdocs/langs/sq_AL/other.lang
@@ -2,6 +2,7 @@
 SecurityCode=Security code
 NumberingShort=N°
 Tools=Tools
+TMenuTools=Tools
 ToolsDesc=All miscellaneous tools not included in other menu entries are collected here.<br /><br />All the tools can be reached in the left menu.
 Birthday=Birthday
 BirthdayDate=Birthday date
@@ -67,14 +68,15 @@ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find her
 PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nYou will find here the shipping __SHIPPINGREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nYou will find here the intervention __FICHINTERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n__PERSONALIZED__\n\n__SIGNATURE__
-DemoDesc=Dolibarr is a compact ERP/CRM supporting several functional modules. A demo showcasing all modules makes no sense as this scenario never occurs. So, several demo profiles are available.
+DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
+ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
 DemoFundation=Manage members of a foundation
 DemoFundation2=Manage members and bank account of a foundation
-DemoCompanyServiceOnly=Manage a freelance activity selling service only
+DemoCompanyServiceOnly=Company or freelance selling service only
 DemoCompanyShopWithCashDesk=Manage a shop with a cash desk
-DemoCompanyProductAndStocks=Manage a small or medium company selling products
-DemoCompanyAll=Manage a small or medium company with multiple activities (all main modules)
+DemoCompanyProductAndStocks=Company selling products with a shop
+DemoCompanyAll=Company with multiple activities (all main modules)
 CreatedBy=Created by %s
 ModifiedBy=Modified by %s
 ValidatedBy=Validated by %s
diff --git a/htdocs/langs/sq_AL/products.lang b/htdocs/langs/sq_AL/products.lang
index 4af6284cfba..b9e3984cf90 100644
--- a/htdocs/langs/sq_AL/products.lang
+++ b/htdocs/langs/sq_AL/products.lang
@@ -5,6 +5,8 @@ ProductLabelTranslated=Translated product label
 ProductDescriptionTranslated=Translated product description
 ProductNoteTranslated=Translated product note
 ProductServiceCard=Products/Services card
+TMenuProducts=Products
+TMenuServices=Services
 Products=Products
 Services=Services
 Product=Product
@@ -58,7 +60,7 @@ SellingPrice=Selling price
 SellingPriceHT=Selling price (net of tax)
 SellingPriceTTC=Selling price (inc. tax)
 CostPriceDescription=This price (net of tax) can be used to store the average amount this product cost to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
-CostPriceUsage=In a future version, this value could be used for margin calculation.
+CostPriceUsage=This value could be used for margin calculation.
 SoldAmount=Sold amount
 PurchasedAmount=Purchased amount
 NewPrice=New price
@@ -140,6 +142,7 @@ ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b>?
 CloneContentProduct=Clone all main informations of product/service
 ClonePricesProduct=Clone main informations and prices
 CloneCompositionProduct=Clone packaged product/service
+CloneCombinationsProduct=Clone product variants
 ProductIsUsed=This product is used
 NewRefForClone=Ref. of new product/service
 SellingPrices=Selling prices
@@ -236,7 +239,7 @@ GlobalVariables=Global variables
 VariableToUpdate=Variable to update
 GlobalVariableUpdaters=Global variable updaters
 UpdateInterval=Update interval (minutes)
-LastUpdated=Last updated
+LastUpdated=Latest update
 CorrectlyUpdated=Correctly updated
 PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
 PropalMergePdfProductChooseFile=Select PDF files
@@ -256,4 +259,41 @@ VolumeUnits=Volume unit
 SizeUnits=Size unit
 DeleteProductBuyPrice=Delete buying price
 ConfirmDeleteProductBuyPrice=Are you sure you want to delete this buying price?
+SubProduct=Sub product
 
+#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
+ProductCombinations=Variants
+HideProductCombinations=Hide products variant in the products selector
+ProductCombination=Variant
+NewProductCombination=New variant
+EditProductCombination=Editing variant
+ProductCombinationGenerator=Variants generator
+Features=Features
+PriceImpact=Price impact
+WeightImpact=Weight impact
+NewProductAttribute=New attribute
+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
+PercentageVariation=Percentage variation
+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 child products
+ConfirmCloneProductCombinations=Would you like to copy all the product variant to the 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
diff --git a/htdocs/langs/sq_AL/projects.lang b/htdocs/langs/sq_AL/projects.lang
index ecf61d17d36..95618bc5db6 100644
--- a/htdocs/langs/sq_AL/projects.lang
+++ b/htdocs/langs/sq_AL/projects.lang
@@ -29,9 +29,9 @@ DeleteAProject=Delete a project
 DeleteATask=Delete a task
 ConfirmDeleteAProject=Are you sure you want to delete this project?
 ConfirmDeleteATask=Are you sure you want to delete this task?
-OpenedProjects=Open projects
-OpenedTasks=Open tasks
-OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
+OpenedProjects=Opened projects
+OpenedTasks=Opened tasks
+OpportunitiesStatusForOpenedProjects=Opportunities amount of opened projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=Show project
 SetProject=Set project
@@ -47,7 +47,7 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
 TaskTimeDate=Date
-TasksOnOpenedProject=Tasks on open projects
+TasksOnOpenedProject=Tasks on opened projects
 WorkloadNotDefined=Workload not defined
 NewTimeSpent=New time spent
 MyTimeSpent=My time spent
@@ -58,6 +58,7 @@ TaskDateEnd=Task end date
 TaskDescription=Task description
 NewTask=New task
 AddTask=Create task
+AddTimeSpent=Create time spent
 Activity=Activity
 Activities=Tasks/activities
 MyActivities=My tasks/activities
@@ -95,6 +96,7 @@ ValidateProject=Validate projet
 ConfirmValidateProject=Are you sure you want to validate this project?
 CloseAProject=Close project
 ConfirmCloseAProject=Are you sure you want to close this project?
+AlsoCloseAProject=Also close project (keep it open if you still need to follow production tasks on it)
 ReOpenAProject=Open project
 ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=Project contacts
@@ -120,7 +122,7 @@ CloneProjectFiles=Clone project joined files
 CloneTaskFiles=Clone task(s) joined files (if task(s) cloned)
 CloneMoveDate=Update project/tasks dates from now?
 ConfirmCloneProject=Are you sure to clone this project?
-ProjectReportDate=Change task date according project start date
+ProjectReportDate=Change task dates according to new project start date
 ErrorShiftTaskDate=Impossible to shift task date according to new project start date
 ProjectsAndTasksLines=Projects and tasks
 ProjectCreatedInDolibarr=Project %s created
@@ -177,9 +179,9 @@ ProjectsStatistics=Statistics on projects/leads
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 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.
-OpenedProjectsByThirdparties=Open projects by thirdparties
+OpenedProjectsByThirdparties=Opened projects by thirdparties
 OnlyOpportunitiesShort=Only opportunities
-OpenedOpportunitiesShort=Open opportunities
+OpenedOpportunitiesShort=Opened opportunities
 NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount
@@ -191,4 +193,4 @@ OppStatusNEGO=Negociation
 OppStatusPENDING=Pending
 OppStatusWON=Won
 OppStatusLOST=Lost
-Budget=Budget
+Budget=Buxheti
diff --git a/htdocs/langs/sq_AL/propal.lang b/htdocs/langs/sq_AL/propal.lang
index ba0c6195026..3565c9007be 100644
--- a/htdocs/langs/sq_AL/propal.lang
+++ b/htdocs/langs/sq_AL/propal.lang
@@ -3,7 +3,7 @@ Proposals=Commercial proposals
 Proposal=Commercial proposal
 ProposalShort=Proposal
 ProposalsDraft=Draft commercial proposals
-ProposalsOpened=Open commercial proposals
+ProposalsOpened=Opened commercial proposals
 Prop=Commercial proposals
 CommercialProposal=Commercial proposal
 ProposalCard=Proposal card
@@ -26,9 +26,9 @@ AmountOfProposalsByMonthHT=Amount by month (net of tax)
 NbOfProposals=Number of commercial proposals
 ShowPropal=Show proposal
 PropalsDraft=Drafts
-PropalsOpened=Hapur
+PropalsOpened=Opened
 PropalStatusDraft=Draft (needs to be validated)
-PropalStatusValidated=Validated (proposal is open)
+PropalStatusValidated=Validated (proposal is opened)
 PropalStatusSigned=Signed (needs billing)
 PropalStatusNotSigned=Not signed (closed)
 PropalStatusBilled=Billed
diff --git a/htdocs/langs/sq_AL/stocks.lang b/htdocs/langs/sq_AL/stocks.lang
index 834fa104098..22491899e66 100644
--- a/htdocs/langs/sq_AL/stocks.lang
+++ b/htdocs/langs/sq_AL/stocks.lang
@@ -22,13 +22,15 @@ Movements=Movements
 ErrorWarehouseRefRequired=Warehouse reference name is required
 ListOfWarehouses=List of warehouses
 ListOfStockMovements=List of stock movements
+StockMovementForId=Movement ID %d
+ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Warehouses area
-Location=Location
+Location=Vendndodhja
 LocationSummary=Short name location
 NumberOfDifferentProducts=Number of different products
 NumberOfProducts=Total number of products
-LastMovement=Last movement
-LastMovements=Last movements
+LastMovement=Latest movement
+LastMovements=Latest movements
 Units=Units
 Unit=Unit
 StockCorrection=Correct stock
@@ -140,3 +142,4 @@ ProductStockWarehouseCreated=Stock limit for alert and desired optimal stock cor
 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
diff --git a/htdocs/langs/sq_AL/supplier_proposal.lang b/htdocs/langs/sq_AL/supplier_proposal.lang
index 09be6640a7e..08e4fa03a10 100644
--- a/htdocs/langs/sq_AL/supplier_proposal.lang
+++ b/htdocs/langs/sq_AL/supplier_proposal.lang
@@ -8,7 +8,7 @@ SearchRequest=Find a request
 DraftRequests=Draft requests
 SupplierProposalsDraft=Draft supplier proposals
 LastModifiedRequests=Latest %s modified price requests
-RequestsOpened=Open price requests
+RequestsOpened=Opened price requests
 SupplierProposalArea=Supplier proposals area
 SupplierProposalShort=Supplier proposal
 SupplierProposals=Supplier proposals
@@ -23,7 +23,7 @@ ConfirmValidateAsk=Are you sure you want to validate this price request under na
 DeleteAsk=Delete request
 ValidateAsk=Validate request
 SupplierProposalStatusDraft=Draft (needs to be validated)
-SupplierProposalStatusValidated=Validated (request is open)
+SupplierProposalStatusValidated=Validated (request is opened)
 SupplierProposalStatusClosed=Mbyllur
 SupplierProposalStatusSigned=Accepted
 SupplierProposalStatusNotSigned=Refuzuar
diff --git a/htdocs/langs/sq_AL/suppliers.lang b/htdocs/langs/sq_AL/suppliers.lang
index 3e513d72e48..b59e28bf105 100644
--- a/htdocs/langs/sq_AL/suppliers.lang
+++ b/htdocs/langs/sq_AL/suppliers.lang
@@ -41,3 +41,4 @@ DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Wrong quality
 ReputationForThisProduct=Reputation
 BuyerName=Emri i blerësit
+AllProductServicePrices=All product / service prices
diff --git a/htdocs/langs/sq_AL/withdrawals.lang b/htdocs/langs/sq_AL/withdrawals.lang
index ad9862a28a8..e5a405b1647 100644
--- a/htdocs/langs/sq_AL/withdrawals.lang
+++ b/htdocs/langs/sq_AL/withdrawals.lang
@@ -24,6 +24,7 @@ WithdrawStatistics=Direct debit payment statistics
 WithdrawRejectStatistics=Direct debit payment reject statistics
 LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
+WithdrawRequestsDone=%s direct debit payment requests recorded
 ThirdPartyBankCode=Third party bank code
 NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoice are on companies with a valid BAN.
 ClassCredited=Classify credited
@@ -76,8 +77,8 @@ RUM=UMR
 RUMLong=Unique Mandate Reference
 RUMWillBeGenerated=UMR number will be generated once bank account information are saved
 WithdrawMode=Direct debit mode (FRST or RECUR)
-WithdrawRequestAmount=Withdraw request amount:
-WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil amount.
+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
diff --git a/htdocs/langs/sr_RS/accountancy.lang b/htdocs/langs/sr_RS/accountancy.lang
index 184a303738a..4e1a88f6681 100644
--- a/htdocs/langs/sr_RS/accountancy.lang
+++ b/htdocs/langs/sr_RS/accountancy.lang
@@ -194,6 +194,8 @@ ChangeBinding=Change the binding
 
 ## Admin
 ApplyMassCategories=Apply mass categories
+AddAccountFromBookKeepingWithNoCategories=Add acccount already used with no categories
+CategoryDeleted=Category for the accounting account has been removed
 
 ## Export
 Exports=Izvozi
@@ -209,6 +211,7 @@ Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution
 Modelcsv_quadratus=Export towards Quadratus QuadraCompta
 Modelcsv_ebp=Export towards EBP
 Modelcsv_cogilog=Export towards Cogilog
+ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
 InitAccountancy=Započinjanje računovodstva
diff --git a/htdocs/langs/sr_RS/admin.lang b/htdocs/langs/sr_RS/admin.lang
index df414c90c53..cdd954c8094 100644
--- a/htdocs/langs/sr_RS/admin.lang
+++ b/htdocs/langs/sr_RS/admin.lang
@@ -9,14 +9,20 @@ VersionDevelopment=Razvoj
 VersionUnknown=Nepoznato
 VersionRecommanded=Preporučeno
 FileCheck=Files integrity checker
-FileCheckDesc=This tool allows you to check the integrity of files of your application, comparing each files with the official ones. You can use this tool to detect if some files were modified by a hacker for example.
+FileCheckDesc=This tool allows you to check the integrity of files and setup of your application, comparing each files with the official ones. 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.
+FileIntegrityIsStrictlyConformedWithReference=Files integrity is strictly conformed with the reference.
+FileIntegrityIsOkButFilesWereAdded=Files integrity check has passed, however some new files were added.
+FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified, removed or added.
+GlobalChecksum=Global checksum
 MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
 LocalSignature=Embedded local signature (less reliable)
 RemoteSignature=Remote distant signature (more reliable)
 FilesMissing=Missing Files
 FilesUpdated=Updated Files
+FilesModified=Modified Files
+FilesAdded=Added Files
 FileCheckDolibarr=Check integrity of application files
-AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from a certified package
+AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from an official package
 XmlNotFound=Xml Integrity File of application not found
 SessionId=Sesija ID
 SessionSaveHandler=Rukovalac čuvanja sesije
@@ -185,7 +191,9 @@ BoxesDesc=Widgets are components showing some information that you can add to pe
 OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
 ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
-ModulesMarketPlaces=More modules...
+ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
+ModulesMarketPlaces=Find external modules...
+GoModuleSetupArea=To deploy/install a new module, go onto the Module setup area at <a href="%s">%s</a>.
 DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules
 DoliPartnersDesc=List of companies providing custom developed modules or features (Note: anyone experienced in PHP programming can provide custom development for an open source project)
 WebSiteDesc=Reference websites to find more modules...
@@ -276,21 +284,22 @@ ModuleFamilyInterface=Interfejsi sa eksternim sistemima
 MenuHandlers=Menu handlers
 MenuAdmin=Menu editor
 DoNotUseInProduction=Do not use in production
-ThisIsProcessToFollow=This is setup to process:
-ThisIsAlternativeProcessToFollow=This is an alternative setup to process:
+ThisIsProcessToFollow=This is steps to process:
+ThisIsAlternativeProcessToFollow=This is an alternative setup to process manually:
 StepNb=Step %s
 FindPackageFromWebSite=Find a package that provides feature you want (for example on official web site %s).
 DownloadPackageFromWebSite=Download package (for example from official web site %s).
-UnpackPackageInDolibarrRoot=Unpack package file into Dolibarr server directory dedicated to external modules: <b>%s</b>
-SetupIsReadyForUse=Install is finished and Dolibarr is ready to use with this new component.
-NotExistsDirect=The alternative root directory is not defined.<br>
-InfDirAlt=Since version 3 it is possible to define an alternative root directory.This allows you to store, same place, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
-InfDirExample=<br>Then declare it in the file conf.php<br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>*These lines are commented with "#", to uncomment only remove the character.
+UnpackPackageInDolibarrRoot=Unpack the packaged files into server directory dedicated to Dolibarr: <b>%s</b>
+UnpackPackageInModulesRoot=To deploy/install an external module, unpack the packaged files into the server directory dedicated to modules: <b>%s</b>
+SetupIsReadyForUse=Module deployment is finished. You must however enable and setup the module in your application by going on the page to setup modules: <a href="%s">%s</a>.
+NotExistsDirect=The alternative root directory is not defined to an existing directory.<br>
+InfDirAlt=Since version 3, it is possible to define an alternative root directory. This allows you to store, into a dedicated directory, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
+InfDirExample=<br>Then declare it in the file <strong>conf.php</strong><br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>If these lines are commented with "#", to enable them, just uncomment by removing the "#" character.
 YouCanSubmitFile=For this step, you can send package using this tool: Select module file
 CurrentVersion=Dolibarr current version
 CallUpdatePage=Go to the page that updates the database structure and data: %s.
 LastStableVersion=Latest stable version
-LastActivationDate=Last activation date
+LastActivationDate=Latest activation date
 UpdateServerOffline=Update server offline
 GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s. <br><b>{000000@x}</b> same as previous but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
 GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
@@ -373,11 +382,11 @@ ExtrafieldCheckBox=Checkbox
 ExtrafieldRadio=Radio button
 ExtrafieldCheckBoxFromList= Checkbox from table
 ExtrafieldLink=Link to an object
-ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>In order to have the list depending on another :<br>1,value1|parent_list_code:parent_key<br>2,value2|parent_list_code:parent_key
+ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list :<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list :<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
-ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
+ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parametri moraju biti ObjectName:Classpath<br>Sintaksa : ObjectName:Classpath<br>Primer : Societe:societe/class/societe.class.php
 LibraryToBuildPDF=Library used for PDF generation
 WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
@@ -411,10 +420,11 @@ ModuleCompanyCodePanicum=Return an empty accountancy code.
 ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party code.
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
-
+WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<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).
+ClickToShowDescription=Click to show description
 # Modules
 Module0Name=Users & groups
-Module0Desc=Users and groups management
+Module0Desc=Users / Employees and Groups management
 Module1Name=Third parties
 Module1Desc=Companies and contact management (customers, prospects...)
 Module2Name=Commercial
@@ -515,8 +525,8 @@ Module2200Name=Dynamic Prices
 Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
 Module2300Desc=Scheduled job management
-Module2400Name=Agenda/Events
-Module2400Desc=Follow events or rendez-vous. Record manual events into Agendas or let application logs automatic events for tracking purposes.
+Module2400Name=Events/Agenda
+Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous.
 Module2500Name=Electronic Content Management
 Module2500Desc=Save and share documents
 Module2600Name=API/Web services (SOAP server)
@@ -582,7 +592,7 @@ Permission34=Delete products
 Permission36=See/manage hidden products
 Permission38=Export products
 Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
-Permission42=Create/modify projects (shared project and projects i'm contact for)
+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)
 Permission45=Export projects
 Permission61=Read interventions
@@ -685,7 +695,7 @@ PermissionAdvanced253=Create/modify internal/external users and permissions
 Permission254=Create/modify external users only
 Permission255=Modify other users password
 Permission256=Delete or disable other users
-Permission262=Extend access to all third parties (not only those linked to user). Not effective for external users (always limited to themselves).
+Permission262=Extend access to all third parties (not only third parties that user is a sale representative).<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 assignement matters).
 Permission271=Read CA
 Permission272=Read invoices
 Permission273=Issue invoices
@@ -887,7 +897,7 @@ Offset=Offset
 AlwaysActive=Always active
 Upgrade=Upgrade
 MenuUpgrade=Upgrade / Extend
-AddExtensionThemeModuleOrOther=Add extension (theme, module, ...)
+AddExtensionThemeModuleOrOther=Deploy/install external module
 WebServer=Web server
 DocumentRootServer=Web server's root directory
 DataRootServer=Data files directory
@@ -994,7 +1004,7 @@ TriggerAlwaysActive=Triggers in this file are always active, whatever are the ac
 TriggerActiveAsModuleActive=Triggers in this file are active as module <b>%s</b> is enabled.
 GeneratedPasswordDesc=Define here which rule you want to use to generate new password if you ask to have auto generated password
 DictionaryDesc=Insert all reference data. You can add your values to the default.
-ConstDesc=This page allows you to edit all other parameters not available in previous pages. These are mostly reserved parameters for developers or advanced troubleshooting.
+ConstDesc=This page allows you to edit all other parameters not available in previous pages. These are mostly reserved parameters for developers or advanced troubleshooting. For a list of options <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">check here</a>.
 MiscellaneousDesc=All other security related parameters are defined here.
 LimitsSetup=Limits/Precision setup
 LimitsDesc=You can define limits, precisions and optimisations used by Dolibarr here
@@ -1161,10 +1171,6 @@ FreeLegalTextOnOrders=Free text on orders
 WatermarkOnDraftOrders=Watermark on draft orders (none if empty)
 ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable
 BANK_ASK_PAYMENT_BANK_DURING_ORDER=Ask for bank account destination of order
-##### Clicktodial #####
-ClickToDialSetup=Click To Dial module setup
-ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with your clicktodial login (defined on your user card)<br><b>__PASS__</b> that will be replaced with your clicktodial password (defined on your user card).
-##### Bookmark4u #####
 ##### Interventions #####
 InterventionsSetup=Interventions module setup
 FreeLegalTextOnInterventions=Free text on intervention documents
@@ -1391,7 +1397,7 @@ SendingsSetup=Sending module setup
 SendingsReceiptModel=Sending receipt model
 SendingsNumberingModules=Sendings numbering modules
 SendingsAbility=Podrška za listove isporuke za isporuke klijentima.
-NoNeedForDeliveryReceipts=In most cases, sendings receipts are used both as sheets for customer deliveries (list of products to send) and sheets that is recevied and signed by customer. So product deliveries receipts is a duplicated feature and is rarely activated.
+NoNeedForDeliveryReceipts=In most cases, shipping sheets are used both as sheets for customer deliveries (list of products to send) and sheets that is received and signed by customer. So product deliveries receipts is a duplicated feature and is rarely activated.
 FreeLegalTextOnShippings=Free text on shipments
 ##### Deliveries #####
 DeliveryOrderNumberingModules=Products deliveries receipt numbering module
@@ -1471,7 +1477,11 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Automatski podesi ovu default vrednost za tip doga
 AGENDA_DEFAULT_FILTER_TYPE=Set automatically this type of event into search filter of agenda view
 AGENDA_DEFAULT_FILTER_STATUS=Set automatically this status for events into search filter of agenda view
 AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
-##### ClickToDial #####
+AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
+AGENDA_NOTIFICATION_SOUND=Enable sound notification
+##### Clicktodial #####
+ClickToDialSetup=Click To Dial module setup
+ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with your clicktodial login (defined on your user card)<br><b>__PASS__</b> that will be replaced with your clicktodial password (defined on your user card).
 ClickToDialDesc=Ovaj modul omogućava klik na brojeve telefona. Klik na ovu ikonu će izvršiti poziv sa Vašeg telefona na odgovarajući broj. Ova funkcionalnost se može koristiti ukoliko se Dolibarr poveže sa call center sistemom koji može pozvati telefonski broj sa SIP sistema.
 ClickToDialUseTelLink=Samo koristi link "tel:" na telefonskim brojevima
 ClickToDialUseTelLinkDesc=Koristi ovu metodu ako korisnici imaju softphone ili softverski interfejs instaliran na istom računaru gde je i browser - biće pozvana kada kliknete na link u browseru koji počinje sa "tel:". Ukoliko Vam je potrebno celokupno server rešenje (bez instalacije softvera), ovde ostavie "Ne" i popunite sledeće polje.
@@ -1499,10 +1509,11 @@ EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint availa
 ##### API ####
 ApiSetup=API module setup
 ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
-ApiProductionMode=Aktiviraj mod produkcije (ovo će aktivirati cache za servis management)
+ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
 ApiExporerIs=You can explore the APIs at url
 OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
 ApiKey=Key for API
+WarningAPIExplorerDisabled=The API explorer has been disabled. API explorer is not required to provide API services. It is a tool for developer to find/test REST APIs. If you need this tool, go into setup of module API REST to activate it.
 ##### Bank #####
 BankSetupModule=Bank module setup
 FreeLegalTextOnChequeReceipts=Free text on cheque receipts
@@ -1571,7 +1582,7 @@ BackupDumpWizard=Wizard to build database backup dump file
 SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
 SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is only manual steps a privileged user can do.
 InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
-ConfFileMuseContainCustom=Installing an external module from application save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to have option<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
+ConfFileMuseContainCustom=Installing an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
 HighlightLinesColor=Boja kojom će linija biti označena kada se mišem pređe preko nje (ostavite prazno kako linija ne bi bila označena)
 TextTitleColor=Color of page title
@@ -1601,6 +1612,7 @@ FixTZ=TimeZone fix
 FillFixTZOnlyIfRequired=Primer: +2 (uneti samo u slučaju problema)
 ExpectedChecksum=Očekivani checksum
 CurrentChecksum=Trenutni checksum
+ForcedConstants=Required constant values
 MailToSendProposal=To send customer proposal
 MailToSendOrder=To send customer order
 MailToSendInvoice=To send customer invoice
@@ -1609,13 +1621,14 @@ MailToSendIntervention=To send intervention
 MailToSendSupplierRequestForQuotation=To send quotation request to supplier
 MailToSendSupplierOrder=To send supplier order
 MailToSendSupplierInvoice=To send supplier invoice
+MailToSendContract=To send a contract
 MailToThirdparty=To send email from third party page
 ByDefaultInList=Prikaži po defaultu na prikazu liste
-YouUseLastStableVersion=Koristite poslednju stabilnu verziju
+YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=Primer poruke koju možete koristiti da biste najavili novu verziju (možete je koristiti na Vašim sajtovima)
 TitleExampleForMaintenanceRelease=Primer poruke koju možete koristiti da biste najavili novu ispravku (možete je koristiti na Vašim sajtovima)
-ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s je dostupan. Verzija %s je major verzija sa novim funkcionalnostima za korisnike i programere. Možete je preuzeti iz download sekcije na http://www.dolibarr.org portalu (folder Stable versions). Možete pročitati <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> za kompletu listu izmena.
-ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s je dostupan. Verzija %s je maintenance verzija i sadrži samo ispravke bugova. Svakome ko koristi stariju verziju preporučujemo da je ažurira. Kao i svaka maintenance verzija, ona ne sadrži nove funkcionalnosti, niti izmene struktura podataka. Možete je preuzeti iz download sekcije na http://www.dolibarr.org portalu (folder Stable versions). Možete pročitati <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> za kompletu listu izmena.
+ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. 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.
+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, nor data structure change is present into 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=Kada je uključena opcija "Više nivoa cene za proizvod/uslugu", možete definisati različite cene za svaki proizvod (po jednu za svaki nivo cene). Da biste uštedeli vreme, ovde možete uneti pravilo za automatsko računanje cene na svim nivoima na osnovu cene koju unesete za prvi nivo. Ova strana ima za cilj da uštedi Vaše vreme i može biti korisna samo ukoliko su cene za svaki od nivoa u funkciji s prvim nivoom cene. U većini slučajeva možete ignorisati ovu stranu.
 ModelModulesProduct=Templates for product documents
 ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
diff --git a/htdocs/langs/sr_RS/banks.lang b/htdocs/langs/sr_RS/banks.lang
index f494a5edfc5..4c3c8c314ed 100644
--- a/htdocs/langs/sr_RS/banks.lang
+++ b/htdocs/langs/sr_RS/banks.lang
@@ -74,13 +74,13 @@ Conciliate=Poravnati
 Conciliation=Poravnanje
 ReconciliationLate=Reconciliation late
 IncludeClosedAccount=Uključi zatvorene račune
-OnlyOpenedAccount=Samo otvoreni računi
+OnlyOpenedAccount=Only opened accounts
 AccountToCredit=Kreditni račun
 AccountToDebit=Debitni račun
 DisableConciliation=Onemogući poravnanje za ovaj račun
 ConciliationDisabled=Opcija poravnanja onemogućena
 LinkedToAConciliatedTransaction=Linked to a conciliated entry
-StatusAccountOpened=Otvoreno
+StatusAccountOpened=Opened
 StatusAccountClosed=Zatvoreno
 AccountIdShort=Broj
 LineRecord=Transakcija
diff --git a/htdocs/langs/sr_RS/bills.lang b/htdocs/langs/sr_RS/bills.lang
index 475a329c1b0..8c9b239ad55 100644
--- a/htdocs/langs/sr_RS/bills.lang
+++ b/htdocs/langs/sr_RS/bills.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - bills
 Bill=Račun
 Bills=Računi
-BillsCustomers=Računi kupaca
+BillsCustomers=Fakture klijenata
 BillsCustomer=Račun kupca
-BillsSuppliers=Računi dobavljača
-BillsCustomersUnpaid=Neplaćeni računi kupaca
-BillsCustomersUnpaidForCompany=Neplaceni računi kupaca za %s
-BillsSuppliersUnpaid=Neplaceni računi dobavljača
-BillsSuppliersUnpaidForCompany=Neplaceni računi dobavljača za %s
+BillsSuppliers=Fakture dobavljača
+BillsCustomersUnpaid=Neplaćene fakture klijenta
+BillsCustomersUnpaidForCompany=Unpaid customer invoices for %s
+BillsSuppliersUnpaid=Neplaćene fakture dobavljača
+BillsSuppliersUnpaidForCompany=Unpaid supplier invoices for %s
 BillsLate=Zakasnele uplate
 BillsStatistics=Statistika računa kupaca
 BillsStatisticsSuppliers=Statistika računa dobavljača
@@ -62,8 +62,8 @@ PaymentsBack=Refundiranja
 paymentInInvoiceCurrency=in invoices currency
 PaidBack=Refundirano
 DeletePayment=Obriši plaćanje
-ConfirmDeletePayment=Are you sure you want to delete this payment?
-ConfirmConvertToReduc=Do you want to convert this credit note or deposit 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.
+ConfirmDeletePayment=Da li ste sigurni da želite da obrišete ovo plaćanje?
+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.
 SupplierPayments=Plaćanja dobavljačima
 ReceivedPayments=Primljene uplate
 ReceivedCustomersPayments=Uplate primljene od kupaca
@@ -78,6 +78,7 @@ PaymentMode=Tip plaćanja
 PaymentTypeDC=Debit/Credit Card
 PaymentTypePP=PayPal
 IdPaymentMode=Način plaćanja (id)
+CodePaymentMode=Payment type (code)
 LabelPaymentMode=Način plaćanja (oznaka)
 PaymentModeShort=Tip uplate
 PaymentTerm=Payment term
@@ -102,9 +103,10 @@ SearchACustomerInvoice=Traži račun kupca
 SearchASupplierInvoice=Traži račun dobavljača
 CancelBill=Otkaži račun
 SendRemindByMail=Pošalji podsetnik Emailom
-DoPayment=Izvrši plaćanje
-DoPaymentBack=Izvrši povraćaj
+DoPayment=Enter payment
+DoPaymentBack=Enter refund
 ConvertToReduc=Konvertuj u budući popust
+ConvertExcessReceivedToReduc=Convert excess received into future discount
 EnterPaymentReceivedFromCustomer=Unesi prijem uplate kupca
 EnterPaymentDueToCustomer=Uplatiti zbog kupca
 DisabledBecauseRemainderToPayIsZero=Onemogući jer je preostali iznos nula
@@ -113,22 +115,24 @@ BillStatus=Status računa
 StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Nacrt (treba da se potvrdi)
 BillStatusPaid=Plaćeno
-BillStatusPaidBackOrConverted=Plaćeno, ili konvertovano u popust
+BillStatusPaidBackOrConverted=Refund or converted into discount
 BillStatusConverted=Plaćeno (spremno za konačni račun)
 BillStatusCanceled=Napušteno
 BillStatusValidated=Potvrdjeno (potrebno izvršiti plaćanje)
 BillStatusStarted=Započeto
 BillStatusNotPaid=Nije plaćeno
+BillStatusNotRefunded=Not refunded
 BillStatusClosedUnpaid=Zatvoreno (neplaćeno)
 BillStatusClosedPaidPartially=Plaćeno (delimično)
 BillShortStatusDraft=Nacrt
 BillShortStatusPaid=Plaćeno
-BillShortStatusPaidBackOrConverted=Obradjeno
+BillShortStatusPaidBackOrConverted=Refund or converted
 BillShortStatusConverted=Obradjeno
 BillShortStatusCanceled=Napušteno
 BillShortStatusValidated=Potvrdjeno
 BillShortStatusStarted=Započeto
 BillShortStatusNotPaid=Nije plaeno
+BillShortStatusNotRefunded=Not refunded
 BillShortStatusClosedUnpaid=Zatvoreno
 BillShortStatusClosedPaidPartially=Plaćeno (delimično)
 PaymentStatusToValidShort=Za potvrdu
@@ -149,14 +153,14 @@ NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified
 FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
 NotARecurringInvoiceTemplate=Not a recurring template invoice
 NewBill=Novi račun
-LastBills=Poslednji %s računi
-LastCustomersBills=Poslednji %s računi kupaca
-LastSuppliersBills=Poslednji %s računi dobavljača
+LastBills=Latest %s invoices
+LastCustomersBills=Latest %s customer invoices
+LastSuppliersBills=Latest %s supplier invoices
 AllBills=Svi računi
 OtherBills=Drugi računi
 DraftBills=Računi u statusu "nacrt"
-CustomersDraftInvoices=Nacrti računa kupcima
-SuppliersDraftInvoices=Nacrti računa dobavljača
+CustomersDraftInvoices=Customer draft invoices
+SuppliersDraftInvoices=Supplier draft invoices
 Unpaid=Neplaćeno
 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>?
@@ -203,7 +207,7 @@ AlreadyPaidNoCreditNotesNoDeposits=Already paid (without credit notes and deposi
 Abandoned=Abandoned
 RemainderToPay=Remaining unpaid
 RemainderToTake=Remaining amount to take
-RemainderToPayBack=Remaining amount to pay back
+RemainderToPayBack=Remaining amount to refund
 Rest=Pending
 AmountExpected=Amount claimed
 ExcessReceived=Excess received
@@ -270,6 +274,7 @@ Deposit=Deposit
 Deposits=Deposits
 DiscountFromCreditNote=Discount from credit note %s
 DiscountFromDeposit=Payments from deposit invoice %s
+DiscountFromExcessReceived=Payments from excess received of invoice %s
 AbsoluteDiscountUse=This kind of credit can be used on invoice before its validation
 CreditNoteDepositUse=Invoice must be validated to use this kind of credits
 NewGlobalDiscount=New absolute discount
@@ -277,8 +282,8 @@ NewRelativeDiscount=New relative discount
 NoteReason=Note/Reason
 ReasonDiscount=Reason
 DiscountOfferedBy=Granted by
-DiscountStillRemaining=Discounts still remaining
-DiscountAlreadyCounted=Discounts already counted
+DiscountStillRemaining=Discounts available
+DiscountAlreadyCounted=Discounts already consumed
 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.
@@ -331,10 +336,12 @@ 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
 # PaymentConditions
 Statut=Status
-PaymentConditionShortRECEP=Immediate
-PaymentConditionRECEP=Immediate
+PaymentConditionShortRECEP=Due Upon Receipt
+PaymentConditionRECEP=Due Upon Receipt
 PaymentConditionShort30D=30 days
 PaymentCondition30D=30 days
 PaymentConditionShort30DENDMONTH=30 days of month-end
@@ -349,6 +356,14 @@ PaymentConditionShortPT_ORDER=Narudžbina
 PaymentConditionPT_ORDER=On order
 PaymentConditionShortPT_5050=50-50
 PaymentConditionPT_5050=50%% in advance, 50%% on delivery
+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
 FixAmount=Fix amount
 VarAmount=Variable amount (%% tot.)
 # PaymentType
@@ -418,7 +433,7 @@ ChequeDeposits=Checks deposits
 Cheques=Checks
 DepositId=ID depozita
 NbCheque=Broj čekova
-CreditNoteConvertedIntoDiscount=This credit note or deposit invoice has been converted into %s
+CreditNoteConvertedIntoDiscount=This %s has been converted into %s
 UsBillingContactAsIncoiveRecipientIfExist=Use customer billing contact address instead of third party address as recipient for invoices
 ShowUnpaidAll=Show all unpaid invoices
 ShowUnpaidLateOnly=Show late unpaid invoices only
diff --git a/htdocs/langs/sr_RS/boxes.lang b/htdocs/langs/sr_RS/boxes.lang
index 8a295348220..aa7923870ed 100644
--- a/htdocs/langs/sr_RS/boxes.lang
+++ b/htdocs/langs/sr_RS/boxes.lang
@@ -25,8 +25,8 @@ BoxTitleLastSuppliers=Latest %s recorded suppliers
 BoxTitleLastModifiedSuppliers=Latest %s modified suppliers
 BoxTitleLastModifiedCustomers=Latest %s modified customers
 BoxTitleLastCustomersOrProspects=Latest %s customers or prospects
-BoxTitleLastCustomerBills=Latest %s customer's invoices
-BoxTitleLastSupplierBills=Latest %s supplier's invoices
+BoxTitleLastCustomerBills=Latest %s customer invoices
+BoxTitleLastSupplierBills=Latest %s supplier invoices
 BoxTitleLastModifiedProspects=Latest %s modified prospects
 BoxTitleLastModifiedMembers=Latest %s members
 BoxTitleLastFicheInter=Latest %s modified interventions
@@ -51,12 +51,12 @@ ClickToAdd=Kliknu ovde da dodaš.
 NoRecordedCustomers=Nema zabeleženog klijenta
 NoRecordedContacts=Nema zabeleženog kontakta
 NoActionsToDo=Nema akcije da se uradi
-NoRecordedOrders=Nema zabeležene narudžbine klijenta
+NoRecordedOrders=No recorded customer orders
 NoRecordedProposals=Nema ponude zabeležene
-NoRecordedInvoices=Nema zabeležene fakture klijenta
-NoUnpaidCustomerBills=Nema neplaćane fakture klijenta
-NoUnpaidSupplierBills=Nema neplaćenih faktura dobavljača
-NoModifiedSupplierBills=Nema zabeleženih faktura dobavljača
+NoRecordedInvoices=No recorded customer invoices
+NoUnpaidCustomerBills=No unpaid customer invoices
+NoUnpaidSupplierBills=No unpaid supplier invoices
+NoModifiedSupplierBills=No recorded supplier invoices
 NoRecordedProducts=Nema  zabeleženih proizvoda/usluga
 NoRecordedProspects=Nema zabeleženog prospekta
 NoContractedProducts=Nema ugovora za proizvode/usluge
diff --git a/htdocs/langs/sr_RS/companies.lang b/htdocs/langs/sr_RS/companies.lang
index b0809dbc2f1..f2b53f00446 100644
--- a/htdocs/langs/sr_RS/companies.lang
+++ b/htdocs/langs/sr_RS/companies.lang
@@ -78,6 +78,10 @@ VATIsNotUsed=Van PDV-a
 CopyAddressFromSoc=Fill address with third party address
 ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
 PaymentBankAccount=Payment bank account
+OverAllProposals=Total proposals
+OverAllOrders=Total orders
+OverAllInvoices=Total invoices
+OverAllSupplierProposals=Total price requests
 ##### Local Taxes #####
 LocalTax1IsUsed=Koristi drugu taksu
 LocalTax1IsUsedES= RE is used
@@ -239,6 +243,10 @@ ProfId3RU=Prof Id 3 (KPP)
 ProfId4RU=Prof Id 4 (OKPO)
 ProfId5RU=-
 ProfId6RU=-
+ProfId1DZ=RC
+ProfId2DZ=Art.
+ProfId3DZ=NIF
+ProfId4DZ=NIS
 VATIntra=PDV broj
 VATIntraShort=PDV number
 VATIntraSyntaxIsValid=Sintaksa je ispravna
@@ -382,8 +390,9 @@ ListCustomersShort=Lista klijenata
 ThirdPartiesArea=Subjekti i obast kontakta
 LastModifiedThirdParties=Latest %s modified third parties
 UniqueThirdParties=Ukupno jedinstvenih subjekata
-InActivity=Otvoreno
+InActivity=Opened
 ActivityCeased=Zatvoreno
+ThirdPartyIsClosed=Third party is closed
 ProductsIntoElements=Lista proizvoda/usluga u %s
 CurrentOutstandingBill=Current outstanding bill
 OutstandingBill=Max. for outstanding bill
@@ -396,7 +405,7 @@ MergeThirdparties=Spoji subjekte
 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 so you will be able to delete the duplicate one.
 ThirdpartiesMergeSuccess=Subjekti su spojeni
 SaleRepresentativeLogin=Login of sales representative
-SaleRepresentativeFirstname=Firstname of sales representative
-SaleRepresentativeLastname=Lastname of sales representative
+SaleRepresentativeFirstname=First name of sales representative
+SaleRepresentativeLastname=Last name of sales representative
 ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
 NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/sr_RS/compta.lang b/htdocs/langs/sr_RS/compta.lang
index 3db01deb1d5..80d0a312e94 100644
--- a/htdocs/langs/sr_RS/compta.lang
+++ b/htdocs/langs/sr_RS/compta.lang
@@ -65,6 +65,7 @@ PaymentSocialContribution=Uplata poreza/doprinosa
 PaymentVat=PDV uplata
 ListPayment=Lista uplata
 ListOfCustomerPayments=Lista uplata klijenata
+ListOfSupplierPayments=Lista uplata dobavljača
 DateStartPeriod=Početak perioda
 DateEndPeriod=Kraj perioda
 newLT1Payment=Nova uplata takse 2
@@ -81,7 +82,7 @@ LT2PaymentES=IRPF uplata
 LT2PaymentsES=IRPF uplate
 VATPayment=Sales tax payment
 VATPayments=Sales tax payments
-VATRefund=Sales tax refund Refund
+VATRefund=Sales tax refund
 Refund=Povraćaj
 SocialContributionsPayments=Uplate poreza/doprinosa
 ShowVatPayment=Prikaži PDV uplatu
@@ -194,7 +195,7 @@ CloneTax=Dupliraj porez/doprinos
 ConfirmCloneTax=Potvrdi dupliranje uplate poreza/doprinosa
 CloneTaxForNextMonth=Dupliraj za sledeći mesec
 SimpleReport=Skraćeni izveštaj
-AddExtraReport=Posebni izveštaji
+AddExtraReport=Extra reports (add foreign and national customer report)
 OtherCountriesCustomersReport=Izveštaj stranih klijenata
 BasedOnTwoFirstLettersOfVATNumberBeingDifferentFromYourCompanyCountry=Zasnovan na prva dva slova PDV broja različitog od ISO koda zemlje Vaše kompanije
 SameCountryCustomersWithVAT=Izveštaj nacionalnih klijenata
diff --git a/htdocs/langs/sr_RS/cron.lang b/htdocs/langs/sr_RS/cron.lang
index 351527df5b5..1bb3caad9fd 100644
--- a/htdocs/langs/sr_RS/cron.lang
+++ b/htdocs/langs/sr_RS/cron.lang
@@ -17,14 +17,14 @@ CronMethodDoesNotExists=Klasa %s ne sadrži ni jedan metod %s
 # Menu
 EnabledAndDisabled=Aktivno i neaktivno
 # Page list
-CronLastOutput=Output poslednjeg izvršenja
-CronLastResult=Poslednji povratni kod
+CronLastOutput=Latest run output
+CronLastResult=Latest result code
 CronCommand=Komanda
 CronList=Planirane operacije
 CronDelete=Obriši planirane operacije
-CronConfirmDelete=Da li ste sigurni da želite da obrišete ove planirane operacije ?
+CronConfirmDelete=Are you sure you want to delete these scheduled jobs?
 CronExecute=Launch scheduled job
-CronConfirmExecute=Da li ste sigurni da želite da sada izvršite planirane operacije ?
+CronConfirmExecute=Are you sure you want to execute these scheduled jobs now?
 CronInfo=Modul planiranih aktivnosti omogućava izvršenje planirane aktivnosti
 CronTask=Operacija
 CronNone=Nema
@@ -39,7 +39,7 @@ CronMethod=Metoda
 CronModule=Modul
 CronNoJobs=Nema prijavljenih operacija
 CronPriority=Prioritet
-CronLabel=Label
+CronLabel=Naziv
 CronNbRun=Br. izvršenja
 CronMaxRun=Maksimalni broj izvršenja
 CronEach=Svakih
@@ -73,7 +73,7 @@ CronType_method=Metoda poziva Dolibarr klase
 CronType_command=Komandna linija
 CronCannotLoadClass=Nemoguće učitati klasu %s ili objekat %s
 UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled jobs" to see and edit scheduled jobs.
-JobDisabled=Job disabled
+JobDisabled=Operacija deaktivirana
 MakeLocalDatabaseDumpShort=Bekap lokalne baze
 MakeLocalDatabaseDump=Kreirajte odbacivanje lokalne baze
 WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of active jobs, your jobs may be delayed to a maximum of %s hours before being run.
diff --git a/htdocs/langs/sr_RS/errors.lang b/htdocs/langs/sr_RS/errors.lang
index 838539dff76..72137d34f13 100644
--- a/htdocs/langs/sr_RS/errors.lang
+++ b/htdocs/langs/sr_RS/errors.lang
@@ -11,6 +11,7 @@ ErrorLoginAlreadyExists=Login %s već postoji
 ErrorGroupAlreadyExists=Grupa %s već postoji
 ErrorRecordNotFound=Linija nije pronađena.
 ErrorFailToCopyFile=Greška prilikom kopiranja fajla '<b>%s</b>' u '<b>%s</b>'.
+ErrorFailToCopyDir=Failed to copy directory '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToRenameFile=Greška prilikom preimenovanja fajla '<b>%s</b>' u '<b>%s</b>'.
 ErrorFailToDeleteFile=Greška prilikom brisanja fajla '<b>%s</b>'.
 ErrorFailToCreateFile=Greška prilikom kreacije fajla '<b>%s</b>'.
@@ -115,7 +116,7 @@ ErrorNoActivatedBarcode=Barcode tip nije aktiviran
 ErrUnzipFails=Greška prilikom dekompresije %s
 ErrNoZipEngine=PHP ne podržava dekompresiju za fajl %s
 ErrorFileMustBeADolibarrPackage=Fajl %s mora biti Dolibarr zip paket
-ErrorFileRequired=Uzima Dolibarr paket
+ErrorModuleFileRequired=You must select a Dolibarr module package file
 ErrorPhpCurlNotInstalled=PHP CURL nije instaliran, ovo je neophodno za Paypal
 ErrorFailedToAddToMailmanList=Greška prilikom dodavanja linije %s Mailman listi %s ili SPIP bazi
 ErrorFailedToRemoveToMailmanList=Greška prilikom uklanjanja linije %s iz Mailman liste %s ili SPIP baze
@@ -170,14 +171,19 @@ ErrorWarehouseRequiredIntoShipmentLine=Magacin je neophodan na liniji do isporuk
 ErrorFileMustHaveFormat=Mora imati format %s
 ErrorSupplierCountryIsNotDefined=Zemlja dobavljača mora biti definisana.
 ErrorsThirdpartyMerge=Failed to merge the two records. Request canceled.
-ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enougth for product %s to add it into a new order.
-ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enougth for product %s to add it into a new invoice.
-ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enougth for product %s to add it into a new shipment.
-ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enougth for product %s to add it into a new proposal.
-ErrorFailedToLoadLoginFileForMode=Failed to get the login file for mode '%s'.
+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 bank 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>
 
 # 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.
diff --git a/htdocs/langs/sr_RS/holiday.lang b/htdocs/langs/sr_RS/holiday.lang
index 25de9d3447c..c9dc7f7746a 100644
--- a/htdocs/langs/sr_RS/holiday.lang
+++ b/htdocs/langs/sr_RS/holiday.lang
@@ -76,8 +76,9 @@ BoxTitleLastLeaveRequests=Latest %s modified leave requests
 HolidaysMonthlyUpdate=Mesečno ažuriranje
 ManualUpdate=Ručno ažuriranje
 HolidaysCancelation=Napusti otkazivanje zahteva
-EmployeeLastname=Employee lastname
-EmployeeFirstname=Employee firstname
+EmployeeLastname=Employee last name
+EmployeeFirstname=Employee first name
+TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
 
 ## Configuration du Module ##
 LastUpdateCP=Latest automatic update of leaves allocation
diff --git a/htdocs/langs/sr_RS/ldap.lang b/htdocs/langs/sr_RS/ldap.lang
index 07cbc9ae468..be096b550f7 100644
--- a/htdocs/langs/sr_RS/ldap.lang
+++ b/htdocs/langs/sr_RS/ldap.lang
@@ -13,8 +13,8 @@ LDAPUsers=Korisnici u LDAP bazi
 LDAPFieldStatus=Status
 LDAPFieldFirstSubscriptionDate=Datum prve prijave
 LDAPFieldFirstSubscriptionAmount=Svota prve prijave
-LDAPFieldLastSubscriptionDate=Datum poslednje prijave
-LDAPFieldLastSubscriptionAmount=Svota poslednje prijave
+LDAPFieldLastSubscriptionDate=Latest subscription date
+LDAPFieldLastSubscriptionAmount=Latest subscription amount
 LDAPFieldSkype=Skype id
 LDAPFieldSkypeExample=Example : skypeName
 UserSynchronized=Korisnik sinhronizovan
diff --git a/htdocs/langs/sr_RS/mails.lang b/htdocs/langs/sr_RS/mails.lang
index 25820718703..365e05c4195 100644
--- a/htdocs/langs/sr_RS/mails.lang
+++ b/htdocs/langs/sr_RS/mails.lang
@@ -35,7 +35,7 @@ MailingStatusSentPartialy=Delimično poslat
 MailingStatusSentCompletely=Potpuno poslat
 MailingStatusError=Greška
 MailingStatusNotSent=Nije poslat
-MailSuccessfulySent=Email uspešno poslat (od %s do %s)
+MailSuccessfulySent=Email successfully accepted for delivery (from %s to %s)
 MailingSuccessfullyValidated=Emailing uspešno odobren
 MailUnsubcribe=Otkaži
 MailingStatusNotContact=Ne kontaktirati više
@@ -74,22 +74,28 @@ ResultOfMailSending=Rezultat masovnog mailinga
 NbSelected=Br selektiranih
 NbIgnored= Br ignorisanih
 NbSent=Br poslatih
+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
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Linija %s u fajlu
 RecipientSelectionModules=Definisani zahtevi za selekciju primalaca
 MailSelectedRecipients=Selektirani primaoci
 MailingArea=Oblast Emailinga
-LastMailings=Poslednjih %s emailinga
+LastMailings=Latest %s emailings
 TargetsStatistics=Statistike targeta
 NbOfCompaniesContacts=Jedinstveni kontakti/adrese
 MailNoChangePossible=Primaoci za odobrene emailinge ne mogu biti izmenjeni
 SearchAMailing=Pretraži emailing
 SendMailing=Pošalji emailing
 SendMail=Pošalji email
-MailingNeedCommand=Iz sigurnosnih razloga, slanje maila je bolje ukoliko se obavlja iz komandne linije. Ukoliko je moguće, obratite se administratoru kako bi putem sledeće komande posla mail svim primaocima:
+SentBy=Poslao
+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=Možete ih poslati i online, dodavanjem parametra MAILING_LIMIT_SENDBYWEB sa vrednošću maksimalnog broja mailova koje želite da pošaljete u jednoj sesiji. Pogledajte Home - Podešavanja - Ostalo.
-ConfirmSendingEmailing=If you can't or prefer sending them with your www browser, please confirm you are sure you want to send emailing now from your browser?
+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=Napomena: Slanje mailova putem web interfejsa se radi iz više puta iz bezbednosnih razloga, <b>%s</b> primalaca od jednom za svaku sesiju slanja.
 TargetsReset=Očisti listu
 ToClearAllRecipientsClickHere=Kliknite ovde da biste očistili listu primalaca za ovaj emailing
@@ -144,3 +150,6 @@ AdvTgtCreateFilter=Create filter
 AdvTgtOrCreateNewFilter=Name of new filter
 NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
+OutGoingEmailSetup=Outgoing email setup
+InGoingEmailSetup=Incoming email setup
+
diff --git a/htdocs/langs/sr_RS/main.lang b/htdocs/langs/sr_RS/main.lang
index 75165677abe..dab37a1af63 100644
--- a/htdocs/langs/sr_RS/main.lang
+++ b/htdocs/langs/sr_RS/main.lang
@@ -63,11 +63,13 @@ ErrorNoVATRateDefinedForSellerCountry=Greška, PDV stopa nije definisana za zeml
 ErrorNoSocialContributionForSellerCountry=Greška, nema poreskih stopa definisanih za zemlju "%s".
 ErrorFailedToSaveFile=Greška, nemoguće sačuvati fajl.
 ErrorCannotAddThisParentWarehouse=You are trying to add a parent warehouse which is already a child of current one
+MaxNbOfRecordPerPage=Max nb of record per page
 NotAuthorized=Nemate prava za tu akciju.
 SetDate=Postavi datum
 SelectDate=Izaberi datum
 SeeAlso=Pogledajte i %s
 SeeHere=Pogledaj ovde
+Apply=Apply
 BackgroundColorByDefault=Default boja pozadine
 FileRenamed=The file was successfully renamed
 FileUploaded=Fajl je uspešno uploadovan
@@ -86,7 +88,7 @@ Undefined=Nedefinisano
 PasswordForgotten=Password forgotten?
 SeeAbove=Pogledajte iznad
 HomeArea=Oblast Home
-LastConnexion=Poslednja konekcija
+LastConnexion=Latest connection
 PreviousConnexion=Prethodna konekcija
 PreviousValue=Previous value
 ConnectedOnMultiCompany=Povezan u okruženje
@@ -236,7 +238,7 @@ DateCreation=Datum kreacije
 DateCreationShort=Datum kreiranja
 DateModification=Datum izmene
 DateModificationShort=Dat. izmene
-DateLastModification=Datum poslednje izmene
+DateLastModification=Latest modification date
 DateValidation=Datum odobrenja
 DateClosing=Datum zatvaranja
 DateDue=Rok
@@ -432,7 +434,7 @@ Reportings=Izveštavanje
 Draft=Draft
 Drafts=Draft
 Validated=Validirano
-Opened=Otvori
+Opened=Opened
 New=Novo
 Discount=Popust
 Unknown=Nepoznato
@@ -460,6 +462,7 @@ DeletePicture=Obriši sliku
 ConfirmDeletePicture=Potvrdite brisanje slike?
 Login=Login
 CurrentLogin=Trenutni login
+EnterLoginDetail=Enter login details
 January=Januar
 February=Februar
 March=Mart
@@ -597,6 +600,8 @@ SessionName=Ime sesije
 Method=Metoda
 Receive=Primi
 CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
+ExpectedValue=Expected Value
+CurrentValue=Trenutna vrednost
 PartialWoman=Delimično
 TotalWoman=Celo
 NeverReceived=Nije primljena
@@ -753,6 +758,8 @@ RemoveString=Remove string '%s'
 SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
 DirectDownloadLink=Direct download link
 Download=Download
+ActualizeCurrency=Update currency rate
+Fiscalyear=Fiscal year
 # Week day
 Monday=Ponedeljak
 Tuesday=Utorak
@@ -787,8 +794,8 @@ SetRef=Podesi ref
 Select2ResultFoundUseArrows=Some results found. Use arrows to select.
 Select2NotFound=Nema rezultata
 Select2Enter=Unesite
-Select2MoreCharacter=or more character
-Select2MoreCharacters=ili više karaktera
+Select2MoreCharacter=or more characters<br /><br /><strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
+Select2MoreCharacters=or more characters<br /><br /><strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
 Select2LoadingMoreResults=Učitavanje drugih rezultata...
 Select2SearchInProgress=Pretraga u toku...
 SearchIntoThirdparties=Subjekti
@@ -809,3 +816,5 @@ SearchIntoContracts=Ugovori
 SearchIntoCustomerShipments=Customer shipments
 SearchIntoExpenseReports=Troškovi
 SearchIntoLeaves=Odsustva
+
+BulkActions=Bulk actions
diff --git a/htdocs/langs/sr_RS/members.lang b/htdocs/langs/sr_RS/members.lang
index ffe2a0b0915..a79a9dd120f 100644
--- a/htdocs/langs/sr_RS/members.lang
+++ b/htdocs/langs/sr_RS/members.lang
@@ -45,7 +45,7 @@ MemberStatusDraft=Draft (čeka potvrdu)
 MemberStatusDraftShort=Draft
 MemberStatusActive=Potvrđen (čeka pretplatu)
 MemberStatusActiveShort=Odobren
-MemberStatusActiveLate=Pretplata je istekla
+MemberStatusActiveLate=Subscription expired
 MemberStatusActiveLateShort=Istekla
 MemberStatusPaid=Pretplata je ažurna
 MemberStatusPaidShort=Ažurna
@@ -136,8 +136,8 @@ DocForAllMembersCards=Generiši vizit karte za sve članove
 DocForOneMemberCards=Generiši vizit kartu za određenog člana
 DocForLabels=Generiši karticu adrese
 SubscriptionPayment=Uplata pretplate
-LastSubscriptionDate=Datum poslednje prijave
-LastSubscriptionAmount=Svota poslednje prijave
+LastSubscriptionDate=Latest subscription date
+LastSubscriptionAmount=Latest subscription amount
 MembersStatisticsByCountries=Statistike članova po zemlji
 MembersStatisticsByState=Statistike članova po regionu
 MembersStatisticsByTown=Statistike članova po gradu
@@ -149,7 +149,7 @@ MembersByStateDesc=Ovaj ekran pokazuje statistike članova po regionu.
 MembersByTownDesc=Ovaj ekran pokazuje statistike članova po gradu.
 MembersStatisticsDesc=Izaberite statistike koje želite da konsultujete...
 MenuMembersStats=Statistike
-LastMemberDate=Datum poslednjeg člana
+LastMemberDate=Latest member date
 Nature=Priroda
 Public=Javne informacije
 NewMemberbyWeb=Novi član je dodat. Čeka se odobrenje.
diff --git a/htdocs/langs/sr_RS/orders.lang b/htdocs/langs/sr_RS/orders.lang
index d0fde1a22da..9b1a9c415d8 100644
--- a/htdocs/langs/sr_RS/orders.lang
+++ b/htdocs/langs/sr_RS/orders.lang
@@ -39,7 +39,7 @@ StatusOrderRefusedShort=Odbijeno
 StatusOrderBilledShort=Naplaćeno
 StatusOrderToProcessShort=Za obradu
 StatusOrderReceivedPartiallyShort=Delimično primljeno
-StatusOrderReceivedAllShort=Primljeno
+StatusOrderReceivedAllShort=Products received
 StatusOrderCanceled=Otkazano
 StatusOrderDraft=Nacrt (čeka na odobrenje)
 StatusOrderValidated=Odobreno
@@ -51,7 +51,7 @@ StatusOrderApproved=Odobreno
 StatusOrderRefused=Odbijeno
 StatusOrderBilled=Naplaćeno
 StatusOrderReceivedPartially=Delimično primljeno
-StatusOrderReceivedAll=Primljeno
+StatusOrderReceivedAll=All products received
 ShippingExist=Isporuka postoji
 QtyOrdered=Kol. naručena
 ProductQtyInDraft=Količina proizvoda u draft narudžbinama
diff --git a/htdocs/langs/sr_RS/other.lang b/htdocs/langs/sr_RS/other.lang
index 4ce2d4a1fff..2ffac3ed71e 100644
--- a/htdocs/langs/sr_RS/other.lang
+++ b/htdocs/langs/sr_RS/other.lang
@@ -2,6 +2,7 @@
 SecurityCode=Bezbednosni kod
 NumberingShort=N°
 Tools=Alati
+TMenuTools=Alati
 ToolsDesc=All miscellaneous tools not included in other menu entries are collected here.<br /><br />All the tools can be reached in the left menu.
 Birthday=Datum rođenja
 BirthdayDate=Birthday date
@@ -67,14 +68,15 @@ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nU prilogu možete
 PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nU prilogu možete naći isporuku __SHIPPINGREF__\n\n__PERSONALIZED__Srdačan pozdrav,\n\n__SIGNATURE__
 PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nU prilogu možete naći intervenciju __FICHINTERREF__\n\n__PERSONALIZED__Srdačan pozdrav,\n\n__SIGNATURE__
 PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n__PERSONALIZED__\n\n__SIGNATURE__
-DemoDesc=Dolibarr is a compact ERP/CRM supporting several functional modules. A demo showcasing all modules makes no sense as this scenario never occurs. So, several demo profiles are available.
+DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
+ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
 DemoFundation=Upravljanje članovima fondacije
 DemoFundation2=Upravljanje članovima i bankovnim računom fondacije
-DemoCompanyServiceOnly=Upravjanje freelance aktivnosti isključivo za prodaju usluga
+DemoCompanyServiceOnly=Company or freelance selling service only
 DemoCompanyShopWithCashDesk=Upravljanje prodavnicom sa kasom
-DemoCompanyProductAndStocks=Upravljanje malim ili srednjim preduzećem koje se bavi prodajom
-DemoCompanyAll=Upravljanje malim ili srednjim preduzećem sa raznim aktivnostima (svi glavni moduli)
+DemoCompanyProductAndStocks=Company selling products with a shop
+DemoCompanyAll=Company with multiple activities (all main modules)
 CreatedBy=Kreirao %s
 ModifiedBy=Izmenio %s
 ValidatedBy=Potvrdio %s
diff --git a/htdocs/langs/sr_RS/products.lang b/htdocs/langs/sr_RS/products.lang
index 7ee8a4804c4..13eafff510d 100644
--- a/htdocs/langs/sr_RS/products.lang
+++ b/htdocs/langs/sr_RS/products.lang
@@ -5,6 +5,8 @@ ProductLabelTranslated=Prevedeni naziv proizvoda
 ProductDescriptionTranslated=Prevedeni opis proizvoda
 ProductNoteTranslated=Prevedena napomena proizvoda
 ProductServiceCard=Kartica Proizvoda/Usluga
+TMenuProducts=Proizvodi
+TMenuServices=Usluge
 Products=Proizvodi
 Services=Usluge
 Product=Proizvod
@@ -58,7 +60,7 @@ SellingPrice=Prodajna cena
 SellingPriceHT=Prodajna cena (neto)
 SellingPriceTTC=Prodajna cena (sa PDV-om)
 CostPriceDescription=Ovu cenu (neto) možete koristiti da zabeležite prosečnu cenu koštanja proizvoda za Vašu kompaniju. To može biti bilo koja cenu koju sami izračunate, npr. prosečna nabavna cena plus prosečna cena proizvodnje i distribucije.
-CostPriceUsage=U sledećoj verziji, ova vrednost će biti korisna za računanje marže.
+CostPriceUsage=This value could be used for margin calculation.
 SoldAmount=Sold amount
 PurchasedAmount=Purchased amount
 NewPrice=Nova cena
@@ -140,6 +142,7 @@ ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b>?
 CloneContentProduct=Kloniraj sve glavne podatke proizvoda/usluge
 ClonePricesProduct=Kloniraj glavne podatke i cene
 CloneCompositionProduct=Dupliraj paket proizvoda/usluga
+CloneCombinationsProduct=Clone product variants
 ProductIsUsed=Ovaj proizvod je u upotrebi
 NewRefForClone=Ref. novog proizvoda/usluge
 SellingPrices=Prodajne cene
@@ -236,7 +239,7 @@ GlobalVariables=Globalne promenljive
 VariableToUpdate=Promenljiva za ažuriranje
 GlobalVariableUpdaters=Ažuriranje globalnih promenljivih
 UpdateInterval=Interval ažuriranja (minuti)
-LastUpdated=Ažurrano
+LastUpdated=Latest update
 CorrectlyUpdated=Uspešno ažurirano
 PropalMergePdfProductActualFile=Fajlovi za dodavanje u PDF Azur su
 PropalMergePdfProductChooseFile=Selektiraj PDF fajlove
@@ -256,4 +259,41 @@ VolumeUnits=Jedinica zapremine
 SizeUnits=jedinica veličine
 DeleteProductBuyPrice=Delete buying price
 ConfirmDeleteProductBuyPrice=Are you sure you want to delete this buying price?
+SubProduct=Sub product
 
+#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
+ProductCombinations=Variants
+HideProductCombinations=Hide products variant in the products selector
+ProductCombination=Variant
+NewProductCombination=New variant
+EditProductCombination=Editing variant
+ProductCombinationGenerator=Variants generator
+Features=Features
+PriceImpact=Price impact
+WeightImpact=Weight impact
+NewProductAttribute=Novi atribut
+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
+PercentageVariation=Percentage variation
+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 child products
+ConfirmCloneProductCombinations=Would you like to copy all the product variant to the 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
diff --git a/htdocs/langs/sr_RS/projects.lang b/htdocs/langs/sr_RS/projects.lang
index 06649beed08..1bc63c8365b 100644
--- a/htdocs/langs/sr_RS/projects.lang
+++ b/htdocs/langs/sr_RS/projects.lang
@@ -29,9 +29,9 @@ DeleteAProject=Obriši projekat
 DeleteATask=Obriši zadatak
 ConfirmDeleteAProject=Are you sure you want to delete this project?
 ConfirmDeleteATask=Are you sure you want to delete this task?
-OpenedProjects=Open projects
-OpenedTasks=Open tasks
-OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
+OpenedProjects=Otvoreni projekti
+OpenedTasks=Otvoreni zadaci
+OpportunitiesStatusForOpenedProjects=Iznos prilika u otvorenim projektima po statusu
 OpportunitiesStatusForProjects=Količina prilika projekata na osnovu statusa
 ShowProject=Prikaži projekat
 SetProject=Postavi projekat
@@ -47,7 +47,7 @@ TaskTimeSpent=Vreme provedeno na zadacima
 TaskTimeUser=Korisnik
 TaskTimeNote=Beleška
 TaskTimeDate=Datum
-TasksOnOpenedProject=Zadaci na otvorenim projektima
+TasksOnOpenedProject=Tasks on opened projects
 WorkloadNotDefined=Količina vremena nije definisana
 NewTimeSpent=Novo provedeno vreme
 MyTimeSpent=Moje vreme
@@ -58,6 +58,7 @@ TaskDateEnd=Kraj zadatka
 TaskDescription=Opis zadatka
 NewTask=Novi zadatak
 AddTask=Kreiraj zadatak
+AddTimeSpent=Create time spent
 Activity=Aktivnost
 Activities=Zadaci/aktivnosti
 MyActivities=Moji zadaci/aktivnosti
@@ -95,6 +96,7 @@ ValidateProject=Odobri projekat
 ConfirmValidateProject=Are you sure you want to validate this project?
 CloseAProject=Zatvori projekat
 ConfirmCloseAProject=Are you sure you want to close this project?
+AlsoCloseAProject=Also close project (keep it open if you still need to follow production tasks on it)
 ReOpenAProject=Otvori projekat
 ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=Kontakti projekta
@@ -120,7 +122,7 @@ CloneProjectFiles=Dupliraj fajlove projekta
 CloneTaskFiles=Dupliraj fajlove zadataka (ukoliko su zadaci duplirani)
 CloneMoveDate=Update project/tasks dates from now?
 ConfirmCloneProject=Are you sure to clone this project?
-ProjectReportDate=Izmenite datum zadatka prema datumu početka projekta.
+ProjectReportDate=Change task dates according to new project start date
 ErrorShiftTaskDate=Nemoguće promeniti datum zadatka prema novom datumu početka projekta
 ProjectsAndTasksLines=Projekti i zadaci
 ProjectCreatedInDolibarr=Projekat %s je kreiran
@@ -177,9 +179,9 @@ ProjectsStatistics=Statistike na projektima/lead-ovima
 TaskAssignedToEnterTime=Zadatak je dodeljen. Unos vremena za ovaj zadatak je omogućen.
 IdTaskTime=Id vremena zadatka
 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.
-OpenedProjectsByThirdparties=Open projects by thirdparties
+OpenedProjectsByThirdparties=Otvoreni projekti po subjektima
 OnlyOpportunitiesShort=Samo šanse
-OpenedOpportunitiesShort=Open opportunities
+OpenedOpportunitiesShort=Otvorene šanse
 NotAnOpportunityShort=Nije šansa
 OpportunityTotalAmount=Ukupan iznos prilika
 OpportunityPonderatedAmount=Prosečni iznos prilika
diff --git a/htdocs/langs/sr_RS/propal.lang b/htdocs/langs/sr_RS/propal.lang
index 619754565cd..7b80739a53d 100644
--- a/htdocs/langs/sr_RS/propal.lang
+++ b/htdocs/langs/sr_RS/propal.lang
@@ -3,7 +3,7 @@ Proposals=Komercijalne ponude
 Proposal=Komercijalna ponuda
 ProposalShort=Ponuda
 ProposalsDraft=Nacrt komercijalne ponude
-ProposalsOpened=Otvorene komercijalne ponude
+ProposalsOpened=Opened commercial proposals
 Prop=Komercijalne ponude
 CommercialProposal=Komercijaln ponuda
 ProposalCard=Kartica ponude
@@ -26,9 +26,9 @@ AmountOfProposalsByMonthHT=Svota po mesecu (neto)
 NbOfProposals=Broj komercijalnih ponuda
 ShowPropal=Prikaži ponudu
 PropalsDraft=Nacrt
-PropalsOpened=Otvorena
+PropalsOpened=Opened
 PropalStatusDraft=Nacrt (čeka odobrenje)
-PropalStatusValidated=Odobrena (ponuda je otvorena)
+PropalStatusValidated=Validated (proposal is opened)
 PropalStatusSigned=Potpisana (za naplatu)
 PropalStatusNotSigned=Nepotpisana (zatvorena)
 PropalStatusBilled=Naplaćena
diff --git a/htdocs/langs/sr_RS/stocks.lang b/htdocs/langs/sr_RS/stocks.lang
index 9395b789bfd..7c1dd34dee2 100644
--- a/htdocs/langs/sr_RS/stocks.lang
+++ b/htdocs/langs/sr_RS/stocks.lang
@@ -22,13 +22,15 @@ Movements=Prometi
 ErrorWarehouseRefRequired=Referenca magacina je obavezna
 ListOfWarehouses=Lista magacina
 ListOfStockMovements=Lista prometa zaliha
+StockMovementForId=Movement ID %d
+ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Oblast magacina
 Location=Lokacija
 LocationSummary=Kratak naziv lokacije
 NumberOfDifferentProducts=Broj različitih proizvoda
 NumberOfProducts=Ukupan broj proizvoda
-LastMovement=Poslednji promet
-LastMovements=Poslednji prometi
+LastMovement=Latest movement
+LastMovements=Latest movements
 Units=Jedinice
 Unit=Jedinica
 StockCorrection=Ispravna zaliha
@@ -140,3 +142,4 @@ ProductStockWarehouseCreated=Stock limit for alert and desired optimal stock cor
 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
diff --git a/htdocs/langs/sr_RS/suppliers.lang b/htdocs/langs/sr_RS/suppliers.lang
index 4946ebe0c34..07a3040908d 100644
--- a/htdocs/langs/sr_RS/suppliers.lang
+++ b/htdocs/langs/sr_RS/suppliers.lang
@@ -9,7 +9,7 @@ ShowSupplier=Prikaži dobavljača
 OrderDate=Datum porudžbine
 BuyingPriceMin=Best buying price
 BuyingPriceMinShort=Best buying price
-TotalBuyingPriceMinShort=Total of subproducts buying prices
+TotalBuyingPriceMinShort=Ukupna kupovna cena pod-proizvoda
 TotalSellingPriceMinShort=Total of subproducts selling prices
 SomeSubProductHaveNoPrices=Neki od pod-proizvoda nemaju definisanu cenu
 AddSupplierPrice=Add buying price
@@ -24,10 +24,10 @@ ExportDataset_fournisseur_1=Lista računa dobavljača
 ExportDataset_fournisseur_2=Računi i uplate dobavljača
 ExportDataset_fournisseur_3=Narudžbine dobavljača
 ApproveThisOrder=Odobri ovu narudžbinu
-ConfirmApproveThisOrder=Da li ste sigurni da želite da odobrite narudžbinu <b>%s</b> ?
+ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b>?
 DenyingThisOrder=Odbij narudžbinu
-ConfirmDenyingThisOrder=Da li ste sigurni da želite da odbijete narudžbinu <b>%s</b> ?
-ConfirmCancelThisOrder=Da li ste sigurni da želite da otkažete narudžbinu <b>%s</b> ?
+ConfirmDenyingThisOrder=Are you sure you want to deny this order <b>%s</b>?
+ConfirmCancelThisOrder=Are you sure you want to cancel this order <b>%s</b>?
 AddSupplierOrder=Kreiraj narudžbinu dobavljača
 AddSupplierInvoice=Kreiraj račun dobavljača
 ListOfSupplierProductForSupplier=Lista proizvoda i cena za dobavljača <b>%s</b> 
@@ -41,3 +41,4 @@ DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Wrong quality
 ReputationForThisProduct=Reputation
 BuyerName=Buyer name
+AllProductServicePrices=All product / service prices
diff --git a/htdocs/langs/sr_RS/users.lang b/htdocs/langs/sr_RS/users.lang
index 4844f9b3208..305d26e405c 100644
--- a/htdocs/langs/sr_RS/users.lang
+++ b/htdocs/langs/sr_RS/users.lang
@@ -36,7 +36,7 @@ AdministratorDesc=Administrator
 DefaultRights=Default prava
 DefaultRightsDesc=Ovde definišite <u>default</u> prava koja će biti automatski dodeljena <u>novokreiranim</u> korisnicima (na kartici korisnika možete izmeniti prava postojećih korisnika).
 DolibarrUsers=Dolibarr korisnici
-LastName=Last Name
+LastName=Prezime
 FirstName=Ime
 ListOfGroups=Lista grupa
 NewGroup=Nova grupa
diff --git a/htdocs/langs/sr_RS/withdrawals.lang b/htdocs/langs/sr_RS/withdrawals.lang
index fdddc599da6..18222f6a67c 100644
--- a/htdocs/langs/sr_RS/withdrawals.lang
+++ b/htdocs/langs/sr_RS/withdrawals.lang
@@ -24,6 +24,7 @@ WithdrawStatistics=Direct debit payment statistics
 WithdrawRejectStatistics=Direct debit payment reject statistics
 LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
+WithdrawRequestsDone=%s direct debit payment requests recorded
 ThirdPartyBankCode=Bankarski kod subjekta
 NoInvoiceCouldBeWithdrawed=Nema uspešno podugnutih faktura. Proverite da su fakture na kompanijama sa validnim IBAN-om.
 ClassCredited=Označi kreditirano
@@ -76,8 +77,8 @@ RUM=UMR
 RUMLong=Unique Mandate Reference
 RUMWillBeGenerated=UMR number will be generated once bank account information are saved
 WithdrawMode=Direct debit mode (FRST or RECUR)
-WithdrawRequestAmount=Tražena svota podizanja:
-WithdrawRequestErrorNilAmount=Nemoguće kreirati zahtev podizanja bez svote.
+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
diff --git a/htdocs/langs/sv_SE/accountancy.lang b/htdocs/langs/sv_SE/accountancy.lang
index 07dbb87c2e2..e4e68206bb2 100644
--- a/htdocs/langs/sv_SE/accountancy.lang
+++ b/htdocs/langs/sv_SE/accountancy.lang
@@ -194,6 +194,8 @@ ChangeBinding=Change the binding
 
 ## Admin
 ApplyMassCategories=Apply mass categories
+AddAccountFromBookKeepingWithNoCategories=Add acccount already used with no categories
+CategoryDeleted=Category for the accounting account has been removed
 
 ## Export
 Exports=Export
@@ -209,6 +211,7 @@ Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution
 Modelcsv_quadratus=Export towards Quadratus QuadraCompta
 Modelcsv_ebp=Export towards EBP
 Modelcsv_cogilog=Export towards Cogilog
+ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
 InitAccountancy=Init accountancy
diff --git a/htdocs/langs/sv_SE/admin.lang b/htdocs/langs/sv_SE/admin.lang
index 8bf5389d436..e842b1d0369 100644
--- a/htdocs/langs/sv_SE/admin.lang
+++ b/htdocs/langs/sv_SE/admin.lang
@@ -9,14 +9,20 @@ VersionDevelopment=Utveckling
 VersionUnknown=Okänd
 VersionRecommanded=Rekommenderad
 FileCheck=Files integrity checker
-FileCheckDesc=This tool allows you to check the integrity of files of your application, comparing each files with the official ones. You can use this tool to detect if some files were modified by a hacker for example.
+FileCheckDesc=This tool allows you to check the integrity of files and setup of your application, comparing each files with the official ones. 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.
+FileIntegrityIsStrictlyConformedWithReference=Files integrity is strictly conformed with the reference.
+FileIntegrityIsOkButFilesWereAdded=Files integrity check has passed, however some new files were added.
+FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified, removed or added.
+GlobalChecksum=Global checksum
 MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
 LocalSignature=Embedded local signature (less reliable)
 RemoteSignature=Remote distant signature (more reliable)
 FilesMissing=Saknade filer
 FilesUpdated=Uppdaterade filer
+FilesModified=Modified Files
+FilesAdded=Added Files
 FileCheckDolibarr=Check integrity of application files
-AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from a certified package
+AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from an official package
 XmlNotFound=Xml Integrity File of application not found
 SessionId=Session ID
 SessionSaveHandler=Handler för att spara sessioner
@@ -185,7 +191,9 @@ BoxesDesc=Widgets are components showing some information that you can add to pe
 OnlyActiveElementsAreShown=Endast delar av <a href="%s">aktiverade moduler</a> visas.
 ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
-ModulesMarketPlaces=Fler moduler ...
+ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
+ModulesMarketPlaces=Find external modules...
+GoModuleSetupArea=To deploy/install a new module, go onto the Module setup area at <a href="%s">%s</a>.
 DoliStoreDesc=DoliStore, den officiella marknadsplatsen för Dolibarr ERP / CRM externa moduler
 DoliPartnersDesc=List of companies providing custom developed modules or features (Note: anyone experienced in PHP programming can provide custom development for an open source project)
 WebSiteDesc=Reference websites to find more modules...
@@ -276,21 +284,22 @@ ModuleFamilyInterface=Interfaces with external systems
 MenuHandlers=Meny hanterar
 MenuAdmin=Menu Editor
 DoNotUseInProduction=Använd inte i poroduktion
-ThisIsProcessToFollow=Detta är inställd för att behandla:
-ThisIsAlternativeProcessToFollow=Detta är ett alternativ inställning till processen:
+ThisIsProcessToFollow=This is steps to process:
+ThisIsAlternativeProcessToFollow=This is an alternative setup to process manually:
 StepNb=Steg %s
 FindPackageFromWebSite=Hitta ett paket som ger funktionen du vill ha (till exempel om %s webbplats).
 DownloadPackageFromWebSite=Hämta paket (till exempel från officiella hemsida%s).
-UnpackPackageInDolibarrRoot=Packa paketfil i Dolibarr serverkatalog tillägnad externa <b>moduler:%s</b>
-SetupIsReadyForUse=Installera är klar och Dolibarr är klar att användas med den nya komponenten.
-NotExistsDirect=Den alternativa rotkatalogen är inte definierad.<br>
-InfDirAlt=Sedab version 3 är det möjligt att definiera en alternativ rotkatalog. Detta medger en gemensam plats att lagra plugin och anpassade mallar.<br>Skapa en katalog i Dolibarrs rot (t.ex. custom).<br>
-InfDirExample=<br> Sedan förklara den i filen conf.php <br> $ Dolibarr_main_url_root_alt = 'http: // myserver / anpassad " <br> $ Dolibarr_main_document_root_alt = '/ sökväg / till / Dolibarr / htdocs / anpassad " <br> * Dessa linjer kommen med "#", för att kommentera bort bara ta bort tecknet.
+UnpackPackageInDolibarrRoot=Unpack the packaged files into server directory dedicated to Dolibarr: <b>%s</b>
+UnpackPackageInModulesRoot=To deploy/install an external module, unpack the packaged files into the server directory dedicated to modules: <b>%s</b>
+SetupIsReadyForUse=Module deployment is finished. You must however enable and setup the module in your application by going on the page to setup modules: <a href="%s">%s</a>.
+NotExistsDirect=The alternative root directory is not defined to an existing directory.<br>
+InfDirAlt=Since version 3, it is possible to define an alternative root directory. This allows you to store, into a dedicated directory, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
+InfDirExample=<br>Then declare it in the file <strong>conf.php</strong><br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>If these lines are commented with "#", to enable them, just uncomment by removing the "#" character.
 YouCanSubmitFile=För detta steg kan du skicka paket med det här verktyget: Välj modulfil
 CurrentVersion=Dolibarr nuvarande version
 CallUpdatePage=Go to the page that updates the database structure and data: %s.
 LastStableVersion=Latest stable version
-LastActivationDate=Last activation date
+LastActivationDate=Latest activation date
 UpdateServerOffline=Uppdatera server offline
 GenericMaskCodes=Du kan ange någon numrering mask. I denna mask skulle följande taggar användas: <br> <b>(000000)</b> motsvarar ett antal som kommer att ökas på varje %s. Ange så många nollor som den önskade längden på disken. Räknaren kommer att fyllas ut med nollor från vänster för att få så många nollor som masken. <br> <b>(000000 000)</b> samma som tidigare men en kompensation som motsvarar det antal till höger om tecknet + tillämpas med början den första %s. <br> <b>(000000 @ x)</b> samma som tidigare, men räknaren återställs till noll när månaden x uppnås (x mellan 1 och 12). Om detta alternativ används och x är 2 eller högre, då sekvensen (yy) (mm) eller (ÅÅÅÅ) (mm) krävs också. <br> <b>(Dd)</b> dag (01 till 31). <br> <b>(Mm)</b> månad (01 till 12). <br> <b>(Yy), (ÅÅÅÅ) eller (y)</b> år under 2, 4 eller ett nummer. <br>
 GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
@@ -373,11 +382,11 @@ ExtrafieldCheckBox=Kryssruta
 ExtrafieldRadio=Radioknapp
 ExtrafieldCheckBoxFromList= Kryssruta från tabell
 ExtrafieldLink=Länk till ett objekt
-ExtrafieldParamHelpselect=Parametrar listan måste vara som nyckel, värde <br><br> till exempel: <br> 1, value1 <br> 2, värde2 <br> 3, value3 <br> ... <br><br> För att få en lista beroende på en annan: <br> 1, value1 | parent_list_code: parent_key <br> 2, värde2 | parent_list_code: parent_key
+ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list :<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list :<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=Parametrar listan måste vara som nyckel, värde <br><br> till exempel: <br> 1, value1 <br> 2, värde2 <br> 3, value3 <br> ...
 ExtrafieldParamHelpradio=Parametrar listan måste vara som nyckel, värde <br><br> till exempel: <br> 1, value1 <br> 2, värde2 <br> 3, value3 <br> ...
-ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
-ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
+ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Example : Societe:societe/class/societe.class.php
 LibraryToBuildPDF=Library used for PDF generation
 WarningUsingFPDF=Varning: Din <b>conf.php</b> innehåller direktiv <b>dolibarr_pdf_force_fpdf = 1.</b> Detta innebär att du använder fpdf bibliotek för att generera PDF-filer. Detta bibliotek är gammalt och inte stöder en mängd funktioner (Unicode, bild öppenhet, kyrilliska, arabiska och asiatiska språk, ...), så att du kan uppleva fel under PDF generation. <br> För att lösa detta och ha ett fullt stöd för PDF-generering, ladda ner <a href="http://www.tcpdf.org/" target="_blank">TCPDF bibliotek</a> , sedan kommentera eller ta bort linjen <b>$ dolibarr_pdf_force_fpdf = 1,</b> och lägg istället <b>$ dolibarr_lib_TCPDF_PATH = 'path_to_TCPDF_dir'</b>
@@ -411,10 +420,11 @@ ModuleCompanyCodePanicum=Avkastningen en tom bokföring kod.
 ModuleCompanyCodeDigitaria=Bokföring kod beror på tredje part kod. Koden består av tecknet &quot;C&quot; i den första positionen och därefter det första fem bokstäver av tredje part koden.
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
-
+WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<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).
+ClickToShowDescription=Click to show description
 # Modules
 Module0Name=Användare & grupper
-Module0Desc=Användare och ledningsgrupper
+Module0Desc=Users / Employees and Groups management
 Module1Name=Tredje part
 Module1Desc=Företag och kontakt ledning
 Module2Name=Kommersiella
@@ -515,8 +525,8 @@ Module2200Name=Dynamiska priser
 Module2200Desc=Aktivera användningen av matematiska uttryck för priser
 Module2300Name=Cron
 Module2300Desc=Planerad jobbhantering
-Module2400Name=Agenda/Events
-Module2400Desc=Follow events or rendez-vous. Record manual events into Agendas or let application logs automatic events for tracking purposes.
+Module2400Name=Events/Agenda
+Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous.
 Module2500Name=Electronic Content Management
 Module2500Desc=Spara och dela dokument
 Module2600Name=API/Web services (SOAP server)
@@ -582,7 +592,7 @@ Permission34=Ta bort produkter
 Permission36=Se / hantera dold produkter
 Permission38=EXPORTVARA
 Permission41=Läs projekt och uppgifter (gemensamma projekt och projekt jag är kontaktperson för). Kan också ange tid konsumeras på tilldelade uppgifter (tidrapport)
-Permission42=Skapa / modifiera projekt (gemensamma projekt och projekt som jag är kontaktperson för)
+Permission42=Create/modify projects (shared project and projects i'm contact for). Can also create tasks and assign users to project and tasks
 Permission44=Ta bort projekt (gemensamma projekt och projekt som jag är kontaktperson för)
 Permission45=Export projects
 Permission61=Läs insatser
@@ -685,7 +695,7 @@ PermissionAdvanced253=Skapa / ändra interna / externa användare och behörighe
 Permission254=Ta bort eller inaktivera andra användare
 Permission255=Skapa / ändra sin egen användarinformation
 Permission256=Ändra sina egna lösenord
-Permission262=Utvidga tillgången till tredje man (inte bara kopplade till användare). Inte effektivt för externa användare (alltid begränsad till själva).
+Permission262=Extend access to all third parties (not only third parties that user is a sale representative).<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 assignement matters).
 Permission271=Läs CA
 Permission272=Läs fakturor
 Permission273=Utfärda fakturor
@@ -887,7 +897,7 @@ Offset=Offset
 AlwaysActive=Alltid aktiv
 Upgrade=Uppgradera
 MenuUpgrade=Uppgradera / Extend
-AddExtensionThemeModuleOrOther=Lägg till förlängning (tema, modul, ...)
+AddExtensionThemeModuleOrOther=Deploy/install external module
 WebServer=Webbserver
 DocumentRootServer=Webbservers rotkatalog
 DataRootServer=Datafiler katalog
@@ -994,7 +1004,7 @@ TriggerAlwaysActive=Triggers i denna fil är alltid aktiva, oavsett är det akti
 TriggerActiveAsModuleActive=Triggers i denna fil är verksamma som modul <b>%s</b> är aktiverat.
 GeneratedPasswordDesc=Ange här vilken regel du vill använda för att generera nytt lösenord om du begära att få automatiskt genererat lösenord
 DictionaryDesc=Insert all reference data. You can add your values to the default.
-ConstDesc=This page allows you to edit all other parameters not available in previous pages. These are mostly reserved parameters for developers or advanced troubleshooting.
+ConstDesc=This page allows you to edit all other parameters not available in previous pages. These are mostly reserved parameters for developers or advanced troubleshooting. For a list of options <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">check here</a>.
 MiscellaneousDesc=All other security related parameters are defined here.
 LimitsSetup=Gränser / Precision setup
 LimitsDesc=Du kan definiera gränser, preciseringar och optimeringar som används av Dolibarr här
@@ -1161,10 +1171,6 @@ FreeLegalTextOnOrders=Fri text på order
 WatermarkOnDraftOrders=Vattenstämpel på utkast till beställningar (ingen om tom)
 ShippableOrderIconInList=Lägg en ikon i Order lista som anger om beställningen är shippable
 BANK_ASK_PAYMENT_BANK_DURING_ORDER=Fråga om målbankkonto för order
-##### Clicktodial #####
-ClickToDialSetup=Klicka för att Dial modul setup
-ClickToDialUrlDesc=Url anropas när ett klick på telefon picto görs. I URL kan du använda taggar <br> <b>__PHONETO__</b> Som kommer att ersättas med telefonnumret för personen att ringa <br> <b>__PHONEFROM__</b> Som ska ersättas med telefonnummer att ringa person (er) <br> <b>__LOGIN__</b> Som ska ersättas med clicktodial inloggning (definierad på ditt användarnamn kort) <br> <b>__PASS__</b> Som ska ersättas med ditt clicktodial lösenord (definierad på ditt användarnamn kort).
-##### Bookmark4u #####
 ##### Interventions #####
 InterventionsSetup=Insatser modul setup
 FreeLegalTextOnInterventions=Fri text om ingripande handlingar
@@ -1391,7 +1397,7 @@ SendingsSetup=Sända modul setup
 SendingsReceiptModel=Att skicka kvitto modell
 SendingsNumberingModules=Sänts numrering moduler
 SendingsAbility=Support shipping sheets for customer deliveries
-NoNeedForDeliveryReceipts=I de flesta fall är sendings kvitton användas både som ark för kundleveranser (förteckning över produkter för att skicka) och ark som är recevied och undertecknas av kunden. Så produktleveranser intäkter är en dubbel funktion och är sällan aktiveras.
+NoNeedForDeliveryReceipts=In most cases, shipping sheets are used both as sheets for customer deliveries (list of products to send) and sheets that is received and signed by customer. So product deliveries receipts is a duplicated feature and is rarely activated.
 FreeLegalTextOnShippings=Fritext på fraktsedlar
 ##### Deliveries #####
 DeliveryOrderNumberingModules=Produkter leveranser kvitto numrering modul
@@ -1471,7 +1477,11 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Set automatically this default value for type of e
 AGENDA_DEFAULT_FILTER_TYPE=Ställs in automatiskt denna typ av händelse till sökfilter av dagordning view
 AGENDA_DEFAULT_FILTER_STATUS=Ställs in automatiskt denna status för evenemang till sökfilter av dagordning view
 AGENDA_DEFAULT_VIEW=Vilken flik vill du öppna som standard vid val av meny Agenda
-##### ClickToDial #####
+AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
+AGENDA_NOTIFICATION_SOUND=Enable sound notification
+##### Clicktodial #####
+ClickToDialSetup=Klicka för att Dial modul setup
+ClickToDialUrlDesc=Url anropas när ett klick på telefon picto görs. I URL kan du använda taggar <br> <b>__PHONETO__</b> Som kommer att ersättas med telefonnumret för personen att ringa <br> <b>__PHONEFROM__</b> Som ska ersättas med telefonnummer att ringa person (er) <br> <b>__LOGIN__</b> Som ska ersättas med clicktodial inloggning (definierad på ditt användarnamn kort) <br> <b>__PASS__</b> Som ska ersättas med ditt clicktodial lösenord (definierad på ditt användarnamn kort).
 ClickToDialDesc=This module allows to make phone numbers clickable. A click on this icon will call make your phone to 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.
 ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
 ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on same computer than the browser, and called when you click on a link in your browser that start 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.
@@ -1499,10 +1509,11 @@ EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint availa
 ##### API ####
 ApiSetup=API-modul konfiguration
 ApiDesc=Genom att aktivera denna modul Dolibarr bli en REST-server för att tillhandahålla diverse webbtjänster.
-ApiProductionMode=Enable production mode (this will activate use of a caches for services management)
+ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
 ApiExporerIs=You can explore the APIs at url
 OnlyActiveElementsAreExposed=Endast element från aktiverade moduler utsätts
 ApiKey=Key för API
+WarningAPIExplorerDisabled=The API explorer has been disabled. API explorer is not required to provide API services. It is a tool for developer to find/test REST APIs. If you need this tool, go into setup of module API REST to activate it.
 ##### Bank #####
 BankSetupModule=Bank modul setup
 FreeLegalTextOnChequeReceipts=Fri text om kontrollera kvitton
@@ -1571,7 +1582,7 @@ 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:
 SomethingMakeInstallFromWebNotPossible2=Av denna anledning, för att processen uppgradering, som beskrivs här är endast manuell steg en privilegierad användare kan göra.
 InstallModuleFromWebHasBeenDisabledByFile=Installation av extern modul från ansökan har inaktiverats av administratören. Du måste be honom att ta bort <strong>filen% s</strong> för att tillåta denna funktion.
-ConfFileMuseContainCustom=Installing an external module from application save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to have option<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
+ConfFileMuseContainCustom=Installing an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Markera tabelllinjer när musen flytta passerar över
 HighlightLinesColor=Highlight color of the line when the mouse passes over (keep empty for no highlight)
 TextTitleColor=Color of page title
@@ -1601,6 +1612,7 @@ FixTZ=Timezone fix
 FillFixTZOnlyIfRequired=Example: +2 (fill only if problem experienced)
 ExpectedChecksum=Expected Checksum
 CurrentChecksum=Current Checksum
+ForcedConstants=Required constant values
 MailToSendProposal=Om du vill skicka kunden förslag
 MailToSendOrder=Om du vill skicka kundorder
 MailToSendInvoice=Om du vill skicka kundfaktura
@@ -1609,13 +1621,14 @@ MailToSendIntervention=Om du vill skicka ingripande
 MailToSendSupplierRequestForQuotation=Om du vill skicka Offertförfrågan till leverantör
 MailToSendSupplierOrder=Om du vill skicka leverantör ordning
 MailToSendSupplierInvoice=Om du vill skicka leverantörsfaktura
+MailToSendContract=To send a contract
 MailToThirdparty=To send email from third party page
 ByDefaultInList=Show by default on list view
-YouUseLastStableVersion=You use the last stable version
+YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
 TitleExampleForMaintenanceRelease=Example of message you can use to announce this maintenance release (feel free to use it on your web sites)
-ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. You can download it from the download area of http://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.
-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, nor data structure change is present into this version. You can download it from the download area of http://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.
+ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. 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.
+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, nor data structure change is present into 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, you can enter here rule to have price for each level autocalculated according to price of first level, so you will have to enter only price for first level on each product. This page is here to save you time and can be usefull only if your prices for each leve are relative to first level. You can ignore this page in most cases.
 ModelModulesProduct=Templates for product documents
 ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
diff --git a/htdocs/langs/sv_SE/banks.lang b/htdocs/langs/sv_SE/banks.lang
index 5bae3cfeba8..c8069f091be 100644
--- a/htdocs/langs/sv_SE/banks.lang
+++ b/htdocs/langs/sv_SE/banks.lang
@@ -74,13 +74,13 @@ Conciliate=Reconcile
 Conciliation=Avstämning
 ReconciliationLate=Reconciliation late
 IncludeClosedAccount=Inkludera stängda konton
-OnlyOpenedAccount=Enbart öppna konton
+OnlyOpenedAccount=Endast öppnat konton
 AccountToCredit=Hänsyn till kreditinstitut
 AccountToDebit=Konto att debitera
 DisableConciliation=Inaktivera försoning för den här kontot
 ConciliationDisabled=Avstämning inaktiverad
 LinkedToAConciliatedTransaction=Linked to a conciliated entry
-StatusAccountOpened=Öppen
+StatusAccountOpened=Öppnad
 StatusAccountClosed=Stängt
 AccountIdShort=Antal
 LineRecord=Transaktion
diff --git a/htdocs/langs/sv_SE/bills.lang b/htdocs/langs/sv_SE/bills.lang
index 45f522e16d0..ac210e0d4bd 100644
--- a/htdocs/langs/sv_SE/bills.lang
+++ b/htdocs/langs/sv_SE/bills.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - bills
 Bill=Faktura
 Bills=Fakturor
-BillsCustomers=Kundfakturor
+BillsCustomers=Customer invoices
 BillsCustomer=Kundfaktura
-BillsSuppliers=Leverantörsfakturor
+BillsSuppliers=Supplier invoices
 BillsCustomersUnpaid=Obetalda kundfakturor
-BillsCustomersUnpaidForCompany=Obetalda kundens fakturor för %s
-BillsSuppliersUnpaid=Obetalda leverantörs fakturor
-BillsSuppliersUnpaidForCompany=Obetald leverantörens fakturor för %s
+BillsCustomersUnpaidForCompany=Unpaid customer invoices for %s
+BillsSuppliersUnpaid=Obetalda leverantörsfakturor
+BillsSuppliersUnpaidForCompany=Unpaid supplier invoices for %s
 BillsLate=Sena betalningar
 BillsStatistics=Kundfakturor statistik
 BillsStatisticsSuppliers=Leverantörsfakturor statistik
@@ -62,8 +62,8 @@ PaymentsBack=Betalningar tillbaka
 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 credit note or deposit 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.
+ConfirmDeletePayment=Är du säker på att du vill ta bort denna betalning?
+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.
 SupplierPayments=Leverantörer betalningar
 ReceivedPayments=Mottagna betalningar
 ReceivedCustomersPayments=Inbetalningar från kunder
@@ -78,6 +78,7 @@ PaymentMode=Betalningssätt
 PaymentTypeDC=Debit/Credit Card
 PaymentTypePP=PayPal
 IdPaymentMode=Payment type (id)
+CodePaymentMode=Payment type (code)
 LabelPaymentMode=Payment type (label)
 PaymentModeShort=Betalningssätt
 PaymentTerm=Betalningsvillkor
@@ -102,9 +103,10 @@ SearchACustomerInvoice=Sök efter en kundfaktura
 SearchASupplierInvoice=Sök efter en leverantörsfaktura
 CancelBill=Avbryt en faktura
 SendRemindByMail=Skicka påminnelse via e-post
-DoPayment=Gör betalning
-DoPaymentBack=Gör betalning tillbaka
+DoPayment=Enter payment
+DoPaymentBack=Enter refund
 ConvertToReduc=Konvertera till framtida rabatt
+ConvertExcessReceivedToReduc=Convert excess received into future discount
 EnterPaymentReceivedFromCustomer=Skriv in avgifter från kunderna
 EnterPaymentDueToCustomer=Gör betalning till kunden
 DisabledBecauseRemainderToPayIsZero=Inaktiverad pga återstående obetalt är noll
@@ -113,22 +115,24 @@ BillStatus=Faktura status
 StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Utkast (måste valideras)
 BillStatusPaid=Betald
-BillStatusPaidBackOrConverted=Betalats eller omvandlas till rabatt
+BillStatusPaidBackOrConverted=Refund or converted into discount
 BillStatusConverted=Omräknat i rabatt
 BillStatusCanceled=Övergiven
 BillStatusValidated=Validerad (måste betalas)
 BillStatusStarted=Påbörjad
 BillStatusNotPaid=Inte betalas
+BillStatusNotRefunded=Not refunded
 BillStatusClosedUnpaid=Stängd (obetald)
 BillStatusClosedPaidPartially=Betald (delvis)
 BillShortStatusDraft=Utkast
 BillShortStatusPaid=Betald
-BillShortStatusPaidBackOrConverted=Bearbetad
+BillShortStatusPaidBackOrConverted=Refund or converted
 BillShortStatusConverted=Bearbetad
 BillShortStatusCanceled=Övergiven
 BillShortStatusValidated=Validerad
 BillShortStatusStarted=Började
 BillShortStatusNotPaid=Inte betalas
+BillShortStatusNotRefunded=Not refunded
 BillShortStatusClosedUnpaid=Stängt
 BillShortStatusClosedPaidPartially=Betald (delvis)
 PaymentStatusToValidShort=För att validera
@@ -149,14 +153,14 @@ NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified
 FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
 NotARecurringInvoiceTemplate=Not a recurring template invoice
 NewBill=Ny faktura
-LastBills=Senaste %s fakturor
-LastCustomersBills=Senaste %s kunder fakturor
-LastSuppliersBills=Senaste %s leverantörer fakturor
+LastBills=Latest %s invoices
+LastCustomersBills=Latest %s customer invoices
+LastSuppliersBills=Latest %s supplier invoices
 AllBills=Alla fakturor
 OtherBills=Övriga fakturor
 DraftBills=Förslag fakturor
-CustomersDraftInvoices=Kunder utkast fakturor
-SuppliersDraftInvoices=Leverantörer utkast fakturor
+CustomersDraftInvoices=Customer draft invoices
+SuppliersDraftInvoices=Supplier draft invoices
 Unpaid=Obetalda
 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>?
@@ -203,7 +207,7 @@ AlreadyPaidNoCreditNotesNoDeposits=Redan betalats (utan kreditnotor och inlånin
 Abandoned=Övergiven
 RemainderToPay=Återstående obetalt
 RemainderToTake=Återstående belopp att ta
-RemainderToPayBack=Återstående belopp att återbetala
+RemainderToPayBack=Remaining amount to refund
 Rest=Avvaktande
 AmountExpected=Yrkade beloppet
 ExcessReceived=Överskott fått
@@ -270,6 +274,7 @@ Deposit=Insättning
 Deposits=Inlåning
 DiscountFromCreditNote=Rabatt från kreditnota %s
 DiscountFromDeposit=Betalningar från %s insättning faktura
+DiscountFromExcessReceived=Payments from excess received of invoice %s
 AbsoluteDiscountUse=Denna typ av krediter kan användas på fakturan innan validering
 CreditNoteDepositUse=Invoice must be validated to use this kind of credits
 NewGlobalDiscount=Ny fix rabatt
@@ -277,8 +282,8 @@ NewRelativeDiscount=Nya relativa rabatt
 NoteReason=Not/orsak
 ReasonDiscount=Orsak
 DiscountOfferedBy=Beviljats av
-DiscountStillRemaining=Rabatt återstår fortfarande
-DiscountAlreadyCounted=Rabatt räknas redan
+DiscountStillRemaining=Discounts available
+DiscountAlreadyCounted=Discounts already consumed
 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.
@@ -331,10 +336,12 @@ 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
 # PaymentConditions
 Statut=Status
-PaymentConditionShortRECEP=Omedelbar
-PaymentConditionRECEP=Omedelbar
+PaymentConditionShortRECEP=Due Upon Receipt
+PaymentConditionRECEP=Due Upon Receipt
 PaymentConditionShort30D=30 dagar
 PaymentCondition30D=30 dagar
 PaymentConditionShort30DENDMONTH=30 days of month-end
@@ -349,6 +356,14 @@ PaymentConditionShortPT_ORDER=Beställ
 PaymentConditionPT_ORDER=Beställda
 PaymentConditionShortPT_5050=50-50
 PaymentConditionPT_5050=50%% i förskott, 50%% vid leverans
+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
 FixAmount=Fast belopp
 VarAmount=Variabelt belopp (%% summa)
 # PaymentType
@@ -418,7 +433,7 @@ ChequeDeposits=Kontroller inlåning
 Cheques=Kontroller
 DepositId=Id deposit
 NbCheque=Number of checks
-CreditNoteConvertedIntoDiscount=Detta kreditnota eller deposition faktura har omvandlats till %s
+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
 ShowUnpaidAll=Visa alla obetalda fakturor
 ShowUnpaidLateOnly=Visa sent obetald faktura endast
diff --git a/htdocs/langs/sv_SE/boxes.lang b/htdocs/langs/sv_SE/boxes.lang
index eb5f2d9a0e8..2d55b2d703f 100644
--- a/htdocs/langs/sv_SE/boxes.lang
+++ b/htdocs/langs/sv_SE/boxes.lang
@@ -25,8 +25,8 @@ BoxTitleLastSuppliers=Latest %s recorded suppliers
 BoxTitleLastModifiedSuppliers=Latest %s modified suppliers
 BoxTitleLastModifiedCustomers=Latest %s modified customers
 BoxTitleLastCustomersOrProspects=Latest %s customers or prospects
-BoxTitleLastCustomerBills=Latest %s customer's invoices
-BoxTitleLastSupplierBills=Latest %s supplier's invoices
+BoxTitleLastCustomerBills=Latest %s customer invoices
+BoxTitleLastSupplierBills=Latest %s supplier invoices
 BoxTitleLastModifiedProspects=Latest %s modified prospects
 BoxTitleLastModifiedMembers=Latest %s members
 BoxTitleLastFicheInter=Latest %s modified interventions
@@ -51,12 +51,12 @@ ClickToAdd=Klicka här för att lägga till.
 NoRecordedCustomers=Inga registrerade kunder
 NoRecordedContacts=Inga noterade kontakter
 NoActionsToDo=Inga åtgärder för att göra
-NoRecordedOrders=Inga registrerade kundens order
+NoRecordedOrders=No recorded customer orders
 NoRecordedProposals=Inga registrerade förslag
-NoRecordedInvoices=Inga registrerade kundens fakturor
-NoUnpaidCustomerBills=Inga obetalda kundens fakturor
-NoUnpaidSupplierBills=Inga obetalda leverantörs fakturor
-NoModifiedSupplierBills=Inga registrerade leverantörens fakturor
+NoRecordedInvoices=No recorded customer invoices
+NoUnpaidCustomerBills=No unpaid customer invoices
+NoUnpaidSupplierBills=No unpaid supplier invoices
+NoModifiedSupplierBills=No recorded supplier invoices
 NoRecordedProducts=Inga registrerade produkter / tjänster
 NoRecordedProspects=Inga registrerade framtidsutsikter
 NoContractedProducts=Inga produkter / tjänster avtalade
diff --git a/htdocs/langs/sv_SE/companies.lang b/htdocs/langs/sv_SE/companies.lang
index 455a1fd61a0..659c82fe210 100644
--- a/htdocs/langs/sv_SE/companies.lang
+++ b/htdocs/langs/sv_SE/companies.lang
@@ -78,6 +78,10 @@ VATIsNotUsed=Moms används inte
 CopyAddressFromSoc=Fill address with third party address
 ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
 PaymentBankAccount=Payment bank account
+OverAllProposals=Total proposals
+OverAllOrders=Total orders
+OverAllInvoices=Total invoices
+OverAllSupplierProposals=Total price requests
 ##### Local Taxes #####
 LocalTax1IsUsed=Använda andra skatte
 LocalTax1IsUsedES= RE används
@@ -239,6 +243,10 @@ ProfId3RU=Prof Id 3 (KPP)
 ProfId4RU=Prof Id 4 (OKPO)
 ProfId5RU=-
 ProfId6RU=-
+ProfId1DZ=RC
+ProfId2DZ=Art.
+ProfId3DZ=NIF
+ProfId4DZ=NIS
 VATIntra=VAT-nummer
 VATIntraShort=VAT-nummer
 VATIntraSyntaxIsValid=Syntaxen är giltigt
@@ -382,8 +390,9 @@ ListCustomersShort=Lista över kunder
 ThirdPartiesArea=Tredje part och kontaktyta
 LastModifiedThirdParties=Latest %s modified third parties
 UniqueThirdParties=Totalt unika tredje part
-InActivity=Öppet
+InActivity=Öppnad
 ActivityCeased=Stängt
+ThirdPartyIsClosed=Third party is closed
 ProductsIntoElements=List of products/services into %s
 CurrentOutstandingBill=Obetalda fakturor
 OutstandingBill=Max för obetald faktura
@@ -396,7 +405,7 @@ MergeThirdparties=Merge third parties
 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 so you will be able to delete the duplicate one.
 ThirdpartiesMergeSuccess=Thirdparties have been merged
 SaleRepresentativeLogin=Login of sales representative
-SaleRepresentativeFirstname=Firstname of sales representative
-SaleRepresentativeLastname=Lastname of sales representative
+SaleRepresentativeFirstname=First name of sales representative
+SaleRepresentativeLastname=Last name of sales representative
 ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
 NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/sv_SE/compta.lang b/htdocs/langs/sv_SE/compta.lang
index 68f881b218f..4f41edbbc17 100644
--- a/htdocs/langs/sv_SE/compta.lang
+++ b/htdocs/langs/sv_SE/compta.lang
@@ -65,6 +65,7 @@ PaymentSocialContribution=Sociala och skattemässiga betalningar
 PaymentVat=Moms betalning
 ListPayment=Lista över betalningar
 ListOfCustomerPayments=Förteckning över kundbetalningar
+ListOfSupplierPayments=Förteckning över leverantörsbetalningar
 DateStartPeriod=Datum startperiod
 DateEndPeriod=Slutdatum perioden
 newLT1Payment=New tax 2 payment
@@ -81,7 +82,7 @@ LT2PaymentES=IRPF Betalning
 LT2PaymentsES=IRPF betalningar
 VATPayment=Sales tax payment
 VATPayments=Sales tax payments
-VATRefund=Sales tax refund Refund
+VATRefund=Sales tax refund
 Refund=Refund
 SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Visa mervärdesskatteskäl
@@ -194,7 +195,7 @@ CloneTax=Clone a social/fiscal tax
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
 CloneTaxForNextMonth=Klona det för nästa månad
 SimpleReport=Simple report
-AddExtraReport=Extra reports
+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
diff --git a/htdocs/langs/sv_SE/cron.lang b/htdocs/langs/sv_SE/cron.lang
index b711b3f74d1..afa1fee7995 100644
--- a/htdocs/langs/sv_SE/cron.lang
+++ b/htdocs/langs/sv_SE/cron.lang
@@ -1,10 +1,10 @@
 # Dolibarr language file - Source file is en_US - cron
 # About page
 # Right
-Permission23101 = Read Scheduled job
-Permission23102 = Create/update Scheduled job
-Permission23103 = Delete Scheduled job
-Permission23104 = Execute Scheduled job
+Permission23101 = Läs Planerad jobb
+Permission23102 = Skapa / uppdatera Schemalagt jobb
+Permission23103 = Radera schemalagt jobb
+Permission23104 = Utför schemalagt jobb
 # Admin
 CronSetup= Planerad jobbhantering installation
 URLToLaunchCronJobs=URL to check and launch qualified cron jobs
@@ -17,14 +17,14 @@ CronMethodDoesNotExists=Class %s does not contains any method %s
 # Menu
 EnabledAndDisabled=Enabled and disabled
 # Page list
-CronLastOutput=Sista loppet utgång
-CronLastResult=Senaste resultat code
+CronLastOutput=Latest run output
+CronLastResult=Latest result code
 CronCommand=Kommando
-CronList=Scheduled jobs
+CronList=Schemalagda jobb
 CronDelete=Delete scheduled jobs
-CronConfirmDelete=Are you sure you want to delete these scheduled jobs ?
+CronConfirmDelete=Are you sure you want to delete these scheduled jobs?
 CronExecute=Launch scheduled job
-CronConfirmExecute=Are you sure you want to execute these scheduled jobs now ?
+CronConfirmExecute=Are you sure you want to execute these scheduled jobs now?
 CronInfo=Scheduled job module allow to execute job that have been planned
 CronTask=Jobb
 CronNone=Ingen
@@ -33,13 +33,13 @@ CronDtEnd=Not after
 CronDtNextLaunch=Nästa exekvering
 CronDtLastLaunch=Start date of latest execution
 CronDtLastResult=End date of latest execution
-CronFrequency=Frequency
+CronFrequency=Frekvens
 CronClass=Class
 CronMethod=Metod
 CronModule=Modul
 CronNoJobs=Inga jobb registrerade
 CronPriority=Prioritet
-CronLabel=Label
+CronLabel=Etikett
 CronNbRun=Nb. lanseringen
 CronMaxRun=Max nb. launch
 CronEach=Varje
@@ -65,7 +65,7 @@ CronMethodHelp=Objektet metod för att starta. <BR> För exemple att hämta meto
 CronArgsHelp=Metoden argument. <BR> Till exemple att hämta förfarande för Dolibarr Produkt objekt /htdocs/product/class/product.class.php kan värdet av paramters vara <i>0, ProductRef</i>
 CronCommandHelp=Systemet kommandoraden som ska köras.
 CronCreateJob=Create new Scheduled Job
-CronFrom=From
+CronFrom=Från
 # Info
 # Common
 CronType=Job type
diff --git a/htdocs/langs/sv_SE/errors.lang b/htdocs/langs/sv_SE/errors.lang
index f2457638257..f47da3aa0ac 100644
--- a/htdocs/langs/sv_SE/errors.lang
+++ b/htdocs/langs/sv_SE/errors.lang
@@ -11,6 +11,7 @@ ErrorLoginAlreadyExists=Logga %s finns redan.
 ErrorGroupAlreadyExists=Grupp %s finns redan.
 ErrorRecordNotFound=Spela in hittades inte.
 ErrorFailToCopyFile=Det gick inte att kopiera filen <b>&quot;%s&quot;</b> till <b>&quot;%s&quot;.</b>
+ErrorFailToCopyDir=Failed to copy directory '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToRenameFile=Det gick inte att byta namn på filen <b>'%s</b> &quot;till&quot; <b>%s</b> &quot;.
 ErrorFailToDeleteFile=Misslyckades med att ta bort filen <b>&quot;%s&quot;.</b>
 ErrorFailToCreateFile=Misslyckades med att skapa filen <b>&quot;%s&quot;.</b>
@@ -115,7 +116,7 @@ ErrorNoActivatedBarcode=Ingen streckkod typ aktiveras
 ErrUnzipFails=Det gick inte att packa upp %s med ZipArchive
 ErrNoZipEngine=Ingen motor att packa upp %s fil i denna PHP
 ErrorFileMustBeADolibarrPackage=Filen %s måste vara ett Dolibarr zip-paket
-ErrorFileRequired=Det tar ett paket Dolibarr fil
+ErrorModuleFileRequired=You must select a Dolibarr module package file
 ErrorPhpCurlNotInstalled=PHP CURL är inte installerat, detta är viktigt för att prata med Paypal
 ErrorFailedToAddToMailmanList=Det gick inte att lägga till post %s till Mailman listan %s eller SPIP bas
 ErrorFailedToRemoveToMailmanList=Det gick inte att ta bort posten %s till Mailman listan %s eller SPIP bas
@@ -170,14 +171,19 @@ ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
 ErrorFileMustHaveFormat=File must have format %s
 ErrorSupplierCountryIsNotDefined=Land för denna leverantör är inte definierat. Korrigera detta först.
 ErrorsThirdpartyMerge=Failed to merge the two records. Request canceled.
-ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enougth for product %s to add it into a new order.
-ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enougth for product %s to add it into a new invoice.
-ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enougth for product %s to add it into a new shipment.
-ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enougth for product %s to add it into a new proposal.
-ErrorFailedToLoadLoginFileForMode=Failed to get the login file for mode '%s'.
+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 bank 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>
 
 # 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.
diff --git a/htdocs/langs/sv_SE/holiday.lang b/htdocs/langs/sv_SE/holiday.lang
index 735e7c1ecea..29c4011fcce 100644
--- a/htdocs/langs/sv_SE/holiday.lang
+++ b/htdocs/langs/sv_SE/holiday.lang
@@ -76,8 +76,9 @@ BoxTitleLastLeaveRequests=Latest %s modified leave requests
 HolidaysMonthlyUpdate=Månads uppdatering
 ManualUpdate=Manuell uppdatering
 HolidaysCancelation=Lämna begäran Spärr
-EmployeeLastname=Employee lastname
-EmployeeFirstname=Employee firstname
+EmployeeLastname=Employee last name
+EmployeeFirstname=Employee first name
+TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
 
 ## Configuration du Module ##
 LastUpdateCP=Latest automatic update of leaves allocation
diff --git a/htdocs/langs/sv_SE/ldap.lang b/htdocs/langs/sv_SE/ldap.lang
index 6558ba7cc67..6fac734fb86 100644
--- a/htdocs/langs/sv_SE/ldap.lang
+++ b/htdocs/langs/sv_SE/ldap.lang
@@ -13,8 +13,8 @@ LDAPUsers=Användare i LDAP-databas
 LDAPFieldStatus=Status
 LDAPFieldFirstSubscriptionDate=Första teckningsdag
 LDAPFieldFirstSubscriptionAmount=Fist teckningsbelopp
-LDAPFieldLastSubscriptionDate=Sista teckningsdag
-LDAPFieldLastSubscriptionAmount=Senaste teckningsbelopp
+LDAPFieldLastSubscriptionDate=Latest subscription date
+LDAPFieldLastSubscriptionAmount=Latest subscription amount
 LDAPFieldSkype=Skype id
 LDAPFieldSkypeExample=Example : skypeName
 UserSynchronized=Användare synkroniseras
diff --git a/htdocs/langs/sv_SE/mails.lang b/htdocs/langs/sv_SE/mails.lang
index b70932a5a1b..61f4c6b3419 100644
--- a/htdocs/langs/sv_SE/mails.lang
+++ b/htdocs/langs/sv_SE/mails.lang
@@ -35,7 +35,7 @@ MailingStatusSentPartialy=Skickat delvis
 MailingStatusSentCompletely=Skickade helt
 MailingStatusError=Fel
 MailingStatusNotSent=Skickas inte
-MailSuccessfulySent=E-post skickad (från %s till %s)
+MailSuccessfulySent=Email successfully accepted for delivery (from %s to %s)
 MailingSuccessfullyValidated=E-post validerades
 MailUnsubcribe=Avanmälan
 MailingStatusNotContact=Kontakta inte längre
@@ -74,22 +74,28 @@ ResultOfMailSending=Result of mass EMail sending
 NbSelected=Nb selected
 NbIgnored=Nb ignored
 NbSent=Nb 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
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Line %s i filen
 RecipientSelectionModules=Definierade krav på mottagarens val
 MailSelectedRecipients=Valda mottagare
 MailingArea=EMailings område
-LastMailings=Senaste %s emailings
+LastMailings=Latest %s emailings
 TargetsStatistics=Mål statistik
 NbOfCompaniesContacts=Unika kontakter av företag
 MailNoChangePossible=Mottagare för validerade e-post kan inte ändras
 SearchAMailing=Sök utskick
 SendMailing=Skicka e-post
 SendMail=Skicka e-post
-MailingNeedCommand=Av säkerhetsskäl, skicka ett email är bättre när de utförs från kommandoraden. Om du har en, be din serveradministratör för att lansera följande kommando för att skicka e-post till alla mottagare:
+SentBy=Skickat av
+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=Du kan dock skicka dem online genom att lägga till parametern MAILING_LIMIT_SENDBYWEB med värde av maximalt antal e-postmeddelanden du vill skicka genom sessionen. För detta, gå hem - Setup - Annat.
-ConfirmSendingEmailing=If you can't or prefer sending them with your www browser, please confirm you are sure you want to send emailing now from your browser?
+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=Obs: Sänder av email från webbgränssnitt sker i flera gånger för säkerhets- och timeout <b>skäl,% s</b> mottagare i taget för varje sändning session.
 TargetsReset=Rensa lista
 ToClearAllRecipientsClickHere=Klicka här för att rensa listor över mottagare av detta e-post
@@ -144,3 +150,6 @@ AdvTgtCreateFilter=Create filter
 AdvTgtOrCreateNewFilter=Name of new filter
 NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
+OutGoingEmailSetup=Outgoing email setup
+InGoingEmailSetup=Incoming email setup
+
diff --git a/htdocs/langs/sv_SE/main.lang b/htdocs/langs/sv_SE/main.lang
index 8753de461c6..53a85b231c7 100644
--- a/htdocs/langs/sv_SE/main.lang
+++ b/htdocs/langs/sv_SE/main.lang
@@ -63,11 +63,13 @@ ErrorNoVATRateDefinedForSellerCountry=Fel, ingen moms har definierats för lande
 ErrorNoSocialContributionForSellerCountry=Error, no social/fiscal taxes type defined for country '%s'.
 ErrorFailedToSaveFile=Fel, kunde inte spara filen.
 ErrorCannotAddThisParentWarehouse=You are trying to add a parent warehouse which is already a child of current one
+MaxNbOfRecordPerPage=Max nb of record per page
 NotAuthorized=You are not authorized to do that.
 SetDate=Ställ in datum
 SelectDate=Välj datum
 SeeAlso=Se även %s
 SeeHere=Se hänvisning
+Apply=Tillämpa
 BackgroundColorByDefault=Standard bakgrundsfärg
 FileRenamed=The file was successfully renamed
 FileUploaded=Filen har laddats upp
@@ -86,7 +88,7 @@ Undefined=Odefinierad
 PasswordForgotten=Password forgotten?
 SeeAbove=Se ovan
 HomeArea=Hem område
-LastConnexion=Senaste anslutningen
+LastConnexion=Latest connection
 PreviousConnexion=Tidigare anslutning
 PreviousValue=Previous value
 ConnectedOnMultiCompany=Ansluten enhet
@@ -236,7 +238,7 @@ DateCreation=Datum för skapande
 DateCreationShort=Creat. date
 DateModification=Ändringsdatum
 DateModificationShort=Ändr. datum
-DateLastModification=Datum för senaste ändring
+DateLastModification=Latest modification date
 DateValidation=Attestdatum
 DateClosing=Sista dag
 DateDue=Förfallodag
@@ -432,7 +434,7 @@ Reportings=Rapportering
 Draft=Utkast
 Drafts=Utkast
 Validated=Validerad
-Opened=Öppen
+Opened=Öppnad
 New=Ny
 Discount=Rabatt
 Unknown=Okänd
@@ -460,6 +462,7 @@ DeletePicture=Ta bort bild
 ConfirmDeletePicture=Bekräfta ta bort bild?
 Login=Inloggning
 CurrentLogin=Nuvarande inloggning
+EnterLoginDetail=Enter login details
 January=Januari
 February=Februari
 March=Mars
@@ -597,6 +600,8 @@ SessionName=Session namn
 Method=Metod
 Receive=Ta emot
 CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
+ExpectedValue=Expected Value
+CurrentValue=Aktuellt värde
 PartialWoman=Partiell
 TotalWoman=Totalt
 NeverReceived=Aldrig fick
@@ -753,6 +758,8 @@ RemoveString=Remove string '%s'
 SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
 DirectDownloadLink=Direct download link
 Download=Download
+ActualizeCurrency=Update currency rate
+Fiscalyear=Räkenskapsåret
 # Week day
 Monday=Måndag
 Tuesday=Tisdag
@@ -787,8 +794,8 @@ SetRef=Set ref
 Select2ResultFoundUseArrows=Some results found. Use arrows to select.
 Select2NotFound=No result found
 Select2Enter=Enter
-Select2MoreCharacter=or more character
-Select2MoreCharacters=or more characters
+Select2MoreCharacter=or more characters<br /><br /><strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
+Select2MoreCharacters=or more characters<br /><br /><strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
 Select2LoadingMoreResults=Loading more results...
 Select2SearchInProgress=Search in progress...
 SearchIntoThirdparties=Thirdparties
@@ -809,3 +816,5 @@ SearchIntoContracts=Kontrakt
 SearchIntoCustomerShipments=Customer shipments
 SearchIntoExpenseReports=Räkningar
 SearchIntoLeaves=Löv
+
+BulkActions=Bulk actions
diff --git a/htdocs/langs/sv_SE/members.lang b/htdocs/langs/sv_SE/members.lang
index 955ea89bd0a..a50041f81ba 100644
--- a/htdocs/langs/sv_SE/members.lang
+++ b/htdocs/langs/sv_SE/members.lang
@@ -45,7 +45,7 @@ MemberStatusDraft=Utkast (måste valideras)
 MemberStatusDraftShort=Förslag
 MemberStatusActive=Validerad (väntar prenumeration)
 MemberStatusActiveShort=Validerad
-MemberStatusActiveLate=prenumeration löpt ut
+MemberStatusActiveLate=Subscription expired
 MemberStatusActiveLateShort=Utgångna
 MemberStatusPaid=Prenumeration aktuell
 MemberStatusPaidShort=Aktuell
@@ -136,8 +136,8 @@ DocForAllMembersCards=Generera visitkort för alla medlemmar (Format för utgån
 DocForOneMemberCards=Generera visitkort för en viss medlem (Format för utgång faktiskt setup: <b>%s)</b>
 DocForLabels=Generera adress ark (Format för utgång faktiskt setup: <b>%s)</b>
 SubscriptionPayment=Teckning betalning
-LastSubscriptionDate=Senast teckningsdag
-LastSubscriptionAmount=Senast teckningsbelopp
+LastSubscriptionDate=Latest subscription date
+LastSubscriptionAmount=Latest subscription amount
 MembersStatisticsByCountries=Medlemmar statistik per land
 MembersStatisticsByState=Medlemmar statistik från stat / provins
 MembersStatisticsByTown=Medlemmar statistik per kommun
@@ -149,7 +149,7 @@ MembersByStateDesc=Denna skärm visar dig statistik över ledamöter av stat / l
 MembersByTownDesc=Denna skärm visar statistik om medlemmar med stan.
 MembersStatisticsDesc=Välj statistik du vill läsa ...
 MenuMembersStats=Statistik
-LastMemberDate=Sista medlemsstaten datum
+LastMemberDate=Latest member date
 Nature=Naturen
 Public=Information är offentliga
 NewMemberbyWeb=Ny ledamot till. Väntar på godkännande
diff --git a/htdocs/langs/sv_SE/orders.lang b/htdocs/langs/sv_SE/orders.lang
index 6add6847a9e..0ac9d32be48 100644
--- a/htdocs/langs/sv_SE/orders.lang
+++ b/htdocs/langs/sv_SE/orders.lang
@@ -39,7 +39,7 @@ StatusOrderRefusedShort=Refused
 StatusOrderBilledShort=Fakturerade
 StatusOrderToProcessShort=För att kunna behandla
 StatusOrderReceivedPartiallyShort=Delvis fått
-StatusOrderReceivedAllShort=Allt fick
+StatusOrderReceivedAllShort=Products received
 StatusOrderCanceled=Annullerad
 StatusOrderDraft=Utkast (måste valideras)
 StatusOrderValidated=Validerad
@@ -51,7 +51,7 @@ StatusOrderApproved=Godkänd
 StatusOrderRefused=Refused
 StatusOrderBilled=Fakturerade
 StatusOrderReceivedPartially=Delvis fått
-StatusOrderReceivedAll=Allt fick
+StatusOrderReceivedAll=All products received
 ShippingExist=En sändning föreligger
 QtyOrdered=Antal beställda
 ProductQtyInDraft=Produktmängd till beställningsutkast
diff --git a/htdocs/langs/sv_SE/other.lang b/htdocs/langs/sv_SE/other.lang
index d670e61b44e..04369a11ffd 100644
--- a/htdocs/langs/sv_SE/other.lang
+++ b/htdocs/langs/sv_SE/other.lang
@@ -2,6 +2,7 @@
 SecurityCode=Säkerhetskod
 NumberingShort=N°
 Tools=Verktyg
+TMenuTools=Verktyg
 ToolsDesc=All miscellaneous tools not included in other menu entries are collected here.<br /><br />All the tools can be reached in the left menu.
 Birthday=Födelsedag
 BirthdayDate=Birthday date
@@ -67,14 +68,15 @@ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find her
 PredefinedMailContentSendShipping=__CONTACTCIVNAME__ Här hittar sjöfarten __SHIPPINGREF__ __PERSONALIZED__Sincerely __SIGNATURE__
 PredefinedMailContentSendFichInter=__CONTACTCIVNAME__ Här hittar interventionen __FICHINTERREF__ __PERSONALIZED__Sincerely __SIGNATURE__
 PredefinedMailContentThirdparty=__CONTACTCIVNAME__ __PERSONALIZED__ __SIGNATURE__
-DemoDesc=Dolibarr is a compact ERP/CRM supporting several functional modules. A demo showcasing all modules makes no sense as this scenario never occurs. So, several demo profiles are available.
+DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
+ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
 DemoFundation=Hantera medlemmar av en stiftelse
 DemoFundation2=Hantera medlemmar och bankkonto i en stiftelse
-DemoCompanyServiceOnly=Hantera en frilansande verksamhet säljer bruk
+DemoCompanyServiceOnly=Company or freelance selling service only
 DemoCompanyShopWithCashDesk=Hantera en butik med en kassa
-DemoCompanyProductAndStocks=Hantera ett litet eller medelstort företag som säljer produkter
-DemoCompanyAll=Hantera ett litet eller medelstort företag med flera verksamheter (alla huvudsakliga moduler)
+DemoCompanyProductAndStocks=Company selling products with a shop
+DemoCompanyAll=Company with multiple activities (all main modules)
 CreatedBy=Skapad av %s
 ModifiedBy=Uppdaterad av %s
 ValidatedBy=Bekräftad av %s
diff --git a/htdocs/langs/sv_SE/products.lang b/htdocs/langs/sv_SE/products.lang
index 91d1935bf55..c23860e5d65 100644
--- a/htdocs/langs/sv_SE/products.lang
+++ b/htdocs/langs/sv_SE/products.lang
@@ -5,6 +5,8 @@ ProductLabelTranslated=Translated product label
 ProductDescriptionTranslated=Translated product description
 ProductNoteTranslated=Translated product note
 ProductServiceCard=Produkter / tjänster kort
+TMenuProducts=Produkter
+TMenuServices=Tjänster
 Products=Produkter
 Services=Tjänster
 Product=Produkt
@@ -58,7 +60,7 @@ SellingPrice=Försäljningspris
 SellingPriceHT=Försäljningspris (exkl skatt)
 SellingPriceTTC=Försäljningspris (inkl. moms)
 CostPriceDescription=This price (net of tax) can be used to store the average amount this product cost to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
-CostPriceUsage=In a future version, this value could be used for margin calculation.
+CostPriceUsage=This value could be used for margin calculation.
 SoldAmount=Sold amount
 PurchasedAmount=Purchased amount
 NewPrice=Nytt pris
@@ -140,6 +142,7 @@ ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b>?
 CloneContentProduct=Klona alla viktiga informationer av produkt / tjänst
 ClonePricesProduct=Klona viktigaste informationer och priser
 CloneCompositionProduct=Clone packaged product/service
+CloneCombinationsProduct=Clone product variants
 ProductIsUsed=Denna produkt används
 NewRefForClone=Ref. av ny produkt / tjänst
 SellingPrices=Selling prices
@@ -236,7 +239,7 @@ GlobalVariables=Global variables
 VariableToUpdate=Variable to update
 GlobalVariableUpdaters=Global variable updaters
 UpdateInterval=Update interval (minutes)
-LastUpdated=Last updated
+LastUpdated=Latest update
 CorrectlyUpdated=Correctly updated
 PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
 PropalMergePdfProductChooseFile=Select PDF files
@@ -256,4 +259,41 @@ VolumeUnits=Volume unit
 SizeUnits=Size unit
 DeleteProductBuyPrice=Delete buying price
 ConfirmDeleteProductBuyPrice=Are you sure you want to delete this buying price?
+SubProduct=Sub product
 
+#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
+ProductCombinations=Variants
+HideProductCombinations=Hide products variant in the products selector
+ProductCombination=Variant
+NewProductCombination=New variant
+EditProductCombination=Editing variant
+ProductCombinationGenerator=Variants generator
+Features=Features
+PriceImpact=Price impact
+WeightImpact=Weight impact
+NewProductAttribute=Nya attribut
+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
+PercentageVariation=Percentage variation
+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 child products
+ConfirmCloneProductCombinations=Would you like to copy all the product variant to the 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
diff --git a/htdocs/langs/sv_SE/projects.lang b/htdocs/langs/sv_SE/projects.lang
index b593c0d7d48..19bfbc40c24 100644
--- a/htdocs/langs/sv_SE/projects.lang
+++ b/htdocs/langs/sv_SE/projects.lang
@@ -29,9 +29,9 @@ DeleteAProject=Ta bort ett projekt
 DeleteATask=Ta bort en uppgift
 ConfirmDeleteAProject=Are you sure you want to delete this project?
 ConfirmDeleteATask=Are you sure you want to delete this task?
-OpenedProjects=Open projects
-OpenedTasks=Open tasks
-OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
+OpenedProjects=Opened projects
+OpenedTasks=Opened tasks
+OpportunitiesStatusForOpenedProjects=Opportunities amount of opened projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=Visa projekt
 SetProject=Ställ projekt
@@ -47,7 +47,7 @@ TaskTimeSpent=Tid som ägnas åt uppgifter
 TaskTimeUser=Användare
 TaskTimeNote=Anmärkning
 TaskTimeDate=Datum
-TasksOnOpenedProject=Tasks on open projects
+TasksOnOpenedProject=Tasks on opened projects
 WorkloadNotDefined=Arbetsbelastning inte definierad
 NewTimeSpent=Ny tid
 MyTimeSpent=Min tid
@@ -58,6 +58,7 @@ TaskDateEnd=Uppgift slutdatum
 TaskDescription=Uppgiftsbeskrivning
 NewTask=Ny uppgift
 AddTask=Skapa uppgift
+AddTimeSpent=Create time spent
 Activity=Aktivitet
 Activities=Uppgifter / aktiviteter
 MyActivities=Mina uppgifter / aktiviteter
@@ -95,6 +96,7 @@ ValidateProject=Validate projet
 ConfirmValidateProject=Are you sure you want to validate this project?
 CloseAProject=Stäng projekt
 ConfirmCloseAProject=Are you sure you want to close this project?
+AlsoCloseAProject=Also close project (keep it open if you still need to follow production tasks on it)
 ReOpenAProject=Öppna projekt
 ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=Projekt kontakter
@@ -120,7 +122,7 @@ CloneProjectFiles=Klon projekt fogade filer
 CloneTaskFiles=Klon uppgift(er) anslöt filer (om uppgiften(s) klonad)
 CloneMoveDate=Update project/tasks dates from now?
 ConfirmCloneProject=Are you sure to clone this project?
-ProjectReportDate=Ändra uppgift datum enligt projektets startdatum
+ProjectReportDate=Change task dates according to new project start date
 ErrorShiftTaskDate=Omöjligt att flytta datum på uppgiften enligt nytt projekt startdatum
 ProjectsAndTasksLines=Projekt och uppdrag
 ProjectCreatedInDolibarr=Projekt %s skapad
@@ -177,9 +179,9 @@ ProjectsStatistics=Statistics on projects/leads
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 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.
-OpenedProjectsByThirdparties=Open projects by thirdparties
+OpenedProjectsByThirdparties=Opened projects by thirdparties
 OnlyOpportunitiesShort=Only opportunities
-OpenedOpportunitiesShort=Open opportunities
+OpenedOpportunitiesShort=Opened opportunities
 NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount
diff --git a/htdocs/langs/sv_SE/propal.lang b/htdocs/langs/sv_SE/propal.lang
index b588757c3c5..4175e240a18 100644
--- a/htdocs/langs/sv_SE/propal.lang
+++ b/htdocs/langs/sv_SE/propal.lang
@@ -3,7 +3,7 @@ Proposals=Kommersiella förslag
 Proposal=Kommersiella förslag
 ProposalShort=Förslag
 ProposalsDraft=Utkast till kommersiella förslag
-ProposalsOpened=Open commercial proposals
+ProposalsOpened=Öppnade kommersiella förslag
 Prop=Kommersiella förslag
 CommercialProposal=Kommersiella förslag
 ProposalCard=Förslaget kortet
@@ -26,9 +26,9 @@ AmountOfProposalsByMonthHT=Belopp per månad (efter skatt)
 NbOfProposals=Antal kommersiella förslag
 ShowPropal=Visa förslag
 PropalsDraft=Utkast
-PropalsOpened=Öppen
+PropalsOpened=Öppnad
 PropalStatusDraft=Utkast (måste valideras)
-PropalStatusValidated=Validerad (förslag är öppen)
+PropalStatusValidated=Validated (proposal is opened)
 PropalStatusSigned=Undertecknats (behov fakturering)
 PropalStatusNotSigned=Inte undertecknat (stängt)
 PropalStatusBilled=Fakturerade
diff --git a/htdocs/langs/sv_SE/stocks.lang b/htdocs/langs/sv_SE/stocks.lang
index dd4aaf8fde8..8704d1ce7a5 100644
--- a/htdocs/langs/sv_SE/stocks.lang
+++ b/htdocs/langs/sv_SE/stocks.lang
@@ -22,13 +22,15 @@ Movements=Förändringar
 ErrorWarehouseRefRequired=Lagrets referensnamn krävs
 ListOfWarehouses=Lista över lager
 ListOfStockMovements=Lista över lagerförändringar
+StockMovementForId=Movement ID %d
+ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Lager område
 Location=Plats
 LocationSummary=Kortnamn plats
 NumberOfDifferentProducts=Antal olika produkter
 NumberOfProducts=Totalt antal produkter
-LastMovement=Senaste förändring
-LastMovements=Senaste förändringar
+LastMovement=Latest movement
+LastMovements=Latest movements
 Units=Enheter
 Unit=Enhet
 StockCorrection=Rätt lager
@@ -140,3 +142,4 @@ ProductStockWarehouseCreated=Stock limit for alert and desired optimal stock cor
 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
diff --git a/htdocs/langs/sv_SE/supplier_proposal.lang b/htdocs/langs/sv_SE/supplier_proposal.lang
index 4bb9cc35ea9..07dcf45c675 100644
--- a/htdocs/langs/sv_SE/supplier_proposal.lang
+++ b/htdocs/langs/sv_SE/supplier_proposal.lang
@@ -8,7 +8,7 @@ SearchRequest=Find a request
 DraftRequests=Draft requests
 SupplierProposalsDraft=Draft supplier proposals
 LastModifiedRequests=Latest %s modified price requests
-RequestsOpened=Open price requests
+RequestsOpened=Opened price requests
 SupplierProposalArea=Supplier proposals area
 SupplierProposalShort=Supplier proposal
 SupplierProposals=Supplier proposals
@@ -23,7 +23,7 @@ ConfirmValidateAsk=Are you sure you want to validate this price request under na
 DeleteAsk=Delete request
 ValidateAsk=Validate request
 SupplierProposalStatusDraft=Utkast (måste valideras)
-SupplierProposalStatusValidated=Validated (request is open)
+SupplierProposalStatusValidated=Validated (request is opened)
 SupplierProposalStatusClosed=Stängt
 SupplierProposalStatusSigned=Accepted
 SupplierProposalStatusNotSigned=Refused
diff --git a/htdocs/langs/sv_SE/suppliers.lang b/htdocs/langs/sv_SE/suppliers.lang
index 1cb8c9b567e..7e1bdba4bd4 100644
--- a/htdocs/langs/sv_SE/suppliers.lang
+++ b/htdocs/langs/sv_SE/suppliers.lang
@@ -9,7 +9,7 @@ ShowSupplier=Visa leverantör
 OrderDate=Beställ datum
 BuyingPriceMin=Best buying price
 BuyingPriceMinShort=Best buying price
-TotalBuyingPriceMinShort=Total of subproducts buying prices
+TotalBuyingPriceMinShort=Totalt subprodukter köper priserna
 TotalSellingPriceMinShort=Total of subproducts selling prices
 SomeSubProductHaveNoPrices=Vissa under produkter har inget pris definierat
 AddSupplierPrice=Add buying price
@@ -24,10 +24,10 @@ ExportDataset_fournisseur_1=Leverantörsfakturor listan och fakturornas linjer
 ExportDataset_fournisseur_2=Leverantörsfakturor och betalningar
 ExportDataset_fournisseur_3=Leverantörs order och orderrader
 ApproveThisOrder=Godkänna denna ordning
-ConfirmApproveThisOrder=Är du säker på att du vill godkänna att <b>%s?</b>
+ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b>?
 DenyingThisOrder=Deny this order
-ConfirmDenyingThisOrder=Är du säker på att du vill förneka detta syfte <b>%s?</b>
-ConfirmCancelThisOrder=Är du säker på att du vill avbryta denna order <b>%s?</b>
+ConfirmDenyingThisOrder=Are you sure you want to deny this order <b>%s</b>?
+ConfirmCancelThisOrder=Are you sure you want to cancel this order <b>%s</b>?
 AddSupplierOrder=Skapa leverantör för
 AddSupplierInvoice=Skapa leverantörsfaktura
 ListOfSupplierProductForSupplier=Förteckning över produkter och priser för leverantör <b>%s</b>
@@ -41,3 +41,4 @@ DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Wrong quality
 ReputationForThisProduct=Reputation
 BuyerName=Buyer name
+AllProductServicePrices=All product / service prices
diff --git a/htdocs/langs/sv_SE/users.lang b/htdocs/langs/sv_SE/users.lang
index 7fe15f51c6d..214d29a79f6 100644
--- a/htdocs/langs/sv_SE/users.lang
+++ b/htdocs/langs/sv_SE/users.lang
@@ -36,7 +36,7 @@ AdministratorDesc=Administratör
 DefaultRights=Standardbehörigheter
 DefaultRightsDesc=Definiera här <u>standardbehörigheter</u> som automatiskt ges till en <u>ny skapat</u> användare (Gå på användarkort att ändra tillstånd av en befintlig användare).
 DolibarrUsers=Dolibarr användare
-LastName=Last Name
+LastName=Efternamn
 FirstName=Förnamn
 ListOfGroups=Lista över grupper
 NewGroup=Ny grupp
diff --git a/htdocs/langs/sv_SE/withdrawals.lang b/htdocs/langs/sv_SE/withdrawals.lang
index cc842fb8cb0..750f3120cc2 100644
--- a/htdocs/langs/sv_SE/withdrawals.lang
+++ b/htdocs/langs/sv_SE/withdrawals.lang
@@ -24,6 +24,7 @@ WithdrawStatistics=Direct debit payment statistics
 WithdrawRejectStatistics=Direct debit payment reject statistics
 LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
+WithdrawRequestsDone=%s direct debit payment requests recorded
 ThirdPartyBankCode=Tredje part bankkod
 NoInvoiceCouldBeWithdrawed=Ingen faktura withdrawed med framgång. Kontrollera att fakturan på företag med en giltig förbud.
 ClassCredited=Klassificera krediteras
@@ -76,8 +77,8 @@ RUM=UMR
 RUMLong=Unique Mandate Reference
 RUMWillBeGenerated=UMR number will be generated once bank account information are saved
 WithdrawMode=Direct debit mode (FRST or RECUR)
-WithdrawRequestAmount=Withdraw request amount:
-WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil amount.
+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
diff --git a/htdocs/langs/sw_SW/accountancy.lang b/htdocs/langs/sw_SW/accountancy.lang
index 5de95948fbf..4c2336b97b0 100644
--- a/htdocs/langs/sw_SW/accountancy.lang
+++ b/htdocs/langs/sw_SW/accountancy.lang
@@ -194,6 +194,8 @@ ChangeBinding=Change the binding
 
 ## Admin
 ApplyMassCategories=Apply mass categories
+AddAccountFromBookKeepingWithNoCategories=Add acccount already used with no categories
+CategoryDeleted=Category for the accounting account has been removed
 
 ## Export
 Exports=Exports
@@ -209,6 +211,7 @@ Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution
 Modelcsv_quadratus=Export towards Quadratus QuadraCompta
 Modelcsv_ebp=Export towards EBP
 Modelcsv_cogilog=Export towards Cogilog
+ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
 InitAccountancy=Init accountancy
diff --git a/htdocs/langs/sw_SW/admin.lang b/htdocs/langs/sw_SW/admin.lang
index 23c8998e615..7282d9a21db 100644
--- a/htdocs/langs/sw_SW/admin.lang
+++ b/htdocs/langs/sw_SW/admin.lang
@@ -9,14 +9,20 @@ VersionDevelopment=Development
 VersionUnknown=Unknown
 VersionRecommanded=Recommended
 FileCheck=Files integrity checker
-FileCheckDesc=This tool allows you to check the integrity of files of your application, comparing each files with the official ones. You can use this tool to detect if some files were modified by a hacker for example.
+FileCheckDesc=This tool allows you to check the integrity of files and setup of your application, comparing each files with the official ones. 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.
+FileIntegrityIsStrictlyConformedWithReference=Files integrity is strictly conformed with the reference.
+FileIntegrityIsOkButFilesWereAdded=Files integrity check has passed, however some new files were added.
+FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified, removed or added.
+GlobalChecksum=Global checksum
 MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
 LocalSignature=Embedded local signature (less reliable)
 RemoteSignature=Remote distant signature (more reliable)
 FilesMissing=Missing Files
 FilesUpdated=Updated Files
+FilesModified=Modified Files
+FilesAdded=Added Files
 FileCheckDolibarr=Check integrity of application files
-AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from a certified package
+AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from an official package
 XmlNotFound=Xml Integrity File of application not found
 SessionId=Session ID
 SessionSaveHandler=Handler to save sessions
@@ -185,7 +191,9 @@ BoxesDesc=Widgets are components showing some information that you can add to pe
 OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
 ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
-ModulesMarketPlaces=More modules...
+ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
+ModulesMarketPlaces=Find external modules...
+GoModuleSetupArea=To deploy/install a new module, go onto the Module setup area at <a href="%s">%s</a>.
 DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules
 DoliPartnersDesc=List of companies providing custom developed modules or features (Note: anyone experienced in PHP programming can provide custom development for an open source project)
 WebSiteDesc=Reference websites to find more modules...
@@ -276,21 +284,22 @@ ModuleFamilyInterface=Interfaces with external systems
 MenuHandlers=Menu handlers
 MenuAdmin=Menu editor
 DoNotUseInProduction=Do not use in production
-ThisIsProcessToFollow=This is setup to process:
-ThisIsAlternativeProcessToFollow=This is an alternative setup to process:
+ThisIsProcessToFollow=This is steps to process:
+ThisIsAlternativeProcessToFollow=This is an alternative setup to process manually:
 StepNb=Step %s
 FindPackageFromWebSite=Find a package that provides feature you want (for example on official web site %s).
 DownloadPackageFromWebSite=Download package (for example from official web site %s).
-UnpackPackageInDolibarrRoot=Unpack package file into Dolibarr server directory dedicated to external modules: <b>%s</b>
-SetupIsReadyForUse=Install is finished and Dolibarr is ready to use with this new component.
-NotExistsDirect=The alternative root directory is not defined.<br>
-InfDirAlt=Since version 3 it is possible to define an alternative root directory.This allows you to store, same place, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
-InfDirExample=<br>Then declare it in the file conf.php<br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>*These lines are commented with "#", to uncomment only remove the character.
+UnpackPackageInDolibarrRoot=Unpack the packaged files into server directory dedicated to Dolibarr: <b>%s</b>
+UnpackPackageInModulesRoot=To deploy/install an external module, unpack the packaged files into the server directory dedicated to modules: <b>%s</b>
+SetupIsReadyForUse=Module deployment is finished. You must however enable and setup the module in your application by going on the page to setup modules: <a href="%s">%s</a>.
+NotExistsDirect=The alternative root directory is not defined to an existing directory.<br>
+InfDirAlt=Since version 3, it is possible to define an alternative root directory. This allows you to store, into a dedicated directory, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
+InfDirExample=<br>Then declare it in the file <strong>conf.php</strong><br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>If these lines are commented with "#", to enable them, just uncomment by removing the "#" character.
 YouCanSubmitFile=For this step, you can send package using this tool: Select module file
 CurrentVersion=Dolibarr current version
 CallUpdatePage=Go to the page that updates the database structure and data: %s.
 LastStableVersion=Latest stable version
-LastActivationDate=Last activation date
+LastActivationDate=Latest activation date
 UpdateServerOffline=Update server offline
 GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s. <br><b>{000000@x}</b> same as previous but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
 GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
@@ -373,11 +382,11 @@ ExtrafieldCheckBox=Checkbox
 ExtrafieldRadio=Radio button
 ExtrafieldCheckBoxFromList= Checkbox from table
 ExtrafieldLink=Link to an object
-ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>In order to have the list depending on another :<br>1,value1|parent_list_code:parent_key<br>2,value2|parent_list_code:parent_key
+ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list :<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list :<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
-ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
+ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Example : Societe:societe/class/societe.class.php
 LibraryToBuildPDF=Library used for PDF generation
 WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
@@ -411,10 +420,11 @@ ModuleCompanyCodePanicum=Return an empty accountancy code.
 ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party code.
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
-
+WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<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).
+ClickToShowDescription=Click to show description
 # Modules
 Module0Name=Users & groups
-Module0Desc=Users and groups management
+Module0Desc=Users / Employees and Groups management
 Module1Name=Third parties
 Module1Desc=Companies and contact management (customers, prospects...)
 Module2Name=Commercial
@@ -515,8 +525,8 @@ Module2200Name=Dynamic Prices
 Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
 Module2300Desc=Scheduled job management
-Module2400Name=Agenda/Events
-Module2400Desc=Follow events or rendez-vous. Record manual events into Agendas or let application logs automatic events for tracking purposes.
+Module2400Name=Events/Agenda
+Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous.
 Module2500Name=Electronic Content Management
 Module2500Desc=Save and share documents
 Module2600Name=API/Web services (SOAP server)
@@ -582,7 +592,7 @@ Permission34=Delete products
 Permission36=See/manage hidden products
 Permission38=Export products
 Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
-Permission42=Create/modify projects (shared project and projects i'm contact for)
+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)
 Permission45=Export projects
 Permission61=Read interventions
@@ -685,7 +695,7 @@ PermissionAdvanced253=Create/modify internal/external users and permissions
 Permission254=Create/modify external users only
 Permission255=Modify other users password
 Permission256=Delete or disable other users
-Permission262=Extend access to all third parties (not only those linked to user). Not effective for external users (always limited to themselves).
+Permission262=Extend access to all third parties (not only third parties that user is a sale representative).<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 assignement matters).
 Permission271=Read CA
 Permission272=Read invoices
 Permission273=Issue invoices
@@ -887,7 +897,7 @@ Offset=Offset
 AlwaysActive=Always active
 Upgrade=Upgrade
 MenuUpgrade=Upgrade / Extend
-AddExtensionThemeModuleOrOther=Add extension (theme, module, ...)
+AddExtensionThemeModuleOrOther=Deploy/install external module
 WebServer=Web server
 DocumentRootServer=Web server's root directory
 DataRootServer=Data files directory
@@ -994,7 +1004,7 @@ TriggerAlwaysActive=Triggers in this file are always active, whatever are the ac
 TriggerActiveAsModuleActive=Triggers in this file are active as module <b>%s</b> is enabled.
 GeneratedPasswordDesc=Define here which rule you want to use to generate new password if you ask to have auto generated password
 DictionaryDesc=Insert all reference data. You can add your values to the default.
-ConstDesc=This page allows you to edit all other parameters not available in previous pages. These are mostly reserved parameters for developers or advanced troubleshooting.
+ConstDesc=This page allows you to edit all other parameters not available in previous pages. These are mostly reserved parameters for developers or advanced troubleshooting. For a list of options <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">check here</a>.
 MiscellaneousDesc=All other security related parameters are defined here.
 LimitsSetup=Limits/Precision setup
 LimitsDesc=You can define limits, precisions and optimisations used by Dolibarr here
@@ -1161,10 +1171,6 @@ FreeLegalTextOnOrders=Free text on orders
 WatermarkOnDraftOrders=Watermark on draft orders (none if empty)
 ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable
 BANK_ASK_PAYMENT_BANK_DURING_ORDER=Ask for bank account destination of order
-##### Clicktodial #####
-ClickToDialSetup=Click To Dial module setup
-ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with your clicktodial login (defined on your user card)<br><b>__PASS__</b> that will be replaced with your clicktodial password (defined on your user card).
-##### Bookmark4u #####
 ##### Interventions #####
 InterventionsSetup=Interventions module setup
 FreeLegalTextOnInterventions=Free text on intervention documents
@@ -1391,7 +1397,7 @@ SendingsSetup=Sending module setup
 SendingsReceiptModel=Sending receipt model
 SendingsNumberingModules=Sendings numbering modules
 SendingsAbility=Support shipping sheets for customer deliveries
-NoNeedForDeliveryReceipts=In most cases, sendings receipts are used both as sheets for customer deliveries (list of products to send) and sheets that is recevied and signed by customer. So product deliveries receipts is a duplicated feature and is rarely activated.
+NoNeedForDeliveryReceipts=In most cases, shipping sheets are used both as sheets for customer deliveries (list of products to send) and sheets that is received and signed by customer. So product deliveries receipts is a duplicated feature and is rarely activated.
 FreeLegalTextOnShippings=Free text on shipments
 ##### Deliveries #####
 DeliveryOrderNumberingModules=Products deliveries receipt numbering module
@@ -1471,7 +1477,11 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Set automatically this default value for type of e
 AGENDA_DEFAULT_FILTER_TYPE=Set automatically this type of event into search filter of agenda view
 AGENDA_DEFAULT_FILTER_STATUS=Set automatically this status for events into search filter of agenda view
 AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
-##### ClickToDial #####
+AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
+AGENDA_NOTIFICATION_SOUND=Enable sound notification
+##### Clicktodial #####
+ClickToDialSetup=Click To Dial module setup
+ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with your clicktodial login (defined on your user card)<br><b>__PASS__</b> that will be replaced with your clicktodial password (defined on your user card).
 ClickToDialDesc=This module allows to make phone numbers clickable. A click on this icon will call make your phone to 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.
 ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
 ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on same computer than the browser, and called when you click on a link in your browser that start 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.
@@ -1499,10 +1509,11 @@ EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint availa
 ##### API ####
 ApiSetup=API module setup
 ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
-ApiProductionMode=Enable production mode (this will activate use of a caches for services management)
+ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
 ApiExporerIs=You can explore the APIs at url
 OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
 ApiKey=Key for API
+WarningAPIExplorerDisabled=The API explorer has been disabled. API explorer is not required to provide API services. It is a tool for developer to find/test REST APIs. If you need this tool, go into setup of module API REST to activate it.
 ##### Bank #####
 BankSetupModule=Bank module setup
 FreeLegalTextOnChequeReceipts=Free text on cheque receipts
@@ -1571,7 +1582,7 @@ BackupDumpWizard=Wizard to build database backup dump file
 SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
 SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is only manual steps a privileged user can do.
 InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
-ConfFileMuseContainCustom=Installing an external module from application save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to have option<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
+ConfFileMuseContainCustom=Installing an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
 HighlightLinesColor=Highlight color of the line when the mouse passes over (keep empty for no highlight)
 TextTitleColor=Color of page title
@@ -1601,6 +1612,7 @@ FixTZ=TimeZone fix
 FillFixTZOnlyIfRequired=Example: +2 (fill only if problem experienced)
 ExpectedChecksum=Expected Checksum
 CurrentChecksum=Current Checksum
+ForcedConstants=Required constant values
 MailToSendProposal=To send customer proposal
 MailToSendOrder=To send customer order
 MailToSendInvoice=To send customer invoice
@@ -1609,13 +1621,14 @@ MailToSendIntervention=To send intervention
 MailToSendSupplierRequestForQuotation=To send quotation request to supplier
 MailToSendSupplierOrder=To send supplier order
 MailToSendSupplierInvoice=To send supplier invoice
+MailToSendContract=To send a contract
 MailToThirdparty=To send email from third party page
 ByDefaultInList=Show by default on list view
-YouUseLastStableVersion=You use the last stable version
+YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
 TitleExampleForMaintenanceRelease=Example of message you can use to announce this maintenance release (feel free to use it on your web sites)
-ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. You can download it from the download area of http://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.
-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, nor data structure change is present into this version. You can download it from the download area of http://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.
+ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. 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.
+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, nor data structure change is present into 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, you can enter here rule to have price for each level autocalculated according to price of first level, so you will have to enter only price for first level on each product. This page is here to save you time and can be usefull only if your prices for each leve are relative to first level. You can ignore this page in most cases.
 ModelModulesProduct=Templates for product documents
 ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
diff --git a/htdocs/langs/sw_SW/banks.lang b/htdocs/langs/sw_SW/banks.lang
index 7ae841cf0f3..f0c41d5d5bf 100644
--- a/htdocs/langs/sw_SW/banks.lang
+++ b/htdocs/langs/sw_SW/banks.lang
@@ -74,13 +74,13 @@ Conciliate=Reconcile
 Conciliation=Reconciliation
 ReconciliationLate=Reconciliation late
 IncludeClosedAccount=Include closed accounts
-OnlyOpenedAccount=Only open accounts
+OnlyOpenedAccount=Only opened accounts
 AccountToCredit=Account to credit
 AccountToDebit=Account to debit
 DisableConciliation=Disable reconciliation feature for this account
 ConciliationDisabled=Reconciliation feature disabled
 LinkedToAConciliatedTransaction=Linked to a conciliated entry
-StatusAccountOpened=Open
+StatusAccountOpened=Opened
 StatusAccountClosed=Closed
 AccountIdShort=Number
 LineRecord=Transaction
diff --git a/htdocs/langs/sw_SW/bills.lang b/htdocs/langs/sw_SW/bills.lang
index bf3b48a37e9..5fb3b6169da 100644
--- a/htdocs/langs/sw_SW/bills.lang
+++ b/htdocs/langs/sw_SW/bills.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - bills
 Bill=Invoice
 Bills=Invoices
-BillsCustomers=Customers invoices
-BillsCustomer=Customers invoice
-BillsSuppliers=Suppliers invoices
-BillsCustomersUnpaid=Unpaid customers invoices
-BillsCustomersUnpaidForCompany=Unpaid customer's invoices for %s
-BillsSuppliersUnpaid=Unpaid supplier's invoices
-BillsSuppliersUnpaidForCompany=Unpaid supplier's invoices for %s
+BillsCustomers=Customer invoices
+BillsCustomer=Customer invoice
+BillsSuppliers=Supplier invoices
+BillsCustomersUnpaid=Unpaid customer invoices
+BillsCustomersUnpaidForCompany=Unpaid customer invoices for %s
+BillsSuppliersUnpaid=Unpaid supplier invoices
+BillsSuppliersUnpaidForCompany=Unpaid supplier invoices for %s
 BillsLate=Late payments
 BillsStatistics=Customers invoices statistics
 BillsStatisticsSuppliers=Suppliers invoices statistics
@@ -62,8 +62,8 @@ PaymentsBack=Payments back
 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 credit note or deposit 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.
+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.
 SupplierPayments=Suppliers payments
 ReceivedPayments=Received payments
 ReceivedCustomersPayments=Payments received from customers
@@ -78,6 +78,7 @@ PaymentMode=Payment type
 PaymentTypeDC=Debit/Credit Card
 PaymentTypePP=PayPal
 IdPaymentMode=Payment type (id)
+CodePaymentMode=Payment type (code)
 LabelPaymentMode=Payment type (label)
 PaymentModeShort=Payment type
 PaymentTerm=Payment term
@@ -102,9 +103,10 @@ SearchACustomerInvoice=Search for a customer invoice
 SearchASupplierInvoice=Search for a supplier invoice
 CancelBill=Cancel an invoice
 SendRemindByMail=Send reminder by EMail
-DoPayment=Do payment
-DoPaymentBack=Do payment back
+DoPayment=Enter payment
+DoPaymentBack=Enter refund
 ConvertToReduc=Convert into future discount
+ConvertExcessReceivedToReduc=Convert excess received into future discount
 EnterPaymentReceivedFromCustomer=Enter payment received from customer
 EnterPaymentDueToCustomer=Make payment due to customer
 DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
@@ -113,22 +115,24 @@ BillStatus=Invoice status
 StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Draft (needs to be validated)
 BillStatusPaid=Paid
-BillStatusPaidBackOrConverted=Paid or converted into discount
+BillStatusPaidBackOrConverted=Refund or converted into discount
 BillStatusConverted=Paid (ready for final invoice)
 BillStatusCanceled=Abandoned
 BillStatusValidated=Validated (needs to be paid)
 BillStatusStarted=Started
 BillStatusNotPaid=Not paid
+BillStatusNotRefunded=Not refunded
 BillStatusClosedUnpaid=Closed (unpaid)
 BillStatusClosedPaidPartially=Paid (partially)
 BillShortStatusDraft=Draft
 BillShortStatusPaid=Paid
-BillShortStatusPaidBackOrConverted=Processed
+BillShortStatusPaidBackOrConverted=Refund or converted
 BillShortStatusConverted=Processed
 BillShortStatusCanceled=Abandoned
 BillShortStatusValidated=Validated
 BillShortStatusStarted=Started
 BillShortStatusNotPaid=Not paid
+BillShortStatusNotRefunded=Not refunded
 BillShortStatusClosedUnpaid=Closed
 BillShortStatusClosedPaidPartially=Paid (partially)
 PaymentStatusToValidShort=To validate
@@ -149,14 +153,14 @@ NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified
 FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
 NotARecurringInvoiceTemplate=Not a recurring template invoice
 NewBill=New invoice
-LastBills=Last %s invoices
-LastCustomersBills=Last %s customers invoices
-LastSuppliersBills=Last %s suppliers invoices
+LastBills=Latest %s invoices
+LastCustomersBills=Latest %s customer invoices
+LastSuppliersBills=Latest %s supplier invoices
 AllBills=All invoices
 OtherBills=Other invoices
 DraftBills=Draft invoices
-CustomersDraftInvoices=Customers draft invoices
-SuppliersDraftInvoices=Suppliers draft invoices
+CustomersDraftInvoices=Customer draft invoices
+SuppliersDraftInvoices=Supplier draft invoices
 Unpaid=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>?
@@ -203,7 +207,7 @@ AlreadyPaidNoCreditNotesNoDeposits=Already paid (without credit notes and deposi
 Abandoned=Abandoned
 RemainderToPay=Remaining unpaid
 RemainderToTake=Remaining amount to take
-RemainderToPayBack=Remaining amount to pay back
+RemainderToPayBack=Remaining amount to refund
 Rest=Pending
 AmountExpected=Amount claimed
 ExcessReceived=Excess received
@@ -270,6 +274,7 @@ Deposit=Deposit
 Deposits=Deposits
 DiscountFromCreditNote=Discount from credit note %s
 DiscountFromDeposit=Payments from deposit invoice %s
+DiscountFromExcessReceived=Payments from excess received of invoice %s
 AbsoluteDiscountUse=This kind of credit can be used on invoice before its validation
 CreditNoteDepositUse=Invoice must be validated to use this kind of credits
 NewGlobalDiscount=New absolute discount
@@ -277,8 +282,8 @@ NewRelativeDiscount=New relative discount
 NoteReason=Note/Reason
 ReasonDiscount=Reason
 DiscountOfferedBy=Granted by
-DiscountStillRemaining=Discounts still remaining
-DiscountAlreadyCounted=Discounts already counted
+DiscountStillRemaining=Discounts available
+DiscountAlreadyCounted=Discounts already consumed
 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.
@@ -331,10 +336,12 @@ 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
 # PaymentConditions
 Statut=Status
-PaymentConditionShortRECEP=Immediate
-PaymentConditionRECEP=Immediate
+PaymentConditionShortRECEP=Due Upon Receipt
+PaymentConditionRECEP=Due Upon Receipt
 PaymentConditionShort30D=30 days
 PaymentCondition30D=30 days
 PaymentConditionShort30DENDMONTH=30 days of month-end
@@ -349,6 +356,14 @@ PaymentConditionShortPT_ORDER=Order
 PaymentConditionPT_ORDER=On order
 PaymentConditionShortPT_5050=50-50
 PaymentConditionPT_5050=50%% in advance, 50%% on delivery
+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
 FixAmount=Fix amount
 VarAmount=Variable amount (%% tot.)
 # PaymentType
@@ -418,7 +433,7 @@ ChequeDeposits=Checks deposits
 Cheques=Checks
 DepositId=Id deposit
 NbCheque=Number of checks
-CreditNoteConvertedIntoDiscount=This credit note or deposit invoice has been converted into %s
+CreditNoteConvertedIntoDiscount=This %s has been converted into %s
 UsBillingContactAsIncoiveRecipientIfExist=Use customer billing contact address instead of third party address as recipient for invoices
 ShowUnpaidAll=Show all unpaid invoices
 ShowUnpaidLateOnly=Show late unpaid invoices only
diff --git a/htdocs/langs/sw_SW/boxes.lang b/htdocs/langs/sw_SW/boxes.lang
index 98970318e85..38b03b4268d 100644
--- a/htdocs/langs/sw_SW/boxes.lang
+++ b/htdocs/langs/sw_SW/boxes.lang
@@ -25,8 +25,8 @@ BoxTitleLastSuppliers=Latest %s recorded suppliers
 BoxTitleLastModifiedSuppliers=Latest %s modified suppliers
 BoxTitleLastModifiedCustomers=Latest %s modified customers
 BoxTitleLastCustomersOrProspects=Latest %s customers or prospects
-BoxTitleLastCustomerBills=Latest %s customer's invoices
-BoxTitleLastSupplierBills=Latest %s supplier's invoices
+BoxTitleLastCustomerBills=Latest %s customer invoices
+BoxTitleLastSupplierBills=Latest %s supplier invoices
 BoxTitleLastModifiedProspects=Latest %s modified prospects
 BoxTitleLastModifiedMembers=Latest %s members
 BoxTitleLastFicheInter=Latest %s modified interventions
@@ -51,12 +51,12 @@ ClickToAdd=Click here to add.
 NoRecordedCustomers=No recorded customers
 NoRecordedContacts=No recorded contacts
 NoActionsToDo=No actions to do
-NoRecordedOrders=No recorded customer's orders
+NoRecordedOrders=No recorded customer orders
 NoRecordedProposals=No recorded proposals
-NoRecordedInvoices=No recorded customer's invoices
-NoUnpaidCustomerBills=No unpaid customer's invoices
-NoUnpaidSupplierBills=No unpaid supplier's invoices
-NoModifiedSupplierBills=No recorded supplier's invoices
+NoRecordedInvoices=No recorded customer invoices
+NoUnpaidCustomerBills=No unpaid customer invoices
+NoUnpaidSupplierBills=No unpaid supplier invoices
+NoModifiedSupplierBills=No recorded supplier invoices
 NoRecordedProducts=No recorded products/services
 NoRecordedProspects=No recorded prospects
 NoContractedProducts=No products/services contracted
diff --git a/htdocs/langs/sw_SW/companies.lang b/htdocs/langs/sw_SW/companies.lang
index 4a631b092cf..1b7efa3c14e 100644
--- a/htdocs/langs/sw_SW/companies.lang
+++ b/htdocs/langs/sw_SW/companies.lang
@@ -78,6 +78,10 @@ VATIsNotUsed=VAT is not used
 CopyAddressFromSoc=Fill address with third party address
 ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
 PaymentBankAccount=Payment bank account
+OverAllProposals=Total proposals
+OverAllOrders=Total orders
+OverAllInvoices=Total invoices
+OverAllSupplierProposals=Total price requests
 ##### Local Taxes #####
 LocalTax1IsUsed=Use second tax
 LocalTax1IsUsedES= RE is used
@@ -239,6 +243,10 @@ ProfId3RU=Prof Id 3 (KPP)
 ProfId4RU=Prof Id 4 (OKPO)
 ProfId5RU=-
 ProfId6RU=-
+ProfId1DZ=RC
+ProfId2DZ=Art.
+ProfId3DZ=NIF
+ProfId4DZ=NIS
 VATIntra=VAT number
 VATIntraShort=VAT number
 VATIntraSyntaxIsValid=Syntax is valid
@@ -382,8 +390,9 @@ ListCustomersShort=List of customers
 ThirdPartiesArea=Third parties and contact area
 LastModifiedThirdParties=Latest %s modified third parties
 UniqueThirdParties=Total of unique third parties
-InActivity=Open
+InActivity=Opened
 ActivityCeased=Closed
+ThirdPartyIsClosed=Third party is closed
 ProductsIntoElements=List of products/services into %s
 CurrentOutstandingBill=Current outstanding bill
 OutstandingBill=Max. for outstanding bill
@@ -396,7 +405,7 @@ MergeThirdparties=Merge third parties
 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 so you will be able to delete the duplicate one.
 ThirdpartiesMergeSuccess=Thirdparties have been merged
 SaleRepresentativeLogin=Login of sales representative
-SaleRepresentativeFirstname=Firstname of sales representative
-SaleRepresentativeLastname=Lastname of sales representative
+SaleRepresentativeFirstname=First name of sales representative
+SaleRepresentativeLastname=Last name of sales representative
 ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
 NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/sw_SW/compta.lang b/htdocs/langs/sw_SW/compta.lang
index 17f2bb4e98f..5e9814369ec 100644
--- a/htdocs/langs/sw_SW/compta.lang
+++ b/htdocs/langs/sw_SW/compta.lang
@@ -65,6 +65,7 @@ PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=VAT payment
 ListPayment=List of payments
 ListOfCustomerPayments=List of customer payments
+ListOfSupplierPayments=List of supplier payments
 DateStartPeriod=Date start period
 DateEndPeriod=Date end period
 newLT1Payment=New tax 2 payment
@@ -81,7 +82,7 @@ LT2PaymentES=IRPF Payment
 LT2PaymentsES=IRPF Payments
 VATPayment=Sales tax payment
 VATPayments=Sales tax payments
-VATRefund=Sales tax refund Refund
+VATRefund=Sales tax refund
 Refund=Refund
 SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Show VAT payment
@@ -194,7 +195,7 @@ CloneTax=Clone a social/fiscal tax
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
 CloneTaxForNextMonth=Clone it for next month
 SimpleReport=Simple report
-AddExtraReport=Extra reports
+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
diff --git a/htdocs/langs/sw_SW/cron.lang b/htdocs/langs/sw_SW/cron.lang
index cb68b31c80f..b1e8bcb36d2 100644
--- a/htdocs/langs/sw_SW/cron.lang
+++ b/htdocs/langs/sw_SW/cron.lang
@@ -17,14 +17,14 @@ CronMethodDoesNotExists=Class %s does not contains any method %s
 # Menu
 EnabledAndDisabled=Enabled and disabled
 # Page list
-CronLastOutput=Last run output
-CronLastResult=Last result code
+CronLastOutput=Latest run output
+CronLastResult=Latest result code
 CronCommand=Command
 CronList=Scheduled jobs
 CronDelete=Delete scheduled jobs
-CronConfirmDelete=Are you sure you want to delete these scheduled jobs ?
+CronConfirmDelete=Are you sure you want to delete these scheduled jobs?
 CronExecute=Launch scheduled job
-CronConfirmExecute=Are you sure you want to execute these scheduled jobs now ?
+CronConfirmExecute=Are you sure you want to execute these scheduled jobs now?
 CronInfo=Scheduled job module allow to execute job that have been planned
 CronTask=Job
 CronNone=None
diff --git a/htdocs/langs/sw_SW/errors.lang b/htdocs/langs/sw_SW/errors.lang
index f935ce72d41..9e2eb6817ef 100644
--- a/htdocs/langs/sw_SW/errors.lang
+++ b/htdocs/langs/sw_SW/errors.lang
@@ -11,6 +11,7 @@ ErrorLoginAlreadyExists=Login %s already exists.
 ErrorGroupAlreadyExists=Group %s already exists.
 ErrorRecordNotFound=Record not found.
 ErrorFailToCopyFile=Failed to copy file '<b>%s</b>' into '<b>%s</b>'.
+ErrorFailToCopyDir=Failed to copy directory '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToRenameFile=Failed to rename file '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToDeleteFile=Failed to remove file '<b>%s</b>'.
 ErrorFailToCreateFile=Failed to create file '<b>%s</b>'.
@@ -115,7 +116,7 @@ ErrorNoActivatedBarcode=No barcode type activated
 ErrUnzipFails=Failed to unzip %s with ZipArchive
 ErrNoZipEngine=No engine to unzip %s file in this PHP
 ErrorFileMustBeADolibarrPackage=The file %s must be a Dolibarr zip package
-ErrorFileRequired=It takes a package Dolibarr file
+ErrorModuleFileRequired=You must select a Dolibarr module package file
 ErrorPhpCurlNotInstalled=The PHP CURL is not installed, this is essential to talk with 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
@@ -170,14 +171,19 @@ ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
 ErrorFileMustHaveFormat=File must have format %s
 ErrorSupplierCountryIsNotDefined=Country for this supplier is not defined. Correct this first.
 ErrorsThirdpartyMerge=Failed to merge the two records. Request canceled.
-ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enougth for product %s to add it into a new order.
-ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enougth for product %s to add it into a new invoice.
-ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enougth for product %s to add it into a new shipment.
-ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enougth for product %s to add it into a new proposal.
-ErrorFailedToLoadLoginFileForMode=Failed to get the login file for mode '%s'.
+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 bank 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>
 
 # 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.
diff --git a/htdocs/langs/sw_SW/holiday.lang b/htdocs/langs/sw_SW/holiday.lang
index a95da81eaaa..50d97c0d8cc 100644
--- a/htdocs/langs/sw_SW/holiday.lang
+++ b/htdocs/langs/sw_SW/holiday.lang
@@ -76,8 +76,9 @@ BoxTitleLastLeaveRequests=Latest %s modified leave requests
 HolidaysMonthlyUpdate=Monthly update
 ManualUpdate=Manual update
 HolidaysCancelation=Leave request cancelation
-EmployeeLastname=Employee lastname
-EmployeeFirstname=Employee firstname
+EmployeeLastname=Employee last name
+EmployeeFirstname=Employee first name
+TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
 
 ## Configuration du Module ##
 LastUpdateCP=Latest automatic update of leaves allocation
diff --git a/htdocs/langs/sw_SW/ldap.lang b/htdocs/langs/sw_SW/ldap.lang
index a17019d00fb..42e699de311 100644
--- a/htdocs/langs/sw_SW/ldap.lang
+++ b/htdocs/langs/sw_SW/ldap.lang
@@ -13,8 +13,8 @@ LDAPUsers=Users in LDAP database
 LDAPFieldStatus=Status
 LDAPFieldFirstSubscriptionDate=First subscription date
 LDAPFieldFirstSubscriptionAmount=First subscription amount
-LDAPFieldLastSubscriptionDate=Last subscription date
-LDAPFieldLastSubscriptionAmount=Last subscription amount
+LDAPFieldLastSubscriptionDate=Latest subscription date
+LDAPFieldLastSubscriptionAmount=Latest subscription amount
 LDAPFieldSkype=Skype id
 LDAPFieldSkypeExample=Example : skypeName
 UserSynchronized=User synchronized
diff --git a/htdocs/langs/sw_SW/mails.lang b/htdocs/langs/sw_SW/mails.lang
index ab18dcdca25..c830b551a67 100644
--- a/htdocs/langs/sw_SW/mails.lang
+++ b/htdocs/langs/sw_SW/mails.lang
@@ -35,7 +35,7 @@ MailingStatusSentPartialy=Sent partialy
 MailingStatusSentCompletely=Sent completely
 MailingStatusError=Error
 MailingStatusNotSent=Not sent
-MailSuccessfulySent=Email successfully sent (from %s to %s)
+MailSuccessfulySent=Email successfully accepted for delivery (from %s to %s)
 MailingSuccessfullyValidated=EMailing successfully validated
 MailUnsubcribe=Unsubscribe
 MailingStatusNotContact=Don't contact anymore
@@ -74,22 +74,28 @@ ResultOfMailSending=Result of mass EMail sending
 NbSelected=Nb selected
 NbIgnored=Nb ignored
 NbSent=Nb 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
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Line %s in file
 RecipientSelectionModules=Defined requests for recipient's selection
 MailSelectedRecipients=Selected recipients
 MailingArea=EMailings area
-LastMailings=Last %s emailings
+LastMailings=Latest %s emailings
 TargetsStatistics=Targets statistics
 NbOfCompaniesContacts=Unique contacts/addresses
 MailNoChangePossible=Recipients for validated emailing can't be changed
 SearchAMailing=Search mailing
 SendMailing=Send emailing
 SendMail=Send email
-MailingNeedCommand=For security reason, sending an emailing is better when performed from command line. If you have one, ask your server administrator to launch the following command to send the emailing to all recipients:
+SentBy=Sent by
+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=You can however send them online by adding parameter MAILING_LIMIT_SENDBYWEB with value of max number of emails you want to send by session. For this, go on Home - Setup - Other.
-ConfirmSendingEmailing=If you can't or prefer sending them with your www browser, please confirm you are sure you want to send emailing now from your browser?
+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.
 TargetsReset=Clear list
 ToClearAllRecipientsClickHere=Click here to clear the recipient list for this emailing
@@ -144,3 +150,6 @@ AdvTgtCreateFilter=Create filter
 AdvTgtOrCreateNewFilter=Name of new filter
 NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
+OutGoingEmailSetup=Outgoing email setup
+InGoingEmailSetup=Incoming email setup
+
diff --git a/htdocs/langs/sw_SW/main.lang b/htdocs/langs/sw_SW/main.lang
index 5dae5edf440..1d4c9c416be 100644
--- a/htdocs/langs/sw_SW/main.lang
+++ b/htdocs/langs/sw_SW/main.lang
@@ -63,11 +63,13 @@ ErrorNoVATRateDefinedForSellerCountry=Error, no vat rates defined for country '%
 ErrorNoSocialContributionForSellerCountry=Error, no social/fiscal taxes type defined for country '%s'.
 ErrorFailedToSaveFile=Error, failed to save file.
 ErrorCannotAddThisParentWarehouse=You are trying to add a parent warehouse which is already a child of current one
+MaxNbOfRecordPerPage=Max nb of record per page
 NotAuthorized=You are not authorized to do that.
 SetDate=Set date
 SelectDate=Select a date
 SeeAlso=See also %s
 SeeHere=See here
+Apply=Apply
 BackgroundColorByDefault=Default background color
 FileRenamed=The file was successfully renamed
 FileUploaded=The file was successfully uploaded
@@ -86,7 +88,7 @@ Undefined=Undefined
 PasswordForgotten=Password forgotten?
 SeeAbove=See above
 HomeArea=Home area
-LastConnexion=Last connection
+LastConnexion=Latest connection
 PreviousConnexion=Previous connection
 PreviousValue=Previous value
 ConnectedOnMultiCompany=Connected on environment
@@ -236,7 +238,7 @@ DateCreation=Creation date
 DateCreationShort=Creat. date
 DateModification=Modification date
 DateModificationShort=Modif. date
-DateLastModification=Last modification date
+DateLastModification=Latest modification date
 DateValidation=Validation date
 DateClosing=Closing date
 DateDue=Due date
@@ -432,7 +434,7 @@ Reportings=Reporting
 Draft=Draft
 Drafts=Drafts
 Validated=Validated
-Opened=Open
+Opened=Opened
 New=New
 Discount=Discount
 Unknown=Unknown
@@ -460,6 +462,7 @@ DeletePicture=Picture delete
 ConfirmDeletePicture=Confirm picture deletion?
 Login=Login
 CurrentLogin=Current login
+EnterLoginDetail=Enter login details
 January=January
 February=February
 March=March
@@ -597,6 +600,8 @@ SessionName=Session name
 Method=Method
 Receive=Receive
 CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
+ExpectedValue=Expected Value
+CurrentValue=Current value
 PartialWoman=Partial
 TotalWoman=Total
 NeverReceived=Never received
@@ -753,6 +758,8 @@ RemoveString=Remove string '%s'
 SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
 DirectDownloadLink=Direct download link
 Download=Download
+ActualizeCurrency=Update currency rate
+Fiscalyear=Fiscal year
 # Week day
 Monday=Monday
 Tuesday=Tuesday
@@ -787,8 +794,8 @@ SetRef=Set ref
 Select2ResultFoundUseArrows=Some results found. Use arrows to select.
 Select2NotFound=No result found
 Select2Enter=Enter
-Select2MoreCharacter=or more character
-Select2MoreCharacters=or more characters
+Select2MoreCharacter=or more characters<br /><br /><strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
+Select2MoreCharacters=or more characters<br /><br /><strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
 Select2LoadingMoreResults=Loading more results...
 Select2SearchInProgress=Search in progress...
 SearchIntoThirdparties=Thirdparties
@@ -809,3 +816,5 @@ SearchIntoContracts=Contracts
 SearchIntoCustomerShipments=Customer shipments
 SearchIntoExpenseReports=Expense reports
 SearchIntoLeaves=Leaves
+
+BulkActions=Bulk actions
diff --git a/htdocs/langs/sw_SW/members.lang b/htdocs/langs/sw_SW/members.lang
index df911af6f71..8f6f76ba48f 100644
--- a/htdocs/langs/sw_SW/members.lang
+++ b/htdocs/langs/sw_SW/members.lang
@@ -45,7 +45,7 @@ MemberStatusDraft=Draft (needs to be validated)
 MemberStatusDraftShort=Draft
 MemberStatusActive=Validated (waiting subscription)
 MemberStatusActiveShort=Validated
-MemberStatusActiveLate=subscription expired
+MemberStatusActiveLate=Subscription expired
 MemberStatusActiveLateShort=Expired
 MemberStatusPaid=Subscription up to date
 MemberStatusPaidShort=Up to date
@@ -136,8 +136,8 @@ DocForAllMembersCards=Generate business cards for all members
 DocForOneMemberCards=Generate business cards for a particular member
 DocForLabels=Generate address sheets
 SubscriptionPayment=Subscription payment
-LastSubscriptionDate=Last subscription date
-LastSubscriptionAmount=Last subscription amount
+LastSubscriptionDate=Latest subscription date
+LastSubscriptionAmount=Latest subscription amount
 MembersStatisticsByCountries=Members statistics by country
 MembersStatisticsByState=Members statistics by state/province
 MembersStatisticsByTown=Members statistics by town
@@ -149,7 +149,7 @@ MembersByStateDesc=This screen show you statistics on members by state/provinces
 MembersByTownDesc=This screen show you statistics on members by town.
 MembersStatisticsDesc=Choose statistics you want to read...
 MenuMembersStats=Statistics
-LastMemberDate=Last member date
+LastMemberDate=Latest member date
 Nature=Nature
 Public=Information are public
 NewMemberbyWeb=New member added. Awaiting approval
diff --git a/htdocs/langs/sw_SW/orders.lang b/htdocs/langs/sw_SW/orders.lang
index 9d2e53e4fe2..331e3b49d3e 100644
--- a/htdocs/langs/sw_SW/orders.lang
+++ b/htdocs/langs/sw_SW/orders.lang
@@ -39,7 +39,7 @@ StatusOrderRefusedShort=Refused
 StatusOrderBilledShort=Billed
 StatusOrderToProcessShort=To process
 StatusOrderReceivedPartiallyShort=Partially received
-StatusOrderReceivedAllShort=Everything received
+StatusOrderReceivedAllShort=Products received
 StatusOrderCanceled=Canceled
 StatusOrderDraft=Draft (needs to be validated)
 StatusOrderValidated=Validated
@@ -51,7 +51,7 @@ StatusOrderApproved=Approved
 StatusOrderRefused=Refused
 StatusOrderBilled=Billed
 StatusOrderReceivedPartially=Partially received
-StatusOrderReceivedAll=Everything received
+StatusOrderReceivedAll=All products received
 ShippingExist=A shipment exists
 QtyOrdered=Qty ordered
 ProductQtyInDraft=Product quantity into draft orders
diff --git a/htdocs/langs/sw_SW/other.lang b/htdocs/langs/sw_SW/other.lang
index 1ea1f9da1db..ab937ff3bab 100644
--- a/htdocs/langs/sw_SW/other.lang
+++ b/htdocs/langs/sw_SW/other.lang
@@ -2,6 +2,7 @@
 SecurityCode=Security code
 NumberingShort=N°
 Tools=Tools
+TMenuTools=Tools
 ToolsDesc=All miscellaneous tools not included in other menu entries are collected here.<br /><br />All the tools can be reached in the left menu.
 Birthday=Birthday
 BirthdayDate=Birthday date
@@ -67,14 +68,15 @@ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find her
 PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nYou will find here the shipping __SHIPPINGREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nYou will find here the intervention __FICHINTERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n__PERSONALIZED__\n\n__SIGNATURE__
-DemoDesc=Dolibarr is a compact ERP/CRM supporting several functional modules. A demo showcasing all modules makes no sense as this scenario never occurs. So, several demo profiles are available.
+DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
+ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
 DemoFundation=Manage members of a foundation
 DemoFundation2=Manage members and bank account of a foundation
-DemoCompanyServiceOnly=Manage a freelance activity selling service only
+DemoCompanyServiceOnly=Company or freelance selling service only
 DemoCompanyShopWithCashDesk=Manage a shop with a cash desk
-DemoCompanyProductAndStocks=Manage a small or medium company selling products
-DemoCompanyAll=Manage a small or medium company with multiple activities (all main modules)
+DemoCompanyProductAndStocks=Company selling products with a shop
+DemoCompanyAll=Company with multiple activities (all main modules)
 CreatedBy=Created by %s
 ModifiedBy=Modified by %s
 ValidatedBy=Validated by %s
diff --git a/htdocs/langs/sw_SW/products.lang b/htdocs/langs/sw_SW/products.lang
index 20440eb611b..3a412a5789c 100644
--- a/htdocs/langs/sw_SW/products.lang
+++ b/htdocs/langs/sw_SW/products.lang
@@ -5,6 +5,8 @@ ProductLabelTranslated=Translated product label
 ProductDescriptionTranslated=Translated product description
 ProductNoteTranslated=Translated product note
 ProductServiceCard=Products/Services card
+TMenuProducts=Products
+TMenuServices=Services
 Products=Products
 Services=Services
 Product=Product
@@ -58,7 +60,7 @@ SellingPrice=Selling price
 SellingPriceHT=Selling price (net of tax)
 SellingPriceTTC=Selling price (inc. tax)
 CostPriceDescription=This price (net of tax) can be used to store the average amount this product cost to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
-CostPriceUsage=In a future version, this value could be used for margin calculation.
+CostPriceUsage=This value could be used for margin calculation.
 SoldAmount=Sold amount
 PurchasedAmount=Purchased amount
 NewPrice=New price
@@ -140,6 +142,7 @@ ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b>?
 CloneContentProduct=Clone all main informations of product/service
 ClonePricesProduct=Clone main informations and prices
 CloneCompositionProduct=Clone packaged product/service
+CloneCombinationsProduct=Clone product variants
 ProductIsUsed=This product is used
 NewRefForClone=Ref. of new product/service
 SellingPrices=Selling prices
@@ -236,7 +239,7 @@ GlobalVariables=Global variables
 VariableToUpdate=Variable to update
 GlobalVariableUpdaters=Global variable updaters
 UpdateInterval=Update interval (minutes)
-LastUpdated=Last updated
+LastUpdated=Latest update
 CorrectlyUpdated=Correctly updated
 PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
 PropalMergePdfProductChooseFile=Select PDF files
@@ -256,4 +259,41 @@ VolumeUnits=Volume unit
 SizeUnits=Size unit
 DeleteProductBuyPrice=Delete buying price
 ConfirmDeleteProductBuyPrice=Are you sure you want to delete this buying price?
+SubProduct=Sub product
 
+#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
+ProductCombinations=Variants
+HideProductCombinations=Hide products variant in the products selector
+ProductCombination=Variant
+NewProductCombination=New variant
+EditProductCombination=Editing variant
+ProductCombinationGenerator=Variants generator
+Features=Features
+PriceImpact=Price impact
+WeightImpact=Weight impact
+NewProductAttribute=New attribute
+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
+PercentageVariation=Percentage variation
+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 child products
+ConfirmCloneProductCombinations=Would you like to copy all the product variant to the 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
diff --git a/htdocs/langs/sw_SW/projects.lang b/htdocs/langs/sw_SW/projects.lang
index ecf61d17d36..f9c603ce113 100644
--- a/htdocs/langs/sw_SW/projects.lang
+++ b/htdocs/langs/sw_SW/projects.lang
@@ -29,9 +29,9 @@ DeleteAProject=Delete a project
 DeleteATask=Delete a task
 ConfirmDeleteAProject=Are you sure you want to delete this project?
 ConfirmDeleteATask=Are you sure you want to delete this task?
-OpenedProjects=Open projects
-OpenedTasks=Open tasks
-OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
+OpenedProjects=Opened projects
+OpenedTasks=Opened tasks
+OpportunitiesStatusForOpenedProjects=Opportunities amount of opened projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=Show project
 SetProject=Set project
@@ -47,7 +47,7 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
 TaskTimeDate=Date
-TasksOnOpenedProject=Tasks on open projects
+TasksOnOpenedProject=Tasks on opened projects
 WorkloadNotDefined=Workload not defined
 NewTimeSpent=New time spent
 MyTimeSpent=My time spent
@@ -58,6 +58,7 @@ TaskDateEnd=Task end date
 TaskDescription=Task description
 NewTask=New task
 AddTask=Create task
+AddTimeSpent=Create time spent
 Activity=Activity
 Activities=Tasks/activities
 MyActivities=My tasks/activities
@@ -95,6 +96,7 @@ ValidateProject=Validate projet
 ConfirmValidateProject=Are you sure you want to validate this project?
 CloseAProject=Close project
 ConfirmCloseAProject=Are you sure you want to close this project?
+AlsoCloseAProject=Also close project (keep it open if you still need to follow production tasks on it)
 ReOpenAProject=Open project
 ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=Project contacts
@@ -120,7 +122,7 @@ CloneProjectFiles=Clone project joined files
 CloneTaskFiles=Clone task(s) joined files (if task(s) cloned)
 CloneMoveDate=Update project/tasks dates from now?
 ConfirmCloneProject=Are you sure to clone this project?
-ProjectReportDate=Change task date according project start date
+ProjectReportDate=Change task dates according to new project start date
 ErrorShiftTaskDate=Impossible to shift task date according to new project start date
 ProjectsAndTasksLines=Projects and tasks
 ProjectCreatedInDolibarr=Project %s created
@@ -177,9 +179,9 @@ ProjectsStatistics=Statistics on projects/leads
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 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.
-OpenedProjectsByThirdparties=Open projects by thirdparties
+OpenedProjectsByThirdparties=Opened projects by thirdparties
 OnlyOpportunitiesShort=Only opportunities
-OpenedOpportunitiesShort=Open opportunities
+OpenedOpportunitiesShort=Opened opportunities
 NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount
diff --git a/htdocs/langs/sw_SW/propal.lang b/htdocs/langs/sw_SW/propal.lang
index 52260fe2b4e..a14d25ce779 100644
--- a/htdocs/langs/sw_SW/propal.lang
+++ b/htdocs/langs/sw_SW/propal.lang
@@ -3,7 +3,7 @@ Proposals=Commercial proposals
 Proposal=Commercial proposal
 ProposalShort=Proposal
 ProposalsDraft=Draft commercial proposals
-ProposalsOpened=Open commercial proposals
+ProposalsOpened=Opened commercial proposals
 Prop=Commercial proposals
 CommercialProposal=Commercial proposal
 ProposalCard=Proposal card
@@ -26,9 +26,9 @@ AmountOfProposalsByMonthHT=Amount by month (net of tax)
 NbOfProposals=Number of commercial proposals
 ShowPropal=Show proposal
 PropalsDraft=Drafts
-PropalsOpened=Open
+PropalsOpened=Opened
 PropalStatusDraft=Draft (needs to be validated)
-PropalStatusValidated=Validated (proposal is open)
+PropalStatusValidated=Validated (proposal is opened)
 PropalStatusSigned=Signed (needs billing)
 PropalStatusNotSigned=Not signed (closed)
 PropalStatusBilled=Billed
diff --git a/htdocs/langs/sw_SW/stocks.lang b/htdocs/langs/sw_SW/stocks.lang
index 834fa104098..1db49b8d8dd 100644
--- a/htdocs/langs/sw_SW/stocks.lang
+++ b/htdocs/langs/sw_SW/stocks.lang
@@ -22,13 +22,15 @@ Movements=Movements
 ErrorWarehouseRefRequired=Warehouse reference name is required
 ListOfWarehouses=List of warehouses
 ListOfStockMovements=List of stock movements
+StockMovementForId=Movement ID %d
+ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Warehouses area
 Location=Location
 LocationSummary=Short name location
 NumberOfDifferentProducts=Number of different products
 NumberOfProducts=Total number of products
-LastMovement=Last movement
-LastMovements=Last movements
+LastMovement=Latest movement
+LastMovements=Latest movements
 Units=Units
 Unit=Unit
 StockCorrection=Correct stock
@@ -140,3 +142,4 @@ ProductStockWarehouseCreated=Stock limit for alert and desired optimal stock cor
 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
diff --git a/htdocs/langs/sw_SW/suppliers.lang b/htdocs/langs/sw_SW/suppliers.lang
index 766e4a9bfe9..b890919ace5 100644
--- a/htdocs/langs/sw_SW/suppliers.lang
+++ b/htdocs/langs/sw_SW/suppliers.lang
@@ -24,10 +24,10 @@ ExportDataset_fournisseur_1=Supplier invoices list and invoice lines
 ExportDataset_fournisseur_2=Supplier invoices and payments
 ExportDataset_fournisseur_3=Supplier orders and order lines
 ApproveThisOrder=Approve this order
-ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b> ?
+ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b>?
 DenyingThisOrder=Deny this order
-ConfirmDenyingThisOrder=Are you sure you want to deny this order <b>%s</b> ?
-ConfirmCancelThisOrder=Are you sure you want to cancel this order <b>%s</b> ?
+ConfirmDenyingThisOrder=Are you sure you want to deny this order <b>%s</b>?
+ConfirmCancelThisOrder=Are you sure you want to cancel this order <b>%s</b>?
 AddSupplierOrder=Create supplier order
 AddSupplierInvoice=Create supplier invoice
 ListOfSupplierProductForSupplier=List of products and prices for supplier <b>%s</b>
@@ -41,3 +41,4 @@ DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Wrong quality
 ReputationForThisProduct=Reputation
 BuyerName=Buyer name
+AllProductServicePrices=All product / service prices
diff --git a/htdocs/langs/sw_SW/users.lang b/htdocs/langs/sw_SW/users.lang
index b836db8eb42..a0a1eae8697 100644
--- a/htdocs/langs/sw_SW/users.lang
+++ b/htdocs/langs/sw_SW/users.lang
@@ -36,7 +36,7 @@ AdministratorDesc=Administrator
 DefaultRights=Default permissions
 DefaultRightsDesc=Define here <u>default</u> permissions that are automatically granted to a <u>new created</u> user (Go on user card to change permission of an existing user).
 DolibarrUsers=Dolibarr users
-LastName=Last Name
+LastName=Last name
 FirstName=First name
 ListOfGroups=List of groups
 NewGroup=New group
diff --git a/htdocs/langs/sw_SW/withdrawals.lang b/htdocs/langs/sw_SW/withdrawals.lang
index 6e560a1abb1..a99d890e5f9 100644
--- a/htdocs/langs/sw_SW/withdrawals.lang
+++ b/htdocs/langs/sw_SW/withdrawals.lang
@@ -24,6 +24,7 @@ WithdrawStatistics=Direct debit payment statistics
 WithdrawRejectStatistics=Direct debit payment reject statistics
 LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
+WithdrawRequestsDone=%s direct debit payment requests recorded
 ThirdPartyBankCode=Third party bank code
 NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoice are on companies with a valid BAN.
 ClassCredited=Classify credited
@@ -76,8 +77,8 @@ RUM=UMR
 RUMLong=Unique Mandate Reference
 RUMWillBeGenerated=UMR number will be generated once bank account information are saved
 WithdrawMode=Direct debit mode (FRST or RECUR)
-WithdrawRequestAmount=Withdraw request amount:
-WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil amount.
+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
diff --git a/htdocs/langs/th_TH/accountancy.lang b/htdocs/langs/th_TH/accountancy.lang
index 84ca546f36a..2c7a10cea3e 100644
--- a/htdocs/langs/th_TH/accountancy.lang
+++ b/htdocs/langs/th_TH/accountancy.lang
@@ -194,6 +194,8 @@ ChangeBinding=Change the binding
 
 ## Admin
 ApplyMassCategories=Apply mass categories
+AddAccountFromBookKeepingWithNoCategories=Add acccount already used with no categories
+CategoryDeleted=Category for the accounting account has been removed
 
 ## Export
 Exports=การส่งออก
@@ -209,6 +211,7 @@ Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution
 Modelcsv_quadratus=Export towards Quadratus QuadraCompta
 Modelcsv_ebp=Export towards EBP
 Modelcsv_cogilog=Export towards Cogilog
+ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
 InitAccountancy=Init accountancy
diff --git a/htdocs/langs/th_TH/admin.lang b/htdocs/langs/th_TH/admin.lang
index f1b6eb2175a..c9e8a91c78a 100644
--- a/htdocs/langs/th_TH/admin.lang
+++ b/htdocs/langs/th_TH/admin.lang
@@ -9,14 +9,20 @@ VersionDevelopment=พัฒนาการ
 VersionUnknown=ไม่ทราบ
 VersionRecommanded=แนะนำ
 FileCheck=Files integrity checker
-FileCheckDesc=This tool allows you to check the integrity of files of your application, comparing each files with the official ones. You can use this tool to detect if some files were modified by a hacker for example.
+FileCheckDesc=This tool allows you to check the integrity of files and setup of your application, comparing each files with the official ones. 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.
+FileIntegrityIsStrictlyConformedWithReference=Files integrity is strictly conformed with the reference.
+FileIntegrityIsOkButFilesWereAdded=Files integrity check has passed, however some new files were added.
+FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified, removed or added.
+GlobalChecksum=Global checksum
 MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
 LocalSignature=Embedded local signature (less reliable)
 RemoteSignature=Remote distant signature (more reliable)
 FilesMissing=ไฟล์ที่ขาดหายไป
 FilesUpdated=ไฟล์ล่าสุด
+FilesModified=Modified Files
+FilesAdded=Added Files
 FileCheckDolibarr=Check integrity of application files
-AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from a certified package
+AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from an official package
 XmlNotFound=Xml Integrity File of application not found
 SessionId=ID เซสชั่น
 SessionSaveHandler=จัดการที่จะบันทึกการประชุม
@@ -185,7 +191,9 @@ BoxesDesc=Widgets are components showing some information that you can add to pe
 OnlyActiveElementsAreShown=องค์ประกอบเฉพาะจาก <a href="%s">โมดูลที่เปิดใช้งาน</a> จะแสดง
 ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
-ModulesMarketPlaces=โมดูลอื่น ๆ ...
+ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
+ModulesMarketPlaces=Find external modules...
+GoModuleSetupArea=To deploy/install a new module, go onto the Module setup area at <a href="%s">%s</a>.
 DoliStoreDesc=DoliStore สถานที่อย่างเป็นทางการสำหรับตลาด Dolibarr ERP / CRM โมดูลภายนอก
 DoliPartnersDesc=List of companies providing custom developed modules or features (Note: anyone experienced in PHP programming can provide custom development for an open source project)
 WebSiteDesc=Reference websites to find more modules...
@@ -276,21 +284,22 @@ ModuleFamilyInterface=Interfaces with external systems
 MenuHandlers=รถยกเมนู
 MenuAdmin=แก้ไขเมนู
 DoNotUseInProduction=อย่าใช้ในการผลิต
-ThisIsProcessToFollow=นี่คือการตั้งค่าที่จะดำเนินการ:
-ThisIsAlternativeProcessToFollow=นี่คือทางเลือกในการติดตั้งกระบวนการ:
+ThisIsProcessToFollow=This is steps to process:
+ThisIsAlternativeProcessToFollow=This is an alternative setup to process manually:
 StepNb=ขั้นตอนที่% s
 FindPackageFromWebSite=หาแพคเกจที่มีคุณลักษณะที่คุณต้องการ (ตัวอย่างเช่นในเว็บไซต์อย่างเป็นทางการของ% s)
 DownloadPackageFromWebSite=แพคเกจการดาวน์โหลด (เช่นจากเว็บไซต์อย่างเป็นทางการ% s)
-UnpackPackageInDolibarrRoot=แฟ้มแพคเกจแกะลงในไดเรกทอรีเซิร์ฟเวอร์ Dolibarr <b>ทุ่มเทให้กับโมดูลภายนอก:% s</b>
-SetupIsReadyForUse=ติดตั้งเสร็จสิ้นแล้วและ Dolibarr พร้อมที่จะใช้กับองค์ประกอบใหม่นี้
-NotExistsDirect=ไดเรกทอรีรากทางเลือกที่ไม่ได้กำหนดไว้ <br>
-InfDirAlt=ตั้งแต่รุ่นที่ 3 ก็เป็นไปได้ที่จะกำหนด directory.This รากทางเลือกที่ช่วยให้คุณสามารถจัดเก็บสถานที่เดียวกันปลั๊กอินและแม่แบบกำหนดเอง <br> เพียงแค่สร้างไดเรกทอรีที่รากของ Dolibarr (เช่นที่กำหนดเอง) <br>
-InfDirExample=<br> จากนั้นประกาศใน conf.php ไฟล์ <br> $ dolibarr_main_url_root_alt = 'http: // myserver / กำหนดเอง' <br> $ dolibarr_main_document_root_alt = '/ เส้นทาง / ของ / dolibarr / htdocs / กำหนดเอง' <br> * เส้นเหล่านี้จะให้ความเห็นกับ "#" เพื่อ uncomment ลบตัวอักษร
+UnpackPackageInDolibarrRoot=Unpack the packaged files into server directory dedicated to Dolibarr: <b>%s</b>
+UnpackPackageInModulesRoot=To deploy/install an external module, unpack the packaged files into the server directory dedicated to modules: <b>%s</b>
+SetupIsReadyForUse=Module deployment is finished. You must however enable and setup the module in your application by going on the page to setup modules: <a href="%s">%s</a>.
+NotExistsDirect=The alternative root directory is not defined to an existing directory.<br>
+InfDirAlt=Since version 3, it is possible to define an alternative root directory. This allows you to store, into a dedicated directory, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
+InfDirExample=<br>Then declare it in the file <strong>conf.php</strong><br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>If these lines are commented with "#", to enable them, just uncomment by removing the "#" character.
 YouCanSubmitFile=สำหรับขั้นตอนนี้คุณสามารถส่งแพคเกจการใช้เครื่องมือนี้: เลือกไฟล์โมดูล
 CurrentVersion=รุ่นปัจจุบัน Dolibarr
 CallUpdatePage=Go to the page that updates the database structure and data: %s.
 LastStableVersion=Latest stable version
-LastActivationDate=Last activation date
+LastActivationDate=Latest activation date
 UpdateServerOffline=เซิร์ฟเวอร์การอัพเดทออฟไลน์
 GenericMaskCodes=คุณอาจป้อนหน้ากากเลขใด ๆ ในหน้ากากนี้แท็กต่อไปนี้สามารถนำมาใช้: <br> <b>{000000}</b> สอดคล้องกับจำนวนที่จะเพิ่มขึ้นในแต่ละ% s ใส่เลขศูนย์เป็นจำนวนมากตามความยาวที่ต้องการของเคาน์เตอร์ เคาน์เตอร์จะแล้วเสร็จภายในศูนย์จากซ้ายเพื่อให้มีศูนย์มากที่สุดเท่าที่เป็นหน้ากาก <br> <b>{000000} + 000</b> เช่นเดียวกับก่อนหน้านี้ แต่ชดเชยที่สอดคล้องกับจำนวนที่อยู่ทางขวาของเครื่องหมาย + ถูกนำไปใช้ในการเริ่มต้นครั้งแรก% <br> <b>{000000 @ x}</b> เดียวกับก่อนหน้านี้ แต่นับตั้งค่าใหม่เป็นศูนย์เมื่อเดือน x ถึง (x ระหว่างวันที่ 1 และ 12 หรือ 0 จะใช้เดือนแรกของปีงบประมาณที่กำหนดไว้ในการกำหนดค่าของคุณหรือ 99 เพื่อตั้งค่าให้เป็นศูนย์ทุกเดือน ) ถ้าตัวเลือกนี้ถูกนำมาใช้และ x 2 หรือสูงกว่านั้นลำดับ {yy} {} มิลลิเมตรหรือปปปป {} {} มิลลิเมตรจะต้องมี <br> <b>{} วววัน</b> (01-31) <br> <b>{} มิลลิเมตรเดือน</b> (01-12) <br> <b>yy {}, {} หรือปปปป {y}</b> มากกว่าปีที่ 2, 4 หรือ 1 หมายเลข <br>
 GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
@@ -373,11 +382,11 @@ ExtrafieldCheckBox=ช่องทำเครื่องหมาย
 ExtrafieldRadio=ปุ่ม
 ExtrafieldCheckBoxFromList= Checkbox จากตาราง
 ExtrafieldLink=เชื่อมโยงไปยังวัตถุ
-ExtrafieldParamHelpselect=รายการพารามิเตอร์จะต้องเป็นเหมือนกุญแจสำคัญค่า <br><br> ตัวอย่างเช่น: <br> 1 ค่า 1 <br> 2 value2 <br> 3 value3 <br> ... <br><br> เพื่อที่จะมีรายชื่อขึ้นอยู่กับอื่น: <br> 1 ค่า 1 | parent_list_code: parent_key <br> 2 value2 | parent_list_code: parent_key
+ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list :<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list :<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=รายการพารามิเตอร์จะต้องเป็นเหมือนกุญแจสำคัญค่า <br><br> ตัวอย่างเช่น: <br> 1 ค่า 1 <br> 2 value2 <br> 3 value3 <br> ...
 ExtrafieldParamHelpradio=รายการพารามิเตอร์จะต้องเป็นเหมือนกุญแจสำคัญค่า <br><br> ตัวอย่างเช่น: <br> 1 ค่า 1 <br> 2 value2 <br> 3 value3 <br> ...
-ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
-ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
+ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Example : Societe:societe/class/societe.class.php
 LibraryToBuildPDF=Library used for PDF generation
 WarningUsingFPDF=คำเตือน: <b>conf.php</b> ของคุณมี <b>dolibarr_pdf_force_fpdf</b> สั่ง <b>=</b> 1 ซึ่งหมายความว่าคุณใช้ห้องสมุด FPDF ในการสร้างไฟล์ PDF ห้องสมุดนี้จะเก่าและไม่สนับสนุนจำนวนมากของคุณสมบัติ (Unicode โปร่งใสภาพ Cyrillic ภาษาอาหรับและเอเซีย, ... ) ดังนั้นคุณอาจพบข้อผิดพลาดระหว่างการสร้างรูปแบบไฟล์ PDF <br> เพื่อแก้ปัญหานี้และมีการสนับสนุนอย่างเต็มที่จากการสร้างรูปแบบไฟล์ PDF โปรดดาวน์โหลด <a href="http://www.tcpdf.org/" target="_blank">ห้องสมุด TCPDF</a> แล้วแสดงความคิดเห็นหรือลบบรรทัด <b>$ dolibarr_pdf_force_fpdf = 1</b> และเพิ่มแทน <b>$ dolibarr_lib_TCPDF_PATH = 'path_to_TCPDF_dir'</b>
@@ -411,10 +420,11 @@ ModuleCompanyCodePanicum=กลับรหัสบัญชีที่ว่
 ModuleCompanyCodeDigitaria=รหัสบัญชีรหัสขึ้นอยู่กับบุคคลที่สาม รหัสประกอบด้วยตัวอักษร "C" ในตำแหน่งแรกตามด้วย 5 ตัวอักษรแรกของรหัสของบุคคลที่สาม
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
-
+WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<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).
+ClickToShowDescription=Click to show description
 # Modules
 Module0Name=และกลุ่มผู้ใช้
-Module0Desc=ผู้ใช้และกลุ่มการจัดการ
+Module0Desc=Users / Employees and Groups management
 Module1Name=บุคคลที่สาม
 Module1Desc=บริษัท และการจัดการรายชื่อผู้ติดต่อ (ลูกค้ากลุ่มเป้าหมาย ... )
 Module2Name=เชิงพาณิชย์
@@ -515,8 +525,8 @@ Module2200Name=ราคาแบบไดนามิก
 Module2200Desc=เปิดใช้งานการใช้งานของการแสดงออกทางคณิตศาสตร์สำหรับราคา
 Module2300Name=Cron
 Module2300Desc=การจัดการงานตามเวลาที่กำหนด
-Module2400Name=Agenda/Events
-Module2400Desc=Follow events or rendez-vous. Record manual events into Agendas or let application logs automatic events for tracking purposes.
+Module2400Name=Events/Agenda
+Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous.
 Module2500Name=การจัดการเนื้อหาอิเล็กทรอนิกส์
 Module2500Desc=บันทึกและแบ่งปันเอกสาร
 Module2600Name=API/Web services (SOAP server)
@@ -582,7 +592,7 @@ Permission34=ลบผลิตภัณฑ์
 Permission36=ดู / จัดการผลิตภัณฑ์ที่ซ่อน
 Permission38=สินค้าส่งออก
 Permission41=อ่านโครงการและงาน (โครงการและโครงการที่ใช้ร่วมกันฉันติดต่อ) นอกจากนี้ยังสามารถใส่เวลาที่ใช้ในงานที่ได้รับมอบหมาย (timesheet)
-Permission42=สร้าง / แก้ไขโครงการ (โครงการและโครงการที่ใช้ร่วมกันฉันติดต่อ)
+Permission42=Create/modify projects (shared project and projects i'm contact for). Can also create tasks and assign users to project and tasks
 Permission44=ลบโครงการ (โครงการและโครงการที่ใช้ร่วมกันฉันติดต่อ)
 Permission45=Export projects
 Permission61=อ่านการแทรกแซง
@@ -685,7 +695,7 @@ PermissionAdvanced253=สร้าง / แก้ไขผู้ใช้ภา
 Permission254=สร้าง / แก้ไขผู้ใช้ภายนอกเท่านั้น
 Permission255=แก้ไขรหัสผ่านผู้ใช้อื่น ๆ
 Permission256=ลบหรือปิดการใช้งานผู้ใช้อื่น ๆ
-Permission262=ขยายการเข้าถึงบุคคลที่สามทั้งหมด (ไม่เพียง แต่ผู้ที่เชื่อมโยงกับผู้ใช้) ที่มีประสิทธิภาพไม่ได้สำหรับผู้ใช้ภายนอก (จำกัด เสมอกับตัวเอง)
+Permission262=Extend access to all third parties (not only third parties that user is a sale representative).<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 assignement matters).
 Permission271=อ่าน CA
 Permission272=อ่านใบแจ้งหนี้
 Permission273=ใบแจ้งหนี้ฉบับ
@@ -887,7 +897,7 @@ Offset=สาขา
 AlwaysActive=ใช้งานอยู่เสมอ
 Upgrade=อัพเกรด
 MenuUpgrade=อัพเกรด / ขยาย
-AddExtensionThemeModuleOrOther=เพิ่มส่วนขยาย (ชุดรูปแบบโมดูล, ... )
+AddExtensionThemeModuleOrOther=Deploy/install external module
 WebServer=เว็บเซิร์ฟเวอร์
 DocumentRootServer=ไดเรกทอรีรากของเว็บเซิร์ฟเวอร์
 DataRootServer=ไดเรกทอรีไฟล์ข้อมูล
@@ -994,7 +1004,7 @@ TriggerAlwaysActive=ทริกเกอร์ในแฟ้มนี้มี
 TriggerActiveAsModuleActive=<b>ทริกเกอร์ในแฟ้มนี้มีการใช้งานเป็นโมดูล% s</b> ถูกเปิดใช้งาน
 GeneratedPasswordDesc=กำหนดกฎที่นี่ที่คุณต้องการที่จะใช้ในการสร้างรหัสผ่านใหม่ถ้าคุณขอให้มีรหัสผ่านที่สร้างอัตโนมัติ
 DictionaryDesc=Insert all reference data. You can add your values to the default.
-ConstDesc=This page allows you to edit all other parameters not available in previous pages. These are mostly reserved parameters for developers or advanced troubleshooting.
+ConstDesc=This page allows you to edit all other parameters not available in previous pages. These are mostly reserved parameters for developers or advanced troubleshooting. For a list of options <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">check here</a>.
 MiscellaneousDesc=All other security related parameters are defined here.
 LimitsSetup=ข้อ จำกัด / การตั้งค่าความแม่นยำ
 LimitsDesc=คุณสามารถกำหนดวงเงินแม่นยำและ optimisations ใช้โดย Dolibarr ที่นี่
@@ -1161,10 +1171,6 @@ FreeLegalTextOnOrders=ข้อความฟรีเมื่อสั่ง
 WatermarkOnDraftOrders=ลายน้ำในการสั่งซื้อร่าง (ไม่มีถ้าว่างเปล่า)
 ShippableOrderIconInList=ไอคอนเพิ่มในรายการสั่งซื้อที่แสดงถ้าสั่งเป็น shippable
 BANK_ASK_PAYMENT_BANK_DURING_ORDER=ขอบัญชีธนาคารปลายทางของการสั่งซื้อ
-##### Clicktodial #####
-ClickToDialSetup=คลิกเพื่อกดติดตั้งโมดูล
-ClickToDialUrlDesc=url ที่เรียกว่าเมื่อการคลิกที่ picto โทรศัพท์จะทำ ใน URL คุณสามารถใช้แท็ก <br> <b>__PHONETO__</b> ที่จะถูกแทนที่ด้วยหมายเลขโทรศัพท์ของบุคคลที่จะเรียก <br> <b>__PHONEFROM__</b> ที่จะถูกแทนที่ด้วยหมายเลขโทรศัพท์ของบุคคลที่โทร (คุณ) <br> <b>__LOGIN__</b> ที่จะถูกแทนที่ด้วยการเข้าสู่ระบบของคุณ clicktodial (ตามที่กำหนดในบัตรผู้ใช้ของคุณ) <br> <b>__PASS__</b> ที่จะถูกแทนที่ด้วยรหัสผ่าน clicktodial คุณ (ที่กำหนดไว้ในบัตรผู้ใช้ของคุณ)
-##### Bookmark4u #####
 ##### Interventions #####
 InterventionsSetup=การแทรกแซงการติดตั้งโมดูล
 FreeLegalTextOnInterventions=ข้อความฟรีเกี่ยวกับเอกสารการแทรกแซง
@@ -1391,7 +1397,7 @@ SendingsSetup=ส่งติดตั้งโมดูล
 SendingsReceiptModel=รูปแบบการส่งใบเสร็จรับเงิน
 SendingsNumberingModules=sendings โมดูลจำนวน
 SendingsAbility=Support shipping sheets for customer deliveries
-NoNeedForDeliveryReceipts=ในกรณีส่วนใหญ่ตอบรับใบเสร็จรับเงินที่มีการใช้ทั้งสองเป็นแผ่นสำหรับการส่งมอบลูกค้า (รายชื่อของผลิตภัณฑ์ที่จะส่ง) และแผ่นที่ recevied และลงนามโดยลูกค้า ดังนั้นใบเสร็จรับเงินการส่งมอบผลิตภัณฑ์ที่มีคุณลักษณะที่ซ้ำกันและมีการเปิดใช้งานไม่ค่อย
+NoNeedForDeliveryReceipts=In most cases, shipping sheets are used both as sheets for customer deliveries (list of products to send) and sheets that is received and signed by customer. So product deliveries receipts is a duplicated feature and is rarely activated.
 FreeLegalTextOnShippings=ข้อความฟรีในการจัดส่ง
 ##### Deliveries #####
 DeliveryOrderNumberingModules=สินค้าที่ได้รับการส่งมอบโมดูลหมายเลข
@@ -1471,7 +1477,11 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Set automatically this default value for type of e
 AGENDA_DEFAULT_FILTER_TYPE=ตั้งค่าโดยอัตโนมัติประเภทของเหตุการณ์นี้ในการกรองการค้นหาในมุมมองของวาระการประชุม
 AGENDA_DEFAULT_FILTER_STATUS=ตั้งค่าโดยอัตโนมัติสถานะสำหรับการจัดกิจกรรมนี้ในการกรองการค้นหาในมุมมองของวาระการประชุม
 AGENDA_DEFAULT_VIEW=ซึ่งแท็บที่คุณต้องการที่จะเปิดตามค่าเริ่มต้นเมื่อมีการเลือกวาระที่เมนู
-##### ClickToDial #####
+AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
+AGENDA_NOTIFICATION_SOUND=Enable sound notification
+##### Clicktodial #####
+ClickToDialSetup=คลิกเพื่อกดติดตั้งโมดูล
+ClickToDialUrlDesc=url ที่เรียกว่าเมื่อการคลิกที่ picto โทรศัพท์จะทำ ใน URL คุณสามารถใช้แท็ก <br> <b>__PHONETO__</b> ที่จะถูกแทนที่ด้วยหมายเลขโทรศัพท์ของบุคคลที่จะเรียก <br> <b>__PHONEFROM__</b> ที่จะถูกแทนที่ด้วยหมายเลขโทรศัพท์ของบุคคลที่โทร (คุณ) <br> <b>__LOGIN__</b> ที่จะถูกแทนที่ด้วยการเข้าสู่ระบบของคุณ clicktodial (ตามที่กำหนดในบัตรผู้ใช้ของคุณ) <br> <b>__PASS__</b> ที่จะถูกแทนที่ด้วยรหัสผ่าน clicktodial คุณ (ที่กำหนดไว้ในบัตรผู้ใช้ของคุณ)
 ClickToDialDesc=This module allows to make phone numbers clickable. A click on this icon will call make your phone to 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.
 ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
 ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on same computer than the browser, and called when you click on a link in your browser that start 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.
@@ -1499,10 +1509,11 @@ EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint availa
 ##### API ####
 ApiSetup=API การติดตั้งโมดูล
 ApiDesc=โดยการเปิดใช้โมดูลนี้ Dolibarr กลายเป็นเซิร์ฟเวอร์ REST เพื่อให้บริการเว็บอื่น ๆ
-ApiProductionMode=Enable production mode (this will activate use of a caches for services management)
+ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
 ApiExporerIs=You can explore the APIs at url
 OnlyActiveElementsAreExposed=องค์ประกอบเฉพาะจากโมดูลมีการเปิดใช้งาน
 ApiKey=ที่สำคัญสำหรับ API
+WarningAPIExplorerDisabled=The API explorer has been disabled. API explorer is not required to provide API services. It is a tool for developer to find/test REST APIs. If you need this tool, go into setup of module API REST to activate it.
 ##### Bank #####
 BankSetupModule=ธนาคารติดตั้งโมดูล
 FreeLegalTextOnChequeReceipts=ข้อความฟรีในการตรวจสอบใบเสร็จรับเงิน
@@ -1571,7 +1582,7 @@ BackupDumpWizard=ตัวช่วยสร้างการสร้างแ
 SomethingMakeInstallFromWebNotPossible=การติดตั้งโมดูลภายนอกเป็นไปไม่ได้จากอินเตอร์เฟซเว็บด้วยเหตุผลต่อไปนี้:
 SomethingMakeInstallFromWebNotPossible2=ด้วยเหตุนี้กระบวนการอัพเกรดอธิบายไว้ที่นี่เป็นเพียงไม่กี่ก้าวคู่มือผู้ใช้สิทธิพิเศษที่สามารถทำ
 InstallModuleFromWebHasBeenDisabledByFile=ติดตั้งโมดูลภายนอกจากโปรแกรมที่ได้รับการปิดใช้งานโดยผู้ดูแลระบบ <strong>คุณต้องขอให้เขาลบไฟล์% s</strong> เพื่อให้คุณลักษณะนี้
-ConfFileMuseContainCustom=Installing an external module from application save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to have option<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
+ConfFileMuseContainCustom=Installing an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=เน้นเส้นตารางเมื่อเลื่อนเมาส์ผ่านไป
 HighlightLinesColor=Highlight color of the line when the mouse passes over (keep empty for no highlight)
 TextTitleColor=Color of page title
@@ -1601,6 +1612,7 @@ FixTZ=แก้ไขเขตเวลา
 FillFixTZOnlyIfRequired=Example: +2 (fill only if problem experienced)
 ExpectedChecksum=Expected Checksum
 CurrentChecksum=Current Checksum
+ForcedConstants=Required constant values
 MailToSendProposal=ที่จะส่งข้อเสนอของลูกค้า
 MailToSendOrder=ในการส่งคำสั่งของลูกค้า
 MailToSendInvoice=ในการส่งใบแจ้งหนี้ลูกค้า
@@ -1609,13 +1621,14 @@ MailToSendIntervention=ในการส่งการแทรกแซง
 MailToSendSupplierRequestForQuotation=ในการส่งคำขอใบเสนอราคาในการจัดจำหน่าย
 MailToSendSupplierOrder=ในการส่งคำสั่งผู้จัดจำหน่าย
 MailToSendSupplierInvoice=ในการส่งใบแจ้งหนี้จัดจำหน่าย
+MailToSendContract=To send a contract
 MailToThirdparty=To send email from third party page
 ByDefaultInList=Show by default on list view
-YouUseLastStableVersion=You use the last stable version
+YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
 TitleExampleForMaintenanceRelease=Example of message you can use to announce this maintenance release (feel free to use it on your web sites)
-ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. You can download it from the download area of http://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.
-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, nor data structure change is present into this version. You can download it from the download area of http://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.
+ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. 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.
+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, nor data structure change is present into 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, you can enter here rule to have price for each level autocalculated according to price of first level, so you will have to enter only price for first level on each product. This page is here to save you time and can be usefull only if your prices for each leve are relative to first level. You can ignore this page in most cases.
 ModelModulesProduct=Templates for product documents
 ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
diff --git a/htdocs/langs/th_TH/banks.lang b/htdocs/langs/th_TH/banks.lang
index 0dd76499370..3828dc011a5 100644
--- a/htdocs/langs/th_TH/banks.lang
+++ b/htdocs/langs/th_TH/banks.lang
@@ -74,13 +74,13 @@ Conciliate=คืนดี
 Conciliation=การประนีประนอม
 ReconciliationLate=Reconciliation late
 IncludeClosedAccount=รวมบัญชีปิด
-OnlyOpenedAccount=เปิดเฉพาะบัญชี
+OnlyOpenedAccount=Only opened accounts
 AccountToCredit=บัญชีเครดิต
 AccountToDebit=บัญชีเดบิต
 DisableConciliation=ปิดใช้งานคุณลักษณะการปรองดองสำหรับบัญชีนี้
 ConciliationDisabled=คุณลักษณะสมานฉันท์ปิดการใช้งาน
 LinkedToAConciliatedTransaction=Linked to a conciliated entry
-StatusAccountOpened=เปิด
+StatusAccountOpened=Opened
 StatusAccountClosed=ปิด
 AccountIdShort=จำนวน
 LineRecord=การซื้อขาย
diff --git a/htdocs/langs/th_TH/bills.lang b/htdocs/langs/th_TH/bills.lang
index c9dbb4b242b..d9596808d70 100644
--- a/htdocs/langs/th_TH/bills.lang
+++ b/htdocs/langs/th_TH/bills.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - bills
 Bill=ใบกำกับสินค้า
 Bills=ใบแจ้งหนี้
-BillsCustomers=ใบแจ้งหนี้ลูกค้า
-BillsCustomer=ใบแจ้งหนี้ลูกค้า
-BillsSuppliers=ซัพพลายเออร์ใบแจ้งหนี้
-BillsCustomersUnpaid=ใบแจ้งหนี้ค้างชำระของลูกค้า
-BillsCustomersUnpaidForCompany=ใบแจ้งหนี้ของลูกค้าที่ค้างชำระสำหรับ% s
-BillsSuppliersUnpaid=ใบแจ้งหนี้ค้างชำระของซัพพลายเออร์
-BillsSuppliersUnpaidForCompany=ใบแจ้งหนี้ค้างชำระของซัพพลายเออร์สำหรับ% s
+BillsCustomers=Customer invoices
+BillsCustomer=ใบแจ้งหนี้ของลูกค้า
+BillsSuppliers=Supplier invoices
+BillsCustomersUnpaid=ใบแจ้งหนี้ของลูกค้าที่ค้างชำระ
+BillsCustomersUnpaidForCompany=Unpaid customer invoices for %s
+BillsSuppliersUnpaid=ใบแจ้งหนี้ที่ค้างชำระผู้จัดจำหน่าย
+BillsSuppliersUnpaidForCompany=Unpaid supplier invoices for %s
 BillsLate=การชำระเงินล่าช้า
 BillsStatistics=สถิติใบแจ้งหนี้ลูกค้า
 BillsStatisticsSuppliers=สถิติใบแจ้งหนี้ซัพพลายเออร์
@@ -62,8 +62,8 @@ PaymentsBack=การชำระเงินกลับ
 paymentInInvoiceCurrency=in invoices currency
 PaidBack=จ่ายคืน
 DeletePayment=ลบการชำระเงิน
-ConfirmDeletePayment=Are you sure you want to delete this payment?
-ConfirmConvertToReduc=Do you want to convert this credit note or deposit 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.
+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.
 SupplierPayments=การชำระเงินที่ผู้ซื้อผู้ขาย
 ReceivedPayments=การชำระเงินที่ได้รับ
 ReceivedCustomersPayments=การชำระเงินที่ได้รับจากลูกค้า
@@ -78,6 +78,7 @@ PaymentMode=ประเภทการชำระเงิน
 PaymentTypeDC=Debit/Credit Card
 PaymentTypePP=PayPal
 IdPaymentMode=Payment type (id)
+CodePaymentMode=Payment type (code)
 LabelPaymentMode=Payment type (label)
 PaymentModeShort=ประเภทการชำระเงิน
 PaymentTerm=เงื่อนไขการชำระเงิน
@@ -102,9 +103,10 @@ SearchACustomerInvoice=ค้นหาใบแจ้งหนี้ลูกค
 SearchASupplierInvoice=ค้นหาผู้จัดจำหน่ายใบแจ้งหนี้
 CancelBill=ยกเลิกใบแจ้งหนี้
 SendRemindByMail=ส่งการแจ้งเตือนทางอีเมล
-DoPayment=การชำระเงินทำ
-DoPaymentBack=ทำการชำระเงินกลับ
+DoPayment=Enter payment
+DoPaymentBack=Enter refund
 ConvertToReduc=แปลงเป็นส่วนลดในอนาคต
+ConvertExcessReceivedToReduc=Convert excess received into future discount
 EnterPaymentReceivedFromCustomer=ป้อนการชำระเงินที่ได้รับจากลูกค้า
 EnterPaymentDueToCustomer=ชำระเงินเนื่องจากลูกค้า
 DisabledBecauseRemainderToPayIsZero=ปิดใช้งานเนื่องจากค้างชำระที่เหลือเป็นศูนย์
@@ -113,22 +115,24 @@ BillStatus=สถานะใบแจ้งหนี้
 StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=ร่าง (จะต้องมีการตรวจสอบ)
 BillStatusPaid=ต้องจ่าย
-BillStatusPaidBackOrConverted=การชำระเงินหรือแปลงเป็นส่วนลด
+BillStatusPaidBackOrConverted=Refund or converted into discount
 BillStatusConverted=การชำระเงิน (พร้อมสำหรับใบแจ้งหนี้สุดท้าย)
 BillStatusCanceled=ถูกปล่อยปละละเลย
 BillStatusValidated=การตรวจสอบ (จะต้องมีการจ่าย)
 BillStatusStarted=เริ่มต้น
 BillStatusNotPaid=จ่ายเงินไม่ได้
+BillStatusNotRefunded=Not refunded
 BillStatusClosedUnpaid=ปิดให้บริการ (ค้างชำระ)
 BillStatusClosedPaidPartially=การชำระเงิน (บางส่วน)
 BillShortStatusDraft=ร่าง
 BillShortStatusPaid=ต้องจ่าย
-BillShortStatusPaidBackOrConverted=การประมวลผล
+BillShortStatusPaidBackOrConverted=Refund or converted
 BillShortStatusConverted=การประมวลผล
 BillShortStatusCanceled=ถูกปล่อยปละละเลย
 BillShortStatusValidated=ผ่านการตรวจสอบ
 BillShortStatusStarted=เริ่มต้น
 BillShortStatusNotPaid=จ่ายเงินไม่ได้
+BillShortStatusNotRefunded=Not refunded
 BillShortStatusClosedUnpaid=ปิด
 BillShortStatusClosedPaidPartially=การชำระเงิน (บางส่วน)
 PaymentStatusToValidShort=ในการตรวจสอบ
@@ -149,14 +153,14 @@ NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified
 FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
 NotARecurringInvoiceTemplate=Not a recurring template invoice
 NewBill=ใบแจ้งหนี้ใหม่
-LastBills=ใบแจ้งหนี้% s ล่าสุด
-LastCustomersBills=% ล่าสุดของใบแจ้งหนี้ลูกค้า
-LastSuppliersBills=% ล่าสุดของซัพพลายเออร์ใบแจ้งหนี้
+LastBills=Latest %s invoices
+LastCustomersBills=Latest %s customer invoices
+LastSuppliersBills=Latest %s supplier invoices
 AllBills=ใบแจ้งหนี้ทั้งหมด
 OtherBills=ใบแจ้งหนี้อื่น ๆ
 DraftBills=ใบแจ้งหนี้ร่าง
-CustomersDraftInvoices=ลูกค้าร่างใบแจ้งหนี้
-SuppliersDraftInvoices=ซัพพลายเออร์ร่างใบแจ้งหนี้
+CustomersDraftInvoices=Customer draft invoices
+SuppliersDraftInvoices=Supplier draft invoices
 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>?
@@ -203,7 +207,7 @@ AlreadyPaidNoCreditNotesNoDeposits=จ่ายเงินไปแล้ว (
 Abandoned=ถูกปล่อยปละละเลย
 RemainderToPay=ที่เหลือยังไม่ได้ชำระ
 RemainderToTake=เงินส่วนที่เหลือจะใช้
-RemainderToPayBack=เงินส่วนที่เหลือจะจ่ายคืน
+RemainderToPayBack=Remaining amount to refund
 Rest=ที่รอดำเนินการ
 AmountExpected=จำนวนเงินที่อ้างว่า
 ExcessReceived=ส่วนเกินที่ได้รับ
@@ -270,6 +274,7 @@ Deposit=เงินฝาก
 Deposits=เงินฝาก
 DiscountFromCreditNote=ส่วนลดจากใบลดหนี้% s
 DiscountFromDeposit=การชำระเงินจากใบแจ้งหนี้เงินฝาก% s
+DiscountFromExcessReceived=Payments from excess received of invoice %s
 AbsoluteDiscountUse=ชนิดของเครดิตนี้สามารถใช้ในใบแจ้งหนี้ก่อนการตรวจสอบของ
 CreditNoteDepositUse=Invoice must be validated to use this kind of credits
 NewGlobalDiscount=ส่วนลดใหม่แน่นอน
@@ -277,8 +282,8 @@ NewRelativeDiscount=ส่วนลดญาติใหม่
 NoteReason=หมายเหตุ / เหตุผล
 ReasonDiscount=เหตุผล
 DiscountOfferedBy=ที่ได้รับจาก
-DiscountStillRemaining=ส่วนลดที่ยังเหลืออยู่
-DiscountAlreadyCounted=นับส่วนลดแล้ว
+DiscountStillRemaining=Discounts available
+DiscountAlreadyCounted=Discounts already consumed
 BillAddress=ที่อยู่บิล
 HelpEscompte=ส่วนลดนี้จะได้รับส่วนลดพิเศษให้กับลูกค้าเนื่องจากการชำระเงินที่ถูกสร้างขึ้นมาก่อนวาระ
 HelpAbandonBadCustomer=เงินจำนวนนี้ถูกทิ้งร้าง (ลูกค้าบอกว่าจะเป็นลูกค้าที่ไม่ดี) และถือเป็นหลวมพิเศษ
@@ -331,10 +336,12 @@ 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
 # PaymentConditions
 Statut=สถานะ
-PaymentConditionShortRECEP=ทันทีทันใด
-PaymentConditionRECEP=ทันทีทันใด
+PaymentConditionShortRECEP=Due Upon Receipt
+PaymentConditionRECEP=Due Upon Receipt
 PaymentConditionShort30D=30 วัน
 PaymentCondition30D=30 วัน
 PaymentConditionShort30DENDMONTH=30 days of month-end
@@ -349,6 +356,14 @@ 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
 FixAmount=จำนวนการแก้ไข
 VarAmount=ปริมาณ (ทีโอที %%.)
 # PaymentType
@@ -418,7 +433,7 @@ ChequeDeposits=การตรวจสอบเงินฝาก
 Cheques=การตรวจสอบ
 DepositId=Id deposit
 NbCheque=Number of checks
-CreditNoteConvertedIntoDiscount=ใบลดหนี้ใบแจ้งหนี้หรือเงินฝากที่ได้รับการแปลงเป็น% s
+CreditNoteConvertedIntoDiscount=This %s has been converted into %s
 UsBillingContactAsIncoiveRecipientIfExist=ใช้ที่อยู่ติดต่อการเรียกเก็บเงินลูกค้าแทนการอยู่ของบุคคลที่สามในฐานะผู้รับใบแจ้งหนี้
 ShowUnpaidAll=แสดงใบแจ้งหนี้ที่ค้างชำระทั้งหมด
 ShowUnpaidLateOnly=แสดงใบแจ้งหนี้ที่ค้างชำระปลายเท่านั้น
diff --git a/htdocs/langs/th_TH/boxes.lang b/htdocs/langs/th_TH/boxes.lang
index 33dc0e6ce39..a69f2a13819 100644
--- a/htdocs/langs/th_TH/boxes.lang
+++ b/htdocs/langs/th_TH/boxes.lang
@@ -25,8 +25,8 @@ BoxTitleLastSuppliers=Latest %s recorded suppliers
 BoxTitleLastModifiedSuppliers=Latest %s modified suppliers
 BoxTitleLastModifiedCustomers=Latest %s modified customers
 BoxTitleLastCustomersOrProspects=Latest %s customers or prospects
-BoxTitleLastCustomerBills=Latest %s customer's invoices
-BoxTitleLastSupplierBills=Latest %s supplier's invoices
+BoxTitleLastCustomerBills=Latest %s customer invoices
+BoxTitleLastSupplierBills=Latest %s supplier invoices
 BoxTitleLastModifiedProspects=Latest %s modified prospects
 BoxTitleLastModifiedMembers=Latest %s members
 BoxTitleLastFicheInter=Latest %s modified interventions
@@ -51,12 +51,12 @@ ClickToAdd=คลิกที่นี่เพื่อเพิ่ม
 NoRecordedCustomers=ไม่มีลูกค้าที่บันทึกไว้
 NoRecordedContacts=ไม่มีรายชื่อที่บันทึกไว้
 NoActionsToDo=ไม่มีการดำเนินการที่จะทำ
-NoRecordedOrders=ไม่มีการสั่งซื้อของลูกค้าที่บันทึกไว้ของ
+NoRecordedOrders=No recorded customer orders
 NoRecordedProposals=ไม่มีข้อเสนอที่บันทึกไว้
-NoRecordedInvoices=ไม่มีใบแจ้งหนี้ของลูกค้าที่บันทึกไว้
-NoUnpaidCustomerBills=ไม่มีใบแจ้งหนี้ที่ค้างชำระของลูกค้า
-NoUnpaidSupplierBills=ใบแจ้งหนี้ที่ค้างชำระไม่มีผู้จัดจำหน่ายของ
-NoModifiedSupplierBills=ไม่มีใบแจ้งหนี้ของผู้จัดจำหน่ายที่บันทึกไว้
+NoRecordedInvoices=No recorded customer invoices
+NoUnpaidCustomerBills=No unpaid customer invoices
+NoUnpaidSupplierBills=No unpaid supplier invoices
+NoModifiedSupplierBills=No recorded supplier invoices
 NoRecordedProducts=ไม่มีสินค้าบันทึก / บริการ
 NoRecordedProspects=ไม่มีโอกาสที่บันทึกไว้
 NoContractedProducts=ผลิตภัณฑ์ / บริการไม่มีการทำสัญญา
diff --git a/htdocs/langs/th_TH/companies.lang b/htdocs/langs/th_TH/companies.lang
index 5cb62860c6b..84838772af3 100644
--- a/htdocs/langs/th_TH/companies.lang
+++ b/htdocs/langs/th_TH/companies.lang
@@ -78,6 +78,10 @@ VATIsNotUsed=ภาษีมูลค่าเพิ่มที่ไม่ไ
 CopyAddressFromSoc=Fill address with third party address
 ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
 PaymentBankAccount=Payment bank account
+OverAllProposals=Total proposals
+OverAllOrders=Total orders
+OverAllInvoices=Total invoices
+OverAllSupplierProposals=Total price requests
 ##### Local Taxes #####
 LocalTax1IsUsed=ใช้ภาษีที่สอง
 LocalTax1IsUsedES= RE ถูกนำมาใช้
@@ -239,6 +243,10 @@ ProfId3RU=ศหมายเลข 3 (KPP)
 ProfId4RU=ศหมายเลข 4 (OKPO)
 ProfId5RU=-
 ProfId6RU=-
+ProfId1DZ=RC
+ProfId2DZ=Art.
+ProfId3DZ=NIF
+ProfId4DZ=NIS
 VATIntra=ภาษีมูลค่าเพิ่มจำนวน
 VATIntraShort=ภาษีมูลค่าเพิ่มจำนวน
 VATIntraSyntaxIsValid=ไวยากรณ์ที่ถูกต้อง
@@ -382,8 +390,9 @@ ListCustomersShort=รายชื่อของลูกค้า
 ThirdPartiesArea=บุคคลที่สามและพื้นที่ติดต่อ
 LastModifiedThirdParties=Latest %s modified third parties
 UniqueThirdParties=รวมของบุคคลที่สามที่ไม่ซ้ำกัน
-InActivity=เปิด
+InActivity=Opened
 ActivityCeased=ปิด
+ThirdPartyIsClosed=Third party is closed
 ProductsIntoElements=List of products/services into %s
 CurrentOutstandingBill=การเรียกเก็บเงินในปัจจุบันที่โดดเด่น
 OutstandingBill=แม็กซ์ สำหรับการเรียกเก็บเงินที่โดดเด่น
@@ -396,7 +405,7 @@ MergeThirdparties=ผสานบุคคลที่สาม
 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 so you will be able to delete the duplicate one.
 ThirdpartiesMergeSuccess=Thirdparties ได้รับการรวม
 SaleRepresentativeLogin=Login of sales representative
-SaleRepresentativeFirstname=Firstname of sales representative
-SaleRepresentativeLastname=Lastname of sales representative
+SaleRepresentativeFirstname=First name of sales representative
+SaleRepresentativeLastname=Last name of sales representative
 ErrorThirdpartiesMerge=มีข้อผิดพลาดเมื่อมีการลบ thirdparties กรุณาตรวจสอบการเข้าสู่ระบบ เปลี่ยนแปลงได้รับการหวนกลับ
 NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/th_TH/compta.lang b/htdocs/langs/th_TH/compta.lang
index 8475a041b9d..cf965e0f49c 100644
--- a/htdocs/langs/th_TH/compta.lang
+++ b/htdocs/langs/th_TH/compta.lang
@@ -65,6 +65,7 @@ PaymentSocialContribution=สังคม / ชำระภาษีการค
 PaymentVat=การชำระเงินภาษีมูลค่าเพิ่ม
 ListPayment=รายชื่อของการชำระเงิน
 ListOfCustomerPayments=รายการชำระเงินของลูกค้า
+ListOfSupplierPayments=รายชื่อผู้จัดจำหน่ายของการชำระเงิน
 DateStartPeriod=ระยะเวลาที่เริ่มต้นวันที่
 DateEndPeriod=วันสิ้นงวดวันที่
 newLT1Payment=New tax 2 payment
@@ -81,7 +82,7 @@ LT2PaymentES=IRPF การชำระเงิน
 LT2PaymentsES=IRPF การชำระเงิน
 VATPayment=Sales tax payment
 VATPayments=Sales tax payments
-VATRefund=Sales tax refund Refund
+VATRefund=Sales tax refund
 Refund=Refund
 SocialContributionsPayments=สังคม / การชำระเงินภาษีการคลัง
 ShowVatPayment=แสดงการชำระเงินภาษีมูลค่าเพิ่ม
@@ -194,7 +195,7 @@ CloneTax=โคลนสังคม / ภาษีการคลัง
 ConfirmCloneTax=ยืนยันโคลนของสังคม / ชำระภาษีการคลัง
 CloneTaxForNextMonth=โคลนมันสำหรับเดือนถัดไป
 SimpleReport=รายงานอย่างง่าย
-AddExtraReport=รายงานพิเศษ
+AddExtraReport=Extra reports (add foreign and national customer report)
 OtherCountriesCustomersReport=ลูกค้าต่างประเทศรายงาน
 BasedOnTwoFirstLettersOfVATNumberBeingDifferentFromYourCompanyCountry=ขึ้นอยู่กับตัวอักษรสองตัวแรกของหมายเลข VAT แตกต่างจากรหัสประเทศ บริษัท ของคุณเอง
 SameCountryCustomersWithVAT=ลูกค้าแห่งชาติรายงาน
diff --git a/htdocs/langs/th_TH/cron.lang b/htdocs/langs/th_TH/cron.lang
index b59b5ddfb2d..5172a26816f 100644
--- a/htdocs/langs/th_TH/cron.lang
+++ b/htdocs/langs/th_TH/cron.lang
@@ -17,14 +17,14 @@ CronMethodDoesNotExists=Class %s does not contains any method %s
 # Menu
 EnabledAndDisabled=Enabled and disabled
 # Page list
-CronLastOutput=การทำงานที่ผ่านมาการส่งออก
-CronLastResult=รหัสผลล่าสุด
+CronLastOutput=Latest run output
+CronLastResult=Latest result code
 CronCommand=คำสั่ง
 CronList=งานที่กำหนดเวลาไว้
 CronDelete=ลบงานที่กำหนดไว้
-CronConfirmDelete=คุณแน่ใจหรือว่าต้องการลบงานที่กำหนดไว้เหล่านี้หรือไม่
+CronConfirmDelete=Are you sure you want to delete these scheduled jobs?
 CronExecute=Launch scheduled job
-CronConfirmExecute=คุณแน่ใจหรือว่าต้องการที่จะดำเนินงานที่กำหนดไว้เหล่านี้ตอนนี้หรือไม่
+CronConfirmExecute=Are you sure you want to execute these scheduled jobs now?
 CronInfo=โมดูลงานตามกำหนดการอนุญาตให้มีการดำเนินงานที่ได้รับการวางแผน
 CronTask=งาน
 CronNone=ไม่
@@ -39,7 +39,7 @@ CronMethod=วิธี
 CronModule=โมดูล
 CronNoJobs=ไม่มีงานที่ลงทะเบียน
 CronPriority=ลำดับความสำคัญ
-CronLabel=Label
+CronLabel=ฉลาก
 CronNbRun=nb ยิง
 CronMaxRun=Max nb. launch
 CronEach=ทุกๆ
@@ -73,7 +73,7 @@ CronType_method=วิธีการเรียกร้องของชั
 CronType_command=คำสั่งเชลล์
 CronCannotLoadClass=ไม่สามารถโหลดระดับ s% หรือวัตถุ% s
 UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled jobs" to see and edit scheduled jobs.
-JobDisabled=Job disabled
+JobDisabled=ปิดการใช้งาน
 MakeLocalDatabaseDumpShort=Local database backup
 MakeLocalDatabaseDump=Create a local database dump
 WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of active jobs, your jobs may be delayed to a maximum of %s hours before being run.
diff --git a/htdocs/langs/th_TH/errors.lang b/htdocs/langs/th_TH/errors.lang
index 11ef7c2e143..6092dfbe7a8 100644
--- a/htdocs/langs/th_TH/errors.lang
+++ b/htdocs/langs/th_TH/errors.lang
@@ -11,6 +11,7 @@ ErrorLoginAlreadyExists=เข้าสู่ระบบ% s อยู่แล
 ErrorGroupAlreadyExists=s% กลุ่มที่มีอยู่แล้ว
 ErrorRecordNotFound=บันทึกไม่พบ
 ErrorFailToCopyFile=ไม่สามารถคัดลอกแฟ้ม <b>'% s'</b> เป็น <b>'% s'</b>
+ErrorFailToCopyDir=Failed to copy directory '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToRenameFile=ไม่สามารถเปลี่ยนชื่อไฟล์ <b>'% s'</b> เป็น <b>'% s'</b>
 ErrorFailToDeleteFile=ไม่สามารถลบไฟล์ที่ <b>'% s'</b>
 ErrorFailToCreateFile=ล้มเหลวในการสร้างแฟ้ม <b>'% s'</b>
@@ -115,7 +116,7 @@ ErrorNoActivatedBarcode=ประเภทไม่มีการเปิด
 ErrUnzipFails=ไม่สามารถเปิดเครื่องรูด% s กับ ZipArchive
 ErrNoZipEngine=เครื่องยนต์ยังไม่ได้เปิดเครื่องรูดแฟ้ม% ใน PHP นี้
 ErrorFileMustBeADolibarrPackage=ไฟล์% s จะต้องเป็นแพคเกจซิป Dolibarr
-ErrorFileRequired=มันต้องใช้เวลา Dolibarr ไฟล์แพคเกจ
+ErrorModuleFileRequired=You must select a Dolibarr module package file
 ErrorPhpCurlNotInstalled=PHP CURL ไม่ได้ติดตั้งนี้เป็นสิ่งสำคัญที่จะพูดคุยกับ Paypal
 ErrorFailedToAddToMailmanList=ไม่สามารถเพิ่มบันทึก% s% s รายการบุรุษไปรษณีย์หรือฐานหลักสูตรนานาชาติ
 ErrorFailedToRemoveToMailmanList=ล้มเหลวในการลบบันทึก% s% s รายการบุรุษไปรษณีย์หรือฐานหลักสูตรนานาชาติ
@@ -170,14 +171,19 @@ ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
 ErrorFileMustHaveFormat=File must have format %s
 ErrorSupplierCountryIsNotDefined=ประเทศผู้ผลิตนี้ไม่ได้ถูกกำหนด แก้ไขปัญหานี้เป็นครั้งแรก
 ErrorsThirdpartyMerge=Failed to merge the two records. Request canceled.
-ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enougth for product %s to add it into a new order.
-ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enougth for product %s to add it into a new invoice.
-ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enougth for product %s to add it into a new shipment.
-ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enougth for product %s to add it into a new proposal.
-ErrorFailedToLoadLoginFileForMode=Failed to get the login file for mode '%s'.
+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 bank 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>
 
 # 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.
diff --git a/htdocs/langs/th_TH/holiday.lang b/htdocs/langs/th_TH/holiday.lang
index adc21f83df1..cca9cd986e9 100644
--- a/htdocs/langs/th_TH/holiday.lang
+++ b/htdocs/langs/th_TH/holiday.lang
@@ -76,8 +76,9 @@ BoxTitleLastLeaveRequests=Latest %s modified leave requests
 HolidaysMonthlyUpdate=การปรับปรุงรายเดือน
 ManualUpdate=การปรับปรุงคู่มือการใช้งาน
 HolidaysCancelation=ออกจากคำขอยกเลิก
-EmployeeLastname=Employee lastname
-EmployeeFirstname=Employee firstname
+EmployeeLastname=Employee last name
+EmployeeFirstname=Employee first name
+TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
 
 ## Configuration du Module ##
 LastUpdateCP=Latest automatic update of leaves allocation
diff --git a/htdocs/langs/th_TH/ldap.lang b/htdocs/langs/th_TH/ldap.lang
index 51a4fb78249..4fc7b38f574 100644
--- a/htdocs/langs/th_TH/ldap.lang
+++ b/htdocs/langs/th_TH/ldap.lang
@@ -13,8 +13,8 @@ LDAPUsers=ผู้ใช้ในฐานข้อมูล LDAP
 LDAPFieldStatus=สถานะ
 LDAPFieldFirstSubscriptionDate=วันที่สมัครสมาชิกครั้งแรก
 LDAPFieldFirstSubscriptionAmount=จำนวนการสมัครสมาชิกครั้งแรก
-LDAPFieldLastSubscriptionDate=วันที่สมัครสมาชิกล่าสุด
-LDAPFieldLastSubscriptionAmount=จำนวนการสมัครสมาชิกล่าสุด
+LDAPFieldLastSubscriptionDate=Latest subscription date
+LDAPFieldLastSubscriptionAmount=Latest subscription amount
 LDAPFieldSkype=Skype id
 LDAPFieldSkypeExample=Example : skypeName
 UserSynchronized=ผู้ใช้ตรงกัน
diff --git a/htdocs/langs/th_TH/mails.lang b/htdocs/langs/th_TH/mails.lang
index 7548cf3ca85..eb1d2afde4e 100644
--- a/htdocs/langs/th_TH/mails.lang
+++ b/htdocs/langs/th_TH/mails.lang
@@ -35,7 +35,7 @@ MailingStatusSentPartialy=ส่ง partialy
 MailingStatusSentCompletely=ส่งสมบูรณ์
 MailingStatusError=ความผิดพลาด
 MailingStatusNotSent=ส่งไม่ได้
-MailSuccessfulySent=อีเมลที่ส่งประสบความสำเร็จ (จาก% s% s)
+MailSuccessfulySent=Email successfully accepted for delivery (from %s to %s)
 MailingSuccessfullyValidated=ตรวจสอบการส่งอีเมลที่ประสบความสำเร็จ
 MailUnsubcribe=ยกเลิก
 MailingStatusNotContact=ไม่ติดต่ออีกต่อไป
@@ -74,22 +74,28 @@ ResultOfMailSending=Result of mass EMail sending
 NbSelected=Nb selected
 NbIgnored=Nb ignored
 NbSent=Nb 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
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=สาย% s ในแฟ้ม
 RecipientSelectionModules=การร้องขอที่กำหนดไว้สำหรับการเลือกผู้รับ
 MailSelectedRecipients=เลือกผู้รับ
 MailingArea=พื้นที่ EMailings
-LastMailings=% s emailings ล่าสุด
+LastMailings=Latest %s emailings
 TargetsStatistics=สถิติเป้าหมาย
 NbOfCompaniesContacts=รายชื่อที่ไม่ซ้ำกัน / ที่อยู่
 MailNoChangePossible=ผู้รับการตรวจสอบสำหรับการส่งอีเมลที่ไม่สามารถเปลี่ยนแปลงได้
 SearchAMailing=ค้นหาทางไปรษณีย์
 SendMailing=ส่งการส่งอีเมล
 SendMail=ส่งอีเมล
-MailingNeedCommand=ด้วยเหตุผลด้านความปลอดภัยการส่งการส่งอีเมลที่ดีกว่าเมื่อดำเนินการจากบรรทัดคำสั่ง หากคุณมีหนึ่งขอให้ผู้ดูแลระบบเซิร์ฟเวอร์ของคุณเพื่อเปิดคำสั่งต่อไปที่จะส่งส่งอีเมลไปยังผู้รับทั้งหมด:
+SentBy=ที่ส่งมาจาก
+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=แต่คุณสามารถส่งพวกเขาออนไลน์ด้วยการเพิ่ม MAILING_LIMIT_SENDBYWEB พารามิเตอร์ที่มีค่าจำนวนสูงสุดของอีเมลที่คุณต้องการส่งโดยเซสชั่น สำหรับเรื่องนี้ไปในหน้าแรก - การติดตั้ง - อื่น ๆ
-ConfirmSendingEmailing=If you can't or prefer sending them with your www browser, please confirm you are sure you want to send emailing now from your browser?
+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=หมายเหตุ: การส่งของ emailings จากอินเตอร์เฟซเว็บที่จะทำในหลาย ๆ <b>ครั้งเพื่อความปลอดภัยและเหตุผลหมดเวลาผู้รับ% s</b> ในเวลาสำหรับแต่ละเซสชั่นการส่ง
 TargetsReset=รายชื่อที่ชัดเจน
 ToClearAllRecipientsClickHere=คลิกที่นี่เพื่อล้างรายชื่อผู้รับสำหรับการส่งอีเมลนี้
@@ -144,3 +150,6 @@ AdvTgtCreateFilter=Create filter
 AdvTgtOrCreateNewFilter=Name of new filter
 NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
+OutGoingEmailSetup=Outgoing email setup
+InGoingEmailSetup=Incoming email setup
+
diff --git a/htdocs/langs/th_TH/main.lang b/htdocs/langs/th_TH/main.lang
index 0b0d04d0172..d956e6f6504 100644
--- a/htdocs/langs/th_TH/main.lang
+++ b/htdocs/langs/th_TH/main.lang
@@ -37,8 +37,8 @@ ErrorFieldRequired=สนาม '% s' จะต้อง
 ErrorFieldFormat=สนาม '% s' มีค่าที่ไม่ดี
 ErrorFileDoesNotExists=ไฟล์% s ไม่ได้อยู่
 ErrorFailedToOpenFile=ไม่สามารถเปิดไฟล์% s
-ErrorCanNotCreateDir=Cannot create dir %s
-ErrorCanNotReadDir=Cannot read dir %s
+ErrorCanNotCreateDir=ไม่สามารถสร้างโฟลเดอร์ %s
+ErrorCanNotReadDir=ไม่สามารถอ่านโฟลเดอร์ %s
 ErrorConstantNotDefined=พารามิเตอร์% s ไม่ได้กำหนดไว้
 ErrorUnknown=ข้อผิดพลาดที่ไม่รู้จัก
 ErrorSQL=ข้อผิดพลาด SQL
@@ -63,18 +63,20 @@ ErrorNoVATRateDefinedForSellerCountry=ข้อผิดพลาดอัตร
 ErrorNoSocialContributionForSellerCountry=ข้อผิดพลาดที่ไม่มีทางสังคม / ประเภทภาษีทางการคลังที่กำหนดไว้สำหรับประเทศ '% s'
 ErrorFailedToSaveFile=ข้อผิดพลาดล้มเหลวที่จะบันทึกไฟล์
 ErrorCannotAddThisParentWarehouse=You are trying to add a parent warehouse which is already a child of current one
+MaxNbOfRecordPerPage=Max nb of record per page
 NotAuthorized=You are not authorized to do that.
 SetDate=วันที่ตั้ง
 SelectDate=เลือกวันที่
 SeeAlso=ดูยัง% s
 SeeHere=ดูที่นี่
+Apply=ใช้
 BackgroundColorByDefault=สีพื้นหลังเริ่มต้น
 FileRenamed=The file was successfully renamed
 FileUploaded=ไฟล์อัพโหลดประสบความสำเร็จ
 FileGenerated=The file was successfully generated
 FileWasNotUploaded=ไฟล์ที่ถูกเลือกสำหรับสิ่งที่แนบมา แต่ยังไม่ได้อัปโหลดยัง คลิกที่ "แนบไฟล์" สำหรับเรื่องนี้
 NbOfEntries=nb ของรายการ
-GoToWikiHelpPage=Read online help (Internet access needed)
+GoToWikiHelpPage=อ่านความช่วยเหลือออนไลน์ (อินเทอร์เน็ตจำเป็น)
 GoToHelpPage=อ่านความช่วยเหลือ
 RecordSaved=บันทึกที่บันทึกไว้
 RecordDeleted=บันทึกลบ
@@ -83,7 +85,7 @@ NotDefined=ไม่กำหนด
 DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr authentication mode is set to <b>%s</b> in configuration file <b>conf.php</b>.<br>This means that the password database is external to Dolibarr, so changing this field may have no effect.
 Administrator=ผู้บริหาร
 Undefined=ตะคุ่ม
-PasswordForgotten=Password forgotten?
+PasswordForgotten=ลืมรหัสผ่าน?
 SeeAbove=ดูข้างต้น
 HomeArea=พื้นที่หน้าแรก
 LastConnexion=การเชื่อมต่อล่าสุด
@@ -91,8 +93,8 @@ PreviousConnexion=การเชื่อมต่อก่อนหน้า
 PreviousValue=Previous value
 ConnectedOnMultiCompany=ที่เชื่อมต่อกับสภาพแวดล้อม
 ConnectedSince=เชื่อมต่อตั้งแต่
-AuthenticationMode=Authentication mode
-RequestedUrl=Requested URL
+AuthenticationMode=การรับรองโหมด
+RequestedUrl=URL ที่ร้องขอ
 DatabaseTypeManager=ผู้จัดการฐานข้อมูลประเภท
 RequestLastAccessInError=Latest database access request error
 ReturnCodeLastAccessInError=Return code for latest database access request error
@@ -114,7 +116,7 @@ Yes=ใช่
 no=ไม่
 No=ไม่
 All=ทั้งหมด
-Home=บ้าน
+Home=หน้าแรก
 Help=ช่วย
 OnlineHelp=ความช่วยเหลือออนไลน์
 PageWiki=หน้าวิกิพีเดีย
@@ -236,7 +238,7 @@ DateCreation=วันที่สร้าง
 DateCreationShort=Creat. date
 DateModification=วันที่แก้ไข
 DateModificationShort=Modif วันที่
-DateLastModification=วันที่แก้ไขล่าสุด
+DateLastModification=Latest modification date
 DateValidation=วันที่ตรวจสอบ
 DateClosing=วันปิดสมุดทะเบียน
 DateDue=วันที่ครบกำหนด
@@ -432,7 +434,7 @@ Reportings=การรายงาน
 Draft=ร่าง
 Drafts=ร่าง
 Validated=ผ่านการตรวจสอบ
-Opened=เปิด
+Opened=Opened
 New=ใหม่
 Discount=ส่วนลด
 Unknown=ไม่ทราบ
@@ -460,6 +462,7 @@ DeletePicture=รูปภาพลบ
 ConfirmDeletePicture=ลบภาพยืนยัน?
 Login=เข้าสู่ระบบ
 CurrentLogin=เข้าสู่ระบบปัจจุบัน
+EnterLoginDetail=Enter login details
 January=มกราคม
 February=กุมภาพันธ์
 March=มีนาคม
@@ -597,6 +600,8 @@ SessionName=ชื่อเซสชั่น
 Method=วิธี
 Receive=ได้รับ
 CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
+ExpectedValue=Expected Value
+CurrentValue=มูลค่าปัจจุบัน
 PartialWoman=เป็นบางส่วน
 TotalWoman=ทั้งหมด
 NeverReceived=ไม่เคยได้รับ
@@ -753,6 +758,8 @@ RemoveString=Remove string '%s'
 SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
 DirectDownloadLink=Direct download link
 Download=Download
+ActualizeCurrency=Update currency rate
+Fiscalyear=ปีงบประมาณ
 # Week day
 Monday=วันจันทร์
 Tuesday=วันอังคาร
@@ -787,8 +794,8 @@ SetRef=Set ref
 Select2ResultFoundUseArrows=Some results found. Use arrows to select.
 Select2NotFound=No result found
 Select2Enter=Enter
-Select2MoreCharacter=or more character
-Select2MoreCharacters=or more characters
+Select2MoreCharacter=or more characters<br /><br /><strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
+Select2MoreCharacters=or more characters<br /><br /><strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
 Select2LoadingMoreResults=Loading more results...
 Select2SearchInProgress=Search in progress...
 SearchIntoThirdparties=Thirdparties
@@ -809,3 +816,5 @@ SearchIntoContracts=สัญญา
 SearchIntoCustomerShipments=Customer shipments
 SearchIntoExpenseReports=รายงานค่าใช้จ่าย
 SearchIntoLeaves=ใบลา
+
+BulkActions=Bulk actions
diff --git a/htdocs/langs/th_TH/members.lang b/htdocs/langs/th_TH/members.lang
index d4049cc924a..45145459d38 100644
--- a/htdocs/langs/th_TH/members.lang
+++ b/htdocs/langs/th_TH/members.lang
@@ -45,7 +45,7 @@ MemberStatusDraft=ร่าง (จะต้องมีการตรวจส
 MemberStatusDraftShort=ร่าง
 MemberStatusActive=การตรวจสอบ (รอการสมัครสมาชิก)
 MemberStatusActiveShort=ผ่านการตรวจสอบ
-MemberStatusActiveLate=สมัครสมาชิกหมดอายุ
+MemberStatusActiveLate=Subscription expired
 MemberStatusActiveLateShort=หมดอายุ
 MemberStatusPaid=สมัครสมาชิกถึงวันที่
 MemberStatusPaidShort=ถึงวันที่
@@ -136,8 +136,8 @@ DocForAllMembersCards=สร้างนามบัตรสำหรับส
 DocForOneMemberCards=สร้างนามบัตรของสมาชิกโดยเฉพาะอย่างยิ่ง
 DocForLabels=สร้างแผ่นอยู่
 SubscriptionPayment=การชำระเงินการสมัครสมาชิก
-LastSubscriptionDate=วันที่สมัครสมาชิกล่าสุด
-LastSubscriptionAmount=จำนวนการสมัครสมาชิกล่าสุด
+LastSubscriptionDate=Latest subscription date
+LastSubscriptionAmount=Latest subscription amount
 MembersStatisticsByCountries=สถิติสมาชิกตามประเทศ
 MembersStatisticsByState=สถิติสมาชิกโดยรัฐ / จังหวัด
 MembersStatisticsByTown=สถิติสมาชิกโดยเมือง
@@ -149,7 +149,7 @@ MembersByStateDesc=แสดงหน้าจอนี้คุณสถิต
 MembersByTownDesc=แสดงหน้าจอนี้คุณสถิติเกี่ยวกับสมาชิกเมือง
 MembersStatisticsDesc=เลือกสถิติที่คุณต้องการอ่าน ...
 MenuMembersStats=สถิติ
-LastMemberDate=วันที่สมาชิกคนสุดท้าย
+LastMemberDate=Latest member date
 Nature=ธรรมชาติ
 Public=ข้อมูลเป็นสาธารณะ
 NewMemberbyWeb=สมาชิกใหม่ที่เพิ่ม รอการอนุมัติ
diff --git a/htdocs/langs/th_TH/orders.lang b/htdocs/langs/th_TH/orders.lang
index 8983b888fd5..c26ea4f4a7d 100644
--- a/htdocs/langs/th_TH/orders.lang
+++ b/htdocs/langs/th_TH/orders.lang
@@ -39,7 +39,7 @@ StatusOrderRefusedShort=ปฏิเสธ
 StatusOrderBilledShort=การเรียกเก็บเงิน
 StatusOrderToProcessShort=ในการประมวลผล
 StatusOrderReceivedPartiallyShort=ได้รับบางส่วน
-StatusOrderReceivedAllShort=ทุกอย่างที่ได้รับ
+StatusOrderReceivedAllShort=Products received
 StatusOrderCanceled=ยกเลิก
 StatusOrderDraft=ร่าง (จะต้องมีการตรวจสอบ)
 StatusOrderValidated=ผ่านการตรวจสอบ
@@ -51,7 +51,7 @@ StatusOrderApproved=ได้รับการอนุมัติ
 StatusOrderRefused=ปฏิเสธ
 StatusOrderBilled=การเรียกเก็บเงิน
 StatusOrderReceivedPartially=ได้รับบางส่วน
-StatusOrderReceivedAll=ทุกอย่างที่ได้รับ
+StatusOrderReceivedAll=All products received
 ShippingExist=การจัดส่งสินค้าที่มีอยู่
 QtyOrdered=จำนวนที่สั่งซื้อ
 ProductQtyInDraft=ปริมาณการสั่งซื้อสินค้าเข้ามาในร่าง
diff --git a/htdocs/langs/th_TH/other.lang b/htdocs/langs/th_TH/other.lang
index a9da6c35890..4f436420b43 100644
--- a/htdocs/langs/th_TH/other.lang
+++ b/htdocs/langs/th_TH/other.lang
@@ -2,6 +2,7 @@
 SecurityCode=รหัสรักษาความปลอดภัย
 NumberingShort=N°
 Tools=เครื่องมือ
+TMenuTools=เครื่องมือ
 ToolsDesc=All miscellaneous tools not included in other menu entries are collected here.<br /><br />All the tools can be reached in the left menu.
 Birthday=วันเกิด
 BirthdayDate=Birthday date
@@ -67,14 +68,15 @@ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find her
 PredefinedMailContentSendShipping=__CONTACTCIVNAME__ คุณจะพบว่าที่นี่จัดส่ง __SHIPPINGREF__ __PERSONALIZED__Sincerely __SIGNATURE__
 PredefinedMailContentSendFichInter=__CONTACTCIVNAME__ คุณจะพบว่าที่นี่แทรกแซง __FICHINTERREF__ __PERSONALIZED__Sincerely __SIGNATURE__
 PredefinedMailContentThirdparty=__CONTACTCIVNAME__ __PERSONALIZED__ __SIGNATURE__
-DemoDesc=Dolibarr is a compact ERP/CRM supporting several functional modules. A demo showcasing all modules makes no sense as this scenario never occurs. So, several demo profiles are available.
+DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
+ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
 DemoFundation=จัดการสมาชิกของมูลนิธิ
 DemoFundation2=จัดการสมาชิกและบัญชีธนาคารของมูลนิธิ
-DemoCompanyServiceOnly=การจัดการการขายบริการกิจกรรมอิสระเท่านั้น
+DemoCompanyServiceOnly=Company or freelance selling service only
 DemoCompanyShopWithCashDesk=บริหารจัดการร้านค้าพร้อมโต๊ะเงินสด
-DemoCompanyProductAndStocks=จัดการ บริษัท ขนาดเล็กหรือขนาดกลางขายสินค้า
-DemoCompanyAll=จัดการ บริษัท ขนาดเล็กหรือขนาดกลางที่มีกิจกรรมหลาย ๆ (ทุกโมดูลหลัก)
+DemoCompanyProductAndStocks=Company selling products with a shop
+DemoCompanyAll=Company with multiple activities (all main modules)
 CreatedBy=สร้างโดย% s
 ModifiedBy=ดัดแปลงโดย% s
 ValidatedBy=การตรวจสอบโดย% s
diff --git a/htdocs/langs/th_TH/products.lang b/htdocs/langs/th_TH/products.lang
index da98a1bc5a3..7848e487c3c 100644
--- a/htdocs/langs/th_TH/products.lang
+++ b/htdocs/langs/th_TH/products.lang
@@ -5,6 +5,8 @@ ProductLabelTranslated=Translated product label
 ProductDescriptionTranslated=Translated product description
 ProductNoteTranslated=Translated product note
 ProductServiceCard=สินค้า / บริการบัตร
+TMenuProducts=ผลิตภัณฑ์
+TMenuServices=บริการ
 Products=ผลิตภัณฑ์
 Services=บริการ
 Product=สินค้า
@@ -58,7 +60,7 @@ SellingPrice=ราคาขาย
 SellingPriceHT=ราคาขาย (สุทธิจากภาษี)
 SellingPriceTTC=ราคาขาย (รวมภาษี).
 CostPriceDescription=This price (net of tax) can be used to store the average amount this product cost to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
-CostPriceUsage=In a future version, this value could be used for margin calculation.
+CostPriceUsage=This value could be used for margin calculation.
 SoldAmount=Sold amount
 PurchasedAmount=Purchased amount
 NewPrice=ราคาใหม่
@@ -140,6 +142,7 @@ ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b>?
 CloneContentProduct=โคลนข้อมูลหลักทั้งหมดของสินค้า / บริการ
 ClonePricesProduct=ข้อมูลหลักโคลนและราคา
 CloneCompositionProduct=โคลนบรรจุสินค้า / บริการ
+CloneCombinationsProduct=Clone product variants
 ProductIsUsed=ผลิตภัณฑ์นี้ถูกนำมาใช้
 NewRefForClone=อ้าง ของผลิตภัณฑ์ / บริการใหม่
 SellingPrices=Selling prices
@@ -236,7 +239,7 @@ GlobalVariables=ตัวแปรทั่วโลก
 VariableToUpdate=Variable to update
 GlobalVariableUpdaters=อัพเดทตัวแปรทั่วโลก
 UpdateInterval=ช่วงเวลาการปรับปรุง (นาที)
-LastUpdated=อัพเดทล่าสุด
+LastUpdated=Latest update
 CorrectlyUpdated=ปรับปรุงอย่างถูกต้อง
 PropalMergePdfProductActualFile=ไฟล์ที่ใช้ในการเพิ่มเป็น PDF ดาซูร์มี / เป็น
 PropalMergePdfProductChooseFile=ไฟล์ PDF เลือก
@@ -256,4 +259,41 @@ VolumeUnits=Volume unit
 SizeUnits=Size unit
 DeleteProductBuyPrice=Delete buying price
 ConfirmDeleteProductBuyPrice=Are you sure you want to delete this buying price?
+SubProduct=Sub product
 
+#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
+ProductCombinations=Variants
+HideProductCombinations=Hide products variant in the products selector
+ProductCombination=Variant
+NewProductCombination=New variant
+EditProductCombination=Editing variant
+ProductCombinationGenerator=Variants generator
+Features=Features
+PriceImpact=Price impact
+WeightImpact=Weight impact
+NewProductAttribute=คุณลักษณะใหม่
+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
+PercentageVariation=Percentage variation
+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 child products
+ConfirmCloneProductCombinations=Would you like to copy all the product variant to the 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
diff --git a/htdocs/langs/th_TH/projects.lang b/htdocs/langs/th_TH/projects.lang
index e3169619f86..43ea4da302a 100644
--- a/htdocs/langs/th_TH/projects.lang
+++ b/htdocs/langs/th_TH/projects.lang
@@ -29,9 +29,9 @@ DeleteAProject=ลบโครงการ
 DeleteATask=ลบงาน
 ConfirmDeleteAProject=Are you sure you want to delete this project?
 ConfirmDeleteATask=Are you sure you want to delete this task?
-OpenedProjects=Open projects
-OpenedTasks=Open tasks
-OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
+OpenedProjects=เปิดโครงการ
+OpenedTasks=Opened tasks
+OpportunitiesStatusForOpenedProjects=Opportunities amount of opened projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=แสดงโครงการ
 SetProject=โครงการตั้ง
@@ -47,7 +47,7 @@ TaskTimeSpent=เวลาที่ใช้ในงาน
 TaskTimeUser=ผู้ใช้งาน
 TaskTimeNote=บันทึก
 TaskTimeDate=วันที่
-TasksOnOpenedProject=งานเกี่ยวกับโครงการที่เปิด
+TasksOnOpenedProject=Tasks on opened projects
 WorkloadNotDefined=ภาระงานที่ไม่ได้กำหนดไว้
 NewTimeSpent=เวลาใหม่ใช้เวลา
 MyTimeSpent=เวลาของการใช้จ่าย
@@ -58,6 +58,7 @@ TaskDateEnd=งานวันที่สิ้นสุด
 TaskDescription=รายละเอียดงาน
 NewTask=งานใหม่
 AddTask=สร้างงาน
+AddTimeSpent=Create time spent
 Activity=กิจกรรม
 Activities=งาน / กิจกรรม
 MyActivities=งานของฉัน / กิจกรรม
@@ -95,6 +96,7 @@ ValidateProject=ตรวจสอบ Projet
 ConfirmValidateProject=Are you sure you want to validate this project?
 CloseAProject=โครงการปิด
 ConfirmCloseAProject=Are you sure you want to close this project?
+AlsoCloseAProject=Also close project (keep it open if you still need to follow production tasks on it)
 ReOpenAProject=เปิดโครงการ
 ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=รายชื่อโครงการ
@@ -120,7 +122,7 @@ CloneProjectFiles=เข้าร่วมโครงการโคลนไ
 CloneTaskFiles=งานโคลน (s) เข้าร่วมไฟล์ (ถ้างาน (s) โคลน)
 CloneMoveDate=Update project/tasks dates from now?
 ConfirmCloneProject=Are you sure to clone this project?
-ProjectReportDate=เปลี่ยนวันงานโครงการตามวันที่เริ่มต้น
+ProjectReportDate=Change task dates according to new project start date
 ErrorShiftTaskDate=เป็นไปไม่ได้ที่จะเปลี่ยนวันงานตามโครงการใหม่วันที่เริ่มต้น
 ProjectsAndTasksLines=โครงการและงาน
 ProjectCreatedInDolibarr=โครงการสร้าง% s
@@ -177,9 +179,9 @@ ProjectsStatistics=สถิติในโครงการ / โอกาส
 TaskAssignedToEnterTime=งานที่ได้รับมอบหมาย เข้าครั้งในงานนี้จะเป็นไปได้
 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.
-OpenedProjectsByThirdparties=Open projects by thirdparties
+OpenedProjectsByThirdparties=โครงการเปิดโดย thirdparties
 OnlyOpportunitiesShort=Only opportunities
-OpenedOpportunitiesShort=Open opportunities
+OpenedOpportunitiesShort=Opened opportunities
 NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount
diff --git a/htdocs/langs/th_TH/propal.lang b/htdocs/langs/th_TH/propal.lang
index 58d5eb77972..e76f520e1f4 100644
--- a/htdocs/langs/th_TH/propal.lang
+++ b/htdocs/langs/th_TH/propal.lang
@@ -3,7 +3,7 @@ Proposals=ข้อเสนอเชิงพาณิชย์
 Proposal=ข้อเสนอเชิงพาณิชย์
 ProposalShort=ข้อเสนอ
 ProposalsDraft=ข้อเสนอในเชิงพาณิชย์ร่าง
-ProposalsOpened=ข้อเสนอในเชิงพาณิชย์เปิด
+ProposalsOpened=Opened commercial proposals
 Prop=ข้อเสนอเชิงพาณิชย์
 CommercialProposal=ข้อเสนอเชิงพาณิชย์
 ProposalCard=การ์ดเสนอ
@@ -26,9 +26,9 @@ AmountOfProposalsByMonthHT=จำนวนเดือน (สุทธิจา
 NbOfProposals=จำนวนของข้อเสนอในเชิงพาณิชย์
 ShowPropal=แสดงข้อเสนอ
 PropalsDraft=ร่าง
-PropalsOpened=เปิด
+PropalsOpened=Opened
 PropalStatusDraft=ร่าง (จะต้องมีการตรวจสอบ)
-PropalStatusValidated=การตรวจสอบ (ข้อเสนอเปิด)
+PropalStatusValidated=Validated (proposal is opened)
 PropalStatusSigned=ลงนาม (ความต้องการของการเรียกเก็บเงิน)
 PropalStatusNotSigned=ไม่ได้ลงชื่อ (ปิด)
 PropalStatusBilled=การเรียกเก็บเงิน
diff --git a/htdocs/langs/th_TH/stocks.lang b/htdocs/langs/th_TH/stocks.lang
index 44d9bb92d71..40f6b077791 100644
--- a/htdocs/langs/th_TH/stocks.lang
+++ b/htdocs/langs/th_TH/stocks.lang
@@ -22,13 +22,15 @@ Movements=การเคลื่อนไหว
 ErrorWarehouseRefRequired=ชื่ออ้างอิงคลังสินค้าจะต้อง
 ListOfWarehouses=รายชื่อของคลังสินค้า
 ListOfStockMovements=รายการเคลื่อนไหวของหุ้น
+StockMovementForId=Movement ID %d
+ListMouvementStockProject=List of stock movements associated to project
 StocksArea=พื้นที่โกดัง
 Location=สถานที่
 LocationSummary=ที่ตั้งชื่อสั้น
 NumberOfDifferentProducts=จำนวนของผลิตภัณฑ์ที่แตกต่างกัน
 NumberOfProducts=จำนวนของผลิตภัณฑ์
-LastMovement=ความเคลื่อนไหวล่าสุด
-LastMovements=ความเคลื่อนไหวล่าสุด
+LastMovement=Latest movement
+LastMovements=Latest movements
 Units=หน่วย
 Unit=หน่วย
 StockCorrection=หุ้นที่ถูกต้อง
@@ -140,3 +142,4 @@ ProductStockWarehouseCreated=Stock limit for alert and desired optimal stock cor
 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
diff --git a/htdocs/langs/th_TH/supplier_proposal.lang b/htdocs/langs/th_TH/supplier_proposal.lang
index 78f63e57af9..1f1ba6bbb23 100644
--- a/htdocs/langs/th_TH/supplier_proposal.lang
+++ b/htdocs/langs/th_TH/supplier_proposal.lang
@@ -8,7 +8,7 @@ SearchRequest=Find a request
 DraftRequests=Draft requests
 SupplierProposalsDraft=Draft supplier proposals
 LastModifiedRequests=Latest %s modified price requests
-RequestsOpened=Open price requests
+RequestsOpened=Opened price requests
 SupplierProposalArea=Supplier proposals area
 SupplierProposalShort=Supplier proposal
 SupplierProposals=Supplier proposals
@@ -23,7 +23,7 @@ ConfirmValidateAsk=Are you sure you want to validate this price request under na
 DeleteAsk=Delete request
 ValidateAsk=Validate request
 SupplierProposalStatusDraft=ร่าง (จะต้องมีการตรวจสอบ)
-SupplierProposalStatusValidated=Validated (request is open)
+SupplierProposalStatusValidated=Validated (request is opened)
 SupplierProposalStatusClosed=ปิด
 SupplierProposalStatusSigned=Accepted
 SupplierProposalStatusNotSigned=ปฏิเสธ
diff --git a/htdocs/langs/th_TH/suppliers.lang b/htdocs/langs/th_TH/suppliers.lang
index 9ab252ed4dd..902ec4a8136 100644
--- a/htdocs/langs/th_TH/suppliers.lang
+++ b/htdocs/langs/th_TH/suppliers.lang
@@ -9,7 +9,7 @@ ShowSupplier=แสดงผู้จัดจำหน่าย
 OrderDate=วันที่สั่งซื้อ
 BuyingPriceMin=Best buying price
 BuyingPriceMinShort=Best buying price
-TotalBuyingPriceMinShort=Total of subproducts buying prices
+TotalBuyingPriceMinShort=รวม subproducts ซื้อราคา
 TotalSellingPriceMinShort=Total of subproducts selling prices
 SomeSubProductHaveNoPrices=บางผลิตภัณฑ์ย่อยได้ไม่มีราคาที่กำหนดไว้
 AddSupplierPrice=Add buying price
@@ -24,10 +24,10 @@ ExportDataset_fournisseur_1=ผู้ผลิตรายการใบแจ
 ExportDataset_fournisseur_2=ผู้ผลิตใบแจ้งหนี้และการชำระเงิน
 ExportDataset_fournisseur_3=คำสั่งผู้ผลิตและสายการสั่งซื้อ
 ApproveThisOrder=อนุมัติคำสั่งนี้
-ConfirmApproveThisOrder=<b>คุณแน่ใจหรือว่าต้องการที่จะอนุมัติคำสั่งซื้อ% s?</b>
+ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b>?
 DenyingThisOrder=ปฏิเสธคำสั่งนี้
-ConfirmDenyingThisOrder=<b>คุณแน่ใจหรือว่าต้องการที่จะปฏิเสธ% s</b> สั่งซื้อนี้?
-ConfirmCancelThisOrder=<b>คุณแน่ใจหรือว่าต้องการยกเลิก% s</b> สั่งซื้อนี้?
+ConfirmDenyingThisOrder=Are you sure you want to deny this order <b>%s</b>?
+ConfirmCancelThisOrder=Are you sure you want to cancel this order <b>%s</b>?
 AddSupplierOrder=เพื่อสร้างผู้จัดจำหน่าย
 AddSupplierInvoice=สร้างใบแจ้งหนี้จัดจำหน่าย
 ListOfSupplierProductForSupplier=<b>รายการของผลิตภัณฑ์และราคาสำหรับผู้จัดจำหน่าย% s</b>
@@ -41,3 +41,4 @@ DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Wrong quality
 ReputationForThisProduct=Reputation
 BuyerName=Buyer name
+AllProductServicePrices=All product / service prices
diff --git a/htdocs/langs/th_TH/users.lang b/htdocs/langs/th_TH/users.lang
index 330ddf086ed..83663049e76 100644
--- a/htdocs/langs/th_TH/users.lang
+++ b/htdocs/langs/th_TH/users.lang
@@ -8,7 +8,7 @@ EditPassword=แก้ไขรหัสผ่าน
 SendNewPassword=สร้างรหัสผ่านใหม่และส่งรหัสผ่าน
 ReinitPassword=สร้างรหัสผ่านใหม่
 PasswordChangedTo=เปลี่ยนรหัสผ่านในการ:% s
-SubjectNewPassword=Your new password for %s
+SubjectNewPassword=รหัสผ่านใหม่ของคุณ %s
 GroupRights=สิทธิ์ของกลุ่ม
 UserRights=สิทธิ์ของผู้ใช้
 UserGUISetup=หน้าจอที่ใช้ติดตั้ง
@@ -36,7 +36,7 @@ AdministratorDesc=ผู้บริหาร
 DefaultRights=สิทธิ์เริ่มต้น
 DefaultRightsDesc=<u>ที่นี่กำหนดสิทธิ์เริ่มต้นที่จะได้รับโดยอัตโนมัติไปยังผู้ใช้ที่สร้างใหม่</u> (ไปในบัตรผู้ใช้สามารถเปลี่ยนได้รับอนุญาตจากผู้ใช้ที่มีอยู่)
 DolibarrUsers=ผู้ใช้ Dolibarr
-LastName=Last Name
+LastName=นามสกุล
 FirstName=ชื่อแรก
 ListOfGroups=รายชื่อของกลุ่ม
 NewGroup=กลุ่มใหม่
diff --git a/htdocs/langs/th_TH/withdrawals.lang b/htdocs/langs/th_TH/withdrawals.lang
index 88456228689..80f90d2ce73 100644
--- a/htdocs/langs/th_TH/withdrawals.lang
+++ b/htdocs/langs/th_TH/withdrawals.lang
@@ -24,6 +24,7 @@ WithdrawStatistics=Direct debit payment statistics
 WithdrawRejectStatistics=Direct debit payment reject statistics
 LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
+WithdrawRequestsDone=%s direct debit payment requests recorded
 ThirdPartyBankCode=รหัสธนาคารของบุคคลที่สาม
 NoInvoiceCouldBeWithdrawed=ใบแจ้งหนี้ไม่มี withdrawed กับความสำเร็จ ตรวจสอบใบแจ้งหนี้ที่อยู่ใน บริษัท ที่มีบ้านที่ถูกต้อง
 ClassCredited=จำแนกเครดิต
@@ -76,8 +77,8 @@ RUM=UMR
 RUMLong=Unique Mandate Reference
 RUMWillBeGenerated=UMR number will be generated once bank account information are saved
 WithdrawMode=Direct debit mode (FRST or RECUR)
-WithdrawRequestAmount=จำนวนเงินที่ถอนคำขอ:
-WithdrawRequestErrorNilAmount=ไม่สามารถสร้างถอนการร้องขอสำหรับจำนวนเงินที่ศูนย์
+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
diff --git a/htdocs/langs/tr_TR/accountancy.lang b/htdocs/langs/tr_TR/accountancy.lang
index f0ca4e6a59f..4c62a66caa3 100644
--- a/htdocs/langs/tr_TR/accountancy.lang
+++ b/htdocs/langs/tr_TR/accountancy.lang
@@ -57,7 +57,7 @@ ChangeAndLoad=Change and load
 Addanaccount=Muhasebe hesabı ekle
 AccountAccounting=Muhasebe hesabı
 AccountAccountingShort=Hesap
-AccountAccountingSuggest=Accounting account suggested
+AccountAccountingSuggest=Önerilen muhasebe hesabı
 MenuDefaultAccounts=Default accounts
 MenuVatAccounts=Vat accounts
 MenuTaxAccounts=Tax accounts
@@ -67,32 +67,32 @@ MenuProductsAccounts=Product accounts
 ProductsBinding=Products accounts
 Ventilation=Hesaba bağlama
 CustomersVentilation=Müşteri faturası bağlama
-SuppliersVentilation=Supplier invoice binding
+SuppliersVentilation=Tedarikçi faturası bağlama
 ExpenseReportsVentilation=Expense report binding
-CreateMvts=Create new transaction
-UpdateMvts=Modification of a transaction
-WriteBookKeeping=Journalize transactions in General Ledger
+CreateMvts=Yeni işlem oluştur
+UpdateMvts=İşlemi değiştir
+WriteBookKeeping=İşlemleri Büyük Deftere kaydet
 Bookkeeping=Büyük Defter
 AccountBalance=Hesap bakiyesi
 
 CAHTF=Total purchase supplier before tax
 TotalExpenseReport=Total expense report
-InvoiceLines=Lines of invoices to bind
-InvoiceLinesDone=Bound lines of invoices
+InvoiceLines=Bağlanacak fatura satırları
+InvoiceLinesDone=Bağlı fatura satırları
 ExpenseReportLines=Lines of expense reports to bind
 ExpenseReportLinesDone=Bound lines of expense reports
-IntoAccount=Bind line with the accounting account
+IntoAccount=Satırı muhasebe hesabına bağla
 
 
-Ventilate=Bind
+Ventilate=Bağla
 LineId=Id line
 Processing=İşleme
-EndProcessing=Process terminated.
+EndProcessing=İşlem sonlandırıldı.
 SelectedLines=Seçilen satırlar
 Lineofinvoice=Fatura satırı
 LineOfExpenseReport=Line of expense report
 NoAccountSelected=No accounting account selected
-VentilatedinAccount=Binded successfully to the accounting account
+VentilatedinAccount=Muhasebe hesabına başarıyla bağlandı
 NotVentilatedinAccount=Not bound to the accounting account
 XLineSuccessfullyBinded=%s products/services successfuly bound to an accounting account
 XLineFailedToBeBinded=%s products/services were not bound to any accounting account
@@ -194,6 +194,8 @@ ChangeBinding=Change the binding
 
 ## Admin
 ApplyMassCategories=Toplu kategori uygula
+AddAccountFromBookKeepingWithNoCategories=Add acccount already used with no categories
+CategoryDeleted=Category for the accounting account has been removed
 
 ## Export
 Exports=Dışaaktarımlar
@@ -209,6 +211,7 @@ Modelcsv_ciel=Sage Ciel Compta ya da Compta Evolution'a doğru dışaaktar
 Modelcsv_quadratus=Quadratus QuadraCompta'ya doğru dışaaktar
 Modelcsv_ebp=EBP'ye yönelik dışaaktarım
 Modelcsv_cogilog=Cogilog'a dışaaktar
+ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
 InitAccountancy=Muhasebe başlangıcı
diff --git a/htdocs/langs/tr_TR/admin.lang b/htdocs/langs/tr_TR/admin.lang
index 2ce445f8080..ae61d3d4459 100644
--- a/htdocs/langs/tr_TR/admin.lang
+++ b/htdocs/langs/tr_TR/admin.lang
@@ -9,14 +9,20 @@ VersionDevelopment=Geliştirme
 VersionUnknown=Bilinmeyen
 VersionRecommanded=Önerilen
 FileCheck=Dosya bütünlüğü denetleyicisi
-FileCheckDesc=This tool allows you to check the integrity of files of your application, comparing each files with the official ones. You can use this tool to detect if some files were modified by a hacker for example.
+FileCheckDesc=This tool allows you to check the integrity of files and setup of your application, comparing each files with the official ones. 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.
+FileIntegrityIsStrictlyConformedWithReference=Files integrity is strictly conformed with the reference.
+FileIntegrityIsOkButFilesWereAdded=Files integrity check has passed, however some new files were added.
+FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified, removed or added.
+GlobalChecksum=Global checksum
 MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
 LocalSignature=Embedded local signature (less reliable)
 RemoteSignature=Remote distant signature (more reliable)
 FilesMissing=Eksik dosyalar
 FilesUpdated=Güncellenmiş Dosyalar
+FilesModified=Modified Files
+FilesAdded=Added Files
 FileCheckDolibarr=Uygulama dosyaları bütünlüğünü denetle
-AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from a certified package
+AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from an official package
 XmlNotFound=Uygulamanın Xml Bütünlük Dosyası Bulunamadı
 SessionId=Oturum Kimliği
 SessionSaveHandler=Oturum kayıt yürütücüsü
@@ -185,7 +191,9 @@ BoxesDesc=Ekran etiketleri, sayfaları kişiselleştirmek için ekleyeceğiniz b
 OnlyActiveElementsAreShown=Yalnızca <ahref="modules.php">etkinleştirilmiş modüllerin</a> öğeleri gösterilmiştir.
 ModulesDesc=Dolibarr modülleri, yazılımda hangi özelliğin devreye alınacağını tanımlar. Modül devreye alındıktan sonra kullanıcıya bazı izinler vermeniz gerekir. Bir modülü/özelliği etkinleştirmek için aç/kapa düğmesini tıklayın.
 ModulesMarketPlaceDesc=Internette dış web sitelerinde indirmek için daha çok modül bulabilirsiniz...
-ModulesMarketPlaces=Daha çok modül...
+ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
+ModulesMarketPlaces=Find external modules...
+GoModuleSetupArea=To deploy/install a new module, go onto the Module setup area at <a href="%s">%s</a>.
 DoliStoreDesc=DoliStore, Dolibarr ERP/CRM dış modülleri için resmi pazar yeri
 DoliPartnersDesc=İstek üzerine modül ve özellik geliştiren firmaların listesi. (Not: Açık kaynak kullanan PHP bilen herhangi bir firma size özel geliştirme hizmetleri sağlayabilir)
 WebSiteDesc=Daha çok modül bulabileceğiniz referans web siteleri...
@@ -276,21 +284,22 @@ ModuleFamilyInterface=Dış sistemli arayüzler
 MenuHandlers=Menü işlemcileri
 MenuAdmin=Menü düzenleyici
 DoNotUseInProduction=Üretimde kullanmayın
-ThisIsProcessToFollow=Bu ayarlama işlemidir:
-ThisIsAlternativeProcessToFollow=Bu bir alternatif işlem ayarıdır:
+ThisIsProcessToFollow=This is steps to process:
+ThisIsAlternativeProcessToFollow=This is an alternative setup to process manually:
 StepNb=Adım %s
 FindPackageFromWebSite=İstediğiniz özelliği sağlayan bir paket bulun (örneğin; resmi web sitesinden %s).
 DownloadPackageFromWebSite=Paketi indir (örneğin resmi web sitesinden %s).
-UnpackPackageInDolibarrRoot=Dosya paketini dış modüllere adanmış Dolibarr sunucusu dizinin içine ayıklayın: <b>%s</b>
-SetupIsReadyForUse=Kurma işlemi bitmiştir ve Dolibarr bu yeni bileşeni ile kullanıma hazırdır.
-NotExistsDirect=Alternatif kök dizin tanımlanmamış.<br>
-InfDirAlt=Sürüm 3 ten beri bir alternatif kök dizin tanımlanabiliyor. Bu sizin bir miktar boşluk, eklentiler ve özel şablonlar depolamanızı sağlar.<br>Yalnızca Dolibarr kökünde bir dizin oluşturun (örn. özel).<br>
-InfDirExample=<br>Sonra bunu conf.php dosyasında belirtin<br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>*Bu satırlar "#" karakteri ile yorumlanır, yorumu kaldırmak için sadece bu karakteri kaldırın.
+UnpackPackageInDolibarrRoot=Unpack the packaged files into server directory dedicated to Dolibarr: <b>%s</b>
+UnpackPackageInModulesRoot=To deploy/install an external module, unpack the packaged files into the server directory dedicated to modules: <b>%s</b>
+SetupIsReadyForUse=Module deployment is finished. You must however enable and setup the module in your application by going on the page to setup modules: <a href="%s">%s</a>.
+NotExistsDirect=The alternative root directory is not defined to an existing directory.<br>
+InfDirAlt=Since version 3, it is possible to define an alternative root directory. This allows you to store, into a dedicated directory, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
+InfDirExample=<br>Then declare it in the file <strong>conf.php</strong><br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>If these lines are commented with "#", to enable them, just uncomment by removing the "#" character.
 YouCanSubmitFile=Bu adımda paketi göndermek için kullanacağınız araç: Modül dosyasını seç
 CurrentVersion=Dolibarr geçerli sürümü
 CallUpdatePage=Veritabanı yapısını ve verileri güncelleyen sayfaya git: %s.
 LastStableVersion=Son kararlı sürüm
-LastActivationDate=Son etkinleştirme tarihi
+LastActivationDate=Latest activation date
 UpdateServerOffline=Güncelleme sunucusu çevrimdışı
 GenericMaskCodes=Herhangi bir numaralandırma maskesi girebilirsiniz. Bu maskede alttaki etiketler kullanılabilir: <br><b>{000000}</ b> her %s te artırılacak bir numaraya karşılık gelir. Sayacın istenilen uzunluğu kadar çok sıfır girin. Sayaç, maskedeki kadar çok sayıda sıfır olacak şekilde soldan sıfırlarla tamamlanacaktır.<br><b>{000000+000}</b> önceki ile aynıdır fakat + işaretinin sağındaki sayıya denk gelen bir sapma ilk %s ten itibaren uygulanır.<br><b>{000000@x}</b> önceki ile aynıdır fakat sayaç x aya ulaşıldığında sıfırlanır (x= 1 ve 12 arasındadır veya yapılandırmada tanımlanan mali yılın ilk aylarını kullanmak için 0 dır). Bu seçenek kullanılırsa ve x= 2 veya daha yüksekse, {yyyy}{mm} veya {yyyy}{mm} dizisi de gereklidir.<br><b>{dd}</b> gün (01 ila 31).<br><b> {mm}</b> ay (01 ila 12).<br><b>{yy}</b>, <b>{yyyy}</b> veya <b>{y}</b> yıl 2, 4 veya 1 sayıları üzerindedir.<br>
 GenericMaskCodes2=<b>{cccc}</b> n Karakterdeki istemci kodu <br><b>{cccc000}</b> n Karakterdeki istemci kodu müşteri için özel bir sayaç tarafından takip edilmektedir. Müşteriye ayrılan bu sayaç, genel sayaçla aynı anda sıfırlanır.<br><b>{tttt}</b> n Karakterdeki üçüncü taraf türü kodu (bakınız sözlük-şirket türleri).<br>
@@ -373,11 +382,11 @@ ExtrafieldCheckBox=Onay kutusu
 ExtrafieldRadio=Onay düğmesi
 ExtrafieldCheckBoxFromList= Tablodan açılır kutu
 ExtrafieldLink=Bir nesneye bağlantı
-ExtrafieldParamHelpselect=Parametre listesi anahtar.değer gibi olmalı, örneğin <br><br> : <br>1,değer1<br>2,değer2<br>3,değer3<br>...<br><br>Başka bir listeye bağlı bir liste elde etmek için :<br>1,değer1|parent_list_code:parent_key<br>2,değer2|parent_list_code:parent_key
+ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list :<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list :<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=Parametre listesi anahtar.değer gibi olmalı, örneğin <br><br> : <br>1,değer1<br>2,değer2<br>3,değer3<br>...
 ExtrafieldParamHelpradio=Parametre listesi anahtar.değer gibi olmalı, örneğin <br><br> : <br>1,değer1<br>2,değer2<br>3,değer3<br>...
-ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
-ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
+ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Ölçütler ObjectName:Classpath<br>Syntax şeklinde olmalı :\nObjectName:Classpath<br>Örnek : Societe:societe/class/societe.class.php
 LibraryToBuildPDF=PDF oluşturmada kullanılan kütüphane
 WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
@@ -411,10 +420,11 @@ ModuleCompanyCodePanicum=Boş bir muhasebe kodu girin.
 ModuleCompanyCodeDigitaria=Muhasebe kodu üçüncü parti koduna bağlıdır. Kod üçüncü parti kodunun ilk 5 karakterini izleyen birinci konumda "C" karakterinden oluşmaktadır.
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Tutar (vergi öncesi) bu tutardan yüksekse 3 aşamalı bir onaylama kullanın...
-
+WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<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).
+ClickToShowDescription=Click to show description
 # Modules
 Module0Name=Kullanıcılar & gruplar
-Module0Desc=Kullanıcı ve grup yönetimi
+Module0Desc=Users / Employees and Groups management
 Module1Name=Üçüncü partiler
 Module1Desc=Firma ve kişi yönetimi (müşteriler, adaylar…)
 Module2Name=Ticaret
@@ -515,8 +525,8 @@ Module2200Name=Dinamik Fiyatlar
 Module2200Desc=Fiyatlar için matematik ifadelerin kullanımını etkinleştir
 Module2300Name=Kron
 Module2300Desc=Planlı iş yönetimi
-Module2400Name=Gündem/Etkinlikler
-Module2400Desc=Etkinlik ya da randevu izle. Etkinlikleri gündeme el ile kaydet ya da uygulama izleme amacı ile etkinlikleri otomatik kaydetsin.
+Module2400Name=Events/Agenda
+Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous.
 Module2500Name=Elektronik İçerik Yönetimi
 Module2500Desc=Belgeleri saklayın ve yönetin
 Module2600Name=API/Web hizmetleri (SOAP sunucusu)
@@ -582,7 +592,7 @@ Permission34=Ürün sil
 Permission36=Gizli ürünleri gör/yönet
 Permission38=Ürün dışaaktar
 Permission41=Proje ve görevleri oku (paylaşılan projeleri ve benim ilgilisi olduğum projeleri). Aynı zamanda verilen görevlerde harcanan süreleri de ekleyebilir (zaman çizelgeleri).
-Permission42=Proje oluştur/düzenle (paylaşılan projeler ve ilgilisi olduğum projeler)
+Permission42=Create/modify projects (shared project and projects i'm contact for). Can also create tasks and assign users to project and tasks
 Permission44=Proje sil (paylaşılan projeler ve ilgilisi olduğum projeler)
 Permission45=Projeleri dışaaktar
 Permission61=Müdahale oku
@@ -685,7 +695,7 @@ PermissionAdvanced253=İç/dış kullanıcı ve izinlerini oluştur/değiştir
 Permission254=Yalnızca dış kullanıcıları oluştur/değiştir
 Permission255=Diğer kullanıcıların şifrelerini değiştir
 Permission256=Diğer kullanıcıları sil ya da engelle
-Permission262=Erişimi bütün üçüncü partlere genişlet (yalnızca kullanıcıya bağlı olanları değil). Dış kullanıcılar için etkili değildir (her zaman kendileri ile sınırlıdır).
+Permission262=Extend access to all third parties (not only third parties that user is a sale representative).<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 assignement matters).
 Permission271=CA oku
 Permission272=Fatura oku
 Permission273=Fatura dağıt
@@ -887,7 +897,7 @@ Offset=Sapma
 AlwaysActive=Her zaman etkin
 Upgrade=Yükselt
 MenuUpgrade=Yükseltme / Genişletme
-AddExtensionThemeModuleOrOther=Uzantı ekle (Tema, modül, ...)
+AddExtensionThemeModuleOrOther=Deploy/install external module
 WebServer=Web sunucusu
 DocumentRootServer=Web sunucusu kök dizini
 DataRootServer=Veri dizini dosyaları
@@ -994,7 +1004,7 @@ TriggerAlwaysActive=Bu dosyadaki tetikleyiciler, etkin Dolibarr modülleri ne ol
 TriggerActiveAsModuleActive=Bu dosyadaki tetikleyiciler <b>%s</b> modülü etkinleştirildiğinde etkin olur.
 GeneratedPasswordDesc=Eğer otomatik olarak yeni bir parola oluşturmak isterseniz burada kullanmak istediğiniz kuralı tanımlayabilirsiniz.
 DictionaryDesc=Bütün referans verisini ekleyin. Değerlerinizi varsayılana ekleyebilirsiniz.
-ConstDesc=Bu sayfa, önceki sayfalarda mevcut olmayan diğer tüm parametreleri düzenleme olanağı sağlar. Geliştiriciler veya gelişmiş sorunbulma için ayrılmış parametrelerdir.
+ConstDesc=This page allows you to edit all other parameters not available in previous pages. These are mostly reserved parameters for developers or advanced troubleshooting. For a list of options <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">check here</a>.
 MiscellaneousDesc=Burada güvenlik ile ilgili diğer tüm parametreler tanımlanır.
 LimitsSetup=Sınırlar/Doğruluk kurulumu
 LimitsDesc=Burada Dolibarr’ın kullanımı için sınırlar, hassasiyet ve optimizasyon tanımlayabilirsiniz
@@ -1161,10 +1171,6 @@ FreeLegalTextOnOrders=Siparişte serbest metin
 WatermarkOnDraftOrders=Taslak siparişlerde filigran (boşsa yoktur)
 ShippableOrderIconInList=Sipariş listesine sevk edilebilir olup olmadığını belirten bir simge koyun
 BANK_ASK_PAYMENT_BANK_DURING_ORDER=Siparişe ait banka hesabını iste
-##### Clicktodial #####
-ClickToDialSetup=TıklaAra modülü kurulumu
-ClickToDialUrlDesc=Telefon resmi üzerine tıklandığında Url aranır. URL’de aranan kişinin telefon numarası ile değişecek <br><b>__PHONETO__</b> etiketini kullanabilirsiniz
-##### Bookmark4u #####
 ##### Interventions #####
 InterventionsSetup=Müdahaleler modülü kurulumu
 FreeLegalTextOnInterventions=Müdahale belgelerinde serbest metin
@@ -1391,7 +1397,7 @@ SendingsSetup=Gönderme modülü kurulumu
 SendingsReceiptModel=Makbuz gönderme modeli
 SendingsNumberingModules=Gönderi numaralandırma modülü
 SendingsAbility=Müşteri teslimatlarında sevkiyat tablolarını destekler
-NoNeedForDeliveryReceipts=Çoğu durumda, gönderilen fişler hem müşteri teslimatları (gönderilecek ürün listesi) hem de müşteri tarafından alınan ve imzalanan belgeler olarak kullanılır. Yani, ürün teslimat makbuzları çift kopya özelliğindedir ve nadiren etkinleştirilir.
+NoNeedForDeliveryReceipts=In most cases, shipping sheets are used both as sheets for customer deliveries (list of products to send) and sheets that is received and signed by customer. So product deliveries receipts is a duplicated feature and is rarely activated.
 FreeLegalTextOnShippings=Sevkiyatlarda serbest metin
 ##### Deliveries #####
 DeliveryOrderNumberingModules=Ürün teslimat fişlerinde numaralandırma modülü
@@ -1471,7 +1477,11 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Etkinlik oluşturma formundaki etkinlik türü iç
 AGENDA_DEFAULT_FILTER_TYPE=Gündem görünümü arama süzgeçinde, etkinlikler için otomatik olarak bu etkinlik türünü ayarlar
 AGENDA_DEFAULT_FILTER_STATUS=Gündem görünümü arama süzgeçinde, etkinlikler için otomatik olarak bu durum türünü ayarlar
 AGENDA_DEFAULT_VIEW=Gündem menüsünü seçtiğinizde varsayılan olarak hangi sekmenin açılmasını istiyorsunuz
-##### ClickToDial #####
+AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
+AGENDA_NOTIFICATION_SOUND=Enable sound notification
+##### Clicktodial #####
+ClickToDialSetup=TıklaAra modülü kurulumu
+ClickToDialUrlDesc=Telefon resmi üzerine tıklandığında Url aranır. URL’de aranan kişinin telefon numarası ile değişecek <br><b>__PHONETO__</b> etiketini kullanabilirsiniz
 ClickToDialDesc=Bu modül telefon numaralarının tıklanabilmesini sağlar. Bu simgeye tıklanma telefonunuz ile bu telefonun aranmasını sağlar. Bu işlem Dolibarr'dan bir çağrı merkezini aramak için kullanılır, örneğin SIP sisteminde bir telefon numarasının aranması.
 ClickToDialUseTelLink=Telefon numaraları üzerinde yalnızca bir "tel:" linki kullan
 ClickToDialUseTelLinkDesc=Eğer kullanıcılarınız bir softphone ya da web tarayıcıdan farklı olarak aynı bilgisayarda kurulu bir arayüz kullanıyorsa ve web tarayıcınızda "tel:" ile başlayan bir köprü tıklandığında aranıyorsa bu yöntemi kullanın. Tam bir sunucu çözümüne gereksiniminiz varsa (yerel yazılım kurulumu gereksinimi olmadan) bunu "HAYIR" olarak ayarlayın ve sonraki alanı doldurun.
@@ -1499,10 +1509,11 @@ EndPointIs=SOAP istemcileri isteklerini URL de varolan Dolibarr uç noktasına g
 ##### API ####
 ApiSetup=API modül ayarları
 ApiDesc=Bu modül etkinleştirilerek Dolibarr çeşitli web hizmetlerini sağlayan bir REST sunucusu haline getirilir.
-ApiProductionMode=Üretim modunu etkinleştir (Bu hizmetlerin yönetimi için önbellek kullanımını etkinleştirir)
+ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
 ApiExporerIs=API leri url de keşfedebilirsiniz
 OnlyActiveElementsAreExposed=Yalnızca etkin modüllerdeki öğeler gösterilir
 ApiKey=API için anahtar
+WarningAPIExplorerDisabled=The API explorer has been disabled. API explorer is not required to provide API services. It is a tool for developer to find/test REST APIs. If you need this tool, go into setup of module API REST to activate it.
 ##### Bank #####
 BankSetupModule=Banka modülü kurulumu
 FreeLegalTextOnChequeReceipts=Çek makbuzlarının üzerinde serbest metin
@@ -1571,7 +1582,7 @@ 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:
 SomethingMakeInstallFromWebNotPossible2=Bu nedenle, burada anlatılan yükseltme işlemi yalnızca ayrıcalıklı bir kullanıcın elle atacağı adımlardır.
 InstallModuleFromWebHasBeenDisabledByFile=Dış modülün uygulama içerisinden kurulumu yöneticiniz tarafından engellenmiştir. Bu özelliğe izin verilmesi için ondan <strong>%s</strong> dosyasını kaldırmasını istemelisiniz.
-ConfFileMuseContainCustom=Uygulama içinden dış modül kurarken modül dosyalarını bu dizine kaydedin: <strong>%s</strong>. Bu dizinin Dolibar tarafından işlenebilmesi için önce <strong>conf/conf.php</strong> dosyanızı ayarlamalısınız ki böylece<br> <strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong> seçeneklerini elde edin
+ConfFileMuseContainCustom=Installing an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Tablo satırlarını fare üzerine geldiğinde vurgula
 HighlightLinesColor=Fare üzerinden geçerken satır rengini vurgula (vurgulanmaması için boş bırakın)
 TextTitleColor=Sayfa başlık rengi
@@ -1601,6 +1612,7 @@ FixTZ=Saat Dilimi Farkı
 FillFixTZOnlyIfRequired=Örnek: +2 (yalnızca sorun yaşanmışsa doldurun)
 ExpectedChecksum=Beklenen Sağlama
 CurrentChecksum=Geçerli Sağlama
+ForcedConstants=Required constant values
 MailToSendProposal=Müşteri teklifi göndermek için
 MailToSendOrder=Müşteri siparişi göndermek için
 MailToSendInvoice=Müşteri faturası göndermek için
@@ -1609,13 +1621,14 @@ MailToSendIntervention=Müdahale göndermek için
 MailToSendSupplierRequestForQuotation=Tedarikçiye teklif isteği göndermek için
 MailToSendSupplierOrder=Tedarikçi siparişi göndermek için
 MailToSendSupplierInvoice=Tedarikçi faturası göndermek için
+MailToSendContract=To send a contract
 MailToThirdparty=Üçüncü taraf sayfasından eposta göndermek için
 ByDefaultInList=Liste görünümünde varsayılana göre göster
-YouUseLastStableVersion=Son kararlı sürümü kullanın
+YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=Bu ana sürümü duyurmak için kullanabileceğiniz mesaj örneği (web sitenizde rahatça kullanabilirsiniz)
 TitleExampleForMaintenanceRelease=Bu bakım sürümü duyurmak için kullanabileceğiniz mesaj örneği (web sitenizde rahatça kullanabilirsiniz)
-ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s hazırdır. Sürüm %s hem kullanıcılar, hem de geliştiriciler için bir çok yeni özellik içeren bir ana sürümdür. Bu sürümü http://www.dolibarr.org (Kararlı sürümler alt dizininden) portalının indirme alanından yükleyebilirsiniz. Değişiklerin tam listesini incelemek için <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> adresine bakabilirsiniz.
-ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s hazırdır. Sürüm %s bir bakım sürümü olup yalnızca hataların onarımını içerir. Daha eski bir sürüm kullanan herkesin bu sürüme yükselmesini öneririz. Her bakım sürümünde olduğu gibi, bu sürümde de ne yeni özellik ne de veri yapısı değişikliği vardır. Bu sürümü http://www.dolibarr.org (Kararlı sürümler alt dizininden) portalının indirmeler alanından yükleyebilirsiniz. Tam değişiklik listesini incelemek için <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> adresine bakabilirsiniz.
+ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. 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.
+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, nor data structure change is present into 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="Her ürün/hizmet için çok seviyeli fiyat" açık ise her ürün için farklı fiyatlar (her fiyat seviyesi için bir) tanımlayabilirsiniz. Zaman kazanmak için, burada, temel fiyata göre her seviye için kendiliğinden hesaplama yapılması için kural girebilirisiniz. Bu sayfa zaman kazanmanız için vardır ve yalnzca diğer fiyat seviyeleri temel fiyata bağlı ise kullanışlıdır. Çoğu durumda bu sayfayı gözardı edebilirsiniz.
 ModelModulesProduct=Ürün belgeleri için şablonlar
 ToGenerateCodeDefineAutomaticRuleFirst=Otomatik kodlar oluşturabilmek için önce otomatik olarak barkod numarası tanımlayacak bir yönetici tanımlamalısınız.
diff --git a/htdocs/langs/tr_TR/banks.lang b/htdocs/langs/tr_TR/banks.lang
index 9c96778238a..96f9a3f579f 100644
--- a/htdocs/langs/tr_TR/banks.lang
+++ b/htdocs/langs/tr_TR/banks.lang
@@ -74,7 +74,7 @@ Conciliate=Uzlaştır
 Conciliation=Uzlaşma
 ReconciliationLate=Reconciliation late
 IncludeClosedAccount=Kapalı hesapları içer
-OnlyOpenedAccount=Yalnızca açık hesaplar
+OnlyOpenedAccount=Sadece açık hesapları
 AccountToCredit=Alacak hesabı
 AccountToDebit=Borç hesabı
 DisableConciliation=Bu hesap için uzlaşma özelliğini engelle
diff --git a/htdocs/langs/tr_TR/bills.lang b/htdocs/langs/tr_TR/bills.lang
index 34870de77dd..784baaaa1cb 100644
--- a/htdocs/langs/tr_TR/bills.lang
+++ b/htdocs/langs/tr_TR/bills.lang
@@ -5,9 +5,9 @@ BillsCustomers=Müşteri faturaları
 BillsCustomer=Müşteri faturası
 BillsSuppliers=Tedarikçi faturaları
 BillsCustomersUnpaid=Ödenmemiş müşteri faturaları
-BillsCustomersUnpaidForCompany=%s için ödenmemiş müşteri faturaları
+BillsCustomersUnpaidForCompany=Unpaid customer invoices for %s
 BillsSuppliersUnpaid=Ödenmemiş tedarikçi faturaları
-BillsSuppliersUnpaidForCompany=%s için ödenmemiş tedarikçi faturaları
+BillsSuppliersUnpaidForCompany=Unpaid supplier invoices for %s
 BillsLate=Geç ödemeler
 BillsStatistics=Müşteri faturaları istatistikleri
 BillsStatisticsSuppliers=Tedarikçi faturaları istatistikleri
@@ -63,7 +63,7 @@ paymentInInvoiceCurrency=fatura para biriminde
 PaidBack=Geri ödenen
 DeletePayment=Ödeme sil
 ConfirmDeletePayment=Bu ödemeyi silmek istediğinizden emin misiniz?
-ConfirmConvertToReduc=Bu iade faturasını ya da nakit avans faturasını mutlak bir indirime dönüştürmek istiyor musunuz? <br> Bu tutar diğer indirimlerin arasına kaydedilecek olup bu müşteri için mevcut ya da ileride kesilecek faturada indirim olarak kullanılabilecektir.
+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.
 SupplierPayments=Tedarikçi ödemeleri
 ReceivedPayments=Alınan ödemeler
 ReceivedCustomersPayments=Müşterilerden alınan ödemeler
@@ -78,6 +78,7 @@ PaymentMode=Ödeme türü
 PaymentTypeDC=Debit/Credit Card
 PaymentTypePP=PayPal
 IdPaymentMode=Ödeme türü (id)
+CodePaymentMode=Payment type (code)
 LabelPaymentMode=Ödeme türü (etiket)
 PaymentModeShort=Ödeme türü
 PaymentTerm=Ödeme koşulu
@@ -102,9 +103,10 @@ SearchACustomerInvoice=Müşteri faturası ara
 SearchASupplierInvoice=Tedarikçi faturası ara
 CancelBill=Fatura iptal et
 SendRemindByMail=EPosta ile anımsatma gönder
-DoPayment=Ödeme yap
-DoPaymentBack=Geri ödeme yap
+DoPayment=Enter payment
+DoPaymentBack=Enter refund
 ConvertToReduc=Gelecekteki indirime dönüştür
+ConvertExcessReceivedToReduc=Convert excess received into future discount
 EnterPaymentReceivedFromCustomer=Müşteriden alınan ödeme girin
 EnterPaymentDueToCustomer=Müşteri nedeniyle ödeme yap
 DisabledBecauseRemainderToPayIsZero=Ödenmemiş kalan sıfır olduğundan devre dışı
@@ -113,22 +115,24 @@ BillStatus=Fatura durumu
 StatusOfGeneratedInvoices=Oluşturulan faturaların durumu
 BillStatusDraft=Taslak (doğrulanma gerektirir)
 BillStatusPaid=Ödenmiş
-BillStatusPaidBackOrConverted=Ödenmiş ya da indirime dönüştürülmüş
+BillStatusPaidBackOrConverted=Refund or converted into discount
 BillStatusConverted=Ödenmiş (son fatura için hazır)
 BillStatusCanceled=Terkedilmiş
 BillStatusValidated=Doğrulanmış (ödenmesi gerekir)
 BillStatusStarted=Başlamış
 BillStatusNotPaid=Ödenmemiş
+BillStatusNotRefunded=Not refunded
 BillStatusClosedUnpaid=Kapalı (ödenmemiş)
 BillStatusClosedPaidPartially=Ödenmiş (kısmen)
 BillShortStatusDraft=Taslak
 BillShortStatusPaid=Ödenmiş
-BillShortStatusPaidBackOrConverted=İşlenmiş
+BillShortStatusPaidBackOrConverted=Refund or converted
 BillShortStatusConverted=İşlenmiş
 BillShortStatusCanceled=Terkedilmiş
 BillShortStatusValidated=Doğrulanmış
 BillShortStatusStarted=Başlamış
 BillShortStatusNotPaid=Ödenmemiş
+BillShortStatusNotRefunded=Not refunded
 BillShortStatusClosedUnpaid=Kapalı
 BillShortStatusClosedPaidPartially=Ödenmiş (Kısmen)
 PaymentStatusToValidShort=Doğrulanacak
@@ -149,14 +153,14 @@ NoQualifiedRecurringInvoiceTemplateFound=Oluşturmak için gerekli nitelikte yin
 FoundXQualifiedRecurringInvoiceTemplate=Oluşturmak için gerekli nitelikte %s yinelenen fatura(lar) şablonu bulundu.
 NotARecurringInvoiceTemplate=Bir yinelenen fatura şablonu değil
 NewBill=Yeni fatura
-LastBills=Son %s fatura
-LastCustomersBills=Son %s müşteri faturası
-LastSuppliersBills=Son %s tedarikçi faturası
+LastBills=Latest %s invoices
+LastCustomersBills=Latest %s customer invoices
+LastSuppliersBills=Latest %s supplier invoices
 AllBills=Tüm faturalar
 OtherBills=Diğer faturalar
 DraftBills=Taslak faturalar
-CustomersDraftInvoices=Müşteri taslak faturaları
-SuppliersDraftInvoices=Tedarikçi taslak faturaları
+CustomersDraftInvoices=Customer draft invoices
+SuppliersDraftInvoices=Supplier draft invoices
 Unpaid=Ödenmemiş
 ConfirmDeleteBill=Bu faturayı silmek istediğinizden emin misiniz?
 ConfirmValidateBill=<b>%s</b> referanslı bu faturayı doğrulamak istediğiniz emin misiniz?
@@ -203,7 +207,7 @@ AlreadyPaidNoCreditNotesNoDeposits=Zaten ödenmiş (iade faturası ve nakit avan
 Abandoned=Terkedilen
 RemainderToPay=Ödenmemiş kalan
 RemainderToTake=Alınacak kalan tutar
-RemainderToPayBack=Geri ödenecek kalan tutar
+RemainderToPayBack=Remaining amount to refund
 Rest=Bekleyen
 AmountExpected=İstenen tutar
 ExcessReceived=Fazla alınan
@@ -270,6 +274,7 @@ Deposit=Nakit avans
 Deposits=Nakit avanslar
 DiscountFromCreditNote=İade faturası %s ten indirim
 DiscountFromDeposit=%s nakit avans faturasından ödemeler
+DiscountFromExcessReceived=Payments from excess received of invoice %s
 AbsoluteDiscountUse=Bu tür alacak fatura onaylanmadan önce faturada kullanılabilir
 CreditNoteDepositUse=Bu türde alacakları kullanmadan önce fatura doğrulanmış olmalıdır
 NewGlobalDiscount=Yeni mutlak indirim
@@ -277,8 +282,8 @@ NewRelativeDiscount=Yeni göreceli indirim
 NoteReason=Not/Nedeni
 ReasonDiscount=Neden
 DiscountOfferedBy=Veren
-DiscountStillRemaining=Hala kalan indirim var
-DiscountAlreadyCounted=İndirim zaten sayıldı
+DiscountStillRemaining=Discounts available
+DiscountAlreadyCounted=Discounts already consumed
 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.
@@ -331,10 +336,12 @@ InvoiceAutoValidate=Faturaları otomatik olarak doğrula
 GeneratedFromRecurringInvoice=Şablondan oluşturulan yinelenen fatura %s
 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=Warning, the invoice date is too far from current date
 # PaymentConditions
 Statut=Durumu
-PaymentConditionShortRECEP=Derhal
-PaymentConditionRECEP=Derhal
+PaymentConditionShortRECEP=Due Upon Receipt
+PaymentConditionRECEP=Due Upon Receipt
 PaymentConditionShort30D=30 gün
 PaymentCondition30D=30 gün
 PaymentConditionShort30DENDMONTH=Ay sonunda 30 gün
@@ -349,6 +356,14 @@ PaymentConditionShortPT_ORDER=Sipariş
 PaymentConditionPT_ORDER=Siparişle
 PaymentConditionShortPT_5050=50-50
 PaymentConditionPT_5050=50%% peşin, 50%% teslimatta
+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
 FixAmount=Sabit tutar
 VarAmount=Değişken tutar (%% top.)
 # PaymentType
@@ -418,7 +433,7 @@ ChequeDeposits=Çek hesapları
 Cheques=Çekler
 DepositId=Depozit Kimliği
 NbCheque=Çek sayısı
-CreditNoteConvertedIntoDiscount=Bu iade faturası ya da nakit avans faturası %s durumuna dönüştürüldü
+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
 ShowUnpaidAll=Tüm ödenmemiş faturaları göster
 ShowUnpaidLateOnly=Ödenmemiş bütün faturaları göster
diff --git a/htdocs/langs/tr_TR/boxes.lang b/htdocs/langs/tr_TR/boxes.lang
index 889c1c80aab..83ab874ff32 100644
--- a/htdocs/langs/tr_TR/boxes.lang
+++ b/htdocs/langs/tr_TR/boxes.lang
@@ -25,8 +25,8 @@ BoxTitleLastSuppliers=Kaydedilen son %s tedarikçi
 BoxTitleLastModifiedSuppliers=Değiştirilen son %s tedarikçi
 BoxTitleLastModifiedCustomers=Değiştirilen son %s müşteri
 BoxTitleLastCustomersOrProspects=Son %s müşteri veya aday
-BoxTitleLastCustomerBills=Son %s müşteri faturası
-BoxTitleLastSupplierBills=Son %s tedarikçi faturası
+BoxTitleLastCustomerBills=Latest %s customer invoices
+BoxTitleLastSupplierBills=Latest %s supplier invoices
 BoxTitleLastModifiedProspects=Değiştirilen son %s aday
 BoxTitleLastModifiedMembers=Son %s üye
 BoxTitleLastFicheInter=Değiştirilen son %s müdahale
@@ -51,12 +51,12 @@ ClickToAdd=Eklemek için buraya tıklayın.
 NoRecordedCustomers=Kayıtlı müşteri yok
 NoRecordedContacts=Kayıtlı kişi yok
 NoActionsToDo=Yapılacak eylem yok
-NoRecordedOrders=Kayıtlı müşteri siparişi yok
+NoRecordedOrders=No recorded customer orders
 NoRecordedProposals=Kayıtlı teklif yok
-NoRecordedInvoices=Kayıtlı müşteri faturası yok
-NoUnpaidCustomerBills=Ödenmemiş müşteri faturası yok
-NoUnpaidSupplierBills=Ödenmemiş tedarikçi faturası yok
-NoModifiedSupplierBills=Değiştirilen tedarikçi faturası yok
+NoRecordedInvoices=No recorded customer invoices
+NoUnpaidCustomerBills=No unpaid customer invoices
+NoUnpaidSupplierBills=No unpaid supplier invoices
+NoModifiedSupplierBills=No recorded supplier invoices
 NoRecordedProducts=Kayıtlı ürün/hizmet yok
 NoRecordedProspects=Kayıtlı aday yok
 NoContractedProducts=Sözleşmeli ürün/hizmet yok
diff --git a/htdocs/langs/tr_TR/companies.lang b/htdocs/langs/tr_TR/companies.lang
index 1a9e6cf3b3c..d6d156ad563 100644
--- a/htdocs/langs/tr_TR/companies.lang
+++ b/htdocs/langs/tr_TR/companies.lang
@@ -78,6 +78,10 @@ VATIsNotUsed=KDV kullanılmaz
 CopyAddressFromSoc=Fill address with third party address
 ThirdpartyNotCustomerNotSupplierSoNoRef=Üçüncü taraf ne müşteri ne de tedarikçidir, bağlanacak uygun bir öğe yok.
 PaymentBankAccount=Payment bank account
+OverAllProposals=Total proposals
+OverAllOrders=Total orders
+OverAllInvoices=Total invoices
+OverAllSupplierProposals=Total price requests
 ##### Local Taxes #####
 LocalTax1IsUsed=İkinci vergiyi kullan
 LocalTax1IsUsedES= RE kullanılır
@@ -239,6 +243,10 @@ ProfId3RU=Prof Id 3 (KPP)
 ProfId4RU=Prof Id 4 (OKPO)
 ProfId5RU=-
 ProfId6RU=-
+ProfId1DZ=RC
+ProfId2DZ=Art.
+ProfId3DZ=NIF
+ProfId4DZ=NIS
 VATIntra=Vergi numarası
 VATIntraShort=Vergi numarası
 VATIntraSyntaxIsValid=Sözdizimi geçerli
@@ -384,6 +392,7 @@ LastModifiedThirdParties=Değiştirilen son %s üçüncü parti
 UniqueThirdParties=Toplam benzersiz üçüncü parti
 InActivity=Açık
 ActivityCeased=Kapalı
+ThirdPartyIsClosed=Third party is closed
 ProductsIntoElements=%s içindeki ürünler/hizmetler listesi
 CurrentOutstandingBill=Geçerli bekleyen fatura
 OutstandingBill=Ödenmemiş fatura için ençok tutar
@@ -396,7 +405,7 @@ MergeThirdparties=Üçüncü partileri birleştir
 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 so you will be able to delete the duplicate one.
 ThirdpartiesMergeSuccess=Üçüncü taraflar birleştirilmiştir
 SaleRepresentativeLogin=Satış temsilcisinin kullanıcı adı
-SaleRepresentativeFirstname=Satış temsilcisinin ilkadı
-SaleRepresentativeLastname=Satış temsilcisinin soyadı
+SaleRepresentativeFirstname=First name of sales representative
+SaleRepresentativeLastname=Last name of sales representative
 ErrorThirdpartiesMerge=Üçüncü taraf silinirken bir hata oluştu. Lütfen kayıtları inceleyin. Değişiklikler geri alındı.
 NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/tr_TR/compta.lang b/htdocs/langs/tr_TR/compta.lang
index 9a1e93c4ba8..38639e13bcc 100644
--- a/htdocs/langs/tr_TR/compta.lang
+++ b/htdocs/langs/tr_TR/compta.lang
@@ -65,6 +65,7 @@ PaymentSocialContribution=Sosyal/mali vergi ödemesi
 PaymentVat=KDV ödeme
 ListPayment=Ödemeler listesi
 ListOfCustomerPayments=Müşteri ödemeleri listesi
+ListOfSupplierPayments=Tedarikçi ödemeleri listesi
 DateStartPeriod=Başlangıç dönemi tarihi
 DateEndPeriod=Bitiş dönemi tarihi
 newLT1Payment=Yeni vergi 2 ödemesi
@@ -81,7 +82,7 @@ LT2PaymentES=IRPF Ödemesi
 LT2PaymentsES=IRPF Ödemeleri
 VATPayment=Satış vergisi ödemesi
 VATPayments=Satış vergisi ödemeleri
-VATRefund=Satış vergisi iadesi
+VATRefund=Sales tax refund
 Refund=İade
 SocialContributionsPayments=Sosyal/mali vergi ödemeleri
 ShowVatPayment=KDV ödemesi göster
@@ -194,7 +195,7 @@ CloneTax=Sosyal/mali vergi kopyala
 ConfirmCloneTax=Sosyal/mali vergi ödemesi kopyalamasını onayla
 CloneTaxForNextMonth=Sonraki aya kopyala
 SimpleReport=Basit rapor
-AddExtraReport=Ekstra raporlar
+AddExtraReport=Extra reports (add foreign and national customer report)
 OtherCountriesCustomersReport=Yabancı müşteri raporu
 BasedOnTwoFirstLettersOfVATNumberBeingDifferentFromYourCompanyCountry=Kendi firmanızın ülke kodundan farklı olan KDV sinin ilk iki harfine dayanan
 SameCountryCustomersWithVAT=Yerli müşteri raporu
diff --git a/htdocs/langs/tr_TR/cron.lang b/htdocs/langs/tr_TR/cron.lang
index bf06ba93a52..43d9ce91177 100644
--- a/htdocs/langs/tr_TR/cron.lang
+++ b/htdocs/langs/tr_TR/cron.lang
@@ -17,14 +17,14 @@ CronMethodDoesNotExists=Sınıf %s hiçbir %s yöntemi içermiyor
 # Menu
 EnabledAndDisabled=Etkin ve engelli
 # Page list
-CronLastOutput=Son çalıştırma çıktısı
-CronLastResult=Son sonuç kodu
+CronLastOutput=Latest run output
+CronLastResult=Latest result code
 CronCommand=Komut
 CronList=Planlı işler
 CronDelete=Planlı işleri sil
-CronConfirmDelete=Bu planlı işleri silmek istediğinizden emin misiniz?
+CronConfirmDelete=Are you sure you want to delete these scheduled jobs?
 CronExecute=Planlı işleri yükle
-CronConfirmExecute=Bu planlı işleri şimdi yürütmek istediğinizden emin misiniz?
+CronConfirmExecute=Are you sure you want to execute these scheduled jobs now?
 CronInfo=Planlı iş modülü planlanmış işlerin yürütülmesini sağlar
 CronTask=İş
 CronNone=Hiçbiri
diff --git a/htdocs/langs/tr_TR/errors.lang b/htdocs/langs/tr_TR/errors.lang
index 93527d23612..287807daf9b 100644
--- a/htdocs/langs/tr_TR/errors.lang
+++ b/htdocs/langs/tr_TR/errors.lang
@@ -11,6 +11,7 @@ ErrorLoginAlreadyExists=%s kullanıcı adı zaten var.
 ErrorGroupAlreadyExists=%s Grubu zaten var.
 ErrorRecordNotFound=Kayıt bulunamadı.
 ErrorFailToCopyFile='<b>%s</b>' dosyası '<b>%s</b>' içine kopyalanamadı.
+ErrorFailToCopyDir=Failed to copy directory '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToRenameFile='<b>%s</b>' dosyasının adı '<b>%s</b>' olarak değiştirilemedi.
 ErrorFailToDeleteFile='<b>%s</b>' dosyası kaldırılamadı
 ErrorFailToCreateFile='<b>%s</b>' dosyası oluşturulamadı
@@ -115,7 +116,7 @@ ErrorNoActivatedBarcode=Etkinleştirilmiş barkod türü yok
 ErrUnzipFails=% ZipArchive ile sıkıştırılamıyor
 ErrNoZipEngine=Bu PHP deki %s dosyası ayıklamak için motor yok
 ErrorFileMustBeADolibarrPackage=Bu %s dosyası bir Dolibarr zip paketi olmalıdır
-ErrorFileRequired=Bir Dolibar dosyası paketi alıyor
+ErrorModuleFileRequired=You must select a Dolibarr module package file
 ErrorPhpCurlNotInstalled=PHP CURL kurulu değil, Bu PayPal ile iletişim kurmak için gereklidir
 ErrorFailedToAddToMailmanList=Mailman listesine ya da SPIP tabanına kayıt eklenemiyor
 ErrorFailedToRemoveToMailmanList=%s kaydının Mailman %s listesine ya da SPIP tabanına taşınmasında hata
@@ -170,14 +171,19 @@ ErrorWarehouseRequiredIntoShipmentLine=Depo gemi hattı üzerinde gerekli
 ErrorFileMustHaveFormat=Dosya %s biçiminde olmalıdır
 ErrorSupplierCountryIsNotDefined=Bu tedarikçi için ülke tanımlanmamış. Önce bunu düzeltin.
 ErrorsThirdpartyMerge=İki kaydın birleştirilmesinde hata. İstek iptal edildi.
-ErrorStockIsNotEnoughToAddProductOnOrder=Yeni bir siparişe ürün eklemek için %s ürünü stok düzeyi yeterli değildir.
-ErrorStockIsNotEnoughToAddProductOnInvoice=Yeni bir faturaya ürün eklemek için %s ürünü stok düzeyi yeterli değildir.
-ErrorStockIsNotEnoughToAddProductOnShipment=Yeni bir sevkiyata ürün eklemek için %s ürünü stok düzeyi yeterli değildir.
-ErrorStockIsNotEnoughToAddProductOnProposal=Yeni bir teklife ürün eklemek için %s ürünü stok düzeyi yeterli değildir.
-ErrorFailedToLoadLoginFileForMode=Mod '%s' için kullanıcı girişi dosyası alınamadı.
+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=Modül dosyası bulunamadı.
 ErrorFieldAccountNotDefinedForBankLine=Kaynak bankanın %s satırı için Muhasebe hesabı değeri tanımlanmamış
 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>
 
 # 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.
diff --git a/htdocs/langs/tr_TR/holiday.lang b/htdocs/langs/tr_TR/holiday.lang
index 5a849682fef..525f1475fd9 100644
--- a/htdocs/langs/tr_TR/holiday.lang
+++ b/htdocs/langs/tr_TR/holiday.lang
@@ -76,8 +76,9 @@ BoxTitleLastLeaveRequests=Değiştirilen son %s izin isteği
 HolidaysMonthlyUpdate=Aylık güncelleme
 ManualUpdate=Elle güncelleme
 HolidaysCancelation=İzin isteği iptali
-EmployeeLastname=Çalışanın soyadı
-EmployeeFirstname=Çalışanın adı
+EmployeeLastname=Employee last name
+EmployeeFirstname=Employee first name
+TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
 
 ## Configuration du Module ##
 LastUpdateCP=İzin tahsislerinin son otomatik güncellenmesi
diff --git a/htdocs/langs/tr_TR/ldap.lang b/htdocs/langs/tr_TR/ldap.lang
index c69d9132a2a..a4531cec157 100644
--- a/htdocs/langs/tr_TR/ldap.lang
+++ b/htdocs/langs/tr_TR/ldap.lang
@@ -13,8 +13,8 @@ LDAPUsers=LDAP veritabanındaki kullanıcılar
 LDAPFieldStatus=Durum
 LDAPFieldFirstSubscriptionDate=İlk abonelik tarihi
 LDAPFieldFirstSubscriptionAmount=İlk abonelik tutarı
-LDAPFieldLastSubscriptionDate=Son abonelik tarihi
-LDAPFieldLastSubscriptionAmount=Son abonelik tutarı
+LDAPFieldLastSubscriptionDate=Latest subscription date
+LDAPFieldLastSubscriptionAmount=Latest subscription amount
 LDAPFieldSkype=Skype kimliği
 LDAPFieldSkypeExample=Örnek: skypeAdı
 UserSynchronized=Kullanıcı senkronize edildi
diff --git a/htdocs/langs/tr_TR/mails.lang b/htdocs/langs/tr_TR/mails.lang
index 8be013ced98..b4fbbaba046 100644
--- a/htdocs/langs/tr_TR/mails.lang
+++ b/htdocs/langs/tr_TR/mails.lang
@@ -35,7 +35,7 @@ MailingStatusSentPartialy=Kısmen gönderildi
 MailingStatusSentCompletely=Tamamen gönderildi
 MailingStatusError=Hata
 MailingStatusNotSent=Gönderilmedi
-MailSuccessfulySent=Eposta başarıyla gönderildi (%s ten %s e)
+MailSuccessfulySent=Email successfully accepted for delivery (from %s to %s)
 MailingSuccessfullyValidated=Eposta doğrulanması başarılı
 MailUnsubcribe=Aboneliği kaldır
 MailingStatusNotContact=Bir daha görüşme
@@ -74,22 +74,28 @@ ResultOfMailSending=Toplu Eposta gönderimi sonuçu
 NbSelected=Seçilen sayısı
 NbIgnored=Yoksayılan sayısı
 NbSent=Gönderilen sayısı
+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
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Satır %s dosyası
 RecipientSelectionModules=Alıcıların seçimine göre tanımlanmış istekler
 MailSelectedRecipients=Seçilen alıcılar
 MailingArea=Eposta alanı
-LastMailings=Son %s eposta
+LastMailings=Latest %s emailings
 TargetsStatistics=Hedef istatistikleri
 NbOfCompaniesContacts=Benzersiz kişiler/adresler
 MailNoChangePossible=Doğrulanmış epostaların alıcıları değiştirilemez
 SearchAMailing=Eposta ara
 SendMailing=E-posta gönder
 SendMail=E-posta gönder
-MailingNeedCommand=Güvenlik nedeni ile, Eposta gönderiminin komut satırından yapılması daha iyidir. Bütün posta alıcılarına eposta göndermek için sunucu yönetcisinden aşağıdaki komutu başlatmasını isteyin:
+SentBy=Gönderen
+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=Bunula birlikte, oturum tarafından gönderilecek ençok Eposta sayılı MAILING_LIMIT_SENDBYWEB parametresini ekleyerek çevrim içi olarak gönderebilirsiniz. Bunu için Giriş-Kurulum-Diğer menüsüne gidin.
-ConfirmSendingEmailing=If you can't or prefer sending them with your www browser, please confirm you are sure you want to send emailing now from your browser?
+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=Not: Web arayüzünden eposta gönderimi güvenlik ve süre aşımı yüzünden birçok kez yapılmıştır, her gönderme oturumu başına <b>%s<b> alıcıya
 TargetsReset=Listeyi temizle
 ToClearAllRecipientsClickHere=Bu e-posta Alıcı listesini temizlemek için burayı tıkla
@@ -144,3 +150,6 @@ AdvTgtCreateFilter=Süzgeç oluştur
 AdvTgtOrCreateNewFilter=Yeni süzgeç adı
 NoContactWithCategoryFound=Kategorisi olan hiç bir kişi/adres bulunamadı
 NoContactLinkedToThirdpartieWithCategoryFound=Kategorisi olan hiç bir kişi/adres bulunamadı
+OutGoingEmailSetup=Outgoing email setup
+InGoingEmailSetup=Incoming email setup
+
diff --git a/htdocs/langs/tr_TR/main.lang b/htdocs/langs/tr_TR/main.lang
index 19d44476bb3..bf36b1fa09c 100644
--- a/htdocs/langs/tr_TR/main.lang
+++ b/htdocs/langs/tr_TR/main.lang
@@ -63,11 +63,13 @@ ErrorNoVATRateDefinedForSellerCountry=Hata, ülke '%s' için herhangi bir KDV or
 ErrorNoSocialContributionForSellerCountry=Hata, '%s' ülkesi için sosyal/mali vergi tipi tanımlanmamış.
 ErrorFailedToSaveFile=Hata, dosya kaydedilemedi.
 ErrorCannotAddThisParentWarehouse=You are trying to add a parent warehouse which is already a child of current one
+MaxNbOfRecordPerPage=Max nb of record per page
 NotAuthorized=Bunu yapmak için yetkiniz yok.
 SetDate=Ayar tarihi
 SelectDate=Bir tarih seç
 SeeAlso=Buna da bakın %s
 SeeHere=Buraya bak
+Apply=Uygula
 BackgroundColorByDefault=Varsayılan arkaplan rengi
 FileRenamed=Dosya adı değiştirilmesi başarılı
 FileUploaded=Dosya yüklemesi başarılı
@@ -86,7 +88,7 @@ Undefined=Tanımlanmamış
 PasswordForgotten=Parola mı unutuldu?
 SeeAbove=Yukarı bak
 HomeArea=Giriş alanı
-LastConnexion=Son bağlantı
+LastConnexion=Latest connection
 PreviousConnexion=Önceki bağlantı
 PreviousValue=Önceki değer
 ConnectedOnMultiCompany=Çevreye bağlanmış
@@ -236,7 +238,7 @@ DateCreation=Oluşturma tarihi
 DateCreationShort=Oluşt. tarihi
 DateModification=Değiştirme tarihi
 DateModificationShort=Değiş. tarihi
-DateLastModification=Son değiştirme tarihi
+DateLastModification=Latest modification date
 DateValidation=Doğrulama tarihi
 DateClosing=Kapanış tarihi
 DateDue=Vade tarihi
@@ -432,7 +434,7 @@ Reportings=Raporlama
 Draft=Taslak
 Drafts=Taslaklar
 Validated=Doğrulanmış
-Opened=Aç
+Opened=Açık
 New=Yeni
 Discount=İndirim
 Unknown=Bilinmeyen
@@ -460,6 +462,7 @@ DeletePicture=Resim sil
 ConfirmDeletePicture=Resim silmeyi onayla
 Login=Oturum açma
 CurrentLogin=Geçerli kullanıcı
+EnterLoginDetail=Enter login details
 January=Ocak
 February=Şubat
 March=Mart
@@ -597,6 +600,8 @@ SessionName=Oturum adı
 Method=Yöntem
 Receive=Al
 CompleteOrNoMoreReceptionExpected=Tamamlandı ya da yapılacak başka şey yok
+ExpectedValue=Expected Value
+CurrentValue=Geçerli değer
 PartialWoman=Kısmi
 TotalWoman=Toplam
 NeverReceived=Hiç alınmadı
@@ -753,6 +758,8 @@ RemoveString=Remove string '%s'
 SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
 DirectDownloadLink=Direct download link
 Download=Download
+ActualizeCurrency=Update currency rate
+Fiscalyear=Mali yıl
 # Week day
 Monday=Pazartesi
 Tuesday=Salı
@@ -787,8 +794,8 @@ SetRef=Ref ayarla
 Select2ResultFoundUseArrows=Bazı sonuçlar bulundu. Ok tuşlarını kullanarak seçin.
 Select2NotFound=Hiç sonuç bulunamadı
 Select2Enter=Gir
-Select2MoreCharacter=ya da daha fazla harf
-Select2MoreCharacters=ya da daha fazla harf
+Select2MoreCharacter=or more characters<br /><br /><strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
+Select2MoreCharacters=or more characters<br /><br /><strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
 Select2LoadingMoreResults=Daha fazla sonuç yükleniyor...
 Select2SearchInProgress=Arama sürmekte...
 SearchIntoThirdparties=Üçüncü taraflar
@@ -809,3 +816,5 @@ SearchIntoContracts=Sözleşmeler
 SearchIntoCustomerShipments=Müşteri sevkiyatları
 SearchIntoExpenseReports=Gider raporları
 SearchIntoLeaves=İzinler
+
+BulkActions=Bulk actions
diff --git a/htdocs/langs/tr_TR/members.lang b/htdocs/langs/tr_TR/members.lang
index 1ff4bebacfe..6ceb6af3c8b 100644
--- a/htdocs/langs/tr_TR/members.lang
+++ b/htdocs/langs/tr_TR/members.lang
@@ -45,7 +45,7 @@ MemberStatusDraft=Taslak (doğrulanması gerekir)
 MemberStatusDraftShort=Taslak
 MemberStatusActive=Onaylı (abonelik bekliyor)
 MemberStatusActiveShort=Doğrulanmış
-MemberStatusActiveLate=abonelik süresi doldu
+MemberStatusActiveLate=Subscription expired
 MemberStatusActiveLateShort=Süresi doldu
 MemberStatusPaid=Abonelik güncel
 MemberStatusPaidShort=Güncel
@@ -136,8 +136,8 @@ DocForAllMembersCards=Bütün üyeler için kartvizit oluştur (Çıkış format
 DocForOneMemberCards=Belirli bir üye için kartvizit oluştur (Çıkış formatı için gerçek ayar : <b>%s</b>)
 DocForLabels=Adres çizelgeleri oluştur (Çıkış formatı için gerçek ayar : <b>%s</b>)
 SubscriptionPayment=Abonelik ödemesi
-LastSubscriptionDate=Son abonelik tarihi
-LastSubscriptionAmount=Son abonelik tutarı
+LastSubscriptionDate=Latest subscription date
+LastSubscriptionAmount=Latest subscription amount
 MembersStatisticsByCountries=Ülkeye göre üye istatistikleri
 MembersStatisticsByState=Eyalete/ile göre üyelik istatistikleri
 MembersStatisticsByTown=İlçelere göre üyelik istatistikleri
@@ -149,7 +149,7 @@ MembersByStateDesc=Bu ekran eyaletlere/illere/bölgelere göre üyelik istatiskl
 MembersByTownDesc=Bu ekran ilçelere göre üyelik istatistikleri görüntüler.
 MembersStatisticsDesc=Görmek istediğiniz istatistikleri seçin...
 MenuMembersStats=İstatistikler
-LastMemberDate=Son üyelik tarihi
+LastMemberDate=Latest member date
 Nature=Niteliği
 Public=Bilgiler geneldir
 NewMemberbyWeb=Yeni üye eklendi. Onay bekliyor
diff --git a/htdocs/langs/tr_TR/orders.lang b/htdocs/langs/tr_TR/orders.lang
index e3cf6febc3d..bb6170ed5ce 100644
--- a/htdocs/langs/tr_TR/orders.lang
+++ b/htdocs/langs/tr_TR/orders.lang
@@ -39,7 +39,7 @@ StatusOrderRefusedShort=Reddedildi
 StatusOrderBilledShort=Faturalandı
 StatusOrderToProcessShort=İşlenecek
 StatusOrderReceivedPartiallyShort=Kısmen aldı
-StatusOrderReceivedAllShort=Herşey alındı
+StatusOrderReceivedAllShort=Products received
 StatusOrderCanceled=İptal edilmiş
 StatusOrderDraft=Taslak (doğrulanması gerekir)
 StatusOrderValidated=Doğrulanmış
@@ -51,7 +51,7 @@ StatusOrderApproved=Onaylı
 StatusOrderRefused=Reddedildi
 StatusOrderBilled=Faturalandı
 StatusOrderReceivedPartially=Kısmen alındı
-StatusOrderReceivedAll=Her şey kabul edildi
+StatusOrderReceivedAll=All products received
 ShippingExist=Bir sevkiyat var
 QtyOrdered=Sipariş miktarı
 ProductQtyInDraft=Taslak siparişlerdeki ürün miktarı
diff --git a/htdocs/langs/tr_TR/other.lang b/htdocs/langs/tr_TR/other.lang
index 6112e5d087b..05f824dab00 100644
--- a/htdocs/langs/tr_TR/other.lang
+++ b/htdocs/langs/tr_TR/other.lang
@@ -2,6 +2,7 @@
 SecurityCode=Güvenlik kodu
 NumberingShort=N°
 Tools=Araçlar
+TMenuTools=Araçlar
 ToolsDesc=Bu alan diğer menü girişlerinde bulunmayan çeşitli araçlarburada toplanmıştır.<br /><br />Bütün araçlara sol menüden ulaşılabilir.
 Birthday=Doğumgünü
 BirthdayDate=Doğumgünü tarihi
@@ -67,14 +68,15 @@ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nFaturanız ektedi
 PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nSevkiyatınız bilgilerinize sunulmuştur __SHIPPINGREF__\n\n__PERSONALIZED__Saygılarımızla\n\n__SIGNATURE__
 PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nMüdahale bilgilerinize sunulmuştur __FICHINTERREF__\n\n__PERSONALIZED__Saygılarımızla\n\n__SIGNATURE__
 PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n__PERSONALIZED__\n__SIGNATURE__
-DemoDesc=Dolibarr birçok fonksiyonel modülden oluşan derlitoplu bir ERP/CRM programıdır. Bu durumda tüm modülleri içeren bir demo asla hiçbir şey demek değildir. Yani, birçok demo profili vardır.
+DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=İşlemlerinize uyan demo profilini seçin...
+ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
 DemoFundation=Bir derneğin üyelerini yönet
 DemoFundation2=Bir derneğin üyelerini ve banka hesabını yönet
-DemoCompanyServiceOnly=Yalnızca serbest meslek satış hizmetleri işlemlerini yönet
+DemoCompanyServiceOnly=Company or freelance selling service only
 DemoCompanyShopWithCashDesk=Kasası olan bir mağazayı yönet
-DemoCompanyProductAndStocks=Ürün satışı yapan küçük veya orta ölçekli bir firmayı yönet
-DemoCompanyAll=Birçok işlemi olan küçük veya orta ölçekli bir firmayı yönet (bütün ana modüller)
+DemoCompanyProductAndStocks=Company selling products with a shop
+DemoCompanyAll=Company with multiple activities (all main modules)
 CreatedBy=Oluşturan %s
 ModifiedBy=%s tarafından düzenlendi
 ValidatedBy=%s tarafından onaylandı
diff --git a/htdocs/langs/tr_TR/products.lang b/htdocs/langs/tr_TR/products.lang
index 83ed1b4b208..2102213a083 100644
--- a/htdocs/langs/tr_TR/products.lang
+++ b/htdocs/langs/tr_TR/products.lang
@@ -5,6 +5,8 @@ ProductLabelTranslated=Çevirilmiş ürün etiketi
 ProductDescriptionTranslated=Çevirilmiş ürün tanımı
 ProductNoteTranslated=Çevirilmiş ürün notu
 ProductServiceCard=Ürün/Hizmet kartı
+TMenuProducts=Ürünler
+TMenuServices=Hizmetler
 Products=Ürünler
 Services=Hizmetler
 Product=Ürün
@@ -58,7 +60,7 @@ SellingPrice=Satış fiyatı
 SellingPriceHT=Satış Fiyatı (vergisiz net)
 SellingPriceTTC=Satış Fiyatı (vergi dahil)
 CostPriceDescription=Bu fiyat (vergisiz), bu ürünün firmanıza olan ortalama maliyetini kaydetmek için kullanılabilir. Kendinize hesapladığınız herhangi bir fiyat olabilir, örneğin; ortalama alış fiyatı artı ortalama üretim ve dağıtım maliyeti.
-CostPriceUsage=İleriki bir sürümde bu değer kar oranı hesaplanmasında kullanılabilir.
+CostPriceUsage=This value could be used for margin calculation.
 SoldAmount=Satılan tutar
 PurchasedAmount=Satınalınan tutar
 NewPrice=Yeni fiyat
@@ -140,6 +142,7 @@ ConfirmCloneProduct=<b>%s</b> ürünü ve siparişi klonlamak istediğinizden em
 CloneContentProduct=Ürünün/hizmet bütün temel bilgilerini klonla
 ClonePricesProduct=Ana bilgileri ve fiyatları klonla
 CloneCompositionProduct=Paketlenmiş ürünü/hizmeti kopyala
+CloneCombinationsProduct=Clone product variants
 ProductIsUsed=Bu ürün kullanılır.
 NewRefForClone=Yeni ürün/hizmet ref.
 SellingPrices=Satış fiyatları
@@ -236,7 +239,7 @@ GlobalVariables=Genel değişkenler
 VariableToUpdate=Güncellenecek değişken
 GlobalVariableUpdaters=Genel değişkenler güncelleyicisi
 UpdateInterval=Güncelleme aralığı (dakika)
-LastUpdated=Son güncelleme
+LastUpdated=Latest update
 CorrectlyUpdated=Doru olarak güncellendi
 PropalMergePdfProductActualFile=PDF Azur'a eklenmek için kullanılacak dosya/lar
 PropalMergePdfProductChooseFile=PDF dosyası seç
@@ -256,4 +259,41 @@ VolumeUnits=Hacim birimi
 SizeUnits=Boyut birimi
 DeleteProductBuyPrice=Satınalma fiyatı sil
 ConfirmDeleteProductBuyPrice=Bu satınalma fiyatını silmek istediğinizden emin misiniz?
+SubProduct=Sub product
 
+#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
+ProductCombinations=Variants
+HideProductCombinations=Hide products variant in the products selector
+ProductCombination=Variant
+NewProductCombination=New variant
+EditProductCombination=Editing variant
+ProductCombinationGenerator=Variants generator
+Features=Features
+PriceImpact=Price impact
+WeightImpact=Weight impact
+NewProductAttribute=Yeni bir öznitelik
+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
+PercentageVariation=Percentage variation
+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 child products
+ConfirmCloneProductCombinations=Would you like to copy all the product variant to the 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
diff --git a/htdocs/langs/tr_TR/projects.lang b/htdocs/langs/tr_TR/projects.lang
index 2e04978c706..3e029dde645 100644
--- a/htdocs/langs/tr_TR/projects.lang
+++ b/htdocs/langs/tr_TR/projects.lang
@@ -31,7 +31,7 @@ ConfirmDeleteAProject=Are you sure you want to delete this project?
 ConfirmDeleteATask=Are you sure you want to delete this task?
 OpenedProjects=Açık projeler
 OpenedTasks=Açık görevler
-OpportunitiesStatusForOpenedProjects=Projelerin durumuna göre fırsat tutarı
+OpportunitiesStatusForOpenedProjects=Durumuna göre açık projelerin fırsat tutarı
 OpportunitiesStatusForProjects=Projelerin durumuna göre fırsat tutarı
 ShowProject=Proje göster
 SetProject=Proje ayarla
@@ -58,6 +58,7 @@ TaskDateEnd=Görev bitiş tarihi
 TaskDescription=Görev açıklaması
 NewTask=Yeni görev
 AddTask=Görev oluştur
+AddTimeSpent=Create time spent
 Activity=Etkinlik
 Activities=Görevler/etkinlikler
 MyActivities=Görevlerim/etkinliklerim
@@ -95,6 +96,7 @@ ValidateProject=Proje doğrula
 ConfirmValidateProject=Are you sure you want to validate this project?
 CloseAProject=Proje kapat
 ConfirmCloseAProject=Are you sure you want to close this project?
+AlsoCloseAProject=Also close project (keep it open if you still need to follow production tasks on it)
 ReOpenAProject=Proje aç
 ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=Proje ilgilileri
@@ -120,7 +122,7 @@ CloneProjectFiles=Birleşik proje dosyalarını kopyala
 CloneTaskFiles=Birleşik görev(ler) dosyalarını kopyala (görev(ler) kopyalanmışsa)
 CloneMoveDate=Update project/tasks dates from now?
 ConfirmCloneProject=Are you sure to clone this project?
-ProjectReportDate=Görevi proje başlama tarihine göre değiştir
+ProjectReportDate=Change task dates according to new project start date
 ErrorShiftTaskDate=Görev tarihini yeni proje başlama tarihine göre kaydırmak olası değil
 ProjectsAndTasksLines=Projeler ve görevler
 ProjectCreatedInDolibarr=%s projesi oluşturuldu
@@ -177,7 +179,7 @@ ProjectsStatistics=Projeler/adaylar için istatistikler
 TaskAssignedToEnterTime=Atanan görevler. Bu göreve süre girmek mümkün olmalı.
 IdTaskTime=Görev zamanı kimliği
 YouCanCompleteRef=Eğer referansı bazı bilgilerle tamamlamak isterseniz (arama süzgeçleri olarak kullanmak üzere), ayırmak için bir - karakteri eklemeniz önerilir, böylece otomatik numaralandırma sonraki projeler için de çalışacaktır. Örneğin; %s-ABC. Etikete arama anahtarları da eklemeyi yeğleyebilirsiniz. Ama en iyisi özel bir alan olarak da adlandırılan tamamlayıcı özellikler eklemek olabilir.
-OpenedProjectsByThirdparties=Üçüncü partilere göre açık projeler
+OpenedProjectsByThirdparties=Üçüncü partiye göre açık projeler
 OnlyOpportunitiesShort=Yalnızca fırsatlar
 OpenedOpportunitiesShort=Açık fırsatlar
 NotAnOpportunityShort=Bir fırsat değil
diff --git a/htdocs/langs/tr_TR/propal.lang b/htdocs/langs/tr_TR/propal.lang
index 06ef94d049c..d8a5226f495 100644
--- a/htdocs/langs/tr_TR/propal.lang
+++ b/htdocs/langs/tr_TR/propal.lang
@@ -26,9 +26,9 @@ AmountOfProposalsByMonthHT=Aylık tutar (vergi hariç)
 NbOfProposals=Teklif sayısı
 ShowPropal=Teklif göster
 PropalsDraft=Taslaklar
-PropalsOpened=Aç
+PropalsOpened=Açık
 PropalStatusDraft=Taslak (doğrulanması gerekir)
-PropalStatusValidated=Onaylı (teklif açık)
+PropalStatusValidated=Validated (proposal is opened)
 PropalStatusSigned=İmzalı(faturalanacak)
 PropalStatusNotSigned=İmzalanmamış (kapalı)
 PropalStatusBilled=Faturalanmış
diff --git a/htdocs/langs/tr_TR/stocks.lang b/htdocs/langs/tr_TR/stocks.lang
index 99b7bb2bc89..080d7e8dcf5 100644
--- a/htdocs/langs/tr_TR/stocks.lang
+++ b/htdocs/langs/tr_TR/stocks.lang
@@ -22,13 +22,15 @@ Movements=Hareketler
 ErrorWarehouseRefRequired=Depo referans adı gereklidir
 ListOfWarehouses=Depo listesi
 ListOfStockMovements=Stok hareketleri listesi
+StockMovementForId=Movement ID %d
+ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Depo alanı
 Location=Konum
 LocationSummary=Kısa konum adı
 NumberOfDifferentProducts=Farklı ürün sayısı
 NumberOfProducts=Toplam ürün sayısı
-LastMovement=Son hareket
-LastMovements=Son hareketler
+LastMovement=Latest movement
+LastMovements=Latest movements
 Units=Birimler
 Unit=Birim
 StockCorrection=Stok düzelt
@@ -140,3 +142,4 @@ ProductStockWarehouseCreated=Stock limit for alert and desired optimal stock cor
 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
diff --git a/htdocs/langs/tr_TR/supplier_proposal.lang b/htdocs/langs/tr_TR/supplier_proposal.lang
index 4d2be517d34..ba533544e62 100644
--- a/htdocs/langs/tr_TR/supplier_proposal.lang
+++ b/htdocs/langs/tr_TR/supplier_proposal.lang
@@ -8,7 +8,7 @@ SearchRequest=İstek ara
 DraftRequests=Taslak istekler
 SupplierProposalsDraft=Taslak tedarikçi teklifleri
 LastModifiedRequests=Değiştirilen son %s fiyat isteği
-RequestsOpened=Fiyat isteği aç
+RequestsOpened=Opened price requests
 SupplierProposalArea=Tedarikçi teklifleri alanı
 SupplierProposalShort=Tedarikçi teklifi
 SupplierProposals=Tedarikçi teklifleri
@@ -23,7 +23,7 @@ ConfirmValidateAsk=Are you sure you want to validate this price request under na
 DeleteAsk=İstek sil
 ValidateAsk=İstek doğrula
 SupplierProposalStatusDraft=Taslak (doğrulanması gerekir)
-SupplierProposalStatusValidated=Doğrulanmış (istek açıktır)
+SupplierProposalStatusValidated=Validated (request is opened)
 SupplierProposalStatusClosed=Kapalı
 SupplierProposalStatusSigned=Kabul edildi
 SupplierProposalStatusNotSigned=Reddedildi
diff --git a/htdocs/langs/tr_TR/suppliers.lang b/htdocs/langs/tr_TR/suppliers.lang
index 905ba8d2f26..5f30ce08003 100644
--- a/htdocs/langs/tr_TR/suppliers.lang
+++ b/htdocs/langs/tr_TR/suppliers.lang
@@ -24,10 +24,10 @@ ExportDataset_fournisseur_1=Tedarikçi faturaları listesi ve fatura satırları
 ExportDataset_fournisseur_2=Tedarikçi faturaları ve ödemeleri
 ExportDataset_fournisseur_3=Tedarikçi siparişleri ve sipariş satırları
 ApproveThisOrder=Bu siparişi onayla
-ConfirmApproveThisOrder=<b>%s</b> siparişini onaylamak istediğinizden emin misiniz?
+ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b>?
 DenyingThisOrder=Bu siparişi reddet
-ConfirmDenyingThisOrder=<b>%s</b> siparişini reddetmek istediğinizden emin misiniz?
-ConfirmCancelThisOrder=<b>%s</b> siparişini iptal etmek istediğinizden emin misiniz?
+ConfirmDenyingThisOrder=Are you sure you want to deny this order <b>%s</b>?
+ConfirmCancelThisOrder=Are you sure you want to cancel this order <b>%s</b>?
 AddSupplierOrder=Tedarikçi siparişi oluştur
 AddSupplierInvoice=Tedarikçi faturası oluştur
 ListOfSupplierProductForSupplier=Tedarikçi <b>%s</b> için ürün ve fiyat listesi
@@ -41,3 +41,4 @@ DoNotOrderThisProductToThisSupplier=Sipariş verme
 NotTheGoodQualitySupplier=Hatalı kalite
 ReputationForThisProduct=İtibar
 BuyerName=Alıcı adı
+AllProductServicePrices=All product / service prices
diff --git a/htdocs/langs/tr_TR/withdrawals.lang b/htdocs/langs/tr_TR/withdrawals.lang
index bce159374d7..6086463c616 100644
--- a/htdocs/langs/tr_TR/withdrawals.lang
+++ b/htdocs/langs/tr_TR/withdrawals.lang
@@ -24,6 +24,7 @@ WithdrawStatistics=Direct debit payment statistics
 WithdrawRejectStatistics=Direct debit payment reject statistics
 LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
+WithdrawRequestsDone=%s direct debit payment requests recorded
 ThirdPartyBankCode=Üçüncü parti banka kodu
 NoInvoiceCouldBeWithdrawed=Hiçbir fatura için para çekme işlemi başarılamadı. Firma faturalarının geçerli bir BAN'ı olduğunu kontrol edin.
 ClassCredited=Alacak olarak sınıflandır
@@ -76,8 +77,8 @@ RUM=UMR
 RUMLong=Unique Mandate Reference
 RUMWillBeGenerated=UMR number will be generated once bank account information are saved
 WithdrawMode=Direct debit mode (FRST or RECUR)
-WithdrawRequestAmount=Para çekme isteği tutarı:
-WithdrawRequestErrorNilAmount=Tutar boş olduğu için para çekme işlemi oluşturulamıyor.
+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
diff --git a/htdocs/langs/uk_UA/accountancy.lang b/htdocs/langs/uk_UA/accountancy.lang
index 5de95948fbf..4c2336b97b0 100644
--- a/htdocs/langs/uk_UA/accountancy.lang
+++ b/htdocs/langs/uk_UA/accountancy.lang
@@ -194,6 +194,8 @@ ChangeBinding=Change the binding
 
 ## Admin
 ApplyMassCategories=Apply mass categories
+AddAccountFromBookKeepingWithNoCategories=Add acccount already used with no categories
+CategoryDeleted=Category for the accounting account has been removed
 
 ## Export
 Exports=Exports
@@ -209,6 +211,7 @@ Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution
 Modelcsv_quadratus=Export towards Quadratus QuadraCompta
 Modelcsv_ebp=Export towards EBP
 Modelcsv_cogilog=Export towards Cogilog
+ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
 InitAccountancy=Init accountancy
diff --git a/htdocs/langs/uk_UA/admin.lang b/htdocs/langs/uk_UA/admin.lang
index a27452bf639..e93325c5f87 100644
--- a/htdocs/langs/uk_UA/admin.lang
+++ b/htdocs/langs/uk_UA/admin.lang
@@ -9,14 +9,20 @@ VersionDevelopment=Розробча
 VersionUnknown=Невизначена
 VersionRecommanded=Рекомендована
 FileCheck=Files integrity checker
-FileCheckDesc=This tool allows you to check the integrity of files of your application, comparing each files with the official ones. You can use this tool to detect if some files were modified by a hacker for example.
+FileCheckDesc=This tool allows you to check the integrity of files and setup of your application, comparing each files with the official ones. 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.
+FileIntegrityIsStrictlyConformedWithReference=Files integrity is strictly conformed with the reference.
+FileIntegrityIsOkButFilesWereAdded=Files integrity check has passed, however some new files were added.
+FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified, removed or added.
+GlobalChecksum=Global checksum
 MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
 LocalSignature=Embedded local signature (less reliable)
 RemoteSignature=Remote distant signature (more reliable)
 FilesMissing=Missing Files
 FilesUpdated=Updated Files
+FilesModified=Modified Files
+FilesAdded=Added Files
 FileCheckDolibarr=Check integrity of application files
-AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from a certified package
+AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from an official package
 XmlNotFound=Xml Integrity File of application not found
 SessionId=ID Сессії
 SessionSaveHandler=Handler to save sessions
@@ -185,7 +191,9 @@ BoxesDesc=Widgets are components showing some information that you can add to pe
 OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
 ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
-ModulesMarketPlaces=More modules...
+ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
+ModulesMarketPlaces=Find external modules...
+GoModuleSetupArea=To deploy/install a new module, go onto the Module setup area at <a href="%s">%s</a>.
 DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules
 DoliPartnersDesc=List of companies providing custom developed modules or features (Note: anyone experienced in PHP programming can provide custom development for an open source project)
 WebSiteDesc=Reference websites to find more modules...
@@ -276,21 +284,22 @@ ModuleFamilyInterface=Interfaces with external systems
 MenuHandlers=Menu handlers
 MenuAdmin=Menu editor
 DoNotUseInProduction=Do not use in production
-ThisIsProcessToFollow=This is setup to process:
-ThisIsAlternativeProcessToFollow=This is an alternative setup to process:
+ThisIsProcessToFollow=This is steps to process:
+ThisIsAlternativeProcessToFollow=This is an alternative setup to process manually:
 StepNb=Step %s
 FindPackageFromWebSite=Find a package that provides feature you want (for example on official web site %s).
 DownloadPackageFromWebSite=Download package (for example from official web site %s).
-UnpackPackageInDolibarrRoot=Unpack package file into Dolibarr server directory dedicated to external modules: <b>%s</b>
-SetupIsReadyForUse=Install is finished and Dolibarr is ready to use with this new component.
-NotExistsDirect=The alternative root directory is not defined.<br>
-InfDirAlt=Since version 3 it is possible to define an alternative root directory.This allows you to store, same place, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
-InfDirExample=<br>Then declare it in the file conf.php<br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>*These lines are commented with "#", to uncomment only remove the character.
+UnpackPackageInDolibarrRoot=Unpack the packaged files into server directory dedicated to Dolibarr: <b>%s</b>
+UnpackPackageInModulesRoot=To deploy/install an external module, unpack the packaged files into the server directory dedicated to modules: <b>%s</b>
+SetupIsReadyForUse=Module deployment is finished. You must however enable and setup the module in your application by going on the page to setup modules: <a href="%s">%s</a>.
+NotExistsDirect=The alternative root directory is not defined to an existing directory.<br>
+InfDirAlt=Since version 3, it is possible to define an alternative root directory. This allows you to store, into a dedicated directory, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
+InfDirExample=<br>Then declare it in the file <strong>conf.php</strong><br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>If these lines are commented with "#", to enable them, just uncomment by removing the "#" character.
 YouCanSubmitFile=For this step, you can send package using this tool: Select module file
 CurrentVersion=Dolibarr current version
 CallUpdatePage=Go to the page that updates the database structure and data: %s.
 LastStableVersion=Latest stable version
-LastActivationDate=Last activation date
+LastActivationDate=Latest activation date
 UpdateServerOffline=Update server offline
 GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s. <br><b>{000000@x}</b> same as previous but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
 GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
@@ -373,11 +382,11 @@ ExtrafieldCheckBox=Checkbox
 ExtrafieldRadio=Radio button
 ExtrafieldCheckBoxFromList= Checkbox from table
 ExtrafieldLink=Link to an object
-ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>In order to have the list depending on another :<br>1,value1|parent_list_code:parent_key<br>2,value2|parent_list_code:parent_key
+ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list :<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list :<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
-ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
+ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Example : Societe:societe/class/societe.class.php
 LibraryToBuildPDF=Library used for PDF generation
 WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
@@ -411,10 +420,11 @@ ModuleCompanyCodePanicum=Return an empty accountancy code.
 ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party code.
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
-
+WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<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).
+ClickToShowDescription=Click to show description
 # Modules
 Module0Name=Users & groups
-Module0Desc=Users and groups management
+Module0Desc=Users / Employees and Groups management
 Module1Name=Third parties
 Module1Desc=Companies and contact management (customers, prospects...)
 Module2Name=Commercial
@@ -515,8 +525,8 @@ Module2200Name=Dynamic Prices
 Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
 Module2300Desc=Scheduled job management
-Module2400Name=Agenda/Events
-Module2400Desc=Follow events or rendez-vous. Record manual events into Agendas or let application logs automatic events for tracking purposes.
+Module2400Name=Events/Agenda
+Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous.
 Module2500Name=Electronic Content Management
 Module2500Desc=Save and share documents
 Module2600Name=API/Web services (SOAP server)
@@ -582,7 +592,7 @@ Permission34=Delete products
 Permission36=See/manage hidden products
 Permission38=Export products
 Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
-Permission42=Create/modify projects (shared project and projects i'm contact for)
+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)
 Permission45=Export projects
 Permission61=Read interventions
@@ -685,7 +695,7 @@ PermissionAdvanced253=Create/modify internal/external users and permissions
 Permission254=Create/modify external users only
 Permission255=Modify other users password
 Permission256=Delete or disable other users
-Permission262=Extend access to all third parties (not only those linked to user). Not effective for external users (always limited to themselves).
+Permission262=Extend access to all third parties (not only third parties that user is a sale representative).<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 assignement matters).
 Permission271=Read CA
 Permission272=Read invoices
 Permission273=Issue invoices
@@ -887,7 +897,7 @@ Offset=Offset
 AlwaysActive=Always active
 Upgrade=Upgrade
 MenuUpgrade=Upgrade / Extend
-AddExtensionThemeModuleOrOther=Add extension (theme, module, ...)
+AddExtensionThemeModuleOrOther=Deploy/install external module
 WebServer=Web server
 DocumentRootServer=Web server's root directory
 DataRootServer=Data files directory
@@ -994,7 +1004,7 @@ TriggerAlwaysActive=Triggers in this file are always active, whatever are the ac
 TriggerActiveAsModuleActive=Triggers in this file are active as module <b>%s</b> is enabled.
 GeneratedPasswordDesc=Define here which rule you want to use to generate new password if you ask to have auto generated password
 DictionaryDesc=Insert all reference data. You can add your values to the default.
-ConstDesc=This page allows you to edit all other parameters not available in previous pages. These are mostly reserved parameters for developers or advanced troubleshooting.
+ConstDesc=This page allows you to edit all other parameters not available in previous pages. These are mostly reserved parameters for developers or advanced troubleshooting. For a list of options <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">check here</a>.
 MiscellaneousDesc=All other security related parameters are defined here.
 LimitsSetup=Limits/Precision setup
 LimitsDesc=You can define limits, precisions and optimisations used by Dolibarr here
@@ -1161,10 +1171,6 @@ FreeLegalTextOnOrders=Free text on orders
 WatermarkOnDraftOrders=Watermark on draft orders (none if empty)
 ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable
 BANK_ASK_PAYMENT_BANK_DURING_ORDER=Ask for bank account destination of order
-##### Clicktodial #####
-ClickToDialSetup=Click To Dial module setup
-ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with your clicktodial login (defined on your user card)<br><b>__PASS__</b> that will be replaced with your clicktodial password (defined on your user card).
-##### Bookmark4u #####
 ##### Interventions #####
 InterventionsSetup=Interventions module setup
 FreeLegalTextOnInterventions=Free text on intervention documents
@@ -1391,7 +1397,7 @@ SendingsSetup=Sending module setup
 SendingsReceiptModel=Sending receipt model
 SendingsNumberingModules=Sendings numbering modules
 SendingsAbility=Support shipping sheets for customer deliveries
-NoNeedForDeliveryReceipts=In most cases, sendings receipts are used both as sheets for customer deliveries (list of products to send) and sheets that is recevied and signed by customer. So product deliveries receipts is a duplicated feature and is rarely activated.
+NoNeedForDeliveryReceipts=In most cases, shipping sheets are used both as sheets for customer deliveries (list of products to send) and sheets that is received and signed by customer. So product deliveries receipts is a duplicated feature and is rarely activated.
 FreeLegalTextOnShippings=Free text on shipments
 ##### Deliveries #####
 DeliveryOrderNumberingModules=Products deliveries receipt numbering module
@@ -1471,7 +1477,11 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Set automatically this default value for type of e
 AGENDA_DEFAULT_FILTER_TYPE=Set automatically this type of event into search filter of agenda view
 AGENDA_DEFAULT_FILTER_STATUS=Set automatically this status for events into search filter of agenda view
 AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
-##### ClickToDial #####
+AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
+AGENDA_NOTIFICATION_SOUND=Enable sound notification
+##### Clicktodial #####
+ClickToDialSetup=Click To Dial module setup
+ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with your clicktodial login (defined on your user card)<br><b>__PASS__</b> that will be replaced with your clicktodial password (defined on your user card).
 ClickToDialDesc=This module allows to make phone numbers clickable. A click on this icon will call make your phone to 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.
 ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
 ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on same computer than the browser, and called when you click on a link in your browser that start 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.
@@ -1499,10 +1509,11 @@ EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint availa
 ##### API ####
 ApiSetup=API module setup
 ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
-ApiProductionMode=Enable production mode (this will activate use of a caches for services management)
+ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
 ApiExporerIs=You can explore the APIs at url
 OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
 ApiKey=Key for API
+WarningAPIExplorerDisabled=The API explorer has been disabled. API explorer is not required to provide API services. It is a tool for developer to find/test REST APIs. If you need this tool, go into setup of module API REST to activate it.
 ##### Bank #####
 BankSetupModule=Bank module setup
 FreeLegalTextOnChequeReceipts=Free text on cheque receipts
@@ -1571,7 +1582,7 @@ BackupDumpWizard=Wizard to build database backup dump file
 SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
 SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is only manual steps a privileged user can do.
 InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
-ConfFileMuseContainCustom=Installing an external module from application save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to have option<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
+ConfFileMuseContainCustom=Installing an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
 HighlightLinesColor=Highlight color of the line when the mouse passes over (keep empty for no highlight)
 TextTitleColor=Color of page title
@@ -1601,6 +1612,7 @@ FixTZ=TimeZone fix
 FillFixTZOnlyIfRequired=Example: +2 (fill only if problem experienced)
 ExpectedChecksum=Expected Checksum
 CurrentChecksum=Current Checksum
+ForcedConstants=Required constant values
 MailToSendProposal=To send customer proposal
 MailToSendOrder=To send customer order
 MailToSendInvoice=To send customer invoice
@@ -1609,13 +1621,14 @@ MailToSendIntervention=To send intervention
 MailToSendSupplierRequestForQuotation=To send quotation request to supplier
 MailToSendSupplierOrder=To send supplier order
 MailToSendSupplierInvoice=To send supplier invoice
+MailToSendContract=To send a contract
 MailToThirdparty=To send email from third party page
 ByDefaultInList=Show by default on list view
-YouUseLastStableVersion=You use the last stable version
+YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
 TitleExampleForMaintenanceRelease=Example of message you can use to announce this maintenance release (feel free to use it on your web sites)
-ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. You can download it from the download area of http://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.
-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, nor data structure change is present into this version. You can download it from the download area of http://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.
+ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. 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.
+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, nor data structure change is present into 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, you can enter here rule to have price for each level autocalculated according to price of first level, so you will have to enter only price for first level on each product. This page is here to save you time and can be usefull only if your prices for each leve are relative to first level. You can ignore this page in most cases.
 ModelModulesProduct=Templates for product documents
 ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
diff --git a/htdocs/langs/uk_UA/banks.lang b/htdocs/langs/uk_UA/banks.lang
index 8cb9eceeedd..28e01fa6583 100644
--- a/htdocs/langs/uk_UA/banks.lang
+++ b/htdocs/langs/uk_UA/banks.lang
@@ -74,13 +74,13 @@ Conciliate=Reconcile
 Conciliation=Reconciliation
 ReconciliationLate=Reconciliation late
 IncludeClosedAccount=Include closed accounts
-OnlyOpenedAccount=Only open accounts
+OnlyOpenedAccount=Only opened accounts
 AccountToCredit=Account to credit
 AccountToDebit=Account to debit
 DisableConciliation=Disable reconciliation feature for this account
 ConciliationDisabled=Reconciliation feature disabled
 LinkedToAConciliatedTransaction=Linked to a conciliated entry
-StatusAccountOpened=Open
+StatusAccountOpened=Opened
 StatusAccountClosed=Зачинено
 AccountIdShort=Number
 LineRecord=Transaction
diff --git a/htdocs/langs/uk_UA/bills.lang b/htdocs/langs/uk_UA/bills.lang
index 315f44f1fb0..99ca4c771c6 100644
--- a/htdocs/langs/uk_UA/bills.lang
+++ b/htdocs/langs/uk_UA/bills.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - bills
 Bill=Рахунок-фактура
 Bills=Рахунки-фактури
-BillsCustomers=Рахунки-фактури клієнтів
-BillsCustomer=Рахунок-фактура клієнта
-BillsSuppliers=Рахунки-фактури постачальників
-BillsCustomersUnpaid=Несплачені рахунки-фактури клієнтів
-BillsCustomersUnpaidForCompany=Неоплачені рахунки-фактури Покупців для %s
-BillsSuppliersUnpaid=Несплачені рахунки-фактури постачальників
-BillsSuppliersUnpaidForCompany=Неоплачені рахунки-фактури постачальнику для %s
+BillsCustomers=Customer invoices
+BillsCustomer=Рахунок клієнта
+BillsSuppliers=Supplier invoices
+BillsCustomersUnpaid=Несплачені рахунки клієнта
+BillsCustomersUnpaidForCompany=Unpaid customer invoices for %s
+BillsSuppliersUnpaid=Unpaid supplier invoices
+BillsSuppliersUnpaidForCompany=Unpaid supplier invoices for %s
 BillsLate=Прострочені платежі
 BillsStatistics=Статистика рахунків клієнтів
 BillsStatisticsSuppliers=Статистика рахунків постачальників
@@ -62,8 +62,8 @@ PaymentsBack=Повернення платежів
 paymentInInvoiceCurrency=in invoices currency
 PaidBack=Повернення платежу
 DeletePayment=Видалити платіж
-ConfirmDeletePayment=Are you sure you want to delete this payment?
-ConfirmConvertToReduc=Do you want to convert this credit note or deposit 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.
+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.
 SupplierPayments=Платежі Постачальникам
 ReceivedPayments=Отримані платежі
 ReceivedCustomersPayments=Платежі, отримані від покупців
@@ -78,6 +78,7 @@ PaymentMode=Тип платежу
 PaymentTypeDC=Debit/Credit Card
 PaymentTypePP=PayPal
 IdPaymentMode=Payment type (id)
+CodePaymentMode=Payment type (code)
 LabelPaymentMode=Payment type (label)
 PaymentModeShort=Тип платежу
 PaymentTerm=Умови платежу
@@ -102,9 +103,10 @@ SearchACustomerInvoice=Пошук рахунку-фактури Покупця
 SearchASupplierInvoice=Пошук рахунку-фактури Постачальника
 CancelBill=Відмінити рахунок-фактуру
 SendRemindByMail=Відправити нагадування по EMail
-DoPayment=Вчинити платіж
-DoPaymentBack=Повернути платіж
+DoPayment=Enter payment
+DoPaymentBack=Enter refund
 ConvertToReduc=Перетворити в майбутню знижку
+ConvertExcessReceivedToReduc=Convert excess received into future discount
 EnterPaymentReceivedFromCustomer=Ввести платіж, отриманий від покупця
 EnterPaymentDueToCustomer=Make payment due to customer
 DisabledBecauseRemainderToPayIsZero=Відключено, тому що оплата, що залишилася є нульовою
@@ -113,22 +115,24 @@ BillStatus=Статус рахунку-фактури
 StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Проект (має бути підтверджений)
 BillStatusPaid=Сплачений
-BillStatusPaidBackOrConverted=Сплачений або конвертований в знижку
+BillStatusPaidBackOrConverted=Refund or converted into discount
 BillStatusConverted=Сплачений (готовий для завершального рахунка-фактури)
 BillStatusCanceled=Анулюваний
 BillStatusValidated=Підтверджений (необхідно сплатити)
 BillStatusStarted=Розпочатий
 BillStatusNotPaid=Неоплачений
+BillStatusNotRefunded=Not refunded
 BillStatusClosedUnpaid=Закритий (неоплачений)
 BillStatusClosedPaidPartially=Сплачений (частково)
 BillShortStatusDraft=Проект
 BillShortStatusPaid=Сплачений
-BillShortStatusPaidBackOrConverted=Оброблений
+BillShortStatusPaidBackOrConverted=Refund or converted
 BillShortStatusConverted=Оброблений
 BillShortStatusCanceled=Анулюваний
 BillShortStatusValidated=Підтверджений
 BillShortStatusStarted=Розпочатий
 BillShortStatusNotPaid=Неоплачений
+BillShortStatusNotRefunded=Not refunded
 BillShortStatusClosedUnpaid=Закритий
 BillShortStatusClosedPaidPartially=Сплачений (частково)
 PaymentStatusToValidShort=На підтвердженні
@@ -149,14 +153,14 @@ NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified
 FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
 NotARecurringInvoiceTemplate=Not a recurring template invoice
 NewBill=Новий рахунок-фактура
-LastBills=Останні %s рахунків-фактур
-LastCustomersBills=Останні %s рахунків-фактур Покупців
-LastSuppliersBills=Останні %s рахунків-фактур Постачальників
+LastBills=Latest %s invoices
+LastCustomersBills=Latest %s customer invoices
+LastSuppliersBills=Latest %s supplier invoices
 AllBills=Усі рахунки-фактури
 OtherBills=Інші рахунки-фактури
 DraftBills=Проекти рахунків-фактур
-CustomersDraftInvoices=Проекти рахунків-фактур Покупців
-SuppliersDraftInvoices=Проекти рахунків-фактур Постачальників
+CustomersDraftInvoices=Customer draft invoices
+SuppliersDraftInvoices=Supplier draft invoices
 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>?
@@ -203,7 +207,7 @@ AlreadyPaidNoCreditNotesNoDeposits=Вже сплачений (без креди
 Abandoned=Анулюваний
 RemainderToPay=Залишити неоплаченим
 RemainderToTake=Remaining amount to take
-RemainderToPayBack=Remaining amount to pay back
+RemainderToPayBack=Remaining amount to refund
 Rest=В очікуванні
 AmountExpected=Заявлена сума
 ExcessReceived=Отриманий надлишок
@@ -270,6 +274,7 @@ Deposit=Внесок
 Deposits=Внески
 DiscountFromCreditNote=Знижка з кредитового авізо %s
 DiscountFromDeposit=Платежі з депозитного рахунка-фактури %s
+DiscountFromExcessReceived=Payments from excess received of invoice %s
 AbsoluteDiscountUse=Такий тип кредиту може бути використаний по рахунку-фактурі до його підтвердження
 CreditNoteDepositUse=Invoice must be validated to use this kind of credits
 NewGlobalDiscount=New absolute discount
@@ -277,8 +282,8 @@ NewRelativeDiscount=New relative discount
 NoteReason=Примітка / Підстава
 ReasonDiscount=Підстава
 DiscountOfferedBy=Надана
-DiscountStillRemaining=Залишок знижки
-DiscountAlreadyCounted=Знижка вже розрахована
+DiscountStillRemaining=Discounts available
+DiscountAlreadyCounted=Discounts already consumed
 BillAddress=Адреса виставляння
 HelpEscompte=Ця знижка надана Покупцеві за достроковий платіж.
 HelpAbandonBadCustomer=Від цієї суми відмовився Покупець (вважається поганим клієнтом) і вона вважається надзвичайною втратою.
@@ -331,10 +336,12 @@ 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
 # PaymentConditions
 Statut=Status
-PaymentConditionShortRECEP=Негайно
-PaymentConditionRECEP=Негайно
+PaymentConditionShortRECEP=Due Upon Receipt
+PaymentConditionRECEP=Due Upon Receipt
 PaymentConditionShort30D=30 днів
 PaymentCondition30D=30 днів
 PaymentConditionShort30DENDMONTH=30 days of month-end
@@ -349,6 +356,14 @@ PaymentConditionShortPT_ORDER=Order
 PaymentConditionPT_ORDER=On 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
 FixAmount=Fix amount
 VarAmount=Variable amount (%% tot.)
 # PaymentType
@@ -418,7 +433,7 @@ ChequeDeposits=Checks deposits
 Cheques=Чеки
 DepositId=Id deposit
 NbCheque=Number of checks
-CreditNoteConvertedIntoDiscount=This credit note or deposit invoice has been converted into %s
+CreditNoteConvertedIntoDiscount=This %s has been converted into %s
 UsBillingContactAsIncoiveRecipientIfExist=Use customer billing contact address instead of third party address as recipient for invoices
 ShowUnpaidAll=Показати усі несплачені рахунки-фактури
 ShowUnpaidLateOnly=Паказати лише прострочені несплачені рахунки-фактури
diff --git a/htdocs/langs/uk_UA/boxes.lang b/htdocs/langs/uk_UA/boxes.lang
index 83555fecdd1..5b5c8e68efa 100644
--- a/htdocs/langs/uk_UA/boxes.lang
+++ b/htdocs/langs/uk_UA/boxes.lang
@@ -25,8 +25,8 @@ BoxTitleLastSuppliers=Latest %s recorded suppliers
 BoxTitleLastModifiedSuppliers=Latest %s modified suppliers
 BoxTitleLastModifiedCustomers=Latest %s modified customers
 BoxTitleLastCustomersOrProspects=Latest %s customers or prospects
-BoxTitleLastCustomerBills=Latest %s customer's invoices
-BoxTitleLastSupplierBills=Latest %s supplier's invoices
+BoxTitleLastCustomerBills=Latest %s customer invoices
+BoxTitleLastSupplierBills=Latest %s supplier invoices
 BoxTitleLastModifiedProspects=Latest %s modified prospects
 BoxTitleLastModifiedMembers=Latest %s members
 BoxTitleLastFicheInter=Latest %s modified interventions
@@ -51,12 +51,12 @@ ClickToAdd=Click here to add.
 NoRecordedCustomers=No recorded customers
 NoRecordedContacts=No recorded contacts
 NoActionsToDo=No actions to do
-NoRecordedOrders=No recorded customer's orders
+NoRecordedOrders=No recorded customer orders
 NoRecordedProposals=No recorded proposals
-NoRecordedInvoices=No recorded customer's invoices
-NoUnpaidCustomerBills=No unpaid customer's invoices
-NoUnpaidSupplierBills=No unpaid supplier's invoices
-NoModifiedSupplierBills=No recorded supplier's invoices
+NoRecordedInvoices=No recorded customer invoices
+NoUnpaidCustomerBills=No unpaid customer invoices
+NoUnpaidSupplierBills=No unpaid supplier invoices
+NoModifiedSupplierBills=No recorded supplier invoices
 NoRecordedProducts=No recorded products/services
 NoRecordedProspects=No recorded prospects
 NoContractedProducts=No products/services contracted
@@ -77,7 +77,7 @@ BoxTitleLatestModifiedSupplierOrders=Latest %s modified supplier orders
 BoxTitleLastModifiedCustomerBills=Latest %s modified customer bills
 BoxTitleLastModifiedCustomerOrders=Latest %s modified customer orders
 BoxTitleLastModifiedPropals=Latest %s modified propals
-ForCustomersInvoices=Customers invoices
+ForCustomersInvoices=Рахунки-фактури покупців
 ForCustomersOrders=Замовлення клієнтів
 ForProposals=Пропозиції
 LastXMonthRolling=The latest %s month rolling
diff --git a/htdocs/langs/uk_UA/companies.lang b/htdocs/langs/uk_UA/companies.lang
index db731fceb9b..8d3285acd19 100644
--- a/htdocs/langs/uk_UA/companies.lang
+++ b/htdocs/langs/uk_UA/companies.lang
@@ -78,6 +78,10 @@ VATIsNotUsed=VAT is not used
 CopyAddressFromSoc=Fill address with third party address
 ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
 PaymentBankAccount=Payment bank account
+OverAllProposals=Total proposals
+OverAllOrders=Total orders
+OverAllInvoices=Total invoices
+OverAllSupplierProposals=Total price requests
 ##### Local Taxes #####
 LocalTax1IsUsed=Use second tax
 LocalTax1IsUsedES= RE is used
@@ -239,6 +243,10 @@ ProfId3RU=Prof Id 3 (KPP)
 ProfId4RU=Prof Id 4 (OKPO)
 ProfId5RU=-
 ProfId6RU=-
+ProfId1DZ=RC
+ProfId2DZ=Art.
+ProfId3DZ=NIF
+ProfId4DZ=NIS
 VATIntra=VAT number
 VATIntraShort=VAT number
 VATIntraSyntaxIsValid=Syntax is valid
@@ -382,8 +390,9 @@ ListCustomersShort=List of customers
 ThirdPartiesArea=Third parties and contact area
 LastModifiedThirdParties=Latest %s modified third parties
 UniqueThirdParties=Total of unique third parties
-InActivity=Open
+InActivity=Opened
 ActivityCeased=Зачинено
+ThirdPartyIsClosed=Third party is closed
 ProductsIntoElements=List of products/services into %s
 CurrentOutstandingBill=Current outstanding bill
 OutstandingBill=Max. for outstanding bill
@@ -396,7 +405,7 @@ MergeThirdparties=Merge third parties
 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 so you will be able to delete the duplicate one.
 ThirdpartiesMergeSuccess=Thirdparties have been merged
 SaleRepresentativeLogin=Login of sales representative
-SaleRepresentativeFirstname=Firstname of sales representative
-SaleRepresentativeLastname=Lastname of sales representative
+SaleRepresentativeFirstname=First name of sales representative
+SaleRepresentativeLastname=Last name of sales representative
 ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
 NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/uk_UA/compta.lang b/htdocs/langs/uk_UA/compta.lang
index 6542a167632..9ce9af8bff6 100644
--- a/htdocs/langs/uk_UA/compta.lang
+++ b/htdocs/langs/uk_UA/compta.lang
@@ -65,6 +65,7 @@ PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=VAT payment
 ListPayment=List of payments
 ListOfCustomerPayments=List of customer payments
+ListOfSupplierPayments=List of supplier payments
 DateStartPeriod=Date start period
 DateEndPeriod=Date end period
 newLT1Payment=New tax 2 payment
@@ -81,7 +82,7 @@ LT2PaymentES=IRPF Payment
 LT2PaymentsES=IRPF Payments
 VATPayment=Sales tax payment
 VATPayments=Sales tax payments
-VATRefund=Sales tax refund Refund
+VATRefund=Sales tax refund
 Refund=Refund
 SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Show VAT payment
@@ -194,7 +195,7 @@ CloneTax=Clone a social/fiscal tax
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
 CloneTaxForNextMonth=Clone it for next month
 SimpleReport=Simple report
-AddExtraReport=Extra reports
+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
diff --git a/htdocs/langs/uk_UA/cron.lang b/htdocs/langs/uk_UA/cron.lang
index cb68b31c80f..5c3ecd0a53f 100644
--- a/htdocs/langs/uk_UA/cron.lang
+++ b/htdocs/langs/uk_UA/cron.lang
@@ -17,14 +17,14 @@ CronMethodDoesNotExists=Class %s does not contains any method %s
 # Menu
 EnabledAndDisabled=Enabled and disabled
 # Page list
-CronLastOutput=Last run output
-CronLastResult=Last result code
+CronLastOutput=Latest run output
+CronLastResult=Latest result code
 CronCommand=Command
 CronList=Scheduled jobs
 CronDelete=Delete scheduled jobs
-CronConfirmDelete=Are you sure you want to delete these scheduled jobs ?
+CronConfirmDelete=Are you sure you want to delete these scheduled jobs?
 CronExecute=Launch scheduled job
-CronConfirmExecute=Are you sure you want to execute these scheduled jobs now ?
+CronConfirmExecute=Are you sure you want to execute these scheduled jobs now?
 CronInfo=Scheduled job module allow to execute job that have been planned
 CronTask=Job
 CronNone=None
@@ -65,7 +65,7 @@ CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of
 CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
 CronCommandHelp=The system command line to execute.
 CronCreateJob=Create new Scheduled Job
-CronFrom=From
+CronFrom=Продавець
 # Info
 # Common
 CronType=Job type
diff --git a/htdocs/langs/uk_UA/errors.lang b/htdocs/langs/uk_UA/errors.lang
index f935ce72d41..9e2eb6817ef 100644
--- a/htdocs/langs/uk_UA/errors.lang
+++ b/htdocs/langs/uk_UA/errors.lang
@@ -11,6 +11,7 @@ ErrorLoginAlreadyExists=Login %s already exists.
 ErrorGroupAlreadyExists=Group %s already exists.
 ErrorRecordNotFound=Record not found.
 ErrorFailToCopyFile=Failed to copy file '<b>%s</b>' into '<b>%s</b>'.
+ErrorFailToCopyDir=Failed to copy directory '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToRenameFile=Failed to rename file '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToDeleteFile=Failed to remove file '<b>%s</b>'.
 ErrorFailToCreateFile=Failed to create file '<b>%s</b>'.
@@ -115,7 +116,7 @@ ErrorNoActivatedBarcode=No barcode type activated
 ErrUnzipFails=Failed to unzip %s with ZipArchive
 ErrNoZipEngine=No engine to unzip %s file in this PHP
 ErrorFileMustBeADolibarrPackage=The file %s must be a Dolibarr zip package
-ErrorFileRequired=It takes a package Dolibarr file
+ErrorModuleFileRequired=You must select a Dolibarr module package file
 ErrorPhpCurlNotInstalled=The PHP CURL is not installed, this is essential to talk with 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
@@ -170,14 +171,19 @@ ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
 ErrorFileMustHaveFormat=File must have format %s
 ErrorSupplierCountryIsNotDefined=Country for this supplier is not defined. Correct this first.
 ErrorsThirdpartyMerge=Failed to merge the two records. Request canceled.
-ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enougth for product %s to add it into a new order.
-ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enougth for product %s to add it into a new invoice.
-ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enougth for product %s to add it into a new shipment.
-ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enougth for product %s to add it into a new proposal.
-ErrorFailedToLoadLoginFileForMode=Failed to get the login file for mode '%s'.
+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 bank 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>
 
 # 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.
diff --git a/htdocs/langs/uk_UA/holiday.lang b/htdocs/langs/uk_UA/holiday.lang
index f5e2fb991a5..5c980824feb 100644
--- a/htdocs/langs/uk_UA/holiday.lang
+++ b/htdocs/langs/uk_UA/holiday.lang
@@ -76,8 +76,9 @@ BoxTitleLastLeaveRequests=Latest %s modified leave requests
 HolidaysMonthlyUpdate=Monthly update
 ManualUpdate=Manual update
 HolidaysCancelation=Leave request cancelation
-EmployeeLastname=Employee lastname
-EmployeeFirstname=Employee firstname
+EmployeeLastname=Employee last name
+EmployeeFirstname=Employee first name
+TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
 
 ## Configuration du Module ##
 LastUpdateCP=Latest automatic update of leaves allocation
diff --git a/htdocs/langs/uk_UA/ldap.lang b/htdocs/langs/uk_UA/ldap.lang
index a17019d00fb..42e699de311 100644
--- a/htdocs/langs/uk_UA/ldap.lang
+++ b/htdocs/langs/uk_UA/ldap.lang
@@ -13,8 +13,8 @@ LDAPUsers=Users in LDAP database
 LDAPFieldStatus=Status
 LDAPFieldFirstSubscriptionDate=First subscription date
 LDAPFieldFirstSubscriptionAmount=First subscription amount
-LDAPFieldLastSubscriptionDate=Last subscription date
-LDAPFieldLastSubscriptionAmount=Last subscription amount
+LDAPFieldLastSubscriptionDate=Latest subscription date
+LDAPFieldLastSubscriptionAmount=Latest subscription amount
 LDAPFieldSkype=Skype id
 LDAPFieldSkypeExample=Example : skypeName
 UserSynchronized=User synchronized
diff --git a/htdocs/langs/uk_UA/mails.lang b/htdocs/langs/uk_UA/mails.lang
index 7f36311ec9e..ebcf609c27d 100644
--- a/htdocs/langs/uk_UA/mails.lang
+++ b/htdocs/langs/uk_UA/mails.lang
@@ -35,7 +35,7 @@ MailingStatusSentPartialy=Sent partialy
 MailingStatusSentCompletely=Sent completely
 MailingStatusError=Помилка
 MailingStatusNotSent=Not sent
-MailSuccessfulySent=Email successfully sent (from %s to %s)
+MailSuccessfulySent=Email successfully accepted for delivery (from %s to %s)
 MailingSuccessfullyValidated=EMailing successfully validated
 MailUnsubcribe=Unsubscribe
 MailingStatusNotContact=Don't contact anymore
@@ -74,22 +74,28 @@ ResultOfMailSending=Result of mass EMail sending
 NbSelected=Nb selected
 NbIgnored=Nb ignored
 NbSent=Nb 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
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Line %s in file
 RecipientSelectionModules=Defined requests for recipient's selection
 MailSelectedRecipients=Selected recipients
 MailingArea=EMailings area
-LastMailings=Last %s emailings
+LastMailings=Latest %s emailings
 TargetsStatistics=Targets statistics
 NbOfCompaniesContacts=Unique contacts/addresses
 MailNoChangePossible=Recipients for validated emailing can't be changed
 SearchAMailing=Search mailing
 SendMailing=Send emailing
 SendMail=Send email
-MailingNeedCommand=For security reason, sending an emailing is better when performed from command line. If you have one, ask your server administrator to launch the following command to send the emailing to all recipients:
+SentBy=Sent by
+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=You can however send them online by adding parameter MAILING_LIMIT_SENDBYWEB with value of max number of emails you want to send by session. For this, go on Home - Setup - Other.
-ConfirmSendingEmailing=If you can't or prefer sending them with your www browser, please confirm you are sure you want to send emailing now from your browser?
+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.
 TargetsReset=Clear list
 ToClearAllRecipientsClickHere=Click here to clear the recipient list for this emailing
@@ -144,3 +150,6 @@ AdvTgtCreateFilter=Create filter
 AdvTgtOrCreateNewFilter=Name of new filter
 NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
+OutGoingEmailSetup=Outgoing email setup
+InGoingEmailSetup=Incoming email setup
+
diff --git a/htdocs/langs/uk_UA/main.lang b/htdocs/langs/uk_UA/main.lang
index d48664466d6..5648e76c43a 100644
--- a/htdocs/langs/uk_UA/main.lang
+++ b/htdocs/langs/uk_UA/main.lang
@@ -63,11 +63,13 @@ ErrorNoVATRateDefinedForSellerCountry=Error, no vat rates defined for country '%
 ErrorNoSocialContributionForSellerCountry=Error, no social/fiscal taxes type defined for country '%s'.
 ErrorFailedToSaveFile=Error, failed to save file.
 ErrorCannotAddThisParentWarehouse=You are trying to add a parent warehouse which is already a child of current one
+MaxNbOfRecordPerPage=Max nb of record per page
 NotAuthorized=You are not authorized to do that.
 SetDate=Set date
 SelectDate=Select a date
 SeeAlso=See also %s
 SeeHere=See here
+Apply=Застосувати
 BackgroundColorByDefault=Default background color
 FileRenamed=The file was successfully renamed
 FileUploaded=The file was successfully uploaded
@@ -86,7 +88,7 @@ Undefined=Undefined
 PasswordForgotten=Password forgotten?
 SeeAbove=See above
 HomeArea=Home area
-LastConnexion=Last connection
+LastConnexion=Latest connection
 PreviousConnexion=Previous connection
 PreviousValue=Previous value
 ConnectedOnMultiCompany=Connected on environment
@@ -236,7 +238,7 @@ DateCreation=Creation date
 DateCreationShort=Creat. date
 DateModification=Modification date
 DateModificationShort=Modif. date
-DateLastModification=Last modification date
+DateLastModification=Latest modification date
 DateValidation=Validation date
 DateClosing=Closing date
 DateDue=Due date
@@ -432,7 +434,7 @@ Reportings=Reporting
 Draft=Проект
 Drafts=Drafts
 Validated=Підтверджений
-Opened=Open
+Opened=Opened
 New=New
 Discount=Знижка
 Unknown=Невизначена
@@ -460,6 +462,7 @@ DeletePicture=Picture delete
 ConfirmDeletePicture=Confirm picture deletion?
 Login=Login
 CurrentLogin=Current login
+EnterLoginDetail=Enter login details
 January=January
 February=February
 March=March
@@ -597,6 +600,8 @@ SessionName=Session name
 Method=Method
 Receive=Receive
 CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
+ExpectedValue=Expected Value
+CurrentValue=Current value
 PartialWoman=Partial
 TotalWoman=Total
 NeverReceived=Never received
@@ -753,6 +758,8 @@ RemoveString=Remove string '%s'
 SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
 DirectDownloadLink=Direct download link
 Download=Download
+ActualizeCurrency=Update currency rate
+Fiscalyear=Fiscal year
 # Week day
 Monday=Monday
 Tuesday=Tuesday
@@ -787,8 +794,8 @@ SetRef=Set ref
 Select2ResultFoundUseArrows=Some results found. Use arrows to select.
 Select2NotFound=No result found
 Select2Enter=Enter
-Select2MoreCharacter=or more character
-Select2MoreCharacters=or more characters
+Select2MoreCharacter=or more characters<br /><br /><strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
+Select2MoreCharacters=or more characters<br /><br /><strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
 Select2LoadingMoreResults=Loading more results...
 Select2SearchInProgress=Search in progress...
 SearchIntoThirdparties=Thirdparties
@@ -809,3 +816,5 @@ SearchIntoContracts=Contracts
 SearchIntoCustomerShipments=Customer shipments
 SearchIntoExpenseReports=Expense reports
 SearchIntoLeaves=Leaves
+
+BulkActions=Bulk actions
diff --git a/htdocs/langs/uk_UA/members.lang b/htdocs/langs/uk_UA/members.lang
index e49f005f193..3434d26e21b 100644
--- a/htdocs/langs/uk_UA/members.lang
+++ b/htdocs/langs/uk_UA/members.lang
@@ -45,7 +45,7 @@ MemberStatusDraft=Проект (має бути підтверджений)
 MemberStatusDraftShort=Проект
 MemberStatusActive=Validated (waiting subscription)
 MemberStatusActiveShort=Підтверджений
-MemberStatusActiveLate=subscription expired
+MemberStatusActiveLate=Subscription expired
 MemberStatusActiveLateShort=Expired
 MemberStatusPaid=Subscription up to date
 MemberStatusPaidShort=Up to date
@@ -136,8 +136,8 @@ DocForAllMembersCards=Generate business cards for all members
 DocForOneMemberCards=Generate business cards for a particular member
 DocForLabels=Generate address sheets
 SubscriptionPayment=Subscription payment
-LastSubscriptionDate=Last subscription date
-LastSubscriptionAmount=Last subscription amount
+LastSubscriptionDate=Latest subscription date
+LastSubscriptionAmount=Latest subscription amount
 MembersStatisticsByCountries=Members statistics by country
 MembersStatisticsByState=Members statistics by state/province
 MembersStatisticsByTown=Members statistics by town
@@ -149,7 +149,7 @@ MembersByStateDesc=This screen show you statistics on members by state/provinces
 MembersByTownDesc=This screen show you statistics on members by town.
 MembersStatisticsDesc=Choose statistics you want to read...
 MenuMembersStats=Statistics
-LastMemberDate=Last member date
+LastMemberDate=Latest member date
 Nature=Nature
 Public=Information are public
 NewMemberbyWeb=New member added. Awaiting approval
diff --git a/htdocs/langs/uk_UA/orders.lang b/htdocs/langs/uk_UA/orders.lang
index b5978884131..493f097fdf4 100644
--- a/htdocs/langs/uk_UA/orders.lang
+++ b/htdocs/langs/uk_UA/orders.lang
@@ -39,7 +39,7 @@ StatusOrderRefusedShort=Refused
 StatusOrderBilledShort=Виставлений
 StatusOrderToProcessShort=To process
 StatusOrderReceivedPartiallyShort=Partially received
-StatusOrderReceivedAllShort=Everything received
+StatusOrderReceivedAllShort=Products received
 StatusOrderCanceled=Canceled
 StatusOrderDraft=Проект (має бути підтверджений)
 StatusOrderValidated=Підтверджений
@@ -51,7 +51,7 @@ StatusOrderApproved=Approved
 StatusOrderRefused=Refused
 StatusOrderBilled=Виставлений
 StatusOrderReceivedPartially=Partially received
-StatusOrderReceivedAll=Everything received
+StatusOrderReceivedAll=All products received
 ShippingExist=A shipment exists
 QtyOrdered=Qty ordered
 ProductQtyInDraft=Product quantity into draft orders
diff --git a/htdocs/langs/uk_UA/other.lang b/htdocs/langs/uk_UA/other.lang
index 1ea1f9da1db..ab937ff3bab 100644
--- a/htdocs/langs/uk_UA/other.lang
+++ b/htdocs/langs/uk_UA/other.lang
@@ -2,6 +2,7 @@
 SecurityCode=Security code
 NumberingShort=N°
 Tools=Tools
+TMenuTools=Tools
 ToolsDesc=All miscellaneous tools not included in other menu entries are collected here.<br /><br />All the tools can be reached in the left menu.
 Birthday=Birthday
 BirthdayDate=Birthday date
@@ -67,14 +68,15 @@ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find her
 PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nYou will find here the shipping __SHIPPINGREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nYou will find here the intervention __FICHINTERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n__PERSONALIZED__\n\n__SIGNATURE__
-DemoDesc=Dolibarr is a compact ERP/CRM supporting several functional modules. A demo showcasing all modules makes no sense as this scenario never occurs. So, several demo profiles are available.
+DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
+ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
 DemoFundation=Manage members of a foundation
 DemoFundation2=Manage members and bank account of a foundation
-DemoCompanyServiceOnly=Manage a freelance activity selling service only
+DemoCompanyServiceOnly=Company or freelance selling service only
 DemoCompanyShopWithCashDesk=Manage a shop with a cash desk
-DemoCompanyProductAndStocks=Manage a small or medium company selling products
-DemoCompanyAll=Manage a small or medium company with multiple activities (all main modules)
+DemoCompanyProductAndStocks=Company selling products with a shop
+DemoCompanyAll=Company with multiple activities (all main modules)
 CreatedBy=Created by %s
 ModifiedBy=Modified by %s
 ValidatedBy=Validated by %s
diff --git a/htdocs/langs/uk_UA/products.lang b/htdocs/langs/uk_UA/products.lang
index 5dc06edaf22..2b147be7dc2 100644
--- a/htdocs/langs/uk_UA/products.lang
+++ b/htdocs/langs/uk_UA/products.lang
@@ -5,6 +5,8 @@ ProductLabelTranslated=Translated product label
 ProductDescriptionTranslated=Translated product description
 ProductNoteTranslated=Translated product note
 ProductServiceCard=Products/Services card
+TMenuProducts=Products
+TMenuServices=Services
 Products=Products
 Services=Services
 Product=Product
@@ -58,7 +60,7 @@ SellingPrice=Selling price
 SellingPriceHT=Selling price (net of tax)
 SellingPriceTTC=Selling price (inc. tax)
 CostPriceDescription=This price (net of tax) can be used to store the average amount this product cost to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
-CostPriceUsage=In a future version, this value could be used for margin calculation.
+CostPriceUsage=This value could be used for margin calculation.
 SoldAmount=Sold amount
 PurchasedAmount=Purchased amount
 NewPrice=New price
@@ -140,6 +142,7 @@ ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b>?
 CloneContentProduct=Clone all main informations of product/service
 ClonePricesProduct=Clone main informations and prices
 CloneCompositionProduct=Clone packaged product/service
+CloneCombinationsProduct=Clone product variants
 ProductIsUsed=This product is used
 NewRefForClone=Ref. of new product/service
 SellingPrices=Selling prices
@@ -236,7 +239,7 @@ GlobalVariables=Global variables
 VariableToUpdate=Variable to update
 GlobalVariableUpdaters=Global variable updaters
 UpdateInterval=Update interval (minutes)
-LastUpdated=Last updated
+LastUpdated=Latest update
 CorrectlyUpdated=Correctly updated
 PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
 PropalMergePdfProductChooseFile=Select PDF files
@@ -256,4 +259,41 @@ VolumeUnits=Volume unit
 SizeUnits=Size unit
 DeleteProductBuyPrice=Delete buying price
 ConfirmDeleteProductBuyPrice=Are you sure you want to delete this buying price?
+SubProduct=Sub product
 
+#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
+ProductCombinations=Variants
+HideProductCombinations=Hide products variant in the products selector
+ProductCombination=Variant
+NewProductCombination=New variant
+EditProductCombination=Editing variant
+ProductCombinationGenerator=Variants generator
+Features=Features
+PriceImpact=Price impact
+WeightImpact=Weight impact
+NewProductAttribute=New attribute
+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
+PercentageVariation=Percentage variation
+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 child products
+ConfirmCloneProductCombinations=Would you like to copy all the product variant to the 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
diff --git a/htdocs/langs/uk_UA/projects.lang b/htdocs/langs/uk_UA/projects.lang
index f824a2bf8c3..8227ed550d9 100644
--- a/htdocs/langs/uk_UA/projects.lang
+++ b/htdocs/langs/uk_UA/projects.lang
@@ -29,9 +29,9 @@ DeleteAProject=Delete a project
 DeleteATask=Delete a task
 ConfirmDeleteAProject=Are you sure you want to delete this project?
 ConfirmDeleteATask=Are you sure you want to delete this task?
-OpenedProjects=Open projects
-OpenedTasks=Open tasks
-OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
+OpenedProjects=Opened projects
+OpenedTasks=Opened tasks
+OpportunitiesStatusForOpenedProjects=Opportunities amount of opened projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=Show project
 SetProject=Set project
@@ -47,7 +47,7 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
 TaskTimeDate=Date
-TasksOnOpenedProject=Tasks on open projects
+TasksOnOpenedProject=Tasks on opened projects
 WorkloadNotDefined=Workload not defined
 NewTimeSpent=New time spent
 MyTimeSpent=My time spent
@@ -58,6 +58,7 @@ TaskDateEnd=Task end date
 TaskDescription=Task description
 NewTask=New task
 AddTask=Create task
+AddTimeSpent=Create time spent
 Activity=Activity
 Activities=Tasks/activities
 MyActivities=My tasks/activities
@@ -95,6 +96,7 @@ ValidateProject=Validate projet
 ConfirmValidateProject=Are you sure you want to validate this project?
 CloseAProject=Close project
 ConfirmCloseAProject=Are you sure you want to close this project?
+AlsoCloseAProject=Also close project (keep it open if you still need to follow production tasks on it)
 ReOpenAProject=Open project
 ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=Project contacts
@@ -120,7 +122,7 @@ CloneProjectFiles=Clone project joined files
 CloneTaskFiles=Clone task(s) joined files (if task(s) cloned)
 CloneMoveDate=Update project/tasks dates from now?
 ConfirmCloneProject=Are you sure to clone this project?
-ProjectReportDate=Change task date according project start date
+ProjectReportDate=Change task dates according to new project start date
 ErrorShiftTaskDate=Impossible to shift task date according to new project start date
 ProjectsAndTasksLines=Projects and tasks
 ProjectCreatedInDolibarr=Project %s created
@@ -177,9 +179,9 @@ ProjectsStatistics=Statistics on projects/leads
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 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.
-OpenedProjectsByThirdparties=Open projects by thirdparties
+OpenedProjectsByThirdparties=Opened projects by thirdparties
 OnlyOpportunitiesShort=Only opportunities
-OpenedOpportunitiesShort=Open opportunities
+OpenedOpportunitiesShort=Opened opportunities
 NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount
diff --git a/htdocs/langs/uk_UA/propal.lang b/htdocs/langs/uk_UA/propal.lang
index 129e713d39d..e8cc8883df8 100644
--- a/htdocs/langs/uk_UA/propal.lang
+++ b/htdocs/langs/uk_UA/propal.lang
@@ -3,7 +3,7 @@ Proposals=Commercial proposals
 Proposal=Commercial proposal
 ProposalShort=Proposal
 ProposalsDraft=Draft commercial proposals
-ProposalsOpened=Open commercial proposals
+ProposalsOpened=Opened commercial proposals
 Prop=Commercial proposals
 CommercialProposal=Commercial proposal
 ProposalCard=Proposal card
@@ -26,9 +26,9 @@ AmountOfProposalsByMonthHT=Amount by month (net of tax)
 NbOfProposals=Number of commercial proposals
 ShowPropal=Show proposal
 PropalsDraft=Drafts
-PropalsOpened=Open
+PropalsOpened=Opened
 PropalStatusDraft=Проект (має бути підтверджений)
-PropalStatusValidated=Validated (proposal is open)
+PropalStatusValidated=Validated (proposal is opened)
 PropalStatusSigned=Signed (needs billing)
 PropalStatusNotSigned=Not signed (closed)
 PropalStatusBilled=Виставлений
diff --git a/htdocs/langs/uk_UA/stocks.lang b/htdocs/langs/uk_UA/stocks.lang
index 83543c23265..3a2d8e92aca 100644
--- a/htdocs/langs/uk_UA/stocks.lang
+++ b/htdocs/langs/uk_UA/stocks.lang
@@ -22,13 +22,15 @@ Movements=Movements
 ErrorWarehouseRefRequired=Warehouse reference name is required
 ListOfWarehouses=List of warehouses
 ListOfStockMovements=List of stock movements
+StockMovementForId=Movement ID %d
+ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Warehouses area
 Location=Розташування
 LocationSummary=Short name location
 NumberOfDifferentProducts=Number of different products
 NumberOfProducts=Total number of products
-LastMovement=Last movement
-LastMovements=Last movements
+LastMovement=Latest movement
+LastMovements=Latest movements
 Units=Units
 Unit=Unit
 StockCorrection=Correct stock
@@ -140,3 +142,4 @@ ProductStockWarehouseCreated=Stock limit for alert and desired optimal stock cor
 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
diff --git a/htdocs/langs/uk_UA/supplier_proposal.lang b/htdocs/langs/uk_UA/supplier_proposal.lang
index e62082f3ec1..a947afa7233 100644
--- a/htdocs/langs/uk_UA/supplier_proposal.lang
+++ b/htdocs/langs/uk_UA/supplier_proposal.lang
@@ -8,7 +8,7 @@ SearchRequest=Find a request
 DraftRequests=Draft requests
 SupplierProposalsDraft=Draft supplier proposals
 LastModifiedRequests=Latest %s modified price requests
-RequestsOpened=Open price requests
+RequestsOpened=Opened price requests
 SupplierProposalArea=Supplier proposals area
 SupplierProposalShort=Supplier proposal
 SupplierProposals=Supplier proposals
@@ -23,7 +23,7 @@ ConfirmValidateAsk=Are you sure you want to validate this price request under na
 DeleteAsk=Delete request
 ValidateAsk=Validate request
 SupplierProposalStatusDraft=Проект (має бути підтверджений)
-SupplierProposalStatusValidated=Validated (request is open)
+SupplierProposalStatusValidated=Validated (request is opened)
 SupplierProposalStatusClosed=Зачинено
 SupplierProposalStatusSigned=Accepted
 SupplierProposalStatusNotSigned=Refused
diff --git a/htdocs/langs/uk_UA/suppliers.lang b/htdocs/langs/uk_UA/suppliers.lang
index 766e4a9bfe9..b890919ace5 100644
--- a/htdocs/langs/uk_UA/suppliers.lang
+++ b/htdocs/langs/uk_UA/suppliers.lang
@@ -24,10 +24,10 @@ ExportDataset_fournisseur_1=Supplier invoices list and invoice lines
 ExportDataset_fournisseur_2=Supplier invoices and payments
 ExportDataset_fournisseur_3=Supplier orders and order lines
 ApproveThisOrder=Approve this order
-ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b> ?
+ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b>?
 DenyingThisOrder=Deny this order
-ConfirmDenyingThisOrder=Are you sure you want to deny this order <b>%s</b> ?
-ConfirmCancelThisOrder=Are you sure you want to cancel this order <b>%s</b> ?
+ConfirmDenyingThisOrder=Are you sure you want to deny this order <b>%s</b>?
+ConfirmCancelThisOrder=Are you sure you want to cancel this order <b>%s</b>?
 AddSupplierOrder=Create supplier order
 AddSupplierInvoice=Create supplier invoice
 ListOfSupplierProductForSupplier=List of products and prices for supplier <b>%s</b>
@@ -41,3 +41,4 @@ DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Wrong quality
 ReputationForThisProduct=Reputation
 BuyerName=Buyer name
+AllProductServicePrices=All product / service prices
diff --git a/htdocs/langs/uk_UA/users.lang b/htdocs/langs/uk_UA/users.lang
index b836db8eb42..a0a1eae8697 100644
--- a/htdocs/langs/uk_UA/users.lang
+++ b/htdocs/langs/uk_UA/users.lang
@@ -36,7 +36,7 @@ AdministratorDesc=Administrator
 DefaultRights=Default permissions
 DefaultRightsDesc=Define here <u>default</u> permissions that are automatically granted to a <u>new created</u> user (Go on user card to change permission of an existing user).
 DolibarrUsers=Dolibarr users
-LastName=Last Name
+LastName=Last name
 FirstName=First name
 ListOfGroups=List of groups
 NewGroup=New group
diff --git a/htdocs/langs/uk_UA/withdrawals.lang b/htdocs/langs/uk_UA/withdrawals.lang
index 6e560a1abb1..a99d890e5f9 100644
--- a/htdocs/langs/uk_UA/withdrawals.lang
+++ b/htdocs/langs/uk_UA/withdrawals.lang
@@ -24,6 +24,7 @@ WithdrawStatistics=Direct debit payment statistics
 WithdrawRejectStatistics=Direct debit payment reject statistics
 LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
+WithdrawRequestsDone=%s direct debit payment requests recorded
 ThirdPartyBankCode=Third party bank code
 NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoice are on companies with a valid BAN.
 ClassCredited=Classify credited
@@ -76,8 +77,8 @@ RUM=UMR
 RUMLong=Unique Mandate Reference
 RUMWillBeGenerated=UMR number will be generated once bank account information are saved
 WithdrawMode=Direct debit mode (FRST or RECUR)
-WithdrawRequestAmount=Withdraw request amount:
-WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil amount.
+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
diff --git a/htdocs/langs/uz_UZ/accountancy.lang b/htdocs/langs/uz_UZ/accountancy.lang
index 5de95948fbf..4c2336b97b0 100644
--- a/htdocs/langs/uz_UZ/accountancy.lang
+++ b/htdocs/langs/uz_UZ/accountancy.lang
@@ -194,6 +194,8 @@ ChangeBinding=Change the binding
 
 ## Admin
 ApplyMassCategories=Apply mass categories
+AddAccountFromBookKeepingWithNoCategories=Add acccount already used with no categories
+CategoryDeleted=Category for the accounting account has been removed
 
 ## Export
 Exports=Exports
@@ -209,6 +211,7 @@ Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution
 Modelcsv_quadratus=Export towards Quadratus QuadraCompta
 Modelcsv_ebp=Export towards EBP
 Modelcsv_cogilog=Export towards Cogilog
+ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
 InitAccountancy=Init accountancy
diff --git a/htdocs/langs/uz_UZ/admin.lang b/htdocs/langs/uz_UZ/admin.lang
index 23c8998e615..7282d9a21db 100644
--- a/htdocs/langs/uz_UZ/admin.lang
+++ b/htdocs/langs/uz_UZ/admin.lang
@@ -9,14 +9,20 @@ VersionDevelopment=Development
 VersionUnknown=Unknown
 VersionRecommanded=Recommended
 FileCheck=Files integrity checker
-FileCheckDesc=This tool allows you to check the integrity of files of your application, comparing each files with the official ones. You can use this tool to detect if some files were modified by a hacker for example.
+FileCheckDesc=This tool allows you to check the integrity of files and setup of your application, comparing each files with the official ones. 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.
+FileIntegrityIsStrictlyConformedWithReference=Files integrity is strictly conformed with the reference.
+FileIntegrityIsOkButFilesWereAdded=Files integrity check has passed, however some new files were added.
+FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified, removed or added.
+GlobalChecksum=Global checksum
 MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
 LocalSignature=Embedded local signature (less reliable)
 RemoteSignature=Remote distant signature (more reliable)
 FilesMissing=Missing Files
 FilesUpdated=Updated Files
+FilesModified=Modified Files
+FilesAdded=Added Files
 FileCheckDolibarr=Check integrity of application files
-AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from a certified package
+AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from an official package
 XmlNotFound=Xml Integrity File of application not found
 SessionId=Session ID
 SessionSaveHandler=Handler to save sessions
@@ -185,7 +191,9 @@ BoxesDesc=Widgets are components showing some information that you can add to pe
 OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
 ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
-ModulesMarketPlaces=More modules...
+ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
+ModulesMarketPlaces=Find external modules...
+GoModuleSetupArea=To deploy/install a new module, go onto the Module setup area at <a href="%s">%s</a>.
 DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules
 DoliPartnersDesc=List of companies providing custom developed modules or features (Note: anyone experienced in PHP programming can provide custom development for an open source project)
 WebSiteDesc=Reference websites to find more modules...
@@ -276,21 +284,22 @@ ModuleFamilyInterface=Interfaces with external systems
 MenuHandlers=Menu handlers
 MenuAdmin=Menu editor
 DoNotUseInProduction=Do not use in production
-ThisIsProcessToFollow=This is setup to process:
-ThisIsAlternativeProcessToFollow=This is an alternative setup to process:
+ThisIsProcessToFollow=This is steps to process:
+ThisIsAlternativeProcessToFollow=This is an alternative setup to process manually:
 StepNb=Step %s
 FindPackageFromWebSite=Find a package that provides feature you want (for example on official web site %s).
 DownloadPackageFromWebSite=Download package (for example from official web site %s).
-UnpackPackageInDolibarrRoot=Unpack package file into Dolibarr server directory dedicated to external modules: <b>%s</b>
-SetupIsReadyForUse=Install is finished and Dolibarr is ready to use with this new component.
-NotExistsDirect=The alternative root directory is not defined.<br>
-InfDirAlt=Since version 3 it is possible to define an alternative root directory.This allows you to store, same place, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
-InfDirExample=<br>Then declare it in the file conf.php<br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>*These lines are commented with "#", to uncomment only remove the character.
+UnpackPackageInDolibarrRoot=Unpack the packaged files into server directory dedicated to Dolibarr: <b>%s</b>
+UnpackPackageInModulesRoot=To deploy/install an external module, unpack the packaged files into the server directory dedicated to modules: <b>%s</b>
+SetupIsReadyForUse=Module deployment is finished. You must however enable and setup the module in your application by going on the page to setup modules: <a href="%s">%s</a>.
+NotExistsDirect=The alternative root directory is not defined to an existing directory.<br>
+InfDirAlt=Since version 3, it is possible to define an alternative root directory. This allows you to store, into a dedicated directory, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
+InfDirExample=<br>Then declare it in the file <strong>conf.php</strong><br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>If these lines are commented with "#", to enable them, just uncomment by removing the "#" character.
 YouCanSubmitFile=For this step, you can send package using this tool: Select module file
 CurrentVersion=Dolibarr current version
 CallUpdatePage=Go to the page that updates the database structure and data: %s.
 LastStableVersion=Latest stable version
-LastActivationDate=Last activation date
+LastActivationDate=Latest activation date
 UpdateServerOffline=Update server offline
 GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s. <br><b>{000000@x}</b> same as previous but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
 GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
@@ -373,11 +382,11 @@ ExtrafieldCheckBox=Checkbox
 ExtrafieldRadio=Radio button
 ExtrafieldCheckBoxFromList= Checkbox from table
 ExtrafieldLink=Link to an object
-ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>In order to have the list depending on another :<br>1,value1|parent_list_code:parent_key<br>2,value2|parent_list_code:parent_key
+ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list :<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list :<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
-ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
+ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Example : Societe:societe/class/societe.class.php
 LibraryToBuildPDF=Library used for PDF generation
 WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
@@ -411,10 +420,11 @@ ModuleCompanyCodePanicum=Return an empty accountancy code.
 ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party code.
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
-
+WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<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).
+ClickToShowDescription=Click to show description
 # Modules
 Module0Name=Users & groups
-Module0Desc=Users and groups management
+Module0Desc=Users / Employees and Groups management
 Module1Name=Third parties
 Module1Desc=Companies and contact management (customers, prospects...)
 Module2Name=Commercial
@@ -515,8 +525,8 @@ Module2200Name=Dynamic Prices
 Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
 Module2300Desc=Scheduled job management
-Module2400Name=Agenda/Events
-Module2400Desc=Follow events or rendez-vous. Record manual events into Agendas or let application logs automatic events for tracking purposes.
+Module2400Name=Events/Agenda
+Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous.
 Module2500Name=Electronic Content Management
 Module2500Desc=Save and share documents
 Module2600Name=API/Web services (SOAP server)
@@ -582,7 +592,7 @@ Permission34=Delete products
 Permission36=See/manage hidden products
 Permission38=Export products
 Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
-Permission42=Create/modify projects (shared project and projects i'm contact for)
+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)
 Permission45=Export projects
 Permission61=Read interventions
@@ -685,7 +695,7 @@ PermissionAdvanced253=Create/modify internal/external users and permissions
 Permission254=Create/modify external users only
 Permission255=Modify other users password
 Permission256=Delete or disable other users
-Permission262=Extend access to all third parties (not only those linked to user). Not effective for external users (always limited to themselves).
+Permission262=Extend access to all third parties (not only third parties that user is a sale representative).<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 assignement matters).
 Permission271=Read CA
 Permission272=Read invoices
 Permission273=Issue invoices
@@ -887,7 +897,7 @@ Offset=Offset
 AlwaysActive=Always active
 Upgrade=Upgrade
 MenuUpgrade=Upgrade / Extend
-AddExtensionThemeModuleOrOther=Add extension (theme, module, ...)
+AddExtensionThemeModuleOrOther=Deploy/install external module
 WebServer=Web server
 DocumentRootServer=Web server's root directory
 DataRootServer=Data files directory
@@ -994,7 +1004,7 @@ TriggerAlwaysActive=Triggers in this file are always active, whatever are the ac
 TriggerActiveAsModuleActive=Triggers in this file are active as module <b>%s</b> is enabled.
 GeneratedPasswordDesc=Define here which rule you want to use to generate new password if you ask to have auto generated password
 DictionaryDesc=Insert all reference data. You can add your values to the default.
-ConstDesc=This page allows you to edit all other parameters not available in previous pages. These are mostly reserved parameters for developers or advanced troubleshooting.
+ConstDesc=This page allows you to edit all other parameters not available in previous pages. These are mostly reserved parameters for developers or advanced troubleshooting. For a list of options <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">check here</a>.
 MiscellaneousDesc=All other security related parameters are defined here.
 LimitsSetup=Limits/Precision setup
 LimitsDesc=You can define limits, precisions and optimisations used by Dolibarr here
@@ -1161,10 +1171,6 @@ FreeLegalTextOnOrders=Free text on orders
 WatermarkOnDraftOrders=Watermark on draft orders (none if empty)
 ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable
 BANK_ASK_PAYMENT_BANK_DURING_ORDER=Ask for bank account destination of order
-##### Clicktodial #####
-ClickToDialSetup=Click To Dial module setup
-ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with your clicktodial login (defined on your user card)<br><b>__PASS__</b> that will be replaced with your clicktodial password (defined on your user card).
-##### Bookmark4u #####
 ##### Interventions #####
 InterventionsSetup=Interventions module setup
 FreeLegalTextOnInterventions=Free text on intervention documents
@@ -1391,7 +1397,7 @@ SendingsSetup=Sending module setup
 SendingsReceiptModel=Sending receipt model
 SendingsNumberingModules=Sendings numbering modules
 SendingsAbility=Support shipping sheets for customer deliveries
-NoNeedForDeliveryReceipts=In most cases, sendings receipts are used both as sheets for customer deliveries (list of products to send) and sheets that is recevied and signed by customer. So product deliveries receipts is a duplicated feature and is rarely activated.
+NoNeedForDeliveryReceipts=In most cases, shipping sheets are used both as sheets for customer deliveries (list of products to send) and sheets that is received and signed by customer. So product deliveries receipts is a duplicated feature and is rarely activated.
 FreeLegalTextOnShippings=Free text on shipments
 ##### Deliveries #####
 DeliveryOrderNumberingModules=Products deliveries receipt numbering module
@@ -1471,7 +1477,11 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Set automatically this default value for type of e
 AGENDA_DEFAULT_FILTER_TYPE=Set automatically this type of event into search filter of agenda view
 AGENDA_DEFAULT_FILTER_STATUS=Set automatically this status for events into search filter of agenda view
 AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
-##### ClickToDial #####
+AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
+AGENDA_NOTIFICATION_SOUND=Enable sound notification
+##### Clicktodial #####
+ClickToDialSetup=Click To Dial module setup
+ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with your clicktodial login (defined on your user card)<br><b>__PASS__</b> that will be replaced with your clicktodial password (defined on your user card).
 ClickToDialDesc=This module allows to make phone numbers clickable. A click on this icon will call make your phone to 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.
 ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
 ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on same computer than the browser, and called when you click on a link in your browser that start 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.
@@ -1499,10 +1509,11 @@ EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint availa
 ##### API ####
 ApiSetup=API module setup
 ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
-ApiProductionMode=Enable production mode (this will activate use of a caches for services management)
+ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
 ApiExporerIs=You can explore the APIs at url
 OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
 ApiKey=Key for API
+WarningAPIExplorerDisabled=The API explorer has been disabled. API explorer is not required to provide API services. It is a tool for developer to find/test REST APIs. If you need this tool, go into setup of module API REST to activate it.
 ##### Bank #####
 BankSetupModule=Bank module setup
 FreeLegalTextOnChequeReceipts=Free text on cheque receipts
@@ -1571,7 +1582,7 @@ BackupDumpWizard=Wizard to build database backup dump file
 SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
 SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is only manual steps a privileged user can do.
 InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
-ConfFileMuseContainCustom=Installing an external module from application save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to have option<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
+ConfFileMuseContainCustom=Installing an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
 HighlightLinesColor=Highlight color of the line when the mouse passes over (keep empty for no highlight)
 TextTitleColor=Color of page title
@@ -1601,6 +1612,7 @@ FixTZ=TimeZone fix
 FillFixTZOnlyIfRequired=Example: +2 (fill only if problem experienced)
 ExpectedChecksum=Expected Checksum
 CurrentChecksum=Current Checksum
+ForcedConstants=Required constant values
 MailToSendProposal=To send customer proposal
 MailToSendOrder=To send customer order
 MailToSendInvoice=To send customer invoice
@@ -1609,13 +1621,14 @@ MailToSendIntervention=To send intervention
 MailToSendSupplierRequestForQuotation=To send quotation request to supplier
 MailToSendSupplierOrder=To send supplier order
 MailToSendSupplierInvoice=To send supplier invoice
+MailToSendContract=To send a contract
 MailToThirdparty=To send email from third party page
 ByDefaultInList=Show by default on list view
-YouUseLastStableVersion=You use the last stable version
+YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
 TitleExampleForMaintenanceRelease=Example of message you can use to announce this maintenance release (feel free to use it on your web sites)
-ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. You can download it from the download area of http://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.
-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, nor data structure change is present into this version. You can download it from the download area of http://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.
+ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. 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.
+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, nor data structure change is present into 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, you can enter here rule to have price for each level autocalculated according to price of first level, so you will have to enter only price for first level on each product. This page is here to save you time and can be usefull only if your prices for each leve are relative to first level. You can ignore this page in most cases.
 ModelModulesProduct=Templates for product documents
 ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
diff --git a/htdocs/langs/uz_UZ/banks.lang b/htdocs/langs/uz_UZ/banks.lang
index 7ae841cf0f3..f0c41d5d5bf 100644
--- a/htdocs/langs/uz_UZ/banks.lang
+++ b/htdocs/langs/uz_UZ/banks.lang
@@ -74,13 +74,13 @@ Conciliate=Reconcile
 Conciliation=Reconciliation
 ReconciliationLate=Reconciliation late
 IncludeClosedAccount=Include closed accounts
-OnlyOpenedAccount=Only open accounts
+OnlyOpenedAccount=Only opened accounts
 AccountToCredit=Account to credit
 AccountToDebit=Account to debit
 DisableConciliation=Disable reconciliation feature for this account
 ConciliationDisabled=Reconciliation feature disabled
 LinkedToAConciliatedTransaction=Linked to a conciliated entry
-StatusAccountOpened=Open
+StatusAccountOpened=Opened
 StatusAccountClosed=Closed
 AccountIdShort=Number
 LineRecord=Transaction
diff --git a/htdocs/langs/uz_UZ/bills.lang b/htdocs/langs/uz_UZ/bills.lang
index bf3b48a37e9..5fb3b6169da 100644
--- a/htdocs/langs/uz_UZ/bills.lang
+++ b/htdocs/langs/uz_UZ/bills.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - bills
 Bill=Invoice
 Bills=Invoices
-BillsCustomers=Customers invoices
-BillsCustomer=Customers invoice
-BillsSuppliers=Suppliers invoices
-BillsCustomersUnpaid=Unpaid customers invoices
-BillsCustomersUnpaidForCompany=Unpaid customer's invoices for %s
-BillsSuppliersUnpaid=Unpaid supplier's invoices
-BillsSuppliersUnpaidForCompany=Unpaid supplier's invoices for %s
+BillsCustomers=Customer invoices
+BillsCustomer=Customer invoice
+BillsSuppliers=Supplier invoices
+BillsCustomersUnpaid=Unpaid customer invoices
+BillsCustomersUnpaidForCompany=Unpaid customer invoices for %s
+BillsSuppliersUnpaid=Unpaid supplier invoices
+BillsSuppliersUnpaidForCompany=Unpaid supplier invoices for %s
 BillsLate=Late payments
 BillsStatistics=Customers invoices statistics
 BillsStatisticsSuppliers=Suppliers invoices statistics
@@ -62,8 +62,8 @@ PaymentsBack=Payments back
 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 credit note or deposit 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.
+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.
 SupplierPayments=Suppliers payments
 ReceivedPayments=Received payments
 ReceivedCustomersPayments=Payments received from customers
@@ -78,6 +78,7 @@ PaymentMode=Payment type
 PaymentTypeDC=Debit/Credit Card
 PaymentTypePP=PayPal
 IdPaymentMode=Payment type (id)
+CodePaymentMode=Payment type (code)
 LabelPaymentMode=Payment type (label)
 PaymentModeShort=Payment type
 PaymentTerm=Payment term
@@ -102,9 +103,10 @@ SearchACustomerInvoice=Search for a customer invoice
 SearchASupplierInvoice=Search for a supplier invoice
 CancelBill=Cancel an invoice
 SendRemindByMail=Send reminder by EMail
-DoPayment=Do payment
-DoPaymentBack=Do payment back
+DoPayment=Enter payment
+DoPaymentBack=Enter refund
 ConvertToReduc=Convert into future discount
+ConvertExcessReceivedToReduc=Convert excess received into future discount
 EnterPaymentReceivedFromCustomer=Enter payment received from customer
 EnterPaymentDueToCustomer=Make payment due to customer
 DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
@@ -113,22 +115,24 @@ BillStatus=Invoice status
 StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Draft (needs to be validated)
 BillStatusPaid=Paid
-BillStatusPaidBackOrConverted=Paid or converted into discount
+BillStatusPaidBackOrConverted=Refund or converted into discount
 BillStatusConverted=Paid (ready for final invoice)
 BillStatusCanceled=Abandoned
 BillStatusValidated=Validated (needs to be paid)
 BillStatusStarted=Started
 BillStatusNotPaid=Not paid
+BillStatusNotRefunded=Not refunded
 BillStatusClosedUnpaid=Closed (unpaid)
 BillStatusClosedPaidPartially=Paid (partially)
 BillShortStatusDraft=Draft
 BillShortStatusPaid=Paid
-BillShortStatusPaidBackOrConverted=Processed
+BillShortStatusPaidBackOrConverted=Refund or converted
 BillShortStatusConverted=Processed
 BillShortStatusCanceled=Abandoned
 BillShortStatusValidated=Validated
 BillShortStatusStarted=Started
 BillShortStatusNotPaid=Not paid
+BillShortStatusNotRefunded=Not refunded
 BillShortStatusClosedUnpaid=Closed
 BillShortStatusClosedPaidPartially=Paid (partially)
 PaymentStatusToValidShort=To validate
@@ -149,14 +153,14 @@ NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified
 FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
 NotARecurringInvoiceTemplate=Not a recurring template invoice
 NewBill=New invoice
-LastBills=Last %s invoices
-LastCustomersBills=Last %s customers invoices
-LastSuppliersBills=Last %s suppliers invoices
+LastBills=Latest %s invoices
+LastCustomersBills=Latest %s customer invoices
+LastSuppliersBills=Latest %s supplier invoices
 AllBills=All invoices
 OtherBills=Other invoices
 DraftBills=Draft invoices
-CustomersDraftInvoices=Customers draft invoices
-SuppliersDraftInvoices=Suppliers draft invoices
+CustomersDraftInvoices=Customer draft invoices
+SuppliersDraftInvoices=Supplier draft invoices
 Unpaid=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>?
@@ -203,7 +207,7 @@ AlreadyPaidNoCreditNotesNoDeposits=Already paid (without credit notes and deposi
 Abandoned=Abandoned
 RemainderToPay=Remaining unpaid
 RemainderToTake=Remaining amount to take
-RemainderToPayBack=Remaining amount to pay back
+RemainderToPayBack=Remaining amount to refund
 Rest=Pending
 AmountExpected=Amount claimed
 ExcessReceived=Excess received
@@ -270,6 +274,7 @@ Deposit=Deposit
 Deposits=Deposits
 DiscountFromCreditNote=Discount from credit note %s
 DiscountFromDeposit=Payments from deposit invoice %s
+DiscountFromExcessReceived=Payments from excess received of invoice %s
 AbsoluteDiscountUse=This kind of credit can be used on invoice before its validation
 CreditNoteDepositUse=Invoice must be validated to use this kind of credits
 NewGlobalDiscount=New absolute discount
@@ -277,8 +282,8 @@ NewRelativeDiscount=New relative discount
 NoteReason=Note/Reason
 ReasonDiscount=Reason
 DiscountOfferedBy=Granted by
-DiscountStillRemaining=Discounts still remaining
-DiscountAlreadyCounted=Discounts already counted
+DiscountStillRemaining=Discounts available
+DiscountAlreadyCounted=Discounts already consumed
 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.
@@ -331,10 +336,12 @@ 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
 # PaymentConditions
 Statut=Status
-PaymentConditionShortRECEP=Immediate
-PaymentConditionRECEP=Immediate
+PaymentConditionShortRECEP=Due Upon Receipt
+PaymentConditionRECEP=Due Upon Receipt
 PaymentConditionShort30D=30 days
 PaymentCondition30D=30 days
 PaymentConditionShort30DENDMONTH=30 days of month-end
@@ -349,6 +356,14 @@ PaymentConditionShortPT_ORDER=Order
 PaymentConditionPT_ORDER=On order
 PaymentConditionShortPT_5050=50-50
 PaymentConditionPT_5050=50%% in advance, 50%% on delivery
+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
 FixAmount=Fix amount
 VarAmount=Variable amount (%% tot.)
 # PaymentType
@@ -418,7 +433,7 @@ ChequeDeposits=Checks deposits
 Cheques=Checks
 DepositId=Id deposit
 NbCheque=Number of checks
-CreditNoteConvertedIntoDiscount=This credit note or deposit invoice has been converted into %s
+CreditNoteConvertedIntoDiscount=This %s has been converted into %s
 UsBillingContactAsIncoiveRecipientIfExist=Use customer billing contact address instead of third party address as recipient for invoices
 ShowUnpaidAll=Show all unpaid invoices
 ShowUnpaidLateOnly=Show late unpaid invoices only
diff --git a/htdocs/langs/uz_UZ/boxes.lang b/htdocs/langs/uz_UZ/boxes.lang
index 98970318e85..38b03b4268d 100644
--- a/htdocs/langs/uz_UZ/boxes.lang
+++ b/htdocs/langs/uz_UZ/boxes.lang
@@ -25,8 +25,8 @@ BoxTitleLastSuppliers=Latest %s recorded suppliers
 BoxTitleLastModifiedSuppliers=Latest %s modified suppliers
 BoxTitleLastModifiedCustomers=Latest %s modified customers
 BoxTitleLastCustomersOrProspects=Latest %s customers or prospects
-BoxTitleLastCustomerBills=Latest %s customer's invoices
-BoxTitleLastSupplierBills=Latest %s supplier's invoices
+BoxTitleLastCustomerBills=Latest %s customer invoices
+BoxTitleLastSupplierBills=Latest %s supplier invoices
 BoxTitleLastModifiedProspects=Latest %s modified prospects
 BoxTitleLastModifiedMembers=Latest %s members
 BoxTitleLastFicheInter=Latest %s modified interventions
@@ -51,12 +51,12 @@ ClickToAdd=Click here to add.
 NoRecordedCustomers=No recorded customers
 NoRecordedContacts=No recorded contacts
 NoActionsToDo=No actions to do
-NoRecordedOrders=No recorded customer's orders
+NoRecordedOrders=No recorded customer orders
 NoRecordedProposals=No recorded proposals
-NoRecordedInvoices=No recorded customer's invoices
-NoUnpaidCustomerBills=No unpaid customer's invoices
-NoUnpaidSupplierBills=No unpaid supplier's invoices
-NoModifiedSupplierBills=No recorded supplier's invoices
+NoRecordedInvoices=No recorded customer invoices
+NoUnpaidCustomerBills=No unpaid customer invoices
+NoUnpaidSupplierBills=No unpaid supplier invoices
+NoModifiedSupplierBills=No recorded supplier invoices
 NoRecordedProducts=No recorded products/services
 NoRecordedProspects=No recorded prospects
 NoContractedProducts=No products/services contracted
diff --git a/htdocs/langs/uz_UZ/companies.lang b/htdocs/langs/uz_UZ/companies.lang
index 4a631b092cf..1b7efa3c14e 100644
--- a/htdocs/langs/uz_UZ/companies.lang
+++ b/htdocs/langs/uz_UZ/companies.lang
@@ -78,6 +78,10 @@ VATIsNotUsed=VAT is not used
 CopyAddressFromSoc=Fill address with third party address
 ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
 PaymentBankAccount=Payment bank account
+OverAllProposals=Total proposals
+OverAllOrders=Total orders
+OverAllInvoices=Total invoices
+OverAllSupplierProposals=Total price requests
 ##### Local Taxes #####
 LocalTax1IsUsed=Use second tax
 LocalTax1IsUsedES= RE is used
@@ -239,6 +243,10 @@ ProfId3RU=Prof Id 3 (KPP)
 ProfId4RU=Prof Id 4 (OKPO)
 ProfId5RU=-
 ProfId6RU=-
+ProfId1DZ=RC
+ProfId2DZ=Art.
+ProfId3DZ=NIF
+ProfId4DZ=NIS
 VATIntra=VAT number
 VATIntraShort=VAT number
 VATIntraSyntaxIsValid=Syntax is valid
@@ -382,8 +390,9 @@ ListCustomersShort=List of customers
 ThirdPartiesArea=Third parties and contact area
 LastModifiedThirdParties=Latest %s modified third parties
 UniqueThirdParties=Total of unique third parties
-InActivity=Open
+InActivity=Opened
 ActivityCeased=Closed
+ThirdPartyIsClosed=Third party is closed
 ProductsIntoElements=List of products/services into %s
 CurrentOutstandingBill=Current outstanding bill
 OutstandingBill=Max. for outstanding bill
@@ -396,7 +405,7 @@ MergeThirdparties=Merge third parties
 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 so you will be able to delete the duplicate one.
 ThirdpartiesMergeSuccess=Thirdparties have been merged
 SaleRepresentativeLogin=Login of sales representative
-SaleRepresentativeFirstname=Firstname of sales representative
-SaleRepresentativeLastname=Lastname of sales representative
+SaleRepresentativeFirstname=First name of sales representative
+SaleRepresentativeLastname=Last name of sales representative
 ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
 NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/uz_UZ/compta.lang b/htdocs/langs/uz_UZ/compta.lang
index 17f2bb4e98f..5e9814369ec 100644
--- a/htdocs/langs/uz_UZ/compta.lang
+++ b/htdocs/langs/uz_UZ/compta.lang
@@ -65,6 +65,7 @@ PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=VAT payment
 ListPayment=List of payments
 ListOfCustomerPayments=List of customer payments
+ListOfSupplierPayments=List of supplier payments
 DateStartPeriod=Date start period
 DateEndPeriod=Date end period
 newLT1Payment=New tax 2 payment
@@ -81,7 +82,7 @@ LT2PaymentES=IRPF Payment
 LT2PaymentsES=IRPF Payments
 VATPayment=Sales tax payment
 VATPayments=Sales tax payments
-VATRefund=Sales tax refund Refund
+VATRefund=Sales tax refund
 Refund=Refund
 SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Show VAT payment
@@ -194,7 +195,7 @@ CloneTax=Clone a social/fiscal tax
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
 CloneTaxForNextMonth=Clone it for next month
 SimpleReport=Simple report
-AddExtraReport=Extra reports
+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
diff --git a/htdocs/langs/uz_UZ/cron.lang b/htdocs/langs/uz_UZ/cron.lang
index cb68b31c80f..b1e8bcb36d2 100644
--- a/htdocs/langs/uz_UZ/cron.lang
+++ b/htdocs/langs/uz_UZ/cron.lang
@@ -17,14 +17,14 @@ CronMethodDoesNotExists=Class %s does not contains any method %s
 # Menu
 EnabledAndDisabled=Enabled and disabled
 # Page list
-CronLastOutput=Last run output
-CronLastResult=Last result code
+CronLastOutput=Latest run output
+CronLastResult=Latest result code
 CronCommand=Command
 CronList=Scheduled jobs
 CronDelete=Delete scheduled jobs
-CronConfirmDelete=Are you sure you want to delete these scheduled jobs ?
+CronConfirmDelete=Are you sure you want to delete these scheduled jobs?
 CronExecute=Launch scheduled job
-CronConfirmExecute=Are you sure you want to execute these scheduled jobs now ?
+CronConfirmExecute=Are you sure you want to execute these scheduled jobs now?
 CronInfo=Scheduled job module allow to execute job that have been planned
 CronTask=Job
 CronNone=None
diff --git a/htdocs/langs/uz_UZ/errors.lang b/htdocs/langs/uz_UZ/errors.lang
index f935ce72d41..9e2eb6817ef 100644
--- a/htdocs/langs/uz_UZ/errors.lang
+++ b/htdocs/langs/uz_UZ/errors.lang
@@ -11,6 +11,7 @@ ErrorLoginAlreadyExists=Login %s already exists.
 ErrorGroupAlreadyExists=Group %s already exists.
 ErrorRecordNotFound=Record not found.
 ErrorFailToCopyFile=Failed to copy file '<b>%s</b>' into '<b>%s</b>'.
+ErrorFailToCopyDir=Failed to copy directory '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToRenameFile=Failed to rename file '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToDeleteFile=Failed to remove file '<b>%s</b>'.
 ErrorFailToCreateFile=Failed to create file '<b>%s</b>'.
@@ -115,7 +116,7 @@ ErrorNoActivatedBarcode=No barcode type activated
 ErrUnzipFails=Failed to unzip %s with ZipArchive
 ErrNoZipEngine=No engine to unzip %s file in this PHP
 ErrorFileMustBeADolibarrPackage=The file %s must be a Dolibarr zip package
-ErrorFileRequired=It takes a package Dolibarr file
+ErrorModuleFileRequired=You must select a Dolibarr module package file
 ErrorPhpCurlNotInstalled=The PHP CURL is not installed, this is essential to talk with 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
@@ -170,14 +171,19 @@ ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
 ErrorFileMustHaveFormat=File must have format %s
 ErrorSupplierCountryIsNotDefined=Country for this supplier is not defined. Correct this first.
 ErrorsThirdpartyMerge=Failed to merge the two records. Request canceled.
-ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enougth for product %s to add it into a new order.
-ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enougth for product %s to add it into a new invoice.
-ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enougth for product %s to add it into a new shipment.
-ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enougth for product %s to add it into a new proposal.
-ErrorFailedToLoadLoginFileForMode=Failed to get the login file for mode '%s'.
+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 bank 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>
 
 # 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.
diff --git a/htdocs/langs/uz_UZ/holiday.lang b/htdocs/langs/uz_UZ/holiday.lang
index a95da81eaaa..50d97c0d8cc 100644
--- a/htdocs/langs/uz_UZ/holiday.lang
+++ b/htdocs/langs/uz_UZ/holiday.lang
@@ -76,8 +76,9 @@ BoxTitleLastLeaveRequests=Latest %s modified leave requests
 HolidaysMonthlyUpdate=Monthly update
 ManualUpdate=Manual update
 HolidaysCancelation=Leave request cancelation
-EmployeeLastname=Employee lastname
-EmployeeFirstname=Employee firstname
+EmployeeLastname=Employee last name
+EmployeeFirstname=Employee first name
+TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
 
 ## Configuration du Module ##
 LastUpdateCP=Latest automatic update of leaves allocation
diff --git a/htdocs/langs/uz_UZ/ldap.lang b/htdocs/langs/uz_UZ/ldap.lang
index a17019d00fb..42e699de311 100644
--- a/htdocs/langs/uz_UZ/ldap.lang
+++ b/htdocs/langs/uz_UZ/ldap.lang
@@ -13,8 +13,8 @@ LDAPUsers=Users in LDAP database
 LDAPFieldStatus=Status
 LDAPFieldFirstSubscriptionDate=First subscription date
 LDAPFieldFirstSubscriptionAmount=First subscription amount
-LDAPFieldLastSubscriptionDate=Last subscription date
-LDAPFieldLastSubscriptionAmount=Last subscription amount
+LDAPFieldLastSubscriptionDate=Latest subscription date
+LDAPFieldLastSubscriptionAmount=Latest subscription amount
 LDAPFieldSkype=Skype id
 LDAPFieldSkypeExample=Example : skypeName
 UserSynchronized=User synchronized
diff --git a/htdocs/langs/uz_UZ/mails.lang b/htdocs/langs/uz_UZ/mails.lang
index ab18dcdca25..c830b551a67 100644
--- a/htdocs/langs/uz_UZ/mails.lang
+++ b/htdocs/langs/uz_UZ/mails.lang
@@ -35,7 +35,7 @@ MailingStatusSentPartialy=Sent partialy
 MailingStatusSentCompletely=Sent completely
 MailingStatusError=Error
 MailingStatusNotSent=Not sent
-MailSuccessfulySent=Email successfully sent (from %s to %s)
+MailSuccessfulySent=Email successfully accepted for delivery (from %s to %s)
 MailingSuccessfullyValidated=EMailing successfully validated
 MailUnsubcribe=Unsubscribe
 MailingStatusNotContact=Don't contact anymore
@@ -74,22 +74,28 @@ ResultOfMailSending=Result of mass EMail sending
 NbSelected=Nb selected
 NbIgnored=Nb ignored
 NbSent=Nb 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
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Line %s in file
 RecipientSelectionModules=Defined requests for recipient's selection
 MailSelectedRecipients=Selected recipients
 MailingArea=EMailings area
-LastMailings=Last %s emailings
+LastMailings=Latest %s emailings
 TargetsStatistics=Targets statistics
 NbOfCompaniesContacts=Unique contacts/addresses
 MailNoChangePossible=Recipients for validated emailing can't be changed
 SearchAMailing=Search mailing
 SendMailing=Send emailing
 SendMail=Send email
-MailingNeedCommand=For security reason, sending an emailing is better when performed from command line. If you have one, ask your server administrator to launch the following command to send the emailing to all recipients:
+SentBy=Sent by
+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=You can however send them online by adding parameter MAILING_LIMIT_SENDBYWEB with value of max number of emails you want to send by session. For this, go on Home - Setup - Other.
-ConfirmSendingEmailing=If you can't or prefer sending them with your www browser, please confirm you are sure you want to send emailing now from your browser?
+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.
 TargetsReset=Clear list
 ToClearAllRecipientsClickHere=Click here to clear the recipient list for this emailing
@@ -144,3 +150,6 @@ AdvTgtCreateFilter=Create filter
 AdvTgtOrCreateNewFilter=Name of new filter
 NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
+OutGoingEmailSetup=Outgoing email setup
+InGoingEmailSetup=Incoming email setup
+
diff --git a/htdocs/langs/uz_UZ/main.lang b/htdocs/langs/uz_UZ/main.lang
index e7caad9e007..350270b06c9 100644
--- a/htdocs/langs/uz_UZ/main.lang
+++ b/htdocs/langs/uz_UZ/main.lang
@@ -63,11 +63,13 @@ ErrorNoVATRateDefinedForSellerCountry=Error, no vat rates defined for country '%
 ErrorNoSocialContributionForSellerCountry=Error, no social/fiscal taxes type defined for country '%s'.
 ErrorFailedToSaveFile=Error, failed to save file.
 ErrorCannotAddThisParentWarehouse=You are trying to add a parent warehouse which is already a child of current one
+MaxNbOfRecordPerPage=Max nb of record per page
 NotAuthorized=You are not authorized to do that.
 SetDate=Set date
 SelectDate=Select a date
 SeeAlso=See also %s
 SeeHere=See here
+Apply=Apply
 BackgroundColorByDefault=Default background color
 FileRenamed=The file was successfully renamed
 FileUploaded=The file was successfully uploaded
@@ -86,7 +88,7 @@ Undefined=Undefined
 PasswordForgotten=Password forgotten?
 SeeAbove=See above
 HomeArea=Home area
-LastConnexion=Last connection
+LastConnexion=Latest connection
 PreviousConnexion=Previous connection
 PreviousValue=Previous value
 ConnectedOnMultiCompany=Connected on environment
@@ -236,7 +238,7 @@ DateCreation=Creation date
 DateCreationShort=Creat. date
 DateModification=Modification date
 DateModificationShort=Modif. date
-DateLastModification=Last modification date
+DateLastModification=Latest modification date
 DateValidation=Validation date
 DateClosing=Closing date
 DateDue=Due date
@@ -432,7 +434,7 @@ Reportings=Reporting
 Draft=Draft
 Drafts=Drafts
 Validated=Validated
-Opened=Open
+Opened=Opened
 New=New
 Discount=Discount
 Unknown=Unknown
@@ -460,6 +462,7 @@ DeletePicture=Picture delete
 ConfirmDeletePicture=Confirm picture deletion?
 Login=Login
 CurrentLogin=Current login
+EnterLoginDetail=Enter login details
 January=January
 February=February
 March=March
@@ -597,6 +600,8 @@ SessionName=Session name
 Method=Method
 Receive=Receive
 CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
+ExpectedValue=Expected Value
+CurrentValue=Current value
 PartialWoman=Partial
 TotalWoman=Total
 NeverReceived=Never received
@@ -753,6 +758,8 @@ RemoveString=Remove string '%s'
 SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
 DirectDownloadLink=Direct download link
 Download=Download
+ActualizeCurrency=Update currency rate
+Fiscalyear=Fiscal year
 # Week day
 Monday=Monday
 Tuesday=Tuesday
@@ -787,8 +794,8 @@ SetRef=Set ref
 Select2ResultFoundUseArrows=Some results found. Use arrows to select.
 Select2NotFound=No result found
 Select2Enter=Enter
-Select2MoreCharacter=or more character
-Select2MoreCharacters=or more characters
+Select2MoreCharacter=or more characters<br /><br /><strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
+Select2MoreCharacters=or more characters<br /><br /><strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
 Select2LoadingMoreResults=Loading more results...
 Select2SearchInProgress=Search in progress...
 SearchIntoThirdparties=Thirdparties
@@ -809,3 +816,5 @@ SearchIntoContracts=Contracts
 SearchIntoCustomerShipments=Customer shipments
 SearchIntoExpenseReports=Expense reports
 SearchIntoLeaves=Leaves
+
+BulkActions=Bulk actions
diff --git a/htdocs/langs/uz_UZ/members.lang b/htdocs/langs/uz_UZ/members.lang
index df911af6f71..8f6f76ba48f 100644
--- a/htdocs/langs/uz_UZ/members.lang
+++ b/htdocs/langs/uz_UZ/members.lang
@@ -45,7 +45,7 @@ MemberStatusDraft=Draft (needs to be validated)
 MemberStatusDraftShort=Draft
 MemberStatusActive=Validated (waiting subscription)
 MemberStatusActiveShort=Validated
-MemberStatusActiveLate=subscription expired
+MemberStatusActiveLate=Subscription expired
 MemberStatusActiveLateShort=Expired
 MemberStatusPaid=Subscription up to date
 MemberStatusPaidShort=Up to date
@@ -136,8 +136,8 @@ DocForAllMembersCards=Generate business cards for all members
 DocForOneMemberCards=Generate business cards for a particular member
 DocForLabels=Generate address sheets
 SubscriptionPayment=Subscription payment
-LastSubscriptionDate=Last subscription date
-LastSubscriptionAmount=Last subscription amount
+LastSubscriptionDate=Latest subscription date
+LastSubscriptionAmount=Latest subscription amount
 MembersStatisticsByCountries=Members statistics by country
 MembersStatisticsByState=Members statistics by state/province
 MembersStatisticsByTown=Members statistics by town
@@ -149,7 +149,7 @@ MembersByStateDesc=This screen show you statistics on members by state/provinces
 MembersByTownDesc=This screen show you statistics on members by town.
 MembersStatisticsDesc=Choose statistics you want to read...
 MenuMembersStats=Statistics
-LastMemberDate=Last member date
+LastMemberDate=Latest member date
 Nature=Nature
 Public=Information are public
 NewMemberbyWeb=New member added. Awaiting approval
diff --git a/htdocs/langs/uz_UZ/orders.lang b/htdocs/langs/uz_UZ/orders.lang
index 9d2e53e4fe2..331e3b49d3e 100644
--- a/htdocs/langs/uz_UZ/orders.lang
+++ b/htdocs/langs/uz_UZ/orders.lang
@@ -39,7 +39,7 @@ StatusOrderRefusedShort=Refused
 StatusOrderBilledShort=Billed
 StatusOrderToProcessShort=To process
 StatusOrderReceivedPartiallyShort=Partially received
-StatusOrderReceivedAllShort=Everything received
+StatusOrderReceivedAllShort=Products received
 StatusOrderCanceled=Canceled
 StatusOrderDraft=Draft (needs to be validated)
 StatusOrderValidated=Validated
@@ -51,7 +51,7 @@ StatusOrderApproved=Approved
 StatusOrderRefused=Refused
 StatusOrderBilled=Billed
 StatusOrderReceivedPartially=Partially received
-StatusOrderReceivedAll=Everything received
+StatusOrderReceivedAll=All products received
 ShippingExist=A shipment exists
 QtyOrdered=Qty ordered
 ProductQtyInDraft=Product quantity into draft orders
diff --git a/htdocs/langs/uz_UZ/other.lang b/htdocs/langs/uz_UZ/other.lang
index 1ea1f9da1db..ab937ff3bab 100644
--- a/htdocs/langs/uz_UZ/other.lang
+++ b/htdocs/langs/uz_UZ/other.lang
@@ -2,6 +2,7 @@
 SecurityCode=Security code
 NumberingShort=N°
 Tools=Tools
+TMenuTools=Tools
 ToolsDesc=All miscellaneous tools not included in other menu entries are collected here.<br /><br />All the tools can be reached in the left menu.
 Birthday=Birthday
 BirthdayDate=Birthday date
@@ -67,14 +68,15 @@ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find her
 PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nYou will find here the shipping __SHIPPINGREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nYou will find here the intervention __FICHINTERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n__PERSONALIZED__\n\n__SIGNATURE__
-DemoDesc=Dolibarr is a compact ERP/CRM supporting several functional modules. A demo showcasing all modules makes no sense as this scenario never occurs. So, several demo profiles are available.
+DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
+ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
 DemoFundation=Manage members of a foundation
 DemoFundation2=Manage members and bank account of a foundation
-DemoCompanyServiceOnly=Manage a freelance activity selling service only
+DemoCompanyServiceOnly=Company or freelance selling service only
 DemoCompanyShopWithCashDesk=Manage a shop with a cash desk
-DemoCompanyProductAndStocks=Manage a small or medium company selling products
-DemoCompanyAll=Manage a small or medium company with multiple activities (all main modules)
+DemoCompanyProductAndStocks=Company selling products with a shop
+DemoCompanyAll=Company with multiple activities (all main modules)
 CreatedBy=Created by %s
 ModifiedBy=Modified by %s
 ValidatedBy=Validated by %s
diff --git a/htdocs/langs/uz_UZ/products.lang b/htdocs/langs/uz_UZ/products.lang
index 20440eb611b..3a412a5789c 100644
--- a/htdocs/langs/uz_UZ/products.lang
+++ b/htdocs/langs/uz_UZ/products.lang
@@ -5,6 +5,8 @@ ProductLabelTranslated=Translated product label
 ProductDescriptionTranslated=Translated product description
 ProductNoteTranslated=Translated product note
 ProductServiceCard=Products/Services card
+TMenuProducts=Products
+TMenuServices=Services
 Products=Products
 Services=Services
 Product=Product
@@ -58,7 +60,7 @@ SellingPrice=Selling price
 SellingPriceHT=Selling price (net of tax)
 SellingPriceTTC=Selling price (inc. tax)
 CostPriceDescription=This price (net of tax) can be used to store the average amount this product cost to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
-CostPriceUsage=In a future version, this value could be used for margin calculation.
+CostPriceUsage=This value could be used for margin calculation.
 SoldAmount=Sold amount
 PurchasedAmount=Purchased amount
 NewPrice=New price
@@ -140,6 +142,7 @@ ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b>?
 CloneContentProduct=Clone all main informations of product/service
 ClonePricesProduct=Clone main informations and prices
 CloneCompositionProduct=Clone packaged product/service
+CloneCombinationsProduct=Clone product variants
 ProductIsUsed=This product is used
 NewRefForClone=Ref. of new product/service
 SellingPrices=Selling prices
@@ -236,7 +239,7 @@ GlobalVariables=Global variables
 VariableToUpdate=Variable to update
 GlobalVariableUpdaters=Global variable updaters
 UpdateInterval=Update interval (minutes)
-LastUpdated=Last updated
+LastUpdated=Latest update
 CorrectlyUpdated=Correctly updated
 PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
 PropalMergePdfProductChooseFile=Select PDF files
@@ -256,4 +259,41 @@ VolumeUnits=Volume unit
 SizeUnits=Size unit
 DeleteProductBuyPrice=Delete buying price
 ConfirmDeleteProductBuyPrice=Are you sure you want to delete this buying price?
+SubProduct=Sub product
 
+#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
+ProductCombinations=Variants
+HideProductCombinations=Hide products variant in the products selector
+ProductCombination=Variant
+NewProductCombination=New variant
+EditProductCombination=Editing variant
+ProductCombinationGenerator=Variants generator
+Features=Features
+PriceImpact=Price impact
+WeightImpact=Weight impact
+NewProductAttribute=New attribute
+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
+PercentageVariation=Percentage variation
+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 child products
+ConfirmCloneProductCombinations=Would you like to copy all the product variant to the 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
diff --git a/htdocs/langs/uz_UZ/projects.lang b/htdocs/langs/uz_UZ/projects.lang
index ecf61d17d36..f9c603ce113 100644
--- a/htdocs/langs/uz_UZ/projects.lang
+++ b/htdocs/langs/uz_UZ/projects.lang
@@ -29,9 +29,9 @@ DeleteAProject=Delete a project
 DeleteATask=Delete a task
 ConfirmDeleteAProject=Are you sure you want to delete this project?
 ConfirmDeleteATask=Are you sure you want to delete this task?
-OpenedProjects=Open projects
-OpenedTasks=Open tasks
-OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
+OpenedProjects=Opened projects
+OpenedTasks=Opened tasks
+OpportunitiesStatusForOpenedProjects=Opportunities amount of opened projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=Show project
 SetProject=Set project
@@ -47,7 +47,7 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
 TaskTimeDate=Date
-TasksOnOpenedProject=Tasks on open projects
+TasksOnOpenedProject=Tasks on opened projects
 WorkloadNotDefined=Workload not defined
 NewTimeSpent=New time spent
 MyTimeSpent=My time spent
@@ -58,6 +58,7 @@ TaskDateEnd=Task end date
 TaskDescription=Task description
 NewTask=New task
 AddTask=Create task
+AddTimeSpent=Create time spent
 Activity=Activity
 Activities=Tasks/activities
 MyActivities=My tasks/activities
@@ -95,6 +96,7 @@ ValidateProject=Validate projet
 ConfirmValidateProject=Are you sure you want to validate this project?
 CloseAProject=Close project
 ConfirmCloseAProject=Are you sure you want to close this project?
+AlsoCloseAProject=Also close project (keep it open if you still need to follow production tasks on it)
 ReOpenAProject=Open project
 ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=Project contacts
@@ -120,7 +122,7 @@ CloneProjectFiles=Clone project joined files
 CloneTaskFiles=Clone task(s) joined files (if task(s) cloned)
 CloneMoveDate=Update project/tasks dates from now?
 ConfirmCloneProject=Are you sure to clone this project?
-ProjectReportDate=Change task date according project start date
+ProjectReportDate=Change task dates according to new project start date
 ErrorShiftTaskDate=Impossible to shift task date according to new project start date
 ProjectsAndTasksLines=Projects and tasks
 ProjectCreatedInDolibarr=Project %s created
@@ -177,9 +179,9 @@ ProjectsStatistics=Statistics on projects/leads
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 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.
-OpenedProjectsByThirdparties=Open projects by thirdparties
+OpenedProjectsByThirdparties=Opened projects by thirdparties
 OnlyOpportunitiesShort=Only opportunities
-OpenedOpportunitiesShort=Open opportunities
+OpenedOpportunitiesShort=Opened opportunities
 NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount
diff --git a/htdocs/langs/uz_UZ/propal.lang b/htdocs/langs/uz_UZ/propal.lang
index 52260fe2b4e..a14d25ce779 100644
--- a/htdocs/langs/uz_UZ/propal.lang
+++ b/htdocs/langs/uz_UZ/propal.lang
@@ -3,7 +3,7 @@ Proposals=Commercial proposals
 Proposal=Commercial proposal
 ProposalShort=Proposal
 ProposalsDraft=Draft commercial proposals
-ProposalsOpened=Open commercial proposals
+ProposalsOpened=Opened commercial proposals
 Prop=Commercial proposals
 CommercialProposal=Commercial proposal
 ProposalCard=Proposal card
@@ -26,9 +26,9 @@ AmountOfProposalsByMonthHT=Amount by month (net of tax)
 NbOfProposals=Number of commercial proposals
 ShowPropal=Show proposal
 PropalsDraft=Drafts
-PropalsOpened=Open
+PropalsOpened=Opened
 PropalStatusDraft=Draft (needs to be validated)
-PropalStatusValidated=Validated (proposal is open)
+PropalStatusValidated=Validated (proposal is opened)
 PropalStatusSigned=Signed (needs billing)
 PropalStatusNotSigned=Not signed (closed)
 PropalStatusBilled=Billed
diff --git a/htdocs/langs/uz_UZ/stocks.lang b/htdocs/langs/uz_UZ/stocks.lang
index 834fa104098..1db49b8d8dd 100644
--- a/htdocs/langs/uz_UZ/stocks.lang
+++ b/htdocs/langs/uz_UZ/stocks.lang
@@ -22,13 +22,15 @@ Movements=Movements
 ErrorWarehouseRefRequired=Warehouse reference name is required
 ListOfWarehouses=List of warehouses
 ListOfStockMovements=List of stock movements
+StockMovementForId=Movement ID %d
+ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Warehouses area
 Location=Location
 LocationSummary=Short name location
 NumberOfDifferentProducts=Number of different products
 NumberOfProducts=Total number of products
-LastMovement=Last movement
-LastMovements=Last movements
+LastMovement=Latest movement
+LastMovements=Latest movements
 Units=Units
 Unit=Unit
 StockCorrection=Correct stock
@@ -140,3 +142,4 @@ ProductStockWarehouseCreated=Stock limit for alert and desired optimal stock cor
 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
diff --git a/htdocs/langs/uz_UZ/suppliers.lang b/htdocs/langs/uz_UZ/suppliers.lang
index 766e4a9bfe9..b890919ace5 100644
--- a/htdocs/langs/uz_UZ/suppliers.lang
+++ b/htdocs/langs/uz_UZ/suppliers.lang
@@ -24,10 +24,10 @@ ExportDataset_fournisseur_1=Supplier invoices list and invoice lines
 ExportDataset_fournisseur_2=Supplier invoices and payments
 ExportDataset_fournisseur_3=Supplier orders and order lines
 ApproveThisOrder=Approve this order
-ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b> ?
+ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b>?
 DenyingThisOrder=Deny this order
-ConfirmDenyingThisOrder=Are you sure you want to deny this order <b>%s</b> ?
-ConfirmCancelThisOrder=Are you sure you want to cancel this order <b>%s</b> ?
+ConfirmDenyingThisOrder=Are you sure you want to deny this order <b>%s</b>?
+ConfirmCancelThisOrder=Are you sure you want to cancel this order <b>%s</b>?
 AddSupplierOrder=Create supplier order
 AddSupplierInvoice=Create supplier invoice
 ListOfSupplierProductForSupplier=List of products and prices for supplier <b>%s</b>
@@ -41,3 +41,4 @@ DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Wrong quality
 ReputationForThisProduct=Reputation
 BuyerName=Buyer name
+AllProductServicePrices=All product / service prices
diff --git a/htdocs/langs/uz_UZ/users.lang b/htdocs/langs/uz_UZ/users.lang
index b836db8eb42..a0a1eae8697 100644
--- a/htdocs/langs/uz_UZ/users.lang
+++ b/htdocs/langs/uz_UZ/users.lang
@@ -36,7 +36,7 @@ AdministratorDesc=Administrator
 DefaultRights=Default permissions
 DefaultRightsDesc=Define here <u>default</u> permissions that are automatically granted to a <u>new created</u> user (Go on user card to change permission of an existing user).
 DolibarrUsers=Dolibarr users
-LastName=Last Name
+LastName=Last name
 FirstName=First name
 ListOfGroups=List of groups
 NewGroup=New group
diff --git a/htdocs/langs/uz_UZ/withdrawals.lang b/htdocs/langs/uz_UZ/withdrawals.lang
index 6e560a1abb1..a99d890e5f9 100644
--- a/htdocs/langs/uz_UZ/withdrawals.lang
+++ b/htdocs/langs/uz_UZ/withdrawals.lang
@@ -24,6 +24,7 @@ WithdrawStatistics=Direct debit payment statistics
 WithdrawRejectStatistics=Direct debit payment reject statistics
 LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
+WithdrawRequestsDone=%s direct debit payment requests recorded
 ThirdPartyBankCode=Third party bank code
 NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoice are on companies with a valid BAN.
 ClassCredited=Classify credited
@@ -76,8 +77,8 @@ RUM=UMR
 RUMLong=Unique Mandate Reference
 RUMWillBeGenerated=UMR number will be generated once bank account information are saved
 WithdrawMode=Direct debit mode (FRST or RECUR)
-WithdrawRequestAmount=Withdraw request amount:
-WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil amount.
+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
diff --git a/htdocs/langs/vi_VN/accountancy.lang b/htdocs/langs/vi_VN/accountancy.lang
index dcc0f84164a..998a2808d5f 100644
--- a/htdocs/langs/vi_VN/accountancy.lang
+++ b/htdocs/langs/vi_VN/accountancy.lang
@@ -3,7 +3,7 @@ ACCOUNTING_EXPORT_SEPARATORCSV=Dấu ngăn cách cột trong file xuất ra
 ACCOUNTING_EXPORT_DATE=Định dạng ngày trong file xuất ra
 ACCOUNTING_EXPORT_PIECE=Export the number of piece
 ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Export with global account
-ACCOUNTING_EXPORT_LABEL=Export label
+ACCOUNTING_EXPORT_LABEL=Xuất nhãn
 ACCOUNTING_EXPORT_AMOUNT=Export amount
 ACCOUNTING_EXPORT_DEVISE=Export currency
 Selectformat=Select the format for the file
@@ -194,6 +194,8 @@ ChangeBinding=Change the binding
 
 ## Admin
 ApplyMassCategories=Apply mass categories
+AddAccountFromBookKeepingWithNoCategories=Add acccount already used with no categories
+CategoryDeleted=Category for the accounting account has been removed
 
 ## Export
 Exports=Xuất khẩu
@@ -209,6 +211,7 @@ Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution
 Modelcsv_quadratus=Export towards Quadratus QuadraCompta
 Modelcsv_ebp=Export towards EBP
 Modelcsv_cogilog=Export towards Cogilog
+ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
 InitAccountancy=Init accountancy
diff --git a/htdocs/langs/vi_VN/admin.lang b/htdocs/langs/vi_VN/admin.lang
index ebb0fceba25..1955d99e98f 100644
--- a/htdocs/langs/vi_VN/admin.lang
+++ b/htdocs/langs/vi_VN/admin.lang
@@ -9,14 +9,20 @@ VersionDevelopment=Phát triển
 VersionUnknown=Không rõ
 VersionRecommanded=Khuyên dùng
 FileCheck=Files integrity checker
-FileCheckDesc=This tool allows you to check the integrity of files of your application, comparing each files with the official ones. You can use this tool to detect if some files were modified by a hacker for example.
+FileCheckDesc=This tool allows you to check the integrity of files and setup of your application, comparing each files with the official ones. 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.
+FileIntegrityIsStrictlyConformedWithReference=Files integrity is strictly conformed with the reference.
+FileIntegrityIsOkButFilesWereAdded=Files integrity check has passed, however some new files were added.
+FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified, removed or added.
+GlobalChecksum=Global checksum
 MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
 LocalSignature=Embedded local signature (less reliable)
 RemoteSignature=Remote distant signature (more reliable)
 FilesMissing=File thất lạc
 FilesUpdated=File đã cập nhật
+FilesModified=Modified Files
+FilesAdded=Added Files
 FileCheckDolibarr=Check integrity of application files
-AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from a certified package
+AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from an official package
 XmlNotFound=Xml Integrity File of application not found
 SessionId=ID phiên làm việc
 SessionSaveHandler=Quản lý lưu phiên làm việc
@@ -185,7 +191,9 @@ BoxesDesc=Widgets are components showing some information that you can add to pe
 OnlyActiveElementsAreShown=Chỉ có các yếu tố từ <a href="%s">module kích hoạt</a> được hiển thị.
 ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
-ModulesMarketPlaces=Nhiều mô-đun ...
+ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
+ModulesMarketPlaces=Find external modules...
+GoModuleSetupArea=To deploy/install a new module, go onto the Module setup area at <a href="%s">%s</a>.
 DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules
 DoliPartnersDesc=List of companies providing custom developed modules or features (Note: anyone experienced in PHP programming can provide custom development for an open source project)
 WebSiteDesc=Reference websites to find more modules...
@@ -231,7 +239,7 @@ SpaceX=Space X
 SpaceY=Space Y
 FontSize=Font size
 Content=Content
-NoticePeriod=Notice period
+NoticePeriod=Kỳ thông báo
 NewByMonth=New by month
 Emails=E-mail
 EMailsSetup=Cài đặt E-mail
@@ -276,21 +284,22 @@ ModuleFamilyInterface=Interfaces with external systems
 MenuHandlers=Điều khiển menu
 MenuAdmin=Biên tập menu
 DoNotUseInProduction=Không sử dụng trong sản xuất
-ThisIsProcessToFollow=Đây là cài đặt cho quy trình:
-ThisIsAlternativeProcessToFollow=Đây là cài đặt thay thế cho quy trình:
+ThisIsProcessToFollow=This is steps to process:
+ThisIsAlternativeProcessToFollow=This is an alternative setup to process manually:
 StepNb=Bước %s
 FindPackageFromWebSite=Tìm một gói phần mềm cung cấp các tính năng mà bạn muốn (ví dụ như trên trang web chính thức %s).
 DownloadPackageFromWebSite=Download package (for example from official web site %s).
-UnpackPackageInDolibarrRoot=Unpack package file into Dolibarr server directory dedicated to external modules: <b>%s</b>
-SetupIsReadyForUse=Cài đặt xong và Dolibarr đã sẵn sàng để sử dụng với thành phần mới này.
-NotExistsDirect=Các thư mục gốc thay thế không được định nghĩa. <br>
-InfDirAlt=Since version 3 it is possible to define an alternative root directory.This allows you to store, same place, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
-InfDirExample=<br>Then declare it in the file conf.php<br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>*These lines are commented with "#", to uncomment only remove the character.
+UnpackPackageInDolibarrRoot=Unpack the packaged files into server directory dedicated to Dolibarr: <b>%s</b>
+UnpackPackageInModulesRoot=To deploy/install an external module, unpack the packaged files into the server directory dedicated to modules: <b>%s</b>
+SetupIsReadyForUse=Module deployment is finished. You must however enable and setup the module in your application by going on the page to setup modules: <a href="%s">%s</a>.
+NotExistsDirect=The alternative root directory is not defined to an existing directory.<br>
+InfDirAlt=Since version 3, it is possible to define an alternative root directory. This allows you to store, into a dedicated directory, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
+InfDirExample=<br>Then declare it in the file <strong>conf.php</strong><br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>If these lines are commented with "#", to enable them, just uncomment by removing the "#" character.
 YouCanSubmitFile=For this step, you can send package using this tool: Select module file
 CurrentVersion=Phiên bản hiện tại Dolibarr
 CallUpdatePage=Go to the page that updates the database structure and data: %s.
 LastStableVersion=Latest stable version
-LastActivationDate=Last activation date
+LastActivationDate=Latest activation date
 UpdateServerOffline=Cập nhật server offline
 GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s. <br><b>{000000@x}</b> same as previous but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
 GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
@@ -373,11 +382,11 @@ ExtrafieldCheckBox=Checkbox
 ExtrafieldRadio=Radio button
 ExtrafieldCheckBoxFromList= Checkbox từ bảng
 ExtrafieldLink=Liên kết với một đối tượng
-ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>In order to have the list depending on another :<br>1,value1|parent_list_code:parent_key<br>2,value2|parent_list_code:parent_key
+ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list :<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list :<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
-ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
+ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Example : Societe:societe/class/societe.class.php
 LibraryToBuildPDF=Library used for PDF generation
 WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
@@ -411,10 +420,11 @@ ModuleCompanyCodePanicum=Trả lại một mã kế toán rỗng.
 ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party code.
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
-
+WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<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).
+ClickToShowDescription=Click to show description
 # Modules
 Module0Name=Người dùng & nhóm
-Module0Desc=Quản lý người dùng và nhóm
+Module0Desc=Users / Employees and Groups management
 Module1Name=Bên thứ ba
 Module1Desc=Quản lý liên lạc và công ty (khách hàng, khách hàng tiềm năng ...)
 Module2Name=Thương mại
@@ -515,8 +525,8 @@ Module2200Name=Giá linh hoạt
 Module2200Desc=Cho phép sử dụng các biểu thức toán học cho giá
 Module2300Name=Cron
 Module2300Desc=Quản lý công việc theo lịch trình
-Module2400Name=Agenda/Events
-Module2400Desc=Follow events or rendez-vous. Record manual events into Agendas or let application logs automatic events for tracking purposes.
+Module2400Name=Events/Agenda
+Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous.
 Module2500Name=Quản lý nội dung điện tử
 Module2500Desc=Lưu và chia sẻ tài liệu
 Module2600Name=API/Web services (SOAP server)
@@ -582,7 +592,7 @@ Permission34=Xóa sản phẩm
 Permission36=Xem/quản lý sản phẩm ẩn
 Permission38=Xuất dữ liệu sản phẩm
 Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
-Permission42=Tạo/chỉnh sửa dự án (dự án chung và các dự án tôi liên lạc)
+Permission42=Create/modify projects (shared project and projects i'm contact for). Can also create tasks and assign users to project and tasks
 Permission44=Xóa dự án (dự án chia sẻ và các dự án tôi liên lạc)
 Permission45=Export projects
 Permission61=Xem intervention
@@ -685,7 +695,7 @@ PermissionAdvanced253=Tạo/chỉnh sửa người sử dụng nội bộ / bên
 Permission254=Tạo/chỉnh sửa chỉ người dùng bên ngoài
 Permission255=Chỉnh sửa mật khẩu của người dùng khác
 Permission256=Xóa hoặc vô hiệu người dùng khác
-Permission262=Mở rộng quyền truy cập vào tất cả các bên thứ ba (không chỉ có những người liên quan đến người dùng). Không có hiệu quả cho người dùng bên ngoài (luôn có giới hạn cho nhóm này).
+Permission262=Extend access to all third parties (not only third parties that user is a sale representative).<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 assignement matters).
 Permission271=Xem CA
 Permission272=Xem hóa đơn
 Permission273=Xuất hóa đơn
@@ -887,7 +897,7 @@ Offset=Offset
 AlwaysActive=Luôn hoạt động
 Upgrade=Nâng cấp
 MenuUpgrade=Nâng cấp / Mở rộng
-AddExtensionThemeModuleOrOther=Thêm phần mở rộng (chủ đề, mô-đun, ...)
+AddExtensionThemeModuleOrOther=Deploy/install external module
 WebServer=Máy chủ Web
 DocumentRootServer=Thư mục gốc của máy chủ Web
 DataRootServer=Thư mục file dữ liệu
@@ -994,7 +1004,7 @@ TriggerAlwaysActive=Triggers in this file are always active, whatever are the ac
 TriggerActiveAsModuleActive=Triggers in this file are active as module <b>%s</b> is enabled.
 GeneratedPasswordDesc=Xác định đây là quy tắc mà bạn muốn sử dụng để tạo mật khẩu mới nếu bạn yêu cầu tạo ra mật khẩu tự động
 DictionaryDesc=Insert all reference data. You can add your values to the default.
-ConstDesc=This page allows you to edit all other parameters not available in previous pages. These are mostly reserved parameters for developers or advanced troubleshooting.
+ConstDesc=This page allows you to edit all other parameters not available in previous pages. These are mostly reserved parameters for developers or advanced troubleshooting. For a list of options <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">check here</a>.
 MiscellaneousDesc=All other security related parameters are defined here.
 LimitsSetup=Cài đặt Giới hạn và độ chính xác
 LimitsDesc=Bạn có thể xác định giới hạn, độ chính xác và tối ưu hoá được sử dụng bởi Dolibarr ở đây
@@ -1161,10 +1171,6 @@ FreeLegalTextOnOrders=Free text on orders
 WatermarkOnDraftOrders=Watermark on draft orders (none if empty)
 ShippableOrderIconInList=Thêm một biểu tượng trong danh sách đơn hàng cho biết nếu đơn hàng có thể vận chuyển
 BANK_ASK_PAYMENT_BANK_DURING_ORDER=Yêu cầu số tài khoản ngân hàng của đơn hàng
-##### Clicktodial #####
-ClickToDialSetup=Click To Dial module setup
-ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with your clicktodial login (defined on your user card)<br><b>__PASS__</b> that will be replaced with your clicktodial password (defined on your user card).
-##### Bookmark4u #####
 ##### Interventions #####
 InterventionsSetup=Interventions module setup
 FreeLegalTextOnInterventions=Free text on intervention documents
@@ -1391,7 +1397,7 @@ SendingsSetup=Cài đặt module Gửi
 SendingsReceiptModel=Mô hình biên nhận Gửi
 SendingsNumberingModules=Module đánh số Gửi
 SendingsAbility=Support shipping sheets for customer deliveries
-NoNeedForDeliveryReceipts=Trong hầu hết các trường hợp, biên nhận gửi đi được sử dụng như phiếu giao hàng khách hàng (danh sách các sản phẩm để gửi) và phiếu này được nhận và ký tên bởi khách hàng. Vì vậy, phiếu vận chuyển sản phẩm là đặc tính trùng lắp và hiếm khi được kích hoạt.
+NoNeedForDeliveryReceipts=In most cases, shipping sheets are used both as sheets for customer deliveries (list of products to send) and sheets that is received and signed by customer. So product deliveries receipts is a duplicated feature and is rarely activated.
 FreeLegalTextOnShippings=Free text trên phiếu vận chuyển
 ##### Deliveries #####
 DeliveryOrderNumberingModules=Module đánh số phiếu giao nhận sản phẩm
@@ -1471,7 +1477,11 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Set automatically this default value for type of e
 AGENDA_DEFAULT_FILTER_TYPE=Thiết lập tự động loại sự kiện này vào khung bộ lọc tìm kiếm chương trình nghị sự
 AGENDA_DEFAULT_FILTER_STATUS=Thiết lập tự động trạng thái này cho các sự kiện vào khung bộ lọc tìm kiếm chương trình nghị sự
 AGENDA_DEFAULT_VIEW=Tab mà bạn muốn mở mặc định khi lựa chọn menu chương trình nghị sự
-##### ClickToDial #####
+AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
+AGENDA_NOTIFICATION_SOUND=Enable sound notification
+##### Clicktodial #####
+ClickToDialSetup=Click To Dial module setup
+ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with your clicktodial login (defined on your user card)<br><b>__PASS__</b> that will be replaced with your clicktodial password (defined on your user card).
 ClickToDialDesc=This module allows to make phone numbers clickable. A click on this icon will call make your phone to 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.
 ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
 ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on same computer than the browser, and called when you click on a link in your browser that start 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.
@@ -1499,10 +1509,11 @@ EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint availa
 ##### API ####
 ApiSetup=API module setup
 ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
-ApiProductionMode=Enable production mode (this will activate use of a caches for services management)
+ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
 ApiExporerIs=You can explore the APIs at url
 OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
 ApiKey=Key for API
+WarningAPIExplorerDisabled=The API explorer has been disabled. API explorer is not required to provide API services. It is a tool for developer to find/test REST APIs. If you need this tool, go into setup of module API REST to activate it.
 ##### Bank #####
 BankSetupModule=Cài đặt module Ngân hàng
 FreeLegalTextOnChequeReceipts=Free text trên biên nhận Séc
@@ -1571,7 +1582,7 @@ BackupDumpWizard=Thủ thuật tạo file dump sao lưu dự phòng cơ sở d
 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:
 SomethingMakeInstallFromWebNotPossible2=Vì lý do này, quá trình nâng cấp để mô tả ở đây là chỉ là bước thủ công một người dùng có đặc quyền có thể làm.
 InstallModuleFromWebHasBeenDisabledByFile=Cài đặt các module bên ngoài từ các ứng dụng đã bị vô hiệu bởi quản trị viên của bạn. Bạn phải yêu cầu ông phải loại bỏ các tập tin <strong>%s</strong> để cho phép tính năng này.
-ConfFileMuseContainCustom=Installing an external module from application save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to have option<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
+ConfFileMuseContainCustom=Installing an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
 HighlightLinesColor=Highlight color of the line when the mouse passes over (keep empty for no highlight)
 TextTitleColor=Color of page title
@@ -1601,6 +1612,7 @@ FixTZ=TimeZone fix
 FillFixTZOnlyIfRequired=Example: +2 (fill only if problem experienced)
 ExpectedChecksum=Expected Checksum
 CurrentChecksum=Current Checksum
+ForcedConstants=Required constant values
 MailToSendProposal=To send customer proposal
 MailToSendOrder=To send customer order
 MailToSendInvoice=To send customer invoice
@@ -1609,13 +1621,14 @@ MailToSendIntervention=To send intervention
 MailToSendSupplierRequestForQuotation=To send quotation request to supplier
 MailToSendSupplierOrder=To send supplier order
 MailToSendSupplierInvoice=To send supplier invoice
+MailToSendContract=To send a contract
 MailToThirdparty=To send email from third party page
 ByDefaultInList=Show by default on list view
-YouUseLastStableVersion=You use the last stable version
+YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
 TitleExampleForMaintenanceRelease=Example of message you can use to announce this maintenance release (feel free to use it on your web sites)
-ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. You can download it from the download area of http://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.
-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, nor data structure change is present into this version. You can download it from the download area of http://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.
+ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. 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.
+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, nor data structure change is present into 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, you can enter here rule to have price for each level autocalculated according to price of first level, so you will have to enter only price for first level on each product. This page is here to save you time and can be usefull only if your prices for each leve are relative to first level. You can ignore this page in most cases.
 ModelModulesProduct=Templates for product documents
 ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
diff --git a/htdocs/langs/vi_VN/banks.lang b/htdocs/langs/vi_VN/banks.lang
index 2dc4d5e0e52..176e9893b0e 100644
--- a/htdocs/langs/vi_VN/banks.lang
+++ b/htdocs/langs/vi_VN/banks.lang
@@ -28,10 +28,10 @@ Reconciliation=Hòa giải
 RIB=Số tài khoản ngân hàng
 IBAN=Số IBAN
 BIC=Số BIC / SWIFT
-SwiftValid=BIC/SWIFT valid
-SwiftVNotalid=BIC/SWIFT not valid
-IbanValid=BAN valid
-IbanNotValid=BAN not valid
+SwiftValid=BIC/SWIFT hợp lệ
+SwiftVNotalid=BIC/SWIFT không hợp lệ
+IbanValid=BAN hợp lệ
+IbanNotValid=BAN không hợp lệ
 StandingOrders=Lệnh ghi nợ trực tiếp
 StandingOrder=Lệnh ghi nợ trực tiếp
 AccountStatement=Sao kê tài khoản
@@ -59,36 +59,36 @@ AccountCard=Thẻ tài khoản
 DeleteAccount=Xóa tài khoản
 ConfirmDeleteAccount=Bạn có chắc muốn xóa tài khoản này ?
 Account=Tài khoản
-BankTransactionByCategories=Bank entries by categories
-BankTransactionForCategory=Bank entries for category <b>%s</b>
+BankTransactionByCategories=Mục ngân hàng theo nhóm
+BankTransactionForCategory=Mục ngân hàng cho mục <b>%s</b>
 RemoveFromRubrique=Hủy bỏ liên kết với danh mục
-RemoveFromRubriqueConfirm=Are you sure you want to remove link between the entry and the category?
-ListBankTransactions=List of bank entries
+RemoveFromRubriqueConfirm=Bạn có muốn xóa liên kết giữa kê khai và danh mục?
+ListBankTransactions=Danh sách mục ngân hàng
 IdTransaction=Mã số giao dịch
-BankTransactions=Bank entries
-ListTransactions=List entries
-ListTransactionsByCategory=List entries/category
-TransactionsToConciliate=Entries to reconcile
+BankTransactions=Mục ngân hàng
+ListTransactions=Danh sách kê khai
+ListTransactionsByCategory=Liệt kê mục/nhóm
+TransactionsToConciliate=Mục cần đối chiếu
 Conciliable=Có thể được đối chiếu
 Conciliate=Đối chiếu
 Conciliation=Đối chiếu
-ReconciliationLate=Reconciliation late
+ReconciliationLate=Đối chiếu sau
 IncludeClosedAccount=Bao gồm các tài khoản đã đóng
-OnlyOpenedAccount=Chỉ tài khoản đang mở
+OnlyOpenedAccount=Chỉ có tài khoản mở
 AccountToCredit=Tài khoản tín dụng
 AccountToDebit=Tài khoản ghi nợ
 DisableConciliation=Vô hiệu hoá tính đối chiếu cho tài khoản này
 ConciliationDisabled=Tính năng đối chiếu bị vô hiệu hóa
-LinkedToAConciliatedTransaction=Linked to a conciliated entry
-StatusAccountOpened=Mở
+LinkedToAConciliatedTransaction=Liên kết đến một mục được giải trình
+StatusAccountOpened=Đã mở
 StatusAccountClosed=Đóng
 AccountIdShort=Số
 LineRecord=Giao dịch
-AddBankRecord=Add entry
-AddBankRecordLong=Add entry manually
+AddBankRecord=Thêm kê khai
+AddBankRecordLong=Thêm kê khai thủ công
 ConciliatedBy=Đối chiếu bởi
 DateConciliating=Ngày đối chiếu
-BankLineConciliated=Entry reconciled
+BankLineConciliated=Kê khai đã đối chiếu
 Reconciled=Đã đối chiếu
 NotReconciled=Chưa đối chiếu
 CustomerInvoicePayment=Thanh toán của khách hàng
@@ -105,20 +105,20 @@ 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.
 CheckTransmitter=Đơn vị phát hành
 ValidateCheckReceipt=Kiểm tra chứng từ séc này?
-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?
+ConfirmValidateCheckReceipt=Bạn có chắc chắn muốn thông qua biên nhận séc này, bạn không thể thay đổi nếu đã hoàn thành
+DeleteCheckReceipt=Xóa biên nhận séc này?
+ConfirmDeleteCheckReceipt=Bạn có muốn xóa biên nhận séc này?
 BankChecks=Séc ngân hàng
-BankChecksToReceipt=Checks awaiting deposit
+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
-DeleteTransaction=Delete entry
-ConfirmDeleteTransaction=Are you sure you want to delete this entry?
-ThisWillAlsoDeleteBankRecord=This will also delete generated bank entry
+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
 BankMovements=Biến động
-PlannedTransactions=Planned entries
+PlannedTransactions=Kê khai theo kế hoạch
 Graph=Đồ họa
-ExportDataset_banque_1=Bank entries and account statement
+ExportDataset_banque_1=Kê khai ngân hàng và bảng kê tài khoản
 ExportDataset_banque_2=Phiếu nộp tiền
 TransactionOnTheOtherAccount=Giao dịch trên tài khoản khác
 PaymentNumberUpdateSucceeded=Cập nhật thành công số thanh toán
@@ -126,13 +126,13 @@ PaymentNumberUpdateFailed=Số thanh toán không thể được cập nhật
 PaymentDateUpdateSucceeded=Cập nhật thành công ngày thanh toán
 PaymentDateUpdateFailed=Ngày thanh toán không thể được cập nhật
 Transactions=Giao dịch
-BankTransactionLine=Bank entry
+BankTransactionLine=Kê khai ngân hàng
 AllAccounts=Tất cả tài khoản ngân hàng/ tiền mặt
 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".
-InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
+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
 ThenCheckLinesAndConciliate=Sau đó, kiểm tra những dòng hiện trong báo cáo ngân hàng và nhấp
@@ -142,11 +142,11 @@ LabelRIB=Nhãn BAN
 NoBANRecord=Không có biểu ghi BAN
 DeleteARib=Xóa biểu ghi BAN
 ConfirmDeleteRib=Bạn có chắc muốn xóa biểu ghi BAN này?
-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
+RejectCheck=Séc bị trả lại
+ConfirmRejectCheck=Bạn có muốn đánh dấu séc này bị từ chối?
+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=Template of SEPA mandate. Usefull for european countries in EEC only.
-DocumentModelBan=Template to print a page with BAN information.
+DocumentModelSepaMandate=Mẫu lệnh SEPA. Chỉ dùng cho các nước trong khối EEC
+DocumentModelBan=Mẫu để in 1 trang với thông tin BAN
diff --git a/htdocs/langs/vi_VN/bills.lang b/htdocs/langs/vi_VN/bills.lang
index 8710f1e15cb..bc384fcae1a 100644
--- a/htdocs/langs/vi_VN/bills.lang
+++ b/htdocs/langs/vi_VN/bills.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - bills
 Bill=Hoá đơn
 Bills=Hoá đơn
-BillsCustomers=Hóa đơn khách hàng
+BillsCustomers=Customer invoices
 BillsCustomer=Hóa đơn khách hàng
-BillsSuppliers=Hóa đơn nhà cung cấp
+BillsSuppliers=Supplier invoices
 BillsCustomersUnpaid=Hóa đơn khách hàng chưa thanh toán
-BillsCustomersUnpaidForCompany=Hoá đơn khách hàng chưa thanh toán cho %s
-BillsSuppliersUnpaid=Hoá đơn nhà cung cấp chưa thanh toán
-BillsSuppliersUnpaidForCompany=Hoá đơn nhà cung cấp chưa thanh toán cho %s
+BillsCustomersUnpaidForCompany=Unpaid customer invoices for %s
+BillsSuppliersUnpaid=Nhà cung cấp hoá đơn chưa thanh toán
+BillsSuppliersUnpaidForCompany=Unpaid supplier invoices for %s
 BillsLate=Thanh toán trễ
 BillsStatistics=Thống kê hóa đơn khách hàng
 BillsStatisticsSuppliers=Thống kê hóa đơn nhà cung cấp
@@ -62,8 +62,8 @@ PaymentsBack=Thanh toán lại
 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 credit note or deposit 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.
+ConfirmDeletePayment=Bạn có chắc muốn xóa thanh toán này ?
+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.
 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
@@ -78,6 +78,7 @@ PaymentMode=Loại thanh toán
 PaymentTypeDC=Thẻ tín dụng/Ghi nợ
 PaymentTypePP=PayPal
 IdPaymentMode=Payment type (id)
+CodePaymentMode=Payment type (code)
 LabelPaymentMode=Payment type (label)
 PaymentModeShort=Loại thanh toán
 PaymentTerm=Điều khoản thanh toán
@@ -102,9 +103,10 @@ SearchACustomerInvoice=Tìm kiếm một hóa đơn khách hàng
 SearchASupplierInvoice=Tìm kiếm một hóa đơn nhà cung cấp
 CancelBill=Hủy hóa đơn
 SendRemindByMail=Gửi nhắc nhở bằng email
-DoPayment=Thực hiện thanh toán
-DoPaymentBack=Thực hiện thanh toán lại
+DoPayment=Enter payment
+DoPaymentBack=Enter refund
 ConvertToReduc=Chuyển đổi thành giảm giá trong tương lai
+ConvertExcessReceivedToReduc=Convert excess received into future discount
 EnterPaymentReceivedFromCustomer=Nhập thanh toán đã nhận được từ khách hàng
 EnterPaymentDueToCustomer=Thực hiện thanh toán do khách hàng
 DisabledBecauseRemainderToPayIsZero=Vô hiệu hóa bởi vì phần chưa thanh toán còn lại là bằng 0
@@ -113,22 +115,24 @@ BillStatus=Trạng thái hóa đơn
 StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Dự thảo (cần được xác nhận)
 BillStatusPaid=Đã trả
-BillStatusPaidBackOrConverted=Đã trả hoặc đã chuyển thành giảm giá
+BillStatusPaidBackOrConverted=Refund or converted into discount
 BillStatusConverted=Đã trả (sẵn sàng cho hóa đơn cuối cùng)
 BillStatusCanceled=Đã loại bỏ
 BillStatusValidated=Đã xác nhận (cần được thanh toán)
 BillStatusStarted=Đã bắt đầu
 BillStatusNotPaid=Chưa trả
+BillStatusNotRefunded=Not refunded
 BillStatusClosedUnpaid=Đã đóng (chưa trả)
 BillStatusClosedPaidPartially=Đã trả (một phần)
 BillShortStatusDraft=Dự thảo
 BillShortStatusPaid=Đã trả
-BillShortStatusPaidBackOrConverted=Đã xử lý
+BillShortStatusPaidBackOrConverted=Refund or converted
 BillShortStatusConverted=Đã xử lý
 BillShortStatusCanceled=Đã loại bỏ
 BillShortStatusValidated=Đã xác nhận
 BillShortStatusStarted=Đã bắt đầu
 BillShortStatusNotPaid=Chưa trả
+BillShortStatusNotRefunded=Not refunded
 BillShortStatusClosedUnpaid=Đã đóng
 BillShortStatusClosedPaidPartially=Đã trả (một phần)
 PaymentStatusToValidShort=Để xác nhận
@@ -149,14 +153,14 @@ NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified
 FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
 NotARecurringInvoiceTemplate=Not a recurring template invoice
 NewBill=Hóa đơn mới
-LastBills=%s hóa đơn cuối
-LastCustomersBills=%s hoá đơn khách hàng cuối
-LastSuppliersBills=%s hóa đơn nhà cung cấp cuối
+LastBills=Latest %s invoices
+LastCustomersBills=Latest %s customer invoices
+LastSuppliersBills=Latest %s supplier invoices
 AllBills=Tất cả hóa đơn
 OtherBills=Hoá đơn khác
 DraftBills=Hóa đơn dự thảo
-CustomersDraftInvoices=Hóa đơn khách hàng dự thảo
-SuppliersDraftInvoices=Hóa đơn nhà cung cấp dự thảo
+CustomersDraftInvoices=Customer draft invoices
+SuppliersDraftInvoices=Supplier draft invoices
 Unpaid=Chưa trả
 ConfirmDeleteBill=Bạn có muốn xóa hóa đơn này?
 ConfirmValidateBill=Are you sure you want to validate this invoice with reference <b>%s</b>?
@@ -189,7 +193,7 @@ NumberOfBills=Nb của hoá đơn
 NumberOfBillsByMonth=Nb của hoá đơn theo tháng
 AmountOfBills=Số tiền của hóa đơn
 AmountOfBillsByMonthHT=Số tiền của hóa đơn theo tháng (có thuế)
-ShowSocialContribution=Show social/fiscal tax
+ShowSocialContribution=Xem thuế social/fiscal
 ShowBill=Hiện thị hóa đơn
 ShowInvoice=Hiển thị hóa đơn
 ShowInvoiceReplace=Hiển thị hóa đơn thay thế
@@ -203,7 +207,7 @@ AlreadyPaidNoCreditNotesNoDeposits=Đã trả (không có giấy báo có hoặc
 Abandoned=Đã loại bỏ
 RemainderToPay=Chưa trả còn lại
 RemainderToTake=Số tiền còn lại để lấy
-RemainderToPayBack=Số tiền còn lại để trả lại
+RemainderToPayBack=Remaining amount to refund
 Rest=Chờ xử lý
 AmountExpected=Số tiền đã đòi
 ExcessReceived=Số dư đã nhận
@@ -270,6 +274,7 @@ Deposit=Ứng trước
 Deposits=Ứng trước
 DiscountFromCreditNote=Giảm giá từ giấy báo có %s
 DiscountFromDeposit=Thanh toán từ hóa đơn ứng trước %s
+DiscountFromExcessReceived=Payments from excess received of invoice %s
 AbsoluteDiscountUse=Đây là loại giấy báo có được sử dụng trên hóa đơn trước khi xác nhận
 CreditNoteDepositUse=Invoice must be validated to use this kind of credits
 NewGlobalDiscount=Tạo giảm giá theo số tiền
@@ -277,8 +282,8 @@ NewRelativeDiscount=Tạo giảm giá theo %
 NoteReason=Ghi chú/Lý do
 ReasonDiscount=Lý do
 DiscountOfferedBy=Được cấp bởi
-DiscountStillRemaining=Giảm giá vẫn còn hiệu lực
-DiscountAlreadyCounted=Giảm giá đã được tính
+DiscountStillRemaining=Discounts available
+DiscountAlreadyCounted=Discounts already consumed
 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ệ .
@@ -323,18 +328,20 @@ FrequencyPer_m=Every %s months
 FrequencyPer_y=Every %s years
 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
-DateLastGeneration=Date of latest generation
-MaxPeriodNumber=Max nb of invoice generation
-NbOfGenerationDone=Nb of invoice generation already done
+DateLastGeneration=Ngày tạo cuối
+MaxPeriodNumber=Số tạo hóa đơn tối đa
+NbOfGenerationDone=Nố tạo hóa đơn đã được thực hiện
 MaxGenerationReached=Maximum nb of generations reached
-InvoiceAutoValidate=Validate invoices automatically
+InvoiceAutoValidate=Xác nhận hóa đơn tự động
 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
 # PaymentConditions
 Statut=Trạng thái
-PaymentConditionShortRECEP=Ngay lập tức
-PaymentConditionRECEP=Ngay lập tức
+PaymentConditionShortRECEP=Due Upon Receipt
+PaymentConditionRECEP=Due Upon Receipt
 PaymentConditionShort30D=30 ngày
 PaymentCondition30D=30 ngày
 PaymentConditionShort30DENDMONTH=30 days of month-end
@@ -349,6 +356,14 @@ PaymentConditionShortPT_ORDER=Đơn hàng
 PaymentConditionPT_ORDER=Trên đơn hàng
 PaymentConditionShortPT_5050=50-50
 PaymentConditionPT_5050=50%% trả trước, 50%% trả khi giao hàng
+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
 FixAmount=Số tiền cố định
 VarAmount=Số tiền thay đổi (%% tot.)
 # PaymentType
@@ -418,7 +433,7 @@ ChequeDeposits=Séc ứng trước
 Cheques=Séc
 DepositId=Id deposit
 NbCheque=Number of checks
-CreditNoteConvertedIntoDiscount=Giấy báo có này hoặc hóa đơn ứng trước đã được chuyển đổi thành %s
+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
 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
diff --git a/htdocs/langs/vi_VN/boxes.lang b/htdocs/langs/vi_VN/boxes.lang
index 7b73fb42ac5..8ec73578f8a 100644
--- a/htdocs/langs/vi_VN/boxes.lang
+++ b/htdocs/langs/vi_VN/boxes.lang
@@ -19,14 +19,14 @@ BoxLastMembers=Latest members
 BoxFicheInter=Latest interventions
 BoxCurrentAccounts=Open accounts balance
 BoxTitleLastRssInfos=Latest %s news from %s
-BoxTitleLastProducts=Latest %s modified products/services
+BoxTitleLastProducts=%s dịch vụ/ sản phẩm mới được sửa
 BoxTitleProductsAlertStock=Sản phẩm trong kho cảnh báo
 BoxTitleLastSuppliers=Latest %s recorded suppliers
 BoxTitleLastModifiedSuppliers=Latest %s modified suppliers
 BoxTitleLastModifiedCustomers=Latest %s modified customers
 BoxTitleLastCustomersOrProspects=Latest %s customers or prospects
-BoxTitleLastCustomerBills=Latest %s customer's invoices
-BoxTitleLastSupplierBills=Latest %s supplier's invoices
+BoxTitleLastCustomerBills=Latest %s customer invoices
+BoxTitleLastSupplierBills=Latest %s supplier invoices
 BoxTitleLastModifiedProspects=Latest %s modified prospects
 BoxTitleLastModifiedMembers=Latest %s members
 BoxTitleLastFicheInter=Latest %s modified interventions
@@ -51,12 +51,12 @@ ClickToAdd=Nhấn vào đây để thêm.
 NoRecordedCustomers=Không có khách hàng ghi nhận
 NoRecordedContacts=Không có địa chỉ liên lạc ghi
 NoActionsToDo=Không có hành động để làm
-NoRecordedOrders=Đơn đặt hàng không có khách hàng ghi nhận của
+NoRecordedOrders=No recorded customer orders
 NoRecordedProposals=Không có đề nghị ghi
-NoRecordedInvoices=Hoá đơn không có khách hàng ghi nhận của
-NoUnpaidCustomerBills=Không có hoá đơn chưa thanh toán của khách hàng
-NoUnpaidSupplierBills=Không có hoá đơn chưa thanh toán của nhà cung cấp
-NoModifiedSupplierBills=Không có nhà cung cấp hoá đơn ghi nhận của
+NoRecordedInvoices=No recorded customer invoices
+NoUnpaidCustomerBills=No unpaid customer invoices
+NoUnpaidSupplierBills=No unpaid supplier invoices
+NoModifiedSupplierBills=No recorded supplier invoices
 NoRecordedProducts=Không ghi nhận sản phẩm / dịch vụ
 NoRecordedProspects=Không có triển vọng ghi
 NoContractedProducts=Không có sản phẩm / dịch vụ ký hợp đồng
diff --git a/htdocs/langs/vi_VN/companies.lang b/htdocs/langs/vi_VN/companies.lang
index 4b0fe6f3f4d..24de14b1b00 100644
--- a/htdocs/langs/vi_VN/companies.lang
+++ b/htdocs/langs/vi_VN/companies.lang
@@ -78,6 +78,10 @@ VATIsNotUsed=Thuế VAT không được dùng
 CopyAddressFromSoc=Fill address with third party address
 ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
 PaymentBankAccount=Payment bank account
+OverAllProposals=Total proposals
+OverAllOrders=Total orders
+OverAllInvoices=Total invoices
+OverAllSupplierProposals=Total price requests
 ##### Local Taxes #####
 LocalTax1IsUsed=Use second tax
 LocalTax1IsUsedES= RE được dùng
@@ -239,6 +243,10 @@ ProfId3RU=Prof Id 3 (KPP)
 ProfId4RU=Prof Id 4 (OKPO)
 ProfId5RU=-
 ProfId6RU=-
+ProfId1DZ=RC
+ProfId2DZ=Art.
+ProfId3DZ=NIF
+ProfId4DZ=NIS
 VATIntra=Số VAT
 VATIntraShort=Số VAT
 VATIntraSyntaxIsValid=Cú pháp hợp lệ
@@ -382,8 +390,9 @@ ListCustomersShort=Danh sách khách hàng
 ThirdPartiesArea=Bên thứ ba và các khu vực liên lạc
 LastModifiedThirdParties=Latest %s modified third parties
 UniqueThirdParties=Tổng của bên thứ ba duy nhất
-InActivity=Mở
+InActivity=Đã mở
 ActivityCeased=Đóng
+ThirdPartyIsClosed=Third party is closed
 ProductsIntoElements=List of products/services into %s
 CurrentOutstandingBill=Công nợ hiện tại
 OutstandingBill=Công nợ tối đa
@@ -396,7 +405,7 @@ MergeThirdparties=Merge third parties
 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 so you will be able to delete the duplicate one.
 ThirdpartiesMergeSuccess=Thirdparties have been merged
 SaleRepresentativeLogin=Login of sales representative
-SaleRepresentativeFirstname=Firstname of sales representative
-SaleRepresentativeLastname=Lastname of sales representative
+SaleRepresentativeFirstname=First name of sales representative
+SaleRepresentativeLastname=Last name of sales representative
 ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
 NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/vi_VN/compta.lang b/htdocs/langs/vi_VN/compta.lang
index 384f47c0402..2ce9d4799df 100644
--- a/htdocs/langs/vi_VN/compta.lang
+++ b/htdocs/langs/vi_VN/compta.lang
@@ -65,6 +65,7 @@ PaymentSocialContribution=Thanh toán xã hội/ fiscal tax
 PaymentVat=Nộp thuế GTGT
 ListPayment=Danh sách thanh toán
 ListOfCustomerPayments=Danh sách các khoản thanh toán của khách hàng
+ListOfSupplierPayments=Danh sách các khoản thanh toán nhà cung cấp
 DateStartPeriod=Ngày giai đoạn bắt đầu
 DateEndPeriod=Thời gian cuối ngày
 newLT1Payment=New tax 2 payment
@@ -81,7 +82,7 @@ LT2PaymentES=IRPF thanh toán
 LT2PaymentsES=IRPF Thanh toán
 VATPayment=Sales tax payment
 VATPayments=Sales tax payments
-VATRefund=Sales tax refund Refund
+VATRefund=Sales tax refund
 Refund=Refund
 SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Hiện nộp thuế GTGT
@@ -194,7 +195,7 @@ CloneTax=Clone a social/fiscal tax
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
 CloneTaxForNextMonth=Sao chép nó vào tháng tới
 SimpleReport=Simple report
-AddExtraReport=Extra reports
+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
diff --git a/htdocs/langs/vi_VN/cron.lang b/htdocs/langs/vi_VN/cron.lang
index 79b3717f462..c3c615b9722 100644
--- a/htdocs/langs/vi_VN/cron.lang
+++ b/htdocs/langs/vi_VN/cron.lang
@@ -1,10 +1,10 @@
 # Dolibarr language file - Source file is en_US - cron
 # About page
 # Right
-Permission23101 = Read Scheduled job
-Permission23102 = Create/update Scheduled job
-Permission23103 = Delete Scheduled job
-Permission23104 = Execute Scheduled job
+Permission23101 = Xem công việc theo lịch trình
+Permission23102 = Tạo/cập nhật công việc theo lịch trình
+Permission23103 = Xóa công việc theo lịch trình
+Permission23104 = Thực thi công việc theo lịch trình
 # Admin
 CronSetup= Theo lịch trình thiết lập quản lý công việc
 URLToLaunchCronJobs=URL to check and launch qualified cron jobs
@@ -17,14 +17,14 @@ CronMethodDoesNotExists=Class %s does not contains any method %s
 # Menu
 EnabledAndDisabled=Enabled and disabled
 # Page list
-CronLastOutput=Bài đầu ra chạy
-CronLastResult=Cuối mã kết quả
+CronLastOutput=Latest run output
+CronLastResult=Latest result code
 CronCommand=Lệnh
-CronList=Scheduled jobs
+CronList=Việc theo lịch trình
 CronDelete=Delete scheduled jobs
-CronConfirmDelete=Are you sure you want to delete these scheduled jobs ?
+CronConfirmDelete=Are you sure you want to delete these scheduled jobs?
 CronExecute=Launch scheduled job
-CronConfirmExecute=Are you sure you want to execute these scheduled jobs now ?
+CronConfirmExecute=Are you sure you want to execute these scheduled jobs now?
 CronInfo=Scheduled job module allow to execute job that have been planned
 CronTask=Công việc
 CronNone=Không
@@ -33,13 +33,13 @@ CronDtEnd=Not after
 CronDtNextLaunch=Thực hiện tiếp theo
 CronDtLastLaunch=Start date of latest execution
 CronDtLastResult=End date of latest execution
-CronFrequency=Frequency
+CronFrequency=Tần số
 CronClass=Class
 CronMethod=Phương pháp
 CronModule=Mô-đun
 CronNoJobs=Không có công ăn việc làm đăng ký
 CronPriority=Ưu tiên
-CronLabel=Label
+CronLabel=Nhãn
 CronNbRun=Nb. ra mắt
 CronMaxRun=Max nb. launch
 CronEach=Mỗi
@@ -65,7 +65,7 @@ CronMethodHelp=Phương pháp đối tượng để khởi động. <BR> Đối
 CronArgsHelp=Các đối số phương pháp. <BR> Đối với exemple phương pháp của Dolibarr đối tượng sản phẩm /htdocs/product/class/product.class.php lấy, giá trị của paramters có thể là <i>0, ProductRef</i>
 CronCommandHelp=Các dòng lệnh hệ thống để thực thi.
 CronCreateJob=Create new Scheduled Job
-CronFrom=From
+CronFrom=Từ
 # Info
 # Common
 CronType=Job type
diff --git a/htdocs/langs/vi_VN/errors.lang b/htdocs/langs/vi_VN/errors.lang
index dc545d48b8b..8d2ddf5ad2c 100644
--- a/htdocs/langs/vi_VN/errors.lang
+++ b/htdocs/langs/vi_VN/errors.lang
@@ -11,6 +11,7 @@ ErrorLoginAlreadyExists=Đăng nhập% s đã tồn tại.
 ErrorGroupAlreadyExists=Nhóm% s đã tồn tại.
 ErrorRecordNotFound=Ghi lại không tìm thấy.
 ErrorFailToCopyFile=Không thể sao chép tập tin <b>'% s'</b> vào <b>'% s'.</b>
+ErrorFailToCopyDir=Failed to copy directory '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToRenameFile=Không thể đổi tên tập tin <b>'% s'</b> vào <b>'% s'.</b>
 ErrorFailToDeleteFile=Không thể loại bỏ các tập tin <b>'% s'.</b>
 ErrorFailToCreateFile=Không thể tạo tập tin <b>'% s'.</b>
@@ -115,7 +116,7 @@ ErrorNoActivatedBarcode=Không có loại mã vạch kích hoạt
 ErrUnzipFails=Không thể giải nén% s với ZipArchive
 ErrNoZipEngine=Không có công cụ để giải nén tập tin% s trong PHP này
 ErrorFileMustBeADolibarrPackage=Các tập tin% s phải là một gói zip Dolibarr
-ErrorFileRequired=Phải mất một tập tin gói Dolibarr
+ErrorModuleFileRequired=You must select a Dolibarr module package file
 ErrorPhpCurlNotInstalled=PHP CURL không được cài đặt, điều này là cần thiết để nói chuyện với Paypal
 ErrorFailedToAddToMailmanList=Không thể để thêm biểu ghi% s vào danh sách Mailman% s hoặc cơ sở SPIP
 ErrorFailedToRemoveToMailmanList=Không thể loại bỏ kỷ lục% s vào danh sách Mailman% s hoặc cơ sở SPIP
@@ -170,14 +171,19 @@ ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
 ErrorFileMustHaveFormat=File must have format %s
 ErrorSupplierCountryIsNotDefined=Quốc gia cho nhà cung cấp này không được xác định. Điều chỉnh lại trước.
 ErrorsThirdpartyMerge=Failed to merge the two records. Request canceled.
-ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enougth for product %s to add it into a new order.
-ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enougth for product %s to add it into a new invoice.
-ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enougth for product %s to add it into a new shipment.
-ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enougth for product %s to add it into a new proposal.
-ErrorFailedToLoadLoginFileForMode=Failed to get the login file for mode '%s'.
+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 bank 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>
 
 # 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.
diff --git a/htdocs/langs/vi_VN/holiday.lang b/htdocs/langs/vi_VN/holiday.lang
index bc1d0d875b0..0853fafd410 100644
--- a/htdocs/langs/vi_VN/holiday.lang
+++ b/htdocs/langs/vi_VN/holiday.lang
@@ -3,24 +3,24 @@ HRM=HRM
 Holidays=Nghỉ phép
 CPTitreMenu=Nghỉ phép
 MenuReportMonth=Báo cáo hàng tháng
-MenuAddCP=New leave request
-NotActiveModCP=Bạn phải kích hoạt Leaves mô đun để xem trang này.
-AddCP=Thực hiện một yêu cầu nghỉ phép
+MenuAddCP=Xin nghỉ phép
+NotActiveModCP=Bạn phải kích hoạt mô đun nghỉ phép để xem trang này.
+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
 DateCreateCP=Ngày tạo
 DraftCP=Dự thảo
 ToReviewCP=Đang chờ phê duyệt
-ApprovedCP=Đã được phê duyệt
-CancelCP=Hủy bỏ
-RefuseCP=Từ chối
-ValidatorCP=Approbator
+ApprovedCP=Đã phê duyệt
+CancelCP=Đã hủy
+RefuseCP=Bị từ chối
+ValidatorCP=Người duyệt
 ListeCP=Danh sách nghỉ phép
-ReviewedByCP=Sẽ được xem xét bởi
+ReviewedByCP=Người xem xét
 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=Balance of leaves
+MenuConfCP=Số ngày nghỉ còn lại
 SoldeCPUser=Nghỉ phép số dư <b>là% s</b> ngày.
 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:
@@ -60,24 +60,25 @@ 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ỉ
 MotifCP=Lý do
-UserCP=Người sử dụng
+UserCP=Người dùng
 ErrorAddEventToUserCP=Đã xảy ra lỗi khi thêm ngày nghỉ đặc biệt.
 AddEventToUserOkCP=Việc bổ sung nghỉ đặc biệt đã được hoàn thành.
-MenuLogCP=View change logs
-LogCP=Đăng cập nhật ngày nghỉ có sẵn
+MenuLogCP=Lịch sử thay đổi
+LogCP=Nhật kí cập nhận ngày nghỉ lễ
 ActionByCP=Thực hiện bởi
-UserUpdateCP=Đối với người sử dụng
+UserUpdateCP=Đối với người dùng
 PrevSoldeCP=Cân bằng trước
-NewSoldeCP=New Balance
+NewSoldeCP=Tạo cân bằng
 alreadyCPexist=Một yêu cầu nghỉ phép đã được thực hiện vào thời gian này.
 FirstDayOfHoliday=Ngày đầu tiên của kỳ nghỉ
 LastDayOfHoliday=Ngày cuối cùng của kỳ nghỉ
-BoxTitleLastLeaveRequests=Latest %s modified leave requests
+BoxTitleLastLeaveRequests=%s yêu cầu nghỉ phép mới được sửa
 HolidaysMonthlyUpdate=Cập nhật hàng tháng
 ManualUpdate=Cập nhật thủ công
 HolidaysCancelation=Để lại yêu cầu hủy bỏ
-EmployeeLastname=Employee lastname
-EmployeeFirstname=Employee firstname
+EmployeeLastname=Employee last name
+EmployeeFirstname=Employee first name
+TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
 
 ## Configuration du Module ##
 LastUpdateCP=Latest automatic update of leaves allocation
@@ -86,7 +87,7 @@ 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
 ErrorMailNotSend=Đã xảy ra lỗi trong khi gửi email:
-NoticePeriod=Notice period
+NoticePeriod=Kỳ thông báo
 #Messages
 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
@@ -99,5 +100,5 @@ HolidaysRefusedBody=Yêu cầu nghỉ phép của bạn cho% s đến% s đã b
 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=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.
+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.
diff --git a/htdocs/langs/vi_VN/ldap.lang b/htdocs/langs/vi_VN/ldap.lang
index ce62c20d8b8..5856cb77205 100644
--- a/htdocs/langs/vi_VN/ldap.lang
+++ b/htdocs/langs/vi_VN/ldap.lang
@@ -13,8 +13,8 @@ LDAPUsers=Người sử dụng trong cơ sở dữ liệu LDAP
 LDAPFieldStatus=Tình trạng
 LDAPFieldFirstSubscriptionDate=Ngày đăng ký đầu tiên
 LDAPFieldFirstSubscriptionAmount=Số lượng thuê bao đầu tiên
-LDAPFieldLastSubscriptionDate=Cuối ngày đăng ký
-LDAPFieldLastSubscriptionAmount=Số lượng đăng ký cuối cùng
+LDAPFieldLastSubscriptionDate=Latest subscription date
+LDAPFieldLastSubscriptionAmount=Latest subscription amount
 LDAPFieldSkype=Skype id
 LDAPFieldSkypeExample=Example : skypeName
 UserSynchronized=Sử dụng đồng bộ
diff --git a/htdocs/langs/vi_VN/mails.lang b/htdocs/langs/vi_VN/mails.lang
index 54f8e439bb4..146d5e4cbbb 100644
--- a/htdocs/langs/vi_VN/mails.lang
+++ b/htdocs/langs/vi_VN/mails.lang
@@ -35,7 +35,7 @@ MailingStatusSentPartialy=Gửi partialy
 MailingStatusSentCompletely=Gửi hoàn toàn
 MailingStatusError=Lỗi
 MailingStatusNotSent=Không gửi
-MailSuccessfulySent=Email đã được gửi thành công (từ% s đến% s)
+MailSuccessfulySent=Email successfully accepted for delivery (from %s to %s)
 MailingSuccessfullyValidated=Gửi email xác nhận thành công
 MailUnsubcribe=Hủy đăng ký
 MailingStatusNotContact=Không liên hệ nữa
@@ -74,22 +74,28 @@ ResultOfMailSending=Result of mass EMail sending
 NbSelected=Nb selected
 NbIgnored=Nb ignored
 NbSent=Nb 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
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Dòng %s trong tập tin
 RecipientSelectionModules=Yêu cầu xác định cho lựa chọn của người nhận
 MailSelectedRecipients=Người nhận lựa chọn
 MailingArea=Khu vực EMailings
-LastMailings=Cuối %s emailings
+LastMailings=Latest %s emailings
 TargetsStatistics=Mục tiêu thống kê
 NbOfCompaniesContacts=Địa chỉ liên lạc duy nhất / địa chỉ
 MailNoChangePossible=Người nhận các thư điện tử xác nhận không thể thay đổi
 SearchAMailing=Tìm kiếm chỉ gửi thư
 SendMailing=Gửi email
 SendMail=Gửi email
-MailingNeedCommand=Vì lý do an ninh, gửi các thư điện tử là tốt hơn khi thực hiện từ dòng lệnh. Nếu bạn có một, yêu cầu quản trị máy chủ của bạn để khởi động các lệnh sau đây để gửi các thư điện tử cho tất cả người nhận:
+SentBy=Gửi
+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=Tuy nhiên bạn có thể gửi trực tuyến bằng cách thêm tham số MAILING_LIMIT_SENDBYWEB với giá trị của số lượng tối đa của các email mà bạn muốn gửi bởi phiên. Đối với điều này, hãy vào Trang chủ - Cài đặt - Loại khác.
-ConfirmSendingEmailing=If you can't or prefer sending them with your www browser, please confirm you are sure you want to send emailing now from your browser?
+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.
 TargetsReset=Xóa danh sách
 ToClearAllRecipientsClickHere=Click vào đây để xóa danh sách người nhận các thư điện tử này
@@ -144,3 +150,6 @@ AdvTgtCreateFilter=Create filter
 AdvTgtOrCreateNewFilter=Name of new filter
 NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
+OutGoingEmailSetup=Outgoing email setup
+InGoingEmailSetup=Incoming email setup
+
diff --git a/htdocs/langs/vi_VN/main.lang b/htdocs/langs/vi_VN/main.lang
index 27402164735..397f84bd5b4 100644
--- a/htdocs/langs/vi_VN/main.lang
+++ b/htdocs/langs/vi_VN/main.lang
@@ -63,11 +63,13 @@ ErrorNoVATRateDefinedForSellerCountry=Lỗi, không xác định tỉ lệ VAT c
 ErrorNoSocialContributionForSellerCountry=Error, no social/fiscal taxes type defined for country '%s'.
 ErrorFailedToSaveFile=Lỗi, lưu tập tin thất bại
 ErrorCannotAddThisParentWarehouse=You are trying to add a parent warehouse which is already a child of current one
+MaxNbOfRecordPerPage=Max nb of record per page
 NotAuthorized=You are not authorized to do that.
 SetDate=Thiết lập ngày
 SelectDate=Chọn một ngày
 SeeAlso=Xem thêm %s
 SeeHere=Xem ở đây
+Apply=Áp dụng
 BackgroundColorByDefault=Màu nền mặc định
 FileRenamed=The file was successfully renamed
 FileUploaded=Các tập tin được tải lên thành công
@@ -86,7 +88,7 @@ Undefined=Không xác định
 PasswordForgotten=Password forgotten?
 SeeAbove=Xem ở trên
 HomeArea=Khu vực nhà
-LastConnexion=Kết nối cuối
+LastConnexion=Latest connection
 PreviousConnexion=Kết nối trước
 PreviousValue=Previous value
 ConnectedOnMultiCompany=Kết nối trong môi trường
@@ -236,7 +238,7 @@ DateCreation=Ngày tạo
 DateCreationShort=Creat. date
 DateModification=Ngày điều chỉnh
 DateModificationShort=Ngày điều chỉnh
-DateLastModification=Ngày điều chỉnh cuối
+DateLastModification=Latest modification date
 DateValidation=Ngày xác nhận
 DateClosing=Ngày kết thúc
 DateDue=Ngày đáo hạn
@@ -432,7 +434,7 @@ Reportings=Việc báo cáo
 Draft=Dự thảo
 Drafts=Dự thảo
 Validated=Đã xác nhận
-Opened=Mở
+Opened=Đã mở
 New=Mới
 Discount=Giảm giá
 Unknown=Không biết
@@ -460,6 +462,7 @@ DeletePicture=Ảnh xóa
 ConfirmDeletePicture=Xác nhận xoá hình ảnh?
 Login=Đăng nhập
 CurrentLogin=Đăng nhập hiện tại
+EnterLoginDetail=Enter login details
 January=Tháng Một
 February=Tháng Hai
 March=Tháng Ba
@@ -597,6 +600,8 @@ SessionName=Tên phiên
 Method=Phương pháp
 Receive=Nhận
 CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
+ExpectedValue=Expected Value
+CurrentValue=Giá trị hiện tại
 PartialWoman=Một phần
 TotalWoman=Tổng
 NeverReceived=Chưa từng nhận
@@ -753,6 +758,8 @@ RemoveString=Remove string '%s'
 SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
 DirectDownloadLink=Direct download link
 Download=Download
+ActualizeCurrency=Update currency rate
+Fiscalyear=Năm tài chính
 # Week day
 Monday=Thứ Hai
 Tuesday=Thứ Ba
@@ -787,8 +794,8 @@ SetRef=Set ref
 Select2ResultFoundUseArrows=Some results found. Use arrows to select.
 Select2NotFound=No result found
 Select2Enter=Enter
-Select2MoreCharacter=or more character
-Select2MoreCharacters=or more characters
+Select2MoreCharacter=or more characters<br /><br /><strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
+Select2MoreCharacters=or more characters<br /><br /><strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
 Select2LoadingMoreResults=Loading more results...
 Select2SearchInProgress=Search in progress...
 SearchIntoThirdparties=Thirdparties
@@ -809,3 +816,5 @@ SearchIntoContracts=Hợp đồng
 SearchIntoCustomerShipments=Customer shipments
 SearchIntoExpenseReports=Expense reports
 SearchIntoLeaves=Nghỉ phép
+
+BulkActions=Bulk actions
diff --git a/htdocs/langs/vi_VN/members.lang b/htdocs/langs/vi_VN/members.lang
index 803469874e4..0e3975605e1 100644
--- a/htdocs/langs/vi_VN/members.lang
+++ b/htdocs/langs/vi_VN/members.lang
@@ -45,7 +45,7 @@ MemberStatusDraft=Dự thảo (cần phải được xác nhận)
 MemberStatusDraftShort=Dự thảo
 MemberStatusActive=Xác nhận (đăng ký chờ đợi)
 MemberStatusActiveShort=Xác nhận
-MemberStatusActiveLate=mô tả hết hạn
+MemberStatusActiveLate=Subscription expired
 MemberStatusActiveLateShort=Hết hạn
 MemberStatusPaid=Đăng ký cập nhật
 MemberStatusPaidShort=Cho đến nay
@@ -136,8 +136,8 @@ DocForAllMembersCards=Tạo danh thiếp cho tất cả các thành viên
 DocForOneMemberCards=Tạo danh thiếp cho một thành viên đặc biệt
 DocForLabels=Tạo tờ địa chỉ
 SubscriptionPayment=Thanh toán mô tả
-LastSubscriptionDate=Cuối ngày đăng ký
-LastSubscriptionAmount=Số lượng đăng ký cuối cùng
+LastSubscriptionDate=Latest subscription date
+LastSubscriptionAmount=Latest subscription amount
 MembersStatisticsByCountries=Thành viên thống kê của đất nước
 MembersStatisticsByState=Thành viên thống kê của tiểu bang / tỉnh
 MembersStatisticsByTown=Thành viên thống kê của thị trấn
@@ -149,7 +149,7 @@ MembersByStateDesc=Màn hình này hiển thị cho bạn số liệu thống k
 MembersByTownDesc=Màn hình này hiển thị cho bạn số liệu thống kê về các thành viên của thị trấn.
 MembersStatisticsDesc=Chọn thống kê mà bạn muốn đọc ...
 MenuMembersStats=Thống kê
-LastMemberDate=Ngày thành viên cuối cùng
+LastMemberDate=Latest member date
 Nature=Tự nhiên
 Public=Thông tin được công khai
 NewMemberbyWeb=Thành viên mới được bổ sung. Đang chờ phê duyệt
diff --git a/htdocs/langs/vi_VN/orders.lang b/htdocs/langs/vi_VN/orders.lang
index f5b67f42e9a..2f64030be08 100644
--- a/htdocs/langs/vi_VN/orders.lang
+++ b/htdocs/langs/vi_VN/orders.lang
@@ -39,7 +39,7 @@ StatusOrderRefusedShort=Đã từ chối
 StatusOrderBilledShort=Đã ra hóa đơn
 StatusOrderToProcessShort=Để xử lý
 StatusOrderReceivedPartiallyShort=Đã nhận một phần
-StatusOrderReceivedAllShort=Đã nhận đủ
+StatusOrderReceivedAllShort=Products received
 StatusOrderCanceled=Đã hủy
 StatusOrderDraft=Dự thảo (cần được xác nhận)
 StatusOrderValidated=Đã xác nhận
@@ -51,7 +51,7 @@ StatusOrderApproved=Đã duyệt
 StatusOrderRefused=Đã từ chối
 StatusOrderBilled=Đã ra hóa đơn
 StatusOrderReceivedPartially=Đã nhận một phần
-StatusOrderReceivedAll=Đã nhận đủ
+StatusOrderReceivedAll=All products received
 ShippingExist=Chưa vận chuyển
 QtyOrdered=Số lượng đã đặt hàng
 ProductQtyInDraft=Nhập lượng sản phẩm vào đơn hàng dự thảo
diff --git a/htdocs/langs/vi_VN/other.lang b/htdocs/langs/vi_VN/other.lang
index 72de1a75527..4fd0bc0f659 100644
--- a/htdocs/langs/vi_VN/other.lang
+++ b/htdocs/langs/vi_VN/other.lang
@@ -2,6 +2,7 @@
 SecurityCode=Mã bảo vệ
 NumberingShort=N°
 Tools=Công cụ
+TMenuTools=Công cụ
 ToolsDesc=All miscellaneous tools not included in other menu entries are collected here.<br /><br />All the tools can be reached in the left menu.
 Birthday=Sinh nhật
 BirthdayDate=Birthday date
@@ -67,14 +68,15 @@ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find her
 PredefinedMailContentSendShipping=__CONTACTCIVNAME__ Bạn sẽ tìm thấy ở đây vận chuyển __SHIPPINGREF__ __PERSONALIZED__Sincerely __SIGNATURE__
 PredefinedMailContentSendFichInter=__CONTACTCIVNAME__ Bạn sẽ tìm thấy ở đây sự can thiệp __FICHINTERREF__ __PERSONALIZED__Sincerely __SIGNATURE__
 PredefinedMailContentThirdparty=__CONTACTCIVNAME__ __PERSONALIZED__ __SIGNATURE__
-DemoDesc=Dolibarr is a compact ERP/CRM supporting several functional modules. A demo showcasing all modules makes no sense as this scenario never occurs. So, several demo profiles are available.
+DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
+ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
 DemoFundation=Quản lý thành viên của một nền tảng
 DemoFundation2=Quản lý thành viên và tài khoản ngân hàng của một nền tảng
-DemoCompanyServiceOnly=Quản lý dịch vụ bán hàng hoạt động tự do chỉ
+DemoCompanyServiceOnly=Company or freelance selling service only
 DemoCompanyShopWithCashDesk=Quản lý một cửa hàng với một bàn bằng tiền mặt
-DemoCompanyProductAndStocks=Quản lý một công ty bán các sản phẩm vừa và nhỏ
-DemoCompanyAll=Quản lý một công ty vừa và nhỏ với nhiều hoạt động (tất cả các mô-đun chính)
+DemoCompanyProductAndStocks=Company selling products with a shop
+DemoCompanyAll=Company with multiple activities (all main modules)
 CreatedBy=Được tạo ra bởi% s
 ModifiedBy=Được thay đổi bởi% s
 ValidatedBy=Xác nhận bởi% s
diff --git a/htdocs/langs/vi_VN/products.lang b/htdocs/langs/vi_VN/products.lang
index 94a7a6ab17e..cab96fe6cf9 100644
--- a/htdocs/langs/vi_VN/products.lang
+++ b/htdocs/langs/vi_VN/products.lang
@@ -1,10 +1,12 @@
 # Dolibarr language file - Source file is en_US - products
 ProductRef=Tham chiếu sản phẩm.
 ProductLabel=Nhãn sản phẩm
-ProductLabelTranslated=Translated product label
-ProductDescriptionTranslated=Translated product description
-ProductNoteTranslated=Translated product note
+ProductLabelTranslated=Nhãn sản phẩm đã dịch
+ProductDescriptionTranslated=Mô tả sản phẩm đã dịch
+ProductNoteTranslated=Ghi chú sản phẩm đã dịch
 ProductServiceCard=Thẻ Sản phẩm/Dịch vụ
+TMenuProducts=Sản phẩm
+TMenuServices=Dịch vụ
 Products=Sản phẩm
 Services=Dịch vụ
 Product=Sản phẩm
@@ -18,20 +20,20 @@ ProductVatMassChange=Thay đổi thuế GTGT hàng loạt
 ProductVatMassChangeDesc=Trang này có thể được dùng để điều chỉnh một thuế suất thuế GTGT được xác định trên sản phẩm hoặc dịch vụ từ một giá trị khác. Cảnh báo, sự thay đổi này được thực hiện trên tất cả các cơ sở dữ liệu.
 MassBarcodeInit=Mass barcode init
 MassBarcodeInitDesc=Trang này có thể được sử dụng để khởi tạo một mã vạch trên các đối tượng mà không có mã vạch xác định. Kiểm tra xem trước đó thiết lập các mô-đun mã vạch hoàn tất chưa.
-ProductAccountancyBuyCode=Accountancy code (purchase)
-ProductAccountancySellCode=Accountancy code (sale)
+ProductAccountancyBuyCode=Mã kế toán (mua hàng)
+ProductAccountancySellCode=Mã kế toán (bán hàng)
 ProductOrService=Sản phẩm hoặc dịch vụ
 ProductsAndServices=Sản phẩm và dịch vụ
 ProductsOrServices=Sản phẩm hoặc dịch vụ
-ProductsOnSell=Product for sale or for purchase
-ProductsNotOnSell=Product not for sale and not for purchase
+ProductsOnSell=Sản phẩm để bán hoặc để mua
+ProductsNotOnSell=Sản phẩm không để bán và không để mua
 ProductsOnSellAndOnBuy=Sản phẩm để bán và mua
 ServicesOnSell=Dịch vụ để bán hoặc để mua
-ServicesNotOnSell=Services not for sale
+ServicesNotOnSell=Dịch vụ không được bán
 ServicesOnSellAndOnBuy=Dịch vụ để bán và mua
-LastModifiedProductsAndServices=Latest %s modified products/services
-LastRecordedProducts=Latest %s recorded products
-LastRecordedServices=Latest %s recorded services
+LastModifiedProductsAndServices=%s dịch vụ/ sản phẩm mới được sửa
+LastRecordedProducts=%s sản phẩm mới được ghi lại
+LastRecordedServices=%s dịch vụ mới được ghi lại
 CardProduct0=Thẻ Sản phẩm
 CardProduct1=Thẻ Dịch vụ
 Stock=Tồn kho
@@ -50,25 +52,25 @@ ProductStatusOnBuy=Để mua
 ProductStatusNotOnBuy=Không mua
 ProductStatusOnBuyShort=Để mua
 ProductStatusNotOnBuyShort=Không mua
-UpdateVAT=Update vat
-UpdateDefaultPrice=Update default price
-UpdateLevelPrices=Update prices for each level
+UpdateVAT=Cập nhật VAT
+UpdateDefaultPrice=Cập nhật giá mặc định
+UpdateLevelPrices=Cập nhật giá cho mỗi cấp độ
 AppliedPricesFrom=Giá áp dụng từ
 SellingPrice=Giá bán
 SellingPriceHT=Giá bán (chưa thuế)
 SellingPriceTTC=Giá bán (đã có thuế.)
 CostPriceDescription=This price (net of tax) can be used to store the average amount this product cost to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
-CostPriceUsage=In a future version, this value could be used for margin calculation.
-SoldAmount=Sold amount
-PurchasedAmount=Purchased amount
+CostPriceUsage=This value could be used for margin calculation.
+SoldAmount=Tổng bán
+PurchasedAmount=Tổng mua
 NewPrice=Giá mới
-MinPrice=Min. selling price
+MinPrice=Giá bán tối thiểu
 CantBeLessThanMinPrice=Giá bán không thấp hơn mức tối thiểu được cho phép của sản phẩm này (%s chưa thuế). Thông điệp này chỉ xuất hiện khi bạn nhập giảm giá quá lớn.
 ContractStatusClosed=Đã đóng
 ErrorProductAlreadyExists=Một sản phẩm với tham chiếu %s đã tồn tại.
 ErrorProductBadRefOrLabel=Sai giá trị tham chiếu hoặc nhãn
 ErrorProductClone=Có một vấn đề trong khi cố sao chép sản phẩm hoặc dịch vụ.
-ErrorPriceCantBeLowerThanMinPrice=Error, price can't be lower than minimum price.
+ErrorPriceCantBeLowerThanMinPrice=Lỗi, giá không thể thấp hơn giá tối thiểu
 Suppliers=Nhà cung cấp
 SupplierRef=Tham chiếu sản phẩm nhà cung cấp.
 ShowProduct=Hiện sản phẩm
@@ -78,7 +80,7 @@ ProductsArea=Khu vực sản phẩm
 ServicesArea=Khu vực dịch vụ
 ListOfStockMovements=Danh sách chuyển tồn kho
 BuyingPrice=Giá mua
-PriceForEachProduct=Products with specific prices
+PriceForEachProduct=Sản phẩm với giá cụ thể
 SupplierCard=Thẻ nhà cung cấp
 PriceRemoved=Giá đã xóa
 BarCode=Mã vạch
@@ -89,11 +91,11 @@ NoteNotVisibleOnBill=Ghi chú (không hiển thị trên hóa đơn, đơn hàng
 ServiceLimitedDuration=Nếu sản phẩm là một dịch vụ có giới hạn thời gian:
 MultiPricesAbility=Several segment of prices per product/service (each customer is in one segment)
 MultiPricesNumPrices=Số lượng Giá
-AssociatedProductsAbility=Activate the feature to manage virtual products
+AssociatedProductsAbility=Mở tính năng quản lý sản phẩm ảo
 AssociatedProducts=Sản phẩm ảo
 AssociatedProductsNumber=Số lượng sản phẩm sáng tác sản phẩm ảo này
 ParentProductsNumber=Số lượng của gói sản phẩm gốc
-ParentProducts=Parent products
+ParentProducts=Sản phẩm cha
 IfZeroItIsNotAVirtualProduct=Nếu 0, sản phẩm này không phải là một sản phẩm ảo
 IfZeroItIsNotUsedByVirtualProduct=Nếu 0, sản phẩm này không được sử dụng bởi bất kỳ sản phẩm ảo
 Translation=Dịch
@@ -101,8 +103,8 @@ KeywordFilter=Bộ lọc từ khóa
 CategoryFilter=Bộ lọc phân nhóm
 ProductToAddSearch=Tìm kiếm sản phẩm để thêm
 NoMatchFound=Không tìm thấy
-ListOfProductsServices=List of products/services
-ProductAssociationList=List of products/services that are component of this virtual product/package
+ListOfProductsServices=Danh sách sản phẩm/dịch vụ
+ProductAssociationList=Danh sách sản phẩm/dịch vụ là thành phần của gói/ sản phẩm ảo này
 ProductParentList=Danh sách sản phẩm ảo / dịch vụ với sản phẩm này như một thành phần
 ErrorAssociationIsFatherOfThis=Một trong những sản phẩm được chọn là gốc của sản phẩm hiện tại
 DeleteProduct=Xóa một sản phẩm/dịch vụ
@@ -127,7 +129,7 @@ PredefinedProductsAndServicesToSell=Sản phẩm/dịch vụ định sẵn để
 PredefinedProductsToPurchase=Sản phẩm đã định sẵn để mua hàng
 PredefinedServicesToPurchase=Dịch vụ định sẵn để mua hàng
 PredefinedProductsAndServicesToPurchase=Sản phẩm/dịch vụ đã định sẵn để puchase
-NotPredefinedProducts=Not predefined products/services
+NotPredefinedProducts=Sản phẩm dịch vụ không xác định trước
 GenerateThumb=Xuất tạo thumb
 ServiceNb=Dịch vụ #%s
 ListProductServiceByPopularity=Danh sách sản phẩm/dịch vụ phổ biến
@@ -136,36 +138,37 @@ ListServiceByPopularity=Danh sách các dịch vụ phổ biến
 Finished=Thành phẩm
 RowMaterial=Nguyên liệu
 CloneProduct=Sao chép sản phẩm hoặc dịch vụ
-ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b>?
+ConfirmCloneProduct=Bạn có chắc muốn sao chép sản phẩm này <b>%s</b> ?
 CloneContentProduct=Sao chép tất cả thông tin chính của sản phẩm/dịch vụ
 ClonePricesProduct=Sao chép thông tin chính và giá cả
-CloneCompositionProduct=Clone packaged product/service
+CloneCompositionProduct=Sao chép sản phẩm/dịch vụ đã đóng gói
+CloneCombinationsProduct=Clone product variants
 ProductIsUsed=Sản phẩm này đã được dùng
 NewRefForClone=Tham chiếu sản phẩm/dịch vụ mới
-SellingPrices=Selling prices
-BuyingPrices=Buying prices
-CustomerPrices=Customer prices
-SuppliersPrices=Supplier prices
-SuppliersPricesOfProductsOrServices=Supplier prices (of products or services)
+SellingPrices=Giá bán
+BuyingPrices=Giá mua
+CustomerPrices=Giá khách hàng
+SuppliersPrices=Giá nhà cung cấp
+SuppliersPricesOfProductsOrServices=Giá nhà cung cấp (của sản phẩm hoặc dịch vụ)
 CustomCode=Mã hải quan
 CountryOrigin=Nước xuất xứ
 Nature=Tự nhiên
-ShortLabel=Short label
+ShortLabel=Nhãn ngắn
 Unit=Đơn vị
 p=u.
 set=set
 se=set
-second=second
+second=giây
 s=s
-hour=hour
+hour=giờ
 h=h
 day=ngày
 d=d
-kilogram=kilogram
+kilogram=ki lô gam
 kg=Kg
 gram=gram
 g=g
-meter=meter
+meter=mét
 m=m
 lm=lm
 m2=m²
@@ -179,15 +182,15 @@ AlwaysUseNewPrice=Luôn sử dụng giá hiện tại của sản phẩm / dịc
 AlwaysUseFixedPrice=Sử dụng giá cố định
 PriceByQuantity=Giá thay đổi theo số lượng
 PriceByQuantityRange=Phạm vi số lượng
-MultipriceRules=Price segment rules
+MultipriceRules=Quy tắc giá thành phần
 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
+PercentDiscountOver=%% giảm giá hơn %s
 ### composition fabrication
 Build=Sản xuất
-ProductsMultiPrice=Products and prices for each price segment
-ProductsOrServiceMultiPrice=Customer prices (of products or services, multi-prices)
-ProductSellByQuarterHT=Products turnover quarterly before tax
+ProductsMultiPrice=Sản phẩm và giá thành cho từng phân khúc giá
+ProductsOrServiceMultiPrice=Giá khách hàng (của sản phẩm hoặc dịch vụ, nhiều mức giá)
+ProductSellByQuarterHT=Sản phẩm 
 ServiceSellByQuarterHT=Services turnover quarterly before tax
 Quarter1=Quý 1
 Quarter2=Quý 2
@@ -204,15 +207,15 @@ FillBarCodeTypeAndValueFromThirdParty=Fill barcode type and value from barcode o
 DefinitionOfBarCodeForProductNotComplete=Định nghĩa của loại hoặc giá trị của mã vạch không đầy đủ cho sản phẩm %s.
 DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of bar code non complete for third party %s.
 BarCodeDataForProduct=Thông tin mã vạch của sản phẩm %s:
-BarCodeDataForThirdparty=Barcode information of third party %s :
+BarCodeDataForThirdparty=Thông tin mã vạch của sản phẩm thứ ba %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
-AddCustomerPrice=Add price by customer
+PriceByCustomer=Giá khác nhau cho mỗi khách hàng
+PriceCatalogue=Giá bán lẻ cho từng sản phẩm/dịch vụ
+PricingRule=Quy tắc cho giá bán
+AddCustomerPrice=Thêm giá theo khách hàng
 ForceUpdateChildPriceSoc=Đặt giá giống nhau trên nhóm khách hàng phụ thuộc
-PriceByCustomerLog=Log of previous customer prices
-MinimumPriceLimit=Minimum price can't be lower then %s
+PriceByCustomerLog=Nhật ký giá trước đây của khách hàng
+MinimumPriceLimit=Giá tối thiểu không thể thấp hơn %s
 MinimumRecommendedPrice=Giá tối thiểu đề nghị là: %s
 PriceExpressionEditor=Soạn thảo biểu giá
 PriceExpressionSelected=Biểu giá được chọn
@@ -227,33 +230,70 @@ DefaultPrice=giá mặc định
 ComposedProductIncDecStock=Tăng/Giảm tồn kho trên thay đổi gốc
 ComposedProduct=Sản phẩm con
 MinSupplierPrice=Giá tối thiểu nhà cung cấp
-MinCustomerPrice=Minimum customer price
+MinCustomerPrice=Giá khách hàng tối thiểu
 DynamicPriceConfiguration=Cấu hình giá linh hoạt
 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 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
+AddVariable=Thêm biến
+AddUpdater=Thêm nguồn cập nhật
 GlobalVariables=Biến toàn cầu
-VariableToUpdate=Variable to update
+VariableToUpdate=Biến để cập nhật
 GlobalVariableUpdaters=Cập nhật biến toàn cầu
 UpdateInterval=Cập nhật khoảng thời gian (phút)
-LastUpdated=Đã cập nhật cuối
+LastUpdated=Latest update
 CorrectlyUpdated=Đã cập nhật chính xác
 PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
-PropalMergePdfProductChooseFile=Select PDF files
-IncludingProductWithTag=Including product/service with tag
-DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on customer
-WarningSelectOneDocument=Please select at least one document
+PropalMergePdfProductChooseFile=Chọn file PDF
+IncludingProductWithTag=Bao gồm sản phẩm/ dịch vụ được gắn tag
+DefaultPriceRealPriceMayDependOnCustomer=Giá mặc định, giá thực có thể phụ thuộc vào khách hàng
+WarningSelectOneDocument=Hãy chọn ít nhất một tài liệu
 DefaultUnitToShow=Đơn vị
-NbOfQtyInProposals=Qty in proposals
-ClinkOnALinkOfColumn=Click on a link of column %s to get a detailed view...
-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
-ConfirmDeleteProductBuyPrice=Are you sure you want to delete this buying price?
+NbOfQtyInProposals=Số lượng trong đề xuất
+ClinkOnALinkOfColumn=Click vào liên kết của cột %s để lấy màn hình chi tiết
+TranslatedLabel=Nhãn dịch thuật
+TranslatedDescription=Mô tả dịch thuật
+TranslatedNote=Ghi chú dịch thuật
+ProductWeight=Trọng lượng cho 1 sản phẩm
+ProductVolume=Khối lượng cho 1 sản phẩm
+WeightUnits=Đơn vị trọng lượng
+VolumeUnits=Đơn vị khối lượng
+SizeUnits=Đơn vị kích thước
+DeleteProductBuyPrice=Xóa giá mua hàng
+ConfirmDeleteProductBuyPrice=Bạn có muốn xóa giá mua hàng này?
+SubProduct=Sub product
 
+#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
+ProductCombinations=Variants
+HideProductCombinations=Hide products variant in the products selector
+ProductCombination=Variant
+NewProductCombination=New variant
+EditProductCombination=Editing variant
+ProductCombinationGenerator=Variants generator
+Features=Features
+PriceImpact=Price impact
+WeightImpact=Weight impact
+NewProductAttribute=Thuộc tính mới
+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
+PercentageVariation=Percentage variation
+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 child products
+ConfirmCloneProductCombinations=Would you like to copy all the product variant to the 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
diff --git a/htdocs/langs/vi_VN/projects.lang b/htdocs/langs/vi_VN/projects.lang
index 87b58f133ae..ef47a652093 100644
--- a/htdocs/langs/vi_VN/projects.lang
+++ b/htdocs/langs/vi_VN/projects.lang
@@ -29,9 +29,9 @@ DeleteAProject=Xóa một dự án
 DeleteATask=Xóa một tác vụ
 ConfirmDeleteAProject=Are you sure you want to delete this project?
 ConfirmDeleteATask=Are you sure you want to delete this task?
-OpenedProjects=Open projects
-OpenedTasks=Open tasks
-OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
+OpenedProjects=Opened projects
+OpenedTasks=Opened tasks
+OpportunitiesStatusForOpenedProjects=Opportunities amount of opened projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=Hiển thị dự án
 SetProject=Lập dự án
@@ -47,7 +47,7 @@ TaskTimeSpent=Thời gian đã qua trên tác vụ
 TaskTimeUser=Người dùng
 TaskTimeNote=Ghi chú
 TaskTimeDate=Ngày
-TasksOnOpenedProject=Tasks on open projects
+TasksOnOpenedProject=Tác vụ đã mở trong dự án
 WorkloadNotDefined=Khối lượng công việc chưa xác định
 NewTimeSpent=Thời gian đã qua mới
 MyTimeSpent=Thời gian đã qua của tôi
@@ -58,6 +58,7 @@ TaskDateEnd=Tác vụ kết thúc ngày
 TaskDescription=Mô tả tác vụ
 NewTask=Tác vụ mới
 AddTask=Tạo tác vụ
+AddTimeSpent=Create time spent
 Activity=Hoạt động
 Activities=Tác vụ/hoạt động
 MyActivities=Tác vụ/hoạt động của tôi
@@ -95,6 +96,7 @@ ValidateProject=Xác nhận dự án
 ConfirmValidateProject=Are you sure you want to validate this project?
 CloseAProject=Đóng dự án
 ConfirmCloseAProject=Are you sure you want to close this project?
+AlsoCloseAProject=Also close project (keep it open if you still need to follow production tasks on it)
 ReOpenAProject=Mở dự án
 ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=Liên lạc dự án
@@ -120,7 +122,7 @@ CloneProjectFiles=Nhân bản dự án được gắn các tập tin
 CloneTaskFiles=Nhân bản (các) tác vụ gắn với (các) tập tin (nếu tác vụ đã nhân bản)
 CloneMoveDate=Update project/tasks dates from now?
 ConfirmCloneProject=Are you sure to clone this project?
-ProjectReportDate=Thay đổi ngày tác vụ theo ngày bắt đầu dự án
+ProjectReportDate=Change task dates according to new project start date
 ErrorShiftTaskDate=Không thể dịch chuyển ngày của tác vụ theo ngày bắt đầu của dự án mới
 ProjectsAndTasksLines=Các dự án và tác vụ
 ProjectCreatedInDolibarr=Dự án %s đã được tạo
@@ -177,9 +179,9 @@ ProjectsStatistics=Statistics on projects/leads
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 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.
-OpenedProjectsByThirdparties=Open projects by thirdparties
+OpenedProjectsByThirdparties=Opened projects by thirdparties
 OnlyOpportunitiesShort=Only opportunities
-OpenedOpportunitiesShort=Open opportunities
+OpenedOpportunitiesShort=Opened opportunities
 NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount
diff --git a/htdocs/langs/vi_VN/propal.lang b/htdocs/langs/vi_VN/propal.lang
index 345907b75a7..f8db7b44873 100644
--- a/htdocs/langs/vi_VN/propal.lang
+++ b/htdocs/langs/vi_VN/propal.lang
@@ -3,7 +3,7 @@ Proposals=Đơn hàng đề xuất
 Proposal=Đơn hàng đề xuất
 ProposalShort=Đơn hàng đề xuất
 ProposalsDraft=Dự thảo đơn hàng đề xuất
-ProposalsOpened=Open commercial proposals
+ProposalsOpened=Đơn hàng đề xuất đã mở
 Prop=Đơn hàng đề xuất
 CommercialProposal=Đơn hàng đề xuất
 ProposalCard=Thẻ đơn hàng đề xuất
@@ -26,9 +26,9 @@ AmountOfProposalsByMonthHT=Số tiền theo tháng (chưa thuế)
 NbOfProposals=Số lượng đơn hàng đề xuất
 ShowPropal=Hiện đơn hàng đề xuất
 PropalsDraft=Dự thảo
-PropalsOpened=Mở
+PropalsOpened=Đã mở
 PropalStatusDraft=Dự thảo (cần được xác nhận)
-PropalStatusValidated=Xác nhận (đề xuất mở)
+PropalStatusValidated=Validated (proposal is opened)
 PropalStatusSigned=Đã ký (cần ra hóa đơn)
 PropalStatusNotSigned=Không ký (đã đóng)
 PropalStatusBilled=Đã ra hóa đơn
diff --git a/htdocs/langs/vi_VN/stocks.lang b/htdocs/langs/vi_VN/stocks.lang
index aaac3d578d5..cfa50d6a236 100644
--- a/htdocs/langs/vi_VN/stocks.lang
+++ b/htdocs/langs/vi_VN/stocks.lang
@@ -22,13 +22,15 @@ Movements=Danh sách chuyển kho
 ErrorWarehouseRefRequired=Tên tài liệu tham khảo kho là cần thiết
 ListOfWarehouses=Danh sách kho
 ListOfStockMovements=Danh sách chuyển động kho
+StockMovementForId=Movement ID %d
+ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Warehouses area
 Location=Đến từ
 LocationSummary=Ngắn vị trí tên
 NumberOfDifferentProducts=Số lượng sản phẩm khác nhau
 NumberOfProducts=Tổng số sản phẩm
-LastMovement=Chuyển động mới
-LastMovements=Chuyển kho cuối
+LastMovement=Latest movement
+LastMovements=Latest movements
 Units=Đơn vị
 Unit=Đơn vị
 StockCorrection=Tồn kho chính xác
@@ -140,3 +142,4 @@ ProductStockWarehouseCreated=Stock limit for alert and desired optimal stock cor
 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
diff --git a/htdocs/langs/vi_VN/supplier_proposal.lang b/htdocs/langs/vi_VN/supplier_proposal.lang
index 3edc11ceca5..1b5f51a415d 100644
--- a/htdocs/langs/vi_VN/supplier_proposal.lang
+++ b/htdocs/langs/vi_VN/supplier_proposal.lang
@@ -8,7 +8,7 @@ SearchRequest=Find a request
 DraftRequests=Draft requests
 SupplierProposalsDraft=Draft supplier proposals
 LastModifiedRequests=Latest %s modified price requests
-RequestsOpened=Open price requests
+RequestsOpened=Opened price requests
 SupplierProposalArea=Supplier proposals area
 SupplierProposalShort=Supplier proposal
 SupplierProposals=Supplier proposals
@@ -23,7 +23,7 @@ ConfirmValidateAsk=Are you sure you want to validate this price request under na
 DeleteAsk=Delete request
 ValidateAsk=Validate request
 SupplierProposalStatusDraft=Dự thảo (cần được xác nhận)
-SupplierProposalStatusValidated=Validated (request is open)
+SupplierProposalStatusValidated=Validated (request is opened)
 SupplierProposalStatusClosed=Đã đóng
 SupplierProposalStatusSigned=Accepted
 SupplierProposalStatusNotSigned=Đã từ chối
diff --git a/htdocs/langs/vi_VN/suppliers.lang b/htdocs/langs/vi_VN/suppliers.lang
index 2979278c0aa..5fba2127274 100644
--- a/htdocs/langs/vi_VN/suppliers.lang
+++ b/htdocs/langs/vi_VN/suppliers.lang
@@ -9,7 +9,7 @@ ShowSupplier=Hiện nhà cung cấp
 OrderDate=Ngày đặt hàng
 BuyingPriceMin=Best buying price
 BuyingPriceMinShort=Best buying price
-TotalBuyingPriceMinShort=Total of subproducts buying prices
+TotalBuyingPriceMinShort=Giá mua của tổng sản phẩm con
 TotalSellingPriceMinShort=Total of subproducts selling prices
 SomeSubProductHaveNoPrices=Một vài sản phẩm con không có giá xác định
 AddSupplierPrice=Add buying price
@@ -24,10 +24,10 @@ ExportDataset_fournisseur_1=Danh sách hóa đơn và chi tiết hóa đơn củ
 ExportDataset_fournisseur_2=Thanh toán và hóa đơn của nhà cung cấp
 ExportDataset_fournisseur_3=Đơn hàng và chi tiết đơn hàng của nhà cung cấp
 ApproveThisOrder=Duyệt đơn hàng này
-ConfirmApproveThisOrder=Bạn có chắc muốn duyệt đơn hàng <b>%s</b> ?
+ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b>?
 DenyingThisOrder=Từ chối đơn hàng này
-ConfirmDenyingThisOrder=Bạn có chắc bạn muốn từ chối đơn hàng này <b>%s</b> ?
-ConfirmCancelThisOrder=Bạn có chắc muốn hủy bỏ đơn hàng này <b>%s</b> ?
+ConfirmDenyingThisOrder=Are you sure you want to deny this order <b>%s</b>?
+ConfirmCancelThisOrder=Are you sure you want to cancel this order <b>%s</b>?
 AddSupplierOrder=Tạo đơn hàng nhà cung cấp
 AddSupplierInvoice=Tạo hóa đơn nhà cung cấp
 ListOfSupplierProductForSupplier=Danh sách sản phẩm và giá cho nhà cung <b>%s</b>
@@ -41,3 +41,4 @@ DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Wrong quality
 ReputationForThisProduct=Reputation
 BuyerName=Buyer name
+AllProductServicePrices=All product / service prices
diff --git a/htdocs/langs/vi_VN/users.lang b/htdocs/langs/vi_VN/users.lang
index f3d10697830..237f0603b72 100644
--- a/htdocs/langs/vi_VN/users.lang
+++ b/htdocs/langs/vi_VN/users.lang
@@ -36,7 +36,7 @@ AdministratorDesc=Quản trị
 DefaultRights=Quyền mặc định
 DefaultRightsDesc=Xác định ở đây các quyền <u>mặc định</u> được tự động cấp cho người dùng <u>được tạo mới</u> (Xem trên thẻ người dùng để thay đổi quyền của người dùng hiện tại).
 DolibarrUsers=Dolibarr users
-LastName=Last Name
+LastName=Họ
 FirstName=Họ
 ListOfGroups=Danh sách nhóm
 NewGroup=Nhóm mới
diff --git a/htdocs/langs/vi_VN/withdrawals.lang b/htdocs/langs/vi_VN/withdrawals.lang
index 79515a36d23..8c483416a79 100644
--- a/htdocs/langs/vi_VN/withdrawals.lang
+++ b/htdocs/langs/vi_VN/withdrawals.lang
@@ -24,6 +24,7 @@ WithdrawStatistics=Direct debit payment statistics
 WithdrawRejectStatistics=Direct debit payment reject statistics
 LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
+WithdrawRequestsDone=%s direct debit payment requests recorded
 ThirdPartyBankCode=Mã ngân hàng của bên thứ ba
 NoInvoiceCouldBeWithdrawed=Không có hoá đơn Đã rút thành công. Kiểm tra hóa đơn được trên công ty với một BAN hợp lệ.
 ClassCredited=Phân loại ghi
@@ -76,8 +77,8 @@ RUM=UMR
 RUMLong=Unique Mandate Reference
 RUMWillBeGenerated=UMR number will be generated once bank account information are saved
 WithdrawMode=Direct debit mode (FRST or RECUR)
-WithdrawRequestAmount=Withdraw request amount:
-WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil amount.
+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
diff --git a/htdocs/langs/zh_CN/accountancy.lang b/htdocs/langs/zh_CN/accountancy.lang
index 66818bb7d8f..eed32904230 100644
--- a/htdocs/langs/zh_CN/accountancy.lang
+++ b/htdocs/langs/zh_CN/accountancy.lang
@@ -194,6 +194,8 @@ ChangeBinding=Change the binding
 
 ## Admin
 ApplyMassCategories=应用批量类别
+AddAccountFromBookKeepingWithNoCategories=Add acccount already used with no categories
+CategoryDeleted=Category for the accounting account has been removed
 
 ## Export
 Exports=导出
@@ -209,6 +211,7 @@ Modelcsv_ciel=向 Sage Ciel Compta 或 Compta Evolution导出
 Modelcsv_quadratus=向 Quadratus QuadraCompta导出
 Modelcsv_ebp=向 EBP导出
 Modelcsv_cogilog=导出到 Cogilog
+ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
 InitAccountancy=初始化会计
diff --git a/htdocs/langs/zh_CN/admin.lang b/htdocs/langs/zh_CN/admin.lang
index 13f8200516f..f4006b35a92 100644
--- a/htdocs/langs/zh_CN/admin.lang
+++ b/htdocs/langs/zh_CN/admin.lang
@@ -9,14 +9,20 @@ VersionDevelopment=开发
 VersionUnknown=未知
 VersionRecommanded=推荐
 FileCheck=Files integrity checker
-FileCheckDesc=This tool allows you to check the integrity of files of your application, comparing each files with the official ones. You can use this tool to detect if some files were modified by a hacker for example.
+FileCheckDesc=This tool allows you to check the integrity of files and setup of your application, comparing each files with the official ones. 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.
+FileIntegrityIsStrictlyConformedWithReference=Files integrity is strictly conformed with the reference.
+FileIntegrityIsOkButFilesWereAdded=Files integrity check has passed, however some new files were added.
+FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified, removed or added.
+GlobalChecksum=Global checksum
 MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
 LocalSignature=Embedded local signature (less reliable)
 RemoteSignature=Remote distant signature (more reliable)
 FilesMissing=缺少文件
 FilesUpdated=已更新的文件
+FilesModified=Modified Files
+FilesAdded=Added Files
 FileCheckDolibarr=Check integrity of application files
-AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from a certified package
+AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from an official package
 XmlNotFound=Xml Integrity File of application not found
 SessionId=会话 ID
 SessionSaveHandler=会话保存处理程序
@@ -185,7 +191,9 @@ BoxesDesc=小组件展示一些可以添加到您个人页面的信息。您可
 OnlyActiveElementsAreShown=仅显示 <a href="%s">已启用模块</a> 的元素。
 ModulesDesc=激活并启用Dolibarr定义的功能模块。部分模块启用后，需要您给予相应用户权限他才能使用到该模块。点击 on/off 来启用/禁用功能/模块。
 ModulesMarketPlaceDesc=你能在外部互联网查找到并下载更多的功能模块...
-ModulesMarketPlaces=更多模块...
+ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
+ModulesMarketPlaces=Find external modules...
+GoModuleSetupArea=To deploy/install a new module, go onto the Module setup area at <a href="%s">%s</a>.
 DoliStoreDesc=DoliStore，为 Dolibarr 的 ERP/CRM 的外部模块官方市场
 DoliPartnersDesc=List of companies providing custom developed modules or features (Note: anyone experienced in PHP programming can provide custom development for an open source project)
 WebSiteDesc=参考网址查找更多模块...
@@ -276,21 +284,22 @@ ModuleFamilyInterface=系统外部扩展接口
 MenuHandlers=菜单处理程序
 MenuAdmin=菜单编辑器
 DoNotUseInProduction=请勿用于生产环境
-ThisIsProcessToFollow=以下为软体的安装过程：
-ThisIsAlternativeProcessToFollow=这是另一种设置的过程：
+ThisIsProcessToFollow=This is steps to process:
+ThisIsAlternativeProcessToFollow=This is an alternative setup to process manually:
 StepNb=第 %s 步
 FindPackageFromWebSite=搜索你需要的功能(例如在官方 %s )。
 DownloadPackageFromWebSite=下载安装包 (例如从官方网站上 %s)
-UnpackPackageInDolibarrRoot=解压缩安装包到 Dolibarr 的服务器中 <b>%s</b> 模块的目录下
-SetupIsReadyForUse=安装完成，Dolibarr 已可以使用此新组件。
-NotExistsDirect=未设置可选备用根目录。<br>
-InfDirAlt=自 v3 版本开始，Dolibarr 可以定义备用根目录地址。这令您可以将插件和自定义模板保存至同一位置。<br>您只需在Dolibarr的根目录下创建一个目录(例如custom)。<br>
-InfDirExample=<br>然后在 conf.php 中声明它<br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>*这些行已经作为注释行存在，移除注释符"#"即可生效。
+UnpackPackageInDolibarrRoot=Unpack the packaged files into server directory dedicated to Dolibarr: <b>%s</b>
+UnpackPackageInModulesRoot=To deploy/install an external module, unpack the packaged files into the server directory dedicated to modules: <b>%s</b>
+SetupIsReadyForUse=Module deployment is finished. You must however enable and setup the module in your application by going on the page to setup modules: <a href="%s">%s</a>.
+NotExistsDirect=The alternative root directory is not defined to an existing directory.<br>
+InfDirAlt=Since version 3, it is possible to define an alternative root directory. This allows you to store, into a dedicated directory, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
+InfDirExample=<br>Then declare it in the file <strong>conf.php</strong><br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>If these lines are commented with "#", to enable them, just uncomment by removing the "#" character.
 YouCanSubmitFile=在这一步中，你可以使用 选择模块文件 来发送包
 CurrentVersion=Dolibarr 当前版本
 CallUpdatePage=升级更新数据库和数据请到: %s.
 LastStableVersion=最新稳定版
-LastActivationDate=Last activation date
+LastActivationDate=Latest activation date
 UpdateServerOffline=离线升级服务器
 GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s. <br><b>{000000@x}</b> same as previous but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
 GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
@@ -373,11 +382,11 @@ ExtrafieldCheckBox=复选框
 ExtrafieldRadio=单选框
 ExtrafieldCheckBoxFromList= 表格的勾选框
 ExtrafieldLink=连接到项目
-ExtrafieldParamHelpselect=字符列表类似于 key,value<br><br> 举例说明 : <br>1,value1<br>2,value2<br>3,value3<br>等等等...<br><br>为了得到字符列表取决于以下：<br>1,value1|parent_list_code:parent_key<br>2,value2|parent_list_code:parent_key
+ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list :<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list :<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=字符列表类似于 key,value<br><br> 举例说明 :: <br>1,value1<br>2,value2<br>3,value3<br>等等等...
 ExtrafieldParamHelpradio=字符列表类似于 key,value<br><br> 举例说明 :: <br>1,value1<br>2,value2<br>3,value3<br>等等等...
-ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
-ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
+ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Example : Societe:societe/class/societe.class.php
 LibraryToBuildPDF=已使用资料库以支持生成PDF文件
 WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
@@ -411,10 +420,11 @@ ModuleCompanyCodePanicum=返回一个空的财务会计科目代码
 ModuleCompanyCodeDigitaria=会计编号取决于客户的编号。代码以C开头，后跟第三方单位的 5 位代码
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
-
+WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<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).
+ClickToShowDescription=Click to show description
 # Modules
 Module0Name=用户和组
-Module0Desc=用户和群组管理模块
+Module0Desc=Users / Employees and Groups management
 Module1Name=合伙人
 Module1Desc=公司和联络人管理(客户、准客户潜在客户...等等)模块
 Module2Name=商业交易
@@ -515,8 +525,8 @@ Module2200Name=动态定价
 Module2200Desc=允许价格的数学表达式
 Module2300Name=计划任务
 Module2300Desc=排定任务管理
-Module2400Name=议程/活动
-Module2400Desc=Follow events or rendez-vous. Record manual events into Agendas or let application logs automatic events for tracking purposes.
+Module2400Name=Events/Agenda
+Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous.
 Module2500Name=电子内容管理
 Module2500Desc=保存和共享文件
 Module2600Name=API/Web 服务 (SOAP 服务器)
@@ -582,7 +592,7 @@ Permission34=删除产品信息
 Permission36=查看/管理隐藏产品
 Permission38=导出产品信息
 Permission41=读取项目和任务(共享的工程和我参与的项目)。还可输入项目所消耗的时间(时间表)
-Permission42=创建/变更项目(公开项目和私人项目)
+Permission42=Create/modify projects (shared project and projects i'm contact for). Can also create tasks and assign users to project and tasks
 Permission44=删除项目(共享的项目和我参与的项目)
 Permission45=导出项目
 Permission61=读取干预
@@ -685,7 +695,7 @@ PermissionAdvanced253=创建/变更内部/外部用户和权限
 Permission254=只能创建/变更外部用户资料
 Permission255=修改其他用户密码
 Permission256=删除或暂时关闭其他用户
-Permission262=扩展权限到所有合伙人(不仅限于与此账户相关联的单位)。对外单位用户无效(他们始终只能访问自己的信息)。
+Permission262=Extend access to all third parties (not only third parties that user is a sale representative).<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 assignement matters).
 Permission271=读取 CA
 Permission272=读取发票
 Permission273=开具发票
@@ -887,7 +897,7 @@ Offset=偏移
 AlwaysActive=此项必须始终保持启用状态
 Upgrade=升级
 MenuUpgrade=升级/扩展
-AddExtensionThemeModuleOrOther=添加扩展(主题、模块...)
+AddExtensionThemeModuleOrOther=Deploy/install external module
 WebServer=网页服务器
 DocumentRootServer=网页服务器的根目录
 DataRootServer=数据文件的目录
@@ -994,7 +1004,7 @@ TriggerAlwaysActive=无论 Dolibarr 的各模块是否启用，此文件中的
 TriggerActiveAsModuleActive=此文件中的触发器将于 <b>%s</b> 模块启用后启用。
 GeneratedPasswordDesc=在此设定新密码的生成规则，如果您选择使用自动生成的密码。
 DictionaryDesc=输入全部参考数据.你能添加你的参数值为默认值。
-ConstDesc=This page allows you to edit all other parameters not available in previous pages. These are mostly reserved parameters for developers or advanced troubleshooting.
+ConstDesc=This page allows you to edit all other parameters not available in previous pages. These are mostly reserved parameters for developers or advanced troubleshooting. For a list of options <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">check here</a>.
 MiscellaneousDesc=所有其他安全相关的参数定义在这里。
 LimitsSetup=范围及精确度
 LimitsDesc=这里您可以设置 Dolibarr 的范围、精度和优化参数。
@@ -1161,10 +1171,6 @@ FreeLegalTextOnOrders=订单中的额外说明文本
 WatermarkOnDraftOrders=为订单草稿添加水印(无则留空)
 ShippableOrderIconInList=如果订单是可以送货的则添加一个标记用于提醒
 BANK_ASK_PAYMENT_BANK_DURING_ORDER=为账单询问银行卡账户
-##### Clicktodial #####
-ClickToDialSetup=点击拨号模块设置
-ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with your clicktodial login (defined on your user card)<br><b>__PASS__</b> that will be replaced with your clicktodial password (defined on your user card).
-##### Bookmark4u #####
 ##### Interventions #####
 InterventionsSetup=干预模块设置
 FreeLegalTextOnInterventions=干预文档中的额外说明文本
@@ -1391,7 +1397,7 @@ SendingsSetup=运输模块设置
 SendingsReceiptModel=运输模板
 SendingsNumberingModules=运输编号模块
 SendingsAbility=支持为客户送货时采用发货单
-NoNeedForDeliveryReceipts=通常发货单同时被用来作为发货清单和收货回执，由客户接收并签字。所以产品收货回执/交付回执是此功能的重复，很少使用。
+NoNeedForDeliveryReceipts=In most cases, shipping sheets are used both as sheets for customer deliveries (list of products to send) and sheets that is received and signed by customer. So product deliveries receipts is a duplicated feature and is rarely activated.
 FreeLegalTextOnShippings=运单中的额外说明文本
 ##### Deliveries #####
 DeliveryOrderNumberingModules=收货回执编号模块
@@ -1471,7 +1477,11 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Set automatically this default value for type of e
 AGENDA_DEFAULT_FILTER_TYPE=Set automatically this type of event into search filter of agenda view
 AGENDA_DEFAULT_FILTER_STATUS=Set automatically this status for events into search filter of agenda view
 AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
-##### ClickToDial #####
+AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
+AGENDA_NOTIFICATION_SOUND=Enable sound notification
+##### Clicktodial #####
+ClickToDialSetup=点击拨号模块设置
+ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with your clicktodial login (defined on your user card)<br><b>__PASS__</b> that will be replaced with your clicktodial password (defined on your user card).
 ClickToDialDesc=This module allows to make phone numbers clickable. A click on this icon will call make your phone to 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.
 ClickToDialUseTelLink=在电话号码上链接 "tel:" 
 ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on same computer than the browser, and called when you click on a link in your browser that start 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.
@@ -1499,10 +1509,11 @@ EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint availa
 ##### API ####
 ApiSetup=API模块设置
 ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
-ApiProductionMode=Enable production mode (this will activate use of a caches for services management)
+ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
 ApiExporerIs=你可浏览 APIs 地址
 OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
 ApiKey=API的Key
+WarningAPIExplorerDisabled=The API explorer has been disabled. API explorer is not required to provide API services. It is a tool for developer to find/test REST APIs. If you need this tool, go into setup of module API REST to activate it.
 ##### Bank #####
 BankSetupModule=银行模块设置
 FreeLegalTextOnChequeReceipts=支票回执中的额外说明文本
@@ -1571,7 +1582,7 @@ BackupDumpWizard=数据库转储备份向导
 SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
 SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is only manual steps a privileged user can do.
 InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
-ConfFileMuseContainCustom=Installing an external module from application save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to have option<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
+ConfFileMuseContainCustom=Installing an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=当鼠标经过表格明细时高亮显示
 HighlightLinesColor=Highlight color of the line when the mouse passes over (keep empty for no highlight)
 TextTitleColor=页面标题颜色
@@ -1601,6 +1612,7 @@ FixTZ=时区修复
 FillFixTZOnlyIfRequired=例：+2 (只有问题发生时才填写)
 ExpectedChecksum=预计校验
 CurrentChecksum=当前校验
+ForcedConstants=Required constant values
 MailToSendProposal=发送客户报价
 MailToSendOrder=发送客户订单
 MailToSendInvoice=发送客户发票
@@ -1609,13 +1621,14 @@ MailToSendIntervention=发送干预
 MailToSendSupplierRequestForQuotation=发送供应商报价请求
 MailToSendSupplierOrder=发送采购订单
 MailToSendSupplierInvoice=发送供应商发票
+MailToSendContract=To send a contract
 MailToThirdparty=To send email from third party page
 ByDefaultInList=默认显示列表视图
-YouUseLastStableVersion=您正在使用最新稳定版
+YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
 TitleExampleForMaintenanceRelease=Example of message you can use to announce this maintenance release (feel free to use it on your web sites)
-ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. You can download it from the download area of http://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.
-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, nor data structure change is present into this version. You can download it from the download area of http://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.
+ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. 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.
+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, nor data structure change is present into 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, you can enter here rule to have price for each level autocalculated according to price of first level, so you will have to enter only price for first level on each product. This page is here to save you time and can be usefull only if your prices for each leve are relative to first level. You can ignore this page in most cases.
 ModelModulesProduct=产品文件模板
 ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
diff --git a/htdocs/langs/zh_CN/banks.lang b/htdocs/langs/zh_CN/banks.lang
index ec000c72ca7..70f74c8a3c8 100644
--- a/htdocs/langs/zh_CN/banks.lang
+++ b/htdocs/langs/zh_CN/banks.lang
@@ -74,13 +74,13 @@ Conciliate=调和
 Conciliation=和解
 ReconciliationLate=Reconciliation late
 IncludeClosedAccount=包括失效账户
-OnlyOpenedAccount=仅有效账户
+OnlyOpenedAccount=只有开立帐户
 AccountToCredit=帐户信用
 AccountToDebit=帐户转帐
 DisableConciliation=此帐户的禁用和解功能
 ConciliationDisabled=和解功能禁用
 LinkedToAConciliatedTransaction=Linked to a conciliated entry
-StatusAccountOpened=打开
+StatusAccountOpened=启动
 StatusAccountClosed=禁用
 AccountIdShort=数字
 LineRecord=交易
diff --git a/htdocs/langs/zh_CN/bills.lang b/htdocs/langs/zh_CN/bills.lang
index c23cf95e119..7af8cc4a501 100644
--- a/htdocs/langs/zh_CN/bills.lang
+++ b/htdocs/langs/zh_CN/bills.lang
@@ -4,10 +4,10 @@ Bills=发票
 BillsCustomers=客户发票
 BillsCustomer=客户发票
 BillsSuppliers=供应商发票
-BillsCustomersUnpaid=未支付的客户发票
-BillsCustomersUnpaidForCompany=客户未支付发票 %s
-BillsSuppliersUnpaid=未支付的供应商发票
-BillsSuppliersUnpaidForCompany=供应商 %s 的未支付发票
+BillsCustomersUnpaid=客户未付发票
+BillsCustomersUnpaidForCompany=Unpaid customer invoices for %s
+BillsSuppliersUnpaid=未付供应商发票
+BillsSuppliersUnpaidForCompany=Unpaid supplier invoices for %s
 BillsLate=逾期付款
 BillsStatistics=客户发票统计
 BillsStatisticsSuppliers=供应商发票统计
@@ -62,8 +62,8 @@ PaymentsBack=付款
 paymentInInvoiceCurrency=in invoices currency
 PaidBack=已退款
 DeletePayment=删除付款
-ConfirmDeletePayment=Are you sure you want to delete this payment?
-ConfirmConvertToReduc=Do you want to convert this credit note or deposit 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.
+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.
 SupplierPayments=供应商付款
 ReceivedPayments=收到的付款
 ReceivedCustomersPayments=收到客户付款
@@ -78,6 +78,7 @@ PaymentMode=付款方式
 PaymentTypeDC=Debit/Credit Card
 PaymentTypePP=PayPal
 IdPaymentMode=付款方式 (id)
+CodePaymentMode=Payment type (code)
 LabelPaymentMode=付款方式 (标签)
 PaymentModeShort=付款方式
 PaymentTerm=付款条件
@@ -102,9 +103,10 @@ SearchACustomerInvoice=搜索客户发票
 SearchASupplierInvoice=搜索供应商发票
 CancelBill=取消发票
 SendRemindByMail=通过电子邮件发送提醒
-DoPayment=执行付款
-DoPaymentBack=执行付款
+DoPayment=Enter payment
+DoPaymentBack=Enter refund
 ConvertToReduc=转换到未来的折扣
+ConvertExcessReceivedToReduc=Convert excess received into future discount
 EnterPaymentReceivedFromCustomer=输入从客户收到的付款
 EnterPaymentDueToCustomer=为客户创建付款延迟
 DisabledBecauseRemainderToPayIsZero=禁用，因为未支付金额为0
@@ -113,22 +115,24 @@ BillStatus=发票状态
 StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=草案(需要确认)
 BillStatusPaid=已支付
-BillStatusPaidBackOrConverted=已支付/已转换为折扣
+BillStatusPaidBackOrConverted=Refund or converted into discount
 BillStatusConverted=已支付 (等待最终发票)
 BillStatusCanceled=已丢弃
 BillStatusValidated=已确认 (需要付款)
 BillStatusStarted=开始
 BillStatusNotPaid=未支付
+BillStatusNotRefunded=Not refunded
 BillStatusClosedUnpaid=已关闭 (未支付)
 BillStatusClosedPaidPartially=已支付 (部分)
 BillShortStatusDraft=草稿
 BillShortStatusPaid=已支付
-BillShortStatusPaidBackOrConverted=处理完毕
+BillShortStatusPaidBackOrConverted=Refund or converted
 BillShortStatusConverted=处理完毕
 BillShortStatusCanceled=已丢弃
 BillShortStatusValidated=已确认
 BillShortStatusStarted=开始
 BillShortStatusNotPaid=未支付
+BillShortStatusNotRefunded=Not refunded
 BillShortStatusClosedUnpaid=禁用
 BillShortStatusClosedPaidPartially=已支付 (部分)
 PaymentStatusToValidShort=需要确认
@@ -149,14 +153,14 @@ NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified
 FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
 NotARecurringInvoiceTemplate=Not a recurring template invoice
 NewBill=新建发票
-LastBills=最近的 %s 份发票
-LastCustomersBills=最近的 %s 份客户发票
-LastSuppliersBills=最近的 %s 份供应商发票
+LastBills=Latest %s invoices
+LastCustomersBills=Latest %s customer invoices
+LastSuppliersBills=Latest %s supplier invoices
 AllBills=全部发票
 OtherBills=其他发票
 DraftBills=发票草稿
-CustomersDraftInvoices=客户发票草稿
-SuppliersDraftInvoices=供应商发票草稿
+CustomersDraftInvoices=Customer draft invoices
+SuppliersDraftInvoices=Supplier draft invoices
 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>?
@@ -203,7 +207,7 @@ AlreadyPaidNoCreditNotesNoDeposits=已支付 (无信用记录及存款)
 Abandoned=已丢弃
 RemainderToPay=未付金额
 RemainderToTake=应付金额
-RemainderToPayBack=应退金额
+RemainderToPayBack=Remaining amount to refund
 Rest=待办
 AmountExpected=索赔额
 ExcessReceived=找零
@@ -270,6 +274,7 @@ Deposit=存款
 Deposits=存款
 DiscountFromCreditNote=从信用记录折扣 %s
 DiscountFromDeposit=从存款发票 %s 付款
+DiscountFromExcessReceived=Payments from excess received of invoice %s
 AbsoluteDiscountUse=这种信用值可以在发票被确认前使用
 CreditNoteDepositUse=Invoice must be validated to use this kind of credits
 NewGlobalDiscount=新的绝对折扣
@@ -277,8 +282,8 @@ NewRelativeDiscount=新的相对折扣
 NoteReason=备注/原因
 ReasonDiscount=原因
 DiscountOfferedBy=授予人
-DiscountStillRemaining=折扣尚存
-DiscountAlreadyCounted=折扣已经结算
+DiscountStillRemaining=Discounts available
+DiscountAlreadyCounted=Discounts already consumed
 BillAddress=账单地址
 HelpEscompte=这是给予客户优惠折扣，因为客户在付款条件日期前已经付清全款。
 HelpAbandonBadCustomer=这一数额已被放弃（客户说是一个坏的客户），并作为一个特殊的松散考虑。
@@ -331,10 +336,12 @@ 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
 # PaymentConditions
 Statut=状态
-PaymentConditionShortRECEP=即时
-PaymentConditionRECEP=即时
+PaymentConditionShortRECEP=Due Upon Receipt
+PaymentConditionRECEP=Due Upon Receipt
 PaymentConditionShort30D=30天
 PaymentCondition30D=30天
 PaymentConditionShort30DENDMONTH=30天后的那个月底
@@ -349,6 +356,14 @@ 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
 FixAmount=固定金额
 VarAmount=可变金额(%% tot.)
 # PaymentType
@@ -418,7 +433,7 @@ ChequeDeposits=支票存款
 Cheques=支票
 DepositId=Id deposit
 NbCheque=Number of checks
-CreditNoteConvertedIntoDiscount=此信用记录或存款发票已经转换为 %s
+CreditNoteConvertedIntoDiscount=This %s has been converted into %s
 UsBillingContactAsIncoiveRecipientIfExist=使用客户账单联络方式而不是合伙人的联络方式作为发票的接收人
 ShowUnpaidAll=显示所有未付发票
 ShowUnpaidLateOnly=只显示超时未付发票
diff --git a/htdocs/langs/zh_CN/boxes.lang b/htdocs/langs/zh_CN/boxes.lang
index 476d96679c3..7748403b6d9 100644
--- a/htdocs/langs/zh_CN/boxes.lang
+++ b/htdocs/langs/zh_CN/boxes.lang
@@ -25,8 +25,8 @@ BoxTitleLastSuppliers=最近登记的 %s 位供应商
 BoxTitleLastModifiedSuppliers=最近变更的 %s 位供应商
 BoxTitleLastModifiedCustomers=最近变更的 %s 位客户
 BoxTitleLastCustomersOrProspects=最近的 %s 位客户或准客户
-BoxTitleLastCustomerBills=最近的 %s 份客户发票
-BoxTitleLastSupplierBills=最近的 %s 份供应商发票
+BoxTitleLastCustomerBills=Latest %s customer invoices
+BoxTitleLastSupplierBills=Latest %s supplier invoices
 BoxTitleLastModifiedProspects=最近变更的 %s 位准客户
 BoxTitleLastModifiedMembers=新进 %s 位会员
 BoxTitleLastFicheInter=最近变更的 %s 条干预
@@ -51,12 +51,12 @@ ClickToAdd=点此添加
 NoRecordedCustomers=空空如也——没有记录
 NoRecordedContacts=无联系人记录
 NoActionsToDo=无待办事项
-NoRecordedOrders=空空如也——没有销售合同记录
+NoRecordedOrders=No recorded customer orders
 NoRecordedProposals=空空如也——没有报价单记录
-NoRecordedInvoices=空空如也——没有销售账单记录
-NoUnpaidCustomerBills=没有未支付客户发票
-NoUnpaidSupplierBills=无未支付的采购账单
-NoModifiedSupplierBills=空空如也——没有采购账单记录
+NoRecordedInvoices=No recorded customer invoices
+NoUnpaidCustomerBills=No unpaid customer invoices
+NoUnpaidSupplierBills=No unpaid supplier invoices
+NoModifiedSupplierBills=No recorded supplier invoices
 NoRecordedProducts=空空如也——没有产品/服务记录
 NoRecordedProspects=空空如也——没有潜在客户记录
 NoContractedProducts=无签订合同的产品
diff --git a/htdocs/langs/zh_CN/companies.lang b/htdocs/langs/zh_CN/companies.lang
index c95018b3285..97be4984480 100644
--- a/htdocs/langs/zh_CN/companies.lang
+++ b/htdocs/langs/zh_CN/companies.lang
@@ -78,6 +78,10 @@ VATIsNotUsed=不含增值税
 CopyAddressFromSoc=Fill address with third party address
 ThirdpartyNotCustomerNotSupplierSoNoRef=合伙人无论客户或供应商，都没有对象可参考
 PaymentBankAccount=Payment bank account
+OverAllProposals=Total proposals
+OverAllOrders=Total orders
+OverAllInvoices=Total invoices
+OverAllSupplierProposals=Total price requests
 ##### Local Taxes #####
 LocalTax1IsUsed=使用第二税率
 LocalTax1IsUsedES= 使用可再生能源
@@ -239,6 +243,10 @@ ProfId3RU=Prof Id 3 (KPP)
 ProfId4RU=Prof Id 4 (OKPO)
 ProfId5RU=-
 ProfId6RU=-
+ProfId1DZ=钢筋混凝土
+ProfId2DZ=Art.
+ProfId3DZ=NIF
+ProfId4DZ=NIS
 VATIntra=增值税号码
 VATIntraShort=增值税号码
 VATIntraSyntaxIsValid=语法是有效的
@@ -382,8 +390,9 @@ ListCustomersShort=客户列表
 ThirdPartiesArea=合伙人信息区
 LastModifiedThirdParties=最近变更的 %s 位合伙人
 UniqueThirdParties=合伙人小计
-InActivity=打开
+InActivity=启动
 ActivityCeased=禁用
+ThirdPartyIsClosed=Third party is closed
 ProductsIntoElements= %s 的中产品/服务列表
 CurrentOutstandingBill=当前优质账单
 OutstandingBill=优质账单最大值
@@ -396,7 +405,7 @@ MergeThirdparties=合并合伙人
 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 so you will be able to delete the duplicate one.
 ThirdpartiesMergeSuccess=合伙人已合并
 SaleRepresentativeLogin=销售代表登陆
-SaleRepresentativeFirstname=销售代表名字
-SaleRepresentativeLastname=销售代表姓氏
+SaleRepresentativeFirstname=First name of sales representative
+SaleRepresentativeLastname=Last name of sales representative
 ErrorThirdpartiesMerge=有一个错误，当删除第三方。请检查日志。改变已被恢复。
 NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/zh_CN/compta.lang b/htdocs/langs/zh_CN/compta.lang
index 8e4e7fd733c..158bee98f0b 100644
--- a/htdocs/langs/zh_CN/compta.lang
+++ b/htdocs/langs/zh_CN/compta.lang
@@ -65,6 +65,7 @@ PaymentSocialContribution=社会/财政税款
 PaymentVat=增值税纳税
 ListPayment=付款列表
 ListOfCustomerPayments=客户付款列表
+ListOfSupplierPayments=供应商付款的名单
 DateStartPeriod=起始日期时期
 DateEndPeriod=结束日期时期
 newLT1Payment=New tax 2 payment
@@ -81,7 +82,7 @@ LT2PaymentES=IRPF付款
 LT2PaymentsES=IRPF付款
 VATPayment=销售税款
 VATPayments=销售税款
-VATRefund=Sales tax refund Refund
+VATRefund=Sales tax refund
 Refund=Refund
 SocialContributionsPayments=社会/财政税款
 ShowVatPayment=显示增值税纳税
@@ -194,7 +195,7 @@ CloneTax=复制 social/fiscal tax
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
 CloneTaxForNextMonth=复制下一个月
 SimpleReport=简报
-AddExtraReport=完整报告
+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
diff --git a/htdocs/langs/zh_CN/cron.lang b/htdocs/langs/zh_CN/cron.lang
index 591bfe33959..720a516ec5a 100644
--- a/htdocs/langs/zh_CN/cron.lang
+++ b/htdocs/langs/zh_CN/cron.lang
@@ -17,14 +17,14 @@ CronMethodDoesNotExists=Class类 %s 没有包含任何方法 %s
 # Menu
 EnabledAndDisabled=启用和禁用
 # Page list
-CronLastOutput=最后运行结果
-CronLastResult=最后结果代码
+CronLastOutput=Latest run output
+CronLastResult=Latest result code
 CronCommand=命令
 CronList=计划任务
 CronDelete=删除计划任务
-CronConfirmDelete=您确定想要删除计划任务吗？
+CronConfirmDelete=Are you sure you want to delete these scheduled jobs?
 CronExecute=安排计划工作
-CronConfirmExecute=你确定想要现在执行这些计划工作吗？
+CronConfirmExecute=Are you sure you want to execute these scheduled jobs now?
 CronInfo=计划工作模式允许执行计划好了的工作
 CronTask=工作
 CronNone=无
diff --git a/htdocs/langs/zh_CN/errors.lang b/htdocs/langs/zh_CN/errors.lang
index a82ada2f894..5cfebca3dcb 100644
--- a/htdocs/langs/zh_CN/errors.lang
+++ b/htdocs/langs/zh_CN/errors.lang
@@ -11,6 +11,7 @@ ErrorLoginAlreadyExists=登陆%s已经存在。
 ErrorGroupAlreadyExists=组%s已经存在。
 ErrorRecordNotFound=记录没有找到。
 ErrorFailToCopyFile=无法复制文件<b>'%s'</b>成<b>'%s'。</b>
+ErrorFailToCopyDir=Failed to copy directory '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToRenameFile=无法重新命名为<b>“%s'</b>文件<b>'%s'。</b>
 ErrorFailToDeleteFile=无法删除文件<b>'%s'</b>的。
 ErrorFailToCreateFile=无法创建文件<b>'%s'</b>的。
@@ -115,7 +116,7 @@ ErrorNoActivatedBarcode=没有激活的条码类型
 ErrUnzipFails=%s 无法解压缩与解压缩
 ErrNoZipEngine=PHP没有引擎来解压缩文件%s
 ErrorFileMustBeADolibarrPackage=%s 文件必须是Dolibarr zip格式包
-ErrorFileRequired=它需要一个Dolibarr格式包文件
+ErrorModuleFileRequired=You must select a Dolibarr module package file
 ErrorPhpCurlNotInstalled=PHP Curl没有安装，这需要与支付宝协调
 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
@@ -170,14 +171,19 @@ ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
 ErrorFileMustHaveFormat=File must have format %s
 ErrorSupplierCountryIsNotDefined=此供应商国是没有定义。正确的这第一。
 ErrorsThirdpartyMerge=两条记录合并失败。请求已取消。
-ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enougth for product %s to add it into a new order.
-ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enougth for product %s to add it into a new invoice.
-ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enougth for product %s to add it into a new shipment.
-ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enougth for product %s to add it into a new proposal.
-ErrorFailedToLoadLoginFileForMode=Failed to get the login file for mode '%s'.
+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 bank 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>
 
 # 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.
diff --git a/htdocs/langs/zh_CN/holiday.lang b/htdocs/langs/zh_CN/holiday.lang
index 684460e5d08..4d3dbb300f3 100644
--- a/htdocs/langs/zh_CN/holiday.lang
+++ b/htdocs/langs/zh_CN/holiday.lang
@@ -76,8 +76,9 @@ BoxTitleLastLeaveRequests=最近变更的 %s 份请假申请
 HolidaysMonthlyUpdate=每月更新
 ManualUpdate=手动更新
 HolidaysCancelation=请假申请取消
-EmployeeLastname=雇员姓氏
-EmployeeFirstname=雇员名字
+EmployeeLastname=Employee last name
+EmployeeFirstname=Employee first name
+TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
 
 ## Configuration du Module ##
 LastUpdateCP=最后自动更新请假分配
diff --git a/htdocs/langs/zh_CN/ldap.lang b/htdocs/langs/zh_CN/ldap.lang
index 38947d0b903..061576326ba 100644
--- a/htdocs/langs/zh_CN/ldap.lang
+++ b/htdocs/langs/zh_CN/ldap.lang
@@ -13,8 +13,8 @@ LDAPUsers=在LDAP用户数据库
 LDAPFieldStatus=地位
 LDAPFieldFirstSubscriptionDate=首先认购日期
 LDAPFieldFirstSubscriptionAmount=认购金额拳
-LDAPFieldLastSubscriptionDate=最后认购日期
-LDAPFieldLastSubscriptionAmount=最后认购金额
+LDAPFieldLastSubscriptionDate=Latest subscription date
+LDAPFieldLastSubscriptionAmount=Latest subscription amount
 LDAPFieldSkype=Skype账号
 LDAPFieldSkypeExample=例如 : skype账号
 UserSynchronized=用户同步
diff --git a/htdocs/langs/zh_CN/mails.lang b/htdocs/langs/zh_CN/mails.lang
index 2baba2f90cc..94b27ed94f9 100644
--- a/htdocs/langs/zh_CN/mails.lang
+++ b/htdocs/langs/zh_CN/mails.lang
@@ -35,7 +35,7 @@ MailingStatusSentPartialy=发送部分
 MailingStatusSentCompletely=发送完全
 MailingStatusError=错误
 MailingStatusNotSent=不发送
-MailSuccessfulySent=电子邮件发送成功 (从 %s 到 %s)
+MailSuccessfulySent=Email successfully accepted for delivery (from %s to %s)
 MailingSuccessfullyValidated=通过电子邮件发送成功验证
 MailUnsubcribe=退订
 MailingStatusNotContact=不要再联系
@@ -74,22 +74,28 @@ ResultOfMailSending=结果邮件群发
 NbSelected=Nb selected
 NbIgnored=Nb ignored
 NbSent=Nb 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
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=在文件%s的线
 RecipientSelectionModules=为收件人的选择定义的要求
 MailSelectedRecipients=请选取收件人
 MailingArea=电子邮件区
-LastMailings=最近的 %s 封邮件
+LastMailings=Latest %s emailings
 TargetsStatistics=统计指标
 NbOfCompaniesContacts=唯一联系人/地址
 MailNoChangePossible=为验证电子邮件收件人无法改变
 SearchAMailing=搜索邮件
 SendMailing=发送电子邮件
 SendMail=发送电子邮件
-MailingNeedCommand=出于安全的原因，收发邮件发送是更好地执行命令行。如果你有一个，请问您的服务器管理员启动以下命令给所有收件人发送电子邮件：
+SentBy=发送
+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=但是您可以发送到网上，加入与最大的电子邮件数量值参数MAILING_LIMIT_SENDBYWEB你要发送的会议。
-ConfirmSendingEmailing=If you can't or prefer sending them with your www browser, please confirm you are sure you want to send emailing now from your browser?
+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=注意: 基于安全与超时的原因从web界面发送邮件 <b>%s</b> 收件人在每次发送会话的时间。
 TargetsReset=清除列表
 ToClearAllRecipientsClickHere=点击这里以清除此电子邮件的收件人列表
@@ -144,3 +150,6 @@ AdvTgtCreateFilter=创建筛选
 AdvTgtOrCreateNewFilter=新筛选器的名称
 NoContactWithCategoryFound=分类没有联系人/地址
 NoContactLinkedToThirdpartieWithCategoryFound=分类没有联系人/地址
+OutGoingEmailSetup=Outgoing email setup
+InGoingEmailSetup=Incoming email setup
+
diff --git a/htdocs/langs/zh_CN/main.lang b/htdocs/langs/zh_CN/main.lang
index 05df6331202..604c8d76ad1 100644
--- a/htdocs/langs/zh_CN/main.lang
+++ b/htdocs/langs/zh_CN/main.lang
@@ -63,11 +63,13 @@ ErrorNoVATRateDefinedForSellerCountry=错误，没有增值税税率确定为国
 ErrorNoSocialContributionForSellerCountry=错误, 这个国家未定义社会/财政税类型 '%s'.
 ErrorFailedToSaveFile=错误，无法保存文件。
 ErrorCannotAddThisParentWarehouse=You are trying to add a parent warehouse which is already a child of current one
+MaxNbOfRecordPerPage=Max nb of record per page
 NotAuthorized=You are not authorized to do that.
 SetDate=设置日期
 SelectDate=请选择日期
 SeeAlso=另请参阅 %s
 SeeHere=看这里
+Apply=申请
 BackgroundColorByDefault=默认的背景颜色
 FileRenamed=The file was successfully renamed
 FileUploaded=文件上传成功
@@ -86,7 +88,7 @@ Undefined=未定义
 PasswordForgotten=Password forgotten?
 SeeAbove=见上文
 HomeArea=首页信息状态区
-LastConnexion=最后登陆
+LastConnexion=Latest connection
 PreviousConnexion=上次登陆
 PreviousValue=上一个值
 ConnectedOnMultiCompany=对实体连接
@@ -236,7 +238,7 @@ DateCreation=创建日期
 DateCreationShort=创建日期
 DateModification=变更日期
 DateModificationShort=变更日期
-DateLastModification=最近变更日期
+DateLastModification=Latest modification date
 DateValidation=验证日期
 DateClosing=截止日期
 DateDue=截止日期
@@ -432,7 +434,7 @@ Reportings=报告
 Draft=草稿
 Drafts=草稿
 Validated=验证
-Opened=打开
+Opened=启动
 New=新建
 Discount=折扣
 Unknown=未知
@@ -460,6 +462,7 @@ DeletePicture=删除图片
 ConfirmDeletePicture=确认删除图片吗？
 Login=登陆
 CurrentLogin=当前登陆
+EnterLoginDetail=Enter login details
 January=一月
 February=二月
 March=三月
@@ -597,6 +600,8 @@ SessionName=会议名称
 Method=方法
 Receive=收到
 CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
+ExpectedValue=Expected Value
+CurrentValue=当前值
 PartialWoman=局部的
 TotalWoman=总计
 NeverReceived=从未收到
@@ -753,6 +758,8 @@ RemoveString=Remove string '%s'
 SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
 DirectDownloadLink=Direct download link
 Download=Download
+ActualizeCurrency=Update currency rate
+Fiscalyear=财务年度
 # Week day
 Monday=星期一
 Tuesday=星期二
@@ -787,8 +794,8 @@ SetRef=设置编号
 Select2ResultFoundUseArrows=Some results found. Use arrows to select.
 Select2NotFound=空空如也——没有结果
 Select2Enter=请输入至少
-Select2MoreCharacter=个以上的字符
-Select2MoreCharacters=个以上的字符
+Select2MoreCharacter=or more characters<br /><br /><strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
+Select2MoreCharacters=or more characters<br /><br /><strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
 Select2LoadingMoreResults=正在加载更多结果...
 Select2SearchInProgress=正在搜索...
 SearchIntoThirdparties=合伙人
@@ -809,3 +816,5 @@ SearchIntoContracts=合同
 SearchIntoCustomerShipments=客户运输
 SearchIntoExpenseReports=费用报表
 SearchIntoLeaves=请假
+
+BulkActions=Bulk actions
diff --git a/htdocs/langs/zh_CN/members.lang b/htdocs/langs/zh_CN/members.lang
index f18177323b6..1507995b0da 100644
--- a/htdocs/langs/zh_CN/members.lang
+++ b/htdocs/langs/zh_CN/members.lang
@@ -45,7 +45,7 @@ MemberStatusDraft=草稿(需要验证)
 MemberStatusDraftShort=草稿
 MemberStatusActive=验证（等待订阅）
 MemberStatusActiveShort=验证
-MemberStatusActiveLate=订阅过期
+MemberStatusActiveLate=Subscription expired
 MemberStatusActiveLateShort=过期
 MemberStatusPaid=认购最新
 MemberStatusPaidShort=截至日期
@@ -136,8 +136,8 @@ DocForAllMembersCards=为所有成员生成名片
 DocForOneMemberCards=为特定成员生成名片
 DocForLabels=生成地址表
 SubscriptionPayment=认购款项
-LastSubscriptionDate=最后认购日期
-LastSubscriptionAmount=最后认购金额
+LastSubscriptionDate=Latest subscription date
+LastSubscriptionAmount=Latest subscription amount
 MembersStatisticsByCountries=按国别统计人员
 MembersStatisticsByState=成员由州/省的统计信息
 MembersStatisticsByTown=按村镇统计人员
@@ -149,7 +149,7 @@ MembersByStateDesc=此界面显示按省/市/村镇统计人员的数据。
 MembersByTownDesc=此界面显示按村镇统计人员的数据。
 MembersStatisticsDesc=选择你想读的统计...
 MenuMembersStats=统计
-LastMemberDate=最后会员日期
+LastMemberDate=Latest member date
 Nature=性质
 Public=信息是否公开
 NewMemberbyWeb=增加了新成员。等待批准中
diff --git a/htdocs/langs/zh_CN/orders.lang b/htdocs/langs/zh_CN/orders.lang
index dc9f7a18b28..fce57b2d250 100644
--- a/htdocs/langs/zh_CN/orders.lang
+++ b/htdocs/langs/zh_CN/orders.lang
@@ -39,7 +39,7 @@ StatusOrderRefusedShort=已拒绝
 StatusOrderBilledShort=已到账
 StatusOrderToProcessShort=待处理
 StatusOrderReceivedPartiallyShort=部分收到
-StatusOrderReceivedAllShort=全部收到
+StatusOrderReceivedAllShort=Products received
 StatusOrderCanceled=已取消
 StatusOrderDraft=草稿(需要验证)
 StatusOrderValidated=已验证
@@ -51,7 +51,7 @@ StatusOrderApproved=已批准
 StatusOrderRefused=已拒绝
 StatusOrderBilled=已到账
 StatusOrderReceivedPartially=部分收到
-StatusOrderReceivedAll=全部收到
+StatusOrderReceivedAll=All products received
 ShippingExist=运输存在
 QtyOrdered=订购数量
 ProductQtyInDraft=订单草稿中的产品数量
diff --git a/htdocs/langs/zh_CN/other.lang b/htdocs/langs/zh_CN/other.lang
index 60d7565a5c7..3f8ee552a68 100644
--- a/htdocs/langs/zh_CN/other.lang
+++ b/htdocs/langs/zh_CN/other.lang
@@ -1,8 +1,8 @@
 # Dolibarr language file - Source file is en_US - other
 SecurityCode=验证码
-Calendar=日历
 NumberingShort=N°
 Tools=工具
+TMenuTools=工具
 ToolsDesc=所有没在其他菜单的工具都在这里<br /><br /> 可以通过左边的菜单访问
 Birthday=生日
 BirthdayDate=生日
@@ -43,7 +43,7 @@ Notify_SHIPPING_SENTBYMAIL=通过电子邮件发送送货信息资料
 Notify_MEMBER_VALIDATE=会员验证
 Notify_MEMBER_MODIFY=会员变更
 Notify_MEMBER_SUBSCRIPTION=会员订阅
-Notify_MEMBER_RESILIATE=会员resiliated
+Notify_MEMBER_RESILIATE=Member terminated
 Notify_MEMBER_DELETE=会员删除
 Notify_PROJECT_CREATE=项目创建
 Notify_TASK_CREATE=创建任务
@@ -55,7 +55,6 @@ TotalSizeOfAttachedFiles=所附文件/文档的总大小
 MaxSize=最大尺寸
 AttachANewFile=添加一个新附件
 LinkedObject=链接对象
-Miscellaneous=各项设定
 NbOfActiveNotifications=通知数量(收到邮件数量)
 PredefinedMailTest=This is a test mail.\nThe two lines are separated by a carriage return.\n\n__SIGNATURE__
 PredefinedMailTestHtml=This 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>__SIGNATURE__
@@ -69,14 +68,15 @@ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find her
 PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nYou will find here the shipping __SHIPPINGREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nYou will find here the intervention __FICHINTERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n__PERSONALIZED__\n\n__SIGNATURE__
-DemoDesc=Dolibarr是一个轻量的功能模块丰富的ERP/CRM系统。展示所有的模块演示没有道理为这种情况永远不会发生。因此，几个演示配置文件。
+DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=选择最适合您所需的演示配置文件…
+ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
 DemoFundation=基础会员管理
 DemoFundation2=管理成员及银行账户的基础
-DemoCompanyServiceOnly=仅管理一个自由活动销售服务
+DemoCompanyServiceOnly=Company or freelance selling service only
 DemoCompanyShopWithCashDesk=管理与现金办公桌店
-DemoCompanyProductAndStocks=管理一个小型或中型公司销售产品
-DemoCompanyAll=管理一个小型或中型公司与多个活动(所有的主要模块)
+DemoCompanyProductAndStocks=Company selling products with a shop
+DemoCompanyAll=Company with multiple activities (all main modules)
 CreatedBy=创建者 %s
 ModifiedBy=修改者 %s
 ValidatedBy=由%验证s
@@ -201,33 +201,13 @@ IfAmountHigherThan=如果数额高于 <strong>%s</strong>
 SourcesRepository=源库
 Chart=图表
 
-##### Calendar common #####
-NewCompanyToDolibarr=公司 %s 已添加
-ContractValidatedInDolibarr=联系人 %s 已验证
-PropalClosedSignedInDolibarr=建议 %s 已标记
-PropalClosedRefusedInDolibarr=建议 %s 已被拒绝
-PropalValidatedInDolibarr=建议 %s 已验证
-PropalClassifiedBilledInDolibarr=建议 %s 已归类账单
-InvoiceValidatedInDolibarr=发票 %s 已验证
-InvoicePaidInDolibarr=发票 %s 已变更为支付
-InvoiceCanceledInDolibarr=发票 %s 已取消
-MemberValidatedInDolibarr=会员 %s 已验证
-MemberResiliatedInDolibarr=会员 %s 已适应
-MemberDeletedInDolibarr=会员 %s 已删除
-MemberSubscriptionAddedInDolibarr=会员订阅 %s 已添加
-ShipmentValidatedInDolibarr=运输 %s 验证
-ShipmentClassifyClosedInDolibarr=发货%s已经确认付账
-ShipmentUnClassifyCloseddInDolibarr=发货%s已经确认重开。
-ShipmentDeletedInDolibarr=运输 %s 已删除
 ##### Export #####
-Export=导出
 ExportsArea=导出区
 AvailableFormats=可用的格式
-LibraryUsed=Librairy使用
-LibraryVersion=版本
+LibraryUsed=使用的资料库
+LibraryVersion=Library version
 ExportableDatas=导出的数据
 NoExportableData=没有导出的数据（导出加载的数据，或丢失的权限没有模块）
-NewExport=新建导出
 ##### External sites #####
 WebsiteSetup=建立模块化的网页
 WEBSITE_PAGEURL=页面URL地址
diff --git a/htdocs/langs/zh_CN/products.lang b/htdocs/langs/zh_CN/products.lang
index 0b15eef3483..59d8ebb6a4e 100644
--- a/htdocs/langs/zh_CN/products.lang
+++ b/htdocs/langs/zh_CN/products.lang
@@ -5,6 +5,8 @@ ProductLabelTranslated=产品标签已翻译
 ProductDescriptionTranslated=产品描述已翻译
 ProductNoteTranslated=产品备注已翻译
 ProductServiceCard=产品/服务 信息卡
+TMenuProducts=产品
+TMenuServices=服务
 Products=产品
 Services=服务
 Product=产品
@@ -58,7 +60,7 @@ SellingPrice=售价
 SellingPriceHT=售价(税前)
 SellingPriceTTC=售价(税后)
 CostPriceDescription=This price (net of tax) can be used to store the average amount this product cost to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
-CostPriceUsage=In a future version, this value could be used for margin calculation.
+CostPriceUsage=This value could be used for margin calculation.
 SoldAmount=销售总额
 PurchasedAmount=采购总额
 NewPrice=新增价格
@@ -140,6 +142,7 @@ ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b>?
 CloneContentProduct=复制产品/服务的所有主要信息
 ClonePricesProduct=复制主要信息/价格
 CloneCompositionProduct=复制已打包包装的产品/服务
+CloneCombinationsProduct=Clone product variants
 ProductIsUsed=此产品已使用
 NewRefForClone=新产品/服务的编号
 SellingPrices=售价
@@ -236,7 +239,7 @@ GlobalVariables=全局变量
 VariableToUpdate=变量到更新
 GlobalVariableUpdaters=全局变量更新
 UpdateInterval=升级更新间隔(分钟)
-LastUpdated=最后更新
+LastUpdated=Latest update
 CorrectlyUpdated=当前更新
 PropalMergePdfProductActualFile=文件添加到 PDF Azur are/is
 PropalMergePdfProductChooseFile=选择PDF文件
@@ -256,4 +259,41 @@ VolumeUnits=体积单位
 SizeUnits=大小单位
 DeleteProductBuyPrice=删除买价
 ConfirmDeleteProductBuyPrice=您确定想要删除买价吗？
+SubProduct=Sub product
 
+#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
+ProductCombinations=Variants
+HideProductCombinations=Hide products variant in the products selector
+ProductCombination=Variant
+NewProductCombination=New variant
+EditProductCombination=Editing variant
+ProductCombinationGenerator=Variants generator
+Features=Features
+PriceImpact=Price impact
+WeightImpact=Weight impact
+NewProductAttribute=新建属性
+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
+PercentageVariation=Percentage variation
+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 child products
+ConfirmCloneProductCombinations=Would you like to copy all the product variant to the 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
diff --git a/htdocs/langs/zh_CN/projects.lang b/htdocs/langs/zh_CN/projects.lang
index 2fa54a07e9d..af1709bdaf9 100644
--- a/htdocs/langs/zh_CN/projects.lang
+++ b/htdocs/langs/zh_CN/projects.lang
@@ -29,9 +29,9 @@ DeleteAProject=删除一个项目
 DeleteATask=删除任务
 ConfirmDeleteAProject=Are you sure you want to delete this project?
 ConfirmDeleteATask=Are you sure you want to delete this task?
-OpenedProjects=打开项目
-OpenedTasks=打开任务
-OpportunitiesStatusForOpenedProjects=按有效项目状态机会值
+OpenedProjects=Opened projects
+OpenedTasks=Opened tasks
+OpportunitiesStatusForOpenedProjects=Opportunities amount of opened projects by status
 OpportunitiesStatusForProjects=按项目状态机会值
 ShowProject=显示项目
 SetProject=设置项目
@@ -47,7 +47,7 @@ TaskTimeSpent=任务花费时间
 TaskTimeUser=用户
 TaskTimeNote=备注
 TaskTimeDate=日期
-TasksOnOpenedProject=打开项目任务
+TasksOnOpenedProject=Tasks on opened projects
 WorkloadNotDefined=工作量没有定义
 NewTimeSpent=新的时间
 MyTimeSpent=我的时间花
@@ -58,6 +58,7 @@ TaskDateEnd=任务结束日期
 TaskDescription=任务描述
 NewTask=新建任务
 AddTask=创建任务
+AddTimeSpent=Create time spent
 Activity=活动
 Activities=任务/活动
 MyActivities=我的任务/活动
@@ -95,6 +96,7 @@ ValidateProject=验证谟
 ConfirmValidateProject=Are you sure you want to validate this project?
 CloseAProject=关闭项目
 ConfirmCloseAProject=Are you sure you want to close this project?
+AlsoCloseAProject=Also close project (keep it open if you still need to follow production tasks on it)
 ReOpenAProject=打开的项目
 ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=项目联系人
@@ -120,7 +122,7 @@ CloneProjectFiles=复制项目嵌入文件中
 CloneTaskFiles=复制任务(s) 嵌入到文件中 (假如任务(s) 已复制的话)
 CloneMoveDate=Update project/tasks dates from now?
 ConfirmCloneProject=Are you sure to clone this project?
-ProjectReportDate=更改任务的日期，根据项目的开始日期
+ProjectReportDate=Change task dates according to new project start date
 ErrorShiftTaskDate=根据新项目的开始日期，不可能的改变任务日期
 ProjectsAndTasksLines=项目和任务
 ProjectCreatedInDolibarr=项目 %s  创建
@@ -177,9 +179,9 @@ ProjectsStatistics=统计项目/线索
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 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.
-OpenedProjectsByThirdparties=按合伙人打开项目
+OpenedProjectsByThirdparties=Opened projects by thirdparties
 OnlyOpportunitiesShort=Only opportunities
-OpenedOpportunitiesShort=Open opportunities
+OpenedOpportunitiesShort=Opened opportunities
 NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=机会数值总计
 OpportunityPonderatedAmount=机会加权数值
diff --git a/htdocs/langs/zh_CN/propal.lang b/htdocs/langs/zh_CN/propal.lang
index 955fd0acd96..d436626cf51 100644
--- a/htdocs/langs/zh_CN/propal.lang
+++ b/htdocs/langs/zh_CN/propal.lang
@@ -3,7 +3,7 @@ Proposals=报价单
 Proposal=报价单
 ProposalShort=报价
 ProposalsDraft=起草报价单
-ProposalsOpened=开启商业报价
+ProposalsOpened=未关闭的报价单
 Prop=报价单
 CommercialProposal=报价单
 ProposalCard=报价 信息卡
@@ -13,8 +13,8 @@ Prospect=准客户
 DeleteProp=删除报价单
 ValidateProp=确定报价单
 AddProp=创建建议
-ConfirmDeleteProp=您确定要删除此报价单吗？
-ConfirmValidateProp=您确定要制定报价<b>%s</b>吗？
+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=最近的 %s 份报价
 LastModifiedProposals=最近变更的 %s 份报价
 AllPropals=全部报价单
@@ -26,9 +26,9 @@ AmountOfProposalsByMonthHT=金额 (税前)/每月
 NbOfProposals=报价单数量
 ShowPropal=显示报价
 PropalsDraft=草稿
-PropalsOpened=打开
+PropalsOpened=启动
 PropalStatusDraft=草稿(需要验证)
-PropalStatusValidated=已确定(打开的报价单)
+PropalStatusValidated=Validated (proposal is opened)
 PropalStatusSigned=已签署(待付款)
 PropalStatusNotSigned=未签署(已关闭)
 PropalStatusBilled=已到账
@@ -56,8 +56,8 @@ CreateEmptyPropal=新建空白报价单
 DefaultProposalDurationValidity=默认报价单有效期(按天计算)
 UseCustomerContactAsPropalRecipientIfExist=报价单中使用客户联系人信息中的地址，不使用客户公司的办公地址是。
 ClonePropal=复制报价单
-ConfirmClonePropal=您确定要复制并变更报价单<b>%s</b>吗？
-ConfirmReOpenProp=您确定要重新打开报价单<b>%s</b>吗?
+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=报价单和报价项目
 ProposalLine=报价项目
 AvailabilityPeriod=交货延迟期
diff --git a/htdocs/langs/zh_CN/stocks.lang b/htdocs/langs/zh_CN/stocks.lang
index b6f6fb6e73c..4cc01c23b15 100644
--- a/htdocs/langs/zh_CN/stocks.lang
+++ b/htdocs/langs/zh_CN/stocks.lang
@@ -22,13 +22,15 @@ Movements=运动
 ErrorWarehouseRefRequired=仓库引用的名称是必需的
 ListOfWarehouses=仓库列表
 ListOfStockMovements=库存调拨列表
+StockMovementForId=Movement ID %d
+ListMouvementStockProject=List of stock movements associated to project
 StocksArea=仓库区
 Location=位置
 LocationSummary=位置简称
 NumberOfDifferentProducts=不同的产品数
 NumberOfProducts=产品总数
-LastMovement=最后乐章
-LastMovements=最后动作
+LastMovement=Latest movement
+LastMovements=Latest movements
 Units=单位
 Unit=单位
 StockCorrection=合适的库存
@@ -140,3 +142,4 @@ ProductStockWarehouseCreated=Stock limit for alert and desired optimal stock cor
 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
diff --git a/htdocs/langs/zh_CN/supplier_proposal.lang b/htdocs/langs/zh_CN/supplier_proposal.lang
index 3969f5f2021..d80e6925b42 100644
--- a/htdocs/langs/zh_CN/supplier_proposal.lang
+++ b/htdocs/langs/zh_CN/supplier_proposal.lang
@@ -8,7 +8,7 @@ SearchRequest=搜索申请
 DraftRequests=草稿
 SupplierProposalsDraft=供应商报价草稿
 LastModifiedRequests=最近变更的 %s 份询价申请
-RequestsOpened=打开询价申请
+RequestsOpened=Opened price requests
 SupplierProposalArea=供应商报价区
 SupplierProposalShort=供应商报价
 SupplierProposals=供应商报价
@@ -23,7 +23,7 @@ ConfirmValidateAsk=Are you sure you want to validate this price request under na
 DeleteAsk=删除申请
 ValidateAsk=验证申请
 SupplierProposalStatusDraft=草稿(需要确认)
-SupplierProposalStatusValidated=Validated (request is open)
+SupplierProposalStatusValidated=Validated (request is opened)
 SupplierProposalStatusClosed=关闭
 SupplierProposalStatusSigned=接受
 SupplierProposalStatusNotSigned=拒绝
diff --git a/htdocs/langs/zh_CN/suppliers.lang b/htdocs/langs/zh_CN/suppliers.lang
index 11c82a45a26..4941e8c2f51 100644
--- a/htdocs/langs/zh_CN/suppliers.lang
+++ b/htdocs/langs/zh_CN/suppliers.lang
@@ -24,10 +24,10 @@ ExportDataset_fournisseur_1=供应商发票清单和发票的路线
 ExportDataset_fournisseur_2=供应商发票和付款
 ExportDataset_fournisseur_3=供应商订单和订单行
 ApproveThisOrder=批准这一命令
-ConfirmApproveThisOrder=你确定要批准了这项命令？
+ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b>?
 DenyingThisOrder=否认这笔订单
-ConfirmDenyingThisOrder=你确定要否认这个秩序？
-ConfirmCancelThisOrder=您确定要取消此订单？
+ConfirmDenyingThisOrder=Are you sure you want to deny this order <b>%s</b>?
+ConfirmCancelThisOrder=Are you sure you want to cancel this order <b>%s</b>?
 AddSupplierOrder=创建供应商订单
 AddSupplierInvoice=创建供应商发票
 ListOfSupplierProductForSupplier=产品和供应商价格列表 <b>%s</b>
@@ -41,3 +41,4 @@ DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=劣质
 ReputationForThisProduct=Reputation
 BuyerName=买家名称
+AllProductServicePrices=All product / service prices
diff --git a/htdocs/langs/zh_CN/withdrawals.lang b/htdocs/langs/zh_CN/withdrawals.lang
index 2b28600e8f4..fb0baabd7b8 100644
--- a/htdocs/langs/zh_CN/withdrawals.lang
+++ b/htdocs/langs/zh_CN/withdrawals.lang
@@ -24,6 +24,7 @@ WithdrawStatistics=Direct debit payment statistics
 WithdrawRejectStatistics=Direct debit payment reject statistics
 LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
+WithdrawRequestsDone=%s direct debit payment requests recorded
 ThirdPartyBankCode=合伙人银行账号
 NoInvoiceCouldBeWithdrawed=没有发票withdrawed成功。检查发票的公司是一个有效的禁令。
 ClassCredited=分类记
@@ -76,8 +77,8 @@ RUM=UMR
 RUMLong=Unique Mandate Reference
 RUMWillBeGenerated=UMR number will be generated once bank account information are saved
 WithdrawMode=Direct debit mode (FRST or RECUR)
-WithdrawRequestAmount=Withdraw request amount:
-WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil amount.
+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
diff --git a/htdocs/langs/zh_TW/accountancy.lang b/htdocs/langs/zh_TW/accountancy.lang
index e8a3dd3232e..1a2bcb9820c 100644
--- a/htdocs/langs/zh_TW/accountancy.lang
+++ b/htdocs/langs/zh_TW/accountancy.lang
@@ -194,6 +194,8 @@ ChangeBinding=Change the binding
 
 ## Admin
 ApplyMassCategories=Apply mass categories
+AddAccountFromBookKeepingWithNoCategories=Add acccount already used with no categories
+CategoryDeleted=Category for the accounting account has been removed
 
 ## Export
 Exports=Exports
@@ -209,6 +211,7 @@ Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution
 Modelcsv_quadratus=Export towards Quadratus QuadraCompta
 Modelcsv_ebp=Export towards EBP
 Modelcsv_cogilog=Export towards Cogilog
+ChartofaccountsId=Chart of accounts Id
 
 ## Tools - Init accounting account on product / service
 InitAccountancy=Init accountancy
diff --git a/htdocs/langs/zh_TW/admin.lang b/htdocs/langs/zh_TW/admin.lang
index c421fa57348..125e8c5f5c8 100644
--- a/htdocs/langs/zh_TW/admin.lang
+++ b/htdocs/langs/zh_TW/admin.lang
@@ -9,14 +9,20 @@ VersionDevelopment=發展
 VersionUnknown=未知
 VersionRecommanded=推薦
 FileCheck=Files integrity checker
-FileCheckDesc=This tool allows you to check the integrity of files of your application, comparing each files with the official ones. You can use this tool to detect if some files were modified by a hacker for example.
+FileCheckDesc=This tool allows you to check the integrity of files and setup of your application, comparing each files with the official ones. 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.
+FileIntegrityIsStrictlyConformedWithReference=Files integrity is strictly conformed with the reference.
+FileIntegrityIsOkButFilesWereAdded=Files integrity check has passed, however some new files were added.
+FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified, removed or added.
+GlobalChecksum=Global checksum
 MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
 LocalSignature=Embedded local signature (less reliable)
 RemoteSignature=Remote distant signature (more reliable)
 FilesMissing=Missing Files
 FilesUpdated=Updated Files
+FilesModified=Modified Files
+FilesAdded=Added Files
 FileCheckDolibarr=Check integrity of application files
-AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from a certified package
+AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from an official package
 XmlNotFound=Xml Integrity File of application not found
 SessionId=會話ID
 SessionSaveHandler=處理程序，以節省會議
@@ -185,7 +191,9 @@ BoxesDesc=Widgets are components showing some information that you can add to pe
 OnlyActiveElementsAreShown=只有被<a href="modules.php"> modules.php </a>所啟用的模組才會顯示。
 ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
-ModulesMarketPlaces=更多的模組...
+ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
+ModulesMarketPlaces=Find external modules...
+GoModuleSetupArea=To deploy/install a new module, go onto the Module setup area at <a href="%s">%s</a>.
 DoliStoreDesc=DoliStore，為Dolibarr的ERP / CRM的外部模組官方市場
 DoliPartnersDesc=List of companies providing custom developed modules or features (Note: anyone experienced in PHP programming can provide custom development for an open source project)
 WebSiteDesc=Reference websites to find more modules...
@@ -276,21 +284,22 @@ ModuleFamilyInterface=Interfaces with external systems
 MenuHandlers=選單處理程序
 MenuAdmin=選單編輯器
 DoNotUseInProduction=Do not use in production
-ThisIsProcessToFollow=以下為軟體安裝的過程：
-ThisIsAlternativeProcessToFollow=This is an alternative setup to process:
+ThisIsProcessToFollow=This is steps to process:
+ThisIsAlternativeProcessToFollow=This is an alternative setup to process manually:
 StepNb=第 %s 步驟
 FindPackageFromWebSite=從網站尋找你想要擴充的主題、模組（可上 %s 網站參考）。
 DownloadPackageFromWebSite=Download package (for example from official web site %s).
-UnpackPackageInDolibarrRoot=Unpack package file into Dolibarr server directory dedicated to external modules: <b>%s</b>
-SetupIsReadyForUse=安裝完成，此時此系統軟體已經可以開始使用擴充的部分。
-NotExistsDirect=The alternative root directory is not defined.<br>
-InfDirAlt=Since version 3 it is possible to define an alternative root directory.This allows you to store, same place, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
-InfDirExample=<br>Then declare it in the file conf.php<br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>*These lines are commented with "#", to uncomment only remove the character.
+UnpackPackageInDolibarrRoot=Unpack the packaged files into server directory dedicated to Dolibarr: <b>%s</b>
+UnpackPackageInModulesRoot=To deploy/install an external module, unpack the packaged files into the server directory dedicated to modules: <b>%s</b>
+SetupIsReadyForUse=Module deployment is finished. You must however enable and setup the module in your application by going on the page to setup modules: <a href="%s">%s</a>.
+NotExistsDirect=The alternative root directory is not defined to an existing directory.<br>
+InfDirAlt=Since version 3, it is possible to define an alternative root directory. This allows you to store, into a dedicated directory, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
+InfDirExample=<br>Then declare it in the file <strong>conf.php</strong><br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>If these lines are commented with "#", to enable them, just uncomment by removing the "#" character.
 YouCanSubmitFile=For this step, you can send package using this tool: Select module file
 CurrentVersion=此系統軟體(Dolibarr)目前版本
 CallUpdatePage=Go to the page that updates the database structure and data: %s.
 LastStableVersion=Latest stable version
-LastActivationDate=Last activation date
+LastActivationDate=Latest activation date
 UpdateServerOffline=Update server offline
 GenericMaskCodes=這個編碼模組使用方式如下:<br>1. <b>{000000}</b>表示每個 %s 編碼會依據此參數產生序號字串，且會自動遞增。有多少個0就表示序號字串有多長，滿最大值會自動歸0。<br>2. <b>{000000+000}</b> 同上面第一條，但是多了 offset 功能，也就第一筆 %s 編碼的起始序號會根據 + 號後面的參數而定。<br>3. <b>{000000@x}</b> 同上面第一條，但是每當為新的月份時，會將序號歸0。如果使用兩個x 則必需要有 {yy}{mm} 或 {yyyy}{mm} 參數。<br><b>{dd}</b> 表示天 (01 to 31).<br><b>{mm}</b> 表示月 (01 to 12)<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b>  表示用多少位數顯示年<br>
 GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
@@ -373,11 +382,11 @@ ExtrafieldCheckBox=Checkbox
 ExtrafieldRadio=Radio button
 ExtrafieldCheckBoxFromList= Checkbox from table
 ExtrafieldLink=Link to an object
-ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>In order to have the list depending on another :<br>1,value1|parent_list_code:parent_key<br>2,value2|parent_list_code:parent_key
+ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list :<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list :<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
-ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
+ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Example : Societe:societe/class/societe.class.php
 LibraryToBuildPDF=Library used for PDF generation
 WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
@@ -411,10 +420,11 @@ ModuleCompanyCodePanicum=只會回傳一個空的會計編號
 ModuleCompanyCodeDigitaria=會計代碼依賴於第三方的代碼。該代碼是字元組成的“C”的第一個位置的前5第三方代碼字元之後。
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
-
+WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.<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).
+ClickToShowDescription=Click to show description
 # Modules
 Module0Name=用戶和組
-Module0Desc=用戶和組管理
+Module0Desc=Users / Employees and Groups management
 Module1Name=客戶/供應商
 Module1Desc=公司和聯絡人的管理
 Module2Name=商業訂單
@@ -515,8 +525,8 @@ Module2200Name=Dynamic Prices
 Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
 Module2300Desc=Scheduled job management
-Module2400Name=Agenda/Events
-Module2400Desc=Follow events or rendez-vous. Record manual events into Agendas or let application logs automatic events for tracking purposes.
+Module2400Name=Events/Agenda
+Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous.
 Module2500Name=電子內容管理
 Module2500Desc=保存和共享文件
 Module2600Name=API/Web services (SOAP server)
@@ -582,7 +592,7 @@ Permission34=刪除產品資訊
 Permission36=查看/隱藏產品管理
 Permission38=匯出產品資訊
 Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
-Permission42=建立/修改項目（共享的項目和項目我聯繫）
+Permission42=Create/modify projects (shared project and projects i'm contact for). Can also create tasks and assign users to project and tasks
 Permission44=刪除項目（共享的項目和項目我聯繫）
 Permission45=Export projects
 Permission61=閲讀干預
@@ -685,7 +695,7 @@ PermissionAdvanced253=創建/修改內部/外部用戶和權限
 Permission254=只能建立/修改外部用戶資訊
 Permission255=修改其他用戶密碼
 Permission256=刪除或暫時關閉其他用戶
-Permission262=允所使用者可以讀取其他人的供應商/客戶/潛在資訊(不限於指連接到自己的)。這個設定不影響外部使用者(外部使用者會有其存取限制)
+Permission262=Extend access to all third parties (not only third parties that user is a sale representative).<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 assignement matters).
 Permission271=正讀
 Permission272=閲讀發票
 Permission273=發票問題
@@ -887,7 +897,7 @@ Offset=抵銷
 AlwaysActive=始終活躍
 Upgrade=升級
 MenuUpgrade=升級/擴充
-AddExtensionThemeModuleOrOther=新增擴充（主題、模組...）
+AddExtensionThemeModuleOrOther=Deploy/install external module
 WebServer=網頁伺服器
 DocumentRootServer=網頁伺服器的根目錄
 DataRootServer=數據文件的目錄
@@ -994,7 +1004,7 @@ TriggerAlwaysActive=在這個文件觸發器總是活躍，無論是激活Doliba
 TriggerActiveAsModuleActive=在這個文件中啟用觸發器活躍模組<b>%s</b>是。
 GeneratedPasswordDesc=這裡定義的規定，你要用來生成新的密碼，如果你問有自動生成的密碼
 DictionaryDesc=Insert all reference data. You can add your values to the default.
-ConstDesc=This page allows you to edit all other parameters not available in previous pages. These are mostly reserved parameters for developers or advanced troubleshooting.
+ConstDesc=This page allows you to edit all other parameters not available in previous pages. These are mostly reserved parameters for developers or advanced troubleshooting. For a list of options <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">check here</a>.
 MiscellaneousDesc=All other security related parameters are defined here.
 LimitsSetup=限制及精準度
 LimitsDesc=您可以定義範圍，精度和Dolibarr這裡使用的最佳化
@@ -1161,10 +1171,6 @@ FreeLegalTextOnOrders=可在下面輸入額外的訂單資訊
 WatermarkOnDraftOrders=Watermark on draft orders (none if empty)
 ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable
 BANK_ASK_PAYMENT_BANK_DURING_ORDER=Ask for bank account destination of order
-##### Clicktodial #####
-ClickToDialSetup=點擊撥號模組設置
-ClickToDialUrlDesc=連結時調用一個電話象形點擊完成。丹斯l'網址，vous pouvez utiliser萊balises <br> <b>%%1 $ s的</b>誇血清remplacé電話桿樂德l' appelé <br> <b>%%2 $ s的</b>誇血清remplacé電話桿樂德l' appelant（樂votre） <br> <b>%%3 $ s的</b>誇血清remplacé桿votre登錄clicktodial（定義所涵蓋河畔votre膠片utilisateur） <br> <b>%%4 $ s的</b>誇血清remplacé桿votre摩托羅拉德過時clicktodial（定義所涵蓋河畔votre膠片utilisateur）。
-##### Bookmark4u #####
 ##### Interventions #####
 InterventionsSetup=干預模組設置
 FreeLegalTextOnInterventions=可在下面輸入額外的調停(干涉)資訊
@@ -1391,7 +1397,7 @@ SendingsSetup=設定出貨單模組
 SendingsReceiptModel=出貨單據範本
 SendingsNumberingModules=設定出貨單編號模組
 SendingsAbility=Support shipping sheets for customer deliveries
-NoNeedForDeliveryReceipts=在大多數情況下，出貨單據可提供客戶記錄及查詢交貨單資訊(產品出貨清單)及收貨單資訊，客戶可同時註記簽收狀態。所以產品交貨單據是一個重複的功能，很少被開啟。
+NoNeedForDeliveryReceipts=In most cases, shipping sheets are used both as sheets for customer deliveries (list of products to send) and sheets that is received and signed by customer. So product deliveries receipts is a duplicated feature and is rarely activated.
 FreeLegalTextOnShippings=Free text on shipments
 ##### Deliveries #####
 DeliveryOrderNumberingModules=產品收貨編號模組
@@ -1471,7 +1477,11 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Set automatically this default value for type of e
 AGENDA_DEFAULT_FILTER_TYPE=Set automatically this type of event into search filter of agenda view
 AGENDA_DEFAULT_FILTER_STATUS=Set automatically this status for events into search filter of agenda view
 AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
-##### ClickToDial #####
+AGENDA_NOTIFICATION=Enable event notification on user browsers when event date is reached (each user is able to refuse this from the browser confirmation question)
+AGENDA_NOTIFICATION_SOUND=Enable sound notification
+##### Clicktodial #####
+ClickToDialSetup=點擊撥號模組設置
+ClickToDialUrlDesc=連結時調用一個電話象形點擊完成。丹斯l'網址，vous pouvez utiliser萊balises <br> <b>%%1 $ s的</b>誇血清remplacé電話桿樂德l' appelé <br> <b>%%2 $ s的</b>誇血清remplacé電話桿樂德l' appelant（樂votre） <br> <b>%%3 $ s的</b>誇血清remplacé桿votre登錄clicktodial（定義所涵蓋河畔votre膠片utilisateur） <br> <b>%%4 $ s的</b>誇血清remplacé桿votre摩托羅拉德過時clicktodial（定義所涵蓋河畔votre膠片utilisateur）。
 ClickToDialDesc=This module allows to make phone numbers clickable. A click on this icon will call make your phone to 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.
 ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
 ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on same computer than the browser, and called when you click on a link in your browser that start 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.
@@ -1499,10 +1509,11 @@ EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint availa
 ##### API ####
 ApiSetup=API module setup
 ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
-ApiProductionMode=Enable production mode (this will activate use of a caches for services management)
+ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
 ApiExporerIs=You can explore the APIs at url
 OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
 ApiKey=Key for API
+WarningAPIExplorerDisabled=The API explorer has been disabled. API explorer is not required to provide API services. It is a tool for developer to find/test REST APIs. If you need this tool, go into setup of module API REST to activate it.
 ##### Bank #####
 BankSetupModule=銀行模組設置
 FreeLegalTextOnChequeReceipts=可在下面輸入額外的支票資訊
@@ -1571,7 +1582,7 @@ BackupDumpWizard=Wizard to build database backup dump file
 SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
 SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is only manual steps a privileged user can do.
 InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
-ConfFileMuseContainCustom=Installing an external module from application save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to have option<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
+ConfFileMuseContainCustom=Installing an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
 HighlightLinesColor=Highlight color of the line when the mouse passes over (keep empty for no highlight)
 TextTitleColor=Color of page title
@@ -1601,6 +1612,7 @@ FixTZ=TimeZone fix
 FillFixTZOnlyIfRequired=Example: +2 (fill only if problem experienced)
 ExpectedChecksum=Expected Checksum
 CurrentChecksum=Current Checksum
+ForcedConstants=Required constant values
 MailToSendProposal=To send customer proposal
 MailToSendOrder=To send customer order
 MailToSendInvoice=To send customer invoice
@@ -1609,13 +1621,14 @@ MailToSendIntervention=To send intervention
 MailToSendSupplierRequestForQuotation=To send quotation request to supplier
 MailToSendSupplierOrder=To send supplier order
 MailToSendSupplierInvoice=To send supplier invoice
+MailToSendContract=To send a contract
 MailToThirdparty=To send email from third party page
 ByDefaultInList=Show by default on list view
-YouUseLastStableVersion=You use the last stable version
+YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
 TitleExampleForMaintenanceRelease=Example of message you can use to announce this maintenance release (feel free to use it on your web sites)
-ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. You can download it from the download area of http://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.
-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, nor data structure change is present into this version. You can download it from the download area of http://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.
+ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. 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.
+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, nor data structure change is present into 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, you can enter here rule to have price for each level autocalculated according to price of first level, so you will have to enter only price for first level on each product. This page is here to save you time and can be usefull only if your prices for each leve are relative to first level. You can ignore this page in most cases.
 ModelModulesProduct=Templates for product documents
 ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
diff --git a/htdocs/langs/zh_TW/banks.lang b/htdocs/langs/zh_TW/banks.lang
index 747d868fece..afd19018e72 100644
--- a/htdocs/langs/zh_TW/banks.lang
+++ b/htdocs/langs/zh_TW/banks.lang
@@ -74,13 +74,13 @@ Conciliate=調和
 Conciliation=和解
 ReconciliationLate=Reconciliation late
 IncludeClosedAccount=包括關閉賬戶
-OnlyOpenedAccount=僅開立賬戶
+OnlyOpenedAccount=只有開立帳戶
 AccountToCredit=帳戶信用
 AccountToDebit=帳戶轉帳
 DisableConciliation=此帳戶的禁用和解功能
 ConciliationDisabled=和解功能禁用
 LinkedToAConciliatedTransaction=Linked to a conciliated entry
-StatusAccountOpened=開放
+StatusAccountOpened=開業
 StatusAccountClosed=關閉
 AccountIdShort=數
 LineRecord=交易
diff --git a/htdocs/langs/zh_TW/bills.lang b/htdocs/langs/zh_TW/bills.lang
index 1f25af9b778..3f14889062d 100644
--- a/htdocs/langs/zh_TW/bills.lang
+++ b/htdocs/langs/zh_TW/bills.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - bills
 Bill=發票
 Bills=發票
-BillsCustomers=客戶發票
+BillsCustomers=Customer invoices
 BillsCustomer=客戶發票
-BillsSuppliers=供應商發票
-BillsCustomersUnpaid=客戶未付款的發票
-BillsCustomersUnpaidForCompany=尚未付款的客戶發票 %s
-BillsSuppliersUnpaid=尚未付款的供應商發票
-BillsSuppliersUnpaidForCompany=尚未付款供應商的發票 %s
+BillsSuppliers=Supplier invoices
+BillsCustomersUnpaid=Unpaid customer invoices
+BillsCustomersUnpaidForCompany=Unpaid customer invoices for %s
+BillsSuppliersUnpaid=Unpaid supplier invoices
+BillsSuppliersUnpaidForCompany=Unpaid supplier invoices for %s
 BillsLate=逾期付款
 BillsStatistics=客戶發票統計
 BillsStatisticsSuppliers=供應商發票統計
@@ -62,8 +62,8 @@ PaymentsBack=付款回
 paymentInInvoiceCurrency=in invoices currency
 PaidBack=返回款項
 DeletePayment=刪除付款
-ConfirmDeletePayment=Are you sure you want to delete this payment?
-ConfirmConvertToReduc=Do you want to convert this credit note or deposit 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.
+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.
 SupplierPayments=已收到的供應商付款單據清單
 ReceivedPayments=收到的付款
 ReceivedCustomersPayments=已收到的客戶付款單據清單
@@ -78,6 +78,7 @@ PaymentMode=付款方式
 PaymentTypeDC=Debit/Credit Card
 PaymentTypePP=PayPal
 IdPaymentMode=Payment type (id)
+CodePaymentMode=Payment type (code)
 LabelPaymentMode=Payment type (label)
 PaymentModeShort=付款方式
 PaymentTerm=付款天數
@@ -102,9 +103,10 @@ SearchACustomerInvoice=搜尋客戶發票
 SearchASupplierInvoice=搜尋供應商發票
 CancelBill=取消發票
 SendRemindByMail=通過電子郵件發送提醒
-DoPayment=不要付款
-DoPaymentBack=不要付款回
+DoPayment=Enter payment
+DoPaymentBack=Enter refund
 ConvertToReduc=轉換到未來的折扣
+ConvertExcessReceivedToReduc=Convert excess received into future discount
 EnterPaymentReceivedFromCustomer=輸入從客戶收到付款
 EnterPaymentDueToCustomer=由於客戶的付款
 DisabledBecauseRemainderToPayIsZero=因剩餘未付款為零而停用
@@ -113,22 +115,24 @@ BillStatus=發票狀態
 StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=草案（等待驗證）
 BillStatusPaid=支付
-BillStatusPaidBackOrConverted=支付或轉換成折扣
+BillStatusPaidBackOrConverted=Refund or converted into discount
 BillStatusConverted=轉換成折扣
 BillStatusCanceled=棄
 BillStatusValidated=驗證（需要付費）
 BillStatusStarted=開始
 BillStatusNotPaid=尚未支付
+BillStatusNotRefunded=Not refunded
 BillStatusClosedUnpaid=關閉（無薪）
 BillStatusClosedPaidPartially=支付（部分）
 BillShortStatusDraft=草案
 BillShortStatusPaid=支付
-BillShortStatusPaidBackOrConverted=加工
+BillShortStatusPaidBackOrConverted=Refund or converted
 BillShortStatusConverted=加工
 BillShortStatusCanceled=棄
 BillShortStatusValidated=驗證
 BillShortStatusStarted=開始
 BillShortStatusNotPaid=尚未支付
+BillShortStatusNotRefunded=Not refunded
 BillShortStatusClosedUnpaid=關閉
 BillShortStatusClosedPaidPartially=支付（部分）
 PaymentStatusToValidShort=為了驗證
@@ -149,14 +153,14 @@ NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified
 FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
 NotARecurringInvoiceTemplate=Not a recurring template invoice
 NewBill=新建發票(invoice)
-LastBills=上次%s的發票
-LastCustomersBills=上次%s的客戶發票
-LastSuppliersBills=上次%s的供應商發票
+LastBills=Latest %s invoices
+LastCustomersBills=Latest %s customer invoices
+LastSuppliersBills=Latest %s supplier invoices
 AllBills=所有發票
 OtherBills=其他發票
 DraftBills=發票草案
-CustomersDraftInvoices=客戶草稿發票
-SuppliersDraftInvoices=供應商草稿發票
+CustomersDraftInvoices=Customer draft invoices
+SuppliersDraftInvoices=Supplier draft invoices
 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>?
@@ -203,7 +207,7 @@ AlreadyPaidNoCreditNotesNoDeposits=已支付（無信用票據及存款）
 Abandoned=棄
 RemainderToPay=Remaining unpaid
 RemainderToTake=Remaining amount to take
-RemainderToPayBack=Remaining amount to pay back
+RemainderToPayBack=Remaining amount to refund
 Rest=Pending
 AmountExpected=索賠額
 ExcessReceived=收到過剩
@@ -270,6 +274,7 @@ Deposit=存款
 Deposits=存款
 DiscountFromCreditNote=從信用註意%折扣s
 DiscountFromDeposit=從存款收支的發票%
+DiscountFromExcessReceived=Payments from excess received of invoice %s
 AbsoluteDiscountUse=這種信貸可用於發票驗證前
 CreditNoteDepositUse=Invoice must be validated to use this kind of credits
 NewGlobalDiscount=新的全域折扣
@@ -277,8 +282,8 @@ NewRelativeDiscount=新的相對折扣
 NoteReason=備註/原因
 ReasonDiscount=原因
 DiscountOfferedBy=獲
-DiscountStillRemaining=剩餘的折扣
-DiscountAlreadyCounted=以計算的折扣
+DiscountStillRemaining=Discounts available
+DiscountAlreadyCounted=Discounts already consumed
 BillAddress=條例草案的報告
 HelpEscompte=這是給予客戶優惠折扣，因為它的任期作出之前付款。
 HelpAbandonBadCustomer=這一數額已被放棄（客戶說是一個壞的客戶），並作為一個特殊的松散考慮。
@@ -331,10 +336,12 @@ 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
 # PaymentConditions
 Statut=地位
-PaymentConditionShortRECEP=即時
-PaymentConditionRECEP=即時
+PaymentConditionShortRECEP=Due Upon Receipt
+PaymentConditionRECEP=Due Upon Receipt
 PaymentConditionShort30D=30天
 PaymentCondition30D=30天
 PaymentConditionShort30DENDMONTH=30 days of month-end
@@ -349,6 +356,14 @@ PaymentConditionShortPT_ORDER=訂單
 PaymentConditionPT_ORDER=On order
 PaymentConditionShortPT_5050=50-50
 PaymentConditionPT_5050=50%% in advance, 50%% on delivery
+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
 FixAmount=Fix amount
 VarAmount=Variable amount (%% tot.)
 # PaymentType
@@ -418,7 +433,7 @@ ChequeDeposits=支票存款
 Cheques=檢查
 DepositId=Id deposit
 NbCheque=Number of checks
-CreditNoteConvertedIntoDiscount=此信用票據或存款發票已到%轉換S
+CreditNoteConvertedIntoDiscount=This %s has been converted into %s
 UsBillingContactAsIncoiveRecipientIfExist=使用客戶的帳單，而不是作為第三方發票收件人地址聯系地址
 ShowUnpaidAll=顯示所有未付款的發票
 ShowUnpaidLateOnly=只顯示遲遲未付款的發票
diff --git a/htdocs/langs/zh_TW/boxes.lang b/htdocs/langs/zh_TW/boxes.lang
index 745f69f2d8f..821700be87f 100644
--- a/htdocs/langs/zh_TW/boxes.lang
+++ b/htdocs/langs/zh_TW/boxes.lang
@@ -25,8 +25,8 @@ BoxTitleLastSuppliers=Latest %s recorded suppliers
 BoxTitleLastModifiedSuppliers=Latest %s modified suppliers
 BoxTitleLastModifiedCustomers=Latest %s modified customers
 BoxTitleLastCustomersOrProspects=Latest %s customers or prospects
-BoxTitleLastCustomerBills=Latest %s customer's invoices
-BoxTitleLastSupplierBills=Latest %s supplier's invoices
+BoxTitleLastCustomerBills=Latest %s customer invoices
+BoxTitleLastSupplierBills=Latest %s supplier invoices
 BoxTitleLastModifiedProspects=Latest %s modified prospects
 BoxTitleLastModifiedMembers=Latest %s members
 BoxTitleLastFicheInter=Latest %s modified interventions
@@ -51,12 +51,12 @@ ClickToAdd=點選這裡來新增
 NoRecordedCustomers=沒有記錄客戶
 NoRecordedContacts=沒有任何聯絡人的記錄
 NoActionsToDo=做任何動作
-NoRecordedOrders=沒有任何客戶的訂單記錄
+NoRecordedOrders=No recorded customer orders
 NoRecordedProposals=沒有任何建議書的記錄
-NoRecordedInvoices=沒有任何客戶發票記錄
-NoUnpaidCustomerBills=沒有未付款客戶帳單
-NoUnpaidSupplierBills=沒有未付款的供應商帳單
-NoModifiedSupplierBills=沒有任何修改過的供應商帳單
+NoRecordedInvoices=No recorded customer invoices
+NoUnpaidCustomerBills=No unpaid customer invoices
+NoUnpaidSupplierBills=No unpaid supplier invoices
+NoModifiedSupplierBills=No recorded supplier invoices
 NoRecordedProducts=沒有任何產品/服務記錄
 NoRecordedProspects=沒有任何潛在資訊記錄
 NoContractedProducts=沒有產品/服務合同
diff --git a/htdocs/langs/zh_TW/companies.lang b/htdocs/langs/zh_TW/companies.lang
index 51e56a3bc31..5b69fd8c9dc 100644
--- a/htdocs/langs/zh_TW/companies.lang
+++ b/htdocs/langs/zh_TW/companies.lang
@@ -78,6 +78,10 @@ VATIsNotUsed=不使用營業稅(VAT)
 CopyAddressFromSoc=Fill address with third party address
 ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
 PaymentBankAccount=Payment bank account
+OverAllProposals=Total proposals
+OverAllOrders=Total orders
+OverAllInvoices=Total invoices
+OverAllSupplierProposals=Total price requests
 ##### Local Taxes #####
 LocalTax1IsUsed=Use second tax
 LocalTax1IsUsedES= 稀土用於
@@ -239,6 +243,10 @@ ProfId3RU=教授ID 3（KPP的）
 ProfId4RU=教授ID 4（玉浦）
 ProfId5RU=-
 ProfId6RU=-
+ProfId1DZ=鋼筋混凝土
+ProfId2DZ=Art.
+ProfId3DZ=NIF
+ProfId4DZ=NIS
 VATIntra=公司統一編號
 VATIntraShort=公司統編
 VATIntraSyntaxIsValid=語法是有效的
@@ -382,8 +390,9 @@ ListCustomersShort=客戶名單
 ThirdPartiesArea=客戶/供應商資料區
 LastModifiedThirdParties=Latest %s modified third parties
 UniqueThirdParties=客戶/供應商圖表種類數
-InActivity=打開
+InActivity=開業
 ActivityCeased=關閉
+ThirdPartyIsClosed=Third party is closed
 ProductsIntoElements=產品列表於 %s
 CurrentOutstandingBill=目前未兌現票據
 OutstandingBill=最高數量的未兌現票據
@@ -396,7 +405,7 @@ MergeThirdparties=合併客戶/供應商
 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 so you will be able to delete the duplicate one.
 ThirdpartiesMergeSuccess=客戶/供應商將被合併
 SaleRepresentativeLogin=Login of sales representative
-SaleRepresentativeFirstname=Firstname of sales representative
-SaleRepresentativeLastname=Lastname of sales representative
+SaleRepresentativeFirstname=First name of sales representative
+SaleRepresentativeLastname=Last name of sales representative
 ErrorThirdpartiesMerge=刪除客戶/供應商時發生錯誤.請檢查log紀錄. 變更將會回復.
 NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/zh_TW/compta.lang b/htdocs/langs/zh_TW/compta.lang
index b0fa541e75f..e47375ad955 100644
--- a/htdocs/langs/zh_TW/compta.lang
+++ b/htdocs/langs/zh_TW/compta.lang
@@ -65,6 +65,7 @@ PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=增值稅納稅
 ListPayment=金名單
 ListOfCustomerPayments=客戶已付款名單
+ListOfSupplierPayments=供應商已付款的名單
 DateStartPeriod=Date start period
 DateEndPeriod=Date end period
 newLT1Payment=New tax 2 payment
@@ -81,7 +82,7 @@ LT2PaymentES=IRPF付款
 LT2PaymentsES=IRPF付款
 VATPayment=Sales tax payment
 VATPayments=Sales tax payments
-VATRefund=Sales tax refund Refund
+VATRefund=Sales tax refund
 Refund=Refund
 SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=顯示增值稅納稅
@@ -194,7 +195,7 @@ CloneTax=Clone a social/fiscal tax
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
 CloneTaxForNextMonth=Clone it for next month
 SimpleReport=Simple report
-AddExtraReport=Extra reports
+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
diff --git a/htdocs/langs/zh_TW/cron.lang b/htdocs/langs/zh_TW/cron.lang
index 7b037a7ed12..d220e226056 100644
--- a/htdocs/langs/zh_TW/cron.lang
+++ b/htdocs/langs/zh_TW/cron.lang
@@ -17,14 +17,14 @@ CronMethodDoesNotExists=Class %s does not contains any method %s
 # Menu
 EnabledAndDisabled=Enabled and disabled
 # Page list
-CronLastOutput=Last run output
-CronLastResult=Last result code
+CronLastOutput=Latest run output
+CronLastResult=Latest result code
 CronCommand=Command
 CronList=Scheduled jobs
 CronDelete=Delete scheduled jobs
-CronConfirmDelete=Are you sure you want to delete these scheduled jobs ?
+CronConfirmDelete=Are you sure you want to delete these scheduled jobs?
 CronExecute=Launch scheduled job
-CronConfirmExecute=Are you sure you want to execute these scheduled jobs now ?
+CronConfirmExecute=Are you sure you want to execute these scheduled jobs now?
 CronInfo=Scheduled job module allow to execute job that have been planned
 CronTask=Job
 CronNone=無
@@ -33,13 +33,13 @@ CronDtEnd=Not after
 CronDtNextLaunch=Next execution
 CronDtLastLaunch=Start date of latest execution
 CronDtLastResult=End date of latest execution
-CronFrequency=Frequency
+CronFrequency=頻率
 CronClass=Class
 CronMethod=方法
 CronModule=模組
 CronNoJobs=No jobs registered
 CronPriority=優先
-CronLabel=Label
+CronLabel=品號
 CronNbRun=Nb. launch
 CronMaxRun=Max nb. launch
 CronEach=Every
diff --git a/htdocs/langs/zh_TW/errors.lang b/htdocs/langs/zh_TW/errors.lang
index b2780d74e84..26f9692cb4b 100644
--- a/htdocs/langs/zh_TW/errors.lang
+++ b/htdocs/langs/zh_TW/errors.lang
@@ -11,6 +11,7 @@ ErrorLoginAlreadyExists=登錄%s已經存在。
 ErrorGroupAlreadyExists=組%s已經存在。
 ErrorRecordNotFound=記錄沒有找到。
 ErrorFailToCopyFile=無法復制文件<b>'%s'</b>成<b>'%s'。</b>
+ErrorFailToCopyDir=Failed to copy directory '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToRenameFile=無法重新命名為<b>“%s'</b>文件<b>'%s'。</b>
 ErrorFailToDeleteFile=無法刪除文件<b>'%s'</b>的。
 ErrorFailToCreateFile=無法創建文件<b>'%s'</b>的。
@@ -115,7 +116,7 @@ ErrorNoActivatedBarcode=沒有激活的條碼類型
 ErrUnzipFails=Failed to unzip %s with ZipArchive
 ErrNoZipEngine=No engine to unzip %s file in this PHP
 ErrorFileMustBeADolibarrPackage=The file %s must be a Dolibarr zip package
-ErrorFileRequired=It takes a package Dolibarr file
+ErrorModuleFileRequired=You must select a Dolibarr module package file
 ErrorPhpCurlNotInstalled=The PHP CURL is not installed, this is essential to talk with 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
@@ -170,14 +171,19 @@ ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
 ErrorFileMustHaveFormat=File must have format %s
 ErrorSupplierCountryIsNotDefined=未定義此供應商國別
 ErrorsThirdpartyMerge=Failed to merge the two records. Request canceled.
-ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enougth for product %s to add it into a new order.
-ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enougth for product %s to add it into a new invoice.
-ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enougth for product %s to add it into a new shipment.
-ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enougth for product %s to add it into a new proposal.
-ErrorFailedToLoadLoginFileForMode=Failed to get the login file for mode '%s'.
+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 bank 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>
 
 # 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.
diff --git a/htdocs/langs/zh_TW/holiday.lang b/htdocs/langs/zh_TW/holiday.lang
index f6286b3cd23..6e8554c4aeb 100644
--- a/htdocs/langs/zh_TW/holiday.lang
+++ b/htdocs/langs/zh_TW/holiday.lang
@@ -76,8 +76,9 @@ BoxTitleLastLeaveRequests=Latest %s modified leave requests
 HolidaysMonthlyUpdate=Monthly update
 ManualUpdate=Manual update
 HolidaysCancelation=Leave request cancelation
-EmployeeLastname=Employee lastname
-EmployeeFirstname=Employee firstname
+EmployeeLastname=Employee last name
+EmployeeFirstname=Employee first name
+TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
 
 ## Configuration du Module ##
 LastUpdateCP=Latest automatic update of leaves allocation
diff --git a/htdocs/langs/zh_TW/ldap.lang b/htdocs/langs/zh_TW/ldap.lang
index 0b3023db254..b45161ea56f 100644
--- a/htdocs/langs/zh_TW/ldap.lang
+++ b/htdocs/langs/zh_TW/ldap.lang
@@ -13,8 +13,8 @@ LDAPUsers=在LDAP用戶數據庫
 LDAPFieldStatus=地位
 LDAPFieldFirstSubscriptionDate=首先認購日期
 LDAPFieldFirstSubscriptionAmount=認購金額拳
-LDAPFieldLastSubscriptionDate=最後認購日期
-LDAPFieldLastSubscriptionAmount=最後認購金額
+LDAPFieldLastSubscriptionDate=Latest subscription date
+LDAPFieldLastSubscriptionAmount=Latest subscription amount
 LDAPFieldSkype=Skype id
 LDAPFieldSkypeExample=Example : skypeName
 UserSynchronized=用戶同步
diff --git a/htdocs/langs/zh_TW/mails.lang b/htdocs/langs/zh_TW/mails.lang
index b889ee4999a..52386a05046 100644
--- a/htdocs/langs/zh_TW/mails.lang
+++ b/htdocs/langs/zh_TW/mails.lang
@@ -35,7 +35,7 @@ MailingStatusSentPartialy=發送部分
 MailingStatusSentCompletely=發送完全
 MailingStatusError=錯誤
 MailingStatusNotSent=不發送
-MailSuccessfulySent=電子郵件發送成功從%（s到%s）
+MailSuccessfulySent=Email successfully accepted for delivery (from %s to %s)
 MailingSuccessfullyValidated=EMailing successfully validated
 MailUnsubcribe=Unsubscribe
 MailingStatusNotContact=Don't contact anymore
@@ -74,22 +74,28 @@ ResultOfMailSending=Result of mass EMail sending
 NbSelected=Nb selected
 NbIgnored=Nb ignored
 NbSent=Nb 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
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=在文件%s的線
 RecipientSelectionModules=為收件人的選擇定義的要求
 MailSelectedRecipients=選擇收件人
 MailingArea=EMailings區
-LastMailings=上次%s的emailings
+LastMailings=Latest %s emailings
 TargetsStatistics=統計指標
 NbOfCompaniesContacts=公司獨特的接觸
 MailNoChangePossible=為驗證電子郵件收件人無法改變
 SearchAMailing=搜尋郵件
 SendMailing=發送電子郵件
 SendMail=發送電子郵件
-MailingNeedCommand=For security reason, sending an emailing is better when performed from command line. If you have one, ask your server administrator to launch the following command to send the emailing to all recipients:
+SentBy=發送
+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=但是您可以發送到網上，加入與最大的電子郵件數量值參數MAILING_LIMIT_SENDBYWEB你要發送的會議。
-ConfirmSendingEmailing=If you can't or prefer sending them with your www browser, please confirm you are sure you want to send emailing now from your browser?
+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.
 TargetsReset=清除名單
 ToClearAllRecipientsClickHere=點擊這裏以清除此電子郵件的收件人列表
@@ -144,3 +150,6 @@ AdvTgtCreateFilter=Create filter
 AdvTgtOrCreateNewFilter=Name of new filter
 NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
+OutGoingEmailSetup=Outgoing email setup
+InGoingEmailSetup=Incoming email setup
+
diff --git a/htdocs/langs/zh_TW/main.lang b/htdocs/langs/zh_TW/main.lang
index 551b92bd8f5..73bd60daff4 100644
--- a/htdocs/langs/zh_TW/main.lang
+++ b/htdocs/langs/zh_TW/main.lang
@@ -63,11 +63,13 @@ ErrorNoVATRateDefinedForSellerCountry=錯誤!沒有定義 '%s' 幣別的營業
 ErrorNoSocialContributionForSellerCountry=Error, no social/fiscal taxes type defined for country '%s'.
 ErrorFailedToSaveFile=錯誤，無法保存文件。
 ErrorCannotAddThisParentWarehouse=You are trying to add a parent warehouse which is already a child of current one
+MaxNbOfRecordPerPage=Max nb of record per page
 NotAuthorized=You are not authorized to do that.
 SetDate=設定日期
 SelectDate=選擇日期
 SeeAlso=請參考 %s
 SeeHere=See here
+Apply=Apply
 BackgroundColorByDefault=默認的背景顏色
 FileRenamed=The file was successfully renamed
 FileUploaded=檔案已上傳
@@ -86,7 +88,7 @@ Undefined=未定義
 PasswordForgotten=Password forgotten?
 SeeAbove=見上文
 HomeArea=首頁區
-LastConnexion=最後連線時間
+LastConnexion=Latest connection
 PreviousConnexion=上次連線時間
 PreviousValue=Previous value
 ConnectedOnMultiCompany=對實體連接
@@ -236,7 +238,7 @@ DateCreation=建立日期
 DateCreationShort=Creat. date
 DateModification=修改日期
 DateModificationShort=修改日期
-DateLastModification=最後修改日期
+DateLastModification=Latest modification date
 DateValidation=驗證日期
 DateClosing=截止日期
 DateDue=截止日期
@@ -432,7 +434,7 @@ Reportings=報表
 Draft=草案
 Drafts=草稿
 Validated=驗證
-Opened=Open
+Opened=開業
 New=新
 Discount=折扣
 Unknown=未知
@@ -460,6 +462,7 @@ DeletePicture=Picture delete
 ConfirmDeletePicture=Confirm picture deletion?
 Login=註冊
 CurrentLogin=當前登錄
+EnterLoginDetail=Enter login details
 January=一月
 February=二月
 March=三月
@@ -597,6 +600,8 @@ SessionName=會議名稱
 Method=方法
 Receive=收到
 CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
+ExpectedValue=Expected Value
+CurrentValue=當前值
 PartialWoman=部分
 TotalWoman=全部
 NeverReceived=從未收到
@@ -753,6 +758,8 @@ RemoveString=Remove string '%s'
 SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
 DirectDownloadLink=Direct download link
 Download=Download
+ActualizeCurrency=Update currency rate
+Fiscalyear=Fiscal year
 # Week day
 Monday=星期一
 Tuesday=星期二
@@ -787,8 +794,8 @@ SetRef=Set ref
 Select2ResultFoundUseArrows=Some results found. Use arrows to select.
 Select2NotFound=No result found
 Select2Enter=Enter
-Select2MoreCharacter=or more character
-Select2MoreCharacters=or more characters
+Select2MoreCharacter=or more characters<br /><br /><strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
+Select2MoreCharacters=or more characters<br /><br /><strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
 Select2LoadingMoreResults=Loading more results...
 Select2SearchInProgress=Search in progress...
 SearchIntoThirdparties=Thirdparties
@@ -809,3 +816,5 @@ SearchIntoContracts=Contracts
 SearchIntoCustomerShipments=Customer shipments
 SearchIntoExpenseReports=Expense reports
 SearchIntoLeaves=休假
+
+BulkActions=Bulk actions
diff --git a/htdocs/langs/zh_TW/members.lang b/htdocs/langs/zh_TW/members.lang
index 73449d56101..51ba7d3d3e1 100644
--- a/htdocs/langs/zh_TW/members.lang
+++ b/htdocs/langs/zh_TW/members.lang
@@ -45,7 +45,7 @@ MemberStatusDraft=草案（等待驗證）
 MemberStatusDraftShort=草案
 MemberStatusActive=驗證（等待訂閱）
 MemberStatusActiveShort=驗證
-MemberStatusActiveLate=訂閱過期
+MemberStatusActiveLate=Subscription expired
 MemberStatusActiveLateShort=過期
 MemberStatusPaid=認購最新
 MemberStatusPaidShort=截至日期
@@ -136,8 +136,8 @@ DocForAllMembersCards=成員（名片格式生成所有輸出實際上設置<b>
 DocForOneMemberCards=設置<b>：%s</b>生成名片輸出實際上是一個特定的成員（格式）
 DocForLabels=生成報告表（格式輸出實際上設置<b>：%s）</b>
 SubscriptionPayment=認購款項
-LastSubscriptionDate=最後認購日期
-LastSubscriptionAmount=最後認購金額
+LastSubscriptionDate=Latest subscription date
+LastSubscriptionAmount=Latest subscription amount
 MembersStatisticsByCountries=成員由國家統計
 MembersStatisticsByState=成員由州/省的統計信息
 MembersStatisticsByTown=成員由鎮統計
@@ -149,7 +149,7 @@ MembersByStateDesc=此屏幕顯示你的統計，成員由州/省/州。
 MembersByTownDesc=該屏幕顯示您的成員由鎮統計。
 MembersStatisticsDesc=選擇你想讀的統計...
 MenuMembersStats=統計
-LastMemberDate=最後一個成員日期
+LastMemberDate=Latest member date
 Nature=種類
 Public=信息是公開的
 NewMemberbyWeb=增加了新成員。等待批準
diff --git a/htdocs/langs/zh_TW/orders.lang b/htdocs/langs/zh_TW/orders.lang
index ebb182c1174..d66dcf2b3a2 100644
--- a/htdocs/langs/zh_TW/orders.lang
+++ b/htdocs/langs/zh_TW/orders.lang
@@ -39,7 +39,7 @@ StatusOrderRefusedShort=拒絕
 StatusOrderBilledShort=帳單
 StatusOrderToProcessShort=要處理
 StatusOrderReceivedPartiallyShort=部分收到
-StatusOrderReceivedAllShort=一切都收到
+StatusOrderReceivedAllShort=Products received
 StatusOrderCanceled=取消
 StatusOrderDraft=草案（等待驗證）
 StatusOrderValidated=驗證階段
@@ -51,7 +51,7 @@ StatusOrderApproved=已核準
 StatusOrderRefused=已拒絕
 StatusOrderBilled=帳單
 StatusOrderReceivedPartially=部分收到
-StatusOrderReceivedAll=一切都收到
+StatusOrderReceivedAll=All products received
 ShippingExist=A貨存在
 QtyOrdered=訂購數量
 ProductQtyInDraft=Product quantity into draft orders
diff --git a/htdocs/langs/zh_TW/other.lang b/htdocs/langs/zh_TW/other.lang
index cb9dcac04cc..412a760ea54 100644
--- a/htdocs/langs/zh_TW/other.lang
+++ b/htdocs/langs/zh_TW/other.lang
@@ -2,6 +2,7 @@
 SecurityCode=安全代碼
 NumberingShort=N°
 Tools=工具
+TMenuTools=Tools
 ToolsDesc=All miscellaneous tools not included in other menu entries are collected here.<br /><br />All the tools can be reached in the left menu.
 Birthday=生日
 BirthdayDate=Birthday date
@@ -67,14 +68,15 @@ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find her
 PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nYou will find here the shipping __SHIPPINGREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nYou will find here the intervention __FICHINTERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n__PERSONALIZED__\n\n__SIGNATURE__
-DemoDesc=Dolibarr is a compact ERP/CRM supporting several functional modules. A demo showcasing all modules makes no sense as this scenario never occurs. So, several demo profiles are available.
+DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
+ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
 DemoFundation=一個基金會管理成員
 DemoFundation2=管理成員及銀行賬戶的基礎
-DemoCompanyServiceOnly=管理一特約銷售服務活動只
+DemoCompanyServiceOnly=Company or freelance selling service only
 DemoCompanyShopWithCashDesk=管理與現金辦公桌店
-DemoCompanyProductAndStocks=管理一個小型或中型公司銷售產品
-DemoCompanyAll=與管理（所有主要功能模塊多種活動小型或中型公司）
+DemoCompanyProductAndStocks=Company selling products with a shop
+DemoCompanyAll=Company with multiple activities (all main modules)
 CreatedBy=建立 by %s
 ModifiedBy=修改 by %s
 ValidatedBy=被%s驗證
diff --git a/htdocs/langs/zh_TW/products.lang b/htdocs/langs/zh_TW/products.lang
index 820294bfe7a..dff8f6f4fcc 100644
--- a/htdocs/langs/zh_TW/products.lang
+++ b/htdocs/langs/zh_TW/products.lang
@@ -5,6 +5,8 @@ ProductLabelTranslated=Translated product label
 ProductDescriptionTranslated=Translated product description
 ProductNoteTranslated=Translated product note
 ProductServiceCard=產品服務卡
+TMenuProducts=產品
+TMenuServices=服務
 Products=產品
 Services=服務
 Product=產品
@@ -58,7 +60,7 @@ SellingPrice=售價
 SellingPriceHT=銷售價格（稅後）
 SellingPriceTTC=銷售價格（包括稅）
 CostPriceDescription=This price (net of tax) can be used to store the average amount this product cost to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
-CostPriceUsage=In a future version, this value could be used for margin calculation.
+CostPriceUsage=This value could be used for margin calculation.
 SoldAmount=Sold amount
 PurchasedAmount=Purchased amount
 NewPrice=新價格
@@ -140,6 +142,7 @@ ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b>?
 CloneContentProduct=複製此產品/服務的所有資訊內容
 ClonePricesProduct=複製此產品/服務的價格資訊
 CloneCompositionProduct=複製產品/服務組合
+CloneCombinationsProduct=Clone product variants
 ProductIsUsed=該產品是用於
 NewRefForClone=新的產品/服務編號
 SellingPrices=銷售價格
@@ -236,7 +239,7 @@ GlobalVariables=Global variables
 VariableToUpdate=Variable to update
 GlobalVariableUpdaters=Global variable updaters
 UpdateInterval=Update interval (minutes)
-LastUpdated=Last updated
+LastUpdated=Latest update
 CorrectlyUpdated=Correctly updated
 PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
 PropalMergePdfProductChooseFile=Select PDF files
@@ -256,4 +259,41 @@ VolumeUnits=Volume unit
 SizeUnits=Size unit
 DeleteProductBuyPrice=Delete buying price
 ConfirmDeleteProductBuyPrice=Are you sure you want to delete this buying price?
+SubProduct=Sub product
 
+#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
+ProductCombinations=Variants
+HideProductCombinations=Hide products variant in the products selector
+ProductCombination=Variant
+NewProductCombination=New variant
+EditProductCombination=Editing variant
+ProductCombinationGenerator=Variants generator
+Features=Features
+PriceImpact=Price impact
+WeightImpact=Weight impact
+NewProductAttribute=新屬性
+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
+PercentageVariation=Percentage variation
+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 child products
+ConfirmCloneProductCombinations=Would you like to copy all the product variant to the 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
diff --git a/htdocs/langs/zh_TW/projects.lang b/htdocs/langs/zh_TW/projects.lang
index f0dd45fe6d1..a00589c9c8d 100644
--- a/htdocs/langs/zh_TW/projects.lang
+++ b/htdocs/langs/zh_TW/projects.lang
@@ -29,9 +29,9 @@ DeleteAProject=刪除一個項目
 DeleteATask=刪除任務
 ConfirmDeleteAProject=Are you sure you want to delete this project?
 ConfirmDeleteATask=Are you sure you want to delete this task?
-OpenedProjects=Open projects
-OpenedTasks=Open tasks
-OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
+OpenedProjects=Opened projects
+OpenedTasks=Opened tasks
+OpportunitiesStatusForOpenedProjects=Opportunities amount of opened projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=顯示項目
 SetProject=設置項目
@@ -47,7 +47,7 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=用戶
 TaskTimeNote=註解
 TaskTimeDate=Date
-TasksOnOpenedProject=Tasks on open projects
+TasksOnOpenedProject=Tasks on opened projects
 WorkloadNotDefined=Workload not defined
 NewTimeSpent=新的時間
 MyTimeSpent=我的時間花
@@ -58,6 +58,7 @@ TaskDateEnd=Task end date
 TaskDescription=Task description
 NewTask=新任務
 AddTask=Create task
+AddTimeSpent=Create time spent
 Activity=活動
 Activities=任務/活動
 MyActivities=我的任務/活動
@@ -95,6 +96,7 @@ ValidateProject=驗證專案
 ConfirmValidateProject=Are you sure you want to validate this project?
 CloseAProject=關閉項目
 ConfirmCloseAProject=Are you sure you want to close this project?
+AlsoCloseAProject=Also close project (keep it open if you still need to follow production tasks on it)
 ReOpenAProject=打開的項目
 ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=項目聯系人
@@ -120,7 +122,7 @@ CloneProjectFiles=Clone project joined files
 CloneTaskFiles=Clone task(s) joined files (if task(s) cloned)
 CloneMoveDate=Update project/tasks dates from now?
 ConfirmCloneProject=Are you sure to clone this project?
-ProjectReportDate=Change task date according project start date
+ProjectReportDate=Change task dates according to new project start date
 ErrorShiftTaskDate=Impossible to shift task date according to new project start date
 ProjectsAndTasksLines=Projects and tasks
 ProjectCreatedInDolibarr=Project %s created
@@ -177,9 +179,9 @@ ProjectsStatistics=Statistics on projects/leads
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 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.
-OpenedProjectsByThirdparties=Open projects by thirdparties
+OpenedProjectsByThirdparties=Opened projects by thirdparties
 OnlyOpportunitiesShort=Only opportunities
-OpenedOpportunitiesShort=Open opportunities
+OpenedOpportunitiesShort=Opened opportunities
 NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount
diff --git a/htdocs/langs/zh_TW/propal.lang b/htdocs/langs/zh_TW/propal.lang
index 837d11462f9..7b28a668c89 100644
--- a/htdocs/langs/zh_TW/propal.lang
+++ b/htdocs/langs/zh_TW/propal.lang
@@ -3,7 +3,7 @@ Proposals=商業建議
 Proposal=商業建議
 ProposalShort=建議
 ProposalsDraft=商業建議草案
-ProposalsOpened=Open commercial proposals
+ProposalsOpened=新開張的商業建議
 Prop=商業建議
 CommercialProposal=商業建議
 ProposalCard=建議卡
@@ -26,9 +26,9 @@ AmountOfProposalsByMonthHT=按月份金額（稅後）
 NbOfProposals=商業建議數
 ShowPropal=顯示建議
 PropalsDraft=草稿
-PropalsOpened=Open
+PropalsOpened=開業
 PropalStatusDraft=草案（等待驗證）
-PropalStatusValidated=驗證（建議打開）
+PropalStatusValidated=Validated (proposal is opened)
 PropalStatusSigned=簽名（需要收費）
 PropalStatusNotSigned=不簽署（非公開）
 PropalStatusBilled=帳單
diff --git a/htdocs/langs/zh_TW/stocks.lang b/htdocs/langs/zh_TW/stocks.lang
index 079039da911..ffabf0d1f35 100644
--- a/htdocs/langs/zh_TW/stocks.lang
+++ b/htdocs/langs/zh_TW/stocks.lang
@@ -22,13 +22,15 @@ Movements=轉讓
 ErrorWarehouseRefRequired=倉庫引用的名稱為必填
 ListOfWarehouses=倉庫名單
 ListOfStockMovements=庫存轉讓清單
+StockMovementForId=Movement ID %d
+ListMouvementStockProject=List of stock movements associated to project
 StocksArea=庫存區
 Location=位置
 LocationSummary=擺放位置
 NumberOfDifferentProducts=Number of different products
 NumberOfProducts=產品總數
-LastMovement=最新異動清單
-LastMovements=最新異動清單
+LastMovement=Latest movement
+LastMovements=Latest movements
 Units=單位
 Unit=單位
 StockCorrection=修正庫存數
@@ -140,3 +142,4 @@ ProductStockWarehouseCreated=Stock limit for alert and desired optimal stock cor
 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
diff --git a/htdocs/langs/zh_TW/supplier_proposal.lang b/htdocs/langs/zh_TW/supplier_proposal.lang
index a993e4b228a..093bf6e2824 100644
--- a/htdocs/langs/zh_TW/supplier_proposal.lang
+++ b/htdocs/langs/zh_TW/supplier_proposal.lang
@@ -8,7 +8,7 @@ SearchRequest=Find a request
 DraftRequests=Draft requests
 SupplierProposalsDraft=Draft supplier proposals
 LastModifiedRequests=Latest %s modified price requests
-RequestsOpened=Open price requests
+RequestsOpened=Opened price requests
 SupplierProposalArea=Supplier proposals area
 SupplierProposalShort=Supplier proposal
 SupplierProposals=Supplier proposals
@@ -23,7 +23,7 @@ ConfirmValidateAsk=Are you sure you want to validate this price request under na
 DeleteAsk=Delete request
 ValidateAsk=Validate request
 SupplierProposalStatusDraft=草案（等待驗證）
-SupplierProposalStatusValidated=Validated (request is open)
+SupplierProposalStatusValidated=Validated (request is opened)
 SupplierProposalStatusClosed=關閉
 SupplierProposalStatusSigned=Accepted
 SupplierProposalStatusNotSigned=Refused
diff --git a/htdocs/langs/zh_TW/suppliers.lang b/htdocs/langs/zh_TW/suppliers.lang
index 2025b3282e7..3dba22176dd 100644
--- a/htdocs/langs/zh_TW/suppliers.lang
+++ b/htdocs/langs/zh_TW/suppliers.lang
@@ -24,10 +24,10 @@ ExportDataset_fournisseur_1=供應商發票清單和發票的路線
 ExportDataset_fournisseur_2=供應商發票和付款
 ExportDataset_fournisseur_3=Supplier orders and order lines
 ApproveThisOrder=批準這個訂單
-ConfirmApproveThisOrder=確定核准此訂單
+ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b>?
 DenyingThisOrder=拒絕此訂單
-ConfirmDenyingThisOrder=拒絕此訂單
-ConfirmCancelThisOrder=取消此訂單
+ConfirmDenyingThisOrder=Are you sure you want to deny this order <b>%s</b>?
+ConfirmCancelThisOrder=Are you sure you want to cancel this order <b>%s</b>?
 AddSupplierOrder=新增供應商的訂單
 AddSupplierInvoice=新增供應商發票
 ListOfSupplierProductForSupplier=<b>供應商 %s 的產品及價格清單</b>
@@ -41,3 +41,4 @@ DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Wrong quality
 ReputationForThisProduct=Reputation
 BuyerName=Buyer name
+AllProductServicePrices=All product / service prices
diff --git a/htdocs/langs/zh_TW/users.lang b/htdocs/langs/zh_TW/users.lang
index d96d262407b..6f12e55637f 100644
--- a/htdocs/langs/zh_TW/users.lang
+++ b/htdocs/langs/zh_TW/users.lang
@@ -36,7 +36,7 @@ AdministratorDesc=管理員
 DefaultRights=默認權限
 DefaultRightsDesc=這裏定義<u>默認</u> ）權限自動授予一個<u>新創建的</u>用戶的用戶（轉到卡上改變現有的用戶權限。
 DolibarrUsers=Dolibarr用戶
-LastName=Last Name
+LastName=姓氏
 FirstName=名字
 ListOfGroups=群組名單
 NewGroup=新增群組
diff --git a/htdocs/langs/zh_TW/withdrawals.lang b/htdocs/langs/zh_TW/withdrawals.lang
index 287cb95149f..dd8b14c5374 100644
--- a/htdocs/langs/zh_TW/withdrawals.lang
+++ b/htdocs/langs/zh_TW/withdrawals.lang
@@ -24,6 +24,7 @@ WithdrawStatistics=Direct debit payment statistics
 WithdrawRejectStatistics=Direct debit payment reject statistics
 LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
+WithdrawRequestsDone=%s direct debit payment requests recorded
 ThirdPartyBankCode=第三方銀行代碼
 NoInvoiceCouldBeWithdrawed=沒有發票withdrawed成功。檢查發票的公司是一個有效的禁令。
 ClassCredited=分類記
@@ -76,8 +77,8 @@ RUM=UMR
 RUMLong=Unique Mandate Reference
 RUMWillBeGenerated=UMR number will be generated once bank account information are saved
 WithdrawMode=Direct debit mode (FRST or RECUR)
-WithdrawRequestAmount=Withdraw request amount:
-WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil amount.
+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
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 2d225458119..2ec76cf412f 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1243,7 +1243,7 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
             {
             	$tmpplugin=empty($conf->global->MAIN_USE_JQUERY_MULTISELECT)?constant('REQUIRE_JQUERY_MULTISELECT'):$conf->global->MAIN_USE_JQUERY_MULTISELECT;
             	print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/'.$tmpplugin.'/'.$tmpplugin.'.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-                print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/select2_locale.js.php'.($ext?'?'.$ext:'').'"></script>'."\n";
+                print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/select2_locale.js.php?lang='.$langs->defaultlang.($ext?'&amp;'.$ext:'').'"></script>'."\n";
             }
             // jQuery jMobile
             if (! $disablejmobile && (! empty($conf->global->MAIN_USE_JQUERY_JMOBILE) || defined('REQUIRE_JQUERY_JMOBILE') || (! empty($conf->dol_use_jmobile) && $conf->dol_use_jmobile > 0)))
@@ -1316,10 +1316,10 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
             
             // Global js function
             print '<!-- Includes JS of Dolibarr -->'."\n";
-            print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/lib_head.js.php?version='.urlencode(DOL_VERSION).($ext?'&amp;'.$ext:'').'"></script>'."\n";
+            print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/lib_head.js.php'.($ext?'?'.$ext:'').'"></script>'."\n";
 
             // Add datepicker default options
-            print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/datepicker.js.php?lang='.$langs->defaultlang.($ext?'&amp;'.$ext:'').'"></script>'."\n";
+            print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/datepicker.js.php'.($ext?'?'.$ext:'').'"></script>'."\n";
 
             // JS forced by modules (relative url starting with /)
             if (! empty($conf->modules_parts['js']))		// $conf->modules_parts['js'] is array('module'=>array('file1','file2'))
@@ -1926,7 +1926,16 @@ if (! function_exists("llxFooter"))
     		print '<script type="text/javascript">
             	jQuery(document).ready(function () {
             		jQuery(".classfortooltip").tipTip({maxWidth: "'.dol_size(($conf->browser->layout == 'phone' ? 400 : 700),'width').'px", edgeOffset: 10, delay: 50, fadeIn: 50, fadeOut: 50});
-            	});
+            		jQuery(".classfortooltiponclicktext").dialog({ width: 500, autoOpen: false });
+            		jQuery(".classfortooltiponclick").click(function () {
+            		    console.log("We click on tooltip for element with dolid="+$(this).attr(\'dolid\'));
+            		    if ($(this).attr(\'dolid\'))
+            		    {
+                            obj=$("#idfortooltiponclick_"+$(this).attr(\'dolid\'));
+            		        obj.dialog("open");
+            		    }
+            		});
+                });
             </script>' . "\n";
         }
         
diff --git a/htdocs/product/index.php b/htdocs/product/index.php
index 74a974804ff..84991a76db2 100644
--- a/htdocs/product/index.php
+++ b/htdocs/product/index.php
@@ -77,35 +77,35 @@ print load_fiche_titre($transAreaType,$linkback,'title_products.png');
 print '<div class="fichecenter"><div class="fichethirdleft">';
 
 
-/*
- * Search Area of product/service
- */
- 
-// Search contract
-if ((! empty($conf->product->enabled) || ! empty($conf->service->enabled)) && ($user->rights->produit->lire || $user->rights->service->lire))
+if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is useless due to the global search combo
 {
-	$listofsearchfields['search_product']=array('text'=>'ProductOrService');
+    // Search contract
+    if ((! empty($conf->product->enabled) || ! empty($conf->service->enabled)) && ($user->rights->produit->lire || $user->rights->service->lire))
+    {
+    	$listofsearchfields['search_product']=array('text'=>'ProductOrService');
+    }
+    
+    if (count($listofsearchfields))
+    {
+    	print '<form method="post" action="'.DOL_URL_ROOT.'/core/search.php">';
+    	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+    	print '<table class="noborder nohover centpercent">';
+    	$i=0;
+    	foreach($listofsearchfields as $key => $value)
+    	{
+    		if ($i == 0) print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
+    		print '<tr '.$bc[false].'>';
+    		print '<td class="nowrap"><label for="'.$key.'">'.$langs->trans($value["text"]).'</label></td><td><input type="text" class="flat inputsearch" name="'.$key.'" id="'.$key.'" size="18"></td>';
+    		if ($i == 0) print '<td rowspan="'.count($listofsearchfields).'"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td>';
+    		print '</tr>';
+    		$i++;
+    	}
+    	print '</table>';	
+    	print '</form>';
+    	print '<br>';
+    }
 }
 
-if (count($listofsearchfields))
-{
-	print '<form method="post" action="'.DOL_URL_ROOT.'/core/search.php">';
-	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-	print '<table class="noborder nohover centpercent">';
-	$i=0;
-	foreach($listofsearchfields as $key => $value)
-	{
-		if ($i == 0) print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
-		print '<tr '.$bc[false].'>';
-		print '<td class="nowrap"><label for="'.$key.'">'.$langs->trans($value["text"]).'</label></td><td><input type="text" class="flat inputsearch" name="'.$key.'" id="'.$key.'" size="18"></td>';
-		if ($i == 0) print '<td rowspan="'.count($listofsearchfields).'"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td>';
-		print '</tr>';
-		$i++;
-	}
-	print '</table>';	
-	print '</form>';
-	print '<br>';
-}
 
 /*
  * Number of products and/or services
diff --git a/htdocs/product/stock/index.php b/htdocs/product/stock/index.php
index 5f075370df6..7349b48d1c9 100644
--- a/htdocs/product/stock/index.php
+++ b/htdocs/product/stock/index.php
@@ -48,17 +48,18 @@ print load_fiche_titre($langs->trans("StocksArea"));
 print '<div class="fichecenter"><div class="fichethirdleft">';
 
 
-/*
- * Zone recherche entrepot
- */
-print '<form method="post" action="'.DOL_URL_ROOT.'/product/stock/list.php">';
-print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-print '<table class="noborder nohover" width="100%">';
-print "<tr class=\"liste_titre\">";
-print '<td colspan="3">'.$langs->trans("Search").'</td></tr>';
-print "<tr ".$bc[false]."><td>";
-print $langs->trans("Warehouse").':</td><td><input class="flat" type="text" size="18" name="sall"></td><td rowspan="2"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
-print "</table></form><br>";
+if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is useless due to the global search combo
+{
+    print '<form method="post" action="'.DOL_URL_ROOT.'/product/stock/list.php">';
+    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+    print '<table class="noborder nohover" width="100%">';
+    print "<tr class=\"liste_titre\">";
+    print '<td colspan="3">'.$langs->trans("Search").'</td></tr>';
+    print "<tr ".$bc[false]."><td>";
+    print $langs->trans("Warehouse").':</td><td><input class="flat" type="text" size="18" name="sall"></td><td rowspan="2"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
+    print "</table></form><br>";
+}
+
 
 $sql = "SELECT e.label, e.rowid, e.statut";
 $sql.= " FROM ".MAIN_DB_PREFIX."entrepot as e";
diff --git a/htdocs/projet/activity/index.php b/htdocs/projet/activity/index.php
index adf6efbc95c..4586c8d52a6 100644
--- a/htdocs/projet/activity/index.php
+++ b/htdocs/projet/activity/index.php
@@ -74,33 +74,36 @@ else
 
 print '<div class="fichecenter"><div class="fichethirdleft">';
 
-// Search project
-if (! empty($conf->projet->enabled) && $user->rights->projet->lire)
+
+if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is useless due to the global search combo
 {
-	$listofsearchfields['search_task']=array('text'=>'Task');
+    // Search project
+    if (! empty($conf->projet->enabled) && $user->rights->projet->lire)
+    {
+    	$listofsearchfields['search_task']=array('text'=>'Task');
+    }
+    
+    if (count($listofsearchfields))
+    {
+    	print '<form method="post" action="'.DOL_URL_ROOT.'/core/search.php">';
+    	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+    	print '<table class="noborder nohover centpercent">';
+    	$i=0;
+    	foreach($listofsearchfields as $key => $value)
+    	{
+    		if ($i == 0) print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
+    		print '<tr '.$bc[false].'>';
+    		print '<td class="nowrap"><label for="'.$key.'">'.$langs->trans($value["text"]).'</label></td><td><input type="text" class="flat inputsearch" name="'.$key.'" id="'.$key.'" size="18"></td>';
+    		if ($i == 0) print '<td rowspan="'.count($listofsearchfields).'"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td>';
+    		print '</tr>';
+    		$i++;
+    	}
+    	print '</table>';	
+    	print '</form>';
+    	print '<br>';
+    }
 }
 
-if (count($listofsearchfields))
-{
-	print '<form method="post" action="'.DOL_URL_ROOT.'/core/search.php">';
-	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-	print '<table class="noborder nohover centpercent">';
-	$i=0;
-	foreach($listofsearchfields as $key => $value)
-	{
-		if ($i == 0) print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
-		print '<tr '.$bc[false].'>';
-		print '<td class="nowrap"><label for="'.$key.'">'.$langs->trans($value["text"]).'</label></td><td><input type="text" class="flat inputsearch" name="'.$key.'" id="'.$key.'" size="18"></td>';
-		if ($i == 0) print '<td rowspan="'.count($listofsearchfields).'"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td>';
-		print '</tr>';
-		$i++;
-	}
-	print '</table>';	
-	print '</form>';
-	print '<br>';
-}
-
-print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 
 /* Affichage de la liste des projets d'aujourd'hui */
 print '<table class="noborder" width="100%">';
@@ -156,8 +159,11 @@ print "</tr>\n";
 print "</table>";
 
 
+print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
+
+
 /* Affichage de la liste des projets d'hier */
-print '<br><table class="noborder" width="100%">';
+print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans('ActivityOnProjectYesterday').'</td>';
 print '<td align="right">'.$langs->trans("Time").'</td>';
diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php
index 87a5509cd38..54643ad6780 100644
--- a/htdocs/projet/element.php
+++ b/htdocs/projet/element.php
@@ -823,7 +823,7 @@ foreach ($listofreferent as $key => $value)
 				print "</td>\n";
 				
 				// Ref
-				print '<td align="left">';
+				print '<td align="left" class="nowrap">';
 				if ($tablename == 'expensereport_det')
 				{
 					print $expensereport->getNomUrl(1);
diff --git a/htdocs/projet/index.php b/htdocs/projet/index.php
index c91bfe1f980..f3690eee61e 100644
--- a/htdocs/projet/index.php
+++ b/htdocs/projet/index.php
@@ -98,30 +98,34 @@ else dol_print_error($db);
 
 print '<div class="fichecenter"><div class="fichethirdleft">';
 
-// Search project
-if (! empty($conf->projet->enabled) && $user->rights->projet->lire)
-{
-	$listofsearchfields['search_project']=array('text'=>'Project');
-}
 
-if (count($listofsearchfields))
+if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is useless due to the global search combo
 {
-	print '<form method="post" action="'.DOL_URL_ROOT.'/core/search.php">';
-	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-	print '<table class="noborder nohover centpercent">';
-	$i=0;
-	foreach($listofsearchfields as $key => $value)
-	{
-		if ($i == 0) print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
-		print '<tr '.$bc[false].'>';
-		print '<td class="nowrap"><label for="'.$key.'">'.$langs->trans($value["text"]).'</label></td><td><input type="text" class="flat inputsearch" name="'.$key.'" id="'.$key.'" size="18"></td>';
-		if ($i == 0) print '<td rowspan="'.count($listofsearchfields).'"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td>';
-		print '</tr>';
-		$i++;
-	}
-	print '</table>';	
-	print '</form>';
-	print '<br>';
+    // Search project
+    if (! empty($conf->projet->enabled) && $user->rights->projet->lire)
+    {
+    	$listofsearchfields['search_project']=array('text'=>'Project');
+    }
+    
+    if (count($listofsearchfields))
+    {
+    	print '<form method="post" action="'.DOL_URL_ROOT.'/core/search.php">';
+    	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+    	print '<table class="noborder nohover centpercent">';
+    	$i=0;
+    	foreach($listofsearchfields as $key => $value)
+    	{
+    		if ($i == 0) print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
+    		print '<tr '.$bc[false].'>';
+    		print '<td class="nowrap"><label for="'.$key.'">'.$langs->trans($value["text"]).'</label></td><td><input type="text" class="flat inputsearch" name="'.$key.'" id="'.$key.'" size="18"></td>';
+    		if ($i == 0) print '<td rowspan="'.count($listofsearchfields).'"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td>';
+    		print '</tr>';
+    		$i++;
+    	}
+    	print '</table>';	
+    	print '</form>';
+    	print '<br>';
+    }
 }
 
 
diff --git a/htdocs/societe/index.php b/htdocs/societe/index.php
index 333ee590f2d..5fa0fd37210 100644
--- a/htdocs/societe/index.php
+++ b/htdocs/societe/index.php
@@ -57,36 +57,38 @@ print load_fiche_titre($transAreaType,$linkback,'title_companies.png');
 print '<div class="fichecenter"><div class="fichethirdleft">';
 
 
-
-// Search thirdparty
-if (! empty($conf->societe->enabled) && $user->rights->societe->lire)
+if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is useless due to the global search combo
 {
-	$listofsearchfields['search_thirdparty']=array('text'=>'ThirdParty');
-}
-// Search contact/address
-if (! empty($conf->societe->enabled) && $user->rights->societe->lire)
-{
-	$listofsearchfields['search_contact']=array('text'=>'Contact');
-}
-
-if (count($listofsearchfields))
-{
-	print '<form method="post" action="'.DOL_URL_ROOT.'/core/search.php">';
-	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-	print '<table class="noborder nohover centpercent">';
-	$i=0;
-	foreach($listofsearchfields as $key => $value)
-	{
-		if ($i == 0) print '<tr class="liste_titre"><th colspan="3">'.$langs->trans("Search").'</th></tr>';
-		print '<tr '.$bc[false].'>';
-		print '<td class="nowrap"><label for="'.$key.'">'.$langs->trans($value["text"]).'</label></td><td><input type="text" class="flat inputsearch" name="'.$key.'" id="'.$key.'" size="18"></td>';
-		if ($i == 0) print '<td rowspan="'.count($listofsearchfields).'"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td>';
-		print '</tr>';
-		$i++;
-	}
-	print '</table>';	
-	print '</form>';
-	print '<br>';
+    // Search thirdparty
+    if (! empty($conf->societe->enabled) && $user->rights->societe->lire)
+    {
+    	$listofsearchfields['search_thirdparty']=array('text'=>'ThirdParty');
+    }
+    // Search contact/address
+    if (! empty($conf->societe->enabled) && $user->rights->societe->lire)
+    {
+    	$listofsearchfields['search_contact']=array('text'=>'Contact');
+    }
+    
+    if (count($listofsearchfields))
+    {
+    	print '<form method="post" action="'.DOL_URL_ROOT.'/core/search.php">';
+    	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+    	print '<table class="noborder nohover centpercent">';
+    	$i=0;
+    	foreach($listofsearchfields as $key => $value)
+    	{
+    		if ($i == 0) print '<tr class="liste_titre"><th colspan="3">'.$langs->trans("Search").'</th></tr>';
+    		print '<tr '.$bc[false].'>';
+    		print '<td class="nowrap"><label for="'.$key.'">'.$langs->trans($value["text"]).'</label></td><td><input type="text" class="flat inputsearch" name="'.$key.'" id="'.$key.'" size="18"></td>';
+    		if ($i == 0) print '<td rowspan="'.count($listofsearchfields).'"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td>';
+    		print '</tr>';
+    		$i++;
+    	}
+    	print '</table>';	
+    	print '</form>';
+    	print '<br>';
+    }
 }
 
 
diff --git a/htdocs/supplier_proposal/index.php b/htdocs/supplier_proposal/index.php
index 9e07aaf5d96..eec34a02987 100644
--- a/htdocs/supplier_proposal/index.php
+++ b/htdocs/supplier_proposal/index.php
@@ -60,15 +60,19 @@ print '<div class="fichecenter"><div class="fichethirdleft">';
 /*
  * Search form
  */
-$var=false;
-print '<form method="post" action="'.DOL_URL_ROOT.'/supplier_proposal/list.php">';
-print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-print '<table class="noborder nohover" width="100%">';
-print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
-print '<tr '.$bc[$var].'><td>';
-print $langs->trans("SupplierProposal").':</td><td><input type="text" class="flat" name="sall" size="18"></td><td><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
-print '</tr>';
-print "</table></form><br>\n";
+
+if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is useless due to the global search combo
+{
+    $var=false;
+    print '<form method="post" action="'.DOL_URL_ROOT.'/supplier_proposal/list.php">';
+    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+    print '<table class="noborder nohover" width="100%">';
+    print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
+    print '<tr '.$bc[$var].'><td>';
+    print $langs->trans("SupplierProposal").':</td><td><input type="text" class="flat" name="sall" size="18"></td><td><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
+    print '</tr>';
+    print "</table></form><br>\n";
+}
 
 
 /*
diff --git a/htdocs/support/index.php b/htdocs/support/index.php
index a895cf5cb1e..0e27107ef54 100644
--- a/htdocs/support/index.php
+++ b/htdocs/support/index.php
@@ -44,7 +44,7 @@ $langs->load("help");
 
 pHeader($langs->trans("DolibarrHelpCenter"), $_SERVER["PHP_SELF"]);
 
-print $langs->trans("HelpCenterDesc1")."<br>\n";
+print '<br>'.$langs->trans("HelpCenterDesc1")."<br>\n";
 print $langs->trans("HelpCenterDesc2")."<br>\n";
 
 print '<br>';
@@ -62,13 +62,13 @@ $style1='color: #333344; font-size: 16px; font-weight: bold';
 $style2='color: #5D4455; font-weight: bold;';
 
 print "\n";
-print '<div style="width: 100%"><div class="inline-block">';
+print '<div style="width: 100%; text-align: center"><div class="inline-block">';
 print "\n";
 
 // Forum/wiki support
 print '<table class="login tablesupport" width="100%">';
 print '<tr class="title" valign="top">';
-print '<td width="100%" align="left" valign="top">';
+print '<td width="100%" align="left" valign="middle">';
 
 print '<table summary="who"><tr><td>'.img_picto('','who.png','',1).'</td><td>';
 
@@ -82,7 +82,7 @@ print '</td>';
 print '</tr>';
 
 print '<tr>';
-print '<td align="center" valign="top">';
+print '<td align="center" valign="middle">';
 
 print '<table class="nocellnopadd">';
 print '<tr><td align="center">';
@@ -112,7 +112,7 @@ print '</div><div class="inline-block">';
 // Official support
 print '<table class="login" width="100%">';
 print '<tr class="title">';
-print '<td width="100%" align="left" valign="top">';
+print '<td width="100%" align="left" valign="middle">';
 
 print '<table summary="community"><tr><td>'.img_picto('','internet.png','',1).'</td><td>';
 print '<font style="'.$style1.'">'.$langs->trans("OfficialSupport").'</font>';
@@ -124,7 +124,7 @@ print '</td></tr></table>';
 
 print '</td>';
 print '</tr><tr>';
-print '<td align="center" valign="top">';
+print '<td align="center" valign="middle">';
 print '<table class="nocellnopadd">';
 print '<tr><td align="center">';
 
@@ -148,7 +148,7 @@ print '</div><div class="inline-block">';
 // Online support
 print '<table class="login" width="100%">';
 print '<tr class="title">';
-print '<td width="100%" align="left" valign="top">';
+print '<td width="100%" align="left" valign="middle">';
 
 print '<table summary="community"><tr><td>'.img_picto('','internet.png','',1).'</td><td>';
 
@@ -161,7 +161,7 @@ print '</td></tr></table>';
 
 print '</td>';
 print '</tr><tr>';
-print '<td align="center" valign="top">';
+print '<td align="center" valign="middle">';
 print '<table class="nocellnopadd">';
 print '<tr><td align="center">';
 print '<br>'.$langs->trans("ToSeeListOfAvailableRessources").'<br>';
@@ -181,7 +181,7 @@ print '</div><div class="inline-block">';
 // EMail support
 print '<table class="login tablesupport" width="100%">';
 print '<tr class="title" valign="top">';
-print '<td width="100%" align="left" valign="top">';
+print '<td width="100%" align="left" valign="middle">';
 
 print '<table summary="mail"><tr><td>'.img_picto('','mail.png','',1).'</td><td>';
 
@@ -214,7 +214,7 @@ print '</div><div class="inline-block">';
 // Other support
 print '<table class="login tablesupport" width="100%">';
 print '<tr class="title">';
-print '<td width="100%" align="left" valign="top">';
+print '<td width="100%" align="left" valign="middle">';
 
 print '<table summary="special"><tr><td>'.img_picto('','pagemaster.png','',1).'</td><td>';
 
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index c8b18c81987..8fae97bb91d 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -1476,7 +1476,7 @@ form#login {
 }
 .login_main_message {
 	text-align: center;
-	max-width: 560px;
+	max-width: 570px;
 	margin-bottom: 10px;
 }
 .login_main_message .error {
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index ad4ec25df1d..3ce7c107939 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -1483,7 +1483,7 @@ form#login {
 }
 .login_main_message {
 	text-align: center;
-	max-width: 560px;
+	max-width: 570px;
 	margin-bottom: 10px;
 }
 .login_main_message .error {