diff --git a/.stickler.yml b/.stickler.yml
new file mode 100644
index 00000000000..b68804448b2
--- /dev/null
+++ b/.stickler.yml
@@ -0,0 +1,10 @@
+---
+linters:
+  phpcs:
+      standard: 'dev/setup/codesniffer/ruleset.xml'
+      extensions: 'php'
+      tab_width: 4
+      fixer: true
+
+fixers:
+    enable: true
diff --git a/.travis.yml b/.travis.yml
index 63e48a051f0..5bbfaabbdd2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -304,7 +304,7 @@ script:
   set -e
   # Exclusions are defined in the ruleset.xml file
   #phpcs -s -n -p -d memory_limit=-1 --colors --tab-width=4 --standard=dev/setup/codesniffer/ruleset.xml --encoding=utf-8 .
-  phpcs -s -p -d memory_limit=-1 --extensions=php --colors --tab-width=4 --standard=dev/setup/codesniffer/ruleset.xml --encoding=utf-8 --runtime-set ignore_warnings_on_exit true .
+  if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then phpcs -s -p -d memory_limit=-1 --extensions=php --colors --tab-width=4 --standard=dev/setup/codesniffer/ruleset.xml --encoding=utf-8 --runtime-set ignore_warnings_on_exit true .; fi
   set +e
   echo
 
diff --git a/ChangeLog b/ChangeLog
index c78ad8674eb..ee409bb7588 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,105 @@
 English Dolibarr ChangeLog
 --------------------------------------------------------------
 
+***** ChangeLog for 10.0.2 compared to 10.0.1 *****
+
+FIX: #10460 compatibility with MariaDB 10.4
+FIX: #11401 Adherent unknown language key
+FIX: #11422 Can't edit his own events with standard rights
+FIX: #11427 require product class (fixes POST /supplierinvoices REST API endpoint)
+FIX: #11570
+FIX: #11591 FIX: #11592
+FIX: #11671 CVE-2019-15062
+FIX: #11672
+FIX: #11685
+FIX: #11702
+FIX: #11711
+FIX: #11720
+FIX: #11746 Unable to modify amount of insurance of a loan
+FIX: #11752
+FIX: #11789 FIX: #11790
+FIX: #11804 list of tickets from a customer card display ALL tickets
+FIX: #11834
+FIX: Add char $ and ; in sanitizing of filenames.
+FIX: Add comment before protected functions
+FIX: Add log and type of content in dolWebsiteOutput and
+FIX: Add repair.php option 'restore' to restore user picture after v10
+FIX: amount opened on thirdparty card dont care of credit note not converted
+FIX: Api of documents work with value 'thirdparty'
+FIX: author in message / ticket API
+FIX: avoid sql error if fk_project is empty during update
+FIX: avoid Warning: A non-numeric value encountered
+FIX: bad consistency in list of invoice for direct debit order.
+FIX: Bad error management in zip compress and web site export
+FIX: bad substitution for extrafields type checkbox
+FIX: better help message with multicompany
+FIX: calculation of $products_dispatched
+FIX: Can't add a new chart of account
+FIX: Can't delete a draft leave even if it should
+FIX: Can't save setup of mailman module
+FIX: column jabberid missing
+FIX: Confirmation of deletion
+FIX: Consistency in direct debit order lists.
+FIX: Content send before header warning
+FIX: credit note can be split
+FIX: credit note used on list
+FIX: Css was saved on wrong website.
+FIX: delivery extrafields
+FIX: Disabling a website does not put it offline
+FIX: display only stripe sources for customer
+FIX: display payment intent in stripe's charge list
+FIX: document list for products in API
+FIX: dol_thirdparty_id for stripe PI
+FIX: Do not show tooltip if tooltip is empty
+FIX: duplicate css tag, decrease padding-bottom for boxes in eldy theme
+FIX: duration when creating service
+FIX: EDB-ID:47370
+FIX: Enable web site
+FIX: error management when adding a property with type real
+FIX: Fatal situation if payment removed on expense report. Action
+FIX: filepath of generated documents doesn't handle products with special characters
+FIX: for MAIN_MAXTABS_IN_CARD = $i card
+FIX: gzip and bzip2 must use option -f
+FIX: It was possible to create cashfence without entering data.
+FIX: javascript error when using dol_use_jmobile=1
+FIX: logout redirect to takepos.php
+FIX: Look and feel v10
+FIX: Make protected all pfd models functions
+FIX: management of extrafields in modulebuilder
+FIX: Missing div for buttons in tax, loan, various payment modules
+FIX: missing include (dol_convert_file not found)
+FIX: Missing some replacements in website module
+FIX: missing test on permission on button to delete ledger record
+FIX: Missing the filter fields in export of expense report and leaves
+FIX: Missing ticket icon on md theme
+FIX: Missing transaction
+FIX: Mode smartphone was not triggered when there is too loo menu
+FIX: Must escape shell
+FIX: Must exclude logs and some dirs for compressed backup
+FIX: name and position of hook FIX: #11710
+FIX: Not showing MAIN_INVERT_SENDER_RECIPIENT when edit field
+FIX: Nowrap missing on amount in boxes
+FIX: Option to use ZipArchive instead of PclZip bugged with large files.
+FIX: order or proposals billed if both workflow conf activated
+FIX: permission check on API intervention
+FIX: phpcs
+FIX: placement function
+FIX: qty in invoice list on product's stats
+FIX: remove disabled product type from product list
+FIX: Return code of pdf_einstein.modules.php and proformat
+FIX: round for application fee in stripe
+FIX: Sens of the balance (Debit - Credit in accountancy not contrary)
+FIX: Several pb in export of documents
+FIX: SQL syntax error and CSRF check on vat reports
+FIX: takepos layout clear or focus search
+FIX: too many record in sql request. Whena criteria is a filter, we must
+FIX: Translation of month
+FIX: USEDOLIBARREDITOR not always set
+FIX: VAT number for Monaco (it uses FR)
+FIX: vulenrability in uploading file found by 美创科技安全实验室
+FIX: wrong display (and hidden input) for already dispatched quantity
+FIX: wrong parameters (same error in branch 9, 10, develop)
+FIX: Wrong variable. Must be PROJECT_HIDE_UNSELECTABLES
 
 ***** ChangeLog for 10.0.1 compared to 10.0.0 *****
 FIX: #10930
diff --git a/htdocs/accountancy/bookkeeping/balance.php b/htdocs/accountancy/bookkeeping/balance.php
index 44a12b76f36..52cb1370cfc 100644
--- a/htdocs/accountancy/bookkeeping/balance.php
+++ b/htdocs/accountancy/bookkeeping/balance.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2016       Olivier Geffroy         <jeff@jeffinfo.com>
  * Copyright (C) 2016       Florian Henry           <florian.henry@open-concept.pro>
- * Copyright (C) 2016-2018  Alexandre Spangaro      <aspangaro@open-dsi.fr>
+ * Copyright (C) 2016-2019  Alexandre Spangaro      <aspangaro@open-dsi.fr>
  * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -164,7 +164,7 @@ if ($action == 'export_csv')
 		print $object->get_compte_desc($line->numero_compte) . $sep;
 		print price($line->debit) . $sep;
 		print price($line->credit) . $sep;
-		print price($line->credit - $line->debit) . $sep;
+		print price($line->debit - $line->credit) . $sep;
 		print "\n";
 	}
 
@@ -293,9 +293,9 @@ if ($action != 'export_csv')
 
 		print '<td>' . length_accountg($line->numero_compte) . '</td>';
 		print '<td>' . $description . '</td>';
-		print '<td class="right">' . price($line->debit) . '</td>';
-		print '<td class="right">' . price($line->credit) . '</td>';
-		print '<td class="right">' . price($line->credit - $line->debit) . '</td>';
+		print '<td class="nowraponall right">' . price($line->debit) . '</td>';
+		print '<td class="nowraponall right">' . price($line->credit) . '</td>';
+		print '<td class="nowraponall right">' . price($line->debit - $line->credit) . '</td>';
 		print '<td class="center">' . $link;
 		print '</td>';
 		print "</tr>\n";
@@ -305,11 +305,11 @@ if ($action != 'export_csv')
 		$sous_total_credit += $line->credit;
 	}
 
-	print '<tr class="liste_total"><td class="right" colspan="2">' . $langs->trans("SubTotal") . ':</td><td class="nowrap right">' . price($sous_total_debit) . '</td><td class="nowrap right">' . price($sous_total_credit) . '</td><td class="nowrap right">' . price(price2num($sous_total_credit - $sous_total_debit)) . '</td>';
+	print '<tr class="liste_total"><td class="right" colspan="2">' . $langs->trans("SubTotal") . ':</td><td class="nowrap right">' . price($sous_total_debit) . '</td><td class="nowrap right">' . price($sous_total_credit) . '</td><td class="nowrap right">' . price(price2num($sous_total_debit - $sous_total_credit)) . '</td>';
 	print "<td>&nbsp;</td>\n";
 	print '</tr>';
 
-	print '<tr class="liste_total"><td class="right" colspan="2">' . $langs->trans("AccountBalance") . ':</td><td class="nowrap right">' . price($total_debit) . '</td><td class="nowrap right">' . price($total_credit) . '</td><td class="nowrap right">' . price(price2num($total_credit - $total_debit)) . '</td>';
+	print '<tr class="liste_total"><td class="right" colspan="2">' . $langs->trans("AccountBalance") . ':</td><td class="nowrap right">' . price($total_debit) . '</td><td class="nowrap right">' . price($total_credit) . '</td><td class="nowrap right">' . price(price2num($total_debit - $total_credit)) . '</td>';
 	print "<td>&nbsp;</td>\n";
 	print '</tr>';
 
diff --git a/htdocs/adherents/class/adherent_type.class.php b/htdocs/adherents/class/adherent_type.class.php
index 0d3980318a4..9591a24fa78 100644
--- a/htdocs/adherents/class/adherent_type.class.php
+++ b/htdocs/adherents/class/adherent_type.class.php
@@ -424,7 +424,7 @@ class AdherentType extends CommonObject
 		global $langs;
 		if ($morphy == 'phy') { return $langs->trans("Physical"); }
 		elseif ($morphy == 'mor') { return $langs->trans("Moral"); }
-        else return $langs->trans("Physical & Morale");
+        else return $langs->trans("MorPhy");
 		//return $morphy;
 	}
 
diff --git a/htdocs/adherents/ldap.php b/htdocs/adherents/ldap.php
index 1d890ab580f..76d915aee32 100644
--- a/htdocs/adherents/ldap.php
+++ b/htdocs/adherents/ldap.php
@@ -83,10 +83,10 @@ if ($action == 'dolibarr2ldap')
  *	View
  */
 
-llxHeader('', $langs->trans("Member"), 'EN:Module_Foundations|FR:Module_Adh&eacute;rents|ES:M&oacute;dulo_Miembros');
-
 $form = new Form($db);
 
+llxHeader('', $langs->trans("Member"), 'EN:Module_Foundations|FR:Module_Adh&eacute;rents|ES:M&oacute;dulo_Miembros');
+
 $head = member_prepare_head($object);
 
 dol_fiche_head($head, 'ldap', $langs->trans("Member"), 0, 'user');
@@ -98,12 +98,12 @@ dol_banner_tab($object, 'rowid', $linkback);
 print '<div class="fichecenter">';
 
 print '<div class="underbanner clearboth"></div>';
-print '<table class="border centpercent">';
+print '<table class="border centpercent tableforfield">';
 
 // Login
-print '<tr><td class="titlefield">'.$langs->trans("Login").'</td><td class="valeur">'.$object->login.'&nbsp;</td></tr>';
+print '<tr><td class="titlefield">'.$langs->trans("Login").' / '.$langs->trans("Id").'</td><td class="valeur">'.$object->login.'&nbsp;</td></tr>';
 
-// Password not crypted
+// If there is a link to password not crypted, we show value in database here so we can compare because it is shown nowhere else
 if (! empty($conf->global->LDAP_MEMBER_FIELD_PASSWORD))
 {
 	print '<tr><td>'.$langs->trans("LDAPFieldPasswordNotCrypted").'</td>';
@@ -111,18 +111,11 @@ if (! empty($conf->global->LDAP_MEMBER_FIELD_PASSWORD))
 	print "</tr>\n";
 }
 
-// Password crypted
-if (! empty($conf->global->LDAP_MEMBER_FIELD_PASSWORD_CRYPTED))
-{
-	print '<tr><td>'.$langs->trans("LDAPFieldPasswordCrypted").'</td>';
-	print '<td class="valeur">'.$object->pass_crypted.'</td>';
-	print "</tr>\n";
-}
+$adht = new AdherentType($db);
+$adht->fetch($object->typeid);
 
 // Type
-print '<tr><td>'.$langs->trans("Type").'</td><td class="valeur">'.$object->type."</td></tr>\n";
-
-$langs->load("admin");
+print '<tr><td>'.$langs->trans("Type").'</td><td class="valeur">'.$adht->getNomUrl(1)."</td></tr>\n";
 
 // LDAP DN
 print '<tr><td>LDAP '.$langs->trans("LDAPMemberDn").'</td><td class="valeur">'.$conf->global->LDAP_MEMBER_DN."</td></tr>\n";
diff --git a/htdocs/adherents/note.php b/htdocs/adherents/note.php
index ce2918cb86a..5f5ab38da61 100644
--- a/htdocs/adherents/note.php
+++ b/htdocs/adherents/note.php
@@ -80,7 +80,7 @@ if ($id)
     print '<div class="fichecenter">';
 
     print '<div class="underbanner clearboth"></div>';
-	print '<table class="border centpercent">';
+	print '<table class="border centpercent tableforfield">';
 
     // Login
     if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
diff --git a/htdocs/adherents/subscription.php b/htdocs/adherents/subscription.php
index ab8206c66b8..7663fe6fba3 100644
--- a/htdocs/adherents/subscription.php
+++ b/htdocs/adherents/subscription.php
@@ -478,7 +478,7 @@ if ($rowid > 0)
     print '<div class="fichehalfleft">';
 
     print '<div class="underbanner clearboth"></div>';
-    print '<table class="border" width="100%">';
+    print '<table class="border centpercent tableforfield">';
 
 	// Login
 	if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php
index 4251ba45ab9..f41275a4c71 100644
--- a/htdocs/adherents/type.php
+++ b/htdocs/adherents/type.php
@@ -283,7 +283,7 @@ if (! $rowid && $action != 'create' && $action != 'edit')
             print '<td class="center">';
 			if ($objp->morphy == 'phy') { print $langs->trans("Physical"); }
 			elseif ($objp->morphy == 'mor') { print $langs->trans("Moral"); }
-			else print $langs->trans("Physical & Morale");
+			else print $langs->trans("MorPhy");
             print '</td>';
 			print '<td class="center">'.yn($objp->subscription).'</td>';
 			print '<td class="center">'.yn($objp->vote).'</td>';
@@ -822,7 +822,7 @@ if ($rowid > 0)
 						$value = $_POST["options_" . $key];
 					}
 				} else {
-					$value = $adht->array_options["options_" . $key];
+					$value = $object->array_options["options_" . $key];
 				}
 				print '<tr><td width="30%">'.$label.'</td><td>';
 				print $extrafields->showInputField($key, $value);
diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index f68864fcc3d..ee90a0638fb 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -39,7 +39,7 @@ 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';
-if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array("errors","admin","main","companies","resource","holiday","accountancy","hrm","orders","contracts","projects","propal","bills","interventions"));
@@ -1782,7 +1782,7 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
 
 	$formadmin = new FormAdmin($db);
 	$formcompany = new FormCompany($db);
-	if (! empty($conf->accounting->enabled)) $formaccounting = new FormAccounting($db);
+	$formaccounting = new FormAccounting($db);
 
 	$withentity='';
 
@@ -1890,6 +1890,7 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
 		elseif (in_array($fieldlist[$field], array('libelle_facture'))) {
 		    print '<td>';
 		    $transfound=0;
+		    $transkey='';
 	        // Special case for labels
 	        if ($tabname == MAIN_DB_PREFIX.'c_payment_term')
 	        {
diff --git a/htdocs/admin/mailman.php b/htdocs/admin/mailman.php
index 4ee9e214890..a2403315614 100644
--- a/htdocs/admin/mailman.php
+++ b/htdocs/admin/mailman.php
@@ -158,8 +158,10 @@ $head = mailmanspip_admin_prepare_head();
 if (! empty($conf->global->ADHERENT_USE_MAILMAN))
 {
     print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+    print '<input type="hidden" name="action" value="update">';
 
-    dol_fiche_head($head, 'mailman', $langs->trans("Setup"), 0, 'user');
+    dol_fiche_head($head, 'mailman', $langs->trans("Setup"), -1, 'user');
 
     //$link=img_picto($langs->trans("Active"),'tick').' ';
     $link='<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=unset&value=0&name=ADHERENT_USE_MAILMAN">';
@@ -227,14 +229,21 @@ else
 if (! empty($conf->global->ADHERENT_USE_MAILMAN))
 {
     print '<form action="'.$_SERVER["PHP_SELF"].'">';
+    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
     print '<input type="hidden" name="action" value="testsubscribe">';
+
     print $langs->trans("TestSubscribe").'<br>';
     print $langs->trans("EMail").' <input type="email" class="flat" name="testsubscribeemail" value="'.GETPOST('testsubscribeemail').'"> <input class="button" type="submit" value="'.$langs->trans("Test").'"><br>';
+
     print '</form>';
+
     print '<form action="'.$_SERVER["PHP_SELF"].'">';
+    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
     print '<input type="hidden" name="action" value="testunsubscribe">';
+
     print $langs->trans("TestUnSubscribe").'<br>';
     print $langs->trans("EMail").' <input type="email" class="flat" name="testunsubscribeemail" value="'.GETPOST('testunsubscribeemail').'"> <input class="button" type="submit" value="'.$langs->trans("Test").'"><br>';
+
     print '</form>';
 }
 
diff --git a/htdocs/admin/spip.php b/htdocs/admin/spip.php
index e0b4b986969..579363395f3 100644
--- a/htdocs/admin/spip.php
+++ b/htdocs/admin/spip.php
@@ -123,8 +123,10 @@ $head = mailmanspip_admin_prepare_head();
 if (! empty($conf->global->ADHERENT_USE_SPIP))
 {
 	print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+	print '<input type="hidden" name="action" value="update">';
 
-	dol_fiche_head($head, 'spip', $langs->trans("Setup"), 0, 'user');
+	dol_fiche_head($head, 'spip', $langs->trans("Setup"), -1, 'user');
 
     //$link=img_picto($langs->trans("Active"),'tick').' ';
     $link='<a href="'.$_SERVER["PHP_SELF"].'?action=unset&value=0&name=ADHERENT_USE_SPIP">';
diff --git a/htdocs/admin/stock.php b/htdocs/admin/stock.php
index 2e934211970..83834aa5861 100644
--- a/htdocs/admin/stock.php
+++ b/htdocs/admin/stock.php
@@ -98,14 +98,14 @@ print '<br>';
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
 print "<td>".$langs->trans("RuleForStockManagementDecrease")."</td>\n";
-print '<td align="center">'.$langs->trans("Status").'</td>'."\n";
+print '<td class="right">'.$langs->trans("Status").'</td>'."\n";
 print '</tr>'."\n";
 
 $found=0;
 
 print '<tr class="oddeven">';
 print '<td>'.$langs->trans("DeStockOnBill").'</td>';
-print '<td align="center">';
+print '<td class="right">';
 if (! empty($conf->facture->enabled))
 {
 if ($conf->use_javascript_ajax) {
@@ -125,7 +125,7 @@ $found++;
 
 print '<tr class="oddeven">';
 print '<td>'.$langs->trans("DeStockOnValidateOrder").'</td>';
-print '<td align="center">';
+print '<td class="right">';
 if (! empty($conf->commande->enabled))
 {
 if ($conf->use_javascript_ajax) {
@@ -147,7 +147,7 @@ $found++;
 
 print '<tr class="oddeven">';
 print '<td>'.$langs->trans("DeStockOnShipment").'</td>';
-print '<td align="center">';
+print '<td class="right">';
 if (! empty($conf->expedition->enabled))
 {
 if ($conf->use_javascript_ajax) {
@@ -167,7 +167,7 @@ $found++;
 
 print '<tr class="oddeven">';
 print '<td>'.$langs->trans("DeStockOnShipmentOnClosing").'</td>';
-print '<td align="center">';
+print '<td class="right">';
 if (! empty($conf->expedition->enabled))
 {
 if ($conf->use_javascript_ajax) {
@@ -200,14 +200,14 @@ print '<br>';
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
 print "<td>".$langs->trans("RuleForStockManagementIncrease")."</td>\n";
-print '<td align="center">'.$langs->trans("Status").'</td>'."\n";
+print '<td class="right">'.$langs->trans("Status").'</td>'."\n";
 print '</tr>'."\n";
 
 $found=0;
 
 print '<tr class="oddeven">';
 print '<td>'.$langs->trans("ReStockOnBill").'</td>';
-print '<td align="center">';
+print '<td class="right">';
 if (! empty($conf->fournisseur->enabled))
 {
 if ($conf->use_javascript_ajax) {
@@ -228,7 +228,7 @@ $found++;
 
 print '<tr class="oddeven">';
 print '<td>'.$langs->trans("ReStockOnValidateOrder").'</td>';
-print '<td align="center">';
+print '<td class="right">';
 if (! empty($conf->fournisseur->enabled))
 {
 if ($conf->use_javascript_ajax) {
@@ -248,8 +248,8 @@ $found++;
 if (!empty($conf->reception->enabled))
 {
 	print '<tr class="oddeven">';
-	print '<td width="60%">'.$langs->trans("StockOnReception").'</td>';
-  print '<td align="center">';
+	print '<td>'.$langs->trans("StockOnReception").'</td>';
+  print '<td class="right">';
 
 if ($conf->use_javascript_ajax) {
     print ajax_constantonoff('STOCK_CALCULATE_ON_RECEPTION');
@@ -263,8 +263,8 @@ if ($conf->use_javascript_ajax) {
 
 
 print '<tr class="oddeven">';
-	print '<td width="60%">'.$langs->trans("StockOnReceptionOnClosing").'</td>';
-  print '<td align="center">';
+	print '<td>'.$langs->trans("StockOnReceptionOnClosing").'</td>';
+  print '<td class="right">';
 
 if ($conf->use_javascript_ajax) {
     print ajax_constantonoff('STOCK_CALCULATE_ON_RECEPTION_CLOSE');
@@ -279,7 +279,7 @@ else
 {
 	print '<tr class="oddeven">';
 	print '<td>'.$langs->trans("ReStockOnDispatchOrder").'</td>';
-  print '<td align="center">';
+  print '<td class="right">';
 	if (! empty($conf->fournisseur->enabled))
 	{
 if ($conf->use_javascript_ajax) {
@@ -308,16 +308,17 @@ if ($conf->use_javascript_ajax) {
 print '</table>';
 
 print '<br>';
+
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
 print "<td>".$langs->trans("RuleForStockAvailability")."</td>\n";
-print '<td align="center">'.$langs->trans("Status").'</td>'."\n";
+print '<td class="right">'.$langs->trans("Status").'</td>'."\n";
 print '</tr>'."\n";
 
 
 print '<tr class="oddeven">';
 print '<td>'.$langs->trans("WarehouseAllowNegativeTransfer").'</td>';
-print '<td align="center">';
+print '<td class="right">';
 if ($conf->use_javascript_ajax) {
     print ajax_constantonoff('STOCK_ALLOW_NEGATIVE_TRANSFER');
 } else {
@@ -332,7 +333,7 @@ if($conf->invoice->enabled)
 {
 	print '<tr class="oddeven">';
 	print '<td>'.$langs->trans("StockMustBeEnoughForInvoice").'</td>';
-  print '<td align="center">';
+  print '<td class="right">';
 if ($conf->use_javascript_ajax) {
     print ajax_constantonoff('STOCK_MUST_BE_ENOUGH_FOR_INVOICE');
 } else {
@@ -347,7 +348,7 @@ if($conf->order->enabled)
 {
 	print '<tr class="oddeven">';
 	print '<td>'.$langs->trans("StockMustBeEnoughForOrder").'</td>';
-  print '<td align="center">';
+  print '<td class="right">';
 if ($conf->use_javascript_ajax) {
     print ajax_constantonoff('STOCK_MUST_BE_ENOUGH_FOR_ORDER');
 } else {
@@ -362,7 +363,7 @@ if($conf->expedition->enabled)
 {
 	print '<tr class="oddeven">';
 	print '<td>'.$langs->trans("StockMustBeEnoughForShipment").'</td>';
-  print '<td align="center">';
+  print '<td class="right">';
 if ($conf->use_javascript_ajax) {
     print ajax_constantonoff('STOCK_MUST_BE_ENOUGH_FOR_SHIPMENT');
 } else {
@@ -386,12 +387,12 @@ if ($virtualdiffersfromphysical)
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
 	print "<td>".$langs->trans("RuleForStockReplenishment")." ".img_help('help', $langs->trans("VirtualDiffersFromPhysical"))."</td>\n";
-  print '<td align="center">'.$langs->trans("Status").'</td>'."\n";
+  print '<td class="right">'.$langs->trans("Status").'</td>'."\n";
 	print '</tr>'."\n";
 
 	print '<tr class="oddeven">';
 	print '<td>'.$langs->trans("UseVirtualStockByDefault").'</td>';
-  print '<td align="center">';
+  print '<td class="right">';
 if ($conf->use_javascript_ajax) {
     print ajax_constantonoff('STOCK_USE_VIRTUAL_STOCK');
 } else {
@@ -409,12 +410,12 @@ print '<table class="noborder" width="100%">';
 
 print '<tr class="liste_titre">';
 print "<td>".$langs->trans("Other")."</td>\n";
-print '<td class="center">'.$langs->trans("Status").'</td>'."\n";
+print '<td class="right">'.$langs->trans("Status").'</td>'."\n";
 print '</tr>'."\n";
 
 print '<tr class="oddeven">';
 print '<td>'.$langs->trans("UserWarehouseAutoCreate").'</td>';
-print '<td class="center">';
+print '<td class="right">';
 if ($conf->use_javascript_ajax) {
     print ajax_constantonoff('STOCK_USERSTOCK_AUTOCREATE');
 } else {
@@ -428,7 +429,7 @@ print '<tr class="oddeven">';
 print '<td>';
 print $form->textwithpicto($langs->trans("StockSupportServices"), $langs->trans("StockSupportServicesDesc"));
 print '</td>';
-print '<td class="center">';
+print '<td class="right">';
 if ($conf->use_javascript_ajax) {
     print ajax_constantonoff('STOCK_SUPPORTS_SERVICES');
 } else {
@@ -440,7 +441,7 @@ print "</tr>\n";
 
 print '<tr class="oddeven">';
 print '<td>'.$langs->trans("AllowAddLimitStockByWarehouse").'</td>';
-print '<td class="center">';
+print '<td class="right">';
 if ($conf->use_javascript_ajax) {
     print ajax_constantonoff('STOCK_ALLOW_ADD_LIMIT_STOCK_BY_WAREHOUSE');
 } else {
@@ -450,19 +451,6 @@ if ($conf->use_javascript_ajax) {
 print "</td>\n";
 print "</tr>\n";
 
-if (! empty($conf->fournisseur->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER)) {
-    print '<tr class="oddeven">';
-    print '<td>'.$langs->trans("UseDispatchStatus").'</td>';
-    print '<td class="center">';
-if ($conf->use_javascript_ajax) {
-    print ajax_constantonoff('SUPPLIER_ORDER_USE_DISPATCH_STATUS');
-} else {
-    $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
-    print $form->selectarray("SUPPLIER_ORDER_USE_DISPATCH_STATUS", $arrval, $conf->global->SUPPLIER_ORDER_USE_DISPATCH_STATUS);
-}
-    print "</td>\n</tr>\n";
-}
-
 print '</table>';
 
 print '<br>';
@@ -471,43 +459,45 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
 	print '<table class="noborder" width="100%">';
 	print '<tr class="liste_titre">';
 	print '<td>'.$langs->trans("Inventory").'</td>'."\n";
-  print '<td align="center">'.$langs->trans("Status").'</td>'."\n";
-  print '</tr>'."\n";
+	print '<td class="right">'.$langs->trans("Status").'</td>'."\n";
+	print '</tr>'."\n";
 
 	// Example with a yes / no select
-	print '<tr class="oddeven">';
+	/*print '<tr class="oddeven">';
 	print '<td>'.$langs->trans("INVENTORY_DISABLE_VIRTUAL").'</td>';
-  print '<td align="center">';
-if ($conf->use_javascript_ajax) {
-    print ajax_constantonoff('INVENTORY_DISABLE_VIRTUAL');
-} else {
-    $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
-    print $form->selectarray("INVENTORY_DISABLE_VIRTUAL", $arrval, $conf->global->INVENTORY_DISABLE_VIRTUAL);
-}
+	print '<td align="center">';
+	if ($conf->use_javascript_ajax) {
+		print ajax_constantonoff('INVENTORY_DISABLE_VIRTUAL');
+	} else {
+		$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
+		print $form->selectarray("INVENTORY_DISABLE_VIRTUAL", $arrval, $conf->global->INVENTORY_DISABLE_VIRTUAL);
+	}
 	print '</td></tr>';
+	*/
 
 	// Example with a yes / no select
-	print '<tr class="oddeven">';
+    /*print '<tr class="oddeven">';
 	print '<td>'.$langs->trans("INVENTORY_USE_MIN_PA_IF_NO_LAST_PA").'</td>';
-  print '<td align="center">';
-if ($conf->use_javascript_ajax) {
-    print ajax_constantonoff('INVENTORY_USE_MIN_PA_IF_NO_LAST_PA');
-} else {
-    $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
-    print $form->selectarray("INVENTORY_USE_MIN_PA_IF_NO_LAST_PA", $arrval, $conf->global->INVENTORY_USE_MIN_PA_IF_NO_LAST_PA);
-}
-	print '</td></tr>';
+	print '<td align="center">';
+  	if ($conf->use_javascript_ajax) {
+  		print ajax_constantonoff('INVENTORY_USE_MIN_PA_IF_NO_LAST_PA');
+  	} else {
+  		$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
+  		print $form->selectarray("INVENTORY_USE_MIN_PA_IF_NO_LAST_PA", $arrval, $conf->global->INVENTORY_USE_MIN_PA_IF_NO_LAST_PA);
+  	}
+  	print '</td></tr>';
+  	*/
 
-	// Example with a yes / no select
+  	// Example with a yes / no select
 	print '<tr class="oddeven">';
-	print '<td>'.$langs->trans("INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT").'</td>';
-  print '<td align="center">';
-if ($conf->use_javascript_ajax) {
-    print ajax_constantonoff('INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT');
-} else {
-    $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
-    print $form->selectarray("INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT", $arrval, $conf->global->INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT);
-}
+	print '<td>'.$langs->trans("INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT").'</td>';
+	print '<td class="right">';
+	if ($conf->use_javascript_ajax) {
+    	print ajax_constantonoff('INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT');
+	} else {
+    	$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
+    	print $form->selectarray("INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT", $arrval, $conf->global->INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT);
+	}
 	print '</td></tr>';
 
 	print '</table>';
diff --git a/htdocs/admin/supplier_order.php b/htdocs/admin/supplier_order.php
index e895a0b4005..2fef63ffdd8 100644
--- a/htdocs/admin/supplier_order.php
+++ b/htdocs/admin/supplier_order.php
@@ -35,7 +35,7 @@ require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array("admin", "other", "orders"));
+$langs->loadLangs(array("admin", "other", "orders", "stocks"));
 
 if (!$user->admin)
 accessforbidden();
@@ -494,20 +494,16 @@ print '<td>'.$langs->trans("Parameter").'</td>';
 print '<td align="center" width="60">'.$langs->trans("Value").'</td>';
 print '<td width="80">&nbsp;</td>';
 print "</tr>\n";
-$var=false;
 
-//if ($conf->global->MAIN_FEATURES_LEVEL > 0)
-//{
-	print '<tr class="oddeven"><td>';
-	print $form->textwithpicto($langs->trans("UseDoubleApproval"), $langs->trans("Use3StepsApproval"), 1, 'help').'<br>';
-	print $langs->trans("IfSetToYesDontForgetPermission");
-	print '</td><td>';
-	print '<input type="text" size="6" name="SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED" value="'.$conf->global->SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED.'">';
-	print '</td><td class="right">';
-	print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
-	print "</td></tr>\n";
+print '<tr class="oddeven"><td>';
+print $form->textwithpicto($langs->trans("UseDoubleApproval"), $langs->trans("Use3StepsApproval"), 1, 'help').'<br>';
+print $langs->trans("IfSetToYesDontForgetPermission");
+print '</td><td>';
+print '<input type="text" size="6" name="SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED" value="'.$conf->global->SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED.'">';
+print '</td><td class="right">';
+print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+print "</td></tr>\n";
 
-//}
 
 // Ask for payment bank during supplier order
 /* Kept as hidden for the moment
@@ -564,6 +560,26 @@ print '</td><td class="right">';
 print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
 print "</td></tr>\n";
 
+// Option to add a quality/validation step, on products, after reception.
+print '<tr class="oddeven">';
+print '<td>'.$langs->trans("UseDispatchStatus").'</td>';
+print '<td></td>';
+print '<td class="center">';
+if ($conf->reception->enabled)
+{
+	print '<span class="opacitymedium">'.$langs->trans("FeatureNotAvailableWithReceptionModule").'</span>';
+}
+else
+{
+	if ($conf->use_javascript_ajax) {
+		print ajax_constantonoff('SUPPLIER_ORDER_USE_DISPATCH_STATUS');
+	} else {
+		$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
+		print $form->selectarray("SUPPLIER_ORDER_USE_DISPATCH_STATUS", $arrval, $conf->global->SUPPLIER_ORDER_USE_DISPATCH_STATUS);
+	}
+}
+print "</td>\n</tr>\n";
+
 print '</table><br>';
 
 print '</form>';
diff --git a/htdocs/admin/tools/dolibarr_export.php b/htdocs/admin/tools/dolibarr_export.php
index c06314daa9a..0bef19dde56 100644
--- a/htdocs/admin/tools/dolibarr_export.php
+++ b/htdocs/admin/tools/dolibarr_export.php
@@ -50,10 +50,20 @@ if (! $user->admin)
 
 if ($action == 'delete')
 {
-	$file=$conf->admin->dir_output.'/backup/'.basename(GETPOST('urlfile', 'alpha'));
-    $ret=dol_delete_file($file, 1);
-    if ($ret) setEventMessages($langs->trans("FileWasRemoved", GETPOST('urlfile')), null, 'mesgs');
-    else setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), null, 'errors');
+	if (preg_match('/^backup\//', GETPOST('urlfile', 'alpha')))
+	{
+		$file=$conf->admin->dir_output.'/backup/'.basename(GETPOST('urlfile', 'alpha'));
+		$ret=dol_delete_file($file, 1);
+		if ($ret) setEventMessages($langs->trans("FileWasRemoved", GETPOST('urlfile')), null, 'mesgs');
+		else setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), null, 'errors');
+	}
+	else
+	{
+		$file=$conf->admin->dir_output.'/documents/'.basename(GETPOST('urlfile', 'alpha'));
+		$ret=dol_delete_file($file, 1);
+		if ($ret) setEventMessages($langs->trans("FileWasRemoved", GETPOST('urlfile')), null, 'mesgs');
+		else setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), null, 'errors');
+	}
     $action='';
 }
 
@@ -577,7 +587,7 @@ print "\n";
 
 ?>
 <br>
-<div class="center"><input type="submit" class="button"
+<div class="center"><input type="submit" class="button reposition"
 	value="<?php echo $langs->trans("GenerateBackup") ?>" id="buttonGo" /><br>
 <br>
 </div>
diff --git a/htdocs/admin/tools/export_files.php b/htdocs/admin/tools/export_files.php
index c1ddedfea53..4f9e8b933d2 100644
--- a/htdocs/admin/tools/export_files.php
+++ b/htdocs/admin/tools/export_files.php
@@ -112,21 +112,27 @@ $utils = new Utils($db);
 
 if ($compression == 'zip')
 {
-    $ret = dol_compress_dir(DOL_DATA_ROOT, $outputdir."/".$file, $compression);
+    $ret = dol_compress_dir(DOL_DATA_ROOT, $outputdir."/".$file, $compression, '/(\.log|\/temp\/|documents\/admin\/documents\/)/');
     if ($ret < 0)
     {
-        $errormsg = $langs->trans("ErrorFailedToWriteInDir", $outputfile);
+    	$errormsg = $langs->trans("ErrorFailedToWriteInDir", $outputdir);
     }
 }
 elseif (in_array($compression, array('gz', 'bz')))
 {
-    $file = substr($file, 0, strrpos($file, '.'));
+	$userlogin = ($user->login ? $user->login : 'unknown');
+
+	$outputfile = $conf->admin->dir_temp.'/export_files.'.$userlogin.'.out';	// File used with popen method
+
+	$file = substr($file, 0, strrpos($file, '.'));
     $file .= '.tar';
-    $cmd = 'tar -cf '.$outputdir."/".$file." --exclude=documents/admin/documents -C ".DOL_DATA_ROOT." ".DOL_DATA_ROOT."/../documents/";
-    exec($cmd, $out, $retval);
-    //var_dump($cmd, DOL_DATA_ROOT);exit;
-    
-    if ($retval != 0)
+    // We also exclude '/temp/' dir and 'documents/admin/documents'
+    $cmd = "tar -cf ".$outputdir."/".$file." --exclude-vcs --exclude 'temp' --exclude 'dolibarr.log' --exclude='documents/admin/documents' -C ".dirname(DOL_DATA_ROOT)." ".basename(DOL_DATA_ROOT);
+
+    $result = $utils->executeCLI($cmd, $outputfile);
+
+    $retval = $result['error'];
+    if ($result['result'] || ! empty($retval))
     {
         $langs->load("errors");
         dol_syslog("Documents tar retval after exec=".$retval, LOG_ERR);
@@ -136,15 +142,17 @@ elseif (in_array($compression, array('gz', 'bz')))
     {
         if ($compression == 'gz')
         {
-            $cmd = "gzip " . $outputdir."/".$file;
+            $cmd = "gzip -f " . $outputdir."/".$file;
         }
         if ($compression == 'bz')
         {
-            $cmd = "bzip2 " . $outputdir."/".$file;
+            $cmd = "bzip2 -f " . $outputdir."/".$file;
         }
-        
-        exec($cmd, $out, $retval);
-        if ($retval != 0)
+
+        $result = $utils->executeCLI($cmd, $outputfile);
+
+        $retval = $result['error'];
+        if ($result['result'] || ! empty($retval))
         {
             $errormsg = 'Error '.$compression.' generation return '.$retval;
             unlink($outputdir."/".$file);
diff --git a/htdocs/bom/lib/bom.lib.php b/htdocs/bom/lib/bom.lib.php
index b54a2e21b57..290e29c3f2b 100644
--- a/htdocs/bom/lib/bom.lib.php
+++ b/htdocs/bom/lib/bom.lib.php
@@ -55,7 +55,7 @@ function bomAdminPrepareHead()
 	//$this->tabs = array(
 	//	'entity:-tabname:Title:@bom:/bom/mypage.php?id=__ID__'
 	//); // to remove a tab
-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'bom');
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'bom');
 
 	return $head;
 }
diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php
index eb263bdffae..b9a92f85d5e 100644
--- a/htdocs/categories/class/categorie.class.php
+++ b/htdocs/categories/class/categorie.class.php
@@ -188,10 +188,12 @@ class Categorie extends CommonObject
 	 * @var string     Color
 	 */
 	public $color;
+
 	/**
-	 * @var ???
+	 * @var int		  Id of thirdparty when CATEGORY_ASSIGNED_TO_A_CUSTOMER is set
 	 */
 	public $socid;
+
 	/**
 	 * @var string	Category type
 	 *
diff --git a/htdocs/categories/viewcat.php b/htdocs/categories/viewcat.php
index a7170b799a2..a7a0767c6b5 100644
--- a/htdocs/categories/viewcat.php
+++ b/htdocs/categories/viewcat.php
@@ -40,7 +40,7 @@ $type = GETPOST('type', 'az09');
 $action=GETPOST('action', 'aZ09');
 $confirm    = GETPOST('confirm', 'alpha');
 $removeelem = GETPOST('removeelem', 'int');
-$elemid     = GETPOST('elemid', 'alpha');
+$elemid     = GETPOST('elemid', 'int');
 
 if ($id == "" && $label == "")
 {
diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index af54186e255..4e5abac75d3 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -221,7 +221,7 @@ if ($action == 'add')
 	}
 
 	// Initialisation objet cactioncomm
-	if (! GETPOST('actioncode') > 0)	// actioncode is id
+	if (GETPOSTISSET('actioncode') && ! GETPOST('actioncode', 'aZ09'))	// actioncode is '0'
 	{
 		$error++; $donotclearsession=1;
 		$action = 'create';
@@ -229,7 +229,7 @@ if ($action == 'add')
 	}
 	else
 	{
-		$object->type_code = GETPOST('actioncode');
+		$object->type_code = GETPOST('actioncode', 'aZ09');
 	}
 
 	if (! $error)
@@ -243,7 +243,7 @@ if ($action == 'add')
 		$object->elementtype = GETPOST("elementtype", 'alpha');
 		if (! GETPOST('label'))
 		{
-			if (GETPOST('actioncode') == 'AC_RDV' && $contact->getFullName($langs))
+			if (GETPOST('actioncode', 'aZ09') == 'AC_RDV' && $contact->getFullName($langs))
 			{
 				$object->label = $langs->transnoentitiesnoconv("TaskRDVWith", $contact->getFullName($langs));
 			}
@@ -426,15 +426,15 @@ if ($action == 'update')
 		$datep=dol_mktime($fulldayevent?'00':$aphour, $fulldayevent?'00':$apmin, 0, $_POST["apmonth"], $_POST["apday"], $_POST["apyear"]);
 		$datef=dol_mktime($fulldayevent?'23':$p2hour, $fulldayevent?'59':$p2min, $fulldayevent?'59':'0', $_POST["p2month"], $_POST["p2day"], $_POST["p2year"]);
 
-		$object->type_id     = dol_getIdFromCode($db, GETPOST("actioncode"), 'c_actioncomm');
-		$object->label       = GETPOST("label");
+		$object->type_id     = dol_getIdFromCode($db, GETPOST("actioncode", 'aZ09'), 'c_actioncomm');
+		$object->label       = GETPOST("label", "alphanohtml");
 		$object->datep       = $datep;
 		$object->datef       = $datef;
 		$object->percentage  = $percentage;
-		$object->priority    = GETPOST("priority");
+		$object->priority    = GETPOST("priority", "alphanohtml");
         $object->fulldayevent= GETPOST("fullday")?1:0;
-		$object->location    = GETPOST('location');
-		$object->socid       = GETPOST("socid");
+        $object->location    = GETPOST('location', "alphanohtml");
+		$object->socid       = GETPOST("socid", "int");
 		$socpeopleassigned   = GETPOST("socpeopleassigned", 'array');
 		$object->socpeopleassigned = array();
 		foreach ($socpeopleassigned as $cid) $object->socpeopleassigned[$cid] = array('id' => $cid);
@@ -446,8 +446,8 @@ if ($action == 'update')
 		$object->fk_project  = GETPOST("projectid", 'int');
 		$object->note        = GETPOST("note", "none");	// deprecated
 		$object->note_private= GETPOST("note", "none");
-		$object->fk_element	 = GETPOST("fk_element");
-		$object->elementtype = GETPOST("elementtype");
+		$object->fk_element	 = GETPOST("fk_element", "int");
+		$object->elementtype = GETPOST("elementtype", "alphanohtml");
 
 		if (! $datef && $percentage == 100)
 		{
@@ -491,7 +491,7 @@ if ($action == 'update')
 		}
 
 		// Check parameters
-		if (! GETPOST('actioncode') > 0)
+		if (GETPOSTISSET('actioncode') && ! GETPOST('actioncode', 'aZ09'))	// actioncode is '0'
 		{
 			$error++; $donotclearsession=1;
 			$action = 'edit';
@@ -499,7 +499,7 @@ if ($action == 'update')
 		}
 		else
 		{
-			$result=$cactioncomm->fetch(GETPOST('actioncode'));
+			$result=$cactioncomm->fetch(GETPOST('actioncode', 'aZ09'));
 		}
 		if (empty($object->userownerid))
 		{
@@ -689,7 +689,7 @@ if ($action == 'create')
 	if ($backtopage) print '<input type="hidden" name="backtopage" value="'.($backtopage != '1' ? $backtopage : $_SERVER["HTTP_REFERER"]).'">';
 	if (empty($conf->global->AGENDA_USE_EVENT_TYPE)) print '<input type="hidden" name="actioncode" value="'.dol_getIdFromCode($db, 'AC_OTH', 'c_actioncomm').'">';
 
-	if (GETPOST("actioncode") == 'AC_RDV') print load_fiche_titre($langs->trans("AddActionRendezVous"), '', 'title_agenda');
+	if (GETPOST("actioncode", 'aZ09') == 'AC_RDV') print load_fiche_titre($langs->trans("AddActionRendezVous"), '', 'title_agenda');
 	else print load_fiche_titre($langs->trans("AddAnAction"), '', 'title_agenda');
 
 	dol_fiche_head();
@@ -701,7 +701,7 @@ if ($action == 'create')
 	{
 		print '<tr><td class="titlefieldcreate"><span class="fieldrequired">'.$langs->trans("Type").'</span></b></td><td>';
 		$default=(empty($conf->global->AGENDA_USE_EVENT_TYPE_DEFAULT)?'':$conf->global->AGENDA_USE_EVENT_TYPE_DEFAULT);
-		$formactions->select_type_actions(GETPOST("actioncode")?GETPOST("actioncode"):($object->type_code?$object->type_code:$default), "actioncode", "systemauto", 0, -1);
+		$formactions->select_type_actions(GETPOST("actioncode", 'aZ09')?GETPOST("actioncode", 'aZ09'):($object->type_code?$object->type_code:$default), "actioncode", "systemauto", 0, -1);
 		print '</td></tr>';
 	}
 
@@ -731,7 +731,7 @@ if ($action == 'create')
 	{
 		$datef=dol_time_plus_duree($datep, $conf->global->AGENDA_AUTOSET_END_DATE_WITH_DELTA_HOURS, 'h');
 	}
-	print '<tr><td><span id="dateend"'.(GETPOST("actioncode") == 'AC_RDV'?' class="fieldrequired"':'').'>'.$langs->trans("DateActionEnd").'</span></td><td>';
+	print '<tr><td><span id="dateend"'.(GETPOST("actioncode", 'aZ09') == 'AC_RDV'?' class="fieldrequired"':'').'>'.$langs->trans("DateActionEnd").'</span></td><td>';
 	if (GETPOST("afaire") == 1) {
         print $form->selectDate($datef, 'p2', 1, 1, 1, "action", 1, 1, 0, 'fulldayend');
     } elseif (GETPOST("afaire") == 2) {
@@ -1010,15 +1010,15 @@ if ($id > 0)
 		$datep=dol_mktime($fulldayevent?'00':$aphour, $fulldayevent?'00':$apmin, 0, $_POST["apmonth"], $_POST["apday"], $_POST["apyear"]);
 		$datef=dol_mktime($fulldayevent?'23':$p2hour, $fulldayevent?'59':$p2min, $fulldayevent?'59':'0', $_POST["p2month"], $_POST["p2day"], $_POST["p2year"]);
 
-		$object->type_id     = dol_getIdFromCode($db, GETPOST("actioncode"), 'c_actioncomm');
-		$object->label       = GETPOST("label");
+		$object->type_id     = dol_getIdFromCode($db, GETPOST("actioncode", 'aZ09'), 'c_actioncomm');
+		$object->label       = GETPOST("label", "alphanohtml");
 		$object->datep       = $datep;
 		$object->datef       = $datef;
 		$object->percentage  = $percentage;
-		$object->priority    = GETPOST("priority");
+		$object->priority    = GETPOST("priority", "alphanohtml");
         $object->fulldayevent= GETPOST("fullday")?1:0;
-		$object->location    = GETPOST('location');
-		$object->socid       = GETPOST("socid");
+		$object->location    = GETPOST('location', "alpanohtml");
+		$object->socid       = GETPOST("socid", "int");
 		$socpeopleassigned   = GETPOST("socpeopleassigned", 'array');
 		foreach ($socpeopleassigned as $tmpid) $object->socpeopleassigned[$id] = array('id' => $tmpid);
 		$object->contactid   = GETPOST("contactid", 'int');
@@ -1101,7 +1101,7 @@ if ($id > 0)
 		    print '<tr><td class="fieldrequired">'.$langs->trans("Type").'</td><td colspan="3">';
 		    if ($object->type_code != 'AC_OTH_AUTO')
 		    {
-                $formactions->select_type_actions(GETPOST("actioncode")?GETPOST("actioncode"):$object->type_code, "actioncode", "systemauto");
+		    	$formactions->select_type_actions(GETPOST("actioncode", 'aZ09')?GETPOST("actioncode", 'aZ09'):$object->type_code, "actioncode", "systemauto");
 		    }
 		    else
 		    {
diff --git a/htdocs/comm/action/class/cactioncomm.class.php b/htdocs/comm/action/class/cactioncomm.class.php
index eb7fb885d8d..5d3290599b9 100644
--- a/htdocs/comm/action/class/cactioncomm.class.php
+++ b/htdocs/comm/action/class/cactioncomm.class.php
@@ -84,7 +84,7 @@ class CActionComm
         $sql = "SELECT id, code, type, libelle as label, color, active, picto";
         $sql.= " FROM ".MAIN_DB_PREFIX."c_actioncomm";
         if (is_numeric($id)) $sql.= " WHERE id=".$id;
-        else $sql.= " WHERE code='".$id."'";
+        else $sql.= " WHERE code='".$this->db->escape($id)."'";
 
         dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
         $resql=$this->db->query($sql);
diff --git a/htdocs/comm/action/list.php b/htdocs/comm/action/list.php
index bd57005b7bf..2ef4c74f765 100644
--- a/htdocs/comm/action/list.php
+++ b/htdocs/comm/action/list.php
@@ -452,6 +452,7 @@ if ($resql)
 	if (! empty($arrayfields['owner']['checked']))		print '<td class="liste_titre"></td>';
 	if (! empty($arrayfields['c.libelle']['checked']))	print '<td class="liste_titre"></td>';
 	if (! empty($arrayfields['a.label']['checked']))	print '<td class="liste_titre"><input type="text" class="maxwidth75" name="search_title" value="'.$search_title.'"></td>';
+	if (! empty($arrayfields['a.note']['checked']))	print '<td class="liste_titre"><input type="text" class="maxwidth75" name="search_note" value="'.$search_note.'"></td>';
 	if (! empty($arrayfields['a.datep']['checked']))	{
 		print '<td class="liste_titre nowraponall" align="center">';
 		print $form->selectDate($datestart, 'datestart', 0, 0, 1, '', 1, 0);
diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index b6f5d9328f8..88dfcef7d7f 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -835,7 +835,7 @@ else
 				{
 					// EMailing feature may be a spam problem, so when you host several users/instance, having this option may force each user to use their own SMTP agent.
 					// You ensure that every user is using its own SMTP server when using the mass emailing module.
-					$linktoadminemailbefore='<a href="'.DOL_URL_ROOT.'/admin/mails.php">';
+					$linktoadminemailbefore='<a href="'.DOL_URL_ROOT.'/admin/mails_emailing.php">';
 					$linktoadminemailend='</a>';
 					setEventMessages($langs->trans("MailSendSetupIs", $listofmethods[$sendingmode]), null, 'warnings');
 					setEventMessages($langs->trans("MailSendSetupIs2", $linktoadminemailbefore, $linktoadminemailend, $langs->transnoentitiesnoconv("MAIN_MAIL_SENDMODE"), $listofmethods['smtps']), null, 'warnings');
diff --git a/htdocs/comm/mailing/class/mailing.class.php b/htdocs/comm/mailing/class/mailing.class.php
index d82ec07612d..1538cbd7c81 100644
--- a/htdocs/comm/mailing/class/mailing.class.php
+++ b/htdocs/comm/mailing/class/mailing.class.php
@@ -335,15 +335,15 @@ class Mailing extends CommonObject
 
 				$target_array=array();
 
-				$sql = "SELECT fk_contact, ";
-				$sql.=" lastname,   ";
-				$sql.=" firstname,";
-				$sql.=" email,";
-				$sql.=" other,";
-				$sql.=" source_url,";
-				$sql.=" source_id ,";
-				$sql.=" source_type ";
-				$sql.= " FROM ".MAIN_DB_PREFIX."mailing_cibles ";
+				$sql = "SELECT fk_contact,";
+				$sql.= " lastname,";
+				$sql.= " firstname,";
+				$sql.= " email,";
+				$sql.= " other,";
+				$sql.= " source_url,";
+				$sql.= " source_id ,";
+				$sql.= " source_type";
+				$sql.= " FROM ".MAIN_DB_PREFIX."mailing_cibles";
 				$sql.= " WHERE fk_mailing = ".$fromid;
 
 				$result=$this->db->query($sql);
@@ -353,14 +353,16 @@ class Mailing extends CommonObject
 					{
 						while ($obj = $this->db->fetch_object($result)) {
 
-							$target_array[]=array('fk_contact'=>$obj->fk_contact,
-							'lastname'=>$obj->lastname,
-							'firstname'=>$obj->firstname,
-							'email'=>$obj->email,
-							'other'=>$obj->other,
-							'source_url'=>$obj->source_url,
-							'source_id'=>$obj->source_id,
-							'source_type'=>$obj->source_type);
+							$target_array[]=array(
+								'fk_contact'=>$obj->fk_contact,
+								'lastname'=>$obj->lastname,
+								'firstname'=>$obj->firstname,
+								'email'=>$obj->email,
+								'other'=>$obj->other,
+								'source_url'=>$obj->source_url,
+								'source_id'=>$obj->source_id,
+								'source_type'=>$obj->source_type
+							);
 						}
 					}
 				}
diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index 7331d7a86e9..180f95e2d4e 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -2500,7 +2500,7 @@ $formquestion = array_merge($formquestion, array(
 					if ($usercansend) {
 						print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=presend&mode=init#formmailbeforetitle">' . $langs->trans('SendMail') . '</a></div>';
 					} else
-						print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#">' . $langs->trans('SendMail') . '</a></div>';
+						print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotEnoughPermissions").'">' . $langs->trans('SendMail') . '</a></div>';
 				}
 
 				// Create an order
@@ -2538,7 +2538,14 @@ $formquestion = array_merge($formquestion, array(
 					$arrayofinvoiceforpropal = $object->getInvoiceArrayList();
 					if ((is_array($arrayofinvoiceforpropal) && count($arrayofinvoiceforpropal) > 0) || empty($conf->global->WORKFLOW_PROPAL_NEED_INVOICE_TO_BE_CLASSIFIED_BILLED))
 					{
-						print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=classifybilled&amp;socid=' . $object->socid . '">' . $langs->trans("ClassifyBilled") . '</a></div>';
+						if ($usercanclose)
+						{
+							print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=classifybilled&amp;socid=' . $object->socid . '">' . $langs->trans("ClassifyBilled") . '</a></div>';
+						}
+						else
+						{
+							print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotEnoughPermissions").'">' . $langs->trans("ClassifyBilled") . '</a></div>';
+						}
 					}
 				}
 
diff --git a/htdocs/commande/tpl/linkedobjectblock.tpl.php b/htdocs/commande/tpl/linkedobjectblock.tpl.php
index 74a2243d633..c2fed2895a8 100644
--- a/htdocs/commande/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/commande/tpl/linkedobjectblock.tpl.php
@@ -81,8 +81,8 @@ if (count($linkedObjectBlock) > 1)
     <tr class="liste_total <?php echo (empty($noMoreLinkedObjectBlockAfter)?'liste_sub_total':''); ?>">
         <td><?php echo $langs->trans("Total"); ?></td>
         <td></td>
-    	<td align="center"></td>
-    	<td align="center"></td>
+    	<td class="center"></td>
+    	<td class="center"></td>
     	<td class="right"><?php echo price($total); ?></td>
     	<td class="right"></td>
     	<td class="right"></td>
diff --git a/htdocs/compta/bank/treso.php b/htdocs/compta/bank/treso.php
index 5b601441378..29bc1db3593 100644
--- a/htdocs/compta/bank/treso.php
+++ b/htdocs/compta/bank/treso.php
@@ -264,12 +264,12 @@ if ($_REQUEST["account"] || $_REQUEST["ref"])
 				$paiement = -1*$socialcontribstatic->getSommePaiement();	// Payment already done
 			}
 
-			$parameters = array('obj' => $obj);
+			$parameters = array('obj' => $obj, 'ref' => $ref, 'refcomp' => $refcomp, 'payment' => $paiement);
 			$reshook = $hookmanager->executeHooks('moreFamily', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 			if(empty($reshook)){
-				$ref = isset($hookmanager->resArray['ref']) ? $hookmanager->resArray['ref'] : '';
-				$refcomp = isset($hookmanager->resArray['refcomp']) ? $hookmanager->resArray['refcomp'] : '';
-				$paiement = isset($hookmanager->resArray['paiement']) ? $hookmanager->resArray['paiement'] : 0;
+				$ref = isset($hookmanager->resArray['ref']) ? $hookmanager->resArray['ref'] : $ref;
+				$refcomp = isset($hookmanager->resArray['refcomp']) ? $hookmanager->resArray['refcomp'] : $refcomp;
+				$paiement = isset($hookmanager->resArray['paiement']) ? $hookmanager->resArray['paiement'] : $paiement;
 			}
 
 			$total_ttc = $obj->total_ttc;
diff --git a/htdocs/compta/localtax/card.php b/htdocs/compta/localtax/card.php
index 821e4d05d7e..0a741e7691b 100644
--- a/htdocs/compta/localtax/card.php
+++ b/htdocs/compta/localtax/card.php
@@ -156,8 +156,6 @@ $title=$langs->trans("LT".$object->ltt) . " - " . $langs->trans("Card");
 $help_url='';
 llxHeader("", $title, $helpurl);
 
-
-
 if ($action == 'create')
 {
     print load_fiche_titre($langs->transcountry($lttype==2?"newLT2Payment":"newLT1Payment", $mysoc->country_code));
diff --git a/htdocs/compta/localtax/clients.php b/htdocs/compta/localtax/clients.php
index 58b1ccd3f21..c4157d81984 100644
--- a/htdocs/compta/localtax/clients.php
+++ b/htdocs/compta/localtax/clients.php
@@ -85,6 +85,12 @@ $socid = GETPOST('socid', 'int');
 if ($user->societe_id) $socid=$user->societe_id;
 $result = restrictedArea($user, 'tax', '', '', 'charges');
 
+if (empty($local))
+{
+	accessforbidden('Parameter localTaxType is missing');
+	exit;
+}
+
 
 
 /*
@@ -106,11 +112,12 @@ llxHeader('', '', '', '', 0, 0, '', '', $morequerystring);
 
 $name=$langs->transcountry($local==1?"LT1ReportByCustomers":"LT2ReportByCustomers", $mysoc->country_code);
 
-$fsearch.='<br>';
-$fsearch.='  <input type="hidden" name="year" value="'.$year.'">';
-$fsearch.='  <input type="hidden" name="modetax" value="'.$modetax.'">';
-$fsearch.='  '.$langs->trans("SalesTurnoverMinimum").': ';
-$fsearch.='  <input type="text" name="min" id="min" value="'.$min.'" size="6">';
+$fsearch ='<!-- hidden fields for form -->';
+$fsearch.='<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+$fsearch.='<input type="hidden" name="modetax" value="'.$modetax.'">';
+$fsearch.='<input type="hidden" name="localTaxType" value="'.$local.'">';
+$fsearch.=$langs->trans("SalesTurnoverMinimum").': ';
+$fsearch.='<input type="text" name="min" id="min" value="'.$min.'" size="6">';
 
 $calc=$conf->global->MAIN_INFO_LOCALTAX_CALC.$local;
 // Affiche en-tete du rapport
diff --git a/htdocs/compta/localtax/index.php b/htdocs/compta/localtax/index.php
index 8d288274049..ef5013c84f6 100644
--- a/htdocs/compta/localtax/index.php
+++ b/htdocs/compta/localtax/index.php
@@ -188,6 +188,19 @@ function pt($db, $sql, $date)
     }
 }
 
+if (empty($localTaxType))
+{
+	accessforbidden('Parameter localTaxType is missing');
+	exit;
+}
+
+
+/*
+ * Actions
+ */
+
+// None
+
 
 /*
  * View
@@ -213,7 +226,11 @@ if($localTaxType==1) {
 	$CalcLT= $conf->global->MAIN_INFO_LOCALTAX_CALC2;
 }
 
-$fsearch.='  <input type="hidden" name="localTaxType" value="'.$localTaxType.'">';
+$fsearch = '<!-- hidden fields for form -->';
+$fsearch.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+$fsearch.= '<input type="hidden" name="localTaxType" value="'.$localTaxType.'">';
+$fsearch.= '<input type="hidden" name="modetax" value="'.$modetax.'">';
+
 $description = $fsearch;
 
 // Show report header
@@ -528,7 +545,7 @@ while ((($y < $yend) || ($y == $yend && $m <= $mend)) && $mcursor < 1000)	// $mc
     $total = $total + $diff;
     $subtotal = price2num($subtotal + $diff, 'MT');
 
-    print '<td class="nowrap right">'.price(price2num($diff, 'MT')).'</td>\n';
+    print '<td class="nowrap right">'.price(price2num($diff, 'MT')).'</td>'."\n";
     print "<td>&nbsp;</td>\n";
     print "</tr>\n";
 
diff --git a/htdocs/compta/localtax/quadri_detail.php b/htdocs/compta/localtax/quadri_detail.php
index 4bbe5c723e1..c28c5f5f48b 100644
--- a/htdocs/compta/localtax/quadri_detail.php
+++ b/htdocs/compta/localtax/quadri_detail.php
@@ -97,6 +97,12 @@ $socid = GETPOST('socid', 'int');
 if ($user->societe_id) $socid=$user->societe_id;
 $result = restrictedArea($user, 'tax', '', '', 'charges');
 
+if (empty($local))
+{
+	accessforbidden('Parameter localTaxType is missing');
+	exit;
+}
+
 
 
 /*
@@ -122,9 +128,10 @@ foreach ($listofparams as $param)
 
 llxHeader('', $langs->trans("LocalTaxReport"), '', '', 0, 0, '', '', $morequerystring);
 
-$fsearch.='  <input type="hidden" name="year" value="'.$year.'">';
-$fsearch.='  <input type="hidden" name="modetax" value="'.$modetax.'">';
-$fsearch.='  <input type="hidden" name="localTaxType" value="'.$local.'">';
+$fsearch = '<!-- hidden fields for form -->';
+$fsearch.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+$fsearch.= '<input type="hidden" name="modetax" value="'.$modetax.'">';
+$fsearch.= '<input type="hidden" name="localTaxType" value="'.$local.'">';
 
 $name=$langs->transcountry($local==1?"LT1ReportByQuarters":"LT2ReportByQuarters", $mysoc->country_code);
 $calcmode='';
@@ -161,7 +168,7 @@ if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
 	$description.='<br>'.$langs->trans("DepositsAreNotIncluded");
 }
 */
-if (! empty($conf->global->MAIN_MODULE_ACCOUNTING)) $description.='<br>'.$langs->trans("ThisIsAnEstimatedValue");
+if (! empty($conf->global->MAIN_MODULE_ACCOUNTING)) $description.=$langs->trans("ThisIsAnEstimatedValue");
 
 // Customers invoices
 $elementcust=$langs->trans("CustomersInvoices");
@@ -186,15 +193,14 @@ if ($mysoc->tva_assuj) {
 
 report_header($name, '', $period, $periodlink, $description, $builddate, $exportlink, array(), $calcmode);
 
-
 if($local==1){
-	$vatcust=$langs->transcountry("LocalTax1", $mysoc->country_code);
-	$vatsup=$langs->transcountry("LocalTax1", $mysoc->country_code);
-	$vatexpensereport=$langs->transcountry("LocalTax1", $mysoc->country_code);
+	$vatcust=$langs->transcountry("LT1", $mysoc->country_code);
+	$vatsup=$langs->transcountry("LT1", $mysoc->country_code);
+	$vatexpensereport=$langs->transcountry("LT1", $mysoc->country_code);
 }else{
-	$vatcust=$langs->transcountry("LocalTax2", $mysoc->country_code);
-	$vatsup=$langs->transcountry("LocalTax2", $mysoc->country_code);
-	$vatexpensereport=$langs->transcountry("LocalTax2", $mysoc->country_code);
+	$vatcust=$langs->transcountry("LT2", $mysoc->country_code);
+	$vatsup=$langs->transcountry("LT2", $mysoc->country_code);
+	$vatexpensereport=$langs->transcountry("LT2", $mysoc->country_code);
 }
 
 // VAT Received and paid
diff --git a/htdocs/compta/prelevement/card.php b/htdocs/compta/prelevement/card.php
index 5864d6301bd..bf95a35f1fd 100644
--- a/htdocs/compta/prelevement/card.php
+++ b/htdocs/compta/prelevement/card.php
@@ -239,6 +239,23 @@ if ($id > 0 || $ref)
 	dol_fiche_end();
 
 
+	$formconfirm = '';
+
+	// Confirmation to delete
+	if ($action == 'delete')
+	{
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('Delete'), $langs->trans('ConfirmDeleteObject'), 'confirm_delete', '', 0, 1);
+	}
+
+	// Call Hook formConfirm
+	/*$parameters = array();
+	$reshook = $hookmanager->executeHooks('formConfirm', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+	if (empty($reshook)) $formconfirm.=$hookmanager->resPrint;
+	elseif ($reshook > 0) $formconfirm=$hookmanager->resPrint;*/
+
+	// Print form confirm
+	print $formconfirm;
+
 
 	if (empty($object->date_trans) && $user->rights->prelevement->bons->send && $action=='settransmitted')
 	{
@@ -298,7 +315,7 @@ if ($id > 0 || $ref)
 			print "<a class=\"butAction\" href=\"card.php?action=setcredited&id=".$object->id."\">".$langs->trans("ClassCredited")."</a>";
 		}
 
-		print "<a class=\"butActionDelete\" href=\"card.php?action=confirm_delete&id=".$object->id."\">".$langs->trans("Delete")."</a>";
+		print "<a class=\"butActionDelete\" href=\"card.php?action=delete&id=".$object->id."\">".$langs->trans("Delete")."</a>";
 
 		print "</div>";
 	}
@@ -356,8 +373,6 @@ if ($id > 0 || $ref)
 		print_liste_field_titre('');
 		print "</tr>\n";
 
-		$var=false;
-
 		$total = 0;
 
 		while ($i < min($num, $conf->liste_limit))
@@ -406,7 +421,10 @@ if ($id > 0 || $ref)
 			print '<td>'.$langs->trans("Total").'</td>';
 			print '<td>&nbsp;</td>';
 			print '<td class="right">';
-			if ($total != $object->amount) print img_warning("AmountOfFileDiffersFromSumOfInvoices");
+			if (empty($offset) && $num <= $limit)	// If we have all record on same page, then the following test/warning can be done
+			{
+				if ($total != $object->amount) print img_warning("TotalAmountOfdirectDebitOrderDiffersFromSumOfLines");
+			}
 			print price($total);
 			print "</td>\n";
 			print '<td>&nbsp;</td>';
diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php
index 1a98c33ab02..10c12d967b3 100644
--- a/htdocs/compta/prelevement/class/bonprelevement.class.php
+++ b/htdocs/compta/prelevement/class/bonprelevement.class.php
@@ -739,14 +739,16 @@ class BonPrelevement extends CommonObject
 		$sql = "SELECT count(f.rowid) as nb";
 		$sql.= " FROM ".MAIN_DB_PREFIX."facture as f";
 		$sql.= ", ".MAIN_DB_PREFIX."prelevement_facture_demande as pfd";
-		$sql.= " WHERE f.fk_statut = 1";
-		$sql.= " AND f.entity IN (".getEntity('invoice').")";
+		$sql.= " WHERE f.entity IN (".getEntity('invoice').")";
+		if (empty($conf->global->WITHDRAWAL_ALLOW_ANY_INVOICE_STATUS))
+		{
+			$sql.= " AND f.fk_statut = ".Facture::STATUS_VALIDATED;
+		}
 		$sql.= " AND f.rowid = pfd.fk_facture";
-		$sql.= " AND f.paye = 0";
 		$sql.= " AND pfd.traite = 0";
 		$sql.= " AND f.total_ttc > 0";
 
-		dol_syslog(get_class($this)."::SommeAPrelever");
+		dol_syslog(get_class($this)."::NbFactureAPrelever");
 		$resql = $this->db->query($sql);
 
 		if ( $resql )
@@ -759,7 +761,7 @@ class BonPrelevement extends CommonObject
 		}
 		else
 		{
-			$this->error=get_class($this)."::SommeAPrelever Erreur -1 sql=".$this->db->error();
+			$this->error=get_class($this)."::NbFactureAPrelever Erreur -1 sql=".$this->db->error();
 			return -1;
 		}
 	}
@@ -1630,8 +1632,8 @@ class BonPrelevement extends CommonObject
 	public static function buildRumNumber($row_code_client, $row_datec, $row_drum)
 	{
 		global $langs;
-		$pre = $langs->trans('RUM').'-';
-		return $pre.$row_code_client.'-'.$row_drum.'-'.date('U', $row_datec);
+		$pre = substr(dol_string_nospecial(dol_string_unaccent($langs->transnoentitiesnoconv('RUM'))), 0, 3);	// Must always be on 3 char ('RUM' or 'UMR'. This is a protection against bad translation)
+		return $pre.'-'.$row_code_client.'-'.$row_drum.'-'.date('U', $row_datec);
 	}
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php
index ddbec62e413..34da3336bcc 100644
--- a/htdocs/compta/prelevement/create.php
+++ b/htdocs/compta/prelevement/create.php
@@ -37,7 +37,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/prelevement.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array('banks', 'categories', 'widthdrawals', 'companies', 'bills'));
+$langs->loadLangs(array('banks', 'categories', 'withdrawals', 'companies', 'bills'));
 
 // Security check
 if ($user->societe_id) $socid=$user->societe_id;
@@ -105,6 +105,7 @@ if (empty($reshook))
 /*
  * View
  */
+
 $form = new Form($db);
 
 $thirdpartystatic=new Societe($db);
@@ -206,9 +207,14 @@ $sql.= " ".MAIN_DB_PREFIX."societe as s,";
 $sql.= " ".MAIN_DB_PREFIX."prelevement_facture_demande as pfd";
 $sql.= " WHERE s.rowid = f.fk_soc";
 $sql.= " AND f.entity IN (".getEntity('invoice').")";
+if (empty($conf->global->WITHDRAWAL_ALLOW_ANY_INVOICE_STATUS))
+{
+	$sql.= " AND f.fk_statut = ".Facture::STATUS_VALIDATED;
+}
+$sql.= " AND f.total_ttc > 0";
 $sql.= " AND pfd.traite = 0";
 $sql.= " AND pfd.fk_facture = f.rowid";
-if ($socid) $sql.= " AND f.fk_soc = ".$socid;
+if ($socid > 0) $sql.= " AND f.fk_soc = ".$socid;
 
 $nbtotalofrecords = '';
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
@@ -292,7 +298,7 @@ if ($resql)
 			$i++;
 		}
 	}
-	else print '<tr '.$bc[0].'><td colspan="5" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
+	else print '<tr class="oddeven"><td colspan="5" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
 	print "</table>";
 	print "</form>";
 	print "<br>\n";
diff --git a/htdocs/compta/prelevement/demandes.php b/htdocs/compta/prelevement/demandes.php
index 8f9df284291..6c1ea278430 100644
--- a/htdocs/compta/prelevement/demandes.php
+++ b/htdocs/compta/prelevement/demandes.php
@@ -35,31 +35,43 @@ $langs->loadLangs(array('banks', 'categories', 'withdrawals', 'companies'));
 
 // Security check
 $socid = GETPOST('socid', 'int');
+$status = GETPOST('status', 'int');
 if ($user->societe_id) $socid=$user->societe_id;
 $result = restrictedArea($user, 'prelevement', '', '', 'bons');
 
-// Get supervariables
-$page =  GETPOST('page', 'int');
-$sortorder = GETPOST('sortorder', 'alpha');
-$sortfield = GETPOST('sortfield', 'alpha');
+$contextpage= GETPOST('contextpage', 'aZ')?GETPOST('contextpage', 'aZ'):'myobjectlist';   // To manage different context of search
+$backtopage = GETPOST('backtopage', 'alpha');											// Go back to a dedicated page
+$optioncss  = GETPOST('optioncss', 'aZ');												// Option for the css output (always '' except when 'print')
 
+// Load variable for pagination
 $limit = GETPOST('limit', 'int')?GETPOST('limit', 'int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
 $page = GETPOST("page", 'int');
-if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+if (empty($page) || $page == -1 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha') || (empty($toselect) && $massaction === '0')) { $page = 0; }     // If $page is not defined, or '' or -1 or if we click on clear filters or if we select empty mass action
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 if (! $sortorder) $sortorder="DESC";
 if (! $sortfield) $sortfield="f.ref";
 
+$massactionbutton = '';
+
 
 /*
  * View
  */
 
-llxHeader();
+if (!$status)
+{
+	$title = $langs->trans("RequestStandingOrderToTreat");
+}
+else
+{
+	$title = $langs->trans("RequestStandingOrderTreated");
+}
+
+llxHeader('', $title);
 
 $thirdpartystatic=new Societe($db);
 $invoicestatic=new Facture($db);
@@ -78,95 +90,129 @@ $sql.= " WHERE s.rowid = f.fk_soc";
 $sql.= " AND f.entity IN (".getEntity('invoice').")";
 if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 if ($socid) $sql.= " AND f.fk_soc = ".$socid;
-if (!$statut) $sql.= " AND pfd.traite = 0";
-if ($statut) $sql.= " AND pfd.traite = ".$statut;
+if (!$status) $sql.= " AND pfd.traite = 0";
+if ($status) $sql.= " AND pfd.traite = ".$status;
+$sql.= " AND f.total_ttc > 0";
+if (empty($conf->global->WITHDRAWAL_ALLOW_ANY_INVOICE_STATUS))
+{
+	$sql.= " AND f.fk_statut = ".Facture::STATUS_VALIDATED;
+}
 $sql.= " AND pfd.fk_facture = f.rowid";
 if (dol_strlen(trim(GETPOST('search_societe', 'alpha'))))
 {
 	$sql.= natural_search("s.nom", 'search_societe');
 }
-$sql.= " ORDER BY $sortfield $sortorder ";
-$sql.= $db->plimit($limit+1, $offset);
+$sql.=$db->order($sortfield, $sortorder);
 
-$resql=$db->query($sql);
-if ($resql)
+
+// Count total nb of records
+$nbtotalofrecords = '';
+if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 {
-	$num = $db->num_rows($resql);
-	$i = 0;
-
-	if (!$statut)
+	$resql = $db->query($sql);
+	$nbtotalofrecords = $db->num_rows($resql);
+	if (($page * $limit) > $nbtotalofrecords)	// if total of record found is smaller than page * limit, goto and load page 0
 	{
-		print_barre_liste($langs->trans("RequestStandingOrderToTreat"), $page, "demandes.php", $urladd, $sortfield, $sortorder, '', $num);
+		$page = 0;
+		$offset = 0;
 	}
-	else
-	{
-		print_barre_liste($langs->trans("RequestStandingOrderTreated"), $page, "demandes.php", $urladd, $sortfield, $sortorder, '', $num);
-	}
-
-	print '<form action="'.$_SERVER["PHP_SELF"].'" method="GET">';
-
-	print '<table class="liste" width="100%">';
-
-	print '<tr class="liste_titre">';
-	print_liste_field_titre("Bill", $_SERVER["PHP_SELF"]);
-	print_liste_field_titre("Company", $_SERVER["PHP_SELF"]);
-    print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], "", "", $param, 'class="right"');
-	print_liste_field_titre("DateRequest", $_SERVER["PHP_SELF"], "", "", $param, 'class="center"');
-	print_liste_field_titre('');
-	print '</tr>';
-
-	print '<tr class="liste_titre">';
-	print '<td class="liste_titre"><input type="text" class="flat" name="search_facture" size="12" value="'.dol_escape_htmltag(GETPOST('search_facture', 'alpha')).'"></td>';
-	print '<td class="liste_titre"><input type="text" class="flat" name="search_societe" size="18" value="'.dol_escape_htmltag(GETPOST('search_societe', 'alpha')).'"></td>';
-	print '<td class="liste_titre"></td>';
-	print '<td class="liste_titre"></td>';
-	// Action column
-	print '<td class="liste_titre" class="middle">';
-	$searchpicto=$form->showFilterAndCheckAddButtons($massactionbutton?1:0, 'checkforselect', 1);
-	print $searchpicto;
-	print '</td>';
-	print '</tr>';
-
-	$users = array();
-
-	while ($i < min($num, $limit))
-	{
-		$obj = $db->fetch_object($resql);
-
-		print '<tr class="oddeven">';
-
-		// Ref facture
-		print '<td>';
-		$invoicestatic->id=$obj->rowid;
-		$invoicestatic->ref=$obj->ref;
-		print $invoicestatic->getNomUrl(1, 'withdraw');
-		print '</td>';
-
-		print '<td>';
-		$thirdpartystatic->id=$obj->socid;
-		$thirdpartystatic->name=$obj->name;
-		print $thirdpartystatic->getNomUrl(1, 'customer');
-		print '</td>';
-
-        print '<td class="right">'.price($obj->total_ttc).'</td>';
-
-        print '<td class="center">'.dol_print_date($db->jdate($obj->date_demande), 'day').'</td>';
-
-        print '<td class="right"></td>';
-
-		print '</tr>';
-		$i++;
-	}
-
-	print "</table><br>";
-
-	print '</form>';
+}
+// if total of record found is smaller than limit, no need to do paging and to restart another select with limits set.
+if (is_numeric($nbtotalofrecords) && $limit > $nbtotalofrecords)
+{
+	$num = $nbtotalofrecords;
 }
 else
 {
-	dol_print_error($db);
+	$sql.= $db->plimit($limit+1, $offset);
+
+	$resql=$db->query($sql);
+	if (! $resql)
+	{
+		dol_print_error($db);
+		exit;
+	}
+
+	$num = $db->num_rows($resql);
 }
 
+
+
+$newcardbutton = '<a href="'.DOL_URL_ROOT.'/compta/prelevement/index.php">'.$langs->trans("Back").'</a>';
+
+print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_generic', 0, $newcardbutton, '', $limit);
+
+print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
+print '<input type="hidden" name="action" value="list">';
+print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+print '<input type="hidden" name="page" value="'.$page.'">';
+print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
+
+
+print '<table class="liste" width="100%">';
+
+print '<tr class="liste_titre">';
+print_liste_field_titre("Bill", $_SERVER["PHP_SELF"]);
+print_liste_field_titre("Company", $_SERVER["PHP_SELF"]);
+print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], "", "", $param, 'class="right"');
+print_liste_field_titre("DateRequest", $_SERVER["PHP_SELF"], "", "", $param, 'class="center"');
+print_liste_field_titre('');
+print '</tr>';
+
+print '<tr class="liste_titre">';
+print '<td class="liste_titre"><input type="text" class="flat" name="search_facture" size="12" value="'.dol_escape_htmltag(GETPOST('search_facture', 'alpha')).'"></td>';
+print '<td class="liste_titre"><input type="text" class="flat" name="search_societe" size="18" value="'.dol_escape_htmltag(GETPOST('search_societe', 'alpha')).'"></td>';
+print '<td class="liste_titre"></td>';
+print '<td class="liste_titre"></td>';
+// Action column
+print '<td class="liste_titre" class="middle">';
+$searchpicto=$form->showFilterAndCheckAddButtons($massactionbutton?1:0, 'checkforselect', 1);
+print $searchpicto;
+print '</td>';
+print '</tr>';
+
+$users = array();
+
+$i = 0;
+while ($i < min($num, $limit))
+{
+	$obj = $db->fetch_object($resql);
+	if (empty($obj)) break;		// Should not happen
+
+	print '<tr class="oddeven">';
+
+	// Ref facture
+	print '<td>';
+	$invoicestatic->id=$obj->rowid;
+	$invoicestatic->ref=$obj->ref;
+	print $invoicestatic->getNomUrl(1, 'withdraw');
+	print '</td>';
+
+	print '<td>';
+	$thirdpartystatic->id=$obj->socid;
+	$thirdpartystatic->name=$obj->name;
+	print $thirdpartystatic->getNomUrl(1, 'customer');
+	print '</td>';
+
+	print '<td class="right">'.price($obj->total_ttc).'</td>';
+
+	print '<td class="center">'.dol_print_date($db->jdate($obj->date_demande), 'day').'</td>';
+
+	print '<td class="right"></td>';
+
+	print '</tr>';
+	$i++;
+}
+
+print "</table><br>";
+
+print '</form>';
+
+
 // End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/compta/prelevement/index.php b/htdocs/compta/prelevement/index.php
index 1be716f8f61..468d4807c65 100644
--- a/htdocs/compta/prelevement/index.php
+++ b/htdocs/compta/prelevement/index.php
@@ -71,6 +71,7 @@ $thirdpartystatic=new Societe($db);
 $invoicestatic=new Facture($db);
 $bprev = new BonPrelevement($db);
 
+
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("Statistics").'</th></tr>';
 
@@ -100,6 +101,11 @@ if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX
 $sql.= " , ".MAIN_DB_PREFIX."prelevement_facture_demande as pfd";
 $sql.= " WHERE s.rowid = f.fk_soc";
 $sql.= " AND f.entity IN (".getEntity('invoice').")";
+$sql.= " AND f.total_ttc > 0";
+if (empty($conf->global->WITHDRAWAL_ALLOW_ANY_INVOICE_STATUS))
+{
+	$sql.= " AND f.fk_statut = ".Facture::STATUS_VALIDATED;
+}
 $sql.= " AND pfd.traite = 0 AND pfd.fk_facture = f.rowid";
 if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 if ($socid) $sql.= " AND f.fk_soc = ".$socid;
diff --git a/htdocs/compta/tva/clients.php b/htdocs/compta/tva/clients.php
index e0775313dd3..969d5322008 100644
--- a/htdocs/compta/tva/clients.php
+++ b/htdocs/compta/tva/clients.php
@@ -123,11 +123,11 @@ if (isset($_REQUEST['extra_report']) && $_REQUEST['extra_report'] == 1) {
 
 llxHeader('', $langs->trans("VATReport"), '', '', 0, 0, '', '', $morequerystring);
 
-$fsearch.='<br>';
-$fsearch.='  <input type="hidden" name="year" value="'.$year.'">';
-$fsearch.='  <input type="hidden" name="modetax" value="'.$modetax.'">';
-$fsearch.='  '.$langs->trans("SalesTurnoverMinimum").': ';
-$fsearch.='  <input type="text" name="min" id="min" value="'.$min.'" size="6">';
+$fsearch ='<!-- hidden fields for form -->';
+$fsearch.='<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+$fsearch.='<input type="hidden" name="modetax" value="'.$modetax.'">';
+$fsearch.=$langs->trans("SalesTurnoverMinimum").': ';
+$fsearch.='<input type="text" name="min" id="min" value="'.$min.'" size="6">';
 
 // Show report header
 $name=$langs->trans("VATReportByThirdParties");
diff --git a/htdocs/compta/tva/index.php b/htdocs/compta/tva/index.php
index f0c96dccdd6..6a83d25070b 100644
--- a/htdocs/compta/tva/index.php
+++ b/htdocs/compta/tva/index.php
@@ -198,7 +198,11 @@ $form=new Form($db);
 $company_static=new Societe($db);
 $tva = new Tva($db);
 
-$description = '';
+$fsearch ='<!-- hidden fields for form -->';
+$fsearch.='<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+$fsearch.='<input type="hidden" name="modetax" value="'.$modetax.'">';
+
+$description = $fsearch;
 
 // Show report header
 $name = $langs->trans("ReportByMonth");
@@ -208,7 +212,7 @@ if ($modetax == 1) $calcmode=$langs->trans('OptionVATDebitOption');
 if ($modetax == 2) $calcmode=$langs->trans('OptionPaymentForProductAndServices');
 $calcmode.='<br>('.$langs->trans("TaxModuleSetupToModifyRules", DOL_URL_ROOT.'/admin/taxes.php').')';
 
-$description = $langs->trans("VATSummary").'<br>';
+$description .= $langs->trans("VATSummary").'<br>';
 if ($conf->global->TAX_MODE_SELL_PRODUCT == 'invoice') $description.=$langs->trans("RulesVATDueProducts");
 if ($conf->global->TAX_MODE_SELL_PRODUCT == 'payment') $description.=$langs->trans("RulesVATInProducts");
 if ($conf->global->TAX_MODE_SELL_SERVICE == 'invoice') $description.='<br>'.$langs->trans("RulesVATDueServices");
diff --git a/htdocs/compta/tva/quadri_detail.php b/htdocs/compta/tva/quadri_detail.php
index 8b58bde4199..581e9a1d13e 100644
--- a/htdocs/compta/tva/quadri_detail.php
+++ b/htdocs/compta/tva/quadri_detail.php
@@ -122,8 +122,9 @@ llxHeader('', $langs->trans("VATReport"), '', '', 0, 0, '', '', $morequerystring
 //print load_fiche_titre($langs->trans("VAT"),"");
 
 //$fsearch.='<br>';
-$fsearch.='  <input type="hidden" name="year" value="'.$year.'">';
-$fsearch.='  <input type="hidden" name="modetax" value="'.$modetax.'">';
+$fsearch ='<!-- hidden fields for form -->';
+$fsearch.='<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+$fsearch.='<input type="hidden" name="modetax" value="'.$modetax.'">';
 //$fsearch.='  '.$langs->trans("SalesTurnoverMinimum").': ';
 //$fsearch.='  <input type="text" name="min" value="'.$min.'">';
 
diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php
index bae8632e289..18da6bf476d 100644
--- a/htdocs/contact/class/contact.class.php
+++ b/htdocs/contact/class/contact.class.php
@@ -81,26 +81,11 @@ class Contact extends CommonObject
 
 	public $civility_id;      // In fact we store civility_code
 	public $civility_code;
-  public $civility;
+	public $civility;
 	public $address;
 	public $zip;
 	public $town;
 
-	/**
-	 * @deprecated
-	 * @see $state_id
-	 */
-	public $fk_departement;
-	/**
-	 * @deprecated
-	 * @see $state_code
-	 */
-	public $departement_code;
-	/**
-	 * @deprecated
-	 * @see $state
-	 */
-	public $departement;
 	public $state_id;	        	// Id of department
 	public $state_code;		    // Code of department
 	public $state;			        // Label of department
diff --git a/htdocs/contact/ldap.php b/htdocs/contact/ldap.php
index 1514a2188ff..edcb08c515b 100644
--- a/htdocs/contact/ldap.php
+++ b/htdocs/contact/ldap.php
@@ -80,12 +80,12 @@ if ($action == 'dolibarr2ldap')
  *	View
  */
 
+$form = new Form($db);
+
 $title = (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("Contacts") : $langs->trans("ContactsAddresses"));
 
 llxHeader('', $title, 'EN:Module_Third_Parties|FR:Module_Tiers|ES:M&oacute;dulo_Empresas');
 
-$form = new Form($db);
-
 $head = contact_prepare_head($object);
 
 dol_fiche_head($head, 'ldap', $title, -1, 'contact');
diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index 5c9ac3375dd..0bf304b96a1 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -433,7 +433,7 @@ if (empty($reshook))
 		}
 
 		$qty = GETPOST('qty'.$predef);
-		$remise_percent = GETPOST('remise_percent'.$predef);
+		$remise_percent = ((GETPOST('remise_percent'.$predef) != '') ? GETPOST('remise_percent'.$predef) : 0);
 
 		if ($qty == '')
 		{
@@ -566,7 +566,8 @@ if (empty($reshook))
 			$info_bits=0;
 			if ($tva_npr) $info_bits |= 0x01;
 
-			if (((!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->produit->ignore_price_min_advance)) || empty($conf->global->MAIN_USE_ADVANCED_PERMS) )&& ($price_min && (price2num($pu_ht)*(1-price2num($remise_percent)/100) < price2num($price_min))))
+			if (((! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->produit->ignore_price_min_advance))
+				|| empty($conf->global->MAIN_USE_ADVANCED_PERMS) ) && ($price_min && (price2num($pu_ht)*(1-price2num($remise_percent)/100) < price2num($price_min))))
 			{
 				$object->error = $langs->trans("CantBeLessThanMinPrice", price(price2num($price_min, 'MU'), 0, $langs, 0, 0, -1, $conf->currency));
 				$result = -1 ;
diff --git a/htdocs/core/boxes/box_activity.php b/htdocs/core/boxes/box_activity.php
index 995ba93fb64..c313b6c526a 100644
--- a/htdocs/core/boxes/box_activity.php
+++ b/htdocs/core/boxes/box_activity.php
@@ -173,7 +173,7 @@ class box_activity extends ModeleBoxes
         			$totalnb += $data[$j]->nb;
 
         			$this->info_box_contents[$line][3] = array(
-                        'td' => 'class="right"',
+                        'td' => 'class="nowrap right"',
                         'text' => price($data[$j]->Mnttot, 1, $langs, 0, 0, -1, $conf->currency),
         			);
         			$this->info_box_contents[$line][4] = array(
@@ -256,7 +256,7 @@ class box_activity extends ModeleBoxes
                     $totalnb += $data[$j]->nb;
 
                     $this->info_box_contents[$line][3] = array(
-                        'td' => 'class="right"',
+                        'td' => 'class="nowrap right"',
                         'text' => price($data[$j]->Mnttot, 1, $langs, 0, 0, -1, $conf->currency),
                     );
                     $this->info_box_contents[$line][4] = array(
@@ -340,7 +340,7 @@ class box_activity extends ModeleBoxes
         			);
 
         			$this->info_box_contents[$line][3] = array(
-                        'td' => 'class="right"',
+                        'td' => 'class="nowrap right"',
                         'text' => price($data[$j]->Mnttot, 1, $langs, 0, 0, -1, $conf->currency)
         			);
 
diff --git a/htdocs/core/boxes/box_comptes.php b/htdocs/core/boxes/box_comptes.php
index 525562d308d..1928ac7cc94 100644
--- a/htdocs/core/boxes/box_comptes.php
+++ b/htdocs/core/boxes/box_comptes.php
@@ -134,7 +134,7 @@ class box_comptes extends ModeleBoxes
                     );
 
                     $this->info_box_contents[$line][] = array(
-                        'td' => 'class="right"',
+                        'td' => 'class="right nowraponall"',
                         'text' => price($solde, 0, $langs, 0, -1, -1, $objp->currency_code)
                     );
 
diff --git a/htdocs/core/boxes/box_produits_alerte_stock.php b/htdocs/core/boxes/box_produits_alerte_stock.php
index d1381870338..165b6db0d6b 100644
--- a/htdocs/core/boxes/box_produits_alerte_stock.php
+++ b/htdocs/core/boxes/box_produits_alerte_stock.php
@@ -179,12 +179,12 @@ class box_produits_alerte_stock extends ModeleBoxes
 	               	}
 
                     $this->info_box_contents[$line][] = array(
-                        'td' => 'class="right"',
+                        'td' => 'class="right nowraponall"',
                         'text' => $price,
                     );
 
                     $this->info_box_contents[$line][] = array(
-                        'td' => 'class="nowrap"',
+                        'td' => 'class="right"',
                         'text' => $price_base_type,
                     );
 
diff --git a/htdocs/core/boxes/box_supplier_orders.php b/htdocs/core/boxes/box_supplier_orders.php
index 34316cd1ad1..6874425db78 100644
--- a/htdocs/core/boxes/box_supplier_orders.php
+++ b/htdocs/core/boxes/box_supplier_orders.php
@@ -135,7 +135,7 @@ class box_supplier_orders extends ModeleBoxes
                     );
 
                     $this->info_box_contents[$line][] = array(
-                        'td' => 'class="right"',
+                        'td' => 'class="right nowrap"',
                         'text' => price($objp->total_ht, 0, $langs, 0, -1, -1, $conf->currency),
                     );
 
diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
index fadd0c02fde..1df572c8a35 100644
--- a/htdocs/core/class/commondocgenerator.class.php
+++ b/htdocs/core/class/commondocgenerator.class.php
@@ -497,8 +497,16 @@ abstract class CommonDocGenerator
 			$resarray['object_total_up'] = $totalUp;
 			$resarray['object_total_up_locale'] = price($resarray['object_total_up'], 0, $outputlangs);
 			if (method_exists($object, 'getTotalDiscount')) {
-				$resarray['object_total_discount'] = round(100 / $totalUp * $object->getTotalDiscount(), 2);
+				$totalDiscount=$object->getTotalDiscount();
+			} else {
+				$totalDiscount=0;
+			}
+			if (!empty($totalUp) && !empty($totalDiscount)) {
+				$resarray['object_total_discount'] = round(100 / $totalUp * $totalDiscount, 2);
 				$resarray['object_total_discount_locale'] = price($resarray['object_total_discount'], 0, $outputlangs);
+			} else {
+				$resarray['object_total_discount']='';
+				$resarray['object_total_discount_locale']='';
 			}
 		}
 
@@ -766,10 +774,20 @@ abstract class CommonDocGenerator
 				//Add value to store price with currency
 				$array_to_fill=array_merge($array_to_fill, array($array_key.'_options_'.$key.'_currency' => $object->array_options['options_'.$key.'_currency']));
 			}
-			elseif($extrafields->attribute_type[$key] == 'select' || $extrafields->attribute_type[$key] == 'checkbox')
+			elseif($extrafields->attribute_type[$key] == 'select')
 			{
 				$object->array_options['options_'.$key] = $extrafields->attribute_param[$key]['options'][$object->array_options['options_'.$key]];
 			}
+			elseif($extrafields->attribute_type[$key] == 'checkbox') {
+				$valArray=explode(',', $object->array_options['options_'.$key]);
+				$output=array();
+				foreach($extrafields->attribute_param[$key]['options'] as $keyopt=>$valopt) {
+					if  (in_array($keyopt, $valArray)) {
+						$output[]=$valopt;
+					}
+				}
+				$object->array_options['options_'.$key] = implode(', ', $output);
+			}
 			elseif($extrafields->attribute_type[$key] == 'date')
 			{
 				if (strlen($object->array_options['options_'.$key])>0)
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 4e88348c6d0..d20a8d2785b 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -6450,9 +6450,12 @@ abstract class CommonObject
 				}
 				else
 				{
-					$csstyle='';
 					$class=(!empty($extrafields->attributes[$this->table_element]['hidden'][$key]) ? 'hideobject ' : '');
+					$csstyle='';
 					if (is_array($params) && count($params)>0) {
+						if (array_key_exists('class', $params)) {
+							$class.=$params['class'].' ';
+						}
 						if (array_key_exists('style', $params)) {
 							$csstyle=$params['style'];
 						}
@@ -6489,16 +6492,19 @@ abstract class CommonObject
 
 					$labeltoshow = $langs->trans($label);
 
-					$out .= '<td class="titlefield';
-					if (GETPOST('action', 'none') == 'create') $out.='create';
+					$out .= '<td class="';
+					//$out .= "titlefield";
+					//if (GETPOST('action', 'none') == 'create') $out.='create';
 					if ($mode != 'view' && ! empty($extrafields->attributes[$this->table_element]['required'][$key])) $out .= ' fieldrequired';
 					$out .= '">';
-					if (! empty($extrafields->attributes[$object->table_element]['help'][$key])) $out .= $form->textwithpicto($labeltoshow, $extrafields->attributes[$object->table_element]['help'][$key]);
+					if (! empty($extrafields->attributes[$this->table_element]['help'][$key])) $out .= $form->textwithpicto($labeltoshow, $extrafields->attributes[$this->table_element]['help'][$key]);
 					else $out .= $labeltoshow;
 					$out .= '</td>';
 
 					$html_id = !empty($this->id) ? $this->element.'_extras_'.$key.'_'.$this->id : '';
+
 					$out .='<td id="'.$html_id.'" class="'.$this->element.'_extras_'.$key.'" '.($colspan?' colspan="'.$colspan.'"':'').'>';
+					//$out .='<td id="'.$html_id.'" class="'.$this->element.'_extras_'.$key.'">';
 
 					switch($mode) {
 						case "view":
@@ -6511,6 +6517,11 @@ abstract class CommonObject
 
 					$out .= '</td>';
 
+					/*for($ii = 0; $ii < ($colspan - 1); $ii++)
+					{
+						$out .='<td class="'.$this->element.'_extras_'.$key.'"></td>';
+					}*/
+
 					if (! empty($conf->global->MAIN_EXTRAFIELDS_USE_TWO_COLUMS) && (($e % 2) == 1)) $out .= '</tr>';
 					else $out .= '</tr>';
 					$e++;
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 80c88e9406c..dce42c79d33 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -1152,9 +1152,8 @@ class Form
 		 	$sql .= ", dictp.code as country_code";
 		}
 
-		$sql.= " FROM (".MAIN_DB_PREFIX ."societe as s";
+		$sql.= " FROM ".MAIN_DB_PREFIX ."societe as s";
 		if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-		$sql.= " )";
 		if ($conf->global->COMPANY_SHOW_ADDRESS_SELECTLIST) {
 			$sql.= " LEFT OUTER JOIN ".MAIN_DB_PREFIX."c_country as dictp ON dictp.rowid=s.fk_pays";
 		}
@@ -1903,6 +1902,15 @@ class Form
 		$price_level = (! empty($price_level) ? $price_level : 0);
 		if (is_null($ajaxoptions)) $ajaxoptions=array();
 
+		if(strval($filtertype) === '' && (!empty($conf->product->enabled) || !empty($conf->service->enabled))){
+			if(!empty($conf->product->enabled) && empty($conf->service->enabled)){
+				$filtertype = '0';
+			}
+			elseif(empty($conf->product->enabled) && !empty($conf->service->enabled)){
+				$filtertype = '1';
+			}
+		}
+
 		if (! empty($conf->use_javascript_ajax) && ! empty($conf->global->PRODUIT_USE_SEARCH_TO_SELECT))
 		{
 			$placeholder='';
@@ -4229,7 +4237,7 @@ class Form
 			$formconfirm.= '<td class="valid">';
 			$formconfirm.= $this->selectyesno("confirm", $newselectedchoice);
 			$formconfirm.= '</td>';
-			$formconfirm.= '<td class="valid center"><input class="button valignmiddle" type="submit" onclick="this.disabled=\'disabled\' value="'.$langs->trans("Validate").'"></td>';
+			$formconfirm.= '<td class="valid center"><input class="button valignmiddle" type="submit" value="'.$langs->trans("Validate").'"></td>';
 			$formconfirm.= '</tr>'."\n";
 
 			$formconfirm.= '</table>'."\n";
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index d271f90720c..9411e8bc824 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -1381,7 +1381,7 @@ class FormFile
 							if (! empty($conf->dol_use_jmobile)) $useajax=0;
 							if (empty($conf->use_javascript_ajax)) $useajax=0;
 							if (! empty($conf->global->MAIN_ECM_DISABLE_JS)) $useajax=0;
-							print '<a href="'.((($useinecm && $useinecm != 6) && $useajax)?'#':($url.'?action=delete&urlfile='.urlencode($filepath).$param)).'" class="deletefilelink" rel="'.$filepath.'">'.img_delete().'</a>';
+							print '<a href="'.((($useinecm && $useinecm != 6) && $useajax)?'#':($url.'?action=delete&urlfile='.urlencode($filepath).$param)).'" class="reposition deletefilelink" rel="'.$filepath.'">'.img_delete().'</a>';
 						}
 						print "</td>";
 
diff --git a/htdocs/core/class/utils.class.php b/htdocs/core/class/utils.class.php
index f86d6570e5c..86eff6613c1 100644
--- a/htdocs/core/class/utils.class.php
+++ b/htdocs/core/class/utils.class.php
@@ -316,27 +316,29 @@ class Utils
 				// TODO Replace with executeCLI function
 				if ($execmethod == 1)
 				{
-					exec($fullcommandclear, $readt, $retval);
-					$result = $retval;
+					$output_arr = array(); $retval = null;
+					exec($fullcommandclear, $output_arr, $retval);
 
 					if ($retval != 0)
 					{
 						$langs->load("errors");
 						dol_syslog("Datadump retval after exec=".$retval, LOG_ERR);
-						$error = 'Error '.$retval;
+						$errormsg = 'Error '.$retval;
 						$ok=0;
 					}
 					else
 					{
 						$i=0;
-						if (!empty($readt))
-						foreach($readt as $key=>$read)
+						if (!empty($output_arr))
 						{
-							$i++;   // output line number
-							if ($i == 1 && preg_match('/Warning.*Using a password/i', $read)) continue;
-							fwrite($handle, $read.($execmethod == 2 ? '' : "\n"));
-							if (preg_match('/'.preg_quote('-- Dump completed').'/i', $read)) $ok=1;
-							elseif (preg_match('/'.preg_quote('SET SQL_NOTES=@OLD_SQL_NOTES').'/i', $read)) $ok=1;
+							foreach($output_arr as $key => $read)
+							{
+								$i++;   // output line number
+								if ($i == 1 && preg_match('/Warning.*Using a password/i', $read)) continue;
+								fwrite($handle, $read.($execmethod == 2 ? '' : "\n"));
+								if (preg_match('/'.preg_quote('-- Dump completed').'/i', $read)) $ok=1;
+								elseif (preg_match('/'.preg_quote('SET SQL_NOTES=@OLD_SQL_NOTES').'/i', $read)) $ok=1;
+							}
 						}
 					}
 				}
@@ -534,6 +536,7 @@ class Utils
 
 		if ($execmethod == 1)
 		{
+			$retval = null;
 			exec($command, $output_arr, $retval);
 			$result = $retval;
 			if ($retval != 0)
@@ -545,7 +548,6 @@ class Utils
 		}
 		if ($execmethod == 2)	// With this method, there is no way to get the return code, only output
 		{
-			$ok=0;
 			$handle = fopen($outputfile, 'w+b');
 			if ($handle)
 			{
diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index c6a5cb14426..d2aee3e6a30 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -1221,9 +1221,12 @@ function dol_delete_file($file, $disableglob = 0, $nophperrors = 0, $nohook = 0,
 							}
 						}
 					}
-					else dol_syslog("Failed to remove file ".$filename, LOG_WARNING);
-					// TODO Failure to remove can be because file was already removed or because of permission
-					// If error because it does not exists, we should return true, and we should return false if this is a permission problem
+					else
+					{
+						dol_syslog("Failed to remove file ".$filename, LOG_WARNING);
+						// TODO Failure to remove can be because file was already removed or because of permission
+						// If error because it does not exists, we should return true, and we should return false if this is a permission problem
+					}
 				}
 			}
 			else dol_syslog("No files to delete found", LOG_DEBUG);
@@ -2062,9 +2065,10 @@ function dol_uncompress($inputfile, $outputdir)
  * @param 	string	$inputdir		Source dir name
  * @param 	string	$outputfile		Target file name (output directory must exists and be writable)
  * @param 	string	$mode			'zip'
+ * @param	string	$excludefiles   A regex pattern. For example: '/\.log$|\/temp\//'
  * @return	int						<0 if KO, >0 if OK
  */
-function dol_compress_dir($inputdir, $outputfile, $mode = "zip")
+function dol_compress_dir($inputdir, $outputfile, $mode = "zip", $excludefiles = '')
 {
 	$foundhandler=0;
 
@@ -2095,6 +2099,7 @@ function dol_compress_dir($inputdir, $outputfile, $mode = "zip")
                 return 1;
             }
             else*/
+			//if (class_exists('ZipArchive') && ! empty($conf->global->MAIN_USE_ZIPARCHIVE_FOR_ZIP_COMPRESS))
 			if (class_exists('ZipArchive'))
 			{
 				$foundhandler=1;
@@ -2102,6 +2107,13 @@ function dol_compress_dir($inputdir, $outputfile, $mode = "zip")
 				// Initialize archive object
 				$zip = new ZipArchive();
 				$result = $zip->open($outputfile, ZipArchive::CREATE | ZipArchive::OVERWRITE);
+				if (! $result)
+				{
+					global $langs, $errormsg;
+					$langs->load("errors");
+					$errormsg=$langs->trans("ErrorFailedToWriteInFile", $outputfile);
+					return -4;
+				}
 
 				// Create recursive directory iterator
 				/** @var SplFileInfo[] $files */
@@ -2118,9 +2130,11 @@ function dol_compress_dir($inputdir, $outputfile, $mode = "zip")
 						// Get real and relative path for current file
 						$filePath = $file->getRealPath();
 						$relativePath = substr($filePath, strlen($inputdir) + 1);
-
-						// Add current file to archive
-						$zip->addFile($filePath, $relativePath);
+						if (empty($excludefiles) || ! preg_match($excludefiles, $filePath))
+						{
+							// Add current file to archive
+							$zip->addFile($filePath, $relativePath);
+						}
 					}
 				}
 
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 30267a57ad5..3d7c9ad0ae2 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -796,8 +796,10 @@ function dol_size($size, $type = '')
  */
 function dol_sanitizeFileName($str, $newstr = '_', $unaccent = 1)
 {
-	// List of special chars for filenames are defined on page https://docs.microsoft.com/en-us/windows/win32/fileio/naming-a-file
-	$filesystem_forbidden_chars = array('<', '>', '/', '\\', '?', '*', '|', '"', ':', '°');
+	// List of special chars for filenames in windows are defined on page https://docs.microsoft.com/en-us/windows/win32/fileio/naming-a-file
+	// Char '>' '<' '|' '$' and ';' are special chars for shells.
+	// Char '/' and '\' are file delimiters.
+	$filesystem_forbidden_chars = array('<', '>', '/', '\\', '?', '*', '|', '"', ':', '°', '$', ';');
 	return dol_string_nospecial($unaccent?dol_string_unaccent($str):$str, $newstr, $filesystem_forbidden_chars);
 }
 
@@ -922,11 +924,15 @@ function dol_escape_js($stringtoescape, $mode = 0, $noescapebackslashn = 0)
  *  @param      string		$stringtoescape		String to escape
  *  @param		int			$keepb				1=Preserve b tags (otherwise, remove them)
  *  @param      int         $keepn              1=Preserve \r\n strings (otherwise, replace them with escaped value). Set to 1 when escaping for a <textarea>.
+ *  @param		string		$keepmoretags		'' or 'common' or list of tags
  *  @return     string     				 		Escaped string
  *  @see		dol_string_nohtmltag(), dol_string_nospecial(), dol_string_unaccent()
  */
-function dol_escape_htmltag($stringtoescape, $keepb = 0, $keepn = 0)
+function dol_escape_htmltag($stringtoescape, $keepb = 0, $keepn = 0, $keepmoretags = '')
 {
+	if ($keepmoretags == 'common') $keepmoretags = 'html,body,a,em,i,u,ul,li,br,div,img,font,p,span,strong,table,tr,td,th,tbody';
+	// TODO Implement $keepmoretags
+
 	// escape quotes and backslashes, newlines, etc.
 	$tmp=html_entity_decode($stringtoescape, ENT_COMPAT, 'UTF-8');		// TODO Use htmlspecialchars_decode instead, that make only required change for html tags
 	if (! $keepb) $tmp=strtr($tmp, array("<b>"=>'','</b>'=>''));
@@ -5528,7 +5534,7 @@ function dol_nl2br($stringtoencode, $nl2brmode = 0, $forxml = false)
 
 /**
  *	This function is called to encode a string into a HTML string but differs from htmlentities because
- * 	a detection is done before to see if text is already HTML or not. Also, all entities but &,<,> are converted.
+ * 	a detection is done before to see if text is already HTML or not. Also, all entities but &,<,>," are converted.
  *  This permits to encode special chars to entities with no double encoding for already encoded HTML strings.
  * 	This function also remove last EOL or BR if $removelasteolbr=1 (default).
  *  For PDF usage, you can show text by 2 ways:
diff --git a/htdocs/core/lib/ldap.lib.php b/htdocs/core/lib/ldap.lib.php
index 02212952084..0babce52470 100644
--- a/htdocs/core/lib/ldap.lib.php
+++ b/htdocs/core/lib/ldap.lib.php
@@ -124,7 +124,7 @@ function show_ldap_test_button($butlabel, $testlabel, $key, $dn, $objectclass)
 	}
 	else
 	{
-		print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action='.$testlabel.'">'.$butlabel.'</a>';
+		print '<a class="butAction reposition" href="'.$_SERVER["PHP_SELF"].'?action='.$testlabel.'">'.$butlabel.'</a>';
 	}
 	print '<br><br>';
 }
diff --git a/htdocs/core/lib/tax.lib.php b/htdocs/core/lib/tax.lib.php
index 884ff4fc922..d959a660224 100644
--- a/htdocs/core/lib/tax.lib.php
+++ b/htdocs/core/lib/tax.lib.php
@@ -124,7 +124,7 @@ function tax_by_thirdparty($type, $db, $y, $date_start, $date_end, $modetax, $di
     	$invoicefieldref='ref';
     }
 
-    if ( strpos($type, 'localtax') === 0 ) {
+    if (strpos($type, 'localtax') === 0) {
     	$f_rate = $type . '_tx';
     } else {
     	$f_rate = 'tva_tx';
diff --git a/htdocs/core/modules/mailings/advthirdparties.modules.php b/htdocs/core/modules/mailings/advthirdparties.modules.php
index a29fdd119bf..370f05e4232 100644
--- a/htdocs/core/modules/mailings/advthirdparties.modules.php
+++ b/htdocs/core/modules/mailings/advthirdparties.modules.php
@@ -88,7 +88,6 @@ class mailing_advthirdparties extends MailingTargets
 
     				dol_syslog(get_class($this)."::add_to_target mailing ".$num." targets found", LOG_DEBUG);
 
-    				$old = '';
     				while ($i < $num)
     				{
     					$obj = $this->db->fetch_object($result);
@@ -144,7 +143,6 @@ class mailing_advthirdparties extends MailingTargets
 
     				dol_syslog(get_class($this)."::add_to_target mailing ".$num." targets found");
 
-    				$old = '';
     				while ($i < $num)
     				{
     					$obj = $this->db->fetch_object($result);
diff --git a/htdocs/core/modules/modDebugBar.class.php b/htdocs/core/modules/modDebugBar.class.php
index 8d51a102251..b69406ffb57 100644
--- a/htdocs/core/modules/modDebugBar.class.php
+++ b/htdocs/core/modules/modDebugBar.class.php
@@ -16,7 +16,7 @@
  */
 
 /**
- * 	\defgroup   debugbar     Debug bar
+ * 	\defgroup   debugbar     Module Debug bar
  *  \brief      debugbar module descriptor.
  *
  *  \file       htdocs/core/modules/modDebugBar.class.php
diff --git a/htdocs/core/modules/modReception.class.php b/htdocs/core/modules/modReception.class.php
index 6594d7bb04a..f85f5656afe 100644
--- a/htdocs/core/modules/modReception.class.php
+++ b/htdocs/core/modules/modReception.class.php
@@ -58,7 +58,7 @@ class modReception extends DolibarrModules
 		// Data directories to create when module is enabled
 		$this->dirs = array("/reception/receipt",
 		                    "/reception/receipt/temp",
-		                    "/doctemplates/reception"
+		                    "/doctemplates/receptions"
 		                    );
 
 		// Config pages
diff --git a/htdocs/core/modules/reception/doc/pdf_squille.modules.php b/htdocs/core/modules/reception/doc/pdf_squille.modules.php
index 9acd517370a..ca167e10644 100644
--- a/htdocs/core/modules/reception/doc/pdf_squille.modules.php
+++ b/htdocs/core/modules/reception/doc/pdf_squille.modules.php
@@ -121,15 +121,7 @@ class pdf_squille extends ModelePdfReception
 		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
 		if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1';
 
-		$outputlangs->load("main");
-		$outputlangs->load("dict");
-		$outputlangs->load("companies");
-		$outputlangs->load("bills");
-		$outputlangs->load("products");
-		$outputlangs->load("propal");
-		$outputlangs->load("deliveries");
-        $outputlangs->load("receptions");
-		$outputlangs->load("productbatch");
+		$outputlangs->loadLangs(array("main","dict","companies","bills","products","propal","deliveries","receptions","productbatch","sendings"));
 
 		$nblignes = count($object->lines);
 
diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php
index f427bb34f92..6bad5bb2ac5 100644
--- a/htdocs/core/tpl/objectline_create.tpl.php
+++ b/htdocs/core/tpl/objectline_create.tpl.php
@@ -375,7 +375,7 @@ if ($nolinesbefore) {
 	{
 		$coldisplay++;
         ?>
-		<td class="nobottom linecolresupplier"><input id="fourn_ref" name="fourn_ref" class="flat maxwidth75" value="<?php echo (isset($_POST["fourn_ref"])?GETPOST("fourn_ref", 'alpha', 2):''); ?>"></td>
+		<td class="nobottom linecolresupplier"><input id="fourn_ref" name="fourn_ref" class="flat minwidth50 maxwidth150" value="<?php echo (isset($_POST["fourn_ref"])?GETPOST("fourn_ref", 'alpha', 2):''); ?>"></td>
 	<?php } ?>
 
 	<td class="nobottom linecolvat right"><?php
diff --git a/htdocs/core/tpl/objectline_edit.tpl.php b/htdocs/core/tpl/objectline_edit.tpl.php
index bac9ff997bc..82eb44c3b9b 100644
--- a/htdocs/core/tpl/objectline_edit.tpl.php
+++ b/htdocs/core/tpl/objectline_edit.tpl.php
@@ -140,7 +140,7 @@ $coldisplay=0;
 	{
 	    $coldisplay++;
 	?>
-		<td class="right"><input id="fourn_ref" name="fourn_ref" class="flat minwidth75" value="<?php echo ($line->ref_supplier ? $line->ref_supplier : $line->ref_fourn); ?>"></td>
+		<td class="right"><input id="fourn_ref" name="fourn_ref" class="flat minwidth50 maxwidth150" value="<?php echo ($line->ref_supplier ? $line->ref_supplier : $line->ref_fourn); ?>"></td>
 	<?php
 	}
 
@@ -261,7 +261,7 @@ $coldisplay=0;
 //Line extrafield
 if (!empty($extrafieldsline))
 {
-	print $line->showOptionals($extrafieldsline, 'edit', array('style'=>$bc[$var],'colspan'=>$coldisplay), '', '', empty($conf->global->MAIN_EXTRAFIELDS_IN_ONE_TD)?0:1);
+	print $line->showOptionals($extrafieldsline, 'edit', array('class'=>'tredited', 'colspan'=>$coldisplay), '', '', empty($conf->global->MAIN_EXTRAFIELDS_IN_ONE_TD)?0:1);
 }
 ?>
 
diff --git a/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php b/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
index b0fc6634a98..daa5ae9a525 100644
--- a/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
+++ b/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
@@ -621,7 +621,10 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 					}
 				}
 
-				if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;
+				if ($result <= 0)
+				{
+					$this->errors[]="ErrorLDAP ".$ldap->error;
+				}
 			}
 		}
 		elseif ($action == 'MEMBER_NEW_PASSWORD')
@@ -644,7 +647,10 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 						$result=$ldap->update($dn, $info, $user, $olddn);
 					}
 
-					if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;
+					if ($result <= 0)
+					{
+						$this->errors[] = "ErrorLDAP ".$ldap->error;
+					}
 				}
 			}
 		}
@@ -668,7 +674,10 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 						$result=$ldap->update($dn, $info, $user, $olddn);
 					}
 
-					if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;
+					if ($result <= 0)
+					{
+						$this->errors[] = "ErrorLDAP ".$ldap->error;
+					}
 				}
 			}
 		}
@@ -721,7 +730,10 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 					}
 				}
 
-				if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;
+				if ($result <= 0)
+				{
+					$this->errors[] = "ErrorLDAP ".$ldap->error;
+				}
 			}
 		}
 
@@ -747,7 +759,10 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 					$result=$ldap->add($dn, $info, $user);
 				}
 
-				if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;
+				if ($result <= 0)
+				{
+					$this->errors[] = "ErrorLDAP ".$ldap->error;
+				}
 			}
 		}
 		elseif ($action == 'MEMBER_TYPE_MODIFY')
@@ -788,7 +803,9 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 					$result=$ldap->update($dn, $info, $user, $olddn);
 				}
 
-				if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;
+				if ($result <= 0) {
+					$this->errors[] = "ErrorLDAP ".$ldap->error;
+				}
 			}
 		}
 		elseif ($action == 'MEMBER_TYPE_DELETE')
@@ -807,7 +824,10 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 					$result=$ldap->delete($dn);
 				}
 
-				if ($result < 0) $this->error="ErrorLDAP ".$ldap->error;
+				if ($result <= 0)
+				{
+					$this->errors[] = "ErrorLDAP ".$ldap->error;
+				}
 			}
 		}
 
diff --git a/htdocs/externalsite/frames.php b/htdocs/externalsite/frames.php
index eb8e06919d3..9c232cbe710 100644
--- a/htdocs/externalsite/frames.php
+++ b/htdocs/externalsite/frames.php
@@ -49,6 +49,7 @@ if (empty($keyforcontent) && empty($conf->global->EXTERNALSITE_URL))
 	llxHeader();
 	print '<div class="error">'.$langs->trans('ExternalSiteModuleNotComplete').'</div>';
 	llxFooter();
+	exit;
 }
 
 if (! empty($keyforcontent))
diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index d15545e4cda..51829492665 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -1822,10 +1822,9 @@ class CommandeFournisseur extends CommonOrder
                 $error++;
             }
 
-            // Si module stock gere et que incrementation faite depuis un dispatching en stock
+            // If module stock is enabled and the stock increase is done on purchase order dispatching
             if (! $error && $entrepot > 0 && ! empty($conf->stock->enabled) && ! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER))
             {
-
                 $mouv = new MouvementStock($this->db);
                 if ($product > 0)
                 {
diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index 436a3a1de86..91310ef9138 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -36,6 +36,7 @@
 
 include_once DOL_DOCUMENT_ROOT.'/core/class/commoninvoice.class.php';
 require_once DOL_DOCUMENT_ROOT.'/multicurrency/class/multicurrency.class.php';
+require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 
 /**
  *	Class to manage suppliers invoices
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index 3e42552a942..1f6baa158da 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -2338,7 +2338,7 @@ elseif (! empty($object->id))
 			}*/
 
 			// Modify
-			if ($object->statut == 1)
+			if ($object->statut == CommandeFournisseur::STATUS_VALIDATED)
 			{
 				if ($user->rights->fournisseur->commande->commander)
 				{
@@ -2347,7 +2347,7 @@ elseif (! empty($object->id))
 			}
 
 			// Approve
-			if ($object->statut == 1)
+			if ($object->statut == CommandeFournisseur::STATUS_VALIDATED)
 			{
 				if ($user->rights->fournisseur->commande->approuver)
 				{
@@ -2369,7 +2369,7 @@ elseif (! empty($object->id))
 			// Second approval (if option SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED is set)
 			if (! empty($conf->global->SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED) && $conf->global->MAIN_FEATURES_LEVEL > 0 && $object->total_ht >= $conf->global->SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED)
 			{
-				if ($object->statut == 1)
+				if ($object->statut == CommandeFournisseur::STATUS_VALIDATED)
 				{
 					if ($user->rights->fournisseur->commande->approve2)
 					{
@@ -2390,7 +2390,7 @@ elseif (! empty($object->id))
 			}
 
 			// Refuse
-			if ($object->statut == 1)
+			if ($object->statut == CommandeFournisseur::STATUS_VALIDATED)
 			{
 				if ($user->rights->fournisseur->commande->approuver || $user->rights->fournisseur->commande->approve2)
 				{
@@ -2403,7 +2403,7 @@ elseif (! empty($object->id))
 			}
 
 			// Send
-			if (in_array($object->statut, array(2, 3, 4, 5)))
+			if (in_array($object->statut, array(CommandeFournisseur::STATUS_ACCEPTED, 3, 4, 5)))
 			{
 				if ($user->rights->fournisseur->commande->commander)
 				{
@@ -2412,7 +2412,7 @@ elseif (! empty($object->id))
 			}
 
 			// Reopen
-			if (in_array($object->statut, array(2)))
+			if (in_array($object->statut, array(CommandeFournisseur::STATUS_ACCEPTED)))
 			{
 				$buttonshown=0;
 				if (! $buttonshown && $user->rights->fournisseur->commande->approuver)
@@ -2454,7 +2454,7 @@ elseif (! empty($object->id))
 				}
 			}
 
-			if ($object->statut == 2)
+			if ($object->statut == CommandeFournisseur::STATUS_ACCEPTED)
 			{
 				if ($user->rights->fournisseur->commande->commander)
 				{
@@ -2466,6 +2466,15 @@ elseif (! empty($object->id))
 				}
 			}
 
+			// Classify received (this does not record reception)
+			if ($object->statut == CommandeFournisseur::STATUS_ORDERSENT || $object->statut == CommandeFournisseur::STATUS_RECEIVED_PARTIALLY)
+			{
+				if ($user->rights->fournisseur->commande->receptionner)
+				{
+					print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=classifyreception#classifyreception">'.$langs->trans("ClassifyReception").'</a></div>';
+				}
+			}
+
 			// Create bill
 			//if (! empty($conf->facture->enabled))
 			//{
@@ -2583,38 +2592,41 @@ elseif (! empty($object->id))
 
 			print '</div><div class="fichehalfright"><div class="ficheaddleft">';
 
-			if ($user->rights->fournisseur->commande->receptionner	&& ($object->statut == 3 || $object->statut == 4))
+			if ($action == 'classifyreception')
 			{
-				// Set status to received (action=livraison)
-				print '<!-- form to record supplier order received -->'."\n";
-				print '<form action="card.php?id='.$object->id.'" method="post">';
-				print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-				print '<input type="hidden"	name="action" value="livraison">';
-				print load_fiche_titre($langs->trans("Receive"), '', '');
+				if ($user->rights->fournisseur->commande->receptionner	&& ($object->statut == CommandeFournisseur::STATUS_ORDERSENT || $object->statut == CommandeFournisseur::STATUS_RECEIVED_PARTIALLY))
+				{
+					// Set status to received (action=livraison)
+					print '<!-- form to record purchase order received -->'."\n";
+					print '<form id="classifyreception" action="card.php?id='.$object->id.'" method="post">';
+					print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+					print '<input type="hidden"	name="action" value="livraison">';
+					print load_fiche_titre($langs->trans("Receive"), '', '');
 
-				print '<table class="noborder centpercent">';
-				//print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("Receive").'</td></tr>';
-				print '<tr><td>'.$langs->trans("DeliveryDate").'</td><td>';
-				$datepreselected = dol_now();
-				print $form->selectDate($datepreselected, '', 1, 1, '', "commande", 1, 1);
-				print "</td></tr>\n";
+					print '<table class="noborder centpercent">';
+					//print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("Receive").'</td></tr>';
+					print '<tr><td>'.$langs->trans("DeliveryDate").'</td><td>';
+					$datepreselected = dol_now();
+					print $form->selectDate($datepreselected, '', 1, 1, '', "commande", 1, 1);
+					print "</td></tr>\n";
 
-				print "<tr><td class=\"fieldrequired\">".$langs->trans("Delivery")."</td><td>\n";
-				$liv = array();
-				$liv[''] = '&nbsp;';
-				$liv['tot']	= $langs->trans("CompleteOrNoMoreReceptionExpected");
-				$liv['par']	= $langs->trans("PartialWoman");
-				$liv['nev']	= $langs->trans("NeverReceived");
-				$liv['can']	= $langs->trans("Canceled");
+					print '<tr><td class="fieldrequired">'.$langs->trans("Delivery")."</td><td>\n";
+					$liv = array();
+					$liv[''] = '&nbsp;';
+					$liv['tot']	= $langs->trans("CompleteOrNoMoreReceptionExpected");
+					$liv['par']	= $langs->trans("PartialWoman");
+					$liv['nev']	= $langs->trans("NeverReceived");
+					$liv['can']	= $langs->trans("Canceled");
 
-				print $form->selectarray("type", $liv);
+					print $form->selectarray("type", $liv);
 
-				print '</td></tr>';
-				print '<tr><td>'.$langs->trans("Comment").'</td><td><input size="40" type="text" name="comment"></td></tr>';
-				print '<tr><td class="center" colspan="2"><input type="submit" class="button" value="'.$langs->trans("Receive").'"></td></tr>';
-				print "</table>\n";
-				print "</form>\n";
-				print "<br>";
+					print '</td></tr>';
+					print '<tr><td>'.$langs->trans("Comment").'</td><td><input size="40" type="text" name="comment"></td></tr>';
+					print '<tr><td class="center" colspan="2"><input type="submit" class="button" value="'.$langs->trans("Receive").'"></td></tr>';
+					print "</table>\n";
+					print "</form>\n";
+					print "<br>";
+				}
 			}
 
 			// List of actions on element
diff --git a/htdocs/fourn/commande/dispatch.php b/htdocs/fourn/commande/dispatch.php
index 48599a5bbf2..17a7443aa9f 100644
--- a/htdocs/fourn/commande/dispatch.php
+++ b/htdocs/fourn/commande/dispatch.php
@@ -883,8 +883,16 @@ if ($id > 0 || ! empty($ref)) {
 			print '<td></td>';
 			print '<td>' . $langs->trans("Warehouse") . '</td>';
 			print '<td>' . $langs->trans("Comment") . '</td>';
-			if (! empty($conf->global->SUPPLIER_ORDER_USE_DISPATCH_STATUS) || !empty($conf->reception->enabled))
+
+			// Status
+			if (! empty($conf->global->SUPPLIER_ORDER_USE_DISPATCH_STATUS) && empty($reception->rowid)) {
 				print '<td class="center" colspan="2">' . $langs->trans("Status") . '</td>';
+			}
+			elseif(!empty($conf->reception->enabled)) {
+				print '<td class="center"></td>';
+			}
+
+			print '<td class="center"></td>';
 
 			print "</tr>\n";
 
@@ -969,17 +977,15 @@ if ($id > 0 || ! empty($ref)) {
 						}
 					}
 					print '</td>';
-				}elseif(!empty($conf->reception->enabled)){
+				} elseif(!empty($conf->reception->enabled)) {
 					print '<td class="right">';
 					if(!empty($reception->id)){
 						print $reception->getLibStatut(5);
 					}
+					print '</td>';
 				}
-					print '</td>';
-					print '<td class="center">';
-					print '</td>';
-
 
+				print '<td class="center"></td>';
 
 				print "</tr>\n";
 
diff --git a/htdocs/holiday/card.php b/htdocs/holiday/card.php
index 87305a19fd4..204d832a94c 100644
--- a/htdocs/holiday/card.php
+++ b/htdocs/holiday/card.php
@@ -55,13 +55,6 @@ $langs->load("holiday");
 
 $childids = $user->getAllChildIds(1);
 
-$cancreate = 0;
-if (! empty($user->rights->holiday->write_all)) $cancreate=1;
-if (! empty($user->rights->holiday->write) && in_array($fuserid, $childids)) $cancreate=1;
-
-$candelete = 0;
-if (! empty($user->rights->holiday->delete)) $candelete=1;
-
 $morefilter = 'AND employee = 1';
 if (! empty($conf->global->HOLIDAY_FOR_NON_SALARIES_TOO)) $morefilter = '';
 
@@ -82,6 +75,13 @@ if ($id > 0)
     }
 }
 
+$cancreate = 0;
+if (! empty($user->rights->holiday->write_all)) $cancreate=1;
+if (! empty($user->rights->holiday->write) && in_array($fuserid, $childids)) $cancreate=1;
+
+$candelete = 0;
+if (! empty($user->rights->holiday->delete)) $candelete=1;
+if ($object->statut == Holiday::STATUS_DRAFT && $user->rights->holiday->write && in_array($object->fk_user, $childids)) $candelete=1;
 
 /*
  * Actions
@@ -122,7 +122,7 @@ if ($action == 'create')
 	    elseif ($starthalfday == 'afternoon') $halfday=-1;
 	    elseif ($endhalfday == 'morning') $halfday=1;
 
-	    $valideur = GETPOST('valideur');
+	    $valideur = GETPOST('valideur', 'int');
 	    $description = trim(GETPOST('description'));
 
     	// If no type
@@ -270,8 +270,8 @@ if ($action == 'update' && ! GETPOSTISSET('savevalidator'))
         // If this is the requestor or has read/write rights
         if ($cancreate)
         {
-            $valideur = $_POST['valideur'];
-            $description = trim($_POST['description']);
+            $valideur = GETPOST('valideur', 'int');
+            $description = trim(GETPOST('description', 'none'));
 
             // If no start date
             if (empty($_POST['date_debut_'])) {
@@ -1297,7 +1297,8 @@ else
                     if (empty($include_users)) print img_warning().' '.$langs->trans("NobodyHasPermissionToValidateHolidays");
                     else
                     {
-                        $s=$form->select_dolusers($object->fk_validator, "valideur", (($action == 'editvalidator') ? 0 : 1), ($user->admin ? '' : array($user->id)), 0, $include_users);
+                    	$arrayofvalidatorstoexclude = (($user->admin || ($user->id != $userRequest->id))? '' : array($user->id));	// Nobody if we are admin or if we are not the user of the leave.
+                    	$s=$form->select_dolusers($object->fk_validator, "valideur", (($action == 'editvalidator') ? 0 : 1), $arrayofvalidatorstoexclude, 0, $include_users);
                     	print $form->textwithpicto($s, $langs->trans("AnyOtherInThisListCanValidate"));
                     }
                     if ($action == 'editvalidator')
@@ -1434,7 +1435,7 @@ else
                     {
                         print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=backtodraft" class="butAction">'.$langs->trans("SetToDraft").'</a>';
                     }
-                    if ($user->rights->holiday->delete && ($object->statut == Holiday::STATUS_DRAFT || $object->statut == Holiday::STATUS_CANCELED || $object->statut == Holiday::STATUS_REFUSED))	// If draft or canceled or refused
+                    if ($candelete && ($object->statut == Holiday::STATUS_DRAFT || $object->statut == Holiday::STATUS_CANCELED || $object->statut == Holiday::STATUS_REFUSED))	// If draft or canceled or refused
                     {
                     	print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delete" class="butActionDelete">'.$langs->trans("DeleteCP").'</a>';
                     }
diff --git a/htdocs/install/repair.php b/htdocs/install/repair.php
index fc9c63e4a40..d34d43384d0 100644
--- a/htdocs/install/repair.php
+++ b/htdocs/install/repair.php
@@ -69,6 +69,7 @@ print '<h3>'.$langs->trans("Repair").'</h3>';
 
 print 'Option standard (\'test\' or \'confirmed\') is '.(GETPOST('standard', 'alpha')?GETPOST('standard', 'alpha'):'undefined').'<br>'."\n";
 print 'Option restore_thirdparties_logos (\'test\' or \'confirmed\') is '.(GETPOST('restore_thirdparties_logos', 'alpha')?GETPOST('restore_thirdparties_logos', 'alpha'):'undefined').'<br>'."\n";
+print 'Option restore_user_pictures (\'test\' or \'confirmed\') is '.(GETPOST('restore_user_pictures', 'alpha')?GETPOST('restore_user_pictures', 'alpha'):'undefined').'<br>'."\n";
 print 'Option clean_linked_elements (\'test\' or \'confirmed\') is '.(GETPOST('clean_linked_elements', 'alpha')?GETPOST('clean_linked_elements', 'alpha'):'undefined').'<br>'."\n";
 print 'Option clean_menus (\'test\' or \'confirmed\') is '.(GETPOST('clean_menus', 'alpha')?GETPOST('clean_menus', 'alpha'):'undefined').'<br>'."\n";
 print 'Option clean_orphelin_dir (\'test\' or \'confirmed\') is '.(GETPOST('clean_orphelin_dir', 'alpha')?GETPOST('clean_orphelin_dir', 'alpha'):'undefined').'<br>'."\n";
@@ -78,6 +79,7 @@ print 'Option rebuild_product_thumbs (\'test\' or \'confirmed\') is '.(GETPOST('
 print 'Option force_disable_of_modules_not_found (\'test\' or \'confirmed\') is '.(GETPOST('force_disable_of_modules_not_found', 'alpha')?GETPOST('force_disable_of_modules_not_found', 'alpha'):'undefined').'<br>'."\n";
 print 'Option clean_perm_table (\'test\' or \'confirmed\') is '.(GETPOST('clean_perm_table', 'alpha')?GETPOST('clean_perm_table', 'alpha'):'undefined').'<br>'."\n";
 print 'Option force_utf8_on_tables, for mysql/mariadb only (\'test\' or \'confirmed\') is '.(GETPOST('force_utf8_on_tables', 'alpha')?GETPOST('force_utf8_on_tables', 'alpha'):'undefined').'<br>'."\n";
+print 'Option repair_link_dispatch_lines_supplier_order_lines, (\'test\' or \'confirmed\') is '.(GETPOST('repair_link_dispatch_lines_supplier_order_lines', 'alpha')?GETPOST('repair_link_dispatch_lines_supplier_order_lines', 'alpha'):'undefined').'<br>'."\n";
 print '<br>';
 
 print '<table cellspacing="0" cellpadding="1" border="0" width="100%">';
@@ -491,70 +493,183 @@ if ($ok && GETPOST('restore_thirdparties_logos'))
 	$ext='';
 
 	print '<tr><td colspan="2"><br>*** Restore thirdparties logo<br>';
-	//foreach($exts as $ext)
-	//{
-		$sql="SELECT s.rowid, s.nom as name, s.logo FROM ".MAIN_DB_PREFIX."societe as s ORDER BY s.nom";
-		$resql=$db->query($sql);
-		if ($resql)
+
+	$sql="SELECT s.rowid, s.nom as name, s.logo FROM ".MAIN_DB_PREFIX."societe as s ORDER BY s.nom";
+	$resql=$db->query($sql);
+	if ($resql)
+	{
+		$num=$db->num_rows($resql);
+		$i=0;
+
+		while($i < $num)
 		{
-			$num=$db->num_rows($resql);
-			$i=0;
+			$obj=$db->fetch_object($resql);
 
-			while($i < $num)
+			/*
+			$name=preg_replace('/é/','',$obj->name);
+			$name=preg_replace('/ /','_',$name);
+			$name=preg_replace('/\'/','',$name);
+			*/
+
+			$tmp=explode('.', $obj->logo);
+			$name=$tmp[0];
+			if (isset($tmp[1])) $ext='.'.$tmp[1];
+
+			if (! empty($name))
 			{
-				$obj=$db->fetch_object($resql);
-
-				/*
-				$name=preg_replace('/é/','',$obj->name);
-				$name=preg_replace('/ /','_',$name);
-				$name=preg_replace('/\'/','',$name);
-				*/
-
-				$tmp=explode('.', $obj->logo);
-				$name=$tmp[0];
-				if (isset($tmp[1])) $ext='.'.$tmp[1];
-
-				if (! empty($name))
+				$filetotest=$dolibarr_main_data_root.'/societe/logos/'.$name.$ext;
+				$filetotestsmall=$dolibarr_main_data_root.'/societe/logos/thumbs/'.$name.'_small'.$ext;
+				$exists=dol_is_file($filetotest);
+				print 'Check thirdparty '.$obj->rowid.' name='.$obj->name.' logo='.$obj->logo.' file '.$filetotest." exists=".$exists."<br>\n";
+				if ($exists)
 				{
-					$filetotest=$dolibarr_main_data_root.'/societe/logos/'.$name.$ext;
-					$filetotestsmall=$dolibarr_main_data_root.'/societe/logos/thumbs/'.$name.$ext;
-					$exists=dol_is_file($filetotest);
-					print 'Check thirdparty '.$obj->rowid.' name='.$obj->name.' logo='.$obj->logo.' file '.$filetotest." exists=".$exists."<br>\n";
-					if ($exists)
+					$filetarget=$dolibarr_main_data_root.'/societe/'.$obj->rowid.'/logos/'.$name.$ext;
+					$filetargetsmall=$dolibarr_main_data_root.'/societe/'.$obj->rowid.'/logos/thumbs/'.$name.'_small'.$ext;
+					$existt=dol_is_file($filetarget);
+					if (! $existt)
 					{
-						$filetarget=$dolibarr_main_data_root.'/societe/'.$obj->rowid.'/logos/'.$name.$ext;
-						$filetargetsmall=$dolibarr_main_data_root.'/societe/'.$obj->rowid.'/logos/thumbs/'.$name.'_small'.$ext;
-						$existt=dol_is_file($filetarget);
-						if (! $existt)
+						if (GETPOST('restore_thirdparties_logos', 'alpha') == 'confirmed')
 						{
 							dol_mkdir($dolibarr_main_data_root.'/societe/'.$obj->rowid.'/logos');
-
-							print "  &nbsp; &nbsp; &nbsp; -> Copy file ".$filetotest." -> ".$filetarget."<br>\n";
-							dol_copy($filetotest, $filetarget, '', 0);
 						}
 
-						$existtt=dol_is_file($filetargetsmall);
-						if (! $existtt)
+						print "  &nbsp; &nbsp; &nbsp; -> Copy file ".$filetotest." -> ".$filetarget."<br>\n";
+						if (GETPOST('restore_thirdparties_logos', 'alpha') == 'confirmed')
+						{
+							dol_copy($filetotest, $filetarget, '', 0);
+						}
+					}
+
+					$existtt=dol_is_file($filetargetsmall);
+					if (! $existtt)
+					{
+						if (GETPOST('restore_thirdparties_logos', 'alpha') == 'confirmed')
 						{
 							dol_mkdir($dolibarr_main_data_root.'/societe/'.$obj->rowid.'/logos/thumbs');
-
-							print "  &nbsp; &nbsp; &nbsp; -> Copy file ".$filetotestsmall." -> ".$filetargetsmall."<br>\n";
+						}
+						print "  &nbsp; &nbsp; &nbsp; -> Copy file ".$filetotestsmall." -> ".$filetargetsmall."<br>\n";
+						if (GETPOST('restore_thirdparties_logos', 'alpha') == 'confirmed')
+						{
 							dol_copy($filetotestsmall, $filetargetsmall, '', 0);
 						}
 					}
 				}
-
-				$i++;
 			}
+
+			$i++;
 		}
-		else
-		{
-			$ok=0;
-			dol_print_error($db);
-		}
+	}
+	else
+	{
+		$ok=0;
+		dol_print_error($db);
+	}
+
+	print '</td></tr>';
+}
+
+
+
+// restore_user_pictures: Move pictures to correct new directory.
+if ($ok && GETPOST('restore_user_pictures', 'alpha'))
+{
+	//$exts=array('gif','png','jpg');
+
+	$ext='';
+
+	print '<tr><td colspan="2"><br>*** Restore user pictures<br>';
+
+	$sql="SELECT s.rowid, s.firstname, s.lastname, s.login, s.photo FROM ".MAIN_DB_PREFIX."user as s ORDER BY s.rowid";
+	$resql=$db->query($sql);
+	if ($resql)
+	{
+		$num=$db->num_rows($resql);
+		$i=0;
+
+		while($i < $num)
+		{
+			$obj=$db->fetch_object($resql);
+
+			/*
+			 $name=preg_replace('/é/','',$obj->name);
+			 $name=preg_replace('/ /','_',$name);
+			 $name=preg_replace('/\'/','',$name);
+			 */
+
+			$tmp=explode('.', $obj->photo);
+			$name=$tmp[0];
+			if (isset($tmp[1])) $ext='.'.$tmp[1];
+
+			if (! empty($name))
+			{
+				$filetotest=$dolibarr_main_data_root.'/users/'.substr(sprintf('%08d', $obj->rowid), -1, 1).'/'.substr(sprintf('%08d', $obj->rowid), -2, 1).'/'.$name.$ext;
+				$filetotestsmall=$dolibarr_main_data_root.'/users/'.substr(sprintf('%08d', $obj->rowid), -1, 1).'/'.substr(sprintf('%08d', $obj->rowid), -2, 1).'/thumbs/'.$name.'_small'.$ext;
+				$filetotestmini=$dolibarr_main_data_root.'/users/'.substr(sprintf('%08d', $obj->rowid), -1, 1).'/'.substr(sprintf('%08d', $obj->rowid), -2, 1).'/thumbs/'.$name.'_mini'.$ext;
+				$exists=dol_is_file($filetotest);
+				print 'Check user '.$obj->rowid.' lastname='.$obj->lastname.' fistname='.$obj->firstname.' photo='.$obj->photo.' file '.$filetotest." exists=".$exists."<br>\n";
+				if ($exists)
+				{
+					$filetarget=$dolibarr_main_data_root.'/users/'.$obj->rowid.'/'.$name.$ext;
+					$filetargetsmall=$dolibarr_main_data_root.'/users/'.$obj->rowid.'/thumbs/'.$name.'_small'.$ext;
+					$filetargetmini=$dolibarr_main_data_root.'/users/'.$obj->rowid.'/thumbs/'.$name.'_mini'.$ext;
+
+					$existt=dol_is_file($filetarget);
+					if (! $existt)
+					{
+						if (GETPOST('restore_user_pictures', 'alpha') == 'confirmed')
+						{
+							dol_mkdir($dolibarr_main_data_root.'/users/'.$obj->rowid);
+						}
+
+						print "  &nbsp; &nbsp; &nbsp; -> Copy file ".$filetotest." -> ".$filetarget."<br>\n";
+						if (GETPOST('restore_user_pictures', 'alpha') == 'confirmed')
+						{
+							dol_copy($filetotest, $filetarget, '', 0);
+						}
+					}
+
+					$existtt=dol_is_file($filetargetsmall);
+					if (! $existtt)
+					{
+						if (GETPOST('restore_user_pictures', 'alpha') == 'confirmed')
+						{
+							dol_mkdir($dolibarr_main_data_root.'/users/'.$obj->rowid.'/thumbs');
+						}
+
+						print "  &nbsp; &nbsp; &nbsp; -> Copy file ".$filetotestsmall." -> ".$filetargetsmall."<br>\n";
+						if (GETPOST('restore_user_pictures', 'alpha') == 'confirmed')
+						{
+							dol_copy($filetotestsmall, $filetargetsmall, '', 0);
+						}
+					}
+
+					$existtt=dol_is_file($filetargetmini);
+					if (! $existtt)
+					{
+						if (GETPOST('restore_user_pictures', 'alpha') == 'confirmed')
+						{
+							dol_mkdir($dolibarr_main_data_root.'/users/'.$obj->rowid.'/thumbs');
+						}
+
+						print "  &nbsp; &nbsp; &nbsp; -> Copy file ".$filetotestmini." -> ".$filetargetmini."<br>\n";
+						if (GETPOST('restore_user_pictures', 'alpha') == 'confirmed')
+						{
+							dol_copy($filetotestmini, $filetargetmini, '', 0);
+						}
+					}
+				}
+			}
+
+			$i++;
+		}
+	}
+	else
+	{
+		$ok=0;
+		dol_print_error($db);
+	}
 
 	print '</td></tr>';
-	//}
 }
 
 
@@ -1275,6 +1390,144 @@ if ($ok && GETPOST('force_utf8_on_tables', 'alpha'))
     }
 }
 
+//
+if ($ok && GETPOST('repair_link_dispatch_lines_supplier_order_lines')) {
+    /*
+     * This script is meant to be run when upgrading from a dolibarr version < 3.8
+     * to a newer version.
+     *
+     * Version 3.8 introduces a new column in llx_commande_fournisseur_dispatch, which
+     * matches the dispatch to a specific supplier order line (so that if there are
+     * several with the same product, the user can specifically tell which products of
+     * which line were dispatched where).
+     *
+     * However when migrating, the new column has a default value of 0, which means that
+     * old supplier orders whose lines were dispatched using the old dolibarr version
+     * have unspecific dispatch lines, which are not taken into account by the new version,
+     * thus making the order look like it was never dispatched at all.
+     *
+     * This scripts sets this foreign key to the first matching supplier order line whose
+     * product (and supplier order of course) are the same as the dispatch’s.
+     *
+     * If the dispatched quantity is more than indicated on the order line (this happens if
+     * there are several order lines for the same product), it creates new dispatch lines
+     * pointing to the other order lines accordingly, until all the dispatched quantity is
+     * accounted for.
+     */
+
+	$repair_link_dispatch_lines_supplier_order_lines = GETPOST('repair_link_dispatch_lines_supplier_order_lines', 'alpha');
+
+
+    echo '<tr><th>Repair llx_commande_fournisseur_dispatch.fk_commandefourndet</th></tr>';
+    echo '<tr><td>Repair in progress. This may take a while.</td></tr>';
+
+    $sql_dispatch = 'SELECT * FROM ' . MAIN_DB_PREFIX . 'commande_fournisseur_dispatch WHERE COALESCE(fk_commandefourndet, 0) = 0';
+    $db->begin();
+    $resql_dispatch = $db->query($sql_dispatch);
+    $n_processed_rows = 0;
+    $errors = array();
+    if ($resql_dispatch) {
+        if ($db->num_rows($resql_dispatch) == 0) {
+            echo '<tr><td>Nothing to do.</td></tr>';
+            exit;
+        }
+        while ($obj_dispatch = $db->fetch_object($resql_dispatch)) {
+            $sql_line = 'SELECT line.rowid, line.qty FROM ' . MAIN_DB_PREFIX . 'commande_fournisseurdet AS line'
+                .       ' WHERE line.fk_commande = ' . $obj_dispatch->fk_commande
+                .       ' AND   line.fk_product  = ' . $obj_dispatch->fk_product;
+            $resql_line = $db->query($sql_line);
+
+            // s’il y a plusieurs lignes avec le même produit sur cette commande fournisseur,
+            // on divise la ligne de dispatch en autant de lignes qu’on en a sur la commande pour le produit
+            // et on met la quantité de la ligne dans la limite du "budget" indiqué par dispatch.qty
+
+            $remaining_qty = $obj_dispatch->qty;
+            $first_iteration = true;
+            if (!$resql_line) {
+                echo '<tr><td>Unable to find a matching supplier order line for dispatch #' . $obj_dispatch->rowid . '</td></tr>';
+                $errors[] = $sql_line;
+                $n_processed_rows++;
+                continue;
+            }
+            if ($db->num_rows($resql_line) == 0) continue;
+            while ($obj_line = $db->fetch_object($resql_line)) {
+                if (!$remaining_qty) break;
+                if (!$obj_line->rowid) {
+                    continue;
+                }
+                $qty_for_line = min($remaining_qty, $obj_line->qty);
+                if ($first_iteration) {
+                    $sql_attach = 'UPDATE ' . MAIN_DB_PREFIX . 'commande_fournisseur_dispatch'
+                        .        ' SET fk_commandefourndet = ' . $obj_line->rowid . ', qty = ' . $qty_for_line
+                        .        ' WHERE rowid = ' . $obj_dispatch->rowid;
+                    $first_iteration = false;
+                } else {
+                    $sql_attach_values = array(
+                        $obj_dispatch->fk_commande,
+                        $obj_dispatch->fk_product,
+                        $obj_line->rowid,
+                        $qty_for_line,
+                        $obj_dispatch->fk_entrepot,
+                        $obj_dispatch->fk_user,
+                        $obj_dispatch->datec ? '"' . $db->escape($obj_dispatch->datec) . '"' : 'NULL',
+                        $obj_dispatch->comment ? '"' . $db->escape($obj_dispatch->comment) . '"' : 'NULL',
+                        $obj_dispatch->status ?: 'NULL',
+                        $obj_dispatch->tms ? '"' . $db->escape($obj_dispatch->tms) . '"': 'NULL',
+                        $obj_dispatch->batch ?: 'NULL',
+                        $obj_dispatch->eatby ? '"' . $db->escape($obj_dispatch->eatby) . '"': 'NULL',
+                        $obj_dispatch->sellby ? '"' . $db->escape($obj_dispatch->sellby) . '"': 'NULL'
+                    );
+                    $sql_attach_values = join(', ', $sql_attach_values);
+
+                    $sql_attach = 'INSERT INTO ' . MAIN_DB_PREFIX . 'commande_fournisseur_dispatch'
+                        .         ' (fk_commande, fk_product, fk_commandefourndet, qty, fk_entrepot, fk_user, datec, comment, status, tms, batch, eatby, sellby)'
+                        .         ' VALUES (' . $sql_attach_values . ')';
+                }
+
+                if ($repair_link_dispatch_lines_supplier_order_lines == 'confirmed')
+                {
+	                $resql_attach = $db->query($sql_attach);
+                }
+                else
+                {
+                	$resql_attach = true;	// Force success in test mode
+                }
+
+                if ($resql_attach) {
+                    $remaining_qty -= $qty_for_line;
+                } else {
+                    $errors[] = $sql_attach;
+                }
+
+                $first_iteration = false;
+            }
+            $n_processed_rows++;
+
+            // report progress every 256th row
+            if (!($n_processed_rows & 0xff)) {
+                echo '<tr><td>Processed ' . $n_processed_rows . ' rows with ' . count($errors) . ' errors…' . "</td></tr>\n";
+                flush();
+                ob_flush();
+            }
+        }
+    } else {
+        echo '<tr><td>Unable to find any dispatch without an fk_commandefourndet.' . "</td></tr>\n";
+        echo $sql_dispatch . "\n";
+    }
+    echo '<tr><td>Fixed ' . $n_processed_rows . ' rows with ' . count($errors) . ' errors…' . "</td></tr>\n";
+    echo '<tr><td>DONE.' . "</td></tr>\n";
+
+    if (count($errors)) {
+        $db->rollback();
+        echo '<tr><td>The transaction was rolled back due to errors: nothing was changed by the script.</td></tr>';
+    } else {
+        $db->commit();
+    }
+    $db->close();
+
+    echo '<tr><td><h3>SQL queries with errors:</h3></tr></td>';
+    echo '<tr><td>' . join('</td></tr><tr><td>', $errors) . '</td></tr>';
+}
 
 print '</table>';
 
diff --git a/htdocs/langs/ar_SA/admin.lang b/htdocs/langs/ar_SA/admin.lang
index 3169b9acfad..07f02963685 100644
--- a/htdocs/langs/ar_SA/admin.lang
+++ b/htdocs/langs/ar_SA/admin.lang
@@ -400,6 +400,7 @@ OldVATRates=معدل ضريبة القيمة المضافة القديم
 NewVATRates=معدل ضريبة القيمة المضافة الجديد
 PriceBaseTypeToChange=تعديل على الأسعار مع القيمة المرجعية قاعدة المعرفة على
 MassConvert=Launch bulk conversion
+PriceFormatInCurrentLanguage=Price Format In Current Language
 String=سلسلة
 TextLong=نص طويل
 HtmlText=Html text
@@ -431,7 +432,7 @@ ExtrafieldParamHelpradio=List of values must be lines with format key,value (whe
 ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- idfilter is necessarly a primary int key<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=List of values 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>Examples:<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
-ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default)<br>Set this to 2 for a collapsing separator (collapsed by default)
+ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Library used for PDF generation
 LocalTaxDesc=Some countries may apply two or three taxes on each invoice line. If this is the case, choose the type for the 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)
 SMS=SMS
@@ -1695,7 +1696,7 @@ SuppliersInvoiceNumberingModel=Vendor invoices numbering models
 IfSetToYesDontForgetPermission=إذا اخترت نعم، لا تنسى أن توفر الأذونات إلى المجموعات أو المستخدمين المسموح بها للموافقة الثانية
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=GeoIP Maxmind الإعداد وحدة
-PathToGeoIPMaxmindCountryDataFile=المسار إلى ملف يحتوي على MaxMind في الملكية الفكرية لترجمة البلاد. <br> الأمثلة على ذلك: <br> /usr/local/share/GeoIP/GeoIP.dat <br> /usr/share/GeoIP/GeoIP.dat
+PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoLite2-Country.mmdb
 NoteOnPathLocation=لاحظ أن الملكية الفكرية الخاصة بك على البيانات القطرية الملف يجب أن تكون داخل الدليل الخاص بي يمكن قراءة (راجع الإعداد open_basedir بى وأذونات نظام الملفات).
 YouCanDownloadFreeDatFileTo=يمكنك تحميل <b>نسخة تجريبية مجانية</b> من GeoIP ملف Maxmind البلاد في ٪ s.
 YouCanDownloadAdvancedDatFileTo=كما يمكنك تحميل <b>نسخة كاملة</b> أكثر من ذلك <b>، مع التحديثات ،</b> من GeoIP ملف Maxmind البلاد في ٪ s.
@@ -1926,14 +1927,13 @@ SmallerThan=Smaller than
 LargerThan=Larger than
 IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID is found into incoming email, the event will be automatically linked to the related objects.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
-IFTTTSetup=IFTTT module setup
-IFTTT_SERVICE_KEY=IFTTT Service key
-IFTTT_DOLIBARR_ENDPOINT_SECUREKEY=Security key to secure the endpoint URL used by IFTTT to send messages to your Dolibarr.
-IFTTTDesc=This module is designed to trigger events on IFTTT and/or to execute some action on external IFTTT triggers.
-UrlForIFTTT=URL endpoint for IFTTT
-YouWillFindItOnYourIFTTTAccount=You will find it on your IFTTT account
 EndPointFor=End point for %s : %s
 DeleteEmailCollector=Delete email collector
 ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
 RecipientEmailsWillBeReplacedWithThisValue=Recipient emails will be always replaced with this value
 AtLeastOneDefaultBankAccountMandatory=At least 1 default bank account must be defined
+RESTRICT_API_ON_IP=Allow available APIs to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can use the available APIs.
+RESTRICT_ON_IP=Allow access to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can access.
+BaseOnSabeDavVersion=Based on the library SabreDAV version
+NotAPublicIp=Not a public IP
+MakeAnonymousPing=Make an anonymous Ping '+1' to the Dolibarr foundation server (done 1 time only after installation) to allow the foundation to count the number of Dolibarr installation.
diff --git a/htdocs/langs/ar_SA/banks.lang b/htdocs/langs/ar_SA/banks.lang
index d561fc38442..f89d3913c72 100644
--- a/htdocs/langs/ar_SA/banks.lang
+++ b/htdocs/langs/ar_SA/banks.lang
@@ -73,6 +73,7 @@ BankTransaction=قيد بنكي
 ListTransactions=قائمة القيود
 ListTransactionsByCategory=قائمةالقيود/الفئات
 TransactionsToConciliate=قيود للتسويات
+TransactionsToConciliateShort=To reconcile
 Conciliable=يمكن أن يتم تسويتة
 Conciliate=التسوية
 Conciliation=تسوية
@@ -116,6 +117,7 @@ DeleteCheckReceipt=حذف هذا الشيك ؟
 ConfirmDeleteCheckReceipt=هل انت متأكد أنك تريد حذف هذا الشيك؟
 BankChecks=الشيكات المصرفية
 BankChecksToReceipt=شيكات في انتظار الإيداع
+BankChecksToReceiptShort=شيكات في انتظار الإيداع
 ShowCheckReceipt=عرض إيصال إيداع شيكات
 NumberOfCheques=No. of check
 DeleteTransaction=حذف المعاملة
diff --git a/htdocs/langs/ar_SA/cashdesk.lang b/htdocs/langs/ar_SA/cashdesk.lang
index 1ce449cabc3..1e4025762cf 100644
--- a/htdocs/langs/ar_SA/cashdesk.lang
+++ b/htdocs/langs/ar_SA/cashdesk.lang
@@ -62,6 +62,7 @@ TicketVatGrouped=Group VAT by rate in tickets
 AutoPrintTickets=Automatically print tickets
 EnableBarOrRestaurantFeatures=Enable features for Bar or Restaurant
 ConfirmDeletionOfThisPOSSale=Do your confirm the deletion of this current sale ?
+ConfirmDiscardOfThisPOSSale=Do you want to discard this current sale ?
 History=التاريخ
 ValidateAndClose=Validate and close
 Terminal=Terminal
@@ -69,3 +70,8 @@ NumberOfTerminals=Number of Terminals
 TerminalSelect=Select terminal you want to use:
 POSTicket=POS Ticket
 BasicPhoneLayout=Use basic layout for phones
+SetupOfTerminalNotComplete=Setup of terminal %s is not complete
+DirectPayment=Direct payment
+DirectPaymentButton=Direct cash payment button
+InvoiceIsAlreadyValidated=Invoice is already validated
+NoLinesToBill=No lines to bill
diff --git a/htdocs/langs/ar_SA/companies.lang b/htdocs/langs/ar_SA/companies.lang
index f7e393cad21..f7ad7c2a1cd 100644
--- a/htdocs/langs/ar_SA/companies.lang
+++ b/htdocs/langs/ar_SA/companies.lang
@@ -54,6 +54,7 @@ Firstname=Firstname
 PostOrFunction=Job position
 UserTitle=العنوان
 NatureOfThirdParty=Nature of Third party
+NatureOfContact=Nature of Contact
 Address=عنوان
 State=الولاية / المقاطعة
 StateShort=حالة
diff --git a/htdocs/langs/ar_SA/contracts.lang b/htdocs/langs/ar_SA/contracts.lang
index f879a52c050..e992fc855d3 100644
--- a/htdocs/langs/ar_SA/contracts.lang
+++ b/htdocs/langs/ar_SA/contracts.lang
@@ -51,6 +51,7 @@ ListOfClosedServices=قائمة مغلقة الخدمات
 ListOfRunningServices=لائحة ادارة الخدمات
 NotActivatedServices=لا تنشيط الخدمات) بين مصدق العقود)
 BoardNotActivatedServices=خدمات لتفعيل العقود بين مصدق
+BoardNotActivatedServicesShort=Services to activate
 LastContracts=Latest %s contracts
 LastModifiedServices=Latest %s modified services
 ContractStartDate=تاريخ البدء
@@ -64,7 +65,10 @@ DateStartRealShort=البداية الحقيقية لتاريخ
 DateEndReal=نهاية التاريخ الحقيقي
 DateEndRealShort=نهاية التاريخ الحقيقي
 CloseService=قريبة من الخدمة
-BoardRunningServices=انتهت إدارة الخدمات
+BoardRunningServices=Services running
+BoardRunningServicesShort=Services running
+BoardExpiredServices=Services expired
+BoardExpiredServicesShort=Services expired
 ServiceStatus=مركز الخدمة
 DraftContracts=عقود مشاريع
 CloseRefusedBecauseOneServiceActive=Contract can't be closed as there is at least one open service on it
diff --git a/htdocs/langs/ar_SA/errors.lang b/htdocs/langs/ar_SA/errors.lang
index 7837448f102..f78543654b2 100644
--- a/htdocs/langs/ar_SA/errors.lang
+++ b/htdocs/langs/ar_SA/errors.lang
@@ -218,6 +218,7 @@ ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text
 ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Error, delete payment linked to a closed invoice is not possible.
+ErrorSearchCriteriaTooSmall=Search criteria too small.
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 WarningPasswordSetWithNoAccount=تم تعيين كلمة مرور لهذا العضو. ومع ذلك، تم إنشاء أي حساب المستخدم. لذلك يتم تخزين كلمة المرور هذه ولكن لا يمكن استخدامها للدخول إلى Dolibarr. ويمكن استخدامه من قبل وحدة / واجهة خارجية ولكن إذا كنت لا تحتاج إلى تعريف أي تسجيل دخول أو كلمة المرور لأحد أفراد، يمكنك تعطيل خيار "إدارة تسجيل دخول لكل عضو" من إعداد وحدة الأعضاء. إذا كنت بحاجة إلى إدارة تسجيل الدخول ولكن لا تحتاج إلى أي كلمة المرور، يمكنك الحفاظ على هذا الحقل فارغا لتجنب هذا التحذير. ملاحظة: يمكن أيضا أن تستخدم البريد الإلكتروني لتسجيل الدخول إذا تم ربط عضو إلى المستخدم.
diff --git a/htdocs/langs/ar_SA/main.lang b/htdocs/langs/ar_SA/main.lang
index 7a2c477c7d0..72af7c235c2 100644
--- a/htdocs/langs/ar_SA/main.lang
+++ b/htdocs/langs/ar_SA/main.lang
@@ -28,6 +28,7 @@ NoTemplateDefined=No template available for this email type
 AvailableVariables=Available substitution variables
 NoTranslation=لا يوجد ترجمة
 Translation=الترجمة
+EmptySearchString=Enter a non empty search string
 NoRecordFound=لا يوجد سجلات
 NoRecordDeleted=No record deleted
 NotEnoughDataYet=Not enough data
@@ -704,6 +705,7 @@ DateOfSignature=Date of signature
 HidePassword=وتبين للقيادة مع كلمة السر الخفي
 UnHidePassword=وتظهر واضحة للقيادة حقيقية كلمة السر
 Root=جذور
+RootOfMedias=Root of public medias (/medias)
 Informations=معلومات
 Page=صفحة
 Notes=وتلاحظ
@@ -981,3 +983,10 @@ PaymentInformation=Payment information
 ValidFrom=Valid from
 ValidUntil=Valid until
 NoRecordedUsers=No users
+ToClose=To close
+ToProcess=لعملية
+ToApprove=To approve
+GlobalOpenedElemView=Global view
+NoArticlesFoundForTheKeyword=No article found for the keyword '<strong>%s</strong>'
+NoArticlesFoundForTheCategory=No article found for the category
+ToAcceptRefuse=To accept | refuse
diff --git a/htdocs/langs/ar_SA/members.lang b/htdocs/langs/ar_SA/members.lang
index be18bfd6f62..364db7f969f 100644
--- a/htdocs/langs/ar_SA/members.lang
+++ b/htdocs/langs/ar_SA/members.lang
@@ -29,6 +29,7 @@ MenuMembersUpToDate=حتى الآن من أعضاء
 MenuMembersNotUpToDate=وحتى الآن من أصل أعضاء
 MenuMembersResiliated=Terminated members
 MembersWithSubscriptionToReceive=أعضاء مع اشتراك لتلقي
+MembersWithSubscriptionToReceiveShort=Subscription to receive
 DateSubscription=تاريخ الاكتتاب
 DateEndSubscription=تاريخ انتهاء الاكتتاب
 EndSubscription=انتهاء الاكتتاب
diff --git a/htdocs/langs/ar_SA/projects.lang b/htdocs/langs/ar_SA/projects.lang
index e377e74bbf9..9061a2adc05 100644
--- a/htdocs/langs/ar_SA/projects.lang
+++ b/htdocs/langs/ar_SA/projects.lang
@@ -76,7 +76,13 @@ MyProjects=بلدي المشاريع
 MyProjectsArea=My projects Area
 DurationEffective=فعالة لمدة
 ProgressDeclared=أعلن التقدم
+TaskProgressSummary=Task progress
+CurentlyOpenedTasks=Curently opened tasks
+TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared progress is less %s than the calculated progression
+TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared progress is more %s than the calculated progression
 ProgressCalculated=تقدم تحسب
+WhichIamLinkedTo=which I'm linked to
+WhichIamLinkedToProject=which I'm linked to project
 Time=وقت
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
diff --git a/htdocs/langs/ar_SA/website.lang b/htdocs/langs/ar_SA/website.lang
index c1895cc0b84..0a00985dd24 100644
--- a/htdocs/langs/ar_SA/website.lang
+++ b/htdocs/langs/ar_SA/website.lang
@@ -2,7 +2,7 @@
 Shortname=رمز
 WebsiteSetupDesc=Create here the websites you wish to use. Then go into menu Websites to edit them.
 DeleteWebsite=Delete website
-ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed.
+ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed. The files uploaded (like into the medias directory, the ECM module, ...) will remain.
 WEBSITE_TYPE_CONTAINER=Type of page/container
 WEBSITE_PAGE_EXAMPLE=Web page to use as example
 WEBSITE_PAGENAME=Page name/alias
@@ -14,6 +14,9 @@ WEBSITE_JS_INLINE=Javascript file content (common to all pages)
 WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages)
 WEBSITE_ROBOT=Robot file (robots.txt)
 WEBSITE_HTACCESS=Website .htaccess file
+WEBSITE_MANIFEST_JSON=Website manifest.json file
+WEBSITE_README=README.md file
+EnterHereLicenseInformation=Enter here meta data or license information to fille a README.md file. if you distribute your website as a template, the file will be included into the temptate package.
 HtmlHeaderPage=HTML header (specific to this page only)
 PageNameAliasHelp=Name or alias of the page.<br>This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "<strong>%s</strong>" to edit this alias.
 EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container.
@@ -41,6 +44,7 @@ RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
 SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then set the name of the virtual host you have created in the properties of web site, so the preview can be done also using this dedicated web server access instead of the internal Dolibarr server.
 YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
 CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
 ReadPerm=قرأ
 WritePerm=Write
@@ -75,7 +79,8 @@ AddWebsiteAccount=Create web site account
 BackToListOfThirdParty=Back to list for Third Party
 DisableSiteFirst=Disable website first
 MyContainerTitle=My web site title
-AnotherContainer=Another container
+AnotherContainer=This is how to include content of another page/container (you may have an error here if you enable dynamic code because the embedded subcontainer may not exists)
+SorryWebsiteIsCurrentlyOffLine=Sorry, this website is currently off line. Please comme back later...
 WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / third party
 YouMustDefineTheHomePage=You must first define the default Home page
@@ -89,7 +94,8 @@ AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
 CorporateHomePage=Corporate Home page
 EmptyPage=Empty page
 ExternalURLMustStartWithHttp=External URL must start with http:// or https://
-ZipOfWebsitePackageToImport=Zip file of website package
+ZipOfWebsitePackageToImport=Upload the Zip file of the website template package
+ZipOfWebsitePackageToLoad=or Choose an available embedded website template package
 ShowSubcontainers=Include dynamic content
 InternalURLOfPage=Internal URL of page
 ThisPageIsTranslationOf=This page/container is a translation of
@@ -101,5 +107,10 @@ NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynam
 ReplaceWebsiteContent=Search or Replace website content
 DeleteAlsoJs=Delete also all javascript files specific to this website?
 DeleteAlsoMedias=Delete also all medias files specific to this website?
-# Export
 MyWebsitePages=My website pages
+SearchReplaceInto=Search | Replace into
+ReplaceString=New string
+CSSContentTooltipHelp=Enter here CSS content. To avoid any conflict with the CSS of the application, be sure to prepend all declaration with the .bodywebsite class. For example:<br><br>#mycssselector, input.myclass:hover { ... }<br>must be<br>.bodywebsite #mycssselector, .bodywebsite input.myclass:hover { ... }<br><br>Note: If you have a large file without this prefix, you can use 'lessc' to convert it to append the .bodywebsite prefix everywhere.
+LinkAndScriptsHereAreNotLoadedInEditor=Warning: This content is output only when site is accessed from a server. It is not used in Edit mode so if you need to load javascript files also in edit mode, just add your tag 'script src=...' into the page.
+Dynamiccontent=Sample of a page with dynamic content
+ImportSite=Import website template
diff --git a/htdocs/langs/bg_BG/admin.lang b/htdocs/langs/bg_BG/admin.lang
index 5d854aba2ac..35d40b9a937 100644
--- a/htdocs/langs/bg_BG/admin.lang
+++ b/htdocs/langs/bg_BG/admin.lang
@@ -400,6 +400,7 @@ OldVATRates=Първоначална ставка на ДДС
 NewVATRates=Нова ставка на ДДС
 PriceBaseTypeToChange=Промяна на цените с базова референтна стойност, определена на
 MassConvert=Стартиране на групово превръщане
+PriceFormatInCurrentLanguage=Price Format In Current Language
 String=Низ
 TextLong=Дълъг текст
 HtmlText=HTML текст
@@ -431,7 +432,7 @@ ExtrafieldParamHelpradio=Списъкът със стойности трябва
 ExtrafieldParamHelpsellist=Списъкът на стойностите идва от таблица <br>Синтаксис: table_name:label_field:id_field::filter<br> Пример: c_typent: libelle:id::filter <br><br> - idfilter е задължително основен int key <br> - филтърът може да бъде прост тест (например active = 1), за да се покаже само активна стойност <br> Може също да използвате $ID$ във филтъра, който е текущият идентификатор на текущия обект. <br>За да направите SELECT във филтъра, използвайте $SEL$ <br> ако искате да филтрирате по допълнителни полета, използвайте синтаксис extra.fieldcode=...(където кодът на полето е кодът на допълнителното поле) <br><br> За да имате списъка в зависимост от друг допълнителен списък с атрибути: <br> c_typent:libelle:id:options_ <i>parent_list_code</i>|parent_column:филтер<br><br> За да имате списъка в зависимост от друг списък: <br> c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelpchkbxlst=Списъкът на стойностите идва от таблица <br> Синтаксис: table_name:label_field:id_field::filter <br> Пример: c_typent:libelle:id::filter <br><br> филтърът може да бъде прост тест (например active = 1), за да се покаже само активна стойност <br> Можете също да използвате $ID$ във филтъра, който е текущият идентификатор на текущия обект <br> За да направите SELECT във филтъра, използвайте $SEL$ <br> ако искате да филтрирате по допълнителни полета, използвайте синтаксис extra.fieldcode=...(където кодът на полето е кодът на екстра полето) <br><br> За да имате списъка в зависимост от друг допълнителен списък с атрибути: <br>c_typent:libelle:id:options_ <i>parent_list_code</i>|parent_column:filter<br><br> За да имате списъка в зависимост от друг списък: <br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Параметрите трябва да са ObjectName:Classpath<br>Синтаксис: ObjectName:Classpath<br>Примери: <br> Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
-ExtrafieldParamHelpSeparator=Оставете празно за обикновен разделител <br> Задайте това на 1 за разделител, който се свива (отворен по подразбиране) <br> Задайте това на 2 за разделител, който се свива (свит по подразбиране).
+ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Използвана библиотека за създаване на PDF файлове
 LocalTaxDesc=Някои държави могат да прилагат два или три данъка към всеки ред във фактурата. Ако случаят е такъв, изберете вида на втория и третия данък и съответната данъчна ставка. Възможен тип са:<br>1: местен данък върху продукти и услуги без ДДС (местния данък се изчислява върху сумата без данък)<br>2: местен данък върху продукти и услуги с ДДС (местният данък се изчислява върху сумата + основния данък)<br>3: местен данък върху продукти без ДДС (местният данък се изчислява върху сумата без данък)<br>4: местен данък върху продукти с ДДС (местният данък се изчислява върху сумата + основния данък)<br>5: местен данък върху услуги без ДДС (местният данък се изчислява върху сумата без данък)<br>6: местен данък върху услуги с ДДС (местният данък се изчислява върху сумата + основния данък)
 SMS=SMS
@@ -1695,7 +1696,7 @@ SuppliersInvoiceNumberingModel=Модели за номериране на фа
 IfSetToYesDontForgetPermission=Ако е избрано ДА, не забравяйте да предоставите права на групи или потребители, от които се очаква второто одобрение.
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=Настройка на модула GeoIP Maxmind
-PathToGeoIPMaxmindCountryDataFile=Път до файл, съдържащ Maxmind IP за превод на държава. <br> Примери: <br> /usr/local/share/GeoIP/GeoIP.dat <br> /usr/share/GeoIP/GeoIP.dat
+PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoLite2-Country.mmdb
 NoteOnPathLocation=Обърнете внимание, че вашият IP файл с данни за държавата трябва да е в директория, която може да се чете от PHP (проверете настройките на вашата PHP open_basedir и правата на файловата система).
 YouCanDownloadFreeDatFileTo=Може да изтеглите <b>безплатна демо версия</b> на Maxmind GeoIP файла за държавата от %s.
 YouCanDownloadAdvancedDatFileTo=Може също така да изтеглите <b>по-пълна версия, с актуализации</b> на Maxmind GeoIP файла за държавата от %s.
@@ -1926,14 +1927,13 @@ SmallerThan=По-малък от
 LargerThan=По-голям от
 IfTrackingIDFoundEventWillBeLinked=Обърнете внимание, че ако е намерен проследяващ код във входящата електронна поща, събитието ще бъде автоматично свързано със свързаните обекти.
 WithGMailYouCanCreateADedicatedPassword=С GMail акаунт, ако сте активирали валидирането в 2 стъпки е препоръчително да създадете специална втора парола за приложението, вместо да използвате своята парола за акаунта от https://myaccount.google.com/.
-IFTTTSetup=Настройка на модул IFTTT
-IFTTT_SERVICE_KEY=IFTTT Service key
-IFTTT_DOLIBARR_ENDPOINT_SECUREKEY=Ключ за сигурност, който защитава URL адреса, използван от IFTTT, за да изпраща съобщения до вашия Dolibarr.
-IFTTTDesc=Този модул е предназначен да задейства събития на IFTTT и / или да изпълнява някои действия, чрез външни IFTTT тригери.
-UrlForIFTTT=URL адрес за IFTTT
-YouWillFindItOnYourIFTTTAccount=Ще го намерите във вашият IFTTT акаунт
 EndPointFor=Крайна точка за %s: %s
 DeleteEmailCollector=Изтриване на имейл колекционер
 ConfirmDeleteEmailCollector=Сигурни ли те, че искате да изтриете този колекционер на имейли?
 RecipientEmailsWillBeReplacedWithThisValue=Recipient emails will be always replaced with this value
 AtLeastOneDefaultBankAccountMandatory=At least 1 default bank account must be defined
+RESTRICT_API_ON_IP=Allow available APIs to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can use the available APIs.
+RESTRICT_ON_IP=Allow access to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can access.
+BaseOnSabeDavVersion=Based on the library SabreDAV version
+NotAPublicIp=Not a public IP
+MakeAnonymousPing=Make an anonymous Ping '+1' to the Dolibarr foundation server (done 1 time only after installation) to allow the foundation to count the number of Dolibarr installation.
diff --git a/htdocs/langs/bg_BG/banks.lang b/htdocs/langs/bg_BG/banks.lang
index e56b8c5deb8..a1dcc519f24 100644
--- a/htdocs/langs/bg_BG/banks.lang
+++ b/htdocs/langs/bg_BG/banks.lang
@@ -73,6 +73,7 @@ BankTransaction=Банкова транзакция
 ListTransactions=Списък транзакции
 ListTransactionsByCategory=Списък транзакции по категория
 TransactionsToConciliate=Транзакции за съгласуване
+TransactionsToConciliateShort=To reconcile
 Conciliable=Може да се съгласува
 Conciliate=Съгласуване
 Conciliation=Съгласуване
@@ -116,6 +117,7 @@ DeleteCheckReceipt=Изтриване на тази чекова разписк
 ConfirmDeleteCheckReceipt=Сигурни ли сте, че искате да изтриете тази чекова разписка?
 BankChecks=Банкови чекове
 BankChecksToReceipt=Чекове чакащи депозит
+BankChecksToReceiptShort=Чекове чакащи депозит
 ShowCheckReceipt=Покажи разписка за получаване на чеков депозит
 NumberOfCheques=Брой чекове
 DeleteTransaction=Изтриване на транзакция
diff --git a/htdocs/langs/bg_BG/cashdesk.lang b/htdocs/langs/bg_BG/cashdesk.lang
index 1570f16cd8a..4fb4301b0ae 100644
--- a/htdocs/langs/bg_BG/cashdesk.lang
+++ b/htdocs/langs/bg_BG/cashdesk.lang
@@ -62,6 +62,7 @@ TicketVatGrouped=Групиране на ДДС по ставка в билет
 AutoPrintTickets=Автоматично отпечатване на билети
 EnableBarOrRestaurantFeatures=Включете функции за бар или ресторант
 ConfirmDeletionOfThisPOSSale=Потвърждавате ли изтриването на настоящата продажба?
+ConfirmDiscardOfThisPOSSale=Do you want to discard this current sale ?
 History=История
 ValidateAndClose=Валидиране и приключване
 Terminal=Терминал
@@ -69,3 +70,8 @@ NumberOfTerminals=Брой терминали
 TerminalSelect=Изберете терминал, който искате да използвате:
 POSTicket=POS тикет
 BasicPhoneLayout=Използване на просто оформление за телефони
+SetupOfTerminalNotComplete=Setup of terminal %s is not complete
+DirectPayment=Direct payment
+DirectPaymentButton=Direct cash payment button
+InvoiceIsAlreadyValidated=Invoice is already validated
+NoLinesToBill=No lines to bill
diff --git a/htdocs/langs/bg_BG/companies.lang b/htdocs/langs/bg_BG/companies.lang
index ba2a4225d02..bd5a4ee57ff 100644
--- a/htdocs/langs/bg_BG/companies.lang
+++ b/htdocs/langs/bg_BG/companies.lang
@@ -54,6 +54,7 @@ Firstname=Собствено име
 PostOrFunction=Длъжност
 UserTitle=Обръщение
 NatureOfThirdParty=Произход на контрагента
+NatureOfContact=Nature of Contact
 Address=Адрес
 State=Област
 StateShort=Област
diff --git a/htdocs/langs/bg_BG/contracts.lang b/htdocs/langs/bg_BG/contracts.lang
index 4009928c061..6045ee79cb8 100644
--- a/htdocs/langs/bg_BG/contracts.lang
+++ b/htdocs/langs/bg_BG/contracts.lang
@@ -51,6 +51,7 @@ ListOfClosedServices=Списък на прекратени услуги
 ListOfRunningServices=Списък на активни услуги
 NotActivatedServices=Неактивни услуги (измежду валидирани договори)
 BoardNotActivatedServices=Услуги за активиране (измежду валидирани договори)
+BoardNotActivatedServicesShort=Services to activate
 LastContracts=Договори: %s последни
 LastModifiedServices=Услуги: %s последно променени
 ContractStartDate=Начална дата
@@ -65,7 +66,9 @@ DateEndReal=Реална крайна дата
 DateEndRealShort=Реална крайна дата
 CloseService=Приключване на услуга
 BoardRunningServices=Активни услуги
+BoardRunningServicesShort=Активни услуги
 BoardExpiredServices=Изтекли услуги
+BoardExpiredServicesShort=Изтекли услуги
 ServiceStatus=Статус на услуга
 DraftContracts=Чернови договори
 CloseRefusedBecauseOneServiceActive=Договорът не може да бъде прекратен, тъй като има най-малко една активна услуга в него.
diff --git a/htdocs/langs/bg_BG/errors.lang b/htdocs/langs/bg_BG/errors.lang
index a277ca94c52..656c9d70d47 100644
--- a/htdocs/langs/bg_BG/errors.lang
+++ b/htdocs/langs/bg_BG/errors.lang
@@ -218,6 +218,7 @@ ErrorVariableKeyForContentMustBeSet=Грешка, трябва да бъде з
 ErrorURLMustStartWithHttp=URL адресът %s трябва да започва с http:// или https://
 ErrorNewRefIsAlreadyUsed=Грешка, новата референция вече е използвана
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Грешка, изтриването на плащане, свързано с приключена фактура, е невъзможно.
+ErrorSearchCriteriaTooSmall=Search criteria too small.
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 WarningPasswordSetWithNoAccount=За този член бе зададена парола. Въпреки това, не е създаден потребителски акаунт. Така че тази парола е съхранена, но не може да се използва за влизане в Dolibarr. Може да се използва от външен модул/интерфейс, но ако не е необходимо да дефинирате потребителско име или парола за член може да деактивирате опцията "Управление на вход за всеки член" от настройката на модула Членове. Ако трябва да управлявате вход, но не се нуждаете от парола, можете да запазите това поле празно, за да избегнете това предупреждение. Забележка: Имейлът може да се използва и като вход, ако членът е свързан с потребител.
diff --git a/htdocs/langs/bg_BG/main.lang b/htdocs/langs/bg_BG/main.lang
index a475e9445a9..7494658e752 100644
--- a/htdocs/langs/bg_BG/main.lang
+++ b/htdocs/langs/bg_BG/main.lang
@@ -28,6 +28,7 @@ NoTemplateDefined=Няма наличен шаблон за този тип им
 AvailableVariables=Налични променливи за заместване
 NoTranslation=Няма превод
 Translation=Превод
+EmptySearchString=Enter a non empty search string
 NoRecordFound=Няма намерен запис
 NoRecordDeleted=Няма изтрит запис
 NotEnoughDataYet=Няма достатъчно данни
@@ -704,6 +705,7 @@ DateOfSignature=Дата на подписване
 HidePassword=Показване на команда със скрита парола
 UnHidePassword=Показване на реална команда с ясна парола
 Root=Начало
+RootOfMedias=Root of public medias (/medias)
 Informations=Информация
 Page=Страница
 Notes=Бележки
@@ -981,3 +983,10 @@ PaymentInformation=Платежна информация
 ValidFrom=Валидно от
 ValidUntil=Валидно до
 NoRecordedUsers=Няма потребители
+ToClose=To close
+ToProcess=За изпълнение
+ToApprove=To approve
+GlobalOpenedElemView=Global view
+NoArticlesFoundForTheKeyword=No article found for the keyword '<strong>%s</strong>'
+NoArticlesFoundForTheCategory=No article found for the category
+ToAcceptRefuse=To accept | refuse
diff --git a/htdocs/langs/bg_BG/members.lang b/htdocs/langs/bg_BG/members.lang
index d19bdf8cddb..9f4ea0538a2 100644
--- a/htdocs/langs/bg_BG/members.lang
+++ b/htdocs/langs/bg_BG/members.lang
@@ -29,6 +29,7 @@ MenuMembersUpToDate=С платен чл. внос
 MenuMembersNotUpToDate=С неплатен чл. внос
 MenuMembersResiliated=Terminated members
 MembersWithSubscriptionToReceive=Събиране на членски внос от членовете
+MembersWithSubscriptionToReceiveShort=Subscription to receive
 DateSubscription=Чл. внос от дата
 DateEndSubscription=Чл. внос до дата
 EndSubscription=Чл внос до
diff --git a/htdocs/langs/bg_BG/projects.lang b/htdocs/langs/bg_BG/projects.lang
index b69000cd9f2..b26cfc806ac 100644
--- a/htdocs/langs/bg_BG/projects.lang
+++ b/htdocs/langs/bg_BG/projects.lang
@@ -76,7 +76,13 @@ MyProjects=Мои проекти
 MyProjectsArea=Секция с мои проекти
 DurationEffective=Ефективна продължителност
 ProgressDeclared=Деклариран напредък
+TaskProgressSummary=Task progress
+CurentlyOpenedTasks=Curently opened tasks
+TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared progress is less %s than the calculated progression
+TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared progress is more %s than the calculated progression
 ProgressCalculated=Изчислен напредък
+WhichIamLinkedTo=which I'm linked to
+WhichIamLinkedToProject=which I'm linked to project
 Time=Време
 ListOfTasks=Списък със задачи
 GoToListOfTimeConsumed=Показване на списъка с изразходвано време
@@ -185,8 +191,8 @@ InputDetail=Детайли
 TimeAlreadyRecorded=Това отделено време е вече записано за тази задача / ден и потребител %s
 ProjectsWithThisUserAsContact=Проекти с потребител за контакт
 TasksWithThisUserAsContact=Задачи възложени на потребител
-ResourceNotAssignedToProject=Не е зададено към проект
-ResourceNotAssignedToTheTask=Не е зададено към задача
+ResourceNotAssignedToProject=Не е участник в проекта
+ResourceNotAssignedToTheTask=Не е участник в задачата
 NoUserAssignedToTheProject=Няма потребители, назначени за този проект.
 TimeSpentBy=Отделено време от
 TasksAssignedTo=Задачи, възложени на
diff --git a/htdocs/langs/bg_BG/website.lang b/htdocs/langs/bg_BG/website.lang
index 7253e5c8aef..c647709243f 100644
--- a/htdocs/langs/bg_BG/website.lang
+++ b/htdocs/langs/bg_BG/website.lang
@@ -2,7 +2,7 @@
 Shortname=Код
 WebsiteSetupDesc=Create here the websites you wish to use. Then go into menu Websites to edit them.
 DeleteWebsite=Изтрийте уебсайт
-ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed.
+ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed. The files uploaded (like into the medias directory, the ECM module, ...) will remain.
 WEBSITE_TYPE_CONTAINER=Type of page/container
 WEBSITE_PAGE_EXAMPLE=Уеб страница, която да се използва като пример
 WEBSITE_PAGENAME=Име на страницата
@@ -14,6 +14,9 @@ WEBSITE_JS_INLINE=Javascript file content (common to all pages)
 WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages)
 WEBSITE_ROBOT=Robot file (robots.txt)
 WEBSITE_HTACCESS=Website .htaccess file
+WEBSITE_MANIFEST_JSON=Website manifest.json file
+WEBSITE_README=README.md file
+EnterHereLicenseInformation=Enter here meta data or license information to fille a README.md file. if you distribute your website as a template, the file will be included into the temptate package.
 HtmlHeaderPage=HTML header (specific to this page only)
 PageNameAliasHelp=Name or alias of the page.<br>This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "<strong>%s</strong>" to edit this alias.
 EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container.
@@ -41,6 +44,7 @@ RealURL=Релен URL
 ViewWebsiteInProduction=Покажи уеб сайта използвайки началното URL
 SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then set the name of the virtual host you have created in the properties of web site, so the preview can be done also using this dedicated web server access instead of the internal Dolibarr server.
 YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
 CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
 ReadPerm=Чета
 WritePerm=Write
@@ -75,7 +79,8 @@ AddWebsiteAccount=Create web site account
 BackToListOfThirdParty=Обратно към списъка с контрагентите
 DisableSiteFirst=Disable website first
 MyContainerTitle=My web site title
-AnotherContainer=Another container
+AnotherContainer=This is how to include content of another page/container (you may have an error here if you enable dynamic code because the embedded subcontainer may not exists)
+SorryWebsiteIsCurrentlyOffLine=Sorry, this website is currently off line. Please comme back later...
 WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / third party
 YouMustDefineTheHomePage=You must first define the default Home page
@@ -89,7 +94,8 @@ AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
 CorporateHomePage=Corporate Home page
 EmptyPage=Empty page
 ExternalURLMustStartWithHttp=External URL must start with http:// or https://
-ZipOfWebsitePackageToImport=Zip file of website package
+ZipOfWebsitePackageToImport=Upload the Zip file of the website template package
+ZipOfWebsitePackageToLoad=or Choose an available embedded website template package
 ShowSubcontainers=Include dynamic content
 InternalURLOfPage=Internal URL of page
 ThisPageIsTranslationOf=This page/container is a translation of
@@ -101,5 +107,10 @@ NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynam
 ReplaceWebsiteContent=Search or Replace website content
 DeleteAlsoJs=Delete also all javascript files specific to this website?
 DeleteAlsoMedias=Delete also all medias files specific to this website?
-# Export
 MyWebsitePages=My website pages
+SearchReplaceInto=Search | Replace into
+ReplaceString=New string
+CSSContentTooltipHelp=Enter here CSS content. To avoid any conflict with the CSS of the application, be sure to prepend all declaration with the .bodywebsite class. For example:<br><br>#mycssselector, input.myclass:hover { ... }<br>must be<br>.bodywebsite #mycssselector, .bodywebsite input.myclass:hover { ... }<br><br>Note: If you have a large file without this prefix, you can use 'lessc' to convert it to append the .bodywebsite prefix everywhere.
+LinkAndScriptsHereAreNotLoadedInEditor=Warning: This content is output only when site is accessed from a server. It is not used in Edit mode so if you need to load javascript files also in edit mode, just add your tag 'script src=...' into the page.
+Dynamiccontent=Sample of a page with dynamic content
+ImportSite=Import website template
diff --git a/htdocs/langs/bn_BD/admin.lang b/htdocs/langs/bn_BD/admin.lang
index 2e27c6fe81f..1a1891009cf 100644
--- a/htdocs/langs/bn_BD/admin.lang
+++ b/htdocs/langs/bn_BD/admin.lang
@@ -400,6 +400,7 @@ OldVATRates=Old VAT rate
 NewVATRates=New VAT rate
 PriceBaseTypeToChange=Modify on prices with base reference value defined on
 MassConvert=Launch bulk conversion
+PriceFormatInCurrentLanguage=Price Format In Current Language
 String=String
 TextLong=Long text
 HtmlText=Html text
@@ -431,7 +432,7 @@ ExtrafieldParamHelpradio=List of values must be lines with format key,value (whe
 ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- idfilter is necessarly a primary int key<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=List of values 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>Examples:<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
-ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default)<br>Set this to 2 for a collapsing separator (collapsed by default)
+ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Library used for PDF generation
 LocalTaxDesc=Some countries may apply two or three taxes on each invoice line. If this is the case, choose the type for the 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)
 SMS=SMS
@@ -1695,7 +1696,7 @@ SuppliersInvoiceNumberingModel=Vendor invoices numbering models
 IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=GeoIP Maxmind module setup
-PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat
+PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoLite2-Country.mmdb
 NoteOnPathLocation=Note that your ip to country data file must be inside a directory your PHP can read (Check your PHP open_basedir setup and filesystem permissions).
 YouCanDownloadFreeDatFileTo=You can download a <b>free demo version</b> of the Maxmind GeoIP country file at %s.
 YouCanDownloadAdvancedDatFileTo=You can also download a more <b>complete version, with updates,</b> of the Maxmind GeoIP country file at %s.
@@ -1926,14 +1927,13 @@ SmallerThan=Smaller than
 LargerThan=Larger than
 IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID is found into incoming email, the event will be automatically linked to the related objects.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
-IFTTTSetup=IFTTT module setup
-IFTTT_SERVICE_KEY=IFTTT Service key
-IFTTT_DOLIBARR_ENDPOINT_SECUREKEY=Security key to secure the endpoint URL used by IFTTT to send messages to your Dolibarr.
-IFTTTDesc=This module is designed to trigger events on IFTTT and/or to execute some action on external IFTTT triggers.
-UrlForIFTTT=URL endpoint for IFTTT
-YouWillFindItOnYourIFTTTAccount=You will find it on your IFTTT account
 EndPointFor=End point for %s : %s
 DeleteEmailCollector=Delete email collector
 ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
 RecipientEmailsWillBeReplacedWithThisValue=Recipient emails will be always replaced with this value
 AtLeastOneDefaultBankAccountMandatory=At least 1 default bank account must be defined
+RESTRICT_API_ON_IP=Allow available APIs to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can use the available APIs.
+RESTRICT_ON_IP=Allow access to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can access.
+BaseOnSabeDavVersion=Based on the library SabreDAV version
+NotAPublicIp=Not a public IP
+MakeAnonymousPing=Make an anonymous Ping '+1' to the Dolibarr foundation server (done 1 time only after installation) to allow the foundation to count the number of Dolibarr installation.
diff --git a/htdocs/langs/bn_BD/banks.lang b/htdocs/langs/bn_BD/banks.lang
index 1022bb99a3f..b3a2847703f 100644
--- a/htdocs/langs/bn_BD/banks.lang
+++ b/htdocs/langs/bn_BD/banks.lang
@@ -73,6 +73,7 @@ BankTransaction=Bank entry
 ListTransactions=List entries
 ListTransactionsByCategory=List entries/category
 TransactionsToConciliate=Entries to reconcile
+TransactionsToConciliateShort=To reconcile
 Conciliable=Can be reconciled
 Conciliate=Reconcile
 Conciliation=Reconciliation
@@ -116,6 +117,7 @@ DeleteCheckReceipt=Delete this check receipt?
 ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
 BankChecks=Bank checks
 BankChecksToReceipt=Checks awaiting deposit
+BankChecksToReceiptShort=Checks awaiting deposit
 ShowCheckReceipt=Show check deposit receipt
 NumberOfCheques=No. of check
 DeleteTransaction=Delete entry
diff --git a/htdocs/langs/bn_BD/cashdesk.lang b/htdocs/langs/bn_BD/cashdesk.lang
index ea0e660ed2d..33ea50dfb0f 100644
--- a/htdocs/langs/bn_BD/cashdesk.lang
+++ b/htdocs/langs/bn_BD/cashdesk.lang
@@ -62,6 +62,7 @@ TicketVatGrouped=Group VAT by rate in tickets
 AutoPrintTickets=Automatically print tickets
 EnableBarOrRestaurantFeatures=Enable features for Bar or Restaurant
 ConfirmDeletionOfThisPOSSale=Do your confirm the deletion of this current sale ?
+ConfirmDiscardOfThisPOSSale=Do you want to discard this current sale ?
 History=History
 ValidateAndClose=Validate and close
 Terminal=Terminal
@@ -69,3 +70,8 @@ NumberOfTerminals=Number of Terminals
 TerminalSelect=Select terminal you want to use:
 POSTicket=POS Ticket
 BasicPhoneLayout=Use basic layout for phones
+SetupOfTerminalNotComplete=Setup of terminal %s is not complete
+DirectPayment=Direct payment
+DirectPaymentButton=Direct cash payment button
+InvoiceIsAlreadyValidated=Invoice is already validated
+NoLinesToBill=No lines to bill
diff --git a/htdocs/langs/bn_BD/companies.lang b/htdocs/langs/bn_BD/companies.lang
index 010d9bc67d7..f9cf71074b1 100644
--- a/htdocs/langs/bn_BD/companies.lang
+++ b/htdocs/langs/bn_BD/companies.lang
@@ -54,6 +54,7 @@ Firstname=First name
 PostOrFunction=Job position
 UserTitle=Title
 NatureOfThirdParty=Nature of Third party
+NatureOfContact=Nature of Contact
 Address=Address
 State=State/Province
 StateShort=State
diff --git a/htdocs/langs/bn_BD/contracts.lang b/htdocs/langs/bn_BD/contracts.lang
index 51b73423fb0..47572c355ab 100644
--- a/htdocs/langs/bn_BD/contracts.lang
+++ b/htdocs/langs/bn_BD/contracts.lang
@@ -51,6 +51,7 @@ ListOfClosedServices=List of closed services
 ListOfRunningServices=List of running services
 NotActivatedServices=Inactive services (among validated contracts)
 BoardNotActivatedServices=Services to activate among validated contracts
+BoardNotActivatedServicesShort=Services to activate
 LastContracts=Latest %s contracts
 LastModifiedServices=Latest %s modified services
 ContractStartDate=Start date
@@ -64,7 +65,10 @@ DateStartRealShort=Real start date
 DateEndReal=Real end date
 DateEndRealShort=Real end date
 CloseService=Close service
-BoardRunningServices=Expired running services
+BoardRunningServices=Services running
+BoardRunningServicesShort=Services running
+BoardExpiredServices=Services expired
+BoardExpiredServicesShort=Services expired
 ServiceStatus=Status of service
 DraftContracts=Drafts contracts
 CloseRefusedBecauseOneServiceActive=Contract can't be closed as there is at least one open service on it
diff --git a/htdocs/langs/bn_BD/errors.lang b/htdocs/langs/bn_BD/errors.lang
index 1ee46fdbb92..0c07b2eafc4 100644
--- a/htdocs/langs/bn_BD/errors.lang
+++ b/htdocs/langs/bn_BD/errors.lang
@@ -218,6 +218,7 @@ ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text
 ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Error, delete payment linked to a closed invoice is not possible.
+ErrorSearchCriteriaTooSmall=Search criteria too small.
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 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/main.lang b/htdocs/langs/bn_BD/main.lang
index bd4ae2153bf..534c54db39c 100644
--- a/htdocs/langs/bn_BD/main.lang
+++ b/htdocs/langs/bn_BD/main.lang
@@ -28,6 +28,7 @@ NoTemplateDefined=No template available for this email type
 AvailableVariables=Available substitution variables
 NoTranslation=No translation
 Translation=Translation
+EmptySearchString=Enter a non empty search string
 NoRecordFound=No record found
 NoRecordDeleted=No record deleted
 NotEnoughDataYet=Not enough data
@@ -704,6 +705,7 @@ DateOfSignature=Date of signature
 HidePassword=Show command with password hidden
 UnHidePassword=Show real command with clear password
 Root=Root
+RootOfMedias=Root of public medias (/medias)
 Informations=Information
 Page=Page
 Notes=Notes
@@ -981,3 +983,10 @@ PaymentInformation=Payment information
 ValidFrom=Valid from
 ValidUntil=Valid until
 NoRecordedUsers=No users
+ToClose=To close
+ToProcess=To process
+ToApprove=To approve
+GlobalOpenedElemView=Global view
+NoArticlesFoundForTheKeyword=No article found for the keyword '<strong>%s</strong>'
+NoArticlesFoundForTheCategory=No article found for the category
+ToAcceptRefuse=To accept | refuse
diff --git a/htdocs/langs/bn_BD/members.lang b/htdocs/langs/bn_BD/members.lang
index 9993e05428f..5886c598d52 100644
--- a/htdocs/langs/bn_BD/members.lang
+++ b/htdocs/langs/bn_BD/members.lang
@@ -29,6 +29,7 @@ MenuMembersUpToDate=Up to date members
 MenuMembersNotUpToDate=Out of date members
 MenuMembersResiliated=Terminated members
 MembersWithSubscriptionToReceive=Members with subscription to receive
+MembersWithSubscriptionToReceiveShort=Subscription to receive
 DateSubscription=Subscription date
 DateEndSubscription=Subscription end date
 EndSubscription=End subscription
diff --git a/htdocs/langs/bn_BD/projects.lang b/htdocs/langs/bn_BD/projects.lang
index 76bd0ce597d..d144fccd272 100644
--- a/htdocs/langs/bn_BD/projects.lang
+++ b/htdocs/langs/bn_BD/projects.lang
@@ -76,7 +76,13 @@ MyProjects=My projects
 MyProjectsArea=My projects Area
 DurationEffective=Effective duration
 ProgressDeclared=Declared progress
+TaskProgressSummary=Task progress
+CurentlyOpenedTasks=Curently opened tasks
+TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared progress is less %s than the calculated progression
+TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared progress is more %s than the calculated progression
 ProgressCalculated=Calculated progress
+WhichIamLinkedTo=which I'm linked to
+WhichIamLinkedToProject=which I'm linked to project
 Time=Time
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
diff --git a/htdocs/langs/bn_BD/website.lang b/htdocs/langs/bn_BD/website.lang
index 0ee00aff7c0..9648ae48cc8 100644
--- a/htdocs/langs/bn_BD/website.lang
+++ b/htdocs/langs/bn_BD/website.lang
@@ -2,7 +2,7 @@
 Shortname=Code
 WebsiteSetupDesc=Create here the websites you wish to use. Then go into menu Websites to edit them.
 DeleteWebsite=Delete website
-ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed.
+ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed. The files uploaded (like into the medias directory, the ECM module, ...) will remain.
 WEBSITE_TYPE_CONTAINER=Type of page/container
 WEBSITE_PAGE_EXAMPLE=Web page to use as example
 WEBSITE_PAGENAME=Page name/alias
@@ -14,6 +14,9 @@ WEBSITE_JS_INLINE=Javascript file content (common to all pages)
 WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages)
 WEBSITE_ROBOT=Robot file (robots.txt)
 WEBSITE_HTACCESS=Website .htaccess file
+WEBSITE_MANIFEST_JSON=Website manifest.json file
+WEBSITE_README=README.md file
+EnterHereLicenseInformation=Enter here meta data or license information to fille a README.md file. if you distribute your website as a template, the file will be included into the temptate package.
 HtmlHeaderPage=HTML header (specific to this page only)
 PageNameAliasHelp=Name or alias of the page.<br>This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "<strong>%s</strong>" to edit this alias.
 EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container.
@@ -41,6 +44,7 @@ RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
 SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then set the name of the virtual host you have created in the properties of web site, so the preview can be done also using this dedicated web server access instead of the internal Dolibarr server.
 YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
 CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
 ReadPerm=Read
 WritePerm=Write
@@ -75,7 +79,8 @@ AddWebsiteAccount=Create web site account
 BackToListOfThirdParty=Back to list for Third Party
 DisableSiteFirst=Disable website first
 MyContainerTitle=My web site title
-AnotherContainer=Another container
+AnotherContainer=This is how to include content of another page/container (you may have an error here if you enable dynamic code because the embedded subcontainer may not exists)
+SorryWebsiteIsCurrentlyOffLine=Sorry, this website is currently off line. Please comme back later...
 WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / third party
 YouMustDefineTheHomePage=You must first define the default Home page
@@ -89,7 +94,8 @@ AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
 CorporateHomePage=Corporate Home page
 EmptyPage=Empty page
 ExternalURLMustStartWithHttp=External URL must start with http:// or https://
-ZipOfWebsitePackageToImport=Zip file of website package
+ZipOfWebsitePackageToImport=Upload the Zip file of the website template package
+ZipOfWebsitePackageToLoad=or Choose an available embedded website template package
 ShowSubcontainers=Include dynamic content
 InternalURLOfPage=Internal URL of page
 ThisPageIsTranslationOf=This page/container is a translation of
@@ -101,5 +107,10 @@ NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynam
 ReplaceWebsiteContent=Search or Replace website content
 DeleteAlsoJs=Delete also all javascript files specific to this website?
 DeleteAlsoMedias=Delete also all medias files specific to this website?
-# Export
 MyWebsitePages=My website pages
+SearchReplaceInto=Search | Replace into
+ReplaceString=New string
+CSSContentTooltipHelp=Enter here CSS content. To avoid any conflict with the CSS of the application, be sure to prepend all declaration with the .bodywebsite class. For example:<br><br>#mycssselector, input.myclass:hover { ... }<br>must be<br>.bodywebsite #mycssselector, .bodywebsite input.myclass:hover { ... }<br><br>Note: If you have a large file without this prefix, you can use 'lessc' to convert it to append the .bodywebsite prefix everywhere.
+LinkAndScriptsHereAreNotLoadedInEditor=Warning: This content is output only when site is accessed from a server. It is not used in Edit mode so if you need to load javascript files also in edit mode, just add your tag 'script src=...' into the page.
+Dynamiccontent=Sample of a page with dynamic content
+ImportSite=Import website template
diff --git a/htdocs/langs/bs_BA/admin.lang b/htdocs/langs/bs_BA/admin.lang
index 3b1cbfdb1bc..6b030b61397 100644
--- a/htdocs/langs/bs_BA/admin.lang
+++ b/htdocs/langs/bs_BA/admin.lang
@@ -400,6 +400,7 @@ OldVATRates=Old VAT rate
 NewVATRates=New VAT rate
 PriceBaseTypeToChange=Modify on prices with base reference value defined on
 MassConvert=Launch bulk conversion
+PriceFormatInCurrentLanguage=Price Format In Current Language
 String=String
 TextLong=Long text
 HtmlText=Html text
@@ -431,7 +432,7 @@ ExtrafieldParamHelpradio=List of values must be lines with format key,value (whe
 ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- idfilter is necessarly a primary int key<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=List of values 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>Examples:<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
-ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default)<br>Set this to 2 for a collapsing separator (collapsed by default)
+ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Library used for PDF generation
 LocalTaxDesc=Some countries may apply two or three taxes on each invoice line. If this is the case, choose the type for the 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)
 SMS=SMS
@@ -1695,7 +1696,7 @@ SuppliersInvoiceNumberingModel=Vendor invoices numbering models
 IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=GeoIP Maxmind module setup
-PathToGeoIPMaxmindCountryDataFile=Putanja do datoteke koja sadrži Maxmind ip do prevoda za zemlju. <br> Primjeri: <br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat
+PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoLite2-Country.mmdb
 NoteOnPathLocation=Note that your ip to country data file must be inside a directory your PHP can read (Check your PHP open_basedir setup and filesystem permissions).
 YouCanDownloadFreeDatFileTo=You can download a <b>free demo version</b> of the Maxmind GeoIP country file at %s.
 YouCanDownloadAdvancedDatFileTo=You can also download a more <b>complete version, with updates,</b> of the Maxmind GeoIP country file at %s.
@@ -1926,14 +1927,13 @@ SmallerThan=Smaller than
 LargerThan=Larger than
 IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID is found into incoming email, the event will be automatically linked to the related objects.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
-IFTTTSetup=IFTTT module setup
-IFTTT_SERVICE_KEY=IFTTT Service key
-IFTTT_DOLIBARR_ENDPOINT_SECUREKEY=Security key to secure the endpoint URL used by IFTTT to send messages to your Dolibarr.
-IFTTTDesc=This module is designed to trigger events on IFTTT and/or to execute some action on external IFTTT triggers.
-UrlForIFTTT=URL endpoint for IFTTT
-YouWillFindItOnYourIFTTTAccount=You will find it on your IFTTT account
 EndPointFor=End point for %s : %s
 DeleteEmailCollector=Delete email collector
 ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
 RecipientEmailsWillBeReplacedWithThisValue=Recipient emails will be always replaced with this value
 AtLeastOneDefaultBankAccountMandatory=At least 1 default bank account must be defined
+RESTRICT_API_ON_IP=Allow available APIs to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can use the available APIs.
+RESTRICT_ON_IP=Allow access to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can access.
+BaseOnSabeDavVersion=Based on the library SabreDAV version
+NotAPublicIp=Not a public IP
+MakeAnonymousPing=Make an anonymous Ping '+1' to the Dolibarr foundation server (done 1 time only after installation) to allow the foundation to count the number of Dolibarr installation.
diff --git a/htdocs/langs/bs_BA/banks.lang b/htdocs/langs/bs_BA/banks.lang
index c61e6a2e969..2e7da709b11 100644
--- a/htdocs/langs/bs_BA/banks.lang
+++ b/htdocs/langs/bs_BA/banks.lang
@@ -73,6 +73,7 @@ BankTransaction=Bankovna transakcija
 ListTransactions=Spisak transakcija
 ListTransactionsByCategory=Spisak transakcija/kategorija
 TransactionsToConciliate=Transakcije za izmirivanje
+TransactionsToConciliateShort=To reconcile
 Conciliable=Može se izmiriti
 Conciliate=Izmiriti
 Conciliation=Podmirivanje
@@ -116,6 +117,7 @@ DeleteCheckReceipt=Obrišite ovaj izvod čeka?
 ConfirmDeleteCheckReceipt=Da li ste sigurni da želite obrisati ovaj izvod od čeka?
 BankChecks=Bankovni ček
 BankChecksToReceipt=Čekovi koji čekaju na depozit
+BankChecksToReceiptShort=Čekovi koji čekaju na depozit
 ShowCheckReceipt=Prikaži priznanicu depozita čeka
 NumberOfCheques=No. of check
 DeleteTransaction=Obriši unos
diff --git a/htdocs/langs/bs_BA/cashdesk.lang b/htdocs/langs/bs_BA/cashdesk.lang
index b267d0af300..9933b93c415 100644
--- a/htdocs/langs/bs_BA/cashdesk.lang
+++ b/htdocs/langs/bs_BA/cashdesk.lang
@@ -62,6 +62,7 @@ TicketVatGrouped=Group VAT by rate in tickets
 AutoPrintTickets=Automatically print tickets
 EnableBarOrRestaurantFeatures=Enable features for Bar or Restaurant
 ConfirmDeletionOfThisPOSSale=Do your confirm the deletion of this current sale ?
+ConfirmDiscardOfThisPOSSale=Do you want to discard this current sale ?
 History=Historija
 ValidateAndClose=Validate and close
 Terminal=Terminal
@@ -69,3 +70,8 @@ NumberOfTerminals=Number of Terminals
 TerminalSelect=Select terminal you want to use:
 POSTicket=POS Ticket
 BasicPhoneLayout=Use basic layout for phones
+SetupOfTerminalNotComplete=Setup of terminal %s is not complete
+DirectPayment=Direct payment
+DirectPaymentButton=Direct cash payment button
+InvoiceIsAlreadyValidated=Invoice is already validated
+NoLinesToBill=No lines to bill
diff --git a/htdocs/langs/bs_BA/companies.lang b/htdocs/langs/bs_BA/companies.lang
index f4be43431d8..644617844ca 100644
--- a/htdocs/langs/bs_BA/companies.lang
+++ b/htdocs/langs/bs_BA/companies.lang
@@ -54,6 +54,7 @@ Firstname=Ime
 PostOrFunction=Pozicija
 UserTitle=Titula
 NatureOfThirdParty=Vrsta treće strane
+NatureOfContact=Nature of Contact
 Address=Adresa
 State=Država/Provincija
 StateShort=Pokrajina
diff --git a/htdocs/langs/bs_BA/contracts.lang b/htdocs/langs/bs_BA/contracts.lang
index 4c773cba9cc..1f4cc0c6ac8 100644
--- a/htdocs/langs/bs_BA/contracts.lang
+++ b/htdocs/langs/bs_BA/contracts.lang
@@ -51,6 +51,7 @@ ListOfClosedServices=Lista završenih usluga
 ListOfRunningServices=Lista aktivnih usluga
 NotActivatedServices=Nekativne usluge (među potvrđenim ugovorima)
 BoardNotActivatedServices=Usluge za aktiviranje među potvrđenim ugovorima
+BoardNotActivatedServicesShort=Services to activate
 LastContracts=Latest %s contracts
 LastModifiedServices=Latest %s modified services
 ContractStartDate=Datum početka
@@ -64,7 +65,10 @@ DateStartRealShort=Pravi datum početka
 DateEndReal=Pravi datum završetka
 DateEndRealShort=Pravi datum završetka
 CloseService=Zatvori uslugu
-BoardRunningServices=Aktivne istekle usluge
+BoardRunningServices=Services running
+BoardRunningServicesShort=Services running
+BoardExpiredServices=Services expired
+BoardExpiredServicesShort=Services expired
 ServiceStatus=Status usluge
 DraftContracts=Nacrti ugovora
 CloseRefusedBecauseOneServiceActive=Contract can't be closed as there is at least one open service on it
diff --git a/htdocs/langs/bs_BA/errors.lang b/htdocs/langs/bs_BA/errors.lang
index d4da3b43f7a..d75afd76d3a 100644
--- a/htdocs/langs/bs_BA/errors.lang
+++ b/htdocs/langs/bs_BA/errors.lang
@@ -218,6 +218,7 @@ ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text
 ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Error, delete payment linked to a closed invoice is not possible.
+ErrorSearchCriteriaTooSmall=Search criteria too small.
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 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/main.lang b/htdocs/langs/bs_BA/main.lang
index 33ca3105dea..ed45d8d4028 100644
--- a/htdocs/langs/bs_BA/main.lang
+++ b/htdocs/langs/bs_BA/main.lang
@@ -28,6 +28,7 @@ NoTemplateDefined=Šablon za ovu vrstu emaila nije dostupan
 AvailableVariables=Dostupne zamjenske varijable
 NoTranslation=Nema prevoda
 Translation=Prevod
+EmptySearchString=Enter a non empty search string
 NoRecordFound=Nije pronađen zapis
 NoRecordDeleted=Nijedan zapis nije obrisan
 NotEnoughDataYet=Nema dovoljno podataka
@@ -704,6 +705,7 @@ DateOfSignature=Datum potpisa
 HidePassword=Pokaži komandu sa skrivenom šifrom
 UnHidePassword=Pokaži stvarnu komandu sa pokazanom šifrom
 Root=Root
+RootOfMedias=Root of public medias (/medias)
 Informations=Inromacije
 Page=Stranica
 Notes=Napomene
@@ -981,3 +983,10 @@ PaymentInformation=Payment information
 ValidFrom=Valid from
 ValidUntil=Valid until
 NoRecordedUsers=No users
+ToClose=To close
+ToProcess=Za obradu
+ToApprove=To approve
+GlobalOpenedElemView=Global view
+NoArticlesFoundForTheKeyword=No article found for the keyword '<strong>%s</strong>'
+NoArticlesFoundForTheCategory=No article found for the category
+ToAcceptRefuse=To accept | refuse
diff --git a/htdocs/langs/bs_BA/members.lang b/htdocs/langs/bs_BA/members.lang
index cb7bda24617..415317e90cf 100644
--- a/htdocs/langs/bs_BA/members.lang
+++ b/htdocs/langs/bs_BA/members.lang
@@ -29,6 +29,7 @@ MenuMembersUpToDate=Up to date members
 MenuMembersNotUpToDate=Out of date members
 MenuMembersResiliated=Terminated members
 MembersWithSubscriptionToReceive=Members with subscription to receive
+MembersWithSubscriptionToReceiveShort=Subscription to receive
 DateSubscription=Subscription date
 DateEndSubscription=Subscription end date
 EndSubscription=End subscription
diff --git a/htdocs/langs/bs_BA/projects.lang b/htdocs/langs/bs_BA/projects.lang
index ca0285ca234..5de7fef299c 100644
--- a/htdocs/langs/bs_BA/projects.lang
+++ b/htdocs/langs/bs_BA/projects.lang
@@ -76,7 +76,13 @@ MyProjects=Moji projekti
 MyProjectsArea=My projects Area
 DurationEffective=Efektivno trajanje
 ProgressDeclared=Declared progress
+TaskProgressSummary=Task progress
+CurentlyOpenedTasks=Curently opened tasks
+TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared progress is less %s than the calculated progression
+TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared progress is more %s than the calculated progression
 ProgressCalculated=Calculated progress
+WhichIamLinkedTo=which I'm linked to
+WhichIamLinkedToProject=which I'm linked to project
 Time=Vrijeme
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
diff --git a/htdocs/langs/bs_BA/website.lang b/htdocs/langs/bs_BA/website.lang
index 8aa3e8d93f8..3d834c20a53 100644
--- a/htdocs/langs/bs_BA/website.lang
+++ b/htdocs/langs/bs_BA/website.lang
@@ -2,7 +2,7 @@
 Shortname=Kod
 WebsiteSetupDesc=Create here the websites you wish to use. Then go into menu Websites to edit them.
 DeleteWebsite=Delete website
-ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed.
+ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed. The files uploaded (like into the medias directory, the ECM module, ...) will remain.
 WEBSITE_TYPE_CONTAINER=Type of page/container
 WEBSITE_PAGE_EXAMPLE=Web page to use as example
 WEBSITE_PAGENAME=Page name/alias
@@ -14,6 +14,9 @@ WEBSITE_JS_INLINE=Javascript file content (common to all pages)
 WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages)
 WEBSITE_ROBOT=Robot file (robots.txt)
 WEBSITE_HTACCESS=Website .htaccess file
+WEBSITE_MANIFEST_JSON=Website manifest.json file
+WEBSITE_README=README.md file
+EnterHereLicenseInformation=Enter here meta data or license information to fille a README.md file. if you distribute your website as a template, the file will be included into the temptate package.
 HtmlHeaderPage=HTML header (specific to this page only)
 PageNameAliasHelp=Name or alias of the page.<br>This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "<strong>%s</strong>" to edit this alias.
 EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container.
@@ -41,6 +44,7 @@ RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
 SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then set the name of the virtual host you have created in the properties of web site, so the preview can be done also using this dedicated web server access instead of the internal Dolibarr server.
 YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
 CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
 ReadPerm=Pročitaj
 WritePerm=Write
@@ -75,7 +79,8 @@ AddWebsiteAccount=Create web site account
 BackToListOfThirdParty=Back to list for Third Party
 DisableSiteFirst=Disable website first
 MyContainerTitle=My web site title
-AnotherContainer=Another container
+AnotherContainer=This is how to include content of another page/container (you may have an error here if you enable dynamic code because the embedded subcontainer may not exists)
+SorryWebsiteIsCurrentlyOffLine=Sorry, this website is currently off line. Please comme back later...
 WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / third party
 YouMustDefineTheHomePage=You must first define the default Home page
@@ -89,7 +94,8 @@ AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
 CorporateHomePage=Corporate Home page
 EmptyPage=Empty page
 ExternalURLMustStartWithHttp=External URL must start with http:// or https://
-ZipOfWebsitePackageToImport=Zip file of website package
+ZipOfWebsitePackageToImport=Upload the Zip file of the website template package
+ZipOfWebsitePackageToLoad=or Choose an available embedded website template package
 ShowSubcontainers=Include dynamic content
 InternalURLOfPage=Internal URL of page
 ThisPageIsTranslationOf=This page/container is a translation of
@@ -101,5 +107,10 @@ NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynam
 ReplaceWebsiteContent=Search or Replace website content
 DeleteAlsoJs=Delete also all javascript files specific to this website?
 DeleteAlsoMedias=Delete also all medias files specific to this website?
-# Export
 MyWebsitePages=My website pages
+SearchReplaceInto=Search | Replace into
+ReplaceString=New string
+CSSContentTooltipHelp=Enter here CSS content. To avoid any conflict with the CSS of the application, be sure to prepend all declaration with the .bodywebsite class. For example:<br><br>#mycssselector, input.myclass:hover { ... }<br>must be<br>.bodywebsite #mycssselector, .bodywebsite input.myclass:hover { ... }<br><br>Note: If you have a large file without this prefix, you can use 'lessc' to convert it to append the .bodywebsite prefix everywhere.
+LinkAndScriptsHereAreNotLoadedInEditor=Warning: This content is output only when site is accessed from a server. It is not used in Edit mode so if you need to load javascript files also in edit mode, just add your tag 'script src=...' into the page.
+Dynamiccontent=Sample of a page with dynamic content
+ImportSite=Import website template
diff --git a/htdocs/langs/ca_ES/accountancy.lang b/htdocs/langs/ca_ES/accountancy.lang
index 06ddc2b794d..807d16ebf67 100644
--- a/htdocs/langs/ca_ES/accountancy.lang
+++ b/htdocs/langs/ca_ES/accountancy.lang
@@ -265,7 +265,7 @@ AccountingJournals=Diari de comptabilitat
 AccountingJournal=Diari comptable
 NewAccountingJournal=Nou diari comptable
 ShowAccoutingJournal=Mostrar diari comptable
-NatureOfJournal=Nature of Journal
+NatureOfJournal=Naturalesa del diari
 AccountingJournalType1=Operacions diverses
 AccountingJournalType2=Vendes
 AccountingJournalType3=Compres
@@ -291,7 +291,7 @@ Modelcsv_quadratus=Exporta a Quadratus QuadraCompta
 Modelcsv_ebp=Exporta a EBP
 Modelcsv_cogilog=Exporta a Cogilog
 Modelcsv_agiris=Exporta a Agiris
-Modelcsv_LDCompta=Export for LD Compta (v9 & higher) (Test)
+Modelcsv_LDCompta=Exporta per LD Compta (v9 i superior) (Prova)
 Modelcsv_openconcerto=Exporta per a OpenConcerto (Test)
 Modelcsv_configurable=Exporta CSV configurable
 Modelcsv_FEC=Exporta FEC
@@ -302,7 +302,7 @@ ChartofaccountsId=Id pla comptable
 InitAccountancy=Inicialitza la comptabilitat
 InitAccountancyDesc=Aquesta pàgina es pot utilitzar per inicialitzar un compte de comptabilitat en productes i serveis que no tenen compte comptable definit per a vendes i compres.
 DefaultBindingDesc=Aquesta pàgina pot ser utilitzat per establir un compte per defecte que s'utilitzarà per enllaçar registre de transaccions sobre els pagament de salaris, donació, impostos i IVA quan no hi ha encara compte comptable específic definit.
-DefaultClosureDesc=This page can be used to set parameters used for accounting closures.
+DefaultClosureDesc=Aquesta pàgina es pot utilitzar per definir els paràmetres usats per als tancaments de comptabilitat.
 Options=Opcions
 OptionModeProductSell=En mode vendes
 OptionModeProductSellIntra=Les vendes de mode exportades a la CEE
diff --git a/htdocs/langs/ca_ES/admin.lang b/htdocs/langs/ca_ES/admin.lang
index ebaaccb4947..b4234f78c68 100644
--- a/htdocs/langs/ca_ES/admin.lang
+++ b/htdocs/langs/ca_ES/admin.lang
@@ -400,6 +400,7 @@ OldVATRates=Taxa d'IVA antiga
 NewVATRates=Taxa d'IVA nova
 PriceBaseTypeToChange=Canviar el preu on la referència de base és
 MassConvert=Inicia la conversió massiva
+PriceFormatInCurrentLanguage=Format del preu en idioma actual
 String=Cadena
 TextLong=Text llarg
 HtmlText=Text Html
@@ -431,7 +432,7 @@ ExtrafieldParamHelpradio=La llista de valor ha de ser un conjunt de línies del
 ExtrafieldParamHelpsellist=Llista de valors que provenen d'una taula<br>Sintaxi: nom_taula:nom_camp:id_camp::filtre<br>Exemple : c_typent:libelle:id::filter<br><br>- idfilter ha de ser necessàriament una "primary int key" <br>- el filtre pot ser una comprovació senzilla (eg active=1) per mostrar només valors actius<br>També es pot emprar $ID$ al filtre per representar el ID de l'actual objecte en curs<br>Per fer un SELECT al filtre empreu $SEL$<br>Si voleu filtrar per algun camp extra ("extrafields") empreu la sintaxi extra.codicamp=... (a on codicamp és el codi del camp extra)<br><br>Per tenir la llista depenent d'una altre llista d'atributs complementaris:<br>c_typent:libelle:id:options_<i>codi_llista_pare</i>|parent_column:filter <br><br>Per tenir la llista depenent d'una altra llista:<br>c_typent:libelle:id:<i>codi_llista_pare</i>|parent_column:filter
 ExtrafieldParamHelpchkbxlst=La llista de valors prové d'una taula <br> Sintaxi: nom_taula:nom_camp:id_camp::filtre <br> Exemple: c_typent:libelle:id::filter<br> <br> filtre pot ser una comprovació simple (p. ex. active=1) per mostrar només el valor actiu <br> També podeu utilitzar $ID$ en el filtre per representar l'ID actual de l'objecte en curs <br>Per fer un SELECT en el filtre utilitzeu $SEL$ <br> si voleu filtrar per camps extra utilitzeu sintaxi extra.fieldcode=... (on el codi de camp és el codi del extrafield) <br> <br>Per tenir la llista depenent d'una altra llista d'atributs complementaris: <br>c_typent:libelle:id:options_<i>codi_llista_pare</i>|parent_column: filter  <br><br>Per tenir la llista depenent d'una altra llista: c_typent:libelle:id:<i>codi_llista_pare</i>|parent_column:filter
 ExtrafieldParamHelplink=Els paràmetres han de ser ObjectName: Classpath<br>Sintaxi: ObjectName:Classpath<br>Exemples :<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
-ExtrafieldParamHelpSeparator=Manteniu-vos buits per obtenir un simple separador <br> Establiu-ho a 1 per a un separador col·lapsat (obert per defecte) <br> Establiu-ho a 2 per a un separador col·lapsat (col·lapsat per defecte)
+ExtrafieldParamHelpSeparator=Manteniu-lo buit per un simple separador <br> Configureu-ho a 1 per a un separador col·lapsador (obert per defecte per a la sessió nova, i es mantindrà l&#39;estat de cada sessió d&#39;usuari) <br> Configureu-ho a 2 per a un separador col·lapsat (es va desplomar per defecte per a la sessió nova, i es mantindrà l&#39;estat per a cada sessió d&#39;usuari)
 LibraryToBuildPDF=Llibreria utilitzada per generar PDF
 LocalTaxDesc=Alguns països apliquen 2 o 3 impostos en cada línia de factura. Si aquest és el cas, escull el tipus pel segon i el tercer impost i el seu valor. Els tipus possibles són: <br>1: impostos locals aplicats en productes i serveis sense IVA (l'impost local serà calculat en el total sense impostos)<br>2: impost local aplicat en productes i serveis amb IVA (l'impost local serà calculat amb el total + l'impost principal)<br>3: impost local aplicat en productes sense IVA (l'impost local serà calculat en el total sense impost)<br>4: impost local aplicat en productes amb IVA (l'impost local serà calculat amb el total + l'impost principal)<br>5: impost local aplicat en serveis sense IVA (l'impost local serà calculat amb el total sense impost)<br>6: impost local aplicat en serveis amb IVA inclòs (l'impost local serà calculat amb el total + IVA)
 SMS=SMS
@@ -574,7 +575,7 @@ Module510Name=Salaris
 Module510Desc=Registre i seguiment del pagament dels salaris dels empleats
 Module520Name=Préstecs
 Module520Desc=Gestió de préstecs
-Module600Name=Notifications on business event
+Module600Name=Notificacions sobre esdeveniments comercials
 Module600Desc=Envieu notificacions per correu electrònic activades per un esdeveniment empresarial: per usuari (configuració definit a cada usuari), per a contactes de tercers (configuració definida en cada tercer) o per correus electrònics específics
 Module600Long=Tingueu en compte que aquest mòdul està dedicat a enviar correus electrònics en temps real quan es produeix un esdeveniment de negoci específic. Si cerqueu una característica per enviar recordatoris per correu electrònic dels esdeveniments de l'agenda, aneu a la configuració del mòdul Agenda.
 Module610Name=Variants de producte
@@ -1193,7 +1194,7 @@ ExtraFieldsSupplierOrders=Atributs complementaris (comandes)
 ExtraFieldsSupplierInvoices=Atributs complementaris (factures)
 ExtraFieldsProject=Atributs complementaris (projectes)
 ExtraFieldsProjectTask=Atributs complementaris (tasques)
-ExtraFieldsSalaries=Complementary attributes (salaries)
+ExtraFieldsSalaries=Atributs complementaris (sous)
 ExtraFieldHasWrongValue=L'atribut %s té un valor no valid
 AlphaNumOnlyLowerCharsAndNoSpace=només caràcters alfanumèrics i en minúscula sense espai
 SendmailOptionNotComplete=Atenció, en alguns sistemes Linux, amb aquest mètode d'enviament, per poder enviar mails en nom seu, la configuració de sendmail ha de contenir l'opció <b>-ba</b> (paràmetre <b>mail.force_extra_parameters</b> a l'arxiu <b>php.ini</b>). Si alguns dels seus destinataris no reben els seus missatges, proveu de modificar aquest paràmetre PHP amb <b>mail.force_extra_parameters =-ba </b>.
@@ -1221,14 +1222,14 @@ SuhosinSessionEncrypt=Emmagatzematge de sessions xifrades per Suhosin
 ConditionIsCurrently=Actualment la condició és %s
 YouUseBestDriver=Utilitzeu el controlador %s, que és el millor controlador disponible actualment.
 YouDoNotUseBestDriver=S'utilitza el controlador %s, però es recomana utilitzar el controlador %s.
-NbOfObjectIsLowerThanNoPb=You have only %s %s in the database. This does not require any particular optimization.
+NbOfObjectIsLowerThanNoPb=Només teniu %s %s a la base de dades. Això no requereix cap optimització particular.
 SearchOptim=Cerca optimització
-YouHaveXObjectUseSearchOptim=You have %s %s in the database. You should add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
-YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to 1 in Home-Setup-Other.
+YouHaveXObjectUseSearchOptim=Teniu %s %s a la base de dades. Hauríeu d’afegir la constant %s a 1 a Home-Setup-Other. Limiteu la cerca a l&#39;inici de cadenes, cosa que permet que la base de dades utilitzeu índexs i haureu d&#39;obtenir una resposta immediata.
+YouHaveXObjectAndSearchOptimOn=Teniu %s %s a la base de dades i %s constant es configura com a 1 a Home-Setup-Other.
 BrowserIsOK=Esteu utilitzant el navegador web %s. Aquest navegador està bé per a la seguretat i el rendiment.
 BrowserIsKO=Esteu utilitzant el navegador web %s. Es considera que aquest navegador és una mala elecció per a la seguretat, el rendiment i la fiabilitat. Recomanem utilitzar Firefox, Chrome, Opera o Safari.
-PHPModuleLoaded=PHP component %s is loaded
-PreloadOPCode=Preloaded OPCode is used
+PHPModuleLoaded=Es carrega el component PHP %s
+PreloadOPCode=S&#39;utilitza un codi OPC precarregat
 AddRefInList=Mostrar client / proveïdor ref. llista d'informació (llista de selecció o combobox) i la majoria d'hipervincle. <br> Els tercers apareixeran amb un format de nom de "CC12345 - SC45678 - The Big Company corp". en lloc de "The Big Company corp".
 AddAdressInList=Mostra la llista d'informació de la direcció de client / proveïdor (llista de selecció o combobox) <br> Els tercers apareixeran amb un format de nom de "The Big Company corp. - 21 jump street 123456 Big town - USA" en lloc de "The Big Company corp".
 AskForPreferredShippingMethod=Demaneu un mètode d'enviament preferit per a tercers.
@@ -1695,7 +1696,7 @@ SuppliersInvoiceNumberingModel=Models de numeració de factures de proveïdor
 IfSetToYesDontForgetPermission=Si esta seleccionat, no oblideu de modificar els permisos en els grups o usuaris per permetre la segona aprovació
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=Configuració del mòdul GeoIP  Maxmind
-PathToGeoIPMaxmindCountryDataFile=Ruta de l'arxiu Maxmind que conté les conversions IP-> País.<br>Exemple: /usr/local/share/GeoIP/GeoIP.dat
+PathToGeoIPMaxmindCountryDataFile=Ruta al fitxer que conté Maxmind ip a la traducció del país. <br> Exemples: <br> /usr/local/share/GeoIP/GeoIP.dat <br> /usr/share/GeoIP/GeoIP.dat <br> /usr/share/GeoIP/GeoLite2-Country.mmdb
 NoteOnPathLocation=Tingueu en compte que aquest arxiu ha d'estar en una carpeta accessible desde la seva PHP (Comproveu la configuració de open_basedir de la seva PHP i els permisos d'arxiu/carpetes).
 YouCanDownloadFreeDatFileTo=Pot descarregar-se una <b>versió demo gratuïta</b> de l'arxiu de països  Maxmind GeoIP a l'adreça %s.
 YouCanDownloadAdvancedDatFileTo=També pot descarregar-se una <b>versió més completa</b> de l'arxiu de països Maxmind GeoIP a l'adreça %s.
@@ -1736,9 +1737,9 @@ ExpenseReportsRulesSetup=Configurar mòdul Informes de despeses - Regles
 ExpenseReportNumberingModules=Número del mòdul Informe de despeses
 NoModueToManageStockIncrease=No esta activat el mòdul per gestionar automàticament l'increment d'estoc. L'increment d'estoc es realitzara només amb l'entrada manual
 YouMayFindNotificationsFeaturesIntoModuleNotification=Podeu trobar opcions de notificacions per correu electrònic habilitant i configurant el mòdul "Notificació".
-ListOfNotificationsPerUser=List of automatic notifications per user*
-ListOfNotificationsPerUserOrContact=List of possible automatic notifications (on business event) available per user* or per contact**
-ListOfFixedNotifications=List of automatic fixed notifications
+ListOfNotificationsPerUser=Llista de notificacions automàtiques per usuari *
+ListOfNotificationsPerUserOrContact=Llista de possibles notificacions automàtiques (en un esdeveniment comercial) disponibles per usuari* o per contacte**
+ListOfFixedNotifications=Llista de notificacions fixes automàtiques
 GoOntoUserCardToAddMore=Ves a la pestanya "Notificacions" d'un usuari per afegir o eliminar notificacions per usuaris.
 GoOntoContactCardToAddMore=Vagi a la pestanya "Notificacions" d'un contacte de tercers per afegir o eliminar notificacions per contactes/direccions
 Threshold=Valor mínim/llindar
@@ -1900,11 +1901,11 @@ OnMobileOnly=Només en pantalla petita (telèfon intel·ligent)
 DisableProspectCustomerType=Desactiveu el tipus de tercers "Prospect + Customer" (per tant, un tercer ha de ser Client o Client Potencial, però no pot ser ambdues)
 MAIN_OPTIMIZEFORTEXTBROWSER=Simplifica la interfície per a persones cegues
 MAIN_OPTIMIZEFORTEXTBROWSERDesc=Activa aquesta opció si ets cec o si fas servir l'aplicació des d'un navegador de text com ara Lynx o Links.
-MAIN_OPTIMIZEFORCOLORBLIND=Change  interface's color for color blind person
-MAIN_OPTIMIZEFORCOLORBLINDDesc=Enable this option if you are a color blind person, in some case interface will change color setup to increase contrast.
+MAIN_OPTIMIZEFORCOLORBLIND=Canvia el color de la interfície per daltònic
+MAIN_OPTIMIZEFORCOLORBLINDDesc=Habiliteu aquesta opció si sou daltònics, en algun cas la interfície canviarà la configuració del color per augmentar el contrast.
 Protanopia=Protanopia
-Deuteranopes=Deuteranopes
-Tritanopes=Tritanopes
+Deuteranopes=Deuteranops
+Tritanopes=Tritanops
 ThisValueCanOverwrittenOnUserLevel=Aquest valor es pot sobreescriure per cada usuari des de la pestanya de la pàgina d'usuari '%s'
 DefaultCustomerType=Tipus de tercer predeterminat per al formulari de creació "Nou client"
 ABankAccountMustBeDefinedOnPaymentModeSetup=Nota: el compte bancari s'ha de definir al mòdul de cada mode de pagament (Paypal, Stripe, ...) per tal que funcioni aquesta funció.
@@ -1918,7 +1919,7 @@ LogsLinesNumber=Nombre de línies que es mostraran a la pestanya de registres
 UseDebugBar=Utilitzeu la barra de depuració
 DEBUGBAR_LOGS_LINES_NUMBER=Nombre d’últimes línies de registre que cal mantenir a la consola
 WarningValueHigherSlowsDramaticalyOutput=Advertència, els valors més alts frenen molt la producció
-ModuleActivated=Module %s is activated and slows the interface
+ModuleActivated=El mòdul %s està activat i alenteix la interfície
 EXPORTS_SHARE_MODELS=Els models d’exportació es comparteixen amb tothom
 ExportSetup=Configuració del mòdul Export
 InstanceUniqueID=ID únic de la instància
@@ -1926,14 +1927,13 @@ SmallerThan=Menor que
 LargerThan=Major que
 IfTrackingIDFoundEventWillBeLinked=Tingueu en compte que si es troba un identificador de seguiment al correu electrònic entrant, l’esdeveniment s’enllaçarà automàticament als objectes relacionats.
 WithGMailYouCanCreateADedicatedPassword=Amb un compte de GMail, si heu activat la validació de dos passos, es recomana crear una segona contrasenya dedicada a l’aplicació en comptes d’utilitzar la contrasenya del vostre compte des de https://myaccount.google.com/.
-IFTTTSetup=Configuració del mòdul IFTTT
-IFTTT_SERVICE_KEY=Clau de servei IFTTT
-IFTTT_DOLIBARR_ENDPOINT_SECUREKEY=Clau de seguretat per assegurar l’URL del punt final utilitzat per IFTTT per enviar missatges al vostre Dolibarr.
-IFTTTDesc=Aquest mòdul està dissenyat per activar esdeveniments en IFTTT i / o per executar alguna acció en desencadenants externs IFTTT.
-UrlForIFTTT=Punt final d’URL per a IFTTT
-YouWillFindItOnYourIFTTTAccount=El trobareu al vostre compte IFTTT
 EndPointFor=Punt final per %s: %s
 DeleteEmailCollector=Suprimeix el recollidor de correu electrònic
 ConfirmDeleteEmailCollector=Esteu segur que voleu suprimir aquest recollidor de correu electrònic?
-RecipientEmailsWillBeReplacedWithThisValue=Recipient emails will be always replaced with this value
-AtLeastOneDefaultBankAccountMandatory=At least 1 default bank account must be defined
+RecipientEmailsWillBeReplacedWithThisValue=Els correus electrònics destinataris sempre se substituiran per aquest valor
+AtLeastOneDefaultBankAccountMandatory=Cal definir com a mínim un compte bancari per defecte
+RESTRICT_API_ON_IP=Permet les API disponibles només a alguna IP de l&#39;amfitrió (no s&#39;admet el caràcter comodí, utilitzeu espai entre valors). Buit significa que tots els amfitrions poden utilitzar les API disponibles.
+RESTRICT_ON_IP=Permet l&#39;accés només a alguna IP de l&#39;amfitrió (no es permet comodí, utilitzeu espai entre valors). Buit significa que hi poden accedir tots els amfitrions.
+BaseOnSabeDavVersion=Basat en la versió de la biblioteca SabreDAV
+NotAPublicIp=No és una IP pública
+MakeAnonymousPing=Creeu un ping &quot;+1&quot; anònim al servidor de bases Dolibarr (fet una vegada només després de la instal·lació) per permetre que la fundació compti el nombre d&#39;instal·lació de Dolibarr.
diff --git a/htdocs/langs/ca_ES/banks.lang b/htdocs/langs/ca_ES/banks.lang
index 8e221c286d0..5b9c75ff79a 100644
--- a/htdocs/langs/ca_ES/banks.lang
+++ b/htdocs/langs/ca_ES/banks.lang
@@ -73,6 +73,7 @@ BankTransaction=Registre bancari
 ListTransactions=Llistat registres
 ListTransactionsByCategory=Llistat registres/categoria
 TransactionsToConciliate=Registres a conciliar
+TransactionsToConciliateShort=Per conciliar
 Conciliable=Conciliable
 Conciliate=Conciliar
 Conciliation=Conciliació
@@ -116,6 +117,7 @@ DeleteCheckReceipt=Vols suprimir aquesta remesa de xec?
 ConfirmDeleteCheckReceipt=Vols eliminar aquesta remesa de xec?
 BankChecks=Xec bancari
 BankChecksToReceipt=Xecs en espera de l'ingrés
+BankChecksToReceiptShort=Xecs en espera de l'ingrés
 ShowCheckReceipt=Mostra la remesa d'ingrés de xec
 NumberOfCheques=Nº de xec
 DeleteTransaction=Eliminar registre
diff --git a/htdocs/langs/ca_ES/bills.lang b/htdocs/langs/ca_ES/bills.lang
index 3f4cf8efab3..f242447468d 100644
--- a/htdocs/langs/ca_ES/bills.lang
+++ b/htdocs/langs/ca_ES/bills.lang
@@ -95,7 +95,7 @@ PaymentHigherThanReminderToPay=Pagament superior a la resta a pagar
 HelpPaymentHigherThanReminderToPay=Atenció, l'import del pagament d'una o més factures és superior a la resta a pagar.<br>Corregiu la entrada, en cas contrari, confirmeu i pensi en crear un abonament d'allò percebut en excés per cada factura sobrepagada.
 HelpPaymentHigherThanReminderToPaySupplier=Atenció, l'import del pagament d'una o més factures és superior a la resta a pagar.<br>Corregiu la entrada, en cas contrari, confirmeu i pensi en crear un abonament d'allò percebut en excés per cada factura sobrepagada.
 ClassifyPaid=Classificar 'Pagat'
-ClassifyUnPaid=Classify 'Unpaid'
+ClassifyUnPaid=Classifica &quot;sense pagar&quot;
 ClassifyPaidPartially=Classificar 'Pagat parcialment'
 ClassifyCanceled=Classificar 'Abandonat'
 ClassifyClosed=Classificar 'Tancat'
@@ -142,7 +142,7 @@ BillShortStatusStarted=Començada
 BillShortStatusNotPaid=Pendent de cobrament
 BillShortStatusNotRefunded=No reemborsat
 BillShortStatusClosedUnpaid=Tancada
-BillShortStatusClosedPaidPartially=Pagada
+BillShortStatusClosedPaidPartially=Pagada (parcial)
 PaymentStatusToValidShort=A validar
 ErrorVATIntraNotConfigured=NIF intracomunitari encara no definit
 ErrorNoPaiementModeConfigured=No s'ha definit la forma de pagament per defecte. Ves a la configuració del mòdul Factures per corregir-ho.
@@ -215,20 +215,20 @@ ShowInvoiceReplace=Veure factura rectificativa
 ShowInvoiceAvoir=Veure abonament
 ShowInvoiceDeposit=Mostrar factura d'acompte
 ShowInvoiceSituation=Mostra la factura de situació
-UseSituationInvoices=Allow situation invoice
-UseSituationInvoicesCreditNote=Allow situation invoice credit note
-Retainedwarranty=Retained warranty
-RetainedwarrantyDefaultPercent=Retained warranty default percent
-ToPayOn=To pay on %s
-toPayOn=to pay on %s
-RetainedWarranty=Retained Warranty
-PaymentConditionsShortRetainedWarranty=Retained warranty payment terms
-DefaultPaymentConditionsRetainedWarranty=Default retained warranty payment terms
-setPaymentConditionsShortRetainedWarranty=Set retained warranty payment terms
-setretainedwarranty=Set retained warranty
-setretainedwarrantyDateLimit=Set retained warranty date limit
-RetainedWarrantyDateLimit=Retained warranty date limit
-RetainedWarrantyNeed100Percent=The situation invoice need to be at 100%% progress to be displayed on PDF
+UseSituationInvoices=Permetre la factura de la situació
+UseSituationInvoicesCreditNote=Permet la nota de crèdit de la factura de situació
+Retainedwarranty=Garantia retinguda
+RetainedwarrantyDefaultPercent=Percentatge de garantia retingut per defecte
+ToPayOn=Per pagar %s
+toPayOn=a pagar %s
+RetainedWarranty=Garantia retinguda
+PaymentConditionsShortRetainedWarranty=Condicions de pagament de la garantia retinguda
+DefaultPaymentConditionsRetainedWarranty=Condicions de pagament per defecte de la garantia retinguda
+setPaymentConditionsShortRetainedWarranty=Definiu els termes de pagament de la garantia retinguda
+setretainedwarranty=Estableix la garantia retinguda
+setretainedwarrantyDateLimit=Estableix el límit de data de garantia conservada
+RetainedWarrantyDateLimit=Data límit de garantia retinguda
+RetainedWarrantyNeed100Percent=La factura de situació ha d’estar al progrés 100%% per mostrar-se en PDF
 ShowPayment=Veure pagament
 AlreadyPaid=Ja pagat
 AlreadyPaidBack=Ja reemborsat
diff --git a/htdocs/langs/ca_ES/cashdesk.lang b/htdocs/langs/ca_ES/cashdesk.lang
index 1b0a6e3a957..b975dee0268 100644
--- a/htdocs/langs/ca_ES/cashdesk.lang
+++ b/htdocs/langs/ca_ES/cashdesk.lang
@@ -62,6 +62,7 @@ TicketVatGrouped=IVA per grups als tiquets
 AutoPrintTickets=Imprimeix automàticament els tiquets
 EnableBarOrRestaurantFeatures=Habiliteu funcions per a bar o restaurant
 ConfirmDeletionOfThisPOSSale=Confirmeu la supressió de la venda actual?
+ConfirmDiscardOfThisPOSSale=Voleu descartar aquesta venda actual?
 History=Històric
 ValidateAndClose=Valida i tanca
 Terminal=Terminal
@@ -69,3 +70,8 @@ NumberOfTerminals=Nombre de terminals
 TerminalSelect=Selecciona el terminal que vols utilitzar:
 POSTicket=Tiquet TPV
 BasicPhoneLayout=Utilitzeu el disseny bàsic dels telèfons
+SetupOfTerminalNotComplete=La configuració del terminal %s no està completa
+DirectPayment=Pagament directe
+DirectPaymentButton=Botó de pagament directe en efectiu
+InvoiceIsAlreadyValidated=La factura ja està validada
+NoLinesToBill=No hi ha línies a facturar
diff --git a/htdocs/langs/ca_ES/companies.lang b/htdocs/langs/ca_ES/companies.lang
index 90fe74a1d3b..88b8307a4bf 100644
--- a/htdocs/langs/ca_ES/companies.lang
+++ b/htdocs/langs/ca_ES/companies.lang
@@ -54,6 +54,7 @@ Firstname=Nom
 PostOrFunction=Càrrec laboral
 UserTitle=Títol cortesia
 NatureOfThirdParty=Naturalesa del tercer
+NatureOfContact=Natura del contacte
 Address=Adreça
 State=Província
 StateShort=Estat
@@ -364,7 +365,7 @@ PL_HIGH=Alt
 TE_UNKNOWN=-
 TE_STARTUP=Petita
 TE_GROUP=Gran empresa
-TE_MEDIUM=PYME
+TE_MEDIUM=PIME
 TE_ADMIN=Administració
 TE_SMALL=TPE
 TE_RETAIL=Minorista
diff --git a/htdocs/langs/ca_ES/contracts.lang b/htdocs/langs/ca_ES/contracts.lang
index 133a45d08fb..16b32e18746 100644
--- a/htdocs/langs/ca_ES/contracts.lang
+++ b/htdocs/langs/ca_ES/contracts.lang
@@ -51,6 +51,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
+BoardNotActivatedServicesShort=Serveis per activar
 LastContracts=Últims %s contractes
 LastModifiedServices=Últims %s serveis modificats
 ContractStartDate=Data inici
@@ -65,7 +66,9 @@ DateEndReal=Data real finalització del servei
 DateEndRealShort=Data real finalització
 CloseService=Finalitzar servei
 BoardRunningServices=Serveis en execució
+BoardRunningServicesShort=Serveis en execució
 BoardExpiredServices=Els serveis han caducat
+BoardExpiredServicesShort=Els serveis han caducat
 ServiceStatus=Estat del servei
 DraftContracts=Contractes esborrany
 CloseRefusedBecauseOneServiceActive=El contracte no es pot tancar ja que almenys hi ha un servei obert
diff --git a/htdocs/langs/ca_ES/errors.lang b/htdocs/langs/ca_ES/errors.lang
index 51c3ff9926e..9e24aeae913 100644
--- a/htdocs/langs/ca_ES/errors.lang
+++ b/htdocs/langs/ca_ES/errors.lang
@@ -90,7 +90,7 @@ ErrorSpecialCharNotAllowedForField=Els caràcters especials no són admesos pel
 ErrorNumRefModel=Hi ha una referència a la base de dades (%s) i és incompatible amb aquesta numeració. Elimineu la línia o renomeneu la referència per activar aquest mòdul.
 ErrorQtyTooLowForThisSupplier=Quantitat massa baixa per aquest proveïdor o sense un preu definit en aquest producte per aquest proveïdor
 ErrorOrdersNotCreatedQtyTooLow=Algunes ordres no s'han creat a causa de quantitats massa baixes
-ErrorModuleSetupNotComplete=Setup of module %s looks to be uncomplete. Go on Home - Setup - Modules to complete.
+ErrorModuleSetupNotComplete=La configuració del mòdul %s sembla incompleta. Vés a Inici: Configuració - Mòduls per completar.
 ErrorBadMask=Error en la màscara
 ErrorBadMaskFailedToLocatePosOfSequence=Error, sense número de seqüència en la màscara
 ErrorBadMaskBadRazMonth=Error, valor de tornada a 0 incorrecte
@@ -218,8 +218,9 @@ ErrorVariableKeyForContentMustBeSet=Error, s'ha d'establir la constant amb el no
 ErrorURLMustStartWithHttp=L'URL %s ha de començar amb http: // o https: //
 ErrorNewRefIsAlreadyUsed=Error, la nova referència ja s’està utilitzant
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Error, l’eliminació del pagament vinculat a una factura tancada no és possible.
+ErrorSearchCriteriaTooSmall=Criteris de cerca massa petits.
 # Warnings
-WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
+WarningParamUploadMaxFileSizeHigherThanPostMaxSize=El paràmetre PHP upload_max_filesize (%s) és superior al paràmetre PHP post_max_size (%s). No es tracta d’una configuració consistent.
 WarningPasswordSetWithNoAccount=S'ha indicat una contrasenya per aquest soci. En canvi, no s'ha creat cap compte d'usuari, de manera que aquesta contrasenya s'ha desat però no pot ser utilitzada per entrar a Dolibarr. Es pot utilitzar per un mòdul/interfície extern, però si no cal definir cap usuari i contrasenya per un soci, pots deshabilitar la opció "Gestiona l'entrada per tots els socis" des de la configuració del mòdul Socis. Si necessites gestionar una entrada sense contrasenya, pots mantenir aquest camp buit i permetre aquest avís. Nota: El correu electrònic es pot utilitzar per entrar si el soci està enllaçat a un usuarí
 WarningMandatorySetupNotComplete=Feu clic aquí per configurar els paràmetres obligatoris
 WarningEnableYourModulesApplications=Feu clic aquí per activar els vostres mòduls i aplicacions
diff --git a/htdocs/langs/ca_ES/main.lang b/htdocs/langs/ca_ES/main.lang
index d4c5c98696c..b92e5d810f0 100644
--- a/htdocs/langs/ca_ES/main.lang
+++ b/htdocs/langs/ca_ES/main.lang
@@ -28,6 +28,7 @@ NoTemplateDefined=No hi ha cap plantilla disponible per a aquest tipus de correu
 AvailableVariables=Variables de substitució disponibles
 NoTranslation=Sense traducció
 Translation=Traducció
+EmptySearchString=Introduïu una cadena de cerca no buida
 NoRecordFound=No s'han trobat registres
 NoRecordDeleted=Sense registres eliminats
 NotEnoughDataYet=Dades insuficients
@@ -445,7 +446,7 @@ ContactsAddressesForCompany=Contactes/adreces d'aquest tercer
 AddressesForCompany=Adreces d'aquest tercer
 ActionsOnCompany=Esdeveniments per a aquest tercer
 ActionsOnContact=Esdeveniments per a aquest contacte / adreça
-ActionsOnContract=Events for this contract
+ActionsOnContract=Esdeveniments per a aquest contracte
 ActionsOnMember=Esdeveniments d'aquest soci
 ActionsOnProduct=Esdeveniments sobre aquest producte
 NActionsLate=%s en retard
@@ -704,6 +705,7 @@ DateOfSignature=Data de signatura
 HidePassword=Mostra comanda amb contrasenya oculta
 UnHidePassword=Mostra comanda amb contrasenya a la vista
 Root=Arrel
+RootOfMedias=Arrel dels mitjans públics (/medias)
 Informations=Informació
 Page=Pàgina
 Notes=Notes
@@ -760,7 +762,7 @@ LinkToSupplierProposal=Enllaç al pressupost del venedor
 LinkToSupplierInvoice=Enllaç a la factura del venedor
 LinkToContract=Enllaça a contracte
 LinkToIntervention=Enllaça a intervenció
-LinkToTicket=Link to ticket
+LinkToTicket=Enllaç al tiquet
 CreateDraft=Crea esborrany
 SetToDraft=Tornar a redactar
 ClickToEdit=Clic per a editar
@@ -981,3 +983,10 @@ PaymentInformation=Informació sobre el pagament
 ValidFrom=Vàlid des de
 ValidUntil=Vàlid fins
 NoRecordedUsers=No hi ha usuaris
+ToClose=Per tancar
+ToProcess=A processar
+ToApprove=Per aprovar
+GlobalOpenedElemView=Vista global
+NoArticlesFoundForTheKeyword=No s&#39;ha trobat cap article per a la paraula clau &quot; <strong>%s</strong> &quot;
+NoArticlesFoundForTheCategory=No s&#39;ha trobat cap article per a la categoria
+ToAcceptRefuse=Per acceptar | refusar
diff --git a/htdocs/langs/ca_ES/members.lang b/htdocs/langs/ca_ES/members.lang
index 7b0071dd54c..a985f42d579 100644
--- a/htdocs/langs/ca_ES/members.lang
+++ b/htdocs/langs/ca_ES/members.lang
@@ -29,6 +29,7 @@ MenuMembersUpToDate=Socis al dia
 MenuMembersNotUpToDate=Socis no al dia
 MenuMembersResiliated=Socis donats de baixa
 MembersWithSubscriptionToReceive=Socis amb afiliació per rebre
+MembersWithSubscriptionToReceiveShort=Subscripcions per rebre
 DateSubscription=Data afiliació
 DateEndSubscription=Data final d'afiliació
 EndSubscription=Final d'afiliació
diff --git a/htdocs/langs/ca_ES/products.lang b/htdocs/langs/ca_ES/products.lang
index cbdf58c6729..8676207cdec 100644
--- a/htdocs/langs/ca_ES/products.lang
+++ b/htdocs/langs/ca_ES/products.lang
@@ -2,7 +2,7 @@
 ProductRef=Ref. producte
 ProductLabel=Etiqueta producte
 ProductLabelTranslated=Etiqueta de producte traduïda
-ProductDescription=Product description
+ProductDescription=Descripció del producte
 ProductDescriptionTranslated=Descripció de producte traduïda
 ProductNoteTranslated=Nota de producte traduïda
 ProductServiceCard=Fitxa producte/servei
diff --git a/htdocs/langs/ca_ES/projects.lang b/htdocs/langs/ca_ES/projects.lang
index 5518dd13758..9add15f0558 100644
--- a/htdocs/langs/ca_ES/projects.lang
+++ b/htdocs/langs/ca_ES/projects.lang
@@ -76,7 +76,13 @@ MyProjects=Els meus projectes
 MyProjectsArea=Àrea dels meus projectes
 DurationEffective=Durada efectiva
 ProgressDeclared=Progressió declarada
+TaskProgressSummary=Progrés de la tasca
+CurentlyOpenedTasks=Tasques obertes de forma corrent
+TheReportedProgressIsLessThanTheCalculatedProgressionByX=El progrés declarat és menys %s que la progressió calculada
+TheReportedProgressIsMoreThanTheCalculatedProgressionByX=El progrés declarat és més %s que la progressió calculada
 ProgressCalculated=Progressió calculada
+WhichIamLinkedTo=al qual estic vinculat
+WhichIamLinkedToProject=que estic vinculat al projecte
 Time=Temps
 ListOfTasks=Llistat de tasques
 GoToListOfTimeConsumed=Ves al llistat de temps consumit
diff --git a/htdocs/langs/ca_ES/stripe.lang b/htdocs/langs/ca_ES/stripe.lang
index 1592435e8e5..600cb1d207e 100644
--- a/htdocs/langs/ca_ES/stripe.lang
+++ b/htdocs/langs/ca_ES/stripe.lang
@@ -65,5 +65,5 @@ StripeUserAccountForActions=Compte d'usuari per utilitzar en alguns e-mails de n
 StripePayoutList=Llista de pagaments de Stripe
 ToOfferALinkForTestWebhook=Enllaç a la configuració de Stripe WebHook per trucar a l’IPN (mode de prova)
 ToOfferALinkForLiveWebhook=Enllaç a la configuració de Stripe WebHook per trucar a l’IPN (mode en directe)
-PaymentWillBeRecordedForNextPeriod=Payment will be recorded for the next period.
-ClickHereToTryAgain=<a href="%s">Click here to try again...</a>
+PaymentWillBeRecordedForNextPeriod=El pagament es registrarà per al període següent.
+ClickHereToTryAgain=<a href="%s">Feu clic aquí per tornar-ho a provar ...</a>
diff --git a/htdocs/langs/ca_ES/website.lang b/htdocs/langs/ca_ES/website.lang
index 4c62bea2365..3e3875a2aa9 100644
--- a/htdocs/langs/ca_ES/website.lang
+++ b/htdocs/langs/ca_ES/website.lang
@@ -2,7 +2,7 @@
 Shortname=Codi
 WebsiteSetupDesc=Creeu aquí els llocs web que voleu utilitzar. A continuació, vagi a menú de llocs web per editar-los.
 DeleteWebsite=Elimina la pàgina web
-ConfirmDeleteWebsite=Està segur que vol eliminar aquest lloc web? Totes les seves pàgines i continguts també seran eliminats.
+ConfirmDeleteWebsite=Esteu segur que voleu suprimir aquest lloc web? Totes les seves pàgines i contingut també se suprimiran. Els fitxers penjats (com al directori de suports, el mòdul ECM, ...) romandran.
 WEBSITE_TYPE_CONTAINER=Tipus de pàgina/contenidor
 WEBSITE_PAGE_EXAMPLE=Pàgina web per utilitzar com a exemple
 WEBSITE_PAGENAME=Nom/alies de pàgina
@@ -14,6 +14,9 @@ WEBSITE_JS_INLINE=Fitxer amb contingut Javascript (comú a totes les pàgines)
 WEBSITE_HTML_HEADER=Afegit a la part inferior de l'encapçalament HTML (comú a totes les pàgines)
 WEBSITE_ROBOT=Fitxer per robots (robots.txt)
 WEBSITE_HTACCESS=Fitxer .htaccess del lloc web
+WEBSITE_MANIFEST_JSON=Arxiu del lloc web manifest.json
+WEBSITE_README=Fitxer README.md
+EnterHereLicenseInformation=Introduïu aquí dades de meta o informació de llicència per enviar un fitxer README.md. si distribuïu el vostre lloc web com a plantilla, el fitxer s’inclourà al paquet temptador.
 HtmlHeaderPage=Encapçalament HTML (específic sols per aquesta pàgina)
 PageNameAliasHelp=Nom o àlies de la pàgina. <br> Aquest àlies també s'utilitza per construir un URL de SEO quan el lloc web es llanci des d'un Host Virtual d'un servidor web (com Apache, Nginx...). Utilitzeu el botó "<strong>%s</strong>" per editar aquest àlies.
 EditTheWebSiteForACommonHeader=Nota: si voleu definir un encapçalament personalitzat per a totes les pàgines, editeu el encapçalament al nivell del lloc en comptes de la pàgina/contenidor.
@@ -41,6 +44,7 @@ RealURL=URL real
 ViewWebsiteInProduction=Mostra la pàgina web utilitzant les URLs d'inici
 SetHereVirtualHost=<u> Ús amb Apache / NGinx / ...</u> <br> Si podeu crear, en el vostre servidor web (Apache, Nginx, ...), un host virtual dedicat amb PHP habilitat i un directori Root a <br> <strong> %s </strong> <br> i, a continuació, estableixi el nom de l'amfitrió virtual que heu creat a les propietats del lloc web, de manera que la previsualització es pot fer també usant aquest accés dedicat al servidor web en lloc del Dolibarr intern servidor.
 YouCanAlsoTestWithPHPS=<u> Utilitzeu-lo amb el servidor incrustat de PHP </u> <br> Al desenvolupar l'entorn, és possible que preferiu provar el lloc amb el servidor web incrustat de PHP (requereix PHP 5.5) executant<br> <strong> php -S 0.0. 0.0: 8080 -t %s </strong>
+YouCanAlsoDeployToAnotherWHP=<u>Executeu el vostre lloc web amb un altre proveïdor de hosting de Dolibarr</u> <br> Si no teniu disponible un servidor web com Apache o NGinx a Internet, podeu exportar i importar el vostre lloc web a una altra instància de Dolibarr proporcionada per un altre proveïdor d&#39;allotjament de Dolibarr que ofereixi una integració completa amb el mòdul del lloc web. Podeu trobar una llista d&#39;alguns proveïdors d&#39;allotjament Dolibarr a <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
 CheckVirtualHostPerms=Comproveu també que l'amfitrió virtual té permisos <strong> %s </strong> en fitxers a <strong> %s </strong>
 ReadPerm=Llegit
 WritePerm=Escriu
@@ -75,7 +79,8 @@ AddWebsiteAccount=Crear un compte de lloc web
 BackToListOfThirdParty=Tornar a la llista de Tercers
 DisableSiteFirst=Deshabilita primer el lloc web
 MyContainerTitle=Títol del meu lloc web
-AnotherContainer=Un altre contenidor
+AnotherContainer=Així s’inclou contingut d’una altra pàgina / contenidor (pot ser que tingueu un error aquí si activeu el codi dinàmic perquè pot no existir el subconjunt incrustat)
+SorryWebsiteIsCurrentlyOffLine=Ho sentim, actualment aquest lloc web està fora de línia. Per favor com a més endavant ...
 WEBSITE_USE_WEBSITE_ACCOUNTS=Activa la taula del compte del lloc web
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Activeu la taula per emmagatzemar comptes del lloc web (login/contrasenya) per a cada lloc web de tercers
 YouMustDefineTheHomePage=Primer heu de definir la pàgina d'inici predeterminada
@@ -89,7 +94,8 @@ AliasPageAlreadyExists=Alias de pàgina <strong>%s</strong> ja existeixen
 CorporateHomePage=Pàgina d'inici corporativa
 EmptyPage=Pàgina buida
 ExternalURLMustStartWithHttp=L'URL externa ha de començar amb http:// o https://
-ZipOfWebsitePackageToImport=Fitxer ZIP del paquet del lloc web
+ZipOfWebsitePackageToImport=Carregueu el fitxer Zip del paquet de plantilles del lloc web
+ZipOfWebsitePackageToLoad=o trieu un paquet de plantilles de lloc web incrustat disponible
 ShowSubcontainers=Inclou contingut dinàmic
 InternalURLOfPage=URL interna de la pàgina
 ThisPageIsTranslationOf=Aquesta pàgina/contenidor és una traducció de
@@ -101,5 +107,10 @@ NotAllowedToAddDynamicContent=No teniu permís per afegir o editar contingut din
 ReplaceWebsiteContent=Cerqueu o substitueixi el contingut del lloc web
 DeleteAlsoJs=Voleu suprimir també tots els fitxers javascript específics d'aquest lloc web?
 DeleteAlsoMedias=Voleu suprimir també tots els fitxers de mitjans específics d’aquest lloc web?
-# Export
 MyWebsitePages=Les meves pàgines web
+SearchReplaceInto=Cercar | Substituïu-lo a
+ReplaceString=Cadena nova
+CSSContentTooltipHelp=Introduïu aquí contingut CSS. Per evitar qualsevol conflicte amb el CSS de l’aplicació, assegureu-vos que preposeu tota declaració amb la classe .bodywebsite. Per exemple: <br><br> #mycssselector, input.myclass: hover {...} <br> ha de ser <br> .bodywebsite #mycssselector, .bodywebsite input.myclass: hover {...} <br><br> Nota: Si teniu un fitxer gran sense aquest prefix, podeu fer servir &#39;lessc&#39; per convertir-lo per afegir el prefix .bodywebs site arreu.
+LinkAndScriptsHereAreNotLoadedInEditor=Avís: aquest contingut només es produeix quan s&#39;accedeix al lloc des d&#39;un servidor. No s&#39;utilitza en mode Edit, de manera que si necessiteu carregar fitxers Javascript també en mode d&#39;edició, només heu d&#39;afegir la vostra etiqueta &#39;script src = ...&#39; a la pàgina.
+Dynamiccontent=Exemple d’una pàgina amb contingut dinàmic
+ImportSite=Importa la plantilla del lloc web
diff --git a/htdocs/langs/ca_ES/withdrawals.lang b/htdocs/langs/ca_ES/withdrawals.lang
index 42a67f6c4ab..be382f5c4e6 100644
--- a/htdocs/langs/ca_ES/withdrawals.lang
+++ b/htdocs/langs/ca_ES/withdrawals.lang
@@ -76,8 +76,8 @@ WithdrawalFile=Arxiu de la domiciliació
 SetToStatusSent=Classificar com "Arxiu enviat"
 ThisWillAlsoAddPaymentOnInvoice=Això també registrarà els pagaments a les factures i les classificarà com a "Pagades" quan el que resti per pagar sigui nul
 StatisticsByLineStatus=Estadístiques per estats de línies
-RUM=Unique Mandate Reference (UMR)
-DateRUM=Mandate signature date
+RUM=Referència de mandat únic (UMR)
+DateRUM=Data de signatura del mandat
 RUMLong=Referència de mandat única (UMR)
 RUMWillBeGenerated=Si està buit, es generarà una UMR (Referència de mandat únic) una vegada que es guardi la informació del compte bancari.
 WithdrawMode=Modo de domiciliació bancària (FRST o RECUR)
diff --git a/htdocs/langs/cs_CZ/admin.lang b/htdocs/langs/cs_CZ/admin.lang
index f9d993354d7..77712c20c0f 100644
--- a/htdocs/langs/cs_CZ/admin.lang
+++ b/htdocs/langs/cs_CZ/admin.lang
@@ -400,6 +400,7 @@ OldVATRates=Staré Sazba DPH
 NewVATRates=Nová sazba DPH
 PriceBaseTypeToChange=Změňte ceny podle základní referenční hodnoty definované na
 MassConvert=Spusťte hromadnou konverzi
+PriceFormatInCurrentLanguage=Price Format In Current Language
 String=Řetěz
 TextLong=Dlouhý text
 HtmlText=Html text
@@ -431,7 +432,7 @@ ExtrafieldParamHelpradio=Seznam hodnot musí být řádky s formátovým klíče
 ExtrafieldParamHelpsellist=Seznam hodnot pochází z tabulky <br> Syntaxe: table_name: label_field: id_field :: filter <br> Příklad: c_typent: libelle: id :: filter <br> <br> - idfilter je nutně primární int klíč <br> - filtr může být jednoduchý test = 1) pro zobrazení pouze aktivní hodnoty <br> Můžete také použít $ ID $ ve filtru, který je aktuálním id aktuálního objektu <br> Chcete-li provést SELECT ve filtru, použijte $ SEL $ <br>, pokud chcete filtrovat na extrafields použít syntaxi extra.fieldcode = ... (kde kód pole je kód extrafield) <br> <br> Aby byl seznam v závislosti na jiném seznamu doplňkových atributů: <br> c_typent: libelle: id: options_ <i> parent_list_code </i> | parent_column: filter <br> <br> Aby bylo možné mít seznam v závislosti na jiném seznamu: <br> c_typent: libelle: id: <i> parent_list_code </i> | parent_column: filtr
 ExtrafieldParamHelpchkbxlst=Seznam hodnot pochází z tabulky <br> Syntaxe: table_name: label_field: id_field :: filter <br> Příklad: c_typent: libelle: id :: filter <br> <br> filtr může být jednoduchý test (např. Aktivní = 1) pro zobrazení pouze aktivní hodnoty <br> You může také použít $ ID $ ve filtru, který je aktuální id aktuálního objektu <br> Chcete-li provést SELECT ve filtru, použijte $ SEL $ <br>, pokud chcete filtrovat na extrafields použijte syntaxi extra.fieldcode = ... (kde kód pole je code of extrafield) <br> <br> Aby byl seznam v závislosti na jiném seznamu doplňkových atributů: <br> c_typent: libelle: id: options_ <i> parent_list_code </i> | parent_column: filter <br> <br> Aby byl seznam v závislosti na jiném seznamu: <br> c_typent: libelle: id: <i> parent_list_code </i> | nadřazený sloupec: filtr
 ExtrafieldParamHelplink=Parametry musí být ObjectName: Classpath <br> Syntaxe: Název_objektu: Classpath <br> Příklady: <br> Societe: societe / class / societe.class.php <br> Kontakt: contact / class / contact.class.php
-ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default)<br>Set this to 2 for a collapsing separator (collapsed by default)
+ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Knihovna používaná pro generování PDF
 LocalTaxDesc=Některé země mohou uplatnit dvě nebo tři daně na každé čáře faktur. Pokud tomu tak je, vyberte typ druhého a třetího daně a jeho sazbu. Možné typy jsou: <br> 1: místní daň se vztahuje na produkty a služby bez DPH (platí se na základě daně bez daně) <br> 2: místní daň se vztahuje na produkty a služby, včetně DPH (0%) 3x342fccfda19b 3: místní daň se vztahuje na produkty bez DPH (místní taxa se vypočítává z částky bez daně) <br> 4: místní daň se vztahuje na produkty včetně DPH (místní taxa se vypočítává z částky + hlavní daň) <br> 5: Místní daň platí pro služby bez DPH z částky bez daně) <br> 6: Místní daň platí za služby včetně DPH (místní taxa se vypočítává z částky + daně)
 SMS=SMS
@@ -1695,7 +1696,7 @@ SuppliersInvoiceNumberingModel=Číslovací modely faktur dodavatelů
 IfSetToYesDontForgetPermission=Je-li nastavena na ano, nezapomeňte uvést oprávnění skupinám nebo uživatelům povoleným pro druhé schválení
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=Nastavení modulu GeoIP Maxmind
-PathToGeoIPMaxmindCountryDataFile=Cesta k souboru obsahující Maxmind IP pro země překladu. <br> Příklady: <br> / Usr / local / share / GeoIP / GeoIP.dat <br> / Usr / share / GeoIP / GeoIP.dat
+PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoLite2-Country.mmdb
 NoteOnPathLocation=Všimněte si, že Vaše IP do souboru záznamu země musí být uvnitř adresáře si můžete přečíst PHP (PHP open_basedir Zkontrolujte nastavení a oprávnění souborového systému).
 YouCanDownloadFreeDatFileTo=Zde si můžete stáhnout <b>zdarma demo verzi</b> země GeoIP Maxmind soubor na %s.
 YouCanDownloadAdvancedDatFileTo=Můžete si také stáhnout <b>úplnější verzi s aktualizací,</b> ze země GeoIP Maxmind soubor na %s.
@@ -1926,14 +1927,13 @@ SmallerThan=Menší než
 LargerThan=Větší než
 IfTrackingIDFoundEventWillBeLinked=Všimněte si, že je-li ID ID nalezeno v příchozím e-mailu, bude událost automaticky propojena s příslušnými objekty.
 WithGMailYouCanCreateADedicatedPassword=Pokud je účet služby GMail povolen, je-li povoleno ověření dvou kroků, je doporučeno vytvořit vyhrazené druhé heslo pro aplikaci namísto použití hesla hesla z účtu https://myaccount.google.com/.
-IFTTTSetup=Nastavení modulu IFTTT
-IFTTT_SERVICE_KEY=Servisní klíč IFTTT
-IFTTT_DOLIBARR_ENDPOINT_SECUREKEY=Bezpečnostní klíč pro zabezpečení adresy URL koncového bodu, kterou používá IFTTT k odesílání zpráv do Dolibarr.
-IFTTTDesc=Tento modul je určen pro spouštění událostí na IFTTT a / nebo pro provádění některých akcí na externích spouštěčích IFTTT.
-UrlForIFTTT=URL koncový bod pro IFTTT
-YouWillFindItOnYourIFTTTAccount=Najdete ho na svém účtu IFTTT
 EndPointFor=End point for %s : %s
 DeleteEmailCollector=Delete email collector
 ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
 RecipientEmailsWillBeReplacedWithThisValue=Recipient emails will be always replaced with this value
 AtLeastOneDefaultBankAccountMandatory=At least 1 default bank account must be defined
+RESTRICT_API_ON_IP=Allow available APIs to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can use the available APIs.
+RESTRICT_ON_IP=Allow access to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can access.
+BaseOnSabeDavVersion=Based on the library SabreDAV version
+NotAPublicIp=Not a public IP
+MakeAnonymousPing=Make an anonymous Ping '+1' to the Dolibarr foundation server (done 1 time only after installation) to allow the foundation to count the number of Dolibarr installation.
diff --git a/htdocs/langs/cs_CZ/banks.lang b/htdocs/langs/cs_CZ/banks.lang
index 1515e2abee5..9bf351f49bf 100644
--- a/htdocs/langs/cs_CZ/banks.lang
+++ b/htdocs/langs/cs_CZ/banks.lang
@@ -73,6 +73,7 @@ BankTransaction=Bankovní transakce
 ListTransactions=Seznamy záznamů
 ListTransactionsByCategory=Seznam položek/kategorií
 TransactionsToConciliate=Položky ke sladění
+TransactionsToConciliateShort=To reconcile
 Conciliable=Může být porovnáno
 Conciliate=Porovnat
 Conciliation=Porovnání
@@ -116,6 +117,7 @@ DeleteCheckReceipt=Chcete smazat potvrzení o kontrole?
 ConfirmDeleteCheckReceipt=Opravdu chcete tuto potvrzení o potvrzení vymazat?
 BankChecks=Bankovní šeky
 BankChecksToReceipt=Kontroly čekající na vklad
+BankChecksToReceiptShort=Kontroly čekající na vklad
 ShowCheckReceipt=Zobrazit příjmový vklad šeku
 NumberOfCheques=Počet kontrol
 DeleteTransaction=Smazat záznam
diff --git a/htdocs/langs/cs_CZ/cashdesk.lang b/htdocs/langs/cs_CZ/cashdesk.lang
index ff93f2d6563..5de3a66db14 100644
--- a/htdocs/langs/cs_CZ/cashdesk.lang
+++ b/htdocs/langs/cs_CZ/cashdesk.lang
@@ -62,6 +62,7 @@ TicketVatGrouped=Skupinová DPH dle sazeb na lístcích
 AutoPrintTickets=Automaticky tisknout vstupenky
 EnableBarOrRestaurantFeatures=Povolit funkce pro Bar nebo Restaurace
 ConfirmDeletionOfThisPOSSale=Potvrzujete, že jste tento prodej zrušili?
+ConfirmDiscardOfThisPOSSale=Do you want to discard this current sale ?
 History=Historie
 ValidateAndClose=Ověřte a zavřete
 Terminal=Terminál
@@ -69,3 +70,8 @@ NumberOfTerminals=Počet terminálů
 TerminalSelect=Vyberte terminál, který chcete použít:
 POSTicket=POS Ticket
 BasicPhoneLayout=Use basic layout for phones
+SetupOfTerminalNotComplete=Setup of terminal %s is not complete
+DirectPayment=Direct payment
+DirectPaymentButton=Direct cash payment button
+InvoiceIsAlreadyValidated=Invoice is already validated
+NoLinesToBill=No lines to bill
diff --git a/htdocs/langs/cs_CZ/companies.lang b/htdocs/langs/cs_CZ/companies.lang
index 01ac74f4df7..24b5436687c 100644
--- a/htdocs/langs/cs_CZ/companies.lang
+++ b/htdocs/langs/cs_CZ/companies.lang
@@ -54,6 +54,7 @@ Firstname=Křestní jméno
 PostOrFunction=Pracovní pozice
 UserTitle=Titul
 NatureOfThirdParty=Povaha subjektu
+NatureOfContact=Nature of Contact
 Address=Adresa
 State=Stát/Okres
 StateShort=Stát
diff --git a/htdocs/langs/cs_CZ/contracts.lang b/htdocs/langs/cs_CZ/contracts.lang
index c7424739a01..5260114a9e0 100644
--- a/htdocs/langs/cs_CZ/contracts.lang
+++ b/htdocs/langs/cs_CZ/contracts.lang
@@ -51,6 +51,7 @@ ListOfClosedServices=Seznam uzavřených služeb
 ListOfRunningServices=Seznam spuštěných služeb
 NotActivatedServices=Neaktivní služby (u ověřených smluv)
 BoardNotActivatedServices=Služby pro aktivaci u ověřených smluv
+BoardNotActivatedServicesShort=Services to activate
 LastContracts=Nejnovější %s smlouvy
 LastModifiedServices=Nejnovější %s modifikované služby
 ContractStartDate=Datum zahájení
@@ -65,7 +66,9 @@ DateEndReal=Skutečné datum ukončení
 DateEndRealShort=Skutečné datum ukončení
 CloseService=Zavřít služby
 BoardRunningServices=Spuštěné služby
+BoardRunningServicesShort=Spuštěné služby
 BoardExpiredServices=Vypršené služby
+BoardExpiredServicesShort=Vypršené služby
 ServiceStatus=Stav služby
 DraftContracts=Koncepty smlouvy
 CloseRefusedBecauseOneServiceActive=Smlouvu nelze uzavřít, protože u ní ní existuje alespoň jedna otevřená služba
diff --git a/htdocs/langs/cs_CZ/errors.lang b/htdocs/langs/cs_CZ/errors.lang
index bf4f3a14b1c..2b03a4f6ccb 100644
--- a/htdocs/langs/cs_CZ/errors.lang
+++ b/htdocs/langs/cs_CZ/errors.lang
@@ -218,6 +218,7 @@ ErrorVariableKeyForContentMustBeSet=Chyba, musí být nastavena konstanta s náz
 ErrorURLMustStartWithHttp=Adresa URL %s musí začínat http: // nebo https: //
 ErrorNewRefIsAlreadyUsed=Chyba, nový odkaz je již použit
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Error, delete payment linked to a closed invoice is not possible.
+ErrorSearchCriteriaTooSmall=Search criteria too small.
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 WarningPasswordSetWithNoAccount=Pro tohoto člena bylo nastaveno heslo. Nebyl však vytvořen žádný uživatelský účet. Toto heslo je uloženo, ale nemůže být použito pro přihlášení k Dolibarr. Může být použito externím modulem / rozhraním, ale pokud nemáte pro člena definováno žádné přihlašovací jméno ani heslo, můžete vypnout možnost "Správa přihlášení pro každého člena" z nastavení modulu člena. Pokud potřebujete spravovat přihlašovací údaje, ale nepotřebujete žádné heslo, můžete toto pole ponechat prázdné, abyste se tomuto varování vyhnuli. Poznámka: E-mail může být také použit jako přihlašovací jméno, pokud je člen připojen k uživateli.
diff --git a/htdocs/langs/cs_CZ/main.lang b/htdocs/langs/cs_CZ/main.lang
index 680091e5929..94eca088317 100644
--- a/htdocs/langs/cs_CZ/main.lang
+++ b/htdocs/langs/cs_CZ/main.lang
@@ -28,6 +28,7 @@ NoTemplateDefined=Pro tento typ e-mailu není k dispozici žádná šablona
 AvailableVariables=K dispozici substituční proměnné
 NoTranslation=Překlad není
 Translation=Překlad
+EmptySearchString=Enter a non empty search string
 NoRecordFound=Nebyl nalezen žádný záznam
 NoRecordDeleted=Žádný záznam nebyl smazán
 NotEnoughDataYet=Nedostatek dat
@@ -704,6 +705,7 @@ DateOfSignature=Datum podpisu
 HidePassword=Zobrazit příkaz s heslem skryté
 UnHidePassword=Zobrazit skutečný příkaz s odstraněným heslem
 Root=Kořen
+RootOfMedias=Root of public medias (/medias)
 Informations=Informace
 Page=Strana
 Notes=Poznámky
@@ -981,3 +983,10 @@ PaymentInformation=Payment information
 ValidFrom=Valid from
 ValidUntil=Valid until
 NoRecordedUsers=No users
+ToClose=To close
+ToProcess=Ve zpracování
+ToApprove=To approve
+GlobalOpenedElemView=Global view
+NoArticlesFoundForTheKeyword=No article found for the keyword '<strong>%s</strong>'
+NoArticlesFoundForTheCategory=No article found for the category
+ToAcceptRefuse=To accept | refuse
diff --git a/htdocs/langs/cs_CZ/members.lang b/htdocs/langs/cs_CZ/members.lang
index 9f7af348b54..dedbca12e02 100644
--- a/htdocs/langs/cs_CZ/members.lang
+++ b/htdocs/langs/cs_CZ/members.lang
@@ -29,6 +29,7 @@ MenuMembersUpToDate=Aktuální členové
 MenuMembersNotUpToDate=Neaktuální členové
 MenuMembersResiliated=Ukončené členové
 MembersWithSubscriptionToReceive=Členové s předplatným k přijímání
+MembersWithSubscriptionToReceiveShort=Subscription to receive
 DateSubscription=Vstupní data
 DateEndSubscription=Datum ukončení předplatného
 EndSubscription=Konec odběru
diff --git a/htdocs/langs/cs_CZ/projects.lang b/htdocs/langs/cs_CZ/projects.lang
index 535c15f31b1..9a893f99d77 100644
--- a/htdocs/langs/cs_CZ/projects.lang
+++ b/htdocs/langs/cs_CZ/projects.lang
@@ -76,7 +76,13 @@ MyProjects=Moje projekty
 MyProjectsArea=Moje projekty Oblast
 DurationEffective=Efektivní doba trvání
 ProgressDeclared=Hlášený progres
+TaskProgressSummary=Task progress
+CurentlyOpenedTasks=Curently opened tasks
+TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared progress is less %s than the calculated progression
+TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared progress is more %s than the calculated progression
 ProgressCalculated=Vypočítaný progres
+WhichIamLinkedTo=which I'm linked to
+WhichIamLinkedToProject=which I'm linked to project
 Time=Čas
 ListOfTasks=Seznam úkolů
 GoToListOfTimeConsumed=Přejít na seznam času spotřebovaného
diff --git a/htdocs/langs/cs_CZ/website.lang b/htdocs/langs/cs_CZ/website.lang
index 603f66e497c..39eafdebf94 100644
--- a/htdocs/langs/cs_CZ/website.lang
+++ b/htdocs/langs/cs_CZ/website.lang
@@ -2,7 +2,7 @@
 Shortname=Kód
 WebsiteSetupDesc=Vytvořte zde webové stránky, které chcete používat. Poté přejděte do nabídky Webové stránky a upravte je.
 DeleteWebsite=Odstranit web
-ConfirmDeleteWebsite=Opravdu chcete smazat tento web? Všechny jeho stránky a obsah budou také odstraněny.
+ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed. The files uploaded (like into the medias directory, the ECM module, ...) will remain.
 WEBSITE_TYPE_CONTAINER=Typ stránky / kontejneru
 WEBSITE_PAGE_EXAMPLE=Webovou stránku, kterou chcete použít jako příklad
 WEBSITE_PAGENAME=Název stránky / alias
@@ -14,6 +14,9 @@ WEBSITE_JS_INLINE=Obsah souboru Javascript (společný pro všechny stránky)
 WEBSITE_HTML_HEADER=Přidání v dolní části hlavičky HTML (společné pro všechny stránky)
 WEBSITE_ROBOT=Soubor pro roboty (soubor robots.txt)
 WEBSITE_HTACCESS=Soubor .htaccess
+WEBSITE_MANIFEST_JSON=Website manifest.json file
+WEBSITE_README=README.md file
+EnterHereLicenseInformation=Enter here meta data or license information to fille a README.md file. if you distribute your website as a template, the file will be included into the temptate package.
 HtmlHeaderPage=Záhlaví HTML (pouze pro tuto stránku)
 PageNameAliasHelp=Název nebo alias stránky. <br> Tento alias je také používán k vytvoření adresy URL při běhu webových stránek z virtuálního hostitele webového serveru (jako Apacke, Nginx, ...). Pomocí tlačítka "<strong> %s </strong>" upravte tento alias.
 EditTheWebSiteForACommonHeader=Poznámka: Pokud chcete definovat osobní hlavičku pro všechny stránky, upravte záhlaví na úrovni webu namísto na stránce / kontejneru.
@@ -41,6 +44,7 @@ RealURL=real URL
 ViewWebsiteInProduction=Pohled webové stránky s použitím domácí adresy URL
 SetHereVirtualHost= <u> Použití s Apache / NGinx / ... </u> <br> Pokud můžete vytvořit na svém webovém serveru (Apache, Nginx, ...) vyhrazený virtuální hostitel s PHP povoleným a kořenový adresář na <br> <strong> %s </strong> <br> pak nastavit název virtuálního hostitele, který jste vytvořili ve vlastnostech webových stránek, takže náhled lze provést také pomocí tohoto vyhrazeného přístupu k webovým serverům místo interního serveru Dolibarr.
 YouCanAlsoTestWithPHPS= <u> Použití s vloženým serverem PHP </u> <br> Při vývoji prostředí můžete upřednostňovat testování webu pomocí integrovaného webového serveru PHP (PHP 5.5 vyžadováno) spuštěním <br> <strong> php -S 0.0.0.0:8080 -t %s </strong>
+YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
 CheckVirtualHostPerms=Zkontrolujte také, že virtuální hostitel má oprávnění <strong> %s </strong> na souborech do <br> <strong> %s </strong>
 ReadPerm=Číst
 WritePerm=Zápis
@@ -75,7 +79,8 @@ AddWebsiteAccount=Vytvořte účet webových stránek
 BackToListOfThirdParty=Zpět na seznam pro subjekt
 DisableSiteFirst=Nejprve zakažte web
 MyContainerTitle=Název mé webové stránky
-AnotherContainer=Další kontejner
+AnotherContainer=This is how to include content of another page/container (you may have an error here if you enable dynamic code because the embedded subcontainer may not exists)
+SorryWebsiteIsCurrentlyOffLine=Sorry, this website is currently off line. Please comme back later...
 WEBSITE_USE_WEBSITE_ACCOUNTS=Povolte tabulku účtu webových stránek
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Aktivujte tabulku pro ukládání účtů webových stránek (login / heslo) pro každý web / třetí stranu
 YouMustDefineTheHomePage=Nejprve musíte definovat výchozí domovskou stránku
@@ -89,7 +94,8 @@ AliasPageAlreadyExists=Stránka aliasu <strong> %s </strong> již existuje
 CorporateHomePage=Domovská stránka firmy
 EmptyPage=Prázdná stránka
 ExternalURLMustStartWithHttp=Externí adresa URL musí začít s http: // nebo https: //
-ZipOfWebsitePackageToImport=Zip soubor webového balíčku
+ZipOfWebsitePackageToImport=Upload the Zip file of the website template package
+ZipOfWebsitePackageToLoad=or Choose an available embedded website template package
 ShowSubcontainers=Zahrnout dynamický obsah
 InternalURLOfPage=Interní adresa URL stránky
 ThisPageIsTranslationOf=Tato stránka / kontejner je překladem
@@ -101,5 +107,10 @@ NotAllowedToAddDynamicContent=Nemáte oprávnění přidávat nebo upravovat dyn
 ReplaceWebsiteContent=Search or Replace website content
 DeleteAlsoJs=Delete also all javascript files specific to this website?
 DeleteAlsoMedias=Delete also all medias files specific to this website?
-# Export
 MyWebsitePages=My website pages
+SearchReplaceInto=Search | Replace into
+ReplaceString=New string
+CSSContentTooltipHelp=Enter here CSS content. To avoid any conflict with the CSS of the application, be sure to prepend all declaration with the .bodywebsite class. For example:<br><br>#mycssselector, input.myclass:hover { ... }<br>must be<br>.bodywebsite #mycssselector, .bodywebsite input.myclass:hover { ... }<br><br>Note: If you have a large file without this prefix, you can use 'lessc' to convert it to append the .bodywebsite prefix everywhere.
+LinkAndScriptsHereAreNotLoadedInEditor=Warning: This content is output only when site is accessed from a server. It is not used in Edit mode so if you need to load javascript files also in edit mode, just add your tag 'script src=...' into the page.
+Dynamiccontent=Sample of a page with dynamic content
+ImportSite=Importujte šablonu webových stránek
diff --git a/htdocs/langs/da_DK/admin.lang b/htdocs/langs/da_DK/admin.lang
index 5b877d21222..1f7549f56a2 100644
--- a/htdocs/langs/da_DK/admin.lang
+++ b/htdocs/langs/da_DK/admin.lang
@@ -400,6 +400,7 @@ OldVATRates=Gammel momssats
 NewVATRates=Ny momssats
 PriceBaseTypeToChange=Rediger priser med basisreferenceværdi defineret på
 MassConvert=Start bulkkonvertering
+PriceFormatInCurrentLanguage=Price Format In Current Language
 String=String
 TextLong=Lang tekst
 HtmlText=Html tekst
@@ -431,7 +432,7 @@ ExtrafieldParamHelpradio=Liste over værdier skal være linjer med formatnøgle,
 ExtrafieldParamHelpsellist=Liste over værdier kommer fra en tabel <br> Syntaks: tabelnavn: label_field: id_field :: filter <br> Eksempel: c_typent: libelle: id :: filter <br> <br> - idfilter er nødvendigvis en primær int nøgle <br> - filteret kan være en simpel test = 1) for at vise kun aktiv værdi <br> Du kan også bruge $ ID $ i filter heks er det nuværende id for nuværende objekt <br> For at gøre et SELECT i filter brug $ SEL $ <br> hvis du vil filtrere på ekstrafelter brug syntax extra.fieldcode = ... (hvor feltkode er koden for ekstrafelt) <br> <br> For at få listen afhængig af en anden komplementær attributliste: <br> c_typent: libelle: id: options_ <i> parent_list_code </i> | parent_column: filter <br> <br> For at have listen afhænger af en anden liste: <br> c_typent: libelle: id: <i> parent_list_code </i> | parent_column: filter
 ExtrafieldParamHelpchkbxlst=Liste over værdier kommer fra en tabel <br> Syntaks: tabelnavn: label_field: id_field :: filter <br> Eksempel: c_typent: libelle: id :: filter <br> <br> filter kan være en simpel test (f.eks. Aktiv = 1) for at vise kun aktiv værdi <br> Du kan også bruge $ ID $ i filter heks er det nuværende id for nuværende objekt <br> For at gøre et SELECT i filter bruger $ SEL $ <br> hvis du vil filtrere på ekstrafelter brug syntax extra.fieldcode = ... (hvor feltkode er kode for ekstrafelt) <br> <br> For at få listen afhængig af en anden komplementær attributliste: <br> c_typent: libelle: id: options_ <i> parent_list_code </i> | parent_column: filter <br> <br> For at få listen afhængig af en anden liste: <br> c_typent: libelle: id: <i> parent_list_code </i> | parent_column: filter
 ExtrafieldParamHelplink=Parametre skal være ObjectName: Classpath <br> Syntaks: Objektnavn: Klassepath <br> Eksempler: <br> Societe: societe / class / societe.class.php <br> Kontakt: kontakt / class / contact.class.php
-ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default)<br>Set this to 2 for a collapsing separator (collapsed by default)
+ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Bibliotek, der bruges for PDF generation
 LocalTaxDesc=Nogle lande kan anmode om to eller tre skatter på hver faktura linje. Hvis dette er tilfældet, skal du vælge typen for den anden og tredje skat og dens sats. Mulig type er: <br> 1: Lokal afgift gælder for varer og ydelser uden moms (localtax beregnes efter beløb uden skat) <br> 2: Lokal afgift gælder for varer og tjenesteydelser inklusive moms (localtax beregnes på beløb + hovedafgift) <br> 3: lokal skat gælder for varer uden moms (localtax beregnes på beløb uden skat) <br> 4: lokal skat gælder for varer inklusive moms (lokaltax beregnes på beløb + hovedstol) <br> 5: lokal skat gælder for tjenester uden moms på beløb uden skat) <br> 6: Lokal afgift gælder for tjenester inklusive moms (lokal taxa er beregnet på beløb + skat)
 SMS=SMS
@@ -1695,7 +1696,7 @@ SuppliersInvoiceNumberingModel=Leverandør fakturaer nummerering modeller
 IfSetToYesDontForgetPermission=Hvis du er indstillet til ja, glem ikke at give tilladelser til grupper eller brugere tilladt til anden godkendelse
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=Opsætning af GeoIP Maxmind-modul
-PathToGeoIPMaxmindCountryDataFile=Sti til fil indeholdende Maxmind ip til oversættelse af land. <br> Eksempler: <br> /usr/local/share/GeoIP/GeoIP.dat <br> /usr/share/GeoIP/GeoIP.dat
+PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoLite2-Country.mmdb
 NoteOnPathLocation=Bemærk, at din ip til land datafil skal være inde en mappe din PHP kan læse (Check din PHP open_basedir setup og filsystem tilladelser).
 YouCanDownloadFreeDatFileTo=Du kan downloade en <b>gratis demo version</b> af Maxmind GeoIP land fil på %s.
 YouCanDownloadAdvancedDatFileTo=Du kan også downloade en mere <b>komplet version, med opdateringer på</b> den Maxmind GeoIP land fil på %s.
@@ -1926,14 +1927,13 @@ SmallerThan=Smaller than
 LargerThan=Larger than
 IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID is found into incoming email, the event will be automatically linked to the related objects.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
-IFTTTSetup=IFTTT module setup
-IFTTT_SERVICE_KEY=IFTTT Service key
-IFTTT_DOLIBARR_ENDPOINT_SECUREKEY=Security key to secure the endpoint URL used by IFTTT to send messages to your Dolibarr.
-IFTTTDesc=This module is designed to trigger events on IFTTT and/or to execute some action on external IFTTT triggers.
-UrlForIFTTT=URL endpoint for IFTTT
-YouWillFindItOnYourIFTTTAccount=You will find it on your IFTTT account
 EndPointFor=End point for %s : %s
 DeleteEmailCollector=Delete email collector
 ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
 RecipientEmailsWillBeReplacedWithThisValue=Recipient emails will be always replaced with this value
 AtLeastOneDefaultBankAccountMandatory=At least 1 default bank account must be defined
+RESTRICT_API_ON_IP=Allow available APIs to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can use the available APIs.
+RESTRICT_ON_IP=Allow access to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can access.
+BaseOnSabeDavVersion=Based on the library SabreDAV version
+NotAPublicIp=Not a public IP
+MakeAnonymousPing=Make an anonymous Ping '+1' to the Dolibarr foundation server (done 1 time only after installation) to allow the foundation to count the number of Dolibarr installation.
diff --git a/htdocs/langs/da_DK/banks.lang b/htdocs/langs/da_DK/banks.lang
index f6f39d2064a..62f20d2b8ae 100644
--- a/htdocs/langs/da_DK/banks.lang
+++ b/htdocs/langs/da_DK/banks.lang
@@ -73,6 +73,7 @@ BankTransaction=Bank post
 ListTransactions=Liste poster
 ListTransactionsByCategory=Liste poster / kategori
 TransactionsToConciliate=Linjer til afsteming
+TransactionsToConciliateShort=To reconcile
 Conciliable=Kan afstemmes
 Conciliate=Afstem
 Conciliation=Afstemning
@@ -116,6 +117,7 @@ DeleteCheckReceipt=Slet denne kvittering for kvittering?
 ConfirmDeleteCheckReceipt=Er du sikker på, at du vil slette denne kvittering for kvittering?
 BankChecks=Bankcheck
 BankChecksToReceipt=Checks venter depositum
+BankChecksToReceiptShort=Checks venter depositum
 ShowCheckReceipt=Vis check depositum kvittering
 NumberOfCheques=Antal tjek
 DeleteTransaction=Slet indtastning
diff --git a/htdocs/langs/da_DK/cashdesk.lang b/htdocs/langs/da_DK/cashdesk.lang
index a1e571c56b9..7fa71475274 100644
--- a/htdocs/langs/da_DK/cashdesk.lang
+++ b/htdocs/langs/da_DK/cashdesk.lang
@@ -62,6 +62,7 @@ TicketVatGrouped=Group VAT by rate in tickets
 AutoPrintTickets=Automatically print tickets
 EnableBarOrRestaurantFeatures=Enable features for Bar or Restaurant
 ConfirmDeletionOfThisPOSSale=Do your confirm the deletion of this current sale ?
+ConfirmDiscardOfThisPOSSale=Do you want to discard this current sale ?
 History=Historie
 ValidateAndClose=Validate and close
 Terminal=Terminal
@@ -69,3 +70,8 @@ NumberOfTerminals=Number of Terminals
 TerminalSelect=Select terminal you want to use:
 POSTicket=POS Ticket
 BasicPhoneLayout=Use basic layout for phones
+SetupOfTerminalNotComplete=Setup of terminal %s is not complete
+DirectPayment=Direct payment
+DirectPaymentButton=Direct cash payment button
+InvoiceIsAlreadyValidated=Invoice is already validated
+NoLinesToBill=No lines to bill
diff --git a/htdocs/langs/da_DK/companies.lang b/htdocs/langs/da_DK/companies.lang
index 251336c2067..46fb1505b01 100644
--- a/htdocs/langs/da_DK/companies.lang
+++ b/htdocs/langs/da_DK/companies.lang
@@ -54,6 +54,7 @@ Firstname=Fornavn
 PostOrFunction=Stilling
 UserTitle=Titel
 NatureOfThirdParty=Tredjepartens art
+NatureOfContact=Nature of Contact
 Address=Adresse
 State=Stat/provins
 StateShort=Stat
diff --git a/htdocs/langs/da_DK/contracts.lang b/htdocs/langs/da_DK/contracts.lang
index 931c0ca0e3c..ebb3561860f 100644
--- a/htdocs/langs/da_DK/contracts.lang
+++ b/htdocs/langs/da_DK/contracts.lang
@@ -51,6 +51,7 @@ ListOfClosedServices=Liste over lukkede tjenester
 ListOfRunningServices=Liste over kører tjenester
 NotActivatedServices=Ikke aktiverede tjenester (blandt bekræftet kontrakter)
 BoardNotActivatedServices=Tjenester for at aktivere blandt bekræftet kontrakter
+BoardNotActivatedServicesShort=Services to activate
 LastContracts=Latest %s contracts
 LastModifiedServices=Latest %s modified services
 ContractStartDate=Startdato
@@ -64,7 +65,10 @@ DateStartRealShort=Real startdato
 DateEndReal=Real slutdato
 DateEndRealShort=Real slutdato
 CloseService=Luk service
-BoardRunningServices=Udløbet kører tjenester
+BoardRunningServices=Services running
+BoardRunningServicesShort=Services running
+BoardExpiredServices=Services expired
+BoardExpiredServicesShort=Services expired
 ServiceStatus=Status for service
 DraftContracts=Drafts kontrakter
 CloseRefusedBecauseOneServiceActive=Kontrakten kan ikke lukkes, da der er mindst en åben service på den
diff --git a/htdocs/langs/da_DK/errors.lang b/htdocs/langs/da_DK/errors.lang
index 957b70c5233..d30865a2e84 100644
--- a/htdocs/langs/da_DK/errors.lang
+++ b/htdocs/langs/da_DK/errors.lang
@@ -218,6 +218,7 @@ ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text
 ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Error, delete payment linked to a closed invoice is not possible.
+ErrorSearchCriteriaTooSmall=Search criteria too small.
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 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/main.lang b/htdocs/langs/da_DK/main.lang
index b3eaeb11178..2a47a015af4 100644
--- a/htdocs/langs/da_DK/main.lang
+++ b/htdocs/langs/da_DK/main.lang
@@ -28,6 +28,7 @@ NoTemplateDefined=Ingen skabelon til rådighed for denne Email-type
 AvailableVariables=Tilgængelige erstatnings variabler
 NoTranslation=Ingen oversættelse
 Translation=Oversættelse
+EmptySearchString=Enter a non empty search string
 NoRecordFound=Ingen poster fundet
 NoRecordDeleted=Ingen post slettet
 NotEnoughDataYet=Ikke nok data
@@ -704,6 +705,7 @@ DateOfSignature=Dato for underskrift
 HidePassword=Vis kommandoen med adgangskode skjulte
 UnHidePassword=Vis reelle kommandoen med klare adgangskode
 Root=Rod
+RootOfMedias=Root of public medias (/medias)
 Informations=Information
 Page=Side
 Notes=Noter
@@ -981,3 +983,10 @@ PaymentInformation=Payment information
 ValidFrom=Valid from
 ValidUntil=Valid until
 NoRecordedUsers=No users
+ToClose=To close
+ToProcess=At behandle
+ToApprove=To approve
+GlobalOpenedElemView=Global view
+NoArticlesFoundForTheKeyword=No article found for the keyword '<strong>%s</strong>'
+NoArticlesFoundForTheCategory=No article found for the category
+ToAcceptRefuse=To accept | refuse
diff --git a/htdocs/langs/da_DK/members.lang b/htdocs/langs/da_DK/members.lang
index cb26f94a83c..1b0d8310594 100644
--- a/htdocs/langs/da_DK/members.lang
+++ b/htdocs/langs/da_DK/members.lang
@@ -29,6 +29,7 @@ MenuMembersUpToDate=Ajour medlemmer
 MenuMembersNotUpToDate=Uaktuel medlemmer
 MenuMembersResiliated=Afsluttede medlemmer
 MembersWithSubscriptionToReceive=Medlemmer med abonnement for at modtage
+MembersWithSubscriptionToReceiveShort=Subscription to receive
 DateSubscription=Subscription dato
 DateEndSubscription=Subscription slutdato
 EndSubscription=End abonnement
diff --git a/htdocs/langs/da_DK/projects.lang b/htdocs/langs/da_DK/projects.lang
index 81b2f06d3bd..3022447dfbe 100644
--- a/htdocs/langs/da_DK/projects.lang
+++ b/htdocs/langs/da_DK/projects.lang
@@ -76,7 +76,13 @@ MyProjects=Mine projekter
 MyProjectsArea=Mine projekter Område
 DurationEffective=Effektiv varighed
 ProgressDeclared=Erklæret fremskridt
+TaskProgressSummary=Task progress
+CurentlyOpenedTasks=Curently opened tasks
+TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared progress is less %s than the calculated progression
+TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared progress is more %s than the calculated progression
 ProgressCalculated=Beregnede fremskridt
+WhichIamLinkedTo=which I'm linked to
+WhichIamLinkedToProject=which I'm linked to project
 Time=Tid
 ListOfTasks=Liste over opgaver
 GoToListOfTimeConsumed=Gå til listen over tid forbrugt
diff --git a/htdocs/langs/da_DK/website.lang b/htdocs/langs/da_DK/website.lang
index 9371ca1fbcb..29984405568 100644
--- a/htdocs/langs/da_DK/website.lang
+++ b/htdocs/langs/da_DK/website.lang
@@ -2,7 +2,7 @@
 Shortname=Kode
 WebsiteSetupDesc=Opret her de websteder, du vil bruge. Gå derefter ind i menuen Websites for at redigere dem.
 DeleteWebsite=Slet websted
-ConfirmDeleteWebsite=Er du sikker på, at du vil slette dette websted? Alle dens sider og indhold vil også blive fjernet.
+ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed. The files uploaded (like into the medias directory, the ECM module, ...) will remain.
 WEBSITE_TYPE_CONTAINER=Type side / container
 WEBSITE_PAGE_EXAMPLE=Webside til brug som eksempel
 WEBSITE_PAGENAME=Sidens navn / alias
@@ -14,6 +14,9 @@ WEBSITE_JS_INLINE=Javascript fil indhold (fælles for alle sider)
 WEBSITE_HTML_HEADER=Tilføjelse nederst på HTML-overskrift (fælles for alle sider)
 WEBSITE_ROBOT=Robotfil (robots.txt)
 WEBSITE_HTACCESS=Website .htaccess file
+WEBSITE_MANIFEST_JSON=Website manifest.json file
+WEBSITE_README=README.md file
+EnterHereLicenseInformation=Enter here meta data or license information to fille a README.md file. if you distribute your website as a template, the file will be included into the temptate package.
 HtmlHeaderPage=HTML-overskrift (kun for denne side)
 PageNameAliasHelp=Navnet eller aliaset på siden. <br> Dette alias bruges også til at oprette en SEO-URL, når webstedet er kørt fra en virtuel vært på en webserver (som Apacke, Nginx, ...). Brug knappen "<strong> %s </strong>" for at redigere dette alias.
 EditTheWebSiteForACommonHeader=Bemærk: Hvis du vil definere en personlig "Header" for alle sider, skal du redigere din "Header" på website niveau i stedet for på siden / containeren.
@@ -41,6 +44,7 @@ RealURL=Rigtig webadresse
 ViewWebsiteInProduction=Se websitet ved hjælp af hjemmesider
 SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then set the name of the virtual host you have created in the properties of web site, so the preview can be done also using this dedicated web server access instead of the internal Dolibarr server.
 YouCanAlsoTestWithPHPS=<u> Brug med PHP-integreret server </ u> <br> På udvikler miljø kan du helst prøve webstedet med den indbyggede PHP-server (PHP 5.5 påkrævet) ved at køre <br> <strong> php -S 0.0. 0,0: 8080 -t %s </ strong>
+YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
 CheckVirtualHostPerms=Kontroller også, at den virtuelle vært har tilladelse <strong> %s </strong> på filer til <br> <strong> %s</strong>
 ReadPerm=Læs
 WritePerm=Skriv
@@ -75,7 +79,8 @@ AddWebsiteAccount=Opret websitet konto
 BackToListOfThirdParty=Tilbage til listen for tredjepart
 DisableSiteFirst=Deaktiver hjemmesiden først
 MyContainerTitle=Min hjemmeside titel
-AnotherContainer=En anden beholder
+AnotherContainer=This is how to include content of another page/container (you may have an error here if you enable dynamic code because the embedded subcontainer may not exists)
+SorryWebsiteIsCurrentlyOffLine=Sorry, this website is currently off line. Please comme back later...
 WEBSITE_USE_WEBSITE_ACCOUNTS=Aktivér webstedets kontobord
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / third party
 YouMustDefineTheHomePage=Du skal først definere standard startside
@@ -89,7 +94,8 @@ AliasPageAlreadyExists=Alias ​​side <strong> %s </strong>eksisterer allerede
 CorporateHomePage=Firmahjemmeside
 EmptyPage=Tom side
 ExternalURLMustStartWithHttp=Ekstern webadresse skal starte med http: // eller https: //
-ZipOfWebsitePackageToImport=Zip-fil af webstedspakke
+ZipOfWebsitePackageToImport=Upload the Zip file of the website template package
+ZipOfWebsitePackageToLoad=or Choose an available embedded website template package
 ShowSubcontainers=Include dynamic content
 InternalURLOfPage=Intern webadresse for siden
 ThisPageIsTranslationOf=This page/container is a translation of
@@ -101,5 +107,10 @@ NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynam
 ReplaceWebsiteContent=Search or Replace website content
 DeleteAlsoJs=Delete also all javascript files specific to this website?
 DeleteAlsoMedias=Delete also all medias files specific to this website?
-# Export
 MyWebsitePages=My website pages
+SearchReplaceInto=Search | Replace into
+ReplaceString=New string
+CSSContentTooltipHelp=Enter here CSS content. To avoid any conflict with the CSS of the application, be sure to prepend all declaration with the .bodywebsite class. For example:<br><br>#mycssselector, input.myclass:hover { ... }<br>must be<br>.bodywebsite #mycssselector, .bodywebsite input.myclass:hover { ... }<br><br>Note: If you have a large file without this prefix, you can use 'lessc' to convert it to append the .bodywebsite prefix everywhere.
+LinkAndScriptsHereAreNotLoadedInEditor=Warning: This content is output only when site is accessed from a server. It is not used in Edit mode so if you need to load javascript files also in edit mode, just add your tag 'script src=...' into the page.
+Dynamiccontent=Sample of a page with dynamic content
+ImportSite=Importer websider skabelon
diff --git a/htdocs/langs/de_DE/admin.lang b/htdocs/langs/de_DE/admin.lang
index d6292945470..a237af16d53 100644
--- a/htdocs/langs/de_DE/admin.lang
+++ b/htdocs/langs/de_DE/admin.lang
@@ -400,6 +400,7 @@ OldVATRates=Alter Umsatzsteuer-Satz
 NewVATRates=Neuer Umsatzsteuer-Satz
 PriceBaseTypeToChange=Ändern Sie den Basispreis definierte nach
 MassConvert=Starte Massenkonvertierung
+PriceFormatInCurrentLanguage=Price Format In Current Language
 String=Zeichenkette
 TextLong=Langer Text
 HtmlText=HTML-Text
@@ -431,7 +432,7 @@ ExtrafieldParamHelpradio=Die Liste der Werte muss aus Zeilen mit dem Format Schl
 ExtrafieldParamHelpsellist=Die Liste der Werte stammt aus einer Tabelle <br> Syntax: table_name: label_field: id_field :: filter <br> Beispiel: c_typent: libelle: id :: filter <br><br> - idfilter ist notwendigerweise ein primärer int-Schlüssel <br> - Filter kann ein einfacher Test sein (z. B. aktiv = 1), um nur den aktiven Wert anzuzeigen <br> Sie können $ ID $ auch in Filtern verwenden, bei denen es sich um die aktuelle ID des aktuellen Objekts handelt <br> Verwenden Sie $ SEL $, um ein SELECT im Filter durchzuführen <br> Wenn Sie nach Extrafeldern filtern möchten, verwenden Sie die Syntax extra.fieldcode = ... (wobei field code der Code des Extrafelds ist) <br><br> Damit die Liste von einer anderen ergänzenden Attributliste abhängt: <br> c_typent: libelle: id: options_ <i>parent_list_code</i> | parent_column: filter <br><br> Um die Liste von einer anderen Liste abhängig zu machen: <br> c_typent: libelle: id: <i>parent_list_code</i> | parent_column: filter
 ExtrafieldParamHelpchkbxlst=List of values 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>Examples:<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
-ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default)<br>Set this to 2 for a collapsing separator (collapsed by default)
+ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Bibliothek zum Erstellen von PDF-Dateien
 LocalTaxDesc=Einige Länder erheben möglicherweise zwei oder drei Steuern auf jede Rechnungsposition. Wenn dies der Fall ist, wählen Sie den Typ für die zweite und dritte Steuer und ihren Steuersatz. Mögliche Typen sind: <br> 1: auf Produkte und Dienstleistungen ohne Mehrwertsteuer wird eine örtliche Steuer erhoben (die örtliche Steuer wird auf den Betrag ohne Mehrwertsteuer berechnet) <br> 2: Für Produkte und Dienstleistungen einschließlich Mehrwertsteuer wird eine lokale Steuer erhoben (die lokale Steuer wird auf den Betrag + die Hauptsteuer berechnet). <br> 3: auf Produkte ohne Mehrwertsteuer wird eine lokale Steuer erhoben (die lokale Steuer wird auf den Betrag ohne Mehrwertsteuer berechnet) <br> 4: Für Produkte einschließlich Mehrwertsteuer wird eine lokale Steuer erhoben (die Mehrwertsteuer wird auf den Betrag + die Haupt-Mehrwertsteuer berechnet). <br> 5: auf Dienstleistungen ohne Mehrwertsteuer wird eine lokale Steuer erhoben (die lokale Steuer wird auf den Betrag ohne Mehrwertsteuer berechnet) <br> 6: Für Dienstleistungen einschließlich Mehrwertsteuer wird eine lokale Steuer erhoben (die lokale Steuer wird auf den Betrag und die Steuer berechnet).
 SMS=SMS
@@ -598,7 +599,7 @@ Module2200Desc=Verwenden Sie mathematische Ausdrücke für die automatische Gene
 Module2300Name=Geplante Aufträge
 Module2300Desc=Verwaltung geplanter Aufgaben (Cron oder chrono Tabelle)
 Module2400Name=Ereignisse / Termine
-Module2400Desc=Ereignisse verfolgen. Protokollieren Sie automatische Ereignisse zu Verfolgungszwecken oder zeichnen Sie manuelle Ereignisse oder Besprechungen auf. Dies ist ein wichtiges Modul für ein gutes Kunden- oder Lieferantenbeziehungsmanagement.
+Module2400Desc=Modul zur Terminplanung und Ereignissaufzeichnung:  Protokollieren Sie automatisch Ereignisse wie beispielsweise Änderungen an Produktdatensätzen zu Verfolgungszwecken oder tragen Sie Termine manuell ein.\nDies ist ein wichtiges Modul für ein gutes Kunden- und/oder Lieferantenbeziehungsmanagement.
 Module2500Name=DMS / ECM
 Module2500Desc=Speicherung und Verteilung von Dokumenten. Automatische organisation der generierten oder gespeicherten Dokumente. Teilen Sie sie bei Bedarf.
 Module2600Name=API/Webservice (SOAP Server)
@@ -1695,7 +1696,7 @@ SuppliersInvoiceNumberingModel=Lieferantenrechnungen Zähl-Modell
 IfSetToYesDontForgetPermission=Wenn auf Ja gesetzt, vergessen Sie nicht, die Berechtigungen den dafür erlaubten Gruppen oder Benutzern auch das Recht für die zweite Zustimmung zu geben.
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=GeoIP-Maxmind Moduleinstellungen
-PathToGeoIPMaxmindCountryDataFile=Pfad zur Datei mit Maxmind IP-zu-Land Übersetzung. <br>Beispiele:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoOP.dat
+PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoLite2-Country.mmdb
 NoteOnPathLocation=Bitte beachten Sie, dass Ihre IP-Länder-Datei in einem von PHP lesbaren Verzeichnis liegen muss (Überprüfen Sie Ihre PHP open_basedir-Einstellungen und die Dateisystem-Berechtigungen).
 YouCanDownloadFreeDatFileTo=Eine <b>kostenlose Demo-Version</b> der Maxmind-GeoIP Datei finden Sie hier: %s
 YouCanDownloadAdvancedDatFileTo=Eine <b>vollständigere Version mit Updates</b> der Maxmind-GeoIP Datei können Sie hier herunterladen: %s
@@ -1926,14 +1927,13 @@ SmallerThan=Kleiner als
 LargerThan=Größer als
 IfTrackingIDFoundEventWillBeLinked=Beachten Sie, dass,wenn in eingehenden e-Mail eine Tracking-ID gefunden wird, das Ereignis automatisch mit den verwanten/verknüpfte Objekte verknüpft wird.
 WithGMailYouCanCreateADedicatedPassword=Wenn Sie bei einem GMail-Konto die 2-stufige Validierung aktiviert haben, wird empfohlen, ein spezielles zweites Passwort für die Anwendung zu erstellen, anstatt Ihr eigenes Konto-Passwort von https://myaccount.google.com/. zu verwenden.
-IFTTTSetup=IFTTTT Modul Setup
-IFTTT_SERVICE_KEY=IFTTTT Dienstleistung Schlüssel
-IFTTT_DOLIBARR_ENDPOINT_SECUREKEY=Sicherheitsschlüssel zum Schutz der Endpunkt-URL, die vom IFTTT verwendet wird, um Nachrichten an Ihre Dolibarrinstanz zu senden.
-IFTTTDesc=Dieses Modul wurde entwickelt, um Ereignisse auf IFTTT auszulösen und/oder eine Aktion auf externe IFTTT-Trigger auszuführen.
-UrlForIFTTT=URL-Endpunkt für IFTTT
-YouWillFindItOnYourIFTTTAccount=Sie finden es auf Ihrem IFTTTT-Konto.
 EndPointFor=Endpunkt für %s:%s
 DeleteEmailCollector=Lösche eMail-Collector
 ConfirmDeleteEmailCollector=Sind Sie sicher, dass Sie diesen eMail-Collector löschen wollen?
 RecipientEmailsWillBeReplacedWithThisValue=Recipient emails will be always replaced with this value
 AtLeastOneDefaultBankAccountMandatory=At least 1 default bank account must be defined
+RESTRICT_API_ON_IP=Allow available APIs to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can use the available APIs.
+RESTRICT_ON_IP=Allow access to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can access.
+BaseOnSabeDavVersion=Based on the library SabreDAV version
+NotAPublicIp=Not a public IP
+MakeAnonymousPing=Make an anonymous Ping '+1' to the Dolibarr foundation server (done 1 time only after installation) to allow the foundation to count the number of Dolibarr installation.
diff --git a/htdocs/langs/de_DE/banks.lang b/htdocs/langs/de_DE/banks.lang
index 9cd672ff36f..96709ccfdeb 100644
--- a/htdocs/langs/de_DE/banks.lang
+++ b/htdocs/langs/de_DE/banks.lang
@@ -73,6 +73,7 @@ BankTransaction=Bank-Transaktionen
 ListTransactions=Liste Einträge
 ListTransactionsByCategory=Liste Einträge/Kategorie
 TransactionsToConciliate=Transaktionen zum ausgleichen
+TransactionsToConciliateShort=To reconcile
 Conciliable=kann ausgeglichen werden
 Conciliate=Ausgleichen
 Conciliation=Ausgleich
@@ -116,6 +117,7 @@ DeleteCheckReceipt=Wollen Sie diesen Rechnungseingang löschen?
 ConfirmDeleteCheckReceipt=Sind Sie sicher, dass Sie diesen Rechnungseingang löschen wollen?
 BankChecks=Bankschecks
 BankChecksToReceipt=Schecks warten auf Einlösung
+BankChecksToReceiptShort=Schecks warten auf Einlösung
 ShowCheckReceipt=Zeige Scheck Einzahlungsbeleg
 NumberOfCheques=Anzahl der Schecks
 DeleteTransaction=Transaktion löschen
diff --git a/htdocs/langs/de_DE/cashdesk.lang b/htdocs/langs/de_DE/cashdesk.lang
index 5675c114bc0..70e05411f1d 100644
--- a/htdocs/langs/de_DE/cashdesk.lang
+++ b/htdocs/langs/de_DE/cashdesk.lang
@@ -62,6 +62,7 @@ TicketVatGrouped=Group VAT by rate in tickets
 AutoPrintTickets=Automatically print tickets
 EnableBarOrRestaurantFeatures=Enable features for Bar or Restaurant
 ConfirmDeletionOfThisPOSSale=Do your confirm the deletion of this current sale ?
+ConfirmDiscardOfThisPOSSale=Do you want to discard this current sale ?
 History=Verlauf
 ValidateAndClose=Validate and close
 Terminal=Terminal
@@ -69,3 +70,8 @@ NumberOfTerminals=Number of Terminals
 TerminalSelect=Select terminal you want to use:
 POSTicket=POS Ticket
 BasicPhoneLayout=Use basic layout for phones
+SetupOfTerminalNotComplete=Setup of terminal %s is not complete
+DirectPayment=Direct payment
+DirectPaymentButton=Direct cash payment button
+InvoiceIsAlreadyValidated=Invoice is already validated
+NoLinesToBill=No lines to bill
diff --git a/htdocs/langs/de_DE/categories.lang b/htdocs/langs/de_DE/categories.lang
index 7d2cacc5a59..bcc9a07a16c 100644
--- a/htdocs/langs/de_DE/categories.lang
+++ b/htdocs/langs/de_DE/categories.lang
@@ -9,7 +9,7 @@ AddIn=Übergeordnete Kategorie
 modify=Ändern
 Classify=zuordnen
 CategoriesArea=Übersicht Kategorien
-ProductsCategoriesArea=Übersicht Produkt-/Leistungskategorien
+ProductsCategoriesArea=Übersicht Produkt- und Leistungskategorien
 SuppliersCategoriesArea=Übersicht Lieferantenkategorien
 CustomersCategoriesArea=Übersicht Kunden-/Interessentenkategorien
 MembersCategoriesArea=Übersicht Mitgliederkategorien
diff --git a/htdocs/langs/de_DE/companies.lang b/htdocs/langs/de_DE/companies.lang
index 9492897f2b6..7df98fd22f8 100644
--- a/htdocs/langs/de_DE/companies.lang
+++ b/htdocs/langs/de_DE/companies.lang
@@ -54,6 +54,7 @@ Firstname=Vorname
 PostOrFunction=Position / Funktion
 UserTitle=Anrede
 NatureOfThirdParty=Art des Partners
+NatureOfContact=Nature of Contact
 Address=Adresse
 State=Bundesland
 StateShort=Staat
@@ -338,7 +339,7 @@ MyContacts=meine Kontakte
 Capital=Kapital
 CapitalOf=Stammkapital: %s
 EditCompany=Unternehmen bearbeiten
-ThisUserIsNot=Dieser Benutzer ist weder ein Lead, Kunde oder Lieferant
+ThisUserIsNot=Dieser Benutzer ist weder ein Interessent, noch ein Kunde oder Lieferant
 VATIntraCheck=Prüfen
 VATIntraCheckDesc=Die Umsatzsteuer-ID muss das Länderpräfix enthalten. Die Verbindung <b> %s </b> verwendet den europäischen Mehrwertsteuerprüfungsdienst (VIES), für den ein Internetzugang vom Dolibarr-Server erforderlich ist.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
diff --git a/htdocs/langs/de_DE/contracts.lang b/htdocs/langs/de_DE/contracts.lang
index 0428016aa25..35a7f4a6a0e 100644
--- a/htdocs/langs/de_DE/contracts.lang
+++ b/htdocs/langs/de_DE/contracts.lang
@@ -51,6 +51,7 @@ ListOfClosedServices=Liste der geschlossenen Verträge/Abos
 ListOfRunningServices=Liste aktiver Services
 NotActivatedServices=Inaktive Services (in freigegebenen Verträgen)
 BoardNotActivatedServices=Zu aktivierende Leistungen in freigegebenen Verträgen
+BoardNotActivatedServicesShort=Services to activate
 LastContracts=%s neueste Verträge
 LastModifiedServices=%s zuletzt veränderte Leistungen
 ContractStartDate=Vertragsbeginn
@@ -65,7 +66,9 @@ DateEndReal=Effektives Ende
 DateEndRealShort=effektives Enddatum
 CloseService=Leistung schließen
 BoardRunningServices=laufende Leistungen
+BoardRunningServicesShort=laufende Leistungen
 BoardExpiredServices=abgelaufene Leistungen
+BoardExpiredServicesShort=abgelaufene Leistungen
 ServiceStatus=Leistungs-Status
 DraftContracts=Vertragsentwürfe
 CloseRefusedBecauseOneServiceActive=Der Vertrag kann nicht geschlossen werden, da noch mindestens eine offene Leistung vorhanden ist.
diff --git a/htdocs/langs/de_DE/errors.lang b/htdocs/langs/de_DE/errors.lang
index 5e5328d3898..3d2231626ee 100644
--- a/htdocs/langs/de_DE/errors.lang
+++ b/htdocs/langs/de_DE/errors.lang
@@ -218,11 +218,12 @@ ErrorVariableKeyForContentMustBeSet=Fehler, die Konstante mit dem Namen %s (mit
 ErrorURLMustStartWithHttp=Die URL %s muss mit http: // oder https: // beginnen.
 ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Error, delete payment linked to a closed invoice is not possible.
+ErrorSearchCriteriaTooSmall=Search criteria too small.
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 WarningPasswordSetWithNoAccount=Es wurde ein Passwort für dieses Mitglied vergeben, aber kein Benutzer erstellt. Das Passwort wird gespeichert, aber kann nicht für die Anmeldung an Dolibarr verwendet werden. Es kann von einem externen Modul/einer Schnittstelle verwendet werden, aber wenn Sie kein Login oder Passwort für dieses Mitglied definiert müssen, können Sie die Option "Login für jedes Mitglied verwalten" in den Mitgliedseinstellungen deaktivieren. Wenn Sie ein Login aber kein Passwort benötige, lassen Sie dieses Feld leer, um diese Meldung zu deaktivieren. Anmerkung: Die E-Mail-Adresse kann auch zur Anmeldung verwendet werden, wenn das Mitglied mit einem Benutzer verbunden wird.
-WarningMandatorySetupNotComplete=Click here to setup mandatory parameters
-WarningEnableYourModulesApplications=Click here to enable your modules and applications
+WarningMandatorySetupNotComplete=Hier klicken, um obligatorische Einstellungen vorzunehmen
+WarningEnableYourModulesApplications=Hier klicken, um Module/Applikationen freizuschalten
 WarningSafeModeOnCheckExecDir=Achtung: Der PHP-Option <b>safe_mode</b> ist aktiviert, entsprechend müssen Befehle in einem mit <b>safe_mode_exec_dir</b> gekennzeichneten Verzeichnis ausgeführt werden.
 WarningBookmarkAlreadyExists=Ein Favorit mit diesem Titel oder dieser Adresse existiert bereits.
 WarningPassIsEmpty=Warnung: Derzeit ist kein Datenbankpasswort gesetzt. Dies ist eine Sicherheitslücke. Konfigurieren Sie schnellstmöglich ein Passwort für den Datenbankzugriff und passen Sie Ihre conf.php entsprechend an.
diff --git a/htdocs/langs/de_DE/install.lang b/htdocs/langs/de_DE/install.lang
index 92e61c2793d..cf79e01463b 100644
--- a/htdocs/langs/de_DE/install.lang
+++ b/htdocs/langs/de_DE/install.lang
@@ -22,7 +22,7 @@ ErrorPHPDoesNotSupportSessions=Your PHP installation does not support sessions.
 ErrorPHPDoesNotSupportGD=Your PHP installation does not support GD graphical functions. No graphs will be available.
 ErrorPHPDoesNotSupportCurl=Ihre PHP-Version unterstützt die Erweiterung Curl nicht
 ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr cannot work correctly. Resolve this before installing Dolibarr.
-ErrorPHPDoesNotSupportIntl=Your PHP installation does not support Intl functions.
+ErrorPHPDoesNotSupportIntl=Ihre PHP-Konfiguration unterstützt keine Internationalisierungsfunktion (intl-extension).
 ErrorDirDoesNotExists=Das Verzeichnis %s existiert nicht.
 ErrorGoBackAndCorrectParameters=Gehen Sie zurück und prüfen/korrigieren Sie die Parameter.
 ErrorWrongValueForParameter=Sie haben einen falschen Wert für den Parameter '%s' eingegeben.
@@ -128,7 +128,7 @@ IfAlreadyExistsCheckOption=Sollte dieser Name korrekt und die Datenbank noch nic
 OpenBaseDir=PHP openbasedir Einstellungen
 YouAskToCreateDatabaseSoRootRequired=You checked the box "Create database". For this, you need to provide the login/password of superuser (bottom of form).
 YouAskToCreateDatabaseUserSoRootRequired=You checked the box "Create database owner". For this, you need to provide the login/password of superuser (bottom of form).
-NextStepMightLastALongTime=The current step may take several minutes. Please wait until the next screen is shown completely before continuing.
+NextStepMightLastALongTime=Der aktuelle Vorgang kann einige Zeit in Anspruch nehmen.\nBitte warten Sie in jedem Fall bis der nächste Schritt angezeigt wird und fahren Sie erst dann fort.
 MigrationCustomerOrderShipping=Migrate shipping for sales orders storage
 MigrationShippingDelivery=Aktualisiere die Speicherung von Lieferungen (Versandart?)
 MigrationShippingDelivery2=Aktualisiere die Speicherung von Lieferungen 2 (Versandart 2?)
diff --git a/htdocs/langs/de_DE/main.lang b/htdocs/langs/de_DE/main.lang
index ae6ad4131a0..dd0ed1c7865 100644
--- a/htdocs/langs/de_DE/main.lang
+++ b/htdocs/langs/de_DE/main.lang
@@ -28,6 +28,7 @@ NoTemplateDefined=Für diesen E-Mail-Typ ist keine Vorlage verfügbar
 AvailableVariables=verfügbare Variablen
 NoTranslation=Keine Übersetzung
 Translation=Übersetzung
+EmptySearchString=Enter a non empty search string
 NoRecordFound=Keinen Eintrag gefunden
 NoRecordDeleted=Keine Datensätze gelöscht
 NotEnoughDataYet=nicht genügend Daten
@@ -469,7 +470,7 @@ NoOpenedElementToProcess=Kein Element zum Verarbeiten geöffnet
 Available=Verfügbar
 NotYetAvailable=Noch nicht verfügbar
 NotAvailable=Nicht verfügbar
-Categories= Suchwörter/Kategorien
+Categories=Kategorien
 Category=Suchwort/Kategorie
 By=Durch
 From=Von
@@ -704,6 +705,7 @@ DateOfSignature=Datum der Unterzeichnung
 HidePassword=Sichere Passworteingabe (Zeichen nicht angezeigt)
 UnHidePassword=Passwort in Klartext anzeigen
 Root=Stammordner
+RootOfMedias=Root of public medias (/medias)
 Informations=Information
 Page=Seite
 Notes=Hinweise
@@ -981,3 +983,10 @@ PaymentInformation=Zahlungsdaten
 ValidFrom=Gültig ab
 ValidUntil=Gültig bis
 NoRecordedUsers=Keine Benutzer
+ToClose=To close
+ToProcess=Zu bearbeiten
+ToApprove=To approve
+GlobalOpenedElemView=Global view
+NoArticlesFoundForTheKeyword=No article found for the keyword '<strong>%s</strong>'
+NoArticlesFoundForTheCategory=No article found for the category
+ToAcceptRefuse=To accept | refuse
diff --git a/htdocs/langs/de_DE/members.lang b/htdocs/langs/de_DE/members.lang
index 56c6c2d04f3..9906d713376 100644
--- a/htdocs/langs/de_DE/members.lang
+++ b/htdocs/langs/de_DE/members.lang
@@ -29,6 +29,7 @@ MenuMembersUpToDate=Aktuelle Mitglieder
 MenuMembersNotUpToDate=Deaktivierte Mitglieder
 MenuMembersResiliated=Deaktivierte Mitglieder
 MembersWithSubscriptionToReceive=Mitglieder mit ausstehendem Beitrag
+MembersWithSubscriptionToReceiveShort=Subscription to receive
 DateSubscription=Abo-Datum
 DateEndSubscription=Abo-Ablaufdatum
 EndSubscription=Abo-Ende
diff --git a/htdocs/langs/de_DE/products.lang b/htdocs/langs/de_DE/products.lang
index c21d97aeafe..6b163a857c8 100644
--- a/htdocs/langs/de_DE/products.lang
+++ b/htdocs/langs/de_DE/products.lang
@@ -81,7 +81,7 @@ ErrorProductBadRefOrLabel=Für Artikel Nr. oder Bezeichnung wurde ein ungültige
 ErrorProductClone=Beim Duplizieren des Produkts oder der Leistung ist ein Problem aufgetreten
 ErrorPriceCantBeLowerThanMinPrice=Fehler, Preis darf nicht unter dem Minimalpreis liegen.
 Suppliers=Lieferanten
-SupplierRef=Hersteller-SKU
+SupplierRef=Lieferanten-Artikelnummer
 ShowProduct=Produkt anzeigen
 ShowService=Leistung anzeigen
 ProductsAndServicesArea=Produkt- und Leistungsübersicht
diff --git a/htdocs/langs/de_DE/projects.lang b/htdocs/langs/de_DE/projects.lang
index 73967c79610..1461937e24f 100644
--- a/htdocs/langs/de_DE/projects.lang
+++ b/htdocs/langs/de_DE/projects.lang
@@ -76,7 +76,13 @@ MyProjects=Meine Projekte
 MyProjectsArea=meine Projekte - Übersicht
 DurationEffective=Effektivdauer
 ProgressDeclared=Angegebener Fortschritt
+TaskProgressSummary=Task progress
+CurentlyOpenedTasks=Curently opened tasks
+TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared progress is less %s than the calculated progression
+TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared progress is more %s than the calculated progression
 ProgressCalculated=Kalkulierter Fortschritt
+WhichIamLinkedTo=which I'm linked to
+WhichIamLinkedToProject=which I'm linked to project
 Time=Zeitaufwand
 ListOfTasks=Aufgabenliste
 GoToListOfTimeConsumed=Liste der verwendeten Zeit aufrufen
diff --git a/htdocs/langs/de_DE/website.lang b/htdocs/langs/de_DE/website.lang
index ec04253430d..de913e9ac0d 100644
--- a/htdocs/langs/de_DE/website.lang
+++ b/htdocs/langs/de_DE/website.lang
@@ -2,7 +2,7 @@
 Shortname=Code
 WebsiteSetupDesc=Create here the websites you wish to use. Then go into menu Websites to edit them.
 DeleteWebsite=Website löschen
-ConfirmDeleteWebsite=Möchten Sie diese Webseite wirklich löschen? Alle Seiten inklusive deren Inhalte werden auch gelöscht.
+ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed. The files uploaded (like into the medias directory, the ECM module, ...) will remain.
 WEBSITE_TYPE_CONTAINER=Art der Seite/Containers
 WEBSITE_PAGE_EXAMPLE=Seite die als Beispiel verwendet werden soll
 WEBSITE_PAGENAME=Seitenname/Alias
@@ -14,6 +14,9 @@ WEBSITE_JS_INLINE=Javascript-Dateiinhalt (für alle Seiten gleich)
 WEBSITE_HTML_HEADER=Diesen Code am Schluss des HTML Headers anhängen (für alle Seiten gleich)
 WEBSITE_ROBOT=Roboterdatei (robots.txt)
 WEBSITE_HTACCESS=Website  .htaccess Datei 
+WEBSITE_MANIFEST_JSON=Website manifest.json file
+WEBSITE_README=README.md file
+EnterHereLicenseInformation=Enter here meta data or license information to fille a README.md file. if you distribute your website as a template, the file will be included into the temptate package.
 HtmlHeaderPage=HTML Header (Nur für diese Seite)
 PageNameAliasHelp=Name oder Alias der Seite. <br>Dieser Alias wird auch zum erstellen einer SEO URL verwendet, wenn die Webseite auf einem Virtuellen Webserver läuft. Verwenden Sie der Button "<strong>%s</strong>" um den Alias zu ändern.
 EditTheWebSiteForACommonHeader=Hinweis: Um einen personalisierten Header für alles Seiten zu erstellen, muss der Header auf Site-Level bearbeitet werden, anstelle auf Seiten/Containerebene.
@@ -41,6 +44,7 @@ RealURL=Echte URL
 ViewWebsiteInProduction=Anzeige der Webseite über die Startseite\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\nüber die URL der Homepage
 SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then set the name of the virtual host you have created in the properties of web site, so the preview can be done also using this dedicated web server access instead of the internal Dolibarr server.
 YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
 CheckVirtualHostPerms=Kontrolliere dass auch der Virtuelle Host die <strong>%s</strong> Berechtigung für die die Dateien in <br><strong>%s</strong> hat
 ReadPerm=Lesen
 WritePerm=Schreiben
@@ -75,7 +79,8 @@ AddWebsiteAccount=Website-Konto erstellen
 BackToListOfThirdParty=Zurück zur Liste für Drittanbieter
 DisableSiteFirst=Webseite zuerst deaktivieren
 MyContainerTitle=Titel der Website
-AnotherContainer=Ein weiterer Container
+AnotherContainer=This is how to include content of another page/container (you may have an error here if you enable dynamic code because the embedded subcontainer may not exists)
+SorryWebsiteIsCurrentlyOffLine=Sorry, this website is currently off line. Please comme back later...
 WEBSITE_USE_WEBSITE_ACCOUNTS=Benutzertabelle für Webseite aktivieren
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / third party
 YouMustDefineTheHomePage=Zuerst muss die Startseite definiert sein
@@ -89,7 +94,8 @@ AliasPageAlreadyExists=Alisseite <strong>%s</strong> existiert schon
 CorporateHomePage=Firmenwebseite
 EmptyPage=Leere Seite
 ExternalURLMustStartWithHttp=Externe URL muss mit http:// oder https:// beginnen
-ZipOfWebsitePackageToImport=Zip file of website package
+ZipOfWebsitePackageToImport=Upload the Zip file of the website template package
+ZipOfWebsitePackageToLoad=or Choose an available embedded website template package
 ShowSubcontainers=Dynamische Inhalte einfügen
 InternalURLOfPage=Interne URL der Seite
 ThisPageIsTranslationOf=This page/container is a translation of
@@ -101,5 +107,10 @@ NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynam
 ReplaceWebsiteContent=Search or Replace website content
 DeleteAlsoJs=Delete also all javascript files specific to this website?
 DeleteAlsoMedias=Delete also all medias files specific to this website?
-# Export
 MyWebsitePages=My website pages
+SearchReplaceInto=Search | Replace into
+ReplaceString=New string
+CSSContentTooltipHelp=Enter here CSS content. To avoid any conflict with the CSS of the application, be sure to prepend all declaration with the .bodywebsite class. For example:<br><br>#mycssselector, input.myclass:hover { ... }<br>must be<br>.bodywebsite #mycssselector, .bodywebsite input.myclass:hover { ... }<br><br>Note: If you have a large file without this prefix, you can use 'lessc' to convert it to append the .bodywebsite prefix everywhere.
+LinkAndScriptsHereAreNotLoadedInEditor=Warning: This content is output only when site is accessed from a server. It is not used in Edit mode so if you need to load javascript files also in edit mode, just add your tag 'script src=...' into the page.
+Dynamiccontent=Sample of a page with dynamic content
+ImportSite=Website-Vorlage importieren
diff --git a/htdocs/langs/el_GR/admin.lang b/htdocs/langs/el_GR/admin.lang
index ba4fa37adc8..92a8cbe0dcb 100644
--- a/htdocs/langs/el_GR/admin.lang
+++ b/htdocs/langs/el_GR/admin.lang
@@ -400,6 +400,7 @@ OldVATRates=Παλιός συντελεστής ΦΠΑ
 NewVATRates=Νέος συντελεστής ΦΠΑ
 PriceBaseTypeToChange=Τροποποίηση τιμών με βάση την τιμή αναφοράς όπως ρυθμίστηκε στο
 MassConvert=Launch bulk conversion
+PriceFormatInCurrentLanguage=Price Format In Current Language
 String=String
 TextLong=Μεγάλο κείμενο
 HtmlText=Html text
@@ -431,7 +432,7 @@ ExtrafieldParamHelpradio=List of values must be lines with format key,value (whe
 ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- idfilter is necessarly a primary int key<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=List of values 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>Examples:<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
-ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default)<br>Set this to 2 for a collapsing separator (collapsed by default)
+ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Βιβλιοθήκη δημιουργίας PDF
 LocalTaxDesc=Some countries may apply two or three taxes on each invoice line. If this is the case, choose the type for the 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)
 SMS=SMS
@@ -1695,7 +1696,7 @@ SuppliersInvoiceNumberingModel=Vendor invoices numbering models
 IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=GeoIP Maxmind module setup
-PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat
+PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoLite2-Country.mmdb
 NoteOnPathLocation=Note that your ip to country data file must be inside a directory your PHP can read (Check your PHP open_basedir setup and filesystem permissions).
 YouCanDownloadFreeDatFileTo=You can download a <b>free demo version</b> of the Maxmind GeoIP country file at %s.
 YouCanDownloadAdvancedDatFileTo=You can also download a more <b>complete version, with updates,</b> of the Maxmind GeoIP country file at %s.
@@ -1926,14 +1927,13 @@ SmallerThan=Smaller than
 LargerThan=Larger than
 IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID is found into incoming email, the event will be automatically linked to the related objects.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
-IFTTTSetup=IFTTT module setup
-IFTTT_SERVICE_KEY=IFTTT Service key
-IFTTT_DOLIBARR_ENDPOINT_SECUREKEY=Security key to secure the endpoint URL used by IFTTT to send messages to your Dolibarr.
-IFTTTDesc=This module is designed to trigger events on IFTTT and/or to execute some action on external IFTTT triggers.
-UrlForIFTTT=URL endpoint for IFTTT
-YouWillFindItOnYourIFTTTAccount=You will find it on your IFTTT account
 EndPointFor=End point for %s : %s
 DeleteEmailCollector=Delete email collector
 ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
 RecipientEmailsWillBeReplacedWithThisValue=Recipient emails will be always replaced with this value
 AtLeastOneDefaultBankAccountMandatory=At least 1 default bank account must be defined
+RESTRICT_API_ON_IP=Allow available APIs to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can use the available APIs.
+RESTRICT_ON_IP=Allow access to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can access.
+BaseOnSabeDavVersion=Based on the library SabreDAV version
+NotAPublicIp=Not a public IP
+MakeAnonymousPing=Make an anonymous Ping '+1' to the Dolibarr foundation server (done 1 time only after installation) to allow the foundation to count the number of Dolibarr installation.
diff --git a/htdocs/langs/el_GR/banks.lang b/htdocs/langs/el_GR/banks.lang
index b12849fe6ed..552a6b7adc5 100644
--- a/htdocs/langs/el_GR/banks.lang
+++ b/htdocs/langs/el_GR/banks.lang
@@ -73,6 +73,7 @@ BankTransaction=Bank entry
 ListTransactions=Λίστα εγγραφών
 ListTransactionsByCategory=Λίστα εγγραφών./κατηγορία
 TransactionsToConciliate=Entries to reconcile
+TransactionsToConciliateShort=To reconcile
 Conciliable=Μπορεί να πραγματοποιηθεί
 Conciliate=Πραγματοποίηση Συναλλαγής
 Conciliation=Πραγματοποίηση Συναλλαγής
@@ -116,6 +117,7 @@ DeleteCheckReceipt=Διαγραφή απόδειξης παραλαβής επι
 ConfirmDeleteCheckReceipt=Είστε σίγουροι πως θέλετε να διαγράψετε αυτή την απόδειξη παραλαβής επιταγής;
 BankChecks=Τραπεζικές Επιταγές
 BankChecksToReceipt=Επιταγές που αναμένουν κατάθεση
+BankChecksToReceiptShort=Επιταγές που αναμένουν κατάθεση
 ShowCheckReceipt=Ελέγξτε την απόδειξη κατάθεσης
 NumberOfCheques=No. of check
 DeleteTransaction=Delete entry
diff --git a/htdocs/langs/el_GR/cashdesk.lang b/htdocs/langs/el_GR/cashdesk.lang
index 496974a0115..a2c72e88f3d 100644
--- a/htdocs/langs/el_GR/cashdesk.lang
+++ b/htdocs/langs/el_GR/cashdesk.lang
@@ -62,6 +62,7 @@ TicketVatGrouped=Group VAT by rate in tickets
 AutoPrintTickets=Automatically print tickets
 EnableBarOrRestaurantFeatures=Enable features for Bar or Restaurant
 ConfirmDeletionOfThisPOSSale=Do your confirm the deletion of this current sale ?
+ConfirmDiscardOfThisPOSSale=Do you want to discard this current sale ?
 History=Ιστορικό
 ValidateAndClose=Validate and close
 Terminal=Terminal
@@ -69,3 +70,8 @@ NumberOfTerminals=Number of Terminals
 TerminalSelect=Select terminal you want to use:
 POSTicket=POS Ticket
 BasicPhoneLayout=Use basic layout for phones
+SetupOfTerminalNotComplete=Setup of terminal %s is not complete
+DirectPayment=Direct payment
+DirectPaymentButton=Direct cash payment button
+InvoiceIsAlreadyValidated=Invoice is already validated
+NoLinesToBill=No lines to bill
diff --git a/htdocs/langs/el_GR/companies.lang b/htdocs/langs/el_GR/companies.lang
index 67fadea2908..6bae7cd7086 100644
--- a/htdocs/langs/el_GR/companies.lang
+++ b/htdocs/langs/el_GR/companies.lang
@@ -54,6 +54,7 @@ Firstname=Όνομα
 PostOrFunction=Θέση εργασίας
 UserTitle=Τίτλος
 NatureOfThirdParty=Nature of Third party
+NatureOfContact=Nature of Contact
 Address=Διεύθυνση
 State=Πολιτεία/Επαρχία
 StateShort=Κατάσταση
diff --git a/htdocs/langs/el_GR/contracts.lang b/htdocs/langs/el_GR/contracts.lang
index 627157a7cdf..8f301040f46 100644
--- a/htdocs/langs/el_GR/contracts.lang
+++ b/htdocs/langs/el_GR/contracts.lang
@@ -51,6 +51,7 @@ ListOfClosedServices=Λίστα κλεισμένων υπηρεσιών
 ListOfRunningServices=Λίστα τρέχουσων υπηρεσιών
 NotActivatedServices=Inactive services (among validated contracts)
 BoardNotActivatedServices=Υπηρεσίες προς ενεργοποίηση σε επικυρωμένα συμβόλαια
+BoardNotActivatedServicesShort=Services to activate
 LastContracts=Τελευταία %s Συμβόλαια
 LastModifiedServices=Τελευταίες %s  τροποποιημένες υπηρεσίες
 ContractStartDate=Ημερ. έναρξης
@@ -64,7 +65,10 @@ DateStartRealShort=Real start date
 DateEndReal=Real end date
 DateEndRealShort=Real end date
 CloseService=Close service
-BoardRunningServices=Εκπρόθεσμες ενεργές υπηρεσίες
+BoardRunningServices=Services running
+BoardRunningServicesShort=Services running
+BoardExpiredServices=Services expired
+BoardExpiredServicesShort=Services expired
 ServiceStatus=Κατάσταση υπηρεσίας
 DraftContracts=Προσχέδια συμβολαίων
 CloseRefusedBecauseOneServiceActive=Contract can't be closed as there is at least one open service on it
diff --git a/htdocs/langs/el_GR/errors.lang b/htdocs/langs/el_GR/errors.lang
index 9a3f85ac11a..83c44b5f988 100644
--- a/htdocs/langs/el_GR/errors.lang
+++ b/htdocs/langs/el_GR/errors.lang
@@ -218,6 +218,7 @@ ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text
 ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Error, delete payment linked to a closed invoice is not possible.
+ErrorSearchCriteriaTooSmall=Search criteria too small.
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 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/main.lang b/htdocs/langs/el_GR/main.lang
index 98b6c9bc764..40f4bf6759a 100644
--- a/htdocs/langs/el_GR/main.lang
+++ b/htdocs/langs/el_GR/main.lang
@@ -28,6 +28,7 @@ NoTemplateDefined=No template available for this email type
 AvailableVariables=Διαθέσιμες μεταβλητές αντικατάστασης
 NoTranslation=Δεν μεταφράστηκε
 Translation=Μετάφραση
+EmptySearchString=Enter a non empty search string
 NoRecordFound=Δεν υπάρχουν καταχωρημένα στοιχεία
 NoRecordDeleted=Δεν διαγράφηκε εγγραφή
 NotEnoughDataYet=Τα δεδομένα δεν είναι επαρκή
@@ -704,6 +705,7 @@ DateOfSignature=Ημερομηνία υπογραφής
 HidePassword=Εμφάνιση πραγματικής εντολής με απόκρυψη του κωδικού
 UnHidePassword=Εμφάνιση πραγματικής εντολής με εμφάνιση του κωδικού
 Root=Ρίζα
+RootOfMedias=Root of public medias (/medias)
 Informations=Πληροφορίες
 Page=Σελίδα
 Notes=Σημειώσεις
@@ -981,3 +983,10 @@ PaymentInformation=Payment information
 ValidFrom=Valid from
 ValidUntil=Valid until
 NoRecordedUsers=No users
+ToClose=To close
+ToProcess=Για την διαδικασία
+ToApprove=To approve
+GlobalOpenedElemView=Global view
+NoArticlesFoundForTheKeyword=No article found for the keyword '<strong>%s</strong>'
+NoArticlesFoundForTheCategory=No article found for the category
+ToAcceptRefuse=To accept | refuse
diff --git a/htdocs/langs/el_GR/members.lang b/htdocs/langs/el_GR/members.lang
index 26e52a39ce7..895cb0c460c 100644
--- a/htdocs/langs/el_GR/members.lang
+++ b/htdocs/langs/el_GR/members.lang
@@ -29,6 +29,7 @@ MenuMembersUpToDate=Up to date members
 MenuMembersNotUpToDate=Out of date members
 MenuMembersResiliated=Terminated members
 MembersWithSubscriptionToReceive=Μέλη αναμένοντα για  λήψη συνδρομής
+MembersWithSubscriptionToReceiveShort=Subscription to receive
 DateSubscription=Ημερομηνία συνδρομής
 DateEndSubscription=Ημερομηνία Λήξης Συνδρομής
 EndSubscription=Λήξη συνδρομής
diff --git a/htdocs/langs/el_GR/projects.lang b/htdocs/langs/el_GR/projects.lang
index b79fe5d0678..cc7793144e1 100644
--- a/htdocs/langs/el_GR/projects.lang
+++ b/htdocs/langs/el_GR/projects.lang
@@ -76,7 +76,13 @@ MyProjects=Τα έργα μου
 MyProjectsArea=My projects Area
 DurationEffective=Αποτελεσματική διάρκεια
 ProgressDeclared=Χαρακτηρίστηκε σε εξέλιξη
+TaskProgressSummary=Task progress
+CurentlyOpenedTasks=Curently opened tasks
+TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared progress is less %s than the calculated progression
+TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared progress is more %s than the calculated progression
 ProgressCalculated=Υπολογιζόμενη πρόοδος
+WhichIamLinkedTo=which I'm linked to
+WhichIamLinkedToProject=which I'm linked to project
 Time=Χρόνος
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
diff --git a/htdocs/langs/el_GR/website.lang b/htdocs/langs/el_GR/website.lang
index 1307d469d99..b3059d0d529 100644
--- a/htdocs/langs/el_GR/website.lang
+++ b/htdocs/langs/el_GR/website.lang
@@ -2,7 +2,7 @@
 Shortname=Κώδικας
 WebsiteSetupDesc=Create here the websites you wish to use. Then go into menu Websites to edit them.
 DeleteWebsite=Διαγραφή ιστοχώρου
-ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed.
+ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed. The files uploaded (like into the medias directory, the ECM module, ...) will remain.
 WEBSITE_TYPE_CONTAINER=Type of page/container
 WEBSITE_PAGE_EXAMPLE=Web page to use as example
 WEBSITE_PAGENAME=Page name/alias
@@ -14,6 +14,9 @@ WEBSITE_JS_INLINE=Javascript file content (common to all pages)
 WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages)
 WEBSITE_ROBOT=Robot file (robots.txt)
 WEBSITE_HTACCESS=Website .htaccess file
+WEBSITE_MANIFEST_JSON=Website manifest.json file
+WEBSITE_README=README.md file
+EnterHereLicenseInformation=Enter here meta data or license information to fille a README.md file. if you distribute your website as a template, the file will be included into the temptate package.
 HtmlHeaderPage=HTML header (specific to this page only)
 PageNameAliasHelp=Name or alias of the page.<br>This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "<strong>%s</strong>" to edit this alias.
 EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container.
@@ -41,6 +44,7 @@ RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
 SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then set the name of the virtual host you have created in the properties of web site, so the preview can be done also using this dedicated web server access instead of the internal Dolibarr server.
 YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
 CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
 ReadPerm=Ανάγνωση
 WritePerm=Write
@@ -75,7 +79,8 @@ AddWebsiteAccount=Create web site account
 BackToListOfThirdParty=Back to list for Third Party
 DisableSiteFirst=Disable website first
 MyContainerTitle=My web site title
-AnotherContainer=Another container
+AnotherContainer=This is how to include content of another page/container (you may have an error here if you enable dynamic code because the embedded subcontainer may not exists)
+SorryWebsiteIsCurrentlyOffLine=Sorry, this website is currently off line. Please comme back later...
 WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / third party
 YouMustDefineTheHomePage=You must first define the default Home page
@@ -89,7 +94,8 @@ AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
 CorporateHomePage=Corporate Home page
 EmptyPage=Empty page
 ExternalURLMustStartWithHttp=External URL must start with http:// or https://
-ZipOfWebsitePackageToImport=Zip file of website package
+ZipOfWebsitePackageToImport=Upload the Zip file of the website template package
+ZipOfWebsitePackageToLoad=or Choose an available embedded website template package
 ShowSubcontainers=Include dynamic content
 InternalURLOfPage=Internal URL of page
 ThisPageIsTranslationOf=This page/container is a translation of
@@ -101,5 +107,10 @@ NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynam
 ReplaceWebsiteContent=Search or Replace website content
 DeleteAlsoJs=Delete also all javascript files specific to this website?
 DeleteAlsoMedias=Delete also all medias files specific to this website?
-# Export
 MyWebsitePages=My website pages
+SearchReplaceInto=Search | Replace into
+ReplaceString=New string
+CSSContentTooltipHelp=Enter here CSS content. To avoid any conflict with the CSS of the application, be sure to prepend all declaration with the .bodywebsite class. For example:<br><br>#mycssselector, input.myclass:hover { ... }<br>must be<br>.bodywebsite #mycssselector, .bodywebsite input.myclass:hover { ... }<br><br>Note: If you have a large file without this prefix, you can use 'lessc' to convert it to append the .bodywebsite prefix everywhere.
+LinkAndScriptsHereAreNotLoadedInEditor=Warning: This content is output only when site is accessed from a server. It is not used in Edit mode so if you need to load javascript files also in edit mode, just add your tag 'script src=...' into the page.
+Dynamiccontent=Sample of a page with dynamic content
+ImportSite=Import website template
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 367ff6672a5..bc9981faf3f 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1685,7 +1685,7 @@ SuppliersSetup=Vendor module setup
 SuppliersCommandModel=Complete template of purchase order (logo...)
 SuppliersInvoiceModel=Complete template of vendor invoice (logo...)
 SuppliersInvoiceNumberingModel=Vendor invoices numbering models
-IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
+IfSetToYesDontForgetPermission=If set to a non null value, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=GeoIP Maxmind module setup
 PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat
@@ -1919,3 +1919,4 @@ DeleteEmailCollector=Delete email collector
 ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
 RecipientEmailsWillBeReplacedWithThisValue=Recipient emails will be always replaced with this value
 AtLeastOneDefaultBankAccountMandatory=At least 1 default bank account must be defined
+FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
\ No newline at end of file
diff --git a/htdocs/langs/en_US/companies.lang b/htdocs/langs/en_US/companies.lang
index dccd53c597a..532fbf14cb7 100644
--- a/htdocs/langs/en_US/companies.lang
+++ b/htdocs/langs/en_US/companies.lang
@@ -96,8 +96,6 @@ LocalTax1IsNotUsedES= RE is not used
 LocalTax2IsUsed=Use third tax
 LocalTax2IsUsedES= IRPF is used
 LocalTax2IsNotUsedES= IRPF is not used
-LocalTax1ES=RE
-LocalTax2ES=IRPF
 WrongCustomerCode=Customer code invalid
 WrongSupplierCode=Vendor code invalid
 CustomerCodeModel=Customer code model
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 5e55597c306..f6753f1b87a 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -821,6 +821,7 @@ Mandatory=Mandatory
 Hello=Hello
 GoodBye=GoodBye
 Sincerely=Sincerely
+ConfirmDeleteObject=Are you sure you want to delete this object?
 DeleteLine=Delete line
 ConfirmDeleteLine=Are you sure you want to delete this line?
 NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked record
diff --git a/htdocs/langs/en_US/orders.lang b/htdocs/langs/en_US/orders.lang
index ad895845488..c170e4c1248 100644
--- a/htdocs/langs/en_US/orders.lang
+++ b/htdocs/langs/en_US/orders.lang
@@ -152,7 +152,7 @@ OrderCreated=Your orders have been created
 OrderFail=An error happened during your orders creation
 CreateOrders=Create orders
 ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s".
-OptionToSetOrderBilledNotEnabled=Option (from module Workflow) to set order to 'Billed' automatically when invoice is validated is off, so you will have to set status of order to 'Billed' manually.
+OptionToSetOrderBilledNotEnabled=Option from module Workflow, to set order to 'Billed' automatically when invoice is validated, is not enabled, so you will have to set the status of orders to 'Billed' manually after the invoice has been generated.
 IfValidateInvoiceIsNoOrderStayUnbilled=If invoice validation is 'No', the order will remain to status 'Unbilled' until the invoice is validated.
-CloseReceivedSupplierOrdersAutomatically=Close order to "%s" automatically if all products are received.
+CloseReceivedSupplierOrdersAutomatically=Close order to status "%s" automatically if all products are received.
 SetShippingMode=Set shipping mode
diff --git a/htdocs/langs/en_US/sendings.lang b/htdocs/langs/en_US/sendings.lang
index ede7fea87b7..f3f023f8dcf 100644
--- a/htdocs/langs/en_US/sendings.lang
+++ b/htdocs/langs/en_US/sendings.lang
@@ -21,6 +21,7 @@ QtyShipped=Qty shipped
 QtyShippedShort=Qty ship.
 QtyPreparedOrShipped=Qty prepared or shipped
 QtyToShip=Qty to ship
+QtyToReceive=Qty to receive
 QtyReceived=Qty received
 QtyInOtherShipments=Qty in other shipments
 KeepToShip=Remain to ship
@@ -46,6 +47,7 @@ DateDeliveryPlanned=Planned date of delivery
 RefDeliveryReceipt=Ref delivery receipt
 StatusReceipt=Status delivery receipt
 DateReceived=Date delivery received
+ClassifyReception=Classify reception
 SendShippingByEMail=Send shipment by email
 SendShippingRef=Submission of shipment %s
 ActionsOnShipping=Events on shipment
diff --git a/htdocs/langs/en_US/stocks.lang b/htdocs/langs/en_US/stocks.lang
index fd89d432360..17f914b7405 100644
--- a/htdocs/langs/en_US/stocks.lang
+++ b/htdocs/langs/en_US/stocks.lang
@@ -55,7 +55,7 @@ PMPValue=Weighted average price
 PMPValueShort=WAP
 EnhancedValueOfWarehouses=Warehouses value
 UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
-AllowAddLimitStockByWarehouse=Manage also values for minimum and desired stock per pairing (product-warehouse) in addition to values per product
+AllowAddLimitStockByWarehouse=Manage also value for minimum and desired stock per pairing (product-warehouse) in addition to the value for minimum and desired stock per product
 IndependantSubProductStock=Product stock and subproduct stock are independent
 QtyDispatched=Quantity dispatched
 QtyDispatchedShort=Qty dispatched
@@ -182,7 +182,7 @@ SelectFournisseur=Vendor filter
 inventoryOnDate=Inventory
 INVENTORY_DISABLE_VIRTUAL=Virtual product (kit): do not decrement stock of a child product
 INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=Use the buy price if no last buy price can be found
-INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT=Stock movement has date of inventory
+INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Stock movements will have the date of inventory (instead of the date of inventory validation)
 inventoryChangePMPPermission=Allow to change PMP value for a product
 ColumnNewPMP=New unit PMP
 OnlyProdsInStock=Do not add product without stock
diff --git a/htdocs/langs/es_ES/accountancy.lang b/htdocs/langs/es_ES/accountancy.lang
index cf6f11de763..3ce22629638 100644
--- a/htdocs/langs/es_ES/accountancy.lang
+++ b/htdocs/langs/es_ES/accountancy.lang
@@ -265,7 +265,7 @@ AccountingJournals=Diarios contables
 AccountingJournal=Diario contable
 NewAccountingJournal=Nuevo diario contable
 ShowAccoutingJournal=Mostrar diario contable
-NatureOfJournal=Nature of Journal
+NatureOfJournal=Naturaleza del diario
 AccountingJournalType1=Operaciones varias
 AccountingJournalType2=Ventas
 AccountingJournalType3=Compras
@@ -291,7 +291,7 @@ Modelcsv_quadratus=Exportar a Quadratus QuadraCompta
 Modelcsv_ebp=Exportar a EBP
 Modelcsv_cogilog=Eportar a Cogilog
 Modelcsv_agiris=Exportar a Agiris
-Modelcsv_LDCompta=Export for LD Compta (v9 & higher) (Test)
+Modelcsv_LDCompta=Exportar para LD Compta (v9 y superior) (En pruebas)
 Modelcsv_openconcerto=Exportar a OpenConcerto (En pruebas)
 Modelcsv_configurable=Exportación CSV Configurable
 Modelcsv_FEC=Exportación FEC
@@ -302,7 +302,7 @@ ChartofaccountsId=Id plan contable
 InitAccountancy=Iniciar contabilidad
 InitAccountancyDesc=Puede usar esta página para inicializar el código contable en productos y servicios que no tienen código contable definido para ventas y compras
 DefaultBindingDesc=Esta página puede usarse para establecer una cuenta predeterminada que se utilizará para enlazar registros de salarios, donaciones, impuestos e IVA cuando no tengan establecida una cuenta contable.
-DefaultClosureDesc=This page can be used to set parameters used for accounting closures.
+DefaultClosureDesc=Esta página se puede usar para configurar los parámetros que se usarán en los cierres contables.
 Options=Opciones
 OptionModeProductSell=Modo ventas
 OptionModeProductSellIntra=Modo Ventas exportación CEE
diff --git a/htdocs/langs/es_ES/admin.lang b/htdocs/langs/es_ES/admin.lang
index e801f9609f6..efaa43dde81 100644
--- a/htdocs/langs/es_ES/admin.lang
+++ b/htdocs/langs/es_ES/admin.lang
@@ -400,6 +400,7 @@ OldVATRates=Tasa de IVA antigua
 NewVATRates=Tasa de IVA nueva
 PriceBaseTypeToChange=Cambiar el precio cuya referencia de base es
 MassConvert=Lanzar la conversión en masa
+PriceFormatInCurrentLanguage=Price Format In Current Language
 String=Cadena de texto
 TextLong=Texto largo
 HtmlText=Texto html
@@ -431,7 +432,7 @@ ExtrafieldParamHelpradio=El listado de valores tiene que ser líneas con el form
 ExtrafieldParamHelpsellist=Lista de valores proviene de una tabla <br> Sintaxis: nombre_tabla: etiqueta_field: id_field :: filtro <br> Ejemplo: c_typent: libelle: id :: filtro <br> <br> filtro puede ser una prueba simple (por ejemplo, activa = 1) Para mostrar sólo el valor activo <br> También puede utilizar $ ID $ en el filtro witch es el actual id del objeto actual <br> Para hacer un SELECT en el filtro de uso $ SEL $ <br> si desea filtrar en campos adicionales utilizar la sintaxis Extra.fieldcode = ... (donde código de campo es el código de campo adicional) <br> <br> Para que la lista dependa de otra lista de campos adicionales: <br> c_typent: libelle: id: options_ <i> parent_list_code </i> | parent_column: filter <br> <br> Para que la lista dependa de otra lista: <br> c_typent: libelle: id: <i> parent_list_code </i> | parent_column: filter
 ExtrafieldParamHelpchkbxlst=Lista de valores proviene de una tabla <br> Sintaxis: nombre_tabla: etiqueta_field: id_field :: filtro <br> Ejemplo: c_typent: libelle: id :: filtro <br> <br> filtro puede ser una prueba simple (por ejemplo, activa = 1) Para mostrar sólo el valor activo <br> También puede utilizar $ ID $ en el filtro witch es el id actual del objeto actual <br> Para hacer un SELECT en el filtro de uso $ SEL $ <br> si desea filtrar en campos adicionales utilizar la sintaxis Extra.fieldcode = ... (donde código de campo es el código de campo adicional) <br> <br> Para que la lista dependa de otra lista de campos adicionales: <br> c_typent: libelle: id: options_ <i> parent_list_code </i> | parent_column: filter <br> <br> Para que la lista dependa de otra lista: <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: <br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
-ExtrafieldParamHelpSeparator=Mantener vacío para un separador simple. <br> Establézcalo a 1 para un separador colapsado (abierto de manera predeterminada) <br> Establézcalo a 2 para un separador de colapso (colapsado de forma predeterminada)
+ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Libreria usada en la generación de los PDF
 LocalTaxDesc=Algunos países aplican 2 o 3 tasas a cada línea de factura. Si es el caso, escoja el tipo de la segunda y tercera tasa y su valor. Los posibles tipos son:<br>1 : tasa local aplicable a productos y servicios sin IVA (tasa local es calculada sobre la base imponible)<br>2 : tasa local se aplica a productos y servicios incluyendo el IVA (tasa local es calculada sobre base imponible+IVA)<br>3 : tasa local se aplica a productos sin IVA (tasa local es calculada sobre la base imponible)<br>4 : tasa local se aplica a productos incluyendo el IVA (tasa local es calculada sobre base imponible+IVA)<br>5 : tasa local se aplica a servicios sin IVA (tasa local es calculada sobre base imponible)<br>6 : tasa local se aplica a servicios incluyendo el IVA (tasa local es calculada sobre base imponible+IVA)
 SMS=SMS
@@ -574,7 +575,7 @@ Module510Name=Salarios
 Module510Desc=Registro y seguimiento del pago de los salarios de sus empleados
 Module520Name=Préstamos
 Module520Desc=Gestión de créditos
-Module600Name=Notifications on business event
+Module600Name=Notificaciones sobre eventos
 Module600Desc=Envía notificaciones por e-mail desencadenados por algunos eventos a los usuarios (configuración definida para cada usuario), los contactos de terceros (configuración definida en cada tercero) o e-mails definidos
 Module600Long=Tenga en cuenta que este módulo envía mensajes de e-mail en tiempo real cuando se produce un evento. Si está buscando una función para enviar recordatorios por e-mail de los eventos de su agenda, vaya a la configuración del módulo Agenda.
 Module610Name=Variantes de productos
@@ -1193,7 +1194,7 @@ ExtraFieldsSupplierOrders=Campos adicionales (pedidos a proveedores)
 ExtraFieldsSupplierInvoices=Campos adicionales (facturas)
 ExtraFieldsProject=Campos adicionales (proyectos)
 ExtraFieldsProjectTask=Campos adicionales (tareas)
-ExtraFieldsSalaries=Complementary attributes (salaries)
+ExtraFieldsSalaries=Campos adicionales (salarios)
 ExtraFieldHasWrongValue=El campo %s tiene un valor no válido
 AlphaNumOnlyLowerCharsAndNoSpace=sólo alfanuméricos y minúsculas sin espacio
 SendmailOptionNotComplete=Atención, en algunos sistemas Linux, con este método de envio, para poder enviar mails en su nombre, la configuración de sendmail debe contener la opción <b>-ba</b> (parámetro <b>mail.force_extra_parameters</b> en el archivo <b>php.ini</b>). Si algunos de sus destinatarios no reciben sus mensajes, pruebe a modificar este parámetro PHP con <b>mail.force_extra_parameters=-ba</b>.
@@ -1221,14 +1222,14 @@ SuhosinSessionEncrypt=Almacenamiento de sesiones cifradas por Suhosin
 ConditionIsCurrently=Actualmente la condición es %s
 YouUseBestDriver=Está usando el driver %s, actualmente es el mejor driver disponible.
 YouDoNotUseBestDriver=Usa el driver %s aunque se recomienda usar el driver %s.
-NbOfObjectIsLowerThanNoPb=You have only %s %s in the database. This does not require any particular optimization.
+NbOfObjectIsLowerThanNoPb=Solo tiene %s %s en la base de datos. Esto no requiere ninguna optimización particular.
 SearchOptim=Buscar optimización
-YouHaveXObjectUseSearchOptim=You have %s %s in the database. You should add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
-YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to 1 in Home-Setup-Other.
+YouHaveXObjectUseSearchOptim=Tiene %s %s en su base de datos. Debería añadir la constante %s a 1 en Inicio-Configuración-Varios, limitando la búsqueda al principio de la cadena lo que hace posible que la base de datos use el índice y se obtenga una respuesta inmediata.
+YouHaveXObjectAndSearchOptimOn=Tiene %s %s en su base de datos y la constante %s configurada como 1 en Inicio-Configuración-Varios
 BrowserIsOK=Usa el navegador web %s. Este navegador está optimizado para la seguridad y el rendimiento.
 BrowserIsKO=Usa el navegador web %s.  Este navegador es una mala opción para la seguridad, rendimiento y fiabilidad. Aconsejamos utilizar Firefox, Chrome, Opera o Safari.
-PHPModuleLoaded=PHP component %s is loaded
-PreloadOPCode=Preloaded OPCode is used
+PHPModuleLoaded=El componente PHP %s está cargado
+PreloadOPCode=Se utiliza OPCode precargado
 AddRefInList=Mostrar código de cliente/proveedor en los listados (y selectores) y enlaces.<br>Los terceros aparecerán con el nombre "CC12345 - SC45678 - The big company coorp", en lugar de "The big company coorp".
 AddAdressInList=Mostrar la dirección del cliente/proveedor en los listados (y selectores) <br>Los terceros aparecerán con el nombre "The big company coorp - 21 jump street 123456 Big town - USA ", en lugar de "The big company coorp".
 AskForPreferredShippingMethod=Consultar por el método preferido de envío a terceros.
@@ -1695,7 +1696,7 @@ SuppliersInvoiceNumberingModel=Modelos de numeración de facturas de proveedor
 IfSetToYesDontForgetPermission=Si está seleccionado, no olvides de modificar los permisos en los grupos o usuarios para permitir la segunda aprobación
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=Configuración del módulo GeoIP Maxmind
-PathToGeoIPMaxmindCountryDataFile=Ruta del archivo Maxmind que contiene las conversiones IP->País.<br>Ejemplo: /usr/local/share/GeoIP/GeoIP.dat
+PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoLite2-Country.mmdb
 NoteOnPathLocation=Tenga en cuenta que este archivo debe estar en un directorio accesible desde su PHP (Compruebe la configuración de open_basedir de su PHP y los permisos de archivo/directorios).
 YouCanDownloadFreeDatFileTo=Puede descargarse una <b>versión demo gratuita</b> del archivo de países Maxmind GeoIP en la dirección %s.
 YouCanDownloadAdvancedDatFileTo=También puede descargarse una <b>versión más completa</b> del archivo de países Maxmind GeoIP en la dirección %s.
@@ -1736,9 +1737,9 @@ ExpenseReportsRulesSetup=Configuración del módulo Informes de gastos - Reglas
 ExpenseReportNumberingModules=Módulo de numeración de informes de gastos
 NoModueToManageStockIncrease=No hay activado módulo para gestionar automáticamente el incremento de stock. El incremento de stock se realizará solamente con entrada manual
 YouMayFindNotificationsFeaturesIntoModuleNotification=Puede encontrar opciones para notificaciones de e-mail activando y configurando el módulo  "Notificaciones".
-ListOfNotificationsPerUser=List of automatic notifications per user*
-ListOfNotificationsPerUserOrContact=List of possible automatic notifications (on business event) available per user* or per contact**
-ListOfFixedNotifications=List of automatic fixed notifications
+ListOfNotificationsPerUser=Listado de notificaciones automáticas por usuario*
+ListOfNotificationsPerUserOrContact=Listado de posibles notificaciones automáticas (eventos) por usuario* o por contacto**
+ListOfFixedNotifications=Listado de notificaciones automáticas fijas
 GoOntoUserCardToAddMore=Vaya a la pestaña "Notificaciones" de un usuario para añadir o elliminar notificaciones a usuarios
 GoOntoContactCardToAddMore=Vaya a la pestaña "Notificaciones" de un contacto de tercero para añadir o eliminar notificaciones para contactos/direcciones
 Threshold=Valor mínimo/umbral
@@ -1900,8 +1901,8 @@ OnMobileOnly=Sólo en pantalla pequeña (smartphone)
 DisableProspectCustomerType=Deshabilitar el tipo de tercero "Cliente Potencial/Cliente" (por lo tanto, el tercero debe ser Cliente Potencial o Cliente pero no pueden ser ambos)
 MAIN_OPTIMIZEFORTEXTBROWSER=Simplificar interfaz para ciegos.
 MAIN_OPTIMIZEFORTEXTBROWSERDesc=Active esta opción sí es usted ciego, or sí usa la aplicación de un navegador de texto como Lynx o Links.
-MAIN_OPTIMIZEFORCOLORBLIND=Change  interface's color for color blind person
-MAIN_OPTIMIZEFORCOLORBLINDDesc=Enable this option if you are a color blind person, in some case interface will change color setup to increase contrast.
+MAIN_OPTIMIZEFORCOLORBLIND=Cambiar el color de la interfaz para personas daltónicas
+MAIN_OPTIMIZEFORCOLORBLINDDesc=Habilite esta opción si es una persona daltónica, en algunos casos la interfaz cambiará la configuración del color para aumentar el contraste.
 Protanopia=Protanopia
 Deuteranopes=Deuteranopes
 Tritanopes=Tritanopes
@@ -1918,7 +1919,7 @@ LogsLinesNumber=Número de líneas a mostrar en la pestaña de registros
 UseDebugBar=Usa la barra de debug
 DEBUGBAR_LOGS_LINES_NUMBER=Número de últimas líneas de registro para mantener en la consola.
 WarningValueHigherSlowsDramaticalyOutput=Advertencia, los valores altos ralentizan dramáticamente la salida.
-ModuleActivated=Module %s is activated and slows the interface
+ModuleActivated=El módulo %s está activado y ralentiza dramáticamente la interfaz
 EXPORTS_SHARE_MODELS=Los modelos de exportación son compartidos con todos.
 ExportSetup=Configuración del módulo de exportación.
 InstanceUniqueID=ID única de la instancia
@@ -1926,14 +1927,13 @@ SmallerThan=Menor que
 LargerThan=Mayor que
 IfTrackingIDFoundEventWillBeLinked=Tenga en cuenta que si se encuentra un ID de seguimiento en el e-mail entrante, el evento se vinculará automáticamente a los objetos relacionados.
 WithGMailYouCanCreateADedicatedPassword=Con una cuenta de GMail, si habilitó la validación de 2 pasos, se recomienda crear una segunda contraseña dedicada para la aplicación en lugar de usar su propia contraseña de https://myaccount.google.com/.
-IFTTTSetup=Configuración del módulo IFTTT
-IFTTT_SERVICE_KEY=IFTTT Service key
-IFTTT_DOLIBARR_ENDPOINT_SECUREKEY=Clave de seguridad para proteger la URL del punto final utilizada por IFTTT para enviar mensajes a su Dolibarr.
-IFTTTDesc=Este módulo está diseñado para desencadenar eventos en IFTTT y/o para ejecutar alguna acción en desencadenadores IFTTT externos.
-UrlForIFTTT=URL endpoint de IFTTT
-YouWillFindItOnYourIFTTTAccount=Lo encontrará en su cuenta de IFTTT.
 EndPointFor=End point for %s : %s
 DeleteEmailCollector=Eliminar el recolector de e-mail
 ConfirmDeleteEmailCollector=¿Está seguro de que querer eliminar este recolector de e-mail?
-RecipientEmailsWillBeReplacedWithThisValue=Recipient emails will be always replaced with this value
-AtLeastOneDefaultBankAccountMandatory=At least 1 default bank account must be defined
+RecipientEmailsWillBeReplacedWithThisValue=Los e-mails del destinatario siempre serán reemplazados por este valor
+AtLeastOneDefaultBankAccountMandatory=Se debe definir al menos una cuenta bancaria predeterminada
+RESTRICT_API_ON_IP=Allow available APIs to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can use the available APIs.
+RESTRICT_ON_IP=Allow access to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can access.
+BaseOnSabeDavVersion=Based on the library SabreDAV version
+NotAPublicIp=Not a public IP
+MakeAnonymousPing=Make an anonymous Ping '+1' to the Dolibarr foundation server (done 1 time only after installation) to allow the foundation to count the number of Dolibarr installation.
diff --git a/htdocs/langs/es_ES/banks.lang b/htdocs/langs/es_ES/banks.lang
index c78e0f4fbd3..d666bb32231 100644
--- a/htdocs/langs/es_ES/banks.lang
+++ b/htdocs/langs/es_ES/banks.lang
@@ -73,6 +73,7 @@ BankTransaction=Registro bancario
 ListTransactions=Listado registros
 ListTransactionsByCategory=Listado registros/categoría
 TransactionsToConciliate=Registros a conciliar
+TransactionsToConciliateShort=To reconcile
 Conciliable=Conciliable
 Conciliate=Conciliar
 Conciliation=Conciliación
@@ -116,6 +117,7 @@ DeleteCheckReceipt=¿Eliminar esta remesa?
 ConfirmDeleteCheckReceipt=¿Está seguro de querer eliminar esta remesa?
 BankChecks=Cheques
 BankChecksToReceipt=Cheques en espera de depositar
+BankChecksToReceiptShort=Cheques en espera de depositar
 ShowCheckReceipt=Mostrar remesa
 NumberOfCheques=Nº Cheque
 DeleteTransaction=Eliminar registro
diff --git a/htdocs/langs/es_ES/bills.lang b/htdocs/langs/es_ES/bills.lang
index 0d5289285aa..cc344ad617c 100644
--- a/htdocs/langs/es_ES/bills.lang
+++ b/htdocs/langs/es_ES/bills.lang
@@ -95,7 +95,7 @@ PaymentHigherThanReminderToPay=Pago superior al resto a pagar
 HelpPaymentHigherThanReminderToPay=Atención, el importe del pago de una o más facturas es superior al resto a pagar.<br> Corrija su entrada, de lo contrario, confirme y piense en crear un abono de lo percibido en exceso para cada factura sobre-pagada.
 HelpPaymentHigherThanReminderToPaySupplier=Atención, el importe del pago de una o más facturas es superior al resto a pagar.<br> Corrija su entrada, de lo contrario, confirme y piense en crear un abono de lo percibido en exceso para cada factura sobre-pagada.
 ClassifyPaid=Clasificar 'Pagado'
-ClassifyUnPaid=Classify 'Unpaid'
+ClassifyUnPaid=Clasificar "No pagado"
 ClassifyPaidPartially=Clasificar 'Pagado parcialmente'
 ClassifyCanceled=Clasificar 'Abandonado'
 ClassifyClosed=Clasificar 'Cerrado'
@@ -215,20 +215,20 @@ ShowInvoiceReplace=Ver factura rectificativa
 ShowInvoiceAvoir=Ver abono
 ShowInvoiceDeposit=Ver factura de anticipo
 ShowInvoiceSituation=Ver situación factura
-UseSituationInvoices=Allow situation invoice
-UseSituationInvoicesCreditNote=Allow situation invoice credit note
-Retainedwarranty=Retained warranty
-RetainedwarrantyDefaultPercent=Retained warranty default percent
-ToPayOn=To pay on %s
-toPayOn=to pay on %s
-RetainedWarranty=Retained Warranty
-PaymentConditionsShortRetainedWarranty=Retained warranty payment terms
-DefaultPaymentConditionsRetainedWarranty=Default retained warranty payment terms
-setPaymentConditionsShortRetainedWarranty=Set retained warranty payment terms
-setretainedwarranty=Set retained warranty
-setretainedwarrantyDateLimit=Set retained warranty date limit
-RetainedWarrantyDateLimit=Retained warranty date limit
-RetainedWarrantyNeed100Percent=The situation invoice need to be at 100%% progress to be displayed on PDF
+UseSituationInvoices=Permitir factura de situación
+UseSituationInvoicesCreditNote=Permitir factura de situación de abono
+Retainedwarranty=Garantía retenida
+RetainedwarrantyDefaultPercent=Porcentaje predeterminado de garantía retenida
+ToPayOn=Para pagar en %s
+toPayOn=pagar en %s
+RetainedWarranty=Garantía retenida
+PaymentConditionsShortRetainedWarranty=Condiciones de pago de la garantía retenida
+DefaultPaymentConditionsRetainedWarranty=Términos de pago de garantía retenidos predeterminados
+setPaymentConditionsShortRetainedWarranty=Definir condiciones de pago de garantía retenidas
+setretainedwarranty=Definir garantía retenida
+setretainedwarrantyDateLimit=Definir fecha límite de garantía retenida
+RetainedWarrantyDateLimit=Fecha límite de garantía retenida
+RetainedWarrantyNeed100Percent=La factura de situación debe estar en el progreso 100%% para que se muestre en PDF
 ShowPayment=Ver pago
 AlreadyPaid=Ya pagado
 AlreadyPaidBack=Ya reembolsado
diff --git a/htdocs/langs/es_ES/cashdesk.lang b/htdocs/langs/es_ES/cashdesk.lang
index c2754213585..1f4efb70578 100644
--- a/htdocs/langs/es_ES/cashdesk.lang
+++ b/htdocs/langs/es_ES/cashdesk.lang
@@ -62,6 +62,7 @@ TicketVatGrouped=Agrupar por tipo de IVA en los tickets
 AutoPrintTickets=Imprimir tickets automáticamente
 EnableBarOrRestaurantFeatures=Habilitar características para Bar o Restaurante
 ConfirmDeletionOfThisPOSSale=¿Está seguro de querer eliminar la venta actual?
+ConfirmDiscardOfThisPOSSale=Do you want to discard this current sale ?
 History=Histórico
 ValidateAndClose=Validar y cerrar
 Terminal=Terminal
@@ -69,3 +70,8 @@ NumberOfTerminals=Número de terminales
 TerminalSelect=Seleccione el terminal que desea usar:
 POSTicket=Ticket POS
 BasicPhoneLayout=Utilizar diseño básico para teléfonos.
+SetupOfTerminalNotComplete=Setup of terminal %s is not complete
+DirectPayment=Direct payment
+DirectPaymentButton=Direct cash payment button
+InvoiceIsAlreadyValidated=Invoice is already validated
+NoLinesToBill=No lines to bill
diff --git a/htdocs/langs/es_ES/companies.lang b/htdocs/langs/es_ES/companies.lang
index 62e66cd8440..36be2a149ad 100644
--- a/htdocs/langs/es_ES/companies.lang
+++ b/htdocs/langs/es_ES/companies.lang
@@ -54,6 +54,7 @@ Firstname=Nombre
 PostOrFunction=Puesto de trabajo
 UserTitle=Título de cortesía
 NatureOfThirdParty=Naturaleza del tercero
+NatureOfContact=Nature of Contact
 Address=Dirección
 State=Provincia
 StateShort=Estado
diff --git a/htdocs/langs/es_ES/contracts.lang b/htdocs/langs/es_ES/contracts.lang
index 611c410bcc9..8e901af802c 100644
--- a/htdocs/langs/es_ES/contracts.lang
+++ b/htdocs/langs/es_ES/contracts.lang
@@ -51,6 +51,7 @@ ListOfClosedServices=Listado de servicios cerrados
 ListOfRunningServices=Listado de servicios activos
 NotActivatedServices=Servicios no activados (con los contratos validados)
 BoardNotActivatedServices=Servicios a activar con los contratos validados
+BoardNotActivatedServicesShort=Services to activate
 LastContracts=Últimos %s contratos
 LastModifiedServices=Últimos %s servicios modificados
 ContractStartDate=Fecha inicio
@@ -65,7 +66,9 @@ DateEndReal=Fecha real fin del servicio
 DateEndRealShort=Fecha real finalización
 CloseService=Finalizar servicio
 BoardRunningServices=Servicios activos
+BoardRunningServicesShort=Servicios activos
 BoardExpiredServices=Servicios expirados
+BoardExpiredServicesShort=Servicios expirados
 ServiceStatus=Estado del servicio
 DraftContracts=Contractos borrador
 CloseRefusedBecauseOneServiceActive=El contrato no puede ser cerrado ya que contiene al menos un servicio abierto.
diff --git a/htdocs/langs/es_ES/errors.lang b/htdocs/langs/es_ES/errors.lang
index 10f6d76c63d..5c010878d9e 100644
--- a/htdocs/langs/es_ES/errors.lang
+++ b/htdocs/langs/es_ES/errors.lang
@@ -90,7 +90,7 @@ ErrorSpecialCharNotAllowedForField=Los caracteres especiales no son admitidos po
 ErrorNumRefModel=Hay una referencia en la base de datos (%s) y es incompatible con esta numeración. Elimine la línea o renombre la referencia para activar este módulo.
 ErrorQtyTooLowForThisSupplier=Cantidad insuficiente para este proveedor o no hay precio definido en este producto para este proveedor
 ErrorOrdersNotCreatedQtyTooLow=Algunos pedidos no se han creado debido a una cantidad demasiado baja
-ErrorModuleSetupNotComplete=Setup of module %s looks to be uncomplete. Go on Home - Setup - Modules to complete.
+ErrorModuleSetupNotComplete=La configuración del módulo %s parece incompleta. Vaya a Inicio - Configuración - Módulos para completarla.
 ErrorBadMask=Error en la máscara
 ErrorBadMaskFailedToLocatePosOfSequence=Error, sin número de secuencia en la máscara
 ErrorBadMaskBadRazMonth=Error, valor de vuelta a 0 incorrecto
@@ -218,8 +218,9 @@ ErrorVariableKeyForContentMustBeSet=Error, debe configurarse la constante con el
 ErrorURLMustStartWithHttp=La URL %s debe comenzar con http:// o https://
 ErrorNewRefIsAlreadyUsed=Error, la nueva referencia ya está en uso
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Error, no es posible eliminar un pago enlazado a una factura cerrada.
+ErrorSearchCriteriaTooSmall=Search criteria too small.
 # Warnings
-WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
+WarningParamUploadMaxFileSizeHigherThanPostMaxSize=El parámetro PHP upload_max_filesize (%s) es más alto que el parámetro PHP post_max_size (%s). Esta no es una configuración consistente.
 WarningPasswordSetWithNoAccount=Se fijó una contraseña para este miembro. Sin embargo, no se ha creado ninguna cuenta de usuario. Así que esta contraseña no se puede utilizar para acceder a Dolibarr. Puede ser utilizada por un módulo/interfaz externo, pero si no necesitar definir accesos de un miembro, puede desactivar la opción "Administrar un inicio de sesión para cada miembro" en la configuración del módulo miembros. Si necesita administrar un inicio de sesión, pero no necesita ninguna contraseña, puede dejar este campo vacío para evitar esta advertencia. Nota: También puede usarse el correo electrónico como inicio de sesión si el miembro está vinculada a un usuario.
 WarningMandatorySetupNotComplete=Haga clic aquí para configurar los parámetros obligatorios
 WarningEnableYourModulesApplications=Haga clic aquí para activar sus módulos y aplicaciones
diff --git a/htdocs/langs/es_ES/main.lang b/htdocs/langs/es_ES/main.lang
index 525c46746fb..b7d87f76fc8 100644
--- a/htdocs/langs/es_ES/main.lang
+++ b/htdocs/langs/es_ES/main.lang
@@ -28,6 +28,7 @@ NoTemplateDefined=Sin plantilla definida para este tipo de e-mail
 AvailableVariables=Variables de substitución disponibles
 NoTranslation=Sin traducción
 Translation=Traducción
+EmptySearchString=Enter a non empty search string
 NoRecordFound=No se han encontrado registros
 NoRecordDeleted=No se ha eliminado el registro
 NotEnoughDataYet=No hay suficientes datos
@@ -445,7 +446,7 @@ ContactsAddressesForCompany=Contactos/direcciones de este tercero
 AddressesForCompany=Direcciones de este tercero
 ActionsOnCompany=Eventos de este tercero
 ActionsOnContact=Eventos de este contacto/dirección
-ActionsOnContract=Events for this contract
+ActionsOnContract=Eventos respecto al contrato
 ActionsOnMember=Eventos respecto a este miembro
 ActionsOnProduct=Eventos sobre este producto
 NActionsLate=%s en retraso
@@ -704,6 +705,7 @@ DateOfSignature=Fecha de la firma
 HidePassword=Mostrar comando con contraseña oculta
 UnHidePassword=Mostrar comando con contraseña a la vista
 Root=Raíz
+RootOfMedias=Root of public medias (/medias)
 Informations=Información
 Page=Página
 Notes=Notas
@@ -760,7 +762,7 @@ LinkToSupplierProposal=Enlazar a presupuesto de proveedor
 LinkToSupplierInvoice=Enlazar a factura de proveedor
 LinkToContract=Enlazar a contrato
 LinkToIntervention=Enlazar a intervención
-LinkToTicket=Link to ticket
+LinkToTicket=Enlazar a ticket
 CreateDraft=Crear borrador
 SetToDraft=Volver a borrador
 ClickToEdit=Clic para editar
@@ -981,3 +983,10 @@ PaymentInformation=Información del pago
 ValidFrom=Válido desde
 ValidUntil=Válido hasta
 NoRecordedUsers=Sin usuarios
+ToClose=To close
+ToProcess=A procesar
+ToApprove=To approve
+GlobalOpenedElemView=Global view
+NoArticlesFoundForTheKeyword=No article found for the keyword '<strong>%s</strong>'
+NoArticlesFoundForTheCategory=No article found for the category
+ToAcceptRefuse=To accept | refuse
diff --git a/htdocs/langs/es_ES/members.lang b/htdocs/langs/es_ES/members.lang
index a1025b9b61e..7f4b43cc971 100644
--- a/htdocs/langs/es_ES/members.lang
+++ b/htdocs/langs/es_ES/members.lang
@@ -29,6 +29,7 @@ MenuMembersUpToDate=Miembros al día
 MenuMembersNotUpToDate=Miembros no al día
 MenuMembersResiliated=Miembros de baja
 MembersWithSubscriptionToReceive=Miembros a la espera de recibir afiliación
+MembersWithSubscriptionToReceiveShort=Subscription to receive
 DateSubscription=Fecha afiliación
 DateEndSubscription=Fecha fin afiliación
 EndSubscription=Fin afiliación
diff --git a/htdocs/langs/es_ES/products.lang b/htdocs/langs/es_ES/products.lang
index e97d80073d5..a67c209afc1 100644
--- a/htdocs/langs/es_ES/products.lang
+++ b/htdocs/langs/es_ES/products.lang
@@ -2,7 +2,7 @@
 ProductRef=Ref. producto
 ProductLabel=Etiqueta producto
 ProductLabelTranslated=Traducción etiqueta de producto
-ProductDescription=Product description
+ProductDescription=Descripción del producto
 ProductDescriptionTranslated=Traducción descripción de producto
 ProductNoteTranslated=Traducción notas de producto
 ProductServiceCard=Ficha producto/servicio
diff --git a/htdocs/langs/es_ES/projects.lang b/htdocs/langs/es_ES/projects.lang
index 963924784e6..d49e68ba7a5 100644
--- a/htdocs/langs/es_ES/projects.lang
+++ b/htdocs/langs/es_ES/projects.lang
@@ -76,7 +76,13 @@ MyProjects=Mis proyectos
 MyProjectsArea=Mi Área de proyectos
 DurationEffective=Duración efectiva
 ProgressDeclared=Progresión declarada
+TaskProgressSummary=Task progress
+CurentlyOpenedTasks=Curently opened tasks
+TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared progress is less %s than the calculated progression
+TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared progress is more %s than the calculated progression
 ProgressCalculated=Progresión calculada
+WhichIamLinkedTo=which I'm linked to
+WhichIamLinkedToProject=which I'm linked to project
 Time=Tiempo
 ListOfTasks=Listado de tareas
 GoToListOfTimeConsumed=Ir al listado de tiempos consumidos
diff --git a/htdocs/langs/es_ES/stripe.lang b/htdocs/langs/es_ES/stripe.lang
index 65ca60c3c51..c78f3ec4948 100644
--- a/htdocs/langs/es_ES/stripe.lang
+++ b/htdocs/langs/es_ES/stripe.lang
@@ -65,5 +65,5 @@ StripeUserAccountForActions=Cuenta de usuario para usar en algunos e-mails de no
 StripePayoutList=Lista de pagos de Stripe
 ToOfferALinkForTestWebhook=Enlace para configurar Stripe WebHook para llamar a la IPN (modo de prueba)
 ToOfferALinkForLiveWebhook=Enlace para configurar Stripe WebHook para llamar a la IPN (modo real)
-PaymentWillBeRecordedForNextPeriod=Payment will be recorded for the next period.
-ClickHereToTryAgain=<a href="%s">Click here to try again...</a>
+PaymentWillBeRecordedForNextPeriod=El pago se registrará para el próximo período.
+ClickHereToTryAgain=<a href="%s">Haga clic aquí para volver a intentarlo ...</a>
diff --git a/htdocs/langs/es_ES/website.lang b/htdocs/langs/es_ES/website.lang
index 58ebf80dece..09f83e94594 100644
--- a/htdocs/langs/es_ES/website.lang
+++ b/htdocs/langs/es_ES/website.lang
@@ -2,7 +2,7 @@
 Shortname=Código
 WebsiteSetupDesc=Cree aquí los sitios web que necesite. Entonces entre en el menú de sitios web para editarlos.
 DeleteWebsite=Eliminar sitio web
-ConfirmDeleteWebsite=¿Está seguro de querer eliminar este sitio web? Todas las páginas y contenido también sera eliminado
+ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed. The files uploaded (like into the medias directory, the ECM module, ...) will remain.
 WEBSITE_TYPE_CONTAINER=Tipo de página/contenedor
 WEBSITE_PAGE_EXAMPLE=Página web para usar como ejemplo
 WEBSITE_PAGENAME=Nombre/alias página
@@ -14,6 +14,9 @@ WEBSITE_JS_INLINE=Contenido del archivo Javascript (común a todas las páginas)
 WEBSITE_HTML_HEADER=Adición en la parte inferior del encabezado HTML (común a todas las páginas)
 WEBSITE_ROBOT=Archivo de robots (robots.txt)
 WEBSITE_HTACCESS=Archivo .htaccess del sitio web
+WEBSITE_MANIFEST_JSON=Website manifest.json file
+WEBSITE_README=README.md file
+EnterHereLicenseInformation=Enter here meta data or license information to fille a README.md file. if you distribute your website as a template, the file will be included into the temptate package.
 HtmlHeaderPage=Encabezado HTML (específico de esta página solamente)
 PageNameAliasHelp=Nombre o alias de la página.<br>Este alias es utilizado también para construir una URL SEO cuando el website sea lanzado desde un Host Virtual de un servidor (como Apache, Nginx...). Usar el botón "<strong>%s</strong>" para editar este alias.
 EditTheWebSiteForACommonHeader=Nota: Si desea definir un encabezado personalizado para todas las páginas, edite el encabezado en el nivel del sitio en lugar de en la página/contenedor.
@@ -41,6 +44,7 @@ RealURL=URL Real
 ViewWebsiteInProduction=Ver sitio web usando la URL de inicio
 SetHereVirtualHost=Si puede crear, en su servidor web (Apache, Nginx...), un Host Virtual con PHP activado y un directorio Root en <br><strong>%s</strong> <br>introduzca aquí el nombre del host virtual que ha creado, así que la previsualización puede verse usando este acceso directo al servidor, y no solo usando el servidor de Dolibarr
 YouCanAlsoTestWithPHPS=En el entorno de desarrollo, es posible que prefiera probar el sitio con el servidor web incrustado de PHP (se requiere PHP 5.5) ejecutando <br><strong> php -S 0.0.0.0:8080 -t %s</strong>
+YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
 CheckVirtualHostPerms=Compruebe también que el host virtual tiene <strong>%s</strong> en archivos en <strong>%s</strong>
 ReadPerm=Leido
 WritePerm=Escribir
@@ -75,7 +79,8 @@ AddWebsiteAccount=Crear cuenta de sitio web
 BackToListOfThirdParty=Volver a la lista de Terceros
 DisableSiteFirst=Deshabilite primero el sitio web
 MyContainerTitle=Título de mi sitio web
-AnotherContainer=Otro contenedor
+AnotherContainer=This is how to include content of another page/container (you may have an error here if you enable dynamic code because the embedded subcontainer may not exists)
+SorryWebsiteIsCurrentlyOffLine=Sorry, this website is currently off line. Please comme back later...
 WEBSITE_USE_WEBSITE_ACCOUNTS=Habilitar tabla de cuentas del sitio web
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Habilitar tabla para almacenar cuentas del sitio web (inicio de sesión/contraseña) para cada sitio web/tercero
 YouMustDefineTheHomePage=Antes debe definir la página de inicio por defecto
@@ -89,7 +94,8 @@ AliasPageAlreadyExists=Ya existe el alias de página <strong>%s</strong>
 CorporateHomePage=Página de inicio corporativa
 EmptyPage=Página vacía
 ExternalURLMustStartWithHttp=La URL externa debe comenzar con http:// o https://
-ZipOfWebsitePackageToImport=Archivo zip del paquete de sitio web
+ZipOfWebsitePackageToImport=Upload the Zip file of the website template package
+ZipOfWebsitePackageToLoad=or Choose an available embedded website template package
 ShowSubcontainers=Incluir contenido dinámico
 InternalURLOfPage=URL interna de la página
 ThisPageIsTranslationOf=Esta página/contenedor es traducción de
@@ -101,5 +107,10 @@ NotAllowedToAddDynamicContent=No tiene permiso para agregar o editar contenido d
 ReplaceWebsiteContent=Buscar o reemplazar el contenido del sitio web
 DeleteAlsoJs=¿Eliminar también todos los archivos javascript específicos de este sitio web?
 DeleteAlsoMedias=¿Eliminar también todos los archivos de medios específicos de este sitio web?
-# Export
 MyWebsitePages=Mis páginas web
+SearchReplaceInto=Search | Replace into
+ReplaceString=New string
+CSSContentTooltipHelp=Enter here CSS content. To avoid any conflict with the CSS of the application, be sure to prepend all declaration with the .bodywebsite class. For example:<br><br>#mycssselector, input.myclass:hover { ... }<br>must be<br>.bodywebsite #mycssselector, .bodywebsite input.myclass:hover { ... }<br><br>Note: If you have a large file without this prefix, you can use 'lessc' to convert it to append the .bodywebsite prefix everywhere.
+LinkAndScriptsHereAreNotLoadedInEditor=Warning: This content is output only when site is accessed from a server. It is not used in Edit mode so if you need to load javascript files also in edit mode, just add your tag 'script src=...' into the page.
+Dynamiccontent=Sample of a page with dynamic content
+ImportSite=Importar plantilla de sitio web
diff --git a/htdocs/langs/es_ES/withdrawals.lang b/htdocs/langs/es_ES/withdrawals.lang
index c83868a0dc0..4c961783175 100644
--- a/htdocs/langs/es_ES/withdrawals.lang
+++ b/htdocs/langs/es_ES/withdrawals.lang
@@ -76,8 +76,8 @@ WithdrawalFile=Archivo de la domiciliación
 SetToStatusSent=Clasificar como "Archivo enviado"
 ThisWillAlsoAddPaymentOnInvoice=Se crearán los pagos de las facturas y las clasificarán como pagadas si el resto a pagar es 0
 StatisticsByLineStatus=Estadísticas por estados de líneas
-RUM=Unique Mandate Reference (UMR)
-DateRUM=Mandate signature date
+RUM=Referencia de mandato único (UMR)
+DateRUM=Fecha de firma del mandato
 RUMLong=Referencia Única de Mandato
 RUMWillBeGenerated=Si está vacío,se generará un número RUM (Referencia Unica de Mandato) una vez que se guarde la información de la cuenta bancaria
 WithdrawMode=Modo domiciliación (FRST o RECUR)
diff --git a/htdocs/langs/et_EE/admin.lang b/htdocs/langs/et_EE/admin.lang
index b9def779562..85af97bdb07 100644
--- a/htdocs/langs/et_EE/admin.lang
+++ b/htdocs/langs/et_EE/admin.lang
@@ -400,6 +400,7 @@ OldVATRates=Vana käibemaksumäär
 NewVATRates=Uus käibemaksumäär
 PriceBaseTypeToChange=Muuda hindadel, mille baasväärtus on defineeritud kui
 MassConvert=Launch bulk conversion
+PriceFormatInCurrentLanguage=Price Format In Current Language
 String=Sõna
 TextLong=Pikk tekst
 HtmlText=HTML-tekst
@@ -431,7 +432,7 @@ ExtrafieldParamHelpradio=List of values must be lines with format key,value (whe
 ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- idfilter is necessarly a primary int key<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=List of values 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>Examples:<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
-ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default)<br>Set this to 2 for a collapsing separator (collapsed by default)
+ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Library used for PDF generation
 LocalTaxDesc=Some countries may apply two or three taxes on each invoice line. If this is the case, choose the type for the 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)
 SMS=SMS
@@ -1695,7 +1696,7 @@ SuppliersInvoiceNumberingModel=Vendor invoices numbering models
 IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=GeoIP Maxmind mooduli seadistamine
-PathToGeoIPMaxmindCountryDataFile=Maxmind IP->maa tõlkimise faili rada.<br>Näited:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat
+PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoLite2-Country.mmdb
 NoteOnPathLocation=Pane tähele, et IP-aadressi ja riiki siduv andmefail peab olema PHP poolt loetavas kaustas (kontrolli PHP open_basedir seadistust ja failisüsteemi õigusi).
 YouCanDownloadFreeDatFileTo=Maxmind GeoIP <b>tasuta demo versiooni</b> saab alla laadida aadressilt %s.
 YouCanDownloadAdvancedDatFileTo=Maxmind GeoIP <b>täielikuma uuendustega versiooni</b> saab alla laadida aadressilt %s.
@@ -1926,14 +1927,13 @@ SmallerThan=Smaller than
 LargerThan=Larger than
 IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID is found into incoming email, the event will be automatically linked to the related objects.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
-IFTTTSetup=IFTTT module setup
-IFTTT_SERVICE_KEY=IFTTT Service key
-IFTTT_DOLIBARR_ENDPOINT_SECUREKEY=Security key to secure the endpoint URL used by IFTTT to send messages to your Dolibarr.
-IFTTTDesc=This module is designed to trigger events on IFTTT and/or to execute some action on external IFTTT triggers.
-UrlForIFTTT=URL endpoint for IFTTT
-YouWillFindItOnYourIFTTTAccount=You will find it on your IFTTT account
 EndPointFor=End point for %s : %s
 DeleteEmailCollector=Delete email collector
 ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
 RecipientEmailsWillBeReplacedWithThisValue=Recipient emails will be always replaced with this value
 AtLeastOneDefaultBankAccountMandatory=At least 1 default bank account must be defined
+RESTRICT_API_ON_IP=Allow available APIs to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can use the available APIs.
+RESTRICT_ON_IP=Allow access to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can access.
+BaseOnSabeDavVersion=Based on the library SabreDAV version
+NotAPublicIp=Not a public IP
+MakeAnonymousPing=Make an anonymous Ping '+1' to the Dolibarr foundation server (done 1 time only after installation) to allow the foundation to count the number of Dolibarr installation.
diff --git a/htdocs/langs/et_EE/banks.lang b/htdocs/langs/et_EE/banks.lang
index 57eb2a49921..74a4d4da9b4 100644
--- a/htdocs/langs/et_EE/banks.lang
+++ b/htdocs/langs/et_EE/banks.lang
@@ -73,6 +73,7 @@ BankTransaction=Bank entry
 ListTransactions=List entries
 ListTransactionsByCategory=List entries/category
 TransactionsToConciliate=Entries to reconcile
+TransactionsToConciliateShort=To reconcile
 Conciliable=Saab viia vastavusse
 Conciliate=Vii vastavusse
 Conciliation=Vastavusse viimine
@@ -116,6 +117,7 @@ DeleteCheckReceipt=Delete this check receipt?
 ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
 BankChecks=Pangatšekid
 BankChecksToReceipt=Checks awaiting deposit
+BankChecksToReceiptShort=Checks awaiting deposit
 ShowCheckReceipt=Näita tšeki deponeerimise kviitungit
 NumberOfCheques=No. of check
 DeleteTransaction=Delete entry
diff --git a/htdocs/langs/et_EE/cashdesk.lang b/htdocs/langs/et_EE/cashdesk.lang
index 13c13db56f8..1b39f6d3ade 100644
--- a/htdocs/langs/et_EE/cashdesk.lang
+++ b/htdocs/langs/et_EE/cashdesk.lang
@@ -62,6 +62,7 @@ TicketVatGrouped=Group VAT by rate in tickets
 AutoPrintTickets=Automatically print tickets
 EnableBarOrRestaurantFeatures=Enable features for Bar or Restaurant
 ConfirmDeletionOfThisPOSSale=Do your confirm the deletion of this current sale ?
+ConfirmDiscardOfThisPOSSale=Do you want to discard this current sale ?
 History=Ajalugu
 ValidateAndClose=Validate and close
 Terminal=Terminal
@@ -69,3 +70,8 @@ NumberOfTerminals=Number of Terminals
 TerminalSelect=Select terminal you want to use:
 POSTicket=POS Ticket
 BasicPhoneLayout=Use basic layout for phones
+SetupOfTerminalNotComplete=Setup of terminal %s is not complete
+DirectPayment=Direct payment
+DirectPaymentButton=Direct cash payment button
+InvoiceIsAlreadyValidated=Invoice is already validated
+NoLinesToBill=No lines to bill
diff --git a/htdocs/langs/et_EE/companies.lang b/htdocs/langs/et_EE/companies.lang
index df5ddbd8531..4a448ddeeda 100644
--- a/htdocs/langs/et_EE/companies.lang
+++ b/htdocs/langs/et_EE/companies.lang
@@ -54,6 +54,7 @@ Firstname=Eesnimi
 PostOrFunction=Job position
 UserTitle=Tiitel
 NatureOfThirdParty=Nature of Third party
+NatureOfContact=Nature of Contact
 Address=Aadress
 State=Osariik/provints
 StateShort=State
diff --git a/htdocs/langs/et_EE/contracts.lang b/htdocs/langs/et_EE/contracts.lang
index 118c34fcdec..7d57cbc0121 100644
--- a/htdocs/langs/et_EE/contracts.lang
+++ b/htdocs/langs/et_EE/contracts.lang
@@ -51,6 +51,7 @@ ListOfClosedServices=Suletud teenuste nimekiri
 ListOfRunningServices=Aktiivsete teenuste nimekiri
 NotActivatedServices=Mitteaktiivsed teenused (kinnitatud lepingutel)
 BoardNotActivatedServices=Teenused, mida aktiveerida kinnitatud lepingutel
+BoardNotActivatedServicesShort=Services to activate
 LastContracts=Latest %s contracts
 LastModifiedServices=Latest %s modified services
 ContractStartDate=Alguskuupäev
@@ -64,7 +65,10 @@ DateStartRealShort=Tegelik alguskuupäev
 DateEndReal=Tegelik lõppkuupäev
 DateEndRealShort=Tegelik lõppkuupäev
 CloseService=Sulge teenus
-BoardRunningServices=Aegunud aktiivsed teenused
+BoardRunningServices=Services running
+BoardRunningServicesShort=Services running
+BoardExpiredServices=Services expired
+BoardExpiredServicesShort=Services expired
 ServiceStatus=Teenuse staatus
 DraftContracts=Lepingute mustandid
 CloseRefusedBecauseOneServiceActive=Contract can't be closed as there is at least one open service on it
diff --git a/htdocs/langs/et_EE/errors.lang b/htdocs/langs/et_EE/errors.lang
index f307abe2390..329e229483c 100644
--- a/htdocs/langs/et_EE/errors.lang
+++ b/htdocs/langs/et_EE/errors.lang
@@ -218,6 +218,7 @@ ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text
 ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Error, delete payment linked to a closed invoice is not possible.
+ErrorSearchCriteriaTooSmall=Search criteria too small.
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 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/main.lang b/htdocs/langs/et_EE/main.lang
index 426c182d98f..cf6d97bc2ff 100644
--- a/htdocs/langs/et_EE/main.lang
+++ b/htdocs/langs/et_EE/main.lang
@@ -28,6 +28,7 @@ NoTemplateDefined=No template available for this email type
 AvailableVariables=Available substitution variables
 NoTranslation=Tõlge puudub
 Translation=Tõlge
+EmptySearchString=Enter a non empty search string
 NoRecordFound=Kirjet ei leitud
 NoRecordDeleted=No record deleted
 NotEnoughDataYet=Not enough data
@@ -704,6 +705,7 @@ DateOfSignature=Date of signature
 HidePassword=Näita käsku peidetud parooliga
 UnHidePassword=Näita käsku koos parooliga
 Root=Juur
+RootOfMedias=Root of public medias (/medias)
 Informations=Informatsioon
 Page=Lehekülg
 Notes=Märkused
@@ -981,3 +983,10 @@ PaymentInformation=Payment information
 ValidFrom=Valid from
 ValidUntil=Valid until
 NoRecordedUsers=No users
+ToClose=To close
+ToProcess=Töödelda
+ToApprove=To approve
+GlobalOpenedElemView=Global view
+NoArticlesFoundForTheKeyword=No article found for the keyword '<strong>%s</strong>'
+NoArticlesFoundForTheCategory=No article found for the category
+ToAcceptRefuse=To accept | refuse
diff --git a/htdocs/langs/et_EE/members.lang b/htdocs/langs/et_EE/members.lang
index 166f365aaa5..7734fa695b5 100644
--- a/htdocs/langs/et_EE/members.lang
+++ b/htdocs/langs/et_EE/members.lang
@@ -29,6 +29,7 @@ MenuMembersUpToDate=Ajakohased liikmed
 MenuMembersNotUpToDate=Aegunud liikmed
 MenuMembersResiliated=Terminated members
 MembersWithSubscriptionToReceive=Kasutajad, kelle liikmemaks on saada
+MembersWithSubscriptionToReceiveShort=Subscription to receive
 DateSubscription=Liikmemaksu kuupäev
 DateEndSubscription=Liikmemaksu  lõppkuupäev
 EndSubscription=Lõpeta liikmemaks
diff --git a/htdocs/langs/et_EE/projects.lang b/htdocs/langs/et_EE/projects.lang
index 55e25fe2ef9..840992498f2 100644
--- a/htdocs/langs/et_EE/projects.lang
+++ b/htdocs/langs/et_EE/projects.lang
@@ -76,7 +76,13 @@ MyProjects=Minu projektid
 MyProjectsArea=My projects Area
 DurationEffective=Efektiivne kestus
 ProgressDeclared=Deklareeritud progress
+TaskProgressSummary=Task progress
+CurentlyOpenedTasks=Curently opened tasks
+TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared progress is less %s than the calculated progression
+TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared progress is more %s than the calculated progression
 ProgressCalculated=Arvutatud progress
+WhichIamLinkedTo=which I'm linked to
+WhichIamLinkedToProject=which I'm linked to project
 Time=Aeg
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
diff --git a/htdocs/langs/et_EE/website.lang b/htdocs/langs/et_EE/website.lang
index 9d04b434869..2f82229426e 100644
--- a/htdocs/langs/et_EE/website.lang
+++ b/htdocs/langs/et_EE/website.lang
@@ -2,7 +2,7 @@
 Shortname=Kood
 WebsiteSetupDesc=Create here the websites you wish to use. Then go into menu Websites to edit them.
 DeleteWebsite=Delete website
-ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed.
+ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed. The files uploaded (like into the medias directory, the ECM module, ...) will remain.
 WEBSITE_TYPE_CONTAINER=Type of page/container
 WEBSITE_PAGE_EXAMPLE=Web page to use as example
 WEBSITE_PAGENAME=Page name/alias
@@ -14,6 +14,9 @@ WEBSITE_JS_INLINE=Javascript file content (common to all pages)
 WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages)
 WEBSITE_ROBOT=Robot file (robots.txt)
 WEBSITE_HTACCESS=Website .htaccess file
+WEBSITE_MANIFEST_JSON=Website manifest.json file
+WEBSITE_README=README.md file
+EnterHereLicenseInformation=Enter here meta data or license information to fille a README.md file. if you distribute your website as a template, the file will be included into the temptate package.
 HtmlHeaderPage=HTML header (specific to this page only)
 PageNameAliasHelp=Name or alias of the page.<br>This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "<strong>%s</strong>" to edit this alias.
 EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container.
@@ -41,6 +44,7 @@ RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
 SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then set the name of the virtual host you have created in the properties of web site, so the preview can be done also using this dedicated web server access instead of the internal Dolibarr server.
 YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
 CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
 ReadPerm=Loe
 WritePerm=Write
@@ -75,7 +79,8 @@ AddWebsiteAccount=Create web site account
 BackToListOfThirdParty=Back to list for Third Party
 DisableSiteFirst=Disable website first
 MyContainerTitle=My web site title
-AnotherContainer=Another container
+AnotherContainer=This is how to include content of another page/container (you may have an error here if you enable dynamic code because the embedded subcontainer may not exists)
+SorryWebsiteIsCurrentlyOffLine=Sorry, this website is currently off line. Please comme back later...
 WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / third party
 YouMustDefineTheHomePage=You must first define the default Home page
@@ -89,7 +94,8 @@ AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
 CorporateHomePage=Corporate Home page
 EmptyPage=Empty page
 ExternalURLMustStartWithHttp=External URL must start with http:// or https://
-ZipOfWebsitePackageToImport=Zip file of website package
+ZipOfWebsitePackageToImport=Upload the Zip file of the website template package
+ZipOfWebsitePackageToLoad=or Choose an available embedded website template package
 ShowSubcontainers=Include dynamic content
 InternalURLOfPage=Internal URL of page
 ThisPageIsTranslationOf=This page/container is a translation of
@@ -101,5 +107,10 @@ NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynam
 ReplaceWebsiteContent=Search or Replace website content
 DeleteAlsoJs=Delete also all javascript files specific to this website?
 DeleteAlsoMedias=Delete also all medias files specific to this website?
-# Export
 MyWebsitePages=My website pages
+SearchReplaceInto=Search | Replace into
+ReplaceString=New string
+CSSContentTooltipHelp=Enter here CSS content. To avoid any conflict with the CSS of the application, be sure to prepend all declaration with the .bodywebsite class. For example:<br><br>#mycssselector, input.myclass:hover { ... }<br>must be<br>.bodywebsite #mycssselector, .bodywebsite input.myclass:hover { ... }<br><br>Note: If you have a large file without this prefix, you can use 'lessc' to convert it to append the .bodywebsite prefix everywhere.
+LinkAndScriptsHereAreNotLoadedInEditor=Warning: This content is output only when site is accessed from a server. It is not used in Edit mode so if you need to load javascript files also in edit mode, just add your tag 'script src=...' into the page.
+Dynamiccontent=Sample of a page with dynamic content
+ImportSite=Import website template
diff --git a/htdocs/langs/eu_ES/admin.lang b/htdocs/langs/eu_ES/admin.lang
index d6df49511a8..30cb8cd7d92 100644
--- a/htdocs/langs/eu_ES/admin.lang
+++ b/htdocs/langs/eu_ES/admin.lang
@@ -400,6 +400,7 @@ OldVATRates=Old VAT rate
 NewVATRates=New VAT rate
 PriceBaseTypeToChange=Modify on prices with base reference value defined on
 MassConvert=Launch bulk conversion
+PriceFormatInCurrentLanguage=Price Format In Current Language
 String=Katea
 TextLong=Testu luzea
 HtmlText=Html text
@@ -431,7 +432,7 @@ ExtrafieldParamHelpradio=List of values must be lines with format key,value (whe
 ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- idfilter is necessarly a primary int key<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=List of values 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>Examples:<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
-ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default)<br>Set this to 2 for a collapsing separator (collapsed by default)
+ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Library used for PDF generation
 LocalTaxDesc=Some countries may apply two or three taxes on each invoice line. If this is the case, choose the type for the 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)
 SMS=SMS
@@ -1695,7 +1696,7 @@ SuppliersInvoiceNumberingModel=Vendor invoices numbering models
 IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=GeoIP Maxmind module setup
-PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat
+PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoLite2-Country.mmdb
 NoteOnPathLocation=Note that your ip to country data file must be inside a directory your PHP can read (Check your PHP open_basedir setup and filesystem permissions).
 YouCanDownloadFreeDatFileTo=You can download a <b>free demo version</b> of the Maxmind GeoIP country file at %s.
 YouCanDownloadAdvancedDatFileTo=You can also download a more <b>complete version, with updates,</b> of the Maxmind GeoIP country file at %s.
@@ -1926,14 +1927,13 @@ SmallerThan=Smaller than
 LargerThan=Larger than
 IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID is found into incoming email, the event will be automatically linked to the related objects.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
-IFTTTSetup=IFTTT module setup
-IFTTT_SERVICE_KEY=IFTTT Service key
-IFTTT_DOLIBARR_ENDPOINT_SECUREKEY=Security key to secure the endpoint URL used by IFTTT to send messages to your Dolibarr.
-IFTTTDesc=This module is designed to trigger events on IFTTT and/or to execute some action on external IFTTT triggers.
-UrlForIFTTT=URL endpoint for IFTTT
-YouWillFindItOnYourIFTTTAccount=You will find it on your IFTTT account
 EndPointFor=End point for %s : %s
 DeleteEmailCollector=Delete email collector
 ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
 RecipientEmailsWillBeReplacedWithThisValue=Recipient emails will be always replaced with this value
 AtLeastOneDefaultBankAccountMandatory=At least 1 default bank account must be defined
+RESTRICT_API_ON_IP=Allow available APIs to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can use the available APIs.
+RESTRICT_ON_IP=Allow access to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can access.
+BaseOnSabeDavVersion=Based on the library SabreDAV version
+NotAPublicIp=Not a public IP
+MakeAnonymousPing=Make an anonymous Ping '+1' to the Dolibarr foundation server (done 1 time only after installation) to allow the foundation to count the number of Dolibarr installation.
diff --git a/htdocs/langs/eu_ES/banks.lang b/htdocs/langs/eu_ES/banks.lang
index e54d9c5be14..dbccde0e2ab 100644
--- a/htdocs/langs/eu_ES/banks.lang
+++ b/htdocs/langs/eu_ES/banks.lang
@@ -73,6 +73,7 @@ BankTransaction=Bank entry
 ListTransactions=List entries
 ListTransactionsByCategory=List entries/category
 TransactionsToConciliate=Entries to reconcile
+TransactionsToConciliateShort=To reconcile
 Conciliable=Can be reconciled
 Conciliate=Reconcile
 Conciliation=Reconciliation
@@ -116,6 +117,7 @@ DeleteCheckReceipt=Delete this check receipt?
 ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
 BankChecks=Bank checks
 BankChecksToReceipt=Checks awaiting deposit
+BankChecksToReceiptShort=Checks awaiting deposit
 ShowCheckReceipt=Show check deposit receipt
 NumberOfCheques=No. of check
 DeleteTransaction=Delete entry
diff --git a/htdocs/langs/eu_ES/cashdesk.lang b/htdocs/langs/eu_ES/cashdesk.lang
index bc5e9f2763a..151255786dd 100644
--- a/htdocs/langs/eu_ES/cashdesk.lang
+++ b/htdocs/langs/eu_ES/cashdesk.lang
@@ -62,6 +62,7 @@ TicketVatGrouped=Group VAT by rate in tickets
 AutoPrintTickets=Automatically print tickets
 EnableBarOrRestaurantFeatures=Enable features for Bar or Restaurant
 ConfirmDeletionOfThisPOSSale=Do your confirm the deletion of this current sale ?
+ConfirmDiscardOfThisPOSSale=Do you want to discard this current sale ?
 History=History
 ValidateAndClose=Validate and close
 Terminal=Terminal
@@ -69,3 +70,8 @@ NumberOfTerminals=Number of Terminals
 TerminalSelect=Select terminal you want to use:
 POSTicket=POS Ticket
 BasicPhoneLayout=Use basic layout for phones
+SetupOfTerminalNotComplete=Setup of terminal %s is not complete
+DirectPayment=Direct payment
+DirectPaymentButton=Direct cash payment button
+InvoiceIsAlreadyValidated=Invoice is already validated
+NoLinesToBill=No lines to bill
diff --git a/htdocs/langs/eu_ES/companies.lang b/htdocs/langs/eu_ES/companies.lang
index 6bd24295b2d..2954dfe70f7 100644
--- a/htdocs/langs/eu_ES/companies.lang
+++ b/htdocs/langs/eu_ES/companies.lang
@@ -54,6 +54,7 @@ Firstname=First name
 PostOrFunction=Job position
 UserTitle=Title
 NatureOfThirdParty=Nature of Third party
+NatureOfContact=Nature of Contact
 Address=Address
 State=State/Province
 StateShort=State
diff --git a/htdocs/langs/eu_ES/contracts.lang b/htdocs/langs/eu_ES/contracts.lang
index e9a8b1f1643..129a2a6d58a 100644
--- a/htdocs/langs/eu_ES/contracts.lang
+++ b/htdocs/langs/eu_ES/contracts.lang
@@ -51,6 +51,7 @@ ListOfClosedServices=List of closed services
 ListOfRunningServices=List of running services
 NotActivatedServices=Inactive services (among validated contracts)
 BoardNotActivatedServices=Services to activate among validated contracts
+BoardNotActivatedServicesShort=Services to activate
 LastContracts=Latest %s contracts
 LastModifiedServices=Latest %s modified services
 ContractStartDate=Start date
@@ -64,7 +65,10 @@ DateStartRealShort=Real start date
 DateEndReal=Real end date
 DateEndRealShort=Real end date
 CloseService=Close service
-BoardRunningServices=Expired running services
+BoardRunningServices=Services running
+BoardRunningServicesShort=Services running
+BoardExpiredServices=Services expired
+BoardExpiredServicesShort=Services expired
 ServiceStatus=Status of service
 DraftContracts=Drafts contracts
 CloseRefusedBecauseOneServiceActive=Contract can't be closed as there is at least one open service on it
diff --git a/htdocs/langs/eu_ES/errors.lang b/htdocs/langs/eu_ES/errors.lang
index 1ee46fdbb92..0c07b2eafc4 100644
--- a/htdocs/langs/eu_ES/errors.lang
+++ b/htdocs/langs/eu_ES/errors.lang
@@ -218,6 +218,7 @@ ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text
 ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Error, delete payment linked to a closed invoice is not possible.
+ErrorSearchCriteriaTooSmall=Search criteria too small.
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 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/main.lang b/htdocs/langs/eu_ES/main.lang
index 330e60e0320..b45edc2f9bf 100644
--- a/htdocs/langs/eu_ES/main.lang
+++ b/htdocs/langs/eu_ES/main.lang
@@ -28,6 +28,7 @@ NoTemplateDefined=No template available for this email type
 AvailableVariables=Available substitution variables
 NoTranslation=No translation
 Translation=Translation
+EmptySearchString=Enter a non empty search string
 NoRecordFound=No record found
 NoRecordDeleted=No record deleted
 NotEnoughDataYet=Not enough data
@@ -704,6 +705,7 @@ DateOfSignature=Date of signature
 HidePassword=Show command with password hidden
 UnHidePassword=Show real command with clear password
 Root=Root
+RootOfMedias=Root of public medias (/medias)
 Informations=Informazioa
 Page=Page
 Notes=Notes
@@ -981,3 +983,10 @@ PaymentInformation=Payment information
 ValidFrom=Valid from
 ValidUntil=Valid until
 NoRecordedUsers=No users
+ToClose=To close
+ToProcess=To process
+ToApprove=To approve
+GlobalOpenedElemView=Global view
+NoArticlesFoundForTheKeyword=No article found for the keyword '<strong>%s</strong>'
+NoArticlesFoundForTheCategory=No article found for the category
+ToAcceptRefuse=To accept | refuse
diff --git a/htdocs/langs/eu_ES/members.lang b/htdocs/langs/eu_ES/members.lang
index abe20775611..ba7f85e4917 100644
--- a/htdocs/langs/eu_ES/members.lang
+++ b/htdocs/langs/eu_ES/members.lang
@@ -29,6 +29,7 @@ MenuMembersUpToDate=Up to date members
 MenuMembersNotUpToDate=Out of date members
 MenuMembersResiliated=Terminated members
 MembersWithSubscriptionToReceive=Members with subscription to receive
+MembersWithSubscriptionToReceiveShort=Subscription to receive
 DateSubscription=Subscription date
 DateEndSubscription=Subscription end date
 EndSubscription=End subscription
diff --git a/htdocs/langs/eu_ES/projects.lang b/htdocs/langs/eu_ES/projects.lang
index 7b543688868..5789a74913c 100644
--- a/htdocs/langs/eu_ES/projects.lang
+++ b/htdocs/langs/eu_ES/projects.lang
@@ -76,7 +76,13 @@ MyProjects=My projects
 MyProjectsArea=My projects Area
 DurationEffective=Effective duration
 ProgressDeclared=Declared progress
+TaskProgressSummary=Task progress
+CurentlyOpenedTasks=Curently opened tasks
+TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared progress is less %s than the calculated progression
+TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared progress is more %s than the calculated progression
 ProgressCalculated=Calculated progress
+WhichIamLinkedTo=which I'm linked to
+WhichIamLinkedToProject=which I'm linked to project
 Time=Time
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
diff --git a/htdocs/langs/eu_ES/website.lang b/htdocs/langs/eu_ES/website.lang
index df217e77646..ab27da37e5e 100644
--- a/htdocs/langs/eu_ES/website.lang
+++ b/htdocs/langs/eu_ES/website.lang
@@ -2,7 +2,7 @@
 Shortname=Kodea
 WebsiteSetupDesc=Create here the websites you wish to use. Then go into menu Websites to edit them.
 DeleteWebsite=Delete website
-ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed.
+ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed. The files uploaded (like into the medias directory, the ECM module, ...) will remain.
 WEBSITE_TYPE_CONTAINER=Type of page/container
 WEBSITE_PAGE_EXAMPLE=Web page to use as example
 WEBSITE_PAGENAME=Page name/alias
@@ -14,6 +14,9 @@ WEBSITE_JS_INLINE=Javascript file content (common to all pages)
 WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages)
 WEBSITE_ROBOT=Robot file (robots.txt)
 WEBSITE_HTACCESS=Website .htaccess file
+WEBSITE_MANIFEST_JSON=Website manifest.json file
+WEBSITE_README=README.md file
+EnterHereLicenseInformation=Enter here meta data or license information to fille a README.md file. if you distribute your website as a template, the file will be included into the temptate package.
 HtmlHeaderPage=HTML header (specific to this page only)
 PageNameAliasHelp=Name or alias of the page.<br>This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "<strong>%s</strong>" to edit this alias.
 EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container.
@@ -41,6 +44,7 @@ RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
 SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then set the name of the virtual host you have created in the properties of web site, so the preview can be done also using this dedicated web server access instead of the internal Dolibarr server.
 YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
 CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
 ReadPerm=Read
 WritePerm=Write
@@ -75,7 +79,8 @@ AddWebsiteAccount=Create web site account
 BackToListOfThirdParty=Back to list for Third Party
 DisableSiteFirst=Disable website first
 MyContainerTitle=My web site title
-AnotherContainer=Another container
+AnotherContainer=This is how to include content of another page/container (you may have an error here if you enable dynamic code because the embedded subcontainer may not exists)
+SorryWebsiteIsCurrentlyOffLine=Sorry, this website is currently off line. Please comme back later...
 WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / third party
 YouMustDefineTheHomePage=You must first define the default Home page
@@ -89,7 +94,8 @@ AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
 CorporateHomePage=Corporate Home page
 EmptyPage=Empty page
 ExternalURLMustStartWithHttp=External URL must start with http:// or https://
-ZipOfWebsitePackageToImport=Zip file of website package
+ZipOfWebsitePackageToImport=Upload the Zip file of the website template package
+ZipOfWebsitePackageToLoad=or Choose an available embedded website template package
 ShowSubcontainers=Include dynamic content
 InternalURLOfPage=Internal URL of page
 ThisPageIsTranslationOf=This page/container is a translation of
@@ -101,5 +107,10 @@ NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynam
 ReplaceWebsiteContent=Search or Replace website content
 DeleteAlsoJs=Delete also all javascript files specific to this website?
 DeleteAlsoMedias=Delete also all medias files specific to this website?
-# Export
 MyWebsitePages=My website pages
+SearchReplaceInto=Search | Replace into
+ReplaceString=New string
+CSSContentTooltipHelp=Enter here CSS content. To avoid any conflict with the CSS of the application, be sure to prepend all declaration with the .bodywebsite class. For example:<br><br>#mycssselector, input.myclass:hover { ... }<br>must be<br>.bodywebsite #mycssselector, .bodywebsite input.myclass:hover { ... }<br><br>Note: If you have a large file without this prefix, you can use 'lessc' to convert it to append the .bodywebsite prefix everywhere.
+LinkAndScriptsHereAreNotLoadedInEditor=Warning: This content is output only when site is accessed from a server. It is not used in Edit mode so if you need to load javascript files also in edit mode, just add your tag 'script src=...' into the page.
+Dynamiccontent=Sample of a page with dynamic content
+ImportSite=Import website template
diff --git a/htdocs/langs/fa_IR/admin.lang b/htdocs/langs/fa_IR/admin.lang
index 2b995dda00f..586e0385611 100644
--- a/htdocs/langs/fa_IR/admin.lang
+++ b/htdocs/langs/fa_IR/admin.lang
@@ -400,6 +400,7 @@ OldVATRates=نرخ قدیمی مالیات‌بر‌ارزش‌افزوده
 NewVATRates=نرخ جدید قدیمی مالیات‌بر‌ارزش‌افزوده
 PriceBaseTypeToChange=تغییر قیمت‌ها بر پایۀ مقدار مرجع تعریف شده در
 MassConvert=اجرای تبدیل دسته‌ای
+PriceFormatInCurrentLanguage=Price Format In Current Language
 String=رشته
 TextLong=متن طولانی
 HtmlText=نوشتۀ HTML
@@ -431,7 +432,7 @@ ExtrafieldParamHelpradio=فهرست مقادیر باید سطوری به شکل
 ExtrafieldParamHelpsellist=فهرست مقادیری که از یک جدول گرفته می‌شود<br>روش درج: table_name:label_field:id_field::filter<br>مثال: c_typent:libelle:id::filter<br><br>- idfilter برای  primary int key ضروری است<br>- فیلتر می‌تواند یک آزمایش ساده باشد (مثلا active=1) تا صرفا مقدار فعال را نمایش دهد. <br>شما همچنین در فیلتر می‌توانید از $ID$ استفاده کنید که برابر با شناسۀ کنونی شیء کنونی است <br>برای انجام یک جستار  SELECT در فیلتر از  $SEL$ استفاده نمائید.<br>در صورتی که بخواهید بخش‌های دیگر - extrafields را فیلتر کنید از این روش استفاده کنید   extra.fieldcode=... (که fieldcode درآن کد مربوط به آن extrafield است)<br><br>برای دریافت یک فهرست بسته به یک فهرست تکمیلی از مشخصه‌های دیگر:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>برای دریافت فهرستی که مبتنی بر فهرستی دیگر است:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelpchkbxlst=فهرست مقادیری که از یک جدول گرفته می‌شود <br>روش درج: table_name:label_field:id_field::filter<br>مثال: c_typent:libelle:id::filter<br><br>filter می‌تواند یک آزمایش ساده باشد (مثال active=1) برای نمایش مقدار فعال <br> شما همچنین می‌توانید از  $ID$ در فیلتر استفاده نمائید که شناسۀ کنونی شیء فعلی است <br>برای انجام جستار  SELECTدر فیلتر از  $SEL$<br>اگر بخواهید از extrafields در فیلتر استفاده نمائید، از روش‌درج extra.fieldcode=...  استفاده نمائید، (که کد فیلتر، همان کد extrafiled است)<br><br> باری دریافت ک فهرست وابسته به یک فهرست تکمیلی از مشخصه‌ها دیگر:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>برای دریافت یک فهرست وابسته به یک فهرست دیگر:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=مؤلفه‌ها باید به شکل ObjectName:Classpath باشد، <br>روش درج: ObjectName:Classpath <br> مثال‌ها: <br> Societe:societe/class/societe.class.php <br> Contact:contact/class/contact.class.php
-ExtrafieldParamHelpSeparator=برای جداکنندۀ ساده خالی بگذارید <br> برای یک جداکنندۀ نزولی به 1 تنظیم کنید (به طور پیش‌فرض باز است) <br> برای یک جداکنندۀ نزولی به 2 تنظیم کنید ( به طور پیش‌فرض نزول کرده است)
+ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=کتابخانۀ قابل استفاده برای تولید PDF
 LocalTaxDesc=برخی کشورها دو یا سه سطر مالیات در خصوص هر سطر از صورت‌حساب دارند. در این حالت، نوع مالیات دوم و سوم و نرخ آن را تعیین کنید. انواع قابل درج عبارتند از: <br>1: مالیات محلی به محصولات و خدمات بدون مالیات‌برارزش‌افزوده اختصاص داده می‌شود (مالیات محلی بر مبنای مبلغ بدون مالیات بر ارزش افزوده محاسبه می‌شود) <br>2: مالیات محلی بر محصولات و خدمات به‌همراه مالیات‌بر‌ارزش‌افزوده (مالیات‌محلی بر مبنای مبلغ + مالیات اصلی محاسبه می‌شود)  <br>3: مالیات محلی بر محصولات بدون مالیات بر ارزش افزوده (مالیات محلی بر اساس مبلع بدون مالیات حساب می‌شود) <br>4: مالیت محلی بر محصولات به همراه مالیات بر ارزش افزوده محاسبه می‌شود (مالیات محلی بر اساس مبلغ + مالیات بر ارزش افزوده اصلی محاسبه می‌شود)  <br>5: مالیات محلی بر بر خدمات بدون مالیات بر ارزش افزوده محاسبه می‌شود (مالیات محلی بر اساس مبلغ بدون مالیات بر ارزش افزوده) <br>6: مالیات محلی بر خدمات و شامل مالیات بر ارزش افزوده ( مالیات محلی بر اساس مبلغ + مالیات بر ارزش افزوده)
 SMS=پیامک
@@ -574,7 +575,7 @@ Module510Name=حقوق
 Module510Desc=ثبت و پیگیری پرداخت‌های کارمندان
 Module520Name=وام‌ها
 Module520Desc=مدیریت وام‌ها
-Module600Name=Notifications on business event
+Module600Name=اطلاع‌رسانی‌های مربوط به روی‌دادتجاری
 Module600Desc=ارسال رایانامه‌های اطلاعیه مبتنی بر یک رخداد کاری: بر اساس کاربر (تنظیمات بر حسب هر کاربر)، بر اساس طرف‌سوم (تنظیمات بر اساس هر طرف سوم) یا بر اساس رایانامه‌های خاص
 Module600Long=به خاطر داشته باشید این واحد رایانامه‌را به صورت بلادرنگ در هنگام یک رخداد معین ارسال می‌نماید. در صورتی که به دنبال یک قابلیت برای ارسال یادآورنده‌های رخدادهائی مثل جلسات باشید، به واحد تنظیمات جلسات مراجعه کنید.
 Module610Name=انواع محصولات
@@ -1193,7 +1194,7 @@ ExtraFieldsSupplierOrders=ویژگی‌های تکمیلی (سفارش‌ها)
 ExtraFieldsSupplierInvoices=ویژگی‌های تکمیلی (صورت‌حساب‌ها)
 ExtraFieldsProject=ویژگی‌های تکمیلی (طرح‌ها)
 ExtraFieldsProjectTask=ویژگی‌های تکمیلی (وظایف)
-ExtraFieldsSalaries=Complementary attributes (salaries)
+ExtraFieldsSalaries=مشخصه‌های مکمل (حقوق‌ها)
 ExtraFieldHasWrongValue=ویژگی %s مقدار نادرستی دارد.
 AlphaNumOnlyLowerCharsAndNoSpace=فقط حروف کوچک و اعداد انگلیسی بدون فاصله
 SendmailOptionNotComplete=هشدار، در برخی سامانه‌های لینوکس، برای ارسال رایانامه از شما، تنظیمات اجرای sendmail نیازمند گزینۀ -ba (در فایل php.ini ، مقدار mail.force_extra_parameters) است. در صورتی که برخی گیرندگان، هرگز رایانامه دریافت نکرده‌اند، این مؤلفۀ PHP را بدین شکل تغییر دهید: mail.force_extra_parameters = -ba ).
@@ -1221,14 +1222,14 @@ SuhosinSessionEncrypt=ذخیره‌سازی نشست کدبندی‌شدۀ Suhos
 ConditionIsCurrently=در حال حاضر وضعیت %s است
 YouUseBestDriver=شما از راه‌انداز %s استفاده می‌کنید که بهترین راه‌انداز دردسترس نیست.
 YouDoNotUseBestDriver=شما از راه‌انداز %s استفاده می‌کنید اما پیشنهاد ما استفادهاز %s است.
-NbOfObjectIsLowerThanNoPb=You have only %s %s in the database. This does not require any particular optimization.
+NbOfObjectIsLowerThanNoPb=شما در پایگاه داده فقط %s%s دارید. این الزاما نیازمند بهینه سازی نیست.
 SearchOptim=بهینه‌سازی جستجو
-YouHaveXObjectUseSearchOptim=You have %s %s in the database. You should add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
-YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to 1 in Home-Setup-Other.
+YouHaveXObjectUseSearchOptim=شما در پایگاه‌داده %s%s دارید. شما باید مقدار ثابت %s را به 1 در خانه-برپاسازی-سایر اضافه کنید. جستجو را محدود به ابتدا نمائید تا به پایگاه‌داده امکان دهید از شاخص‌ها استفاده کند تا بتوانید واکنش فوری داشته باشید.
+YouHaveXObjectAndSearchOptimOn=شما در پایگاه داده %s دارید و مقدار ثابت %s %sدر خانه-برپاسازی-سایر به 1 تنظیم شده است.
 BrowserIsOK=شما از مرورگر وب %s استفاده می‌نمائید. این مرورگر برای کارائی و امنیت مناسب است.
 BrowserIsKO=شما از مرورگر وب %s استفاده می‌نمائید. این مرورگر به‌عنوان یک انتخاب بد به نسبت امنیت، کارائی و اعتمادپذیری شناخته شده است. ما به شما پیشنهاد می‌کنیم از Firefox، Chrome، Opera و Safari استفاده نمائید.
-PHPModuleLoaded=PHP component %s is loaded
-PreloadOPCode=Preloaded OPCode is used
+PHPModuleLoaded=بخش %s در PHP بارگذاری شده است
+PreloadOPCode=OPCode از پیش بارگذاری شده مورد استفاده است
 AddRefInList=نمایش فهرست اطلاعات مرجع -ref. فروشنده/مشتری (فهرست انتخابی یا ترکیبی) و اکثر ابَرپیوند. <br> نام طرف‌های سوم به شکل  " CC12345 - SC45678 - شرکت بزرگ سازمانی " به جای "شرکت بزرگ سازمانی" نمایش داده خواهد شد.
 AddAdressInList=نمایش فهرست اطلاعات نشانی‌های فروشنده/مشتری (فهرست انتخابی یا ترکیبی) <br>شخص سوم‌ها به شکل "شرکت بزرگ سازمانی - شمارۀ 21 خیابان 123456 شهر بزرگ ایران" به جای "شرکت بزرگ سازمانی" نمایش داده خواهند شد.
 AskForPreferredShippingMethod=پرسش برای روش ارسال ترجیحی برای اشخاص سوم
@@ -1695,7 +1696,7 @@ SuppliersInvoiceNumberingModel=روش‌های شماره‌گذاری صورت
 IfSetToYesDontForgetPermission=در صورت تائید، فراموش نکنید به کاربران یا گروه‌هائی مجوز تائید دوم را بدهید
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=برپاسازی واحد GeoIP Maxmind
-PathToGeoIPMaxmindCountryDataFile=مسیر فایل دربردارندۀ Maxmind تبدیل درگاه‌اینترنتی به کشور. <br> مثال‌ها: <br> /usr/local/share/GeoIP/GeoIP.dat <br> /usr/share/GeoIP/GeoIP.dat
+PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoLite2-Country.mmdb
 NoteOnPathLocation=توجه داشته باشید داده‌های فایل تبدیل درگاه‌اینترنتی به کشور باید در پوشه‌ای باشد که PHP بتواند آن را بخواند (تنظیمات  open_basedir  در PHP و مجوزهای فایل را در سامانه بررسی کنید).
 YouCanDownloadFreeDatFileTo=شما می‌توانید <b>یک نسخۀ نمایشی رایگان</b> از فایل کشورهای GeoIP Maxmind را در %s دریافت نمائید.
 YouCanDownloadAdvancedDatFileTo=همچنین می‌توانید یک <b>نسخۀ کامل‌تر به همراه بروزرسانی</b> فایل کشورهای Maxmind GeoIP را در %s دریافت نمائید.
@@ -1736,9 +1737,9 @@ ExpenseReportsRulesSetup=برپاسازی واحد گزارش هزینه‌ها
 ExpenseReportNumberingModules=واحد شماره‌گذاری گزارش هزینه‌ها
 NoModueToManageStockIncrease=هیچ واحدی که قادر به افزایش خودکار موجودی انبار باشد فعال نشده است. افزایش موجودی انبار تنها به صورت دستی انجام خواهد شد.
 YouMayFindNotificationsFeaturesIntoModuleNotification=شما می‌توانید برخی گزینه‌های مربوط به اطلاع‌رسانی از رایانامه را با فعال کردن و تنظیم واحد "آگاهی‌رسانی" تنظیم نمائید.
-ListOfNotificationsPerUser=List of automatic notifications per user*
-ListOfNotificationsPerUserOrContact=List of possible automatic notifications (on business event) available per user* or per contact**
-ListOfFixedNotifications=List of automatic fixed notifications
+ListOfNotificationsPerUser=فهرست اطلاع‌رسانی‌های خودکار بر حسب کاربر*
+ListOfNotificationsPerUserOrContact=فهرست اطلاع‌رسانی‌های خودکار قابل استفاده (مربوط به روی‌دادی تجاری) فعال برای کاربر* یا بر حسب طرف‌تماس**
+ListOfFixedNotifications=فهرست اطلاع‌رسانی‌های خودکار ثابت
 GoOntoUserCardToAddMore=به زبانۀ "آگاهی‌رسانی" یک کاربر رفته تا آگاهی‌رسانی‌های مربوط به کاربران را اضافه یا حذف نمائید
 GoOntoContactCardToAddMore=به زبانۀ "آگاهی رسانی" یک طرف‌سوم رفته تا آگاهی‌رسانی‌های مربوط به یک طرف تماس/نشانی‌ها را اضافه یا حذف نمائید
 Threshold=آستانه
@@ -1900,11 +1901,11 @@ OnMobileOnly=تنها روی صفحات کوچک (تلفن‌هوشمند)
 DisableProspectCustomerType=غیرفعال کردن نوع طرف سوم "مشتری احتمالی + مشتری" (بنابراین شخص‌سوم باید یک مشتری احتمالی یا یک مشتری باشد و نمی‌تواند هر دو با هم باشد)
 MAIN_OPTIMIZEFORTEXTBROWSER=ساده‌کردن رابط‌کاربری برای افراد نابینا
 MAIN_OPTIMIZEFORTEXTBROWSERDesc=این گزینه برای افراد نابینتا استفاده می‌شود یا این‌که از برنامه از یک مرورگر نوشتاری همانند Lynx یا Links استفاده می‌نمائید.
-MAIN_OPTIMIZEFORCOLORBLIND=Change  interface's color for color blind person
-MAIN_OPTIMIZEFORCOLORBLINDDesc=Enable this option if you are a color blind person, in some case interface will change color setup to increase contrast.
-Protanopia=Protanopia
-Deuteranopes=Deuteranopes
-Tritanopes=Tritanopes
+MAIN_OPTIMIZEFORCOLORBLIND=تغییر رنگ‌های صفحه برای استفادۀ افرادی که عارضۀ کوررنگی دارند
+MAIN_OPTIMIZEFORCOLORBLINDDesc=این گزینه را هنگامی استفاده کنید که دچار عارضۀ کوررنگی باشید، در برخی موارد این باعث تغییر رنگ‌های برپاسازی برای افزایش تضاد رنگی خواهد شد.
+Protanopia=پرانتوپیا
+Deuteranopes=دوترانوپس
+Tritanopes=تریتانوپس
 ThisValueCanOverwrittenOnUserLevel=این مقدار می‌تواند توسط هر کاربر از صفحۀ کاربری مربوطه و زبانۀ '%s' مورد بازنویسی قرار گیرد
 DefaultCustomerType=نوع پیش‌فرض شخص‌سوم در برگۀ ساخت "مشتری جدید"
 ABankAccountMustBeDefinedOnPaymentModeSetup=توجه: برای این‌که این قابلیت کار کند، حساب بانکی باید در تنظیمات هر واحد مربوط به پرداخت تعریف شود (Paypal، Stripe و غیره) 
@@ -1918,7 +1919,7 @@ LogsLinesNumber=تعداد سطور نمایش داده شده در زبانۀ 
 UseDebugBar=استفاده از نوار اشکال‌یابی
 DEBUGBAR_LOGS_LINES_NUMBER=تعداد آخرین سطور گزارش‌کار برای حفظ در کنسول
 WarningValueHigherSlowsDramaticalyOutput=هشدار! مقادیر بزرگ خروجی را به‌شدت کند می‌کند
-ModuleActivated=Module %s is activated and slows the interface
+ModuleActivated=واحد %s فعال شده و باعث کاهش سرعت رابط کاربری می‌شود
 EXPORTS_SHARE_MODELS=اشکال صادارات با همگان به اشتراک گذاشته شدند
 ExportSetup=برپاسازی واحد صادرات
 InstanceUniqueID=شناسۀ منحصر به‌فرد نمونه
@@ -1926,14 +1927,13 @@ SmallerThan=کوچک‌تر از
 LargerThan=بزرگتر از
 IfTrackingIDFoundEventWillBeLinked=توجه کنید در صورتی که یک شناسۀ ره‌گیری در یک رایانامۀ دریافتی یافت شود، روی‌داد به طور خودکار به اشیاء مربوطه متصل خواهد شد
 WithGMailYouCanCreateADedicatedPassword=با یک حساب GMail در صورتی که تائید 2 گامی را انتخاب کرده باشید، پیشنهاد می‌شود یک گذرواژۀ دوم برای استفادۀ برنامه به‌جای گذرواژۀ خودتان برای حساب بسازید. این کار از https://myaccount.google.com/ قابل انجام است.
-IFTTTSetup=برپاسازی واحد IFTTT
-IFTTT_SERVICE_KEY=کلید خدمات IFTTT
-IFTTT_DOLIBARR_ENDPOINT_SECUREKEY=کلید امنیتی برای امن‌سازی نشانی نقطۀ نهائی که توسط IFTTT استفاده می‌شود تا در ارسال رایانامه از Dolibarr مورد استفاده قرار گیرد.
-IFTTTDesc=این واحد برای راه‌انداختن رخدادها بر IFTTT طراحی شده و یا این‌که به اجرای کنش‌هائی در راه‌اندازهای IFTTT بیرونی بپردازد
-UrlForIFTTT=نشانی اینترنتی نهائی برای IFTTT
-YouWillFindItOnYourIFTTTAccount=شما آن را بر حساب IFTTT خود پیدا خواهید کرد
 EndPointFor=نقطۀ آخر برای %s : %s
 DeleteEmailCollector=حذف جمع‌آورندۀ رایانامه
 ConfirmDeleteEmailCollector=آیا مطمئن هستید می‌خواهید این جمع‌آورندۀ رایانامه را حذف کنید؟
-RecipientEmailsWillBeReplacedWithThisValue=Recipient emails will be always replaced with this value
-AtLeastOneDefaultBankAccountMandatory=At least 1 default bank account must be defined
+RecipientEmailsWillBeReplacedWithThisValue=رایانامه‌های دریافت‌کننده همواره با این مقدار جایگزین می‌شود
+AtLeastOneDefaultBankAccountMandatory=حداقل 1 حساب بانکی باید تعریف شود
+RESTRICT_API_ON_IP=Allow available APIs to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can use the available APIs.
+RESTRICT_ON_IP=Allow access to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can access.
+BaseOnSabeDavVersion=Based on the library SabreDAV version
+NotAPublicIp=Not a public IP
+MakeAnonymousPing=Make an anonymous Ping '+1' to the Dolibarr foundation server (done 1 time only after installation) to allow the foundation to count the number of Dolibarr installation.
diff --git a/htdocs/langs/fa_IR/banks.lang b/htdocs/langs/fa_IR/banks.lang
index ac3a1f9ff1a..b5bf5a3a325 100644
--- a/htdocs/langs/fa_IR/banks.lang
+++ b/htdocs/langs/fa_IR/banks.lang
@@ -73,6 +73,7 @@ BankTransaction=ورودی بانک
 ListTransactions=فهرست ورودی‌ها
 ListTransactionsByCategory=فهرست ورودی‌ها/دسته‌بندی
 TransactionsToConciliate=ورودی‌های قابل وفق
+TransactionsToConciliateShort=To reconcile
 Conciliable=امکان وفق‌دادن دارد
 Conciliate=وفق دادن
 Conciliation=وفق‌دادن
@@ -116,6 +117,7 @@ DeleteCheckReceipt=حذف این رسید چک
 ConfirmDeleteCheckReceipt=آیا مطمئنید می‌خواهید این رسیدچک را حذف کنید؟
 BankChecks=چک‌های بانکی
 BankChecksToReceipt=چک‌های در انتظار نقدشدن -به حساب گذاشته شده/کلر-
+BankChecksToReceiptShort=چک‌های در انتظار نقدشدن -به حساب گذاشته شده/کلر-
 ShowCheckReceipt=نمایش رسید به‌حساب‌گذاشتن چک
 NumberOfCheques=تعداد چک‌ها
 DeleteTransaction=حذف ورود
diff --git a/htdocs/langs/fa_IR/cashdesk.lang b/htdocs/langs/fa_IR/cashdesk.lang
index ee61f670395..c850664ade5 100644
--- a/htdocs/langs/fa_IR/cashdesk.lang
+++ b/htdocs/langs/fa_IR/cashdesk.lang
@@ -62,6 +62,7 @@ TicketVatGrouped=در قبض م.ب.ا.ا توسط نرخ گروه‌بندی ش
 AutoPrintTickets=چاپ خودکار قبوض
 EnableBarOrRestaurantFeatures=فعال‌کردن موارد مربوط به کافه و رستوران
 ConfirmDeletionOfThisPOSSale=آیا مطمئن هستید می‌خواهید این فروش را حذف کنید؟
+ConfirmDiscardOfThisPOSSale=Do you want to discard this current sale ?
 History=تاریخ
 ValidateAndClose=تائید و بستن
 Terminal=پایانه
@@ -69,3 +70,8 @@ NumberOfTerminals=تعداد پایانه‌ها
 TerminalSelect=پایانه‌ای که می‌خواهید استفاده کنید را انتخاب نمائید:
 POSTicket=برگۀ صندوق
 BasicPhoneLayout=Use basic layout for phones
+SetupOfTerminalNotComplete=Setup of terminal %s is not complete
+DirectPayment=Direct payment
+DirectPaymentButton=Direct cash payment button
+InvoiceIsAlreadyValidated=Invoice is already validated
+NoLinesToBill=No lines to bill
diff --git a/htdocs/langs/fa_IR/companies.lang b/htdocs/langs/fa_IR/companies.lang
index 379ad776c06..53551f9d329 100644
--- a/htdocs/langs/fa_IR/companies.lang
+++ b/htdocs/langs/fa_IR/companies.lang
@@ -54,6 +54,7 @@ Firstname=نام
 PostOrFunction=مرتبۀ شغلی
 UserTitle=عنوان
 NatureOfThirdParty=طبیعت شخص‌سوم
+NatureOfContact=Nature of Contact
 Address=نشانی
 State=ایالت / استان
 StateShort=استان
diff --git a/htdocs/langs/fa_IR/contracts.lang b/htdocs/langs/fa_IR/contracts.lang
index 8c56011b92b..653ab6480c0 100644
--- a/htdocs/langs/fa_IR/contracts.lang
+++ b/htdocs/langs/fa_IR/contracts.lang
@@ -51,6 +51,7 @@ ListOfClosedServices=فهرسته خدمات بسته شده
 ListOfRunningServices=فعرست خدمات در حال اجرا
 NotActivatedServices=خدمات غیرفعال (در قراردادهای تائید شده)
 BoardNotActivatedServices=خدمات قابل فعال‌سازی در قراردادهای تائید شده
+BoardNotActivatedServicesShort=Services to activate
 LastContracts=آخرین %s قراردا
 LastModifiedServices=آخرین %s خدمات ویرایش شده
 ContractStartDate=تاریخ شروع
@@ -65,7 +66,9 @@ DateEndReal=تاریخ پایان حقیقی
 DateEndRealShort=تاریخ پایان واقعی
 CloseService=متوقف‌کردن-بستن خدمات
 BoardRunningServices=خدمات در حال اجرا
+BoardRunningServicesShort=خدمات در حال اجرا
 BoardExpiredServices=خدمات منقضی شده
+BoardExpiredServicesShort=خدمات منقضی شده
 ServiceStatus=وضعیت خدمات
 DraftContracts=قراردادهای پیش‌نویس
 CloseRefusedBecauseOneServiceActive=قرارداد نمی‌تواند بسته شود زیرا حداقل یک سرویس فعال در آن وجود دارد
diff --git a/htdocs/langs/fa_IR/errors.lang b/htdocs/langs/fa_IR/errors.lang
index b93c42f3fd8..74227693360 100644
--- a/htdocs/langs/fa_IR/errors.lang
+++ b/htdocs/langs/fa_IR/errors.lang
@@ -218,6 +218,7 @@ ErrorVariableKeyForContentMustBeSet=خطا، مقدارثابت با نام %s (
 ErrorURLMustStartWithHttp=نشانی اینترنتی %s باید با http://  یا  https:// آغاز گرد
 ErrorNewRefIsAlreadyUsed=خطا، ارجاع جدید قبلا استفاده شده است
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Error, delete payment linked to a closed invoice is not possible.
+ErrorSearchCriteriaTooSmall=Search criteria too small.
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 WarningPasswordSetWithNoAccount=یک گذرواژه برای این عضو تنظیم شده است. با این‌حال هیچ حساب کاربری‌ای ساخته نشده است. بنابراین این گذرواژه برای ورود به Dolibarr قابل استفاده نیست. ممکن است برای یک رابط/واحد بیرونی قابل استفاده باشد، اما اگر شما نخواهید هیچ نام کاربری ورود و گذرواژه‌ای برای یک عضو استفاده کنید، شما می‌توانید گزینۀ "ایجاد یک نام‌ورد برای هر عضو" را از برپاسازی واحد اعضاء غیرفعال کنید. در صورتی که نیاز دارید که نام‌ورود داشته باشید اما گذرواژه نداشته باشید، می‌توانید این بخش را خالی گذاشته تا از این هشدار بر حذر باشید. نکته: همچنین نشانی رایانامه می‌تواند در صورتی که عضو به یک‌کاربر متصل باشد، می‌‌تواند مورد استفاده قرار گیرد
diff --git a/htdocs/langs/fa_IR/main.lang b/htdocs/langs/fa_IR/main.lang
index e9c00db19c4..dd94a5dff6b 100644
--- a/htdocs/langs/fa_IR/main.lang
+++ b/htdocs/langs/fa_IR/main.lang
@@ -28,6 +28,7 @@ NoTemplateDefined=برای این نوع رایانامه قالبی وجود ن
 AvailableVariables=متغیرهای موجود برای جایگزینی 
 NoTranslation=بدون ترجمه
 Translation=ترجمه
+EmptySearchString=Enter a non empty search string
 NoRecordFound=هیچ ردیفی پیدا نشد
 NoRecordDeleted=هیچ ردیفی حذف نشد
 NotEnoughDataYet=دادۀ کافی وجود ندارد
@@ -445,7 +446,7 @@ ContactsAddressesForCompany=طرف‌های‌تماس/نشانی‌های ای
 AddressesForCompany=نشانی‌های این شخص‌سوم
 ActionsOnCompany=روی‌دادهای مربوط به این شخص سوم
 ActionsOnContact=روی‌دادهای مربوط به این طرف‌تماس/نشانی
-ActionsOnContract=Events for this contract
+ActionsOnContract=روی‌دادهای مربوط به این قرارداد
 ActionsOnMember=روی‌دادهای مربوط به این عضو
 ActionsOnProduct=روی‌دادهای مربوط به این محصول
 NActionsLate=%s دیرتر
@@ -704,6 +705,7 @@ DateOfSignature=تاریخ امضا
 HidePassword=نمایش دستور با گذرواژۀ پنهان
 UnHidePassword=نمایش دستور و گذرواژۀ واقعی
 Root=ریشه
+RootOfMedias=Root of public medias (/medias)
 Informations=اطلاعات
 Page=صفحه
 Notes=یادداشت‌ها
@@ -760,7 +762,7 @@ LinkToSupplierProposal=پیوند به پیشنهاد فروشنده
 LinkToSupplierInvoice=پیوند به صورت‌حساب فروشنده
 LinkToContract=پیوند به قرارداد
 LinkToIntervention=پیوند به واسطه‌گری
-LinkToTicket=Link to ticket
+LinkToTicket=اتصال به برگۀ پشتیبانی
 CreateDraft=ساخت پیش‌نویس
 SetToDraft=بازگشت به پیش‌نویس
 ClickToEdit=کلیک برای ویرایش
@@ -981,3 +983,10 @@ PaymentInformation=اطلاعات پرداخت
 ValidFrom=معتبر از
 ValidUntil=معتبر تا
 NoRecordedUsers=کاربری نیست
+ToClose=To close
+ToProcess=برای پردازش
+ToApprove=To approve
+GlobalOpenedElemView=Global view
+NoArticlesFoundForTheKeyword=No article found for the keyword '<strong>%s</strong>'
+NoArticlesFoundForTheCategory=No article found for the category
+ToAcceptRefuse=To accept | refuse
diff --git a/htdocs/langs/fa_IR/members.lang b/htdocs/langs/fa_IR/members.lang
index fc13e7de287..6ad9abfb8a2 100644
--- a/htdocs/langs/fa_IR/members.lang
+++ b/htdocs/langs/fa_IR/members.lang
@@ -29,6 +29,7 @@ MenuMembersUpToDate=تا اعضای تاریخ
 MenuMembersNotUpToDate=از اعضای تاریخ
 MenuMembersResiliated=Terminated members
 MembersWithSubscriptionToReceive=کاربران با اشتراک برای دریافت
+MembersWithSubscriptionToReceiveShort=Subscription to receive
 DateSubscription=تاریخ ثبت نام
 DateEndSubscription=تاریخ پایان ثبت نام
 EndSubscription=اشتراک پایان
diff --git a/htdocs/langs/fa_IR/projects.lang b/htdocs/langs/fa_IR/projects.lang
index a818bc8debc..372512fb04b 100644
--- a/htdocs/langs/fa_IR/projects.lang
+++ b/htdocs/langs/fa_IR/projects.lang
@@ -76,7 +76,13 @@ MyProjects=طرح‌های من
 MyProjectsArea=بخش طرح‌های مربوط به من
 DurationEffective=مدت‌زمان مفید
 ProgressDeclared=پیشرفت اظهار شده
+TaskProgressSummary=Task progress
+CurentlyOpenedTasks=Curently opened tasks
+TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared progress is less %s than the calculated progression
+TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared progress is more %s than the calculated progression
 ProgressCalculated=پیشرفت محاسبه شده
+WhichIamLinkedTo=which I'm linked to
+WhichIamLinkedToProject=which I'm linked to project
 Time=زمان
 ListOfTasks=فهرست وظایف
 GoToListOfTimeConsumed=رجوع به فهرست زمان صرف شده
diff --git a/htdocs/langs/fa_IR/website.lang b/htdocs/langs/fa_IR/website.lang
index e8d9603803b..f80b0cf3e13 100644
--- a/htdocs/langs/fa_IR/website.lang
+++ b/htdocs/langs/fa_IR/website.lang
@@ -2,7 +2,7 @@
 Shortname=رمز
 WebsiteSetupDesc=Create here the websites you wish to use. Then go into menu Websites to edit them.
 DeleteWebsite=Delete website
-ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed.
+ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed. The files uploaded (like into the medias directory, the ECM module, ...) will remain.
 WEBSITE_TYPE_CONTAINER=Type of page/container
 WEBSITE_PAGE_EXAMPLE=Web page to use as example
 WEBSITE_PAGENAME=Page name/alias
@@ -14,6 +14,9 @@ WEBSITE_JS_INLINE=Javascript file content (common to all pages)
 WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages)
 WEBSITE_ROBOT=Robot file (robots.txt)
 WEBSITE_HTACCESS=Website .htaccess file
+WEBSITE_MANIFEST_JSON=Website manifest.json file
+WEBSITE_README=README.md file
+EnterHereLicenseInformation=Enter here meta data or license information to fille a README.md file. if you distribute your website as a template, the file will be included into the temptate package.
 HtmlHeaderPage=HTML header (specific to this page only)
 PageNameAliasHelp=Name or alias of the page.<br>This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "<strong>%s</strong>" to edit this alias.
 EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container.
@@ -41,6 +44,7 @@ RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
 SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then set the name of the virtual host you have created in the properties of web site, so the preview can be done also using this dedicated web server access instead of the internal Dolibarr server.
 YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
 CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
 ReadPerm=خواندن
 WritePerm=Write
@@ -75,7 +79,8 @@ AddWebsiteAccount=Create web site account
 BackToListOfThirdParty=Back to list for Third Party
 DisableSiteFirst=Disable website first
 MyContainerTitle=My web site title
-AnotherContainer=Another container
+AnotherContainer=This is how to include content of another page/container (you may have an error here if you enable dynamic code because the embedded subcontainer may not exists)
+SorryWebsiteIsCurrentlyOffLine=Sorry, this website is currently off line. Please comme back later...
 WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / third party
 YouMustDefineTheHomePage=You must first define the default Home page
@@ -89,7 +94,8 @@ AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
 CorporateHomePage=Corporate Home page
 EmptyPage=Empty page
 ExternalURLMustStartWithHttp=External URL must start with http:// or https://
-ZipOfWebsitePackageToImport=Zip file of website package
+ZipOfWebsitePackageToImport=Upload the Zip file of the website template package
+ZipOfWebsitePackageToLoad=or Choose an available embedded website template package
 ShowSubcontainers=Include dynamic content
 InternalURLOfPage=Internal URL of page
 ThisPageIsTranslationOf=This page/container is a translation of
@@ -101,5 +107,10 @@ NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynam
 ReplaceWebsiteContent=Search or Replace website content
 DeleteAlsoJs=Delete also all javascript files specific to this website?
 DeleteAlsoMedias=Delete also all medias files specific to this website?
-# Export
 MyWebsitePages=My website pages
+SearchReplaceInto=Search | Replace into
+ReplaceString=New string
+CSSContentTooltipHelp=Enter here CSS content. To avoid any conflict with the CSS of the application, be sure to prepend all declaration with the .bodywebsite class. For example:<br><br>#mycssselector, input.myclass:hover { ... }<br>must be<br>.bodywebsite #mycssselector, .bodywebsite input.myclass:hover { ... }<br><br>Note: If you have a large file without this prefix, you can use 'lessc' to convert it to append the .bodywebsite prefix everywhere.
+LinkAndScriptsHereAreNotLoadedInEditor=Warning: This content is output only when site is accessed from a server. It is not used in Edit mode so if you need to load javascript files also in edit mode, just add your tag 'script src=...' into the page.
+Dynamiccontent=Sample of a page with dynamic content
+ImportSite=Import website template
diff --git a/htdocs/langs/fi_FI/admin.lang b/htdocs/langs/fi_FI/admin.lang
index 636b3f07ac7..d926efb438e 100644
--- a/htdocs/langs/fi_FI/admin.lang
+++ b/htdocs/langs/fi_FI/admin.lang
@@ -400,6 +400,7 @@ OldVATRates=Vanha ALV prosentti
 NewVATRates=Uusi ALV prosentti
 PriceBaseTypeToChange=Modify on prices with base reference value defined on
 MassConvert=Launch bulk conversion
+PriceFormatInCurrentLanguage=Price Format In Current Language
 String=String
 TextLong=Pitkä teksti
 HtmlText=Html teksti
@@ -431,7 +432,7 @@ ExtrafieldParamHelpradio=List of values must be lines with format key,value (whe
 ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- idfilter is necessarly a primary int key<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=List of values 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>Examples:<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
-ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default)<br>Set this to 2 for a collapsing separator (collapsed by default)
+ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Käytettävä kirjasto PDF:n luomiseen
 LocalTaxDesc=Some countries may apply two or three taxes on each invoice line. If this is the case, choose the type for the 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)
 SMS=Tekstiviesti
@@ -1695,7 +1696,7 @@ SuppliersInvoiceNumberingModel=Vendor invoices numbering models
 IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=GeoIP Maxmind moduuli setup
-PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat
+PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoLite2-Country.mmdb
 NoteOnPathLocation=Huomaa, että IP-maahan tiedosto on sisällä hakemiston PHP voi lukea (Tarkista PHP open_basedir asetukset ja tiedostojärjestelmän oikeudet).
 YouCanDownloadFreeDatFileTo=Voit <b>ladata</b> ilmaisen <b>demoversion</b> Maxmind GeoIP maa-tiedoston %s.
 YouCanDownloadAdvancedDatFileTo=Voit myös ladata <b>pidempään versioon, niiden päivitykset</b> ja Maxmind GeoIP maa-tiedoston %s.
@@ -1926,14 +1927,13 @@ SmallerThan=Smaller than
 LargerThan=Larger than
 IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID is found into incoming email, the event will be automatically linked to the related objects.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
-IFTTTSetup=IFTTT module setup
-IFTTT_SERVICE_KEY=IFTTT Service key
-IFTTT_DOLIBARR_ENDPOINT_SECUREKEY=Security key to secure the endpoint URL used by IFTTT to send messages to your Dolibarr.
-IFTTTDesc=This module is designed to trigger events on IFTTT and/or to execute some action on external IFTTT triggers.
-UrlForIFTTT=URL endpoint for IFTTT
-YouWillFindItOnYourIFTTTAccount=You will find it on your IFTTT account
 EndPointFor=End point for %s : %s
 DeleteEmailCollector=Delete email collector
 ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
 RecipientEmailsWillBeReplacedWithThisValue=Recipient emails will be always replaced with this value
 AtLeastOneDefaultBankAccountMandatory=At least 1 default bank account must be defined
+RESTRICT_API_ON_IP=Allow available APIs to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can use the available APIs.
+RESTRICT_ON_IP=Allow access to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can access.
+BaseOnSabeDavVersion=Based on the library SabreDAV version
+NotAPublicIp=Not a public IP
+MakeAnonymousPing=Make an anonymous Ping '+1' to the Dolibarr foundation server (done 1 time only after installation) to allow the foundation to count the number of Dolibarr installation.
diff --git a/htdocs/langs/fi_FI/banks.lang b/htdocs/langs/fi_FI/banks.lang
index fe9c6b9f63f..215f5afbe74 100644
--- a/htdocs/langs/fi_FI/banks.lang
+++ b/htdocs/langs/fi_FI/banks.lang
@@ -73,6 +73,7 @@ BankTransaction=Pankkimerkintä
 ListTransactions=Luettelo tapahtumista
 ListTransactionsByCategory=Luettelo tapahtumista / luokka
 TransactionsToConciliate=Täsmäytettävät tapahtumat
+TransactionsToConciliateShort=To reconcile
 Conciliable=Conciliable
 Conciliate=Sovita
 Conciliation=Yhteensovita
@@ -116,6 +117,7 @@ DeleteCheckReceipt=Poista tämä shekkikuitti?
 ConfirmDeleteCheckReceipt=Haluatko varmasti poistaa tämän sekkikuitin?
 BankChecks=Pankkisekit
 BankChecksToReceipt=Talletusta odottavat shekit
+BankChecksToReceiptShort=Talletusta odottavat shekit
 ShowCheckReceipt=Näytä tarkistaa Talletus kuitti
 NumberOfCheques=No. of check
 DeleteTransaction=Poista merkintä
diff --git a/htdocs/langs/fi_FI/cashdesk.lang b/htdocs/langs/fi_FI/cashdesk.lang
index 41d459d8efd..826fa409ae7 100644
--- a/htdocs/langs/fi_FI/cashdesk.lang
+++ b/htdocs/langs/fi_FI/cashdesk.lang
@@ -62,6 +62,7 @@ TicketVatGrouped=Group VAT by rate in tickets
 AutoPrintTickets=Automatically print tickets
 EnableBarOrRestaurantFeatures=Enable features for Bar or Restaurant
 ConfirmDeletionOfThisPOSSale=Do your confirm the deletion of this current sale ?
+ConfirmDiscardOfThisPOSSale=Do you want to discard this current sale ?
 History=Historia
 ValidateAndClose=Validate and close
 Terminal=Terminal
@@ -69,3 +70,8 @@ NumberOfTerminals=Number of Terminals
 TerminalSelect=Select terminal you want to use:
 POSTicket=POS Ticket
 BasicPhoneLayout=Use basic layout for phones
+SetupOfTerminalNotComplete=Setup of terminal %s is not complete
+DirectPayment=Direct payment
+DirectPaymentButton=Direct cash payment button
+InvoiceIsAlreadyValidated=Invoice is already validated
+NoLinesToBill=No lines to bill
diff --git a/htdocs/langs/fi_FI/companies.lang b/htdocs/langs/fi_FI/companies.lang
index cf6410370c7..76679a7aa76 100644
--- a/htdocs/langs/fi_FI/companies.lang
+++ b/htdocs/langs/fi_FI/companies.lang
@@ -54,6 +54,7 @@ Firstname=Etunimi
 PostOrFunction=Asema
 UserTitle=Titteli
 NatureOfThirdParty=Sidosryhmän luonne
+NatureOfContact=Nature of Contact
 Address=Osoite
 State=Valtio / Lääni
 StateShort=Valtio
diff --git a/htdocs/langs/fi_FI/contracts.lang b/htdocs/langs/fi_FI/contracts.lang
index a50ee37e8bb..9a33c265ef1 100644
--- a/htdocs/langs/fi_FI/contracts.lang
+++ b/htdocs/langs/fi_FI/contracts.lang
@@ -51,6 +51,7 @@ ListOfClosedServices=Luettelo suljettu palvelut
 ListOfRunningServices=Luettelo käynnissä olevat palvelut
 NotActivatedServices=Ei aktivoitu palvelut (muun muassa validoitava sopimukset)
 BoardNotActivatedServices=Palvelut aktivoida kesken validoitava sopimukset
+BoardNotActivatedServicesShort=Services to activate
 LastContracts=Viimeisimmät %s sopimukset
 LastModifiedServices=Latest %s modified services
 ContractStartDate=Aloituspäivämäärä
@@ -64,7 +65,10 @@ DateStartRealShort=Real Aloituspäivästä
 DateEndReal=Real lopetuspäivämäärää
 DateEndRealShort=Real lopetuspäivämäärää
 CloseService=Sulje palvelu
-BoardRunningServices=Lakkaa käynnissä olevat palvelut
+BoardRunningServices=Services running
+BoardRunningServicesShort=Services running
+BoardExpiredServices=Services expired
+BoardExpiredServicesShort=Services expired
 ServiceStatus=Tila-palvelun
 DraftContracts=Drafts sopimukset
 CloseRefusedBecauseOneServiceActive=Contract can't be closed as there is at least one open service on it
diff --git a/htdocs/langs/fi_FI/errors.lang b/htdocs/langs/fi_FI/errors.lang
index 326aa5f7cc2..dadd4001ee5 100644
--- a/htdocs/langs/fi_FI/errors.lang
+++ b/htdocs/langs/fi_FI/errors.lang
@@ -218,6 +218,7 @@ ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text
 ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Error, delete payment linked to a closed invoice is not possible.
+ErrorSearchCriteriaTooSmall=Search criteria too small.
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 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/main.lang b/htdocs/langs/fi_FI/main.lang
index 6667c78b2ab..0604d55e298 100644
--- a/htdocs/langs/fi_FI/main.lang
+++ b/htdocs/langs/fi_FI/main.lang
@@ -28,6 +28,7 @@ NoTemplateDefined=Tämän tyyliselle sähköpostille ei ole pohjaa saatavilla
 AvailableVariables=Available substitution variables
 NoTranslation=Ei käännöstä
 Translation=Käännös
+EmptySearchString=Enter a non empty search string
 NoRecordFound=Tietueita ei löytynyt
 NoRecordDeleted=Tallennuksia ei poistettu
 NotEnoughDataYet=Ei tarpeeksi tietoja
@@ -704,6 +705,7 @@ DateOfSignature=Allekirjoituksen päivämäärä
 HidePassword=Näytä komento salasana piilotettuna
 UnHidePassword=Näytä todellinen komento salasana näkyen
 Root=Juuri
+RootOfMedias=Root of public medias (/medias)
 Informations=Information
 Page=Sivu
 Notes=Huomiot
@@ -981,3 +983,10 @@ PaymentInformation=Payment information
 ValidFrom=Valid from
 ValidUntil=Valid until
 NoRecordedUsers=No users
+ToClose=To close
+ToProcess=Jotta prosessi
+ToApprove=To approve
+GlobalOpenedElemView=Global view
+NoArticlesFoundForTheKeyword=No article found for the keyword '<strong>%s</strong>'
+NoArticlesFoundForTheCategory=No article found for the category
+ToAcceptRefuse=To accept | refuse
diff --git a/htdocs/langs/fi_FI/members.lang b/htdocs/langs/fi_FI/members.lang
index 9e846481971..aee1b053fec 100644
--- a/htdocs/langs/fi_FI/members.lang
+++ b/htdocs/langs/fi_FI/members.lang
@@ -29,6 +29,7 @@ MenuMembersUpToDate=Ajan jäsenten
 MenuMembersNotUpToDate=Vanhentunut jäseniä
 MenuMembersResiliated=Terminated members
 MembersWithSubscriptionToReceive=Jäsenet Merkintäoikeuksien vastaanottaa
+MembersWithSubscriptionToReceiveShort=Subscription to receive
 DateSubscription=Tilaus päivämäärän
 DateEndSubscription=Tilaus lopetuspäivämäärää
 EndSubscription=Lopeta tilaus
diff --git a/htdocs/langs/fi_FI/projects.lang b/htdocs/langs/fi_FI/projects.lang
index 803eff3103b..ad9ad782c3a 100644
--- a/htdocs/langs/fi_FI/projects.lang
+++ b/htdocs/langs/fi_FI/projects.lang
@@ -76,7 +76,13 @@ MyProjects=Omat hankkeet
 MyProjectsArea=My projects Area
 DurationEffective=Todellisen keston
 ProgressDeclared=Declared progress
+TaskProgressSummary=Task progress
+CurentlyOpenedTasks=Curently opened tasks
+TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared progress is less %s than the calculated progression
+TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared progress is more %s than the calculated progression
 ProgressCalculated=Calculated progress
+WhichIamLinkedTo=which I'm linked to
+WhichIamLinkedToProject=which I'm linked to project
 Time=Aika
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
diff --git a/htdocs/langs/fi_FI/website.lang b/htdocs/langs/fi_FI/website.lang
index 805210f3811..5a9c3330c46 100644
--- a/htdocs/langs/fi_FI/website.lang
+++ b/htdocs/langs/fi_FI/website.lang
@@ -2,7 +2,7 @@
 Shortname=Koodi
 WebsiteSetupDesc=Create here the websites you wish to use. Then go into menu Websites to edit them.
 DeleteWebsite=Delete website
-ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed.
+ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed. The files uploaded (like into the medias directory, the ECM module, ...) will remain.
 WEBSITE_TYPE_CONTAINER=Type of page/container
 WEBSITE_PAGE_EXAMPLE=Web page to use as example
 WEBSITE_PAGENAME=Page name/alias
@@ -14,6 +14,9 @@ WEBSITE_JS_INLINE=Javascript file content (common to all pages)
 WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages)
 WEBSITE_ROBOT=Robot file (robots.txt)
 WEBSITE_HTACCESS=Website .htaccess file
+WEBSITE_MANIFEST_JSON=Website manifest.json file
+WEBSITE_README=README.md file
+EnterHereLicenseInformation=Enter here meta data or license information to fille a README.md file. if you distribute your website as a template, the file will be included into the temptate package.
 HtmlHeaderPage=HTML header (specific to this page only)
 PageNameAliasHelp=Name or alias of the page.<br>This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "<strong>%s</strong>" to edit this alias.
 EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container.
@@ -41,6 +44,7 @@ RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
 SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then set the name of the virtual host you have created in the properties of web site, so the preview can be done also using this dedicated web server access instead of the internal Dolibarr server.
 YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
 CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
 ReadPerm=Luettu
 WritePerm=Write
@@ -75,7 +79,8 @@ AddWebsiteAccount=Create web site account
 BackToListOfThirdParty=Back to list for Third Party
 DisableSiteFirst=Disable website first
 MyContainerTitle=My web site title
-AnotherContainer=Another container
+AnotherContainer=This is how to include content of another page/container (you may have an error here if you enable dynamic code because the embedded subcontainer may not exists)
+SorryWebsiteIsCurrentlyOffLine=Sorry, this website is currently off line. Please comme back later...
 WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / third party
 YouMustDefineTheHomePage=You must first define the default Home page
@@ -89,7 +94,8 @@ AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
 CorporateHomePage=Corporate Home page
 EmptyPage=Empty page
 ExternalURLMustStartWithHttp=External URL must start with http:// or https://
-ZipOfWebsitePackageToImport=Zip file of website package
+ZipOfWebsitePackageToImport=Upload the Zip file of the website template package
+ZipOfWebsitePackageToLoad=or Choose an available embedded website template package
 ShowSubcontainers=Include dynamic content
 InternalURLOfPage=Internal URL of page
 ThisPageIsTranslationOf=This page/container is a translation of
@@ -101,5 +107,10 @@ NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynam
 ReplaceWebsiteContent=Search or Replace website content
 DeleteAlsoJs=Delete also all javascript files specific to this website?
 DeleteAlsoMedias=Delete also all medias files specific to this website?
-# Export
 MyWebsitePages=My website pages
+SearchReplaceInto=Search | Replace into
+ReplaceString=New string
+CSSContentTooltipHelp=Enter here CSS content. To avoid any conflict with the CSS of the application, be sure to prepend all declaration with the .bodywebsite class. For example:<br><br>#mycssselector, input.myclass:hover { ... }<br>must be<br>.bodywebsite #mycssselector, .bodywebsite input.myclass:hover { ... }<br><br>Note: If you have a large file without this prefix, you can use 'lessc' to convert it to append the .bodywebsite prefix everywhere.
+LinkAndScriptsHereAreNotLoadedInEditor=Warning: This content is output only when site is accessed from a server. It is not used in Edit mode so if you need to load javascript files also in edit mode, just add your tag 'script src=...' into the page.
+Dynamiccontent=Sample of a page with dynamic content
+ImportSite=Import website template
diff --git a/htdocs/langs/fr_FR/orders.lang b/htdocs/langs/fr_FR/orders.lang
index a4a8827ca05..bbbeb2638e8 100644
--- a/htdocs/langs/fr_FR/orders.lang
+++ b/htdocs/langs/fr_FR/orders.lang
@@ -154,5 +154,5 @@ CreateOrders=Créer commandes
 ToBillSeveralOrderSelectCustomer=Pour créer une facture pour plusieurs commandes, cliquez d'abord sur le client, puis choisir "%s".
 OptionToSetOrderBilledNotEnabled=L'option (issue du module Workflow) pour définir automatiquement les commandes à 'Facturé' que une facture est validée, est désactivée, aussi vous devrez donc définir le statut de la commande sur 'Facturé' manuellement.
 IfValidateInvoiceIsNoOrderStayUnbilled=Si la validation de facture est à "Non", la commande restera au statut "Non facturé" jusqu'à ce que la facture soit validée.
-CloseReceivedSupplierOrdersAutomatically=Fermer la commande "%s" automatiquement si tous les produits ont été reçus.
+CloseReceivedSupplierOrdersAutomatically=Fermer la commande au statut "%s" automatiquement si tous les produits ont été reçus.
 SetShippingMode=Définir la méthode d'expédition
diff --git a/htdocs/langs/he_IL/admin.lang b/htdocs/langs/he_IL/admin.lang
index 8de440a7812..779217d0419 100644
--- a/htdocs/langs/he_IL/admin.lang
+++ b/htdocs/langs/he_IL/admin.lang
@@ -400,6 +400,7 @@ OldVATRates=Old VAT rate
 NewVATRates=New VAT rate
 PriceBaseTypeToChange=Modify on prices with base reference value defined on
 MassConvert=Launch bulk conversion
+PriceFormatInCurrentLanguage=Price Format In Current Language
 String=String
 TextLong=Long text
 HtmlText=Html text
@@ -431,7 +432,7 @@ ExtrafieldParamHelpradio=List of values must be lines with format key,value (whe
 ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- idfilter is necessarly a primary int key<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=List of values 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>Examples:<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
-ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default)<br>Set this to 2 for a collapsing separator (collapsed by default)
+ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Library used for PDF generation
 LocalTaxDesc=Some countries may apply two or three taxes on each invoice line. If this is the case, choose the type for the 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)
 SMS=SMS
@@ -1695,7 +1696,7 @@ SuppliersInvoiceNumberingModel=Vendor invoices numbering models
 IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=GeoIP Maxmind ההתקנה מודול
-PathToGeoIPMaxmindCountryDataFile=הנתיב לקובץ המכיל IP Maxmind תרגום הארץ. <br> דוגמה: / usr / local / share / GeoIP / GeoIP.dat
+PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoLite2-Country.mmdb
 NoteOnPathLocation=שים לב כי ה-IP שלכם לקובץ נתונים המדינה חייב להיות בתוך ספרייה PHP שלך יכול לקרוא (יש לבדוק את תוכנית ההתקנה של PHP שלך open_basedir מערכת קבצים והרשאות).
 YouCanDownloadFreeDatFileTo=ניתן להוריד <b>גרסת הדגמה חינם</b> של הקובץ הארץ GeoIP Maxmind ב %s.
 YouCanDownloadAdvancedDatFileTo=ניתן גם להוריד <b>גירסה מלאה יותר, עם עדכונים</b> של הקובץ הארץ GeoIP Maxmind ב %s.
@@ -1926,14 +1927,13 @@ SmallerThan=Smaller than
 LargerThan=Larger than
 IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID is found into incoming email, the event will be automatically linked to the related objects.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
-IFTTTSetup=IFTTT module setup
-IFTTT_SERVICE_KEY=IFTTT Service key
-IFTTT_DOLIBARR_ENDPOINT_SECUREKEY=Security key to secure the endpoint URL used by IFTTT to send messages to your Dolibarr.
-IFTTTDesc=This module is designed to trigger events on IFTTT and/or to execute some action on external IFTTT triggers.
-UrlForIFTTT=URL endpoint for IFTTT
-YouWillFindItOnYourIFTTTAccount=You will find it on your IFTTT account
 EndPointFor=End point for %s : %s
 DeleteEmailCollector=Delete email collector
 ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
 RecipientEmailsWillBeReplacedWithThisValue=Recipient emails will be always replaced with this value
 AtLeastOneDefaultBankAccountMandatory=At least 1 default bank account must be defined
+RESTRICT_API_ON_IP=Allow available APIs to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can use the available APIs.
+RESTRICT_ON_IP=Allow access to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can access.
+BaseOnSabeDavVersion=Based on the library SabreDAV version
+NotAPublicIp=Not a public IP
+MakeAnonymousPing=Make an anonymous Ping '+1' to the Dolibarr foundation server (done 1 time only after installation) to allow the foundation to count the number of Dolibarr installation.
diff --git a/htdocs/langs/he_IL/banks.lang b/htdocs/langs/he_IL/banks.lang
index c77158e07b7..47295ec7e31 100644
--- a/htdocs/langs/he_IL/banks.lang
+++ b/htdocs/langs/he_IL/banks.lang
@@ -73,6 +73,7 @@ BankTransaction=Bank entry
 ListTransactions=List entries
 ListTransactionsByCategory=List entries/category
 TransactionsToConciliate=Entries to reconcile
+TransactionsToConciliateShort=To reconcile
 Conciliable=Can be reconciled
 Conciliate=Reconcile
 Conciliation=Reconciliation
@@ -116,6 +117,7 @@ DeleteCheckReceipt=Delete this check receipt?
 ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
 BankChecks=Bank checks
 BankChecksToReceipt=Checks awaiting deposit
+BankChecksToReceiptShort=Checks awaiting deposit
 ShowCheckReceipt=Show check deposit receipt
 NumberOfCheques=No. of check
 DeleteTransaction=Delete entry
diff --git a/htdocs/langs/he_IL/cashdesk.lang b/htdocs/langs/he_IL/cashdesk.lang
index dde83bb7d61..1d9fc654271 100644
--- a/htdocs/langs/he_IL/cashdesk.lang
+++ b/htdocs/langs/he_IL/cashdesk.lang
@@ -62,6 +62,7 @@ TicketVatGrouped=Group VAT by rate in tickets
 AutoPrintTickets=Automatically print tickets
 EnableBarOrRestaurantFeatures=Enable features for Bar or Restaurant
 ConfirmDeletionOfThisPOSSale=Do your confirm the deletion of this current sale ?
+ConfirmDiscardOfThisPOSSale=Do you want to discard this current sale ?
 History=History
 ValidateAndClose=Validate and close
 Terminal=Terminal
@@ -69,3 +70,8 @@ NumberOfTerminals=Number of Terminals
 TerminalSelect=Select terminal you want to use:
 POSTicket=POS Ticket
 BasicPhoneLayout=Use basic layout for phones
+SetupOfTerminalNotComplete=Setup of terminal %s is not complete
+DirectPayment=Direct payment
+DirectPaymentButton=Direct cash payment button
+InvoiceIsAlreadyValidated=Invoice is already validated
+NoLinesToBill=No lines to bill
diff --git a/htdocs/langs/he_IL/companies.lang b/htdocs/langs/he_IL/companies.lang
index e7677c858d7..14e91648de6 100644
--- a/htdocs/langs/he_IL/companies.lang
+++ b/htdocs/langs/he_IL/companies.lang
@@ -54,6 +54,7 @@ Firstname=שם פרטי
 PostOrFunction=Job position
 UserTitle=Title
 NatureOfThirdParty=Nature of Third party
+NatureOfContact=Nature of Contact
 Address=כתובת
 State=State/Province
 StateShort=State
diff --git a/htdocs/langs/he_IL/contracts.lang b/htdocs/langs/he_IL/contracts.lang
index 6a374d024fc..5edcfad0808 100644
--- a/htdocs/langs/he_IL/contracts.lang
+++ b/htdocs/langs/he_IL/contracts.lang
@@ -51,6 +51,7 @@ ListOfClosedServices=List of closed services
 ListOfRunningServices=List of running services
 NotActivatedServices=Inactive services (among validated contracts)
 BoardNotActivatedServices=Services to activate among validated contracts
+BoardNotActivatedServicesShort=Services to activate
 LastContracts=Latest %s contracts
 LastModifiedServices=Latest %s modified services
 ContractStartDate=Start date
@@ -64,7 +65,10 @@ DateStartRealShort=Real start date
 DateEndReal=Real end date
 DateEndRealShort=Real end date
 CloseService=Close service
-BoardRunningServices=Expired running services
+BoardRunningServices=Services running
+BoardRunningServicesShort=Services running
+BoardExpiredServices=Services expired
+BoardExpiredServicesShort=Services expired
 ServiceStatus=Status of service
 DraftContracts=Drafts contracts
 CloseRefusedBecauseOneServiceActive=Contract can't be closed as there is at least one open service on it
diff --git a/htdocs/langs/he_IL/errors.lang b/htdocs/langs/he_IL/errors.lang
index 1ee46fdbb92..0c07b2eafc4 100644
--- a/htdocs/langs/he_IL/errors.lang
+++ b/htdocs/langs/he_IL/errors.lang
@@ -218,6 +218,7 @@ ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text
 ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Error, delete payment linked to a closed invoice is not possible.
+ErrorSearchCriteriaTooSmall=Search criteria too small.
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 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/main.lang b/htdocs/langs/he_IL/main.lang
index c62afca2efb..943efadaff3 100644
--- a/htdocs/langs/he_IL/main.lang
+++ b/htdocs/langs/he_IL/main.lang
@@ -28,6 +28,7 @@ NoTemplateDefined=No template available for this email type
 AvailableVariables=Available substitution variables
 NoTranslation=No translation
 Translation=Translation
+EmptySearchString=Enter a non empty search string
 NoRecordFound=No record found
 NoRecordDeleted=No record deleted
 NotEnoughDataYet=Not enough data
@@ -704,6 +705,7 @@ DateOfSignature=Date of signature
 HidePassword=Show command with password hidden
 UnHidePassword=Show real command with clear password
 Root=Root
+RootOfMedias=Root of public medias (/medias)
 Informations=Information
 Page=Page
 Notes=Notes
@@ -981,3 +983,10 @@ PaymentInformation=Payment information
 ValidFrom=Valid from
 ValidUntil=Valid until
 NoRecordedUsers=No users
+ToClose=To close
+ToProcess=To process
+ToApprove=To approve
+GlobalOpenedElemView=Global view
+NoArticlesFoundForTheKeyword=No article found for the keyword '<strong>%s</strong>'
+NoArticlesFoundForTheCategory=No article found for the category
+ToAcceptRefuse=To accept | refuse
diff --git a/htdocs/langs/he_IL/members.lang b/htdocs/langs/he_IL/members.lang
index f644cc3afcd..b1010fcd8ac 100644
--- a/htdocs/langs/he_IL/members.lang
+++ b/htdocs/langs/he_IL/members.lang
@@ -29,6 +29,7 @@ MenuMembersUpToDate=Up to date members
 MenuMembersNotUpToDate=Out of date members
 MenuMembersResiliated=Terminated members
 MembersWithSubscriptionToReceive=Members with subscription to receive
+MembersWithSubscriptionToReceiveShort=Subscription to receive
 DateSubscription=Subscription date
 DateEndSubscription=Subscription end date
 EndSubscription=End subscription
diff --git a/htdocs/langs/he_IL/projects.lang b/htdocs/langs/he_IL/projects.lang
index 55292d97c46..9650d3d9229 100644
--- a/htdocs/langs/he_IL/projects.lang
+++ b/htdocs/langs/he_IL/projects.lang
@@ -76,7 +76,13 @@ MyProjects=My projects
 MyProjectsArea=My projects Area
 DurationEffective=Effective duration
 ProgressDeclared=Declared progress
+TaskProgressSummary=Task progress
+CurentlyOpenedTasks=Curently opened tasks
+TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared progress is less %s than the calculated progression
+TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared progress is more %s than the calculated progression
 ProgressCalculated=Calculated progress
+WhichIamLinkedTo=which I'm linked to
+WhichIamLinkedToProject=which I'm linked to project
 Time=Time
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
diff --git a/htdocs/langs/he_IL/website.lang b/htdocs/langs/he_IL/website.lang
index 0ee00aff7c0..9648ae48cc8 100644
--- a/htdocs/langs/he_IL/website.lang
+++ b/htdocs/langs/he_IL/website.lang
@@ -2,7 +2,7 @@
 Shortname=Code
 WebsiteSetupDesc=Create here the websites you wish to use. Then go into menu Websites to edit them.
 DeleteWebsite=Delete website
-ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed.
+ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed. The files uploaded (like into the medias directory, the ECM module, ...) will remain.
 WEBSITE_TYPE_CONTAINER=Type of page/container
 WEBSITE_PAGE_EXAMPLE=Web page to use as example
 WEBSITE_PAGENAME=Page name/alias
@@ -14,6 +14,9 @@ WEBSITE_JS_INLINE=Javascript file content (common to all pages)
 WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages)
 WEBSITE_ROBOT=Robot file (robots.txt)
 WEBSITE_HTACCESS=Website .htaccess file
+WEBSITE_MANIFEST_JSON=Website manifest.json file
+WEBSITE_README=README.md file
+EnterHereLicenseInformation=Enter here meta data or license information to fille a README.md file. if you distribute your website as a template, the file will be included into the temptate package.
 HtmlHeaderPage=HTML header (specific to this page only)
 PageNameAliasHelp=Name or alias of the page.<br>This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "<strong>%s</strong>" to edit this alias.
 EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container.
@@ -41,6 +44,7 @@ RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
 SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then set the name of the virtual host you have created in the properties of web site, so the preview can be done also using this dedicated web server access instead of the internal Dolibarr server.
 YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
 CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
 ReadPerm=Read
 WritePerm=Write
@@ -75,7 +79,8 @@ AddWebsiteAccount=Create web site account
 BackToListOfThirdParty=Back to list for Third Party
 DisableSiteFirst=Disable website first
 MyContainerTitle=My web site title
-AnotherContainer=Another container
+AnotherContainer=This is how to include content of another page/container (you may have an error here if you enable dynamic code because the embedded subcontainer may not exists)
+SorryWebsiteIsCurrentlyOffLine=Sorry, this website is currently off line. Please comme back later...
 WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / third party
 YouMustDefineTheHomePage=You must first define the default Home page
@@ -89,7 +94,8 @@ AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
 CorporateHomePage=Corporate Home page
 EmptyPage=Empty page
 ExternalURLMustStartWithHttp=External URL must start with http:// or https://
-ZipOfWebsitePackageToImport=Zip file of website package
+ZipOfWebsitePackageToImport=Upload the Zip file of the website template package
+ZipOfWebsitePackageToLoad=or Choose an available embedded website template package
 ShowSubcontainers=Include dynamic content
 InternalURLOfPage=Internal URL of page
 ThisPageIsTranslationOf=This page/container is a translation of
@@ -101,5 +107,10 @@ NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynam
 ReplaceWebsiteContent=Search or Replace website content
 DeleteAlsoJs=Delete also all javascript files specific to this website?
 DeleteAlsoMedias=Delete also all medias files specific to this website?
-# Export
 MyWebsitePages=My website pages
+SearchReplaceInto=Search | Replace into
+ReplaceString=New string
+CSSContentTooltipHelp=Enter here CSS content. To avoid any conflict with the CSS of the application, be sure to prepend all declaration with the .bodywebsite class. For example:<br><br>#mycssselector, input.myclass:hover { ... }<br>must be<br>.bodywebsite #mycssselector, .bodywebsite input.myclass:hover { ... }<br><br>Note: If you have a large file without this prefix, you can use 'lessc' to convert it to append the .bodywebsite prefix everywhere.
+LinkAndScriptsHereAreNotLoadedInEditor=Warning: This content is output only when site is accessed from a server. It is not used in Edit mode so if you need to load javascript files also in edit mode, just add your tag 'script src=...' into the page.
+Dynamiccontent=Sample of a page with dynamic content
+ImportSite=Import website template
diff --git a/htdocs/langs/hr_HR/admin.lang b/htdocs/langs/hr_HR/admin.lang
index 03b8897ad05..3f2b20f2fec 100644
--- a/htdocs/langs/hr_HR/admin.lang
+++ b/htdocs/langs/hr_HR/admin.lang
@@ -400,6 +400,7 @@ OldVATRates=Stara stopa PDV-a
 NewVATRates=Nova stopa PDV-a
 PriceBaseTypeToChange=Promjeni cijene sa baznom referentnom vrijednosti definiranoj na
 MassConvert=Launch bulk conversion
+PriceFormatInCurrentLanguage=Price Format In Current Language
 String=String
 TextLong=Long text
 HtmlText=Html text
@@ -431,7 +432,7 @@ ExtrafieldParamHelpradio=List of values must be lines with format key,value (whe
 ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- idfilter is necessarly a primary int key<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=List of values 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>Examples:<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
-ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default)<br>Set this to 2 for a collapsing separator (collapsed by default)
+ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Biblioteka korištena za kreiranje PDF-a
 LocalTaxDesc=Some countries may apply two or three taxes on each invoice line. If this is the case, choose the type for the 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)
 SMS=SMS
@@ -652,13 +653,13 @@ Module62000Name=Incoterms
 Module62000Desc=Add features to manage Incoterms
 Module63000Name=Sredstva
 Module63000Desc=Manage resources (printers, cars, rooms, ...) for allocating to events
-Permission11=Čitaj račune kupca
-Permission12=Izradi/promjeni račune kupca
-Permission13=Ne ovjeravaj račun kupca
-Permission14=Ovjeri račun kupca
-Permission15=Pošalji račun kupca e-poštom
+Permission11=Pregledaj izlazne račune
+Permission12=Izradi/promijeni izlazne račune
+Permission13=Ne ovjeravaj izlazni račun
+Permission14=Ovjeri izlazni račun
+Permission15=Pošalji izlazni račun e-poštom
 Permission16=Izradi plaćanje za račune kupca
-Permission19=Obriši račun kupca
+Permission19=Obriši izlazni račun
 Permission21=Pročitaj ponude
 Permission22=Izradi/izmjeni ponudu
 Permission24=Ovjeri ponudu
@@ -840,10 +841,10 @@ Permission1002=Izradi/izmjeni skladišta
 Permission1003=Obriši skladišta
 Permission1004=Čitaj kretanja zaliha
 Permission1005=Izradi/izmjeni kretanja zaliha
-Permission1101=Čitaj naloge isporuka
-Permission1102=Izradi/izmjeni naloge isporuka
-Permission1104=Ovjeri naloge isporuka
-Permission1109=Obriši naloge isporuka
+Permission1101=Čitaj otpremnice
+Permission1102=Izradi/izmjeni otpremnice
+Permission1104=Ovjeri otpremnice
+Permission1109=Obriši otpremnice
 Permission1121=Read supplier proposals
 Permission1122=Create/modify supplier proposals
 Permission1123=Validate supplier proposals
@@ -1695,7 +1696,7 @@ SuppliersInvoiceNumberingModel=Vendor invoices numbering models
 IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=Podešavanje modula GeoIP Maxmind
-PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat
+PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoLite2-Country.mmdb
 NoteOnPathLocation=Note that your ip to country data file must be inside a directory your PHP can read (Check your PHP open_basedir setup and filesystem permissions).
 YouCanDownloadFreeDatFileTo=You can download a <b>free demo version</b> of the Maxmind GeoIP country file at %s.
 YouCanDownloadAdvancedDatFileTo=You can also download a more <b>complete version, with updates,</b> of the Maxmind GeoIP country file at %s.
@@ -1789,7 +1790,7 @@ MailToSendShipment=Isporuke
 MailToSendIntervention=Intervencije
 MailToSendSupplierRequestForQuotation=Quotation request
 MailToSendSupplierOrder=Narudžbe dobavljačima
-MailToSendSupplierInvoice=Računi dobavljača
+MailToSendSupplierInvoice=Ulazni računi
 MailToSendContract=Ugovori
 MailToThirdparty=Treće osobe
 MailToMember=Članovi
@@ -1926,14 +1927,13 @@ SmallerThan=Smaller than
 LargerThan=Larger than
 IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID is found into incoming email, the event will be automatically linked to the related objects.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
-IFTTTSetup=IFTTT module setup
-IFTTT_SERVICE_KEY=IFTTT Service key
-IFTTT_DOLIBARR_ENDPOINT_SECUREKEY=Security key to secure the endpoint URL used by IFTTT to send messages to your Dolibarr.
-IFTTTDesc=This module is designed to trigger events on IFTTT and/or to execute some action on external IFTTT triggers.
-UrlForIFTTT=URL endpoint for IFTTT
-YouWillFindItOnYourIFTTTAccount=You will find it on your IFTTT account
 EndPointFor=End point for %s : %s
 DeleteEmailCollector=Delete email collector
 ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
 RecipientEmailsWillBeReplacedWithThisValue=Recipient emails will be always replaced with this value
 AtLeastOneDefaultBankAccountMandatory=At least 1 default bank account must be defined
+RESTRICT_API_ON_IP=Allow available APIs to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can use the available APIs.
+RESTRICT_ON_IP=Allow access to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can access.
+BaseOnSabeDavVersion=Based on the library SabreDAV version
+NotAPublicIp=Not a public IP
+MakeAnonymousPing=Make an anonymous Ping '+1' to the Dolibarr foundation server (done 1 time only after installation) to allow the foundation to count the number of Dolibarr installation.
diff --git a/htdocs/langs/hr_HR/banks.lang b/htdocs/langs/hr_HR/banks.lang
index 25dc19fe6c8..84614ab6c52 100644
--- a/htdocs/langs/hr_HR/banks.lang
+++ b/htdocs/langs/hr_HR/banks.lang
@@ -73,6 +73,7 @@ BankTransaction=Bank entry
 ListTransactions=List entries
 ListTransactionsByCategory=List entries/category
 TransactionsToConciliate=Entries to reconcile
+TransactionsToConciliateShort=To reconcile
 Conciliable=Može se uskladiti
 Conciliate=Uskladi
 Conciliation=Usklađivanje
@@ -116,6 +117,7 @@ DeleteCheckReceipt=Delete this check receipt?
 ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
 BankChecks=Bankovni čekovi
 BankChecksToReceipt=Čekovi koji čekaju depozit
+BankChecksToReceiptShort=Čekovi koji čekaju depozit
 ShowCheckReceipt=Prikaži potvrdu depozita čeka
 NumberOfCheques=No. of check
 DeleteTransaction=Delete entry
diff --git a/htdocs/langs/hr_HR/bills.lang b/htdocs/langs/hr_HR/bills.lang
index 993ae31d4c3..6d99cbbf571 100644
--- a/htdocs/langs/hr_HR/bills.lang
+++ b/htdocs/langs/hr_HR/bills.lang
@@ -1,15 +1,15 @@
 # Dolibarr language file - Source file is en_US - bills
 Bill=Račun
 Bills=Računi
-BillsCustomers=Računi kupaca
+BillsCustomers=Izlazni računi
 BillsCustomer=Račun kupca
-BillsSuppliers=Računi dobavljača
-BillsCustomersUnpaid=Neplaćeni računi kupaca
-BillsCustomersUnpaidForCompany=Neplaćeni računi kupaca za %s
-BillsSuppliersUnpaid=Unpaid vendor invoices
+BillsSuppliers=Ulazni računi
+BillsCustomersUnpaid=Neplaćeni izlazni računi
+BillsCustomersUnpaidForCompany=Neplaćeni izlazni računi za %s
+BillsSuppliersUnpaid=Neplaćeni ulazni računi
 BillsSuppliersUnpaidForCompany=Unpaid vendors invoices for %s
 BillsLate=Zakašnjela plaćanja
-BillsStatistics=Statistika računa kupaca
+BillsStatistics=Statistika izlaznih računa
 BillsStatisticsSuppliers=Vendors invoices statistics
 DisabledBecauseDispatchedInBookkeeping=Nije moguće provesti jer je račun poslan u knjigovodstvo
 DisabledBecauseNotLastInvoice=Nije moguće provesti jer se račun ne može izbrisati. U međuvremenu su ispostavljeni novi računi i tako bi neki brojevi ostali preskočeni.
@@ -44,7 +44,7 @@ NotConsumed=Nije potrošio
 NoReplacableInvoice=No replaceable invoices
 NoInvoiceToCorrect=Nema računa za ispravak
 InvoiceHasAvoir=Bio je izvor od jednog ili više knjižnih odobrenja
-CardBill=Kartica računa
+CardBill=Račun
 PredefinedInvoices=Predlošci računa
 Invoice=Račun
 PdfInvoiceTitle=Račun
@@ -52,11 +52,11 @@ Invoices=Računi
 InvoiceLine=Redak računa
 InvoiceCustomer=Račun za kupca
 CustomerInvoice=Račun za kupca
-CustomersInvoices=Računi za kupce
+CustomersInvoices=Izlazni računi
 SupplierInvoice=Vendor invoice
 SuppliersInvoices=Vendors invoices
 SupplierBill=Vendor invoice
-SupplierBills=Računi dobavljača
+SupplierBills=Ulazni računi
 Payment=Plaćanja
 PaymentBack=Isplata
 CustomerInvoicePaymentBack=Isplata
@@ -165,15 +165,15 @@ NewBill=Novi račun
 LastBills=Latest %s invoices
 LatestTemplateInvoices=Latest %s template invoices
 LatestCustomerTemplateInvoices=Latest %s customer template invoices
-LatestSupplierTemplateInvoices=Latest %s vendor template invoices
-LastCustomersBills=Latest %s customer invoices
-LastSuppliersBills=Latest %s vendor invoices
+LatestSupplierTemplateInvoices=Zadnjih %s predložaka ulaznih računa
+LastCustomersBills=Zadnja %s izlazna računa
+LastSuppliersBills=Zadnjih %s ulaznih računa
 AllBills=Svi računi
 AllCustomerTemplateInvoices=All template invoices
 OtherBills=Ostali računi
 DraftBills=Skice računa
-CustomersDraftInvoices=Customer draft invoices
-SuppliersDraftInvoices=Vendor draft invoices
+CustomersDraftInvoices=Skice izlaznih računa
+SuppliersDraftInvoices=Skice ulaznih računa
 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>?
@@ -263,8 +263,8 @@ DateInvoice=Datum računa
 DatePointOfTax=Porezna stavka
 NoInvoice=Nema računa
 ClassifyBill=Svrstavanje računa
-SupplierBillsToPay=Unpaid vendor invoices
-CustomerBillsUnpaid=Neplaćeni računi kupaca
+SupplierBillsToPay=Neplaćeni ulazni računi
+CustomerBillsUnpaid=Neplaćeni izlazni računi
 NonPercuRecuperable=Nepovratno
 SetConditions=Odredi rok plaćanja
 SetMode=Izaberi način plaćanja
@@ -278,10 +278,10 @@ Repeatables=Predlošci
 ChangeIntoRepeatableInvoice=Pretvori u predložak računa
 CreateRepeatableInvoice=Izradi predložak računa
 CreateFromRepeatableInvoice=Izradi iz predloška računa
-CustomersInvoicesAndInvoiceLines=Customer invoices and invoice details
-CustomersInvoicesAndPayments=Računi i plaćanja kupca
-ExportDataset_invoice_1=Customer invoices and invoice details
-ExportDataset_invoice_2=Računi i plaćanja kupca
+CustomersInvoicesAndInvoiceLines=Izlazni računi i detalji računa
+CustomersInvoicesAndPayments=Izlazni računi i plaćanja
+ExportDataset_invoice_1=Izlazni računi i detalji računa
+ExportDataset_invoice_2=Izlazni računi i plaćanja
 ProformaBill=Predračun:
 Reduction=Smanjivanje
 ReductionShort=Popust
@@ -349,7 +349,7 @@ TotalOfTwoDiscountMustEqualsOriginal=The total of the two new discounts must be
 ConfirmRemoveDiscount=Are you sure you want to remove this discount?
 RelatedBill=Povezani račun
 RelatedBills=Povezani račun
-RelatedCustomerInvoices=Povezani računi kupaca
+RelatedCustomerInvoices=Povezani izlazni računi
 RelatedSupplierInvoices=Related vendor invoices
 LatestRelatedBill=Posljednju vezani računi
 WarningBillExist=Warning, one or more invoices already exist
@@ -552,7 +552,7 @@ PDFCrevetteSituationInvoiceLine=Situation N°%s: Inv. N°%s on %s
 TotalSituationInvoice=Ukupno etapa
 invoiceLineProgressError=Napredak stavke računa ne može biti veći od ili  jednak kao sljedećoj stavci
 updatePriceNextInvoiceErrorUpdateline=Error: update price on invoice line: %s
-ToCreateARecurringInvoice=Za kreiranje ponavljajućih računa za ovaj ugovor, prvo kreirajte skicu računa, onda konvertirajte istu u predložak računa i definirajte učestalost generiranja budućih računa.
+ToCreateARecurringInvoice=Za kreiranje ponavljajućih računa za ovaj ugovor, prvo izradite skicu računa, onda konvertirajte istu u predložak računa i definirajte učestalost generiranja budućih računa.
 ToCreateARecurringInvoiceGene=Za generiranje budućih računa normalno ili ručno, idite na izbornik <strong>%s - %s - %s</strong>.
 ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask your administrator to enable and setup module <strong>%s</strong>. Note that both methods (manual and automatic) can be used together with no risk of duplication.
 DeleteRepeatableInvoice=Izbriši predložak računa
diff --git a/htdocs/langs/hr_HR/boxes.lang b/htdocs/langs/hr_HR/boxes.lang
index 784440f4f7d..5f0bbec5abf 100644
--- a/htdocs/langs/hr_HR/boxes.lang
+++ b/htdocs/langs/hr_HR/boxes.lang
@@ -4,10 +4,10 @@ BoxLastRssInfos=RSS Information
 BoxLastProducts=Latest %s Products/Services
 BoxProductsAlertStock=Upozorenja stanja zaliha za proizvode
 BoxLastProductsInContract=Zadnjih %s ugovorenih proizvoda/usluga
-BoxLastSupplierBills=Latest Vendor invoices
-BoxLastCustomerBills=Latest Customer invoices
-BoxOldestUnpaidCustomerBills=Najstariji neplaćeni račun kupca
-BoxOldestUnpaidSupplierBills=Oldest unpaid vendor invoices
+BoxLastSupplierBills=Zadnji ulazni računi
+BoxLastCustomerBills=Zadnji izlazni računi
+BoxOldestUnpaidCustomerBills=Najstariji neplaćeni izlazni račun
+BoxOldestUnpaidSupplierBills=Najstariji neplaćeni ulazni računi
 BoxLastProposals=Zadnja ponuda
 BoxLastProspects=Zadnji izmjenjeni mogući kupci
 BoxLastCustomers=Zadnji promjenjei kupci
@@ -26,12 +26,12 @@ BoxTitleLastSuppliers=Zadnjih %s zabilježenih dobavljača
 BoxTitleLastModifiedSuppliers=Vendors: last %s modified
 BoxTitleLastModifiedCustomers=Customers: last %s modified
 BoxTitleLastCustomersOrProspects=Zadnjih %s kupaca ili potencijalnih kupaca
-BoxTitleLastCustomerBills=Latest %s Customer invoices
-BoxTitleLastSupplierBills=Latest %s Vendor invoices
+BoxTitleLastCustomerBills=Zadnjih %s izlaznih računa
+BoxTitleLastSupplierBills=Zadnjih %s ulaznih računa
 BoxTitleLastModifiedProspects=Prospects: last %s modified
 BoxTitleLastModifiedMembers=Zadnjih %s članova
 BoxTitleLastFicheInter=Zadnjih %s izmjenjenih intervencija
-BoxTitleOldestUnpaidCustomerBills=Customer Invoices: oldest %s unpaid
+BoxTitleOldestUnpaidCustomerBills=Izlazni računi: najstarijih %s neplaćenih
 BoxTitleOldestUnpaidSupplierBills=Vendor Invoices: oldest %s unpaid
 BoxTitleCurrentAccounts=Open Accounts: balances
 BoxTitleLastModifiedContacts=Contacts/Addresses: last %s modified
@@ -56,7 +56,7 @@ NoRecordedOrders=No recorded sales orders
 NoRecordedProposals=Nema pohranjenih prijedloga
 NoRecordedInvoices=No recorded customer invoices
 NoUnpaidCustomerBills=No unpaid customer invoices
-NoUnpaidSupplierBills=No unpaid vendor invoices
+NoUnpaidSupplierBills=Nema neplaćenih ulaznih računa
 NoModifiedSupplierBills=No recorded vendor invoices
 NoRecordedProducts=Nema pohranjenih proizvoda/usluga
 NoRecordedProspects=Nema pohranjenih potencijalnih kupaca
@@ -78,7 +78,7 @@ BoxTitleLatestModifiedSupplierOrders=Vendor Orders: last %s modified
 BoxTitleLastModifiedCustomerBills=Customer Invoices: last %s modified
 BoxTitleLastModifiedCustomerOrders=Sales Orders: last %s modified
 BoxTitleLastModifiedPropals=Zadnjih %s izmjenjenih ponuda
-ForCustomersInvoices=Računi kupaca
+ForCustomersInvoices=Izlazni računi
 ForCustomersOrders=Narudžbe kupaca
 ForProposals=Prijedlozi
 LastXMonthRolling=Zadnjih %s tekučih mjeseci
diff --git a/htdocs/langs/hr_HR/cashdesk.lang b/htdocs/langs/hr_HR/cashdesk.lang
index 3d9b2c69662..44305f43c55 100644
--- a/htdocs/langs/hr_HR/cashdesk.lang
+++ b/htdocs/langs/hr_HR/cashdesk.lang
@@ -62,6 +62,7 @@ TicketVatGrouped=Group VAT by rate in tickets
 AutoPrintTickets=Automatically print tickets
 EnableBarOrRestaurantFeatures=Enable features for Bar or Restaurant
 ConfirmDeletionOfThisPOSSale=Do your confirm the deletion of this current sale ?
+ConfirmDiscardOfThisPOSSale=Do you want to discard this current sale ?
 History=Povijest
 ValidateAndClose=Validate and close
 Terminal=Terminal
@@ -69,3 +70,8 @@ NumberOfTerminals=Number of Terminals
 TerminalSelect=Select terminal you want to use:
 POSTicket=POS Ticket
 BasicPhoneLayout=Use basic layout for phones
+SetupOfTerminalNotComplete=Setup of terminal %s is not complete
+DirectPayment=Direct payment
+DirectPaymentButton=Direct cash payment button
+InvoiceIsAlreadyValidated=Invoice is already validated
+NoLinesToBill=No lines to bill
diff --git a/htdocs/langs/hr_HR/commercial.lang b/htdocs/langs/hr_HR/commercial.lang
index 7bf167c2068..04894e5f22e 100644
--- a/htdocs/langs/hr_HR/commercial.lang
+++ b/htdocs/langs/hr_HR/commercial.lang
@@ -9,7 +9,7 @@ DeleteAction=Obriši događaj
 NewAction=Novi događaj
 AddAction=Izradi događaj
 AddAnAction=Izradi događaj
-AddActionRendezVous=Kreirajte sastanak
+AddActionRendezVous=Izradite sastanak
 ConfirmDeleteAction=Are you sure you want to delete this event?
 CardAction=Kartica događaja
 ActionOnCompany=Povezana tvrtka
diff --git a/htdocs/langs/hr_HR/companies.lang b/htdocs/langs/hr_HR/companies.lang
index f5e548f5e79..8bc8dcae31f 100644
--- a/htdocs/langs/hr_HR/companies.lang
+++ b/htdocs/langs/hr_HR/companies.lang
@@ -54,6 +54,7 @@ Firstname=Ime
 PostOrFunction=Radno mjesto
 UserTitle=Titula
 NatureOfThirdParty=Nature of Third party
+NatureOfContact=Nature of Contact
 Address=Adresa
 State=Država/provincija
 StateShort=Država
diff --git a/htdocs/langs/hr_HR/compta.lang b/htdocs/langs/hr_HR/compta.lang
index 1b5b6ba12c9..78f4f2a58b4 100644
--- a/htdocs/langs/hr_HR/compta.lang
+++ b/htdocs/langs/hr_HR/compta.lang
@@ -213,7 +213,7 @@ Pcg_subtype=Pcg podtip
 InvoiceLinesToDispatch=Stavke računa za otpremu
 ByProductsAndServices=By product and service
 RefExt=Vanjska ref.
-ToCreateAPredefinedInvoice=Za kreiranje predloška računa, kreirajte stadardni račun, onda, bez ovjeravanja, kliknite na gumb "%s"
+ToCreateAPredefinedInvoice=Za kreiranje predloška računa, izradite stadardni račun, onda, bez ovjeravanja, kliknite na gumb "%s"
 LinkedOrder=Poveži s narudžbom
 Mode1=Način 1
 Mode2=Način 2
diff --git a/htdocs/langs/hr_HR/contracts.lang b/htdocs/langs/hr_HR/contracts.lang
index 8871f8bd429..727dc8b584b 100644
--- a/htdocs/langs/hr_HR/contracts.lang
+++ b/htdocs/langs/hr_HR/contracts.lang
@@ -51,6 +51,7 @@ ListOfClosedServices=Lista završenih usluga
 ListOfRunningServices=Lista usluga koje se odvijaju
 NotActivatedServices=Neaktivne usluge(među ovjerenim ugovorima)
 BoardNotActivatedServices=Usluge za aktivaciju među ovjerenim ugovorima
+BoardNotActivatedServicesShort=Services to activate
 LastContracts=Zadnjih %s ugovora
 LastModifiedServices=Zadnjih %s promjenjenih usluga
 ContractStartDate=Datum početka
@@ -64,7 +65,10 @@ DateStartRealShort=Stvarni početni datum
 DateEndReal=Stvarni završni datum
 DateEndRealShort=Stvarni završni datum
 CloseService=Završi uslugu
-BoardRunningServices=Usluge koje su istekle
+BoardRunningServices=Services running
+BoardRunningServicesShort=Services running
+BoardExpiredServices=Services expired
+BoardExpiredServicesShort=Services expired
 ServiceStatus=Status usluge
 DraftContracts=Skica ugovora
 CloseRefusedBecauseOneServiceActive=Contract can't be closed as there is at least one open service on it
diff --git a/htdocs/langs/hr_HR/cron.lang b/htdocs/langs/hr_HR/cron.lang
index c2e49dacddf..d91b7a5fb77 100644
--- a/htdocs/langs/hr_HR/cron.lang
+++ b/htdocs/langs/hr_HR/cron.lang
@@ -52,7 +52,7 @@ CronEvery=Izvrši posao svaki
 CronObject=Instanca/Objekt za kreiranje
 CronArgs=Parametri
 CronSaveSucess=Uspješno spremljeno
-CronNote=Komentar
+CronNote=Napomena
 CronFieldMandatory=Polja %s su obavezna
 CronErrEndDateStartDt=Datum kraja ne može biti prije datuma početka
 StatusAtInstall=Status at module installation
diff --git a/htdocs/langs/hr_HR/deliveries.lang b/htdocs/langs/hr_HR/deliveries.lang
index 401a50ae29b..6965eebf319 100644
--- a/htdocs/langs/hr_HR/deliveries.lang
+++ b/htdocs/langs/hr_HR/deliveries.lang
@@ -2,7 +2,7 @@
 Delivery=Dostava
 DeliveryRef=Ref. dostave
 DeliveryCard=Receipt card
-DeliveryOrder=Narudžba za isporuku
+DeliveryOrder=Otpremnica
 DeliveryDate=Datum dostave
 CreateDeliveryOrder=Generate delivery receipt
 DeliveryStateSaved=Status dostave pohranjen
@@ -11,20 +11,21 @@ ValidateDeliveryReceipt=Ovjeriti otpremnicu
 ValidateDeliveryReceiptConfirm=Are you sure you want to validate this delivery receipt?
 DeleteDeliveryReceipt=Izbriši otpremnicu
 DeleteDeliveryReceiptConfirm=Are you sure you want to delete delivery receipt <b>%s</b>?
-DeliveryMethod=Metoda dostave
-TrackingNumber=Broj za praćenje
+DeliveryMethod=Način isporuke
+TrackingNumber=Broj pošiljke
 DeliveryNotValidated=Dostava nije potvrđena
 StatusDeliveryCanceled=Otkazano
 StatusDeliveryDraft=Skica
 StatusDeliveryValidated=Primljeno
 # merou PDF model
-NameAndSignature=Ime i potpis:
+NameAndSignature=Name and Signature:
 ToAndDate=Za___________________________________ dana ____/_____/__________
 GoodStatusDeclaration=Primljenje su stavke navedene iznad u dobrom stanju,
-Deliverer=Dostavljač:
+Deliverer=Deliverer:
 Sender=Pošiljatelj
 Recipient=Primatelj
 ErrorStockIsNotEnough=Nema dovoljno robe na skladištu
 Shippable=Dostava je moguća
 NonShippable=Dostava nije moguća
 ShowReceiving=Prikaži dostavnu primku
+NonExistentOrder=Nonexistent order
diff --git a/htdocs/langs/hr_HR/errors.lang b/htdocs/langs/hr_HR/errors.lang
index afe8c61f603..87f5ea302e8 100644
--- a/htdocs/langs/hr_HR/errors.lang
+++ b/htdocs/langs/hr_HR/errors.lang
@@ -218,6 +218,7 @@ ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text
 ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Error, delete payment linked to a closed invoice is not possible.
+ErrorSearchCriteriaTooSmall=Search criteria too small.
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 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 e47e5f49b5c..3d1614a22ed 100644
--- a/htdocs/langs/hr_HR/holiday.lang
+++ b/htdocs/langs/hr_HR/holiday.lang
@@ -120,7 +120,7 @@ HolidaysRefusedBody=Your leave request for %s to %s has been denied for the foll
 HolidaysCanceled=Otkazani zahtjev
 HolidaysCanceledBody=Vaš zahtjev za %s do %s je otkazan.
 FollowedByACounter=1: Ovaj tip odsustva mora biti pračen brojačem. Brojač se povečava ručno ili automatski, a kada je zahtjev ovjeren, brojač se smanjuje.<br> 0: Nije pračeno brojačem.
-NoLeaveWithCounterDefined=Nema definiranih tipova zahtjeva koji moraju biti pračenjem brojačem
+NoLeaveWithCounterDefined=There is no leave types defined that need to be followed by a counter
 GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leave</strong> to setup the different types of leaves.
 HolidaySetup=Setup of module Holiday
 HolidaysNumberingModules=Leave requests numbering models
diff --git a/htdocs/langs/hr_HR/main.lang b/htdocs/langs/hr_HR/main.lang
index fac8dcf0a66..e6f55814047 100644
--- a/htdocs/langs/hr_HR/main.lang
+++ b/htdocs/langs/hr_HR/main.lang
@@ -28,6 +28,7 @@ NoTemplateDefined=Nema predloška za taj tip e-pošte
 AvailableVariables=Dostupne zamjenske vrijednosti
 NoTranslation=Bez prijevoda
 Translation=Prijevod
+EmptySearchString=Enter a non empty search string
 NoRecordFound=Spis nije pronađen
 NoRecordDeleted=Spis nije izbrisan
 NotEnoughDataYet=Nedovoljno podataka
@@ -427,8 +428,8 @@ ExternalRef=Vanjska oznaka
 RefSupplier=Oznaka dobavljača
 RefPayment=Oznaka plaćanja
 CommercialProposalsShort=Ponude
-Comment=Komentar
-Comments=Komentari
+Comment=Napomena
+Comments=Napomene
 ActionsToDo=Radnje za obaviti
 ActionsToDoShort=Za učiniti
 ActionsDoneShort=Učinjeno
@@ -704,6 +705,7 @@ DateOfSignature=Datum potpisa
 HidePassword=Prikaži naredbu sa skrivenom zaporkom
 UnHidePassword=Prikaži stvarnu naredbu s čitljivom zaporkom
 Root=Početna mapa
+RootOfMedias=Root of public medias (/medias)
 Informations=Podatak
 Page=Strana
 Notes=Bilješke
@@ -939,7 +941,7 @@ SearchIntoProductsOrServices=Proizvodi ili usluge
 SearchIntoProjects=Projekti
 SearchIntoTasks=Zadaci
 SearchIntoCustomerInvoices=Računi za kupce
-SearchIntoSupplierInvoices=Računi dobavljača
+SearchIntoSupplierInvoices=Ulazni računi
 SearchIntoCustomerOrders=Sales orders
 SearchIntoSupplierOrders=Narudžbe dobavljačima
 SearchIntoCustomerProposals=Ponude kupca
@@ -950,11 +952,11 @@ SearchIntoCustomerShipments=Pošiljke kupcu
 SearchIntoExpenseReports=Troškovnici
 SearchIntoLeaves=Napusti
 SearchIntoTickets=Tickets
-CommentLink=Komentari
-NbComments=Broj komentara
-CommentPage=Prostor za komentare
-CommentAdded=Komentar dodan
-CommentDeleted=Komentar obrisan
+CommentLink=Napomene
+NbComments=Broj napomena
+CommentPage=Prostor za napomene
+CommentAdded=Napomena dodana
+CommentDeleted=Napomena obrisana
 Everybody=Svi
 PayedBy=Platio
 PayedTo=Plaćeno
@@ -981,3 +983,10 @@ PaymentInformation=Payment information
 ValidFrom=Valid from
 ValidUntil=Valid until
 NoRecordedUsers=No users
+ToClose=To close
+ToProcess=Za obradu
+ToApprove=To approve
+GlobalOpenedElemView=Global view
+NoArticlesFoundForTheKeyword=No article found for the keyword '<strong>%s</strong>'
+NoArticlesFoundForTheCategory=No article found for the category
+ToAcceptRefuse=To accept | refuse
diff --git a/htdocs/langs/hr_HR/members.lang b/htdocs/langs/hr_HR/members.lang
index ce9538cc391..eed105f7c1f 100644
--- a/htdocs/langs/hr_HR/members.lang
+++ b/htdocs/langs/hr_HR/members.lang
@@ -29,6 +29,7 @@ MenuMembersUpToDate=Važeći članovi
 MenuMembersNotUpToDate=Istekli članovi
 MenuMembersResiliated=Terminated members
 MembersWithSubscriptionToReceive=Članovi koji primaju pretplatu
+MembersWithSubscriptionToReceiveShort=Subscription to receive
 DateSubscription=Datum pretplate
 DateEndSubscription=Datum kraja pretplate
 EndSubscription=Kraj pretplate
diff --git a/htdocs/langs/hr_HR/opensurvey.lang b/htdocs/langs/hr_HR/opensurvey.lang
index 46358d63a49..c4c3a9eaba4 100644
--- a/htdocs/langs/hr_HR/opensurvey.lang
+++ b/htdocs/langs/hr_HR/opensurvey.lang
@@ -4,8 +4,8 @@ Surveys=Ankete
 OrganizeYourMeetingEasily=Jednostavno organizirajte sastanke i ankete. Prvo odaberite tip ankete...
 NewSurvey=Nova anketa
 OpenSurveyArea=Ankete
-AddACommentForPoll=Možete dodati komentar u anketu...
-AddComment=Dodaj komentar
+AddACommentForPoll=Možete dodati napomenu u anketu...
+AddComment=Dodaj napomenu
 CreatePoll=Izradi anketu
 PollTitle=Naziv ankete
 ToReceiveEMailForEachVote=Primi e-poštu za svaki glas
@@ -20,7 +20,7 @@ TheBestChoice=Najbolji izbor trenutno je
 TheBestChoices=Najbolji izbori trenutno su
 with=sa
 OpenSurveyHowTo=Ako se slažete sa glasanjem u ovoj anketi, morate ostaviti svoje ime, odabrati vrijednosti koje se najbolje slažu sa vama i ovjeriti s plus gumbom na kraju reda.
-CommentsOfVoters=Komentari glasača
+CommentsOfVoters=Opaske glasača
 ConfirmRemovalOfPoll=Jeste li sigurni da želite maknuti ovo glasanje (i sve glasove)
 RemovePoll=Makni anketu
 UrlForSurvey=URL za direktni pristup anketi
@@ -46,7 +46,7 @@ AddADate=Dodaj datum
 AddStartHour=Dodaj sat početka
 AddEndHour=Dodaj sat završetka
 votes=glas(ova)
-NoCommentYet=Nema komentara za anketu
+NoCommentYet=Još nema opaski za ovu anketu
 CanComment=Glasači mogu komentirati anketu
 CanSeeOthersVote=Glasači mogu vidjeti glasove drugih glasača
 SelectDayDesc=For each selected day, you can choose, or not, meeting hours in the following format:<br>- empty,<br>- "8h", "8H" or "8:00" to give a meeting's start hour,<br>- "8-11", "8h-11h", "8H-11H" or "8:00-11:00" to give a meeting's start and end hour,<br>- "8h15-11h15", "8H15-11H15" or "8:15-11:15" for the same thing but with minutes.
diff --git a/htdocs/langs/hr_HR/other.lang b/htdocs/langs/hr_HR/other.lang
index 81defa05c8d..d6b22f95501 100644
--- a/htdocs/langs/hr_HR/other.lang
+++ b/htdocs/langs/hr_HR/other.lang
@@ -180,7 +180,7 @@ StatsByNumberOfUnits=Statistics for sum of qty of products/services
 StatsByNumberOfEntities=Statistics in number of referring entities (no. of invoice, or order...)
 NumberOfProposals=Number of proposals
 NumberOfCustomerOrders=Number of sales orders
-NumberOfCustomerInvoices=Number of customer invoices
+NumberOfCustomerInvoices=Broj izlaznih računa
 NumberOfSupplierProposals=Number of vendor proposals
 NumberOfSupplierOrders=Number of purchase orders
 NumberOfSupplierInvoices=Number of vendor invoices
diff --git a/htdocs/langs/hr_HR/products.lang b/htdocs/langs/hr_HR/products.lang
index 48f1ecedb9f..590be21dcd6 100644
--- a/htdocs/langs/hr_HR/products.lang
+++ b/htdocs/langs/hr_HR/products.lang
@@ -283,7 +283,7 @@ ProductsOrServicesTranslations=Products/Services translations
 TranslatedLabel=Prevedena oznaka
 TranslatedDescription=Preveden opis
 TranslatedNote=Prevedene napomene
-ProductWeight=Težina 1 proizvoda
+ProductWeight=Masa 1 proizvoda
 ProductVolume=Volumen 1 proizvoda
 WeightUnits=Jedinica težine
 VolumeUnits=Jedinica volumena
diff --git a/htdocs/langs/hr_HR/projects.lang b/htdocs/langs/hr_HR/projects.lang
index 5a9ef2fdf4e..eeee1b669c7 100644
--- a/htdocs/langs/hr_HR/projects.lang
+++ b/htdocs/langs/hr_HR/projects.lang
@@ -76,7 +76,13 @@ MyProjects=Moji projekti
 MyProjectsArea=Sučelje mojih projekata
 DurationEffective=Efektivno trajanje
 ProgressDeclared=Objavljeni napredak
+TaskProgressSummary=Task progress
+CurentlyOpenedTasks=Curently opened tasks
+TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared progress is less %s than the calculated progression
+TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared progress is more %s than the calculated progression
 ProgressCalculated=Izračunati napredak
+WhichIamLinkedTo=which I'm linked to
+WhichIamLinkedToProject=which I'm linked to project
 Time=Vrijeme
 ListOfTasks=Popis zadataka
 GoToListOfTimeConsumed=Idi na popis utrošenog vremena
@@ -230,8 +236,8 @@ OtherFilteredTasks=Other filtered tasks
 NoAssignedTasks=No assigned tasks found (assign project/tasks to the current user from the top select box to enter time on it)
 ThirdPartyRequiredToGenerateInvoice=A third party must be defined on project to be able to invoice it.
 # Comments trans
-AllowCommentOnTask=Allow user comments on tasks
-AllowCommentOnProject=Allow user comments on projects
+AllowCommentOnTask=Dopusti napomene korisnika na zadatke
+AllowCommentOnProject=Dopusti napomene korisnika na projekte
 DontHavePermissionForCloseProject=You do not have permissions to close the project %s
 DontHaveTheValidateStatus=The project %s must be open to be closed
 RecordsClosed=%s project(s) closed
diff --git a/htdocs/langs/hr_HR/sendings.lang b/htdocs/langs/hr_HR/sendings.lang
index 433fc80c152..ba4ef2adb90 100644
--- a/htdocs/langs/hr_HR/sendings.lang
+++ b/htdocs/langs/hr_HR/sendings.lang
@@ -17,14 +17,14 @@ NumberOfShipmentsByMonth=Broj pošiljki tijekom mjeseca
 SendingCard=Kartica otpreme
 NewSending=Nova pošiljka
 CreateShipment=Izradi pošiljku
-QtyShipped=Količina poslana
-QtyShippedShort=Qty ship.
-QtyPreparedOrShipped=Qty prepared or shipped
+QtyShipped=Isporučena količina
+QtyShippedShort=Isporučena količina
+QtyPreparedOrShipped=Pripremljena ili isporučena količina
 QtyToShip=Količina za isporuku
 QtyReceived=Količina primljena
-QtyInOtherShipments=Qty in other shipments
+QtyInOtherShipments=Količina u drugim isporukama
 KeepToShip=Preostalo za isporuku
-KeepToShipShort=Remain
+KeepToShipShort=Preosta. količina
 OtherSendingsForSameOrder=Ostale isporuke za ovu narudžbu
 SendingsAndReceivingForSameOrder=Shipments and receipts for this order
 SendingsToValidate=Isporuke za ovjeru
@@ -65,7 +65,7 @@ ValidateOrderFirstBeforeShipment=Prvo morate ovjeriti narudžbu prije izrade otp
 DocumentModelTyphon=Kompletan model dokumenta za dostavnu primku (logo...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Konstanta EXPEDITION_ADDON_NUMBER nije definirana
 SumOfProductVolumes=Ukupni volumen proizvoda
-SumOfProductWeights=Ukupna težina proizvoda
+SumOfProductWeights=Ukupna masa proizvoda
 
 # warehouse details
 DetailWarehouseNumber= Skladišni detalji
diff --git a/htdocs/langs/hr_HR/website.lang b/htdocs/langs/hr_HR/website.lang
index ada37124c25..52c69d8deda 100644
--- a/htdocs/langs/hr_HR/website.lang
+++ b/htdocs/langs/hr_HR/website.lang
@@ -2,7 +2,7 @@
 Shortname=Kod
 WebsiteSetupDesc=Create here the websites you wish to use. Then go into menu Websites to edit them.
 DeleteWebsite=Obriši Web mjesto
-ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed.
+ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed. The files uploaded (like into the medias directory, the ECM module, ...) will remain.
 WEBSITE_TYPE_CONTAINER=Type of page/container
 WEBSITE_PAGE_EXAMPLE=Web page to use as example
 WEBSITE_PAGENAME=Naziv stranice/alias
@@ -14,6 +14,9 @@ WEBSITE_JS_INLINE=Javascript file content (common to all pages)
 WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages)
 WEBSITE_ROBOT=Robot file (robots.txt)
 WEBSITE_HTACCESS=Website .htaccess file
+WEBSITE_MANIFEST_JSON=Website manifest.json file
+WEBSITE_README=README.md file
+EnterHereLicenseInformation=Enter here meta data or license information to fille a README.md file. if you distribute your website as a template, the file will be included into the temptate package.
 HtmlHeaderPage=HTML header (specific to this page only)
 PageNameAliasHelp=Name or alias of the page.<br>This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "<strong>%s</strong>" to edit this alias.
 EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container.
@@ -41,6 +44,7 @@ RealURL=Pravi URL
 ViewWebsiteInProduction=Pogledaj web lokaciju koristeći URL naslovnice
 SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then set the name of the virtual host you have created in the properties of web site, so the preview can be done also using this dedicated web server access instead of the internal Dolibarr server.
 YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
 CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
 ReadPerm=Read
 WritePerm=Write
@@ -75,7 +79,8 @@ AddWebsiteAccount=Create web site account
 BackToListOfThirdParty=Back to list for Third Party
 DisableSiteFirst=Disable website first
 MyContainerTitle=My web site title
-AnotherContainer=Another container
+AnotherContainer=This is how to include content of another page/container (you may have an error here if you enable dynamic code because the embedded subcontainer may not exists)
+SorryWebsiteIsCurrentlyOffLine=Sorry, this website is currently off line. Please comme back later...
 WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / third party
 YouMustDefineTheHomePage=You must first define the default Home page
@@ -89,7 +94,8 @@ AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
 CorporateHomePage=Corporate Home page
 EmptyPage=Empty page
 ExternalURLMustStartWithHttp=External URL must start with http:// or https://
-ZipOfWebsitePackageToImport=Zip file of website package
+ZipOfWebsitePackageToImport=Upload the Zip file of the website template package
+ZipOfWebsitePackageToLoad=or Choose an available embedded website template package
 ShowSubcontainers=Include dynamic content
 InternalURLOfPage=Internal URL of page
 ThisPageIsTranslationOf=This page/container is a translation of
@@ -101,5 +107,10 @@ NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynam
 ReplaceWebsiteContent=Search or Replace website content
 DeleteAlsoJs=Delete also all javascript files specific to this website?
 DeleteAlsoMedias=Delete also all medias files specific to this website?
-# Export
 MyWebsitePages=My website pages
+SearchReplaceInto=Search | Replace into
+ReplaceString=New string
+CSSContentTooltipHelp=Enter here CSS content. To avoid any conflict with the CSS of the application, be sure to prepend all declaration with the .bodywebsite class. For example:<br><br>#mycssselector, input.myclass:hover { ... }<br>must be<br>.bodywebsite #mycssselector, .bodywebsite input.myclass:hover { ... }<br><br>Note: If you have a large file without this prefix, you can use 'lessc' to convert it to append the .bodywebsite prefix everywhere.
+LinkAndScriptsHereAreNotLoadedInEditor=Warning: This content is output only when site is accessed from a server. It is not used in Edit mode so if you need to load javascript files also in edit mode, just add your tag 'script src=...' into the page.
+Dynamiccontent=Sample of a page with dynamic content
+ImportSite=Import website template
diff --git a/htdocs/langs/hr_HR/workflow.lang b/htdocs/langs/hr_HR/workflow.lang
index 0102abea324..191dcc9867e 100644
--- a/htdocs/langs/hr_HR/workflow.lang
+++ b/htdocs/langs/hr_HR/workflow.lang
@@ -1,20 +1,20 @@
 # Dolibarr language file - Source file is en_US - workflow
 WorkflowSetup=Podešavanje modula radnog procesa
-WorkflowDesc=Ovaj modul je dizajniran da mijenja ponašanje automatskih akcija u aplikaciji. Prema predefiniranom, radni proces je otvoren (možete raditi stvari po redu kako želite). Možete uključiti automatske akcije za koje ste zainteresirani.
+WorkflowDesc=This module provides some automatic actions. By default, the workflow is open (you can do things in the order you want) but here you can activate some automatic actions.
 ThereIsNoWorkflowToModify=Nema dostupnih promjena radnog procesa za aktivirane module.
 # Autocreate
-descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a customer order after a commercial proposal is signed (new order will have same amount than proposal)
-descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Automatically create a customer invoice after a commercial proposal is signed (new invoice will have same amount than proposal)
-descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Automatski kreiraj račun kupca nakon što je ugovor ovjeren
-descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice after a customer order is closed (new invoice will have same amount than order)
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a sales order after a commercial proposal is signed (the new order will have same amount as the proposal)
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Automatically create a customer invoice after a commercial proposal is signed (the new invoice will have same amount as the proposal)
+descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Automatski izradi račun kupca nakon što je ugovor ovjeren
+descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice after a sales order is closed (the new invoice will have same amount as the order)
 # Autoclassify customer proposal or order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal(s) to billed when customer order is set to billed (and if amount of the order is same than total amount of signed linked proposals)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal(s) to billed when customer invoice is validated (and if amount of the invoice is same than total amount of signed linked proposals)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is validated (and if amount of the invoice is same than total amount of linked orders)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid (and if amount of the invoice is same than total amount of linked orders)
-descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source customer order to shipped when a shipment is validated (and if quantity shipped by all shipments is the same as in the order to update)
-# Autoclassify supplier order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked orders)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal as billed when sales order is set to billed (and if the amount of the order is the same as the total amount of the signed linked proposal)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal as billed when customer invoice is validated (and if the amount of the invoice is the same as the total amount of the signed linked proposal)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked order)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when customer invoice is set to paid (and if the amount of the invoice is the same as the total amount of the linked order)
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source sales order as shipped when a shipment is validated (and if the quantity shipped by all shipments is the same as in the order to update)
+# Autoclassify purchase order
+descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked proposal)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked order)
 AutomaticCreation=Automatic creation
 AutomaticClassification=Automatic classification
diff --git a/htdocs/langs/hu_HU/admin.lang b/htdocs/langs/hu_HU/admin.lang
index b7a4c9177cb..77c4475c0a4 100644
--- a/htdocs/langs/hu_HU/admin.lang
+++ b/htdocs/langs/hu_HU/admin.lang
@@ -400,6 +400,7 @@ OldVATRates=Régi ÁFA-kulcs
 NewVATRates=Új ÁFA-kulcs
 PriceBaseTypeToChange=Modify on prices with base reference value defined on
 MassConvert=Launch bulk conversion
+PriceFormatInCurrentLanguage=Price Format In Current Language
 String=Szöveg
 TextLong=Hosszú szöveg
 HtmlText=Html text
@@ -431,7 +432,7 @@ ExtrafieldParamHelpradio=List of values must be lines with format key,value (whe
 ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- idfilter is necessarly a primary int key<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=List of values 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>Examples:<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
-ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default)<br>Set this to 2 for a collapsing separator (collapsed by default)
+ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Library used for PDF generation
 LocalTaxDesc=Some countries may apply two or three taxes on each invoice line. If this is the case, choose the type for the 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)
 SMS=SMS
@@ -1695,7 +1696,7 @@ SuppliersInvoiceNumberingModel=Vendor invoices numbering models
 IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=GeoIP MaxMind modul beállítása
-PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat
+PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoLite2-Country.mmdb
 NoteOnPathLocation=Ne feledje, hogy az ip-országra adatfájl belül kell lennie egy könyvtárat a PHP tudja olvasni (Ellenőrizze a PHP open_basedir beállítás és fájlrendszer jogosultságok).
 YouCanDownloadFreeDatFileTo=Tudod letölt egy <b>ingyenes demo verzió</b> az MaxMind GeoIP ország fájlt %s.
 YouCanDownloadAdvancedDatFileTo=Le is tölthet egy <b>teljes verzió, a frissítésekkel,</b> a MaxMind GeoIP ország fájlt %s.
@@ -1926,14 +1927,13 @@ SmallerThan=Smaller than
 LargerThan=Larger than
 IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID is found into incoming email, the event will be automatically linked to the related objects.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
-IFTTTSetup=IFTTT module setup
-IFTTT_SERVICE_KEY=IFTTT Service key
-IFTTT_DOLIBARR_ENDPOINT_SECUREKEY=Security key to secure the endpoint URL used by IFTTT to send messages to your Dolibarr.
-IFTTTDesc=This module is designed to trigger events on IFTTT and/or to execute some action on external IFTTT triggers.
-UrlForIFTTT=URL endpoint for IFTTT
-YouWillFindItOnYourIFTTTAccount=You will find it on your IFTTT account
 EndPointFor=End point for %s : %s
 DeleteEmailCollector=Delete email collector
 ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
 RecipientEmailsWillBeReplacedWithThisValue=Recipient emails will be always replaced with this value
 AtLeastOneDefaultBankAccountMandatory=At least 1 default bank account must be defined
+RESTRICT_API_ON_IP=Allow available APIs to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can use the available APIs.
+RESTRICT_ON_IP=Allow access to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can access.
+BaseOnSabeDavVersion=Based on the library SabreDAV version
+NotAPublicIp=Not a public IP
+MakeAnonymousPing=Make an anonymous Ping '+1' to the Dolibarr foundation server (done 1 time only after installation) to allow the foundation to count the number of Dolibarr installation.
diff --git a/htdocs/langs/hu_HU/banks.lang b/htdocs/langs/hu_HU/banks.lang
index 1f802f6e0bd..1d98bfdf279 100644
--- a/htdocs/langs/hu_HU/banks.lang
+++ b/htdocs/langs/hu_HU/banks.lang
@@ -73,6 +73,7 @@ BankTransaction=Bank entry
 ListTransactions=List entries
 ListTransactionsByCategory=List entries/category
 TransactionsToConciliate=Entries to reconcile
+TransactionsToConciliateShort=To reconcile
 Conciliable=Lehet egyeztetni
 Conciliate=Összeegyeztetni
 Conciliation=Egyeztetés
@@ -116,6 +117,7 @@ DeleteCheckReceipt=Delete this check receipt?
 ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
 BankChecks=Banki csekkek
 BankChecksToReceipt=Letétre váró csekkek
+BankChecksToReceiptShort=Letétre váró csekkek
 ShowCheckReceipt=Mutasd a letéti csekk bizonylatát
 NumberOfCheques=No. of check
 DeleteTransaction=Delete entry
diff --git a/htdocs/langs/hu_HU/cashdesk.lang b/htdocs/langs/hu_HU/cashdesk.lang
index 582ceb6fd2c..50d893797ca 100644
--- a/htdocs/langs/hu_HU/cashdesk.lang
+++ b/htdocs/langs/hu_HU/cashdesk.lang
@@ -62,6 +62,7 @@ TicketVatGrouped=Group VAT by rate in tickets
 AutoPrintTickets=Automatically print tickets
 EnableBarOrRestaurantFeatures=Enable features for Bar or Restaurant
 ConfirmDeletionOfThisPOSSale=Do your confirm the deletion of this current sale ?
+ConfirmDiscardOfThisPOSSale=Do you want to discard this current sale ?
 History=Történet
 ValidateAndClose=Validate and close
 Terminal=Terminal
@@ -69,3 +70,8 @@ NumberOfTerminals=Number of Terminals
 TerminalSelect=Select terminal you want to use:
 POSTicket=POS Ticket
 BasicPhoneLayout=Use basic layout for phones
+SetupOfTerminalNotComplete=Setup of terminal %s is not complete
+DirectPayment=Direct payment
+DirectPaymentButton=Direct cash payment button
+InvoiceIsAlreadyValidated=Invoice is already validated
+NoLinesToBill=No lines to bill
diff --git a/htdocs/langs/hu_HU/companies.lang b/htdocs/langs/hu_HU/companies.lang
index 06b41da68c4..562a36f1cac 100644
--- a/htdocs/langs/hu_HU/companies.lang
+++ b/htdocs/langs/hu_HU/companies.lang
@@ -54,6 +54,7 @@ Firstname=Keresztnév
 PostOrFunction=Állás pozíció
 UserTitle=Cím
 NatureOfThirdParty=Nature of Third party
+NatureOfContact=Nature of Contact
 Address=Cím
 State=Állam / Tartomány
 StateShort=Állam/Megye
diff --git a/htdocs/langs/hu_HU/contracts.lang b/htdocs/langs/hu_HU/contracts.lang
index 182d3f6f6a4..5304ba5bff3 100644
--- a/htdocs/langs/hu_HU/contracts.lang
+++ b/htdocs/langs/hu_HU/contracts.lang
@@ -51,6 +51,7 @@ ListOfClosedServices=Lezárt szolgáltatások listája
 ListOfRunningServices=Futó szolgáltatások listája
 NotActivatedServices=Inaktív szolgáltatások (a hitelesített szerződések között)
 BoardNotActivatedServices=Hitelesített szerződésekhez tartozó aktiválandó szolgáltatások
+BoardNotActivatedServicesShort=Services to activate
 LastContracts=Utóbbi %s szerződés
 LastModifiedServices=Legutóbbi %s változás a szolgáltatásokban
 ContractStartDate=Kezdési dátum
@@ -64,7 +65,10 @@ DateStartRealShort=Tényleges kezdési dátum
 DateEndReal=Tényleges befejezési dátum
 DateEndRealShort=Tényleges befejezési dátum
 CloseService=Szolgáltatás lezárása
-BoardRunningServices=Lejárt futó szolgáltatások
+BoardRunningServices=Services running
+BoardRunningServicesShort=Services running
+BoardExpiredServices=Services expired
+BoardExpiredServicesShort=Services expired
 ServiceStatus=Szolgáltatások állapota
 DraftContracts=Szerződés tervezetek
 CloseRefusedBecauseOneServiceActive=Contract can't be closed as there is at least one open service on it
diff --git a/htdocs/langs/hu_HU/errors.lang b/htdocs/langs/hu_HU/errors.lang
index 53bc6470549..65b7ab6d5c1 100644
--- a/htdocs/langs/hu_HU/errors.lang
+++ b/htdocs/langs/hu_HU/errors.lang
@@ -218,6 +218,7 @@ ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text
 ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Error, delete payment linked to a closed invoice is not possible.
+ErrorSearchCriteriaTooSmall=Search criteria too small.
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 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/main.lang b/htdocs/langs/hu_HU/main.lang
index c94e91f20af..a743330d605 100644
--- a/htdocs/langs/hu_HU/main.lang
+++ b/htdocs/langs/hu_HU/main.lang
@@ -28,6 +28,7 @@ NoTemplateDefined=Ilyen e-mail típushoz nincs elérhető sablon
 AvailableVariables=Available substitution variables
 NoTranslation=Nincs fordítás
 Translation=Fordítás
+EmptySearchString=Enter a non empty search string
 NoRecordFound=Rekord nem található
 NoRecordDeleted=No record deleted
 NotEnoughDataYet=Nincs elég adat
@@ -704,6 +705,7 @@ DateOfSignature=Kelt
 HidePassword=Parancs mutatása rejtett jelszóval
 UnHidePassword=Igazi parancs mutatása üres jelszóval
 Root=Gyökér
+RootOfMedias=Root of public medias (/medias)
 Informations=Information
 Page=Oldal
 Notes=Megjegyzés
@@ -981,3 +983,10 @@ PaymentInformation=Payment information
 ValidFrom=Valid from
 ValidUntil=Valid until
 NoRecordedUsers=No users
+ToClose=To close
+ToProcess=Feldolgozni
+ToApprove=To approve
+GlobalOpenedElemView=Global view
+NoArticlesFoundForTheKeyword=No article found for the keyword '<strong>%s</strong>'
+NoArticlesFoundForTheCategory=No article found for the category
+ToAcceptRefuse=To accept | refuse
diff --git a/htdocs/langs/hu_HU/members.lang b/htdocs/langs/hu_HU/members.lang
index 26bf3cc1072..a548388a40e 100644
--- a/htdocs/langs/hu_HU/members.lang
+++ b/htdocs/langs/hu_HU/members.lang
@@ -29,6 +29,7 @@ MenuMembersUpToDate=Naprakész tagoknak
 MenuMembersNotUpToDate=Elavult tagok
 MenuMembersResiliated=Kilépett tagok
 MembersWithSubscriptionToReceive=Tagok előfizetés kapni
+MembersWithSubscriptionToReceiveShort=Subscription to receive
 DateSubscription=Előfizetés dátum
 DateEndSubscription=Előfizetés záró dátum
 EndSubscription=Vége előfizetés
diff --git a/htdocs/langs/hu_HU/projects.lang b/htdocs/langs/hu_HU/projects.lang
index 48790c31b7f..98f5ea96e2f 100644
--- a/htdocs/langs/hu_HU/projects.lang
+++ b/htdocs/langs/hu_HU/projects.lang
@@ -76,7 +76,13 @@ MyProjects=Projektjeim
 MyProjectsArea=My projects Area
 DurationEffective=Effektív időtartam
 ProgressDeclared=Declared progress
+TaskProgressSummary=Task progress
+CurentlyOpenedTasks=Curently opened tasks
+TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared progress is less %s than the calculated progression
+TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared progress is more %s than the calculated progression
 ProgressCalculated=Calculated progress
+WhichIamLinkedTo=which I'm linked to
+WhichIamLinkedToProject=which I'm linked to project
 Time=Idő
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
diff --git a/htdocs/langs/hu_HU/website.lang b/htdocs/langs/hu_HU/website.lang
index 6a6693d8b9a..bb29ee2c0d2 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 the websites you wish to use. Then go into menu Websites to edit them.
 DeleteWebsite=A honlap törlése
-ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed.
+ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed. The files uploaded (like into the medias directory, the ECM module, ...) will remain.
 WEBSITE_TYPE_CONTAINER=Type of page/container
 WEBSITE_PAGE_EXAMPLE=Web page to use as example
 WEBSITE_PAGENAME=Page name/alias
@@ -14,6 +14,9 @@ WEBSITE_JS_INLINE=Javascript file content (common to all pages)
 WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages)
 WEBSITE_ROBOT=Robot file (robots.txt)
 WEBSITE_HTACCESS=Website .htaccess file
+WEBSITE_MANIFEST_JSON=Website manifest.json file
+WEBSITE_README=README.md file
+EnterHereLicenseInformation=Enter here meta data or license information to fille a README.md file. if you distribute your website as a template, the file will be included into the temptate package.
 HtmlHeaderPage=HTML header (specific to this page only)
 PageNameAliasHelp=Name or alias of the page.<br>This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "<strong>%s</strong>" to edit this alias.
 EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container.
@@ -41,6 +44,7 @@ RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
 SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then set the name of the virtual host you have created in the properties of web site, so the preview can be done also using this dedicated web server access instead of the internal Dolibarr server.
 YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
 CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
 ReadPerm=Olvas
 WritePerm=Write
@@ -75,7 +79,8 @@ AddWebsiteAccount=Create web site account
 BackToListOfThirdParty=Back to list for Third Party
 DisableSiteFirst=Disable website first
 MyContainerTitle=My web site title
-AnotherContainer=Another container
+AnotherContainer=This is how to include content of another page/container (you may have an error here if you enable dynamic code because the embedded subcontainer may not exists)
+SorryWebsiteIsCurrentlyOffLine=Sorry, this website is currently off line. Please comme back later...
 WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / third party
 YouMustDefineTheHomePage=You must first define the default Home page
@@ -89,7 +94,8 @@ AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
 CorporateHomePage=Corporate Home page
 EmptyPage=Empty page
 ExternalURLMustStartWithHttp=External URL must start with http:// or https://
-ZipOfWebsitePackageToImport=Zip file of website package
+ZipOfWebsitePackageToImport=Upload the Zip file of the website template package
+ZipOfWebsitePackageToLoad=or Choose an available embedded website template package
 ShowSubcontainers=Include dynamic content
 InternalURLOfPage=Internal URL of page
 ThisPageIsTranslationOf=This page/container is a translation of
@@ -101,5 +107,10 @@ NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynam
 ReplaceWebsiteContent=Search or Replace website content
 DeleteAlsoJs=Delete also all javascript files specific to this website?
 DeleteAlsoMedias=Delete also all medias files specific to this website?
-# Export
 MyWebsitePages=My website pages
+SearchReplaceInto=Search | Replace into
+ReplaceString=New string
+CSSContentTooltipHelp=Enter here CSS content. To avoid any conflict with the CSS of the application, be sure to prepend all declaration with the .bodywebsite class. For example:<br><br>#mycssselector, input.myclass:hover { ... }<br>must be<br>.bodywebsite #mycssselector, .bodywebsite input.myclass:hover { ... }<br><br>Note: If you have a large file without this prefix, you can use 'lessc' to convert it to append the .bodywebsite prefix everywhere.
+LinkAndScriptsHereAreNotLoadedInEditor=Warning: This content is output only when site is accessed from a server. It is not used in Edit mode so if you need to load javascript files also in edit mode, just add your tag 'script src=...' into the page.
+Dynamiccontent=Sample of a page with dynamic content
+ImportSite=Import website template
diff --git a/htdocs/langs/id_ID/admin.lang b/htdocs/langs/id_ID/admin.lang
index 1ef3844c9e5..3bf526c48f5 100644
--- a/htdocs/langs/id_ID/admin.lang
+++ b/htdocs/langs/id_ID/admin.lang
@@ -400,6 +400,7 @@ OldVATRates=Suku VAT lama
 NewVATRates=Suku VAT baru
 PriceBaseTypeToChange=Modify on prices with base reference value defined on
 MassConvert=Launch bulk conversion
+PriceFormatInCurrentLanguage=Price Format In Current Language
 String=String
 TextLong=Long text
 HtmlText=Html text
@@ -431,7 +432,7 @@ ExtrafieldParamHelpradio=List of values must be lines with format key,value (whe
 ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- idfilter is necessarly a primary int key<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=List of values 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>Examples:<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
-ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default)<br>Set this to 2 for a collapsing separator (collapsed by default)
+ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Library used for PDF generation
 LocalTaxDesc=Some countries may apply two or three taxes on each invoice line. If this is the case, choose the type for the 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)
 SMS=SMS
@@ -1695,7 +1696,7 @@ SuppliersInvoiceNumberingModel=Vendor invoices numbering models
 IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=GeoIP Maxmind module setup
-PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat
+PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoLite2-Country.mmdb
 NoteOnPathLocation=Note that your ip to country data file must be inside a directory your PHP can read (Check your PHP open_basedir setup and filesystem permissions).
 YouCanDownloadFreeDatFileTo=You can download a <b>free demo version</b> of the Maxmind GeoIP country file at %s.
 YouCanDownloadAdvancedDatFileTo=You can also download a more <b>complete version, with updates,</b> of the Maxmind GeoIP country file at %s.
@@ -1926,14 +1927,13 @@ SmallerThan=Smaller than
 LargerThan=lebih besar dari
 IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID is found into incoming email, the event will be automatically linked to the related objects.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
-IFTTTSetup=IFTTT module setup
-IFTTT_SERVICE_KEY=IFTTT Service key
-IFTTT_DOLIBARR_ENDPOINT_SECUREKEY=Security key to secure the endpoint URL used by IFTTT to send messages to your Dolibarr.
-IFTTTDesc=This module is designed to trigger events on IFTTT and/or to execute some action on external IFTTT triggers.
-UrlForIFTTT=URL endpoint for IFTTT
-YouWillFindItOnYourIFTTTAccount=You will find it on your IFTTT account
 EndPointFor=End point for %s : %s
 DeleteEmailCollector=Delete email collector
 ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
 RecipientEmailsWillBeReplacedWithThisValue=Recipient emails will be always replaced with this value
 AtLeastOneDefaultBankAccountMandatory=At least 1 default bank account must be defined
+RESTRICT_API_ON_IP=Allow available APIs to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can use the available APIs.
+RESTRICT_ON_IP=Allow access to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can access.
+BaseOnSabeDavVersion=Based on the library SabreDAV version
+NotAPublicIp=Not a public IP
+MakeAnonymousPing=Make an anonymous Ping '+1' to the Dolibarr foundation server (done 1 time only after installation) to allow the foundation to count the number of Dolibarr installation.
diff --git a/htdocs/langs/id_ID/banks.lang b/htdocs/langs/id_ID/banks.lang
index 2f255f7d905..e522cc77635 100644
--- a/htdocs/langs/id_ID/banks.lang
+++ b/htdocs/langs/id_ID/banks.lang
@@ -73,6 +73,7 @@ BankTransaction=Bank entry
 ListTransactions=List entries
 ListTransactionsByCategory=List entries/category
 TransactionsToConciliate=Entries to reconcile
+TransactionsToConciliateShort=To reconcile
 Conciliable=Can be reconciled
 Conciliate=Reconcile
 Conciliation=Reconciliation
@@ -116,6 +117,7 @@ DeleteCheckReceipt=Delete this check receipt?
 ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
 BankChecks=Bank checks
 BankChecksToReceipt=Checks awaiting deposit
+BankChecksToReceiptShort=Checks awaiting deposit
 ShowCheckReceipt=Show check deposit receipt
 NumberOfCheques=No. of check
 DeleteTransaction=Delete entry
diff --git a/htdocs/langs/id_ID/cashdesk.lang b/htdocs/langs/id_ID/cashdesk.lang
index 0f02416b5de..c0729f62abc 100644
--- a/htdocs/langs/id_ID/cashdesk.lang
+++ b/htdocs/langs/id_ID/cashdesk.lang
@@ -62,6 +62,7 @@ TicketVatGrouped=Group VAT by rate in tickets
 AutoPrintTickets=Automatically print tickets
 EnableBarOrRestaurantFeatures=Enable features for Bar or Restaurant
 ConfirmDeletionOfThisPOSSale=Do your confirm the deletion of this current sale ?
+ConfirmDiscardOfThisPOSSale=Do you want to discard this current sale ?
 History=Riwayat
 ValidateAndClose=Validate and close
 Terminal=Terminal
@@ -69,3 +70,8 @@ NumberOfTerminals=Number of Terminals
 TerminalSelect=Select terminal you want to use:
 POSTicket=POS Ticket
 BasicPhoneLayout=Use basic layout for phones
+SetupOfTerminalNotComplete=Setup of terminal %s is not complete
+DirectPayment=Direct payment
+DirectPaymentButton=Direct cash payment button
+InvoiceIsAlreadyValidated=Invoice is already validated
+NoLinesToBill=No lines to bill
diff --git a/htdocs/langs/id_ID/companies.lang b/htdocs/langs/id_ID/companies.lang
index cb085d5e958..630310380ba 100644
--- a/htdocs/langs/id_ID/companies.lang
+++ b/htdocs/langs/id_ID/companies.lang
@@ -54,6 +54,7 @@ Firstname=First name
 PostOrFunction=Job position
 UserTitle=Title
 NatureOfThirdParty=Nature of Third party
+NatureOfContact=Nature of Contact
 Address=Alamat
 State=State/Province
 StateShort=State
diff --git a/htdocs/langs/id_ID/contracts.lang b/htdocs/langs/id_ID/contracts.lang
index 9d800c4b943..db5ec4e3e57 100644
--- a/htdocs/langs/id_ID/contracts.lang
+++ b/htdocs/langs/id_ID/contracts.lang
@@ -51,6 +51,7 @@ ListOfClosedServices=List of closed services
 ListOfRunningServices=List of running services
 NotActivatedServices=Inactive services (among validated contracts)
 BoardNotActivatedServices=Services to activate among validated contracts
+BoardNotActivatedServicesShort=Services to activate
 LastContracts=Latest %s contracts
 LastModifiedServices=Latest %s modified services
 ContractStartDate=Tanggal mulai
@@ -64,7 +65,10 @@ DateStartRealShort=Real start date
 DateEndReal=Real end date
 DateEndRealShort=Real end date
 CloseService=Close service
-BoardRunningServices=Expired running services
+BoardRunningServices=Services running
+BoardRunningServicesShort=Services running
+BoardExpiredServices=Services expired
+BoardExpiredServicesShort=Services expired
 ServiceStatus=Status of service
 DraftContracts=Drafts contracts
 CloseRefusedBecauseOneServiceActive=Contract can't be closed as there is at least one open service on it
diff --git a/htdocs/langs/id_ID/errors.lang b/htdocs/langs/id_ID/errors.lang
index 1ee46fdbb92..0c07b2eafc4 100644
--- a/htdocs/langs/id_ID/errors.lang
+++ b/htdocs/langs/id_ID/errors.lang
@@ -218,6 +218,7 @@ ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text
 ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Error, delete payment linked to a closed invoice is not possible.
+ErrorSearchCriteriaTooSmall=Search criteria too small.
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 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/main.lang b/htdocs/langs/id_ID/main.lang
index b294092f3c7..4f52a4543e3 100644
--- a/htdocs/langs/id_ID/main.lang
+++ b/htdocs/langs/id_ID/main.lang
@@ -28,6 +28,7 @@ NoTemplateDefined=No template available for this email type
 AvailableVariables=Available substitution variables
 NoTranslation=No translation
 Translation=Translation
+EmptySearchString=Enter a non empty search string
 NoRecordFound=No record found
 NoRecordDeleted=No record deleted
 NotEnoughDataYet=Not enough data
@@ -704,6 +705,7 @@ DateOfSignature=Date of signature
 HidePassword=Show command with password hidden
 UnHidePassword=Show real command with clear password
 Root=Root
+RootOfMedias=Root of public medias (/medias)
 Informations=Information
 Page=Page
 Notes=Notes
@@ -981,3 +983,10 @@ PaymentInformation=Payment information
 ValidFrom=Valid from
 ValidUntil=Valid until
 NoRecordedUsers=No users
+ToClose=To close
+ToProcess=To process
+ToApprove=To approve
+GlobalOpenedElemView=Global view
+NoArticlesFoundForTheKeyword=No article found for the keyword '<strong>%s</strong>'
+NoArticlesFoundForTheCategory=No article found for the category
+ToAcceptRefuse=To accept | refuse
diff --git a/htdocs/langs/id_ID/members.lang b/htdocs/langs/id_ID/members.lang
index 56fcf716b4b..fc6033656cd 100644
--- a/htdocs/langs/id_ID/members.lang
+++ b/htdocs/langs/id_ID/members.lang
@@ -29,6 +29,7 @@ MenuMembersUpToDate=Up to date members
 MenuMembersNotUpToDate=Out of date members
 MenuMembersResiliated=Terminated members
 MembersWithSubscriptionToReceive=Members with subscription to receive
+MembersWithSubscriptionToReceiveShort=Subscription to receive
 DateSubscription=Subscription date
 DateEndSubscription=Subscription end date
 EndSubscription=End subscription
diff --git a/htdocs/langs/id_ID/projects.lang b/htdocs/langs/id_ID/projects.lang
index f9c3cda6dfb..0b5720223f0 100644
--- a/htdocs/langs/id_ID/projects.lang
+++ b/htdocs/langs/id_ID/projects.lang
@@ -76,7 +76,13 @@ MyProjects=My projects
 MyProjectsArea=My projects Area
 DurationEffective=Effective duration
 ProgressDeclared=Declared progress
+TaskProgressSummary=Task progress
+CurentlyOpenedTasks=Curently opened tasks
+TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared progress is less %s than the calculated progression
+TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared progress is more %s than the calculated progression
 ProgressCalculated=Calculated progress
+WhichIamLinkedTo=which I'm linked to
+WhichIamLinkedToProject=which I'm linked to project
 Time=Time
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
diff --git a/htdocs/langs/id_ID/website.lang b/htdocs/langs/id_ID/website.lang
index 0ee00aff7c0..9648ae48cc8 100644
--- a/htdocs/langs/id_ID/website.lang
+++ b/htdocs/langs/id_ID/website.lang
@@ -2,7 +2,7 @@
 Shortname=Code
 WebsiteSetupDesc=Create here the websites you wish to use. Then go into menu Websites to edit them.
 DeleteWebsite=Delete website
-ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed.
+ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed. The files uploaded (like into the medias directory, the ECM module, ...) will remain.
 WEBSITE_TYPE_CONTAINER=Type of page/container
 WEBSITE_PAGE_EXAMPLE=Web page to use as example
 WEBSITE_PAGENAME=Page name/alias
@@ -14,6 +14,9 @@ WEBSITE_JS_INLINE=Javascript file content (common to all pages)
 WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages)
 WEBSITE_ROBOT=Robot file (robots.txt)
 WEBSITE_HTACCESS=Website .htaccess file
+WEBSITE_MANIFEST_JSON=Website manifest.json file
+WEBSITE_README=README.md file
+EnterHereLicenseInformation=Enter here meta data or license information to fille a README.md file. if you distribute your website as a template, the file will be included into the temptate package.
 HtmlHeaderPage=HTML header (specific to this page only)
 PageNameAliasHelp=Name or alias of the page.<br>This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "<strong>%s</strong>" to edit this alias.
 EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container.
@@ -41,6 +44,7 @@ RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
 SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then set the name of the virtual host you have created in the properties of web site, so the preview can be done also using this dedicated web server access instead of the internal Dolibarr server.
 YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
 CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
 ReadPerm=Read
 WritePerm=Write
@@ -75,7 +79,8 @@ AddWebsiteAccount=Create web site account
 BackToListOfThirdParty=Back to list for Third Party
 DisableSiteFirst=Disable website first
 MyContainerTitle=My web site title
-AnotherContainer=Another container
+AnotherContainer=This is how to include content of another page/container (you may have an error here if you enable dynamic code because the embedded subcontainer may not exists)
+SorryWebsiteIsCurrentlyOffLine=Sorry, this website is currently off line. Please comme back later...
 WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / third party
 YouMustDefineTheHomePage=You must first define the default Home page
@@ -89,7 +94,8 @@ AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
 CorporateHomePage=Corporate Home page
 EmptyPage=Empty page
 ExternalURLMustStartWithHttp=External URL must start with http:// or https://
-ZipOfWebsitePackageToImport=Zip file of website package
+ZipOfWebsitePackageToImport=Upload the Zip file of the website template package
+ZipOfWebsitePackageToLoad=or Choose an available embedded website template package
 ShowSubcontainers=Include dynamic content
 InternalURLOfPage=Internal URL of page
 ThisPageIsTranslationOf=This page/container is a translation of
@@ -101,5 +107,10 @@ NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynam
 ReplaceWebsiteContent=Search or Replace website content
 DeleteAlsoJs=Delete also all javascript files specific to this website?
 DeleteAlsoMedias=Delete also all medias files specific to this website?
-# Export
 MyWebsitePages=My website pages
+SearchReplaceInto=Search | Replace into
+ReplaceString=New string
+CSSContentTooltipHelp=Enter here CSS content. To avoid any conflict with the CSS of the application, be sure to prepend all declaration with the .bodywebsite class. For example:<br><br>#mycssselector, input.myclass:hover { ... }<br>must be<br>.bodywebsite #mycssselector, .bodywebsite input.myclass:hover { ... }<br><br>Note: If you have a large file without this prefix, you can use 'lessc' to convert it to append the .bodywebsite prefix everywhere.
+LinkAndScriptsHereAreNotLoadedInEditor=Warning: This content is output only when site is accessed from a server. It is not used in Edit mode so if you need to load javascript files also in edit mode, just add your tag 'script src=...' into the page.
+Dynamiccontent=Sample of a page with dynamic content
+ImportSite=Import website template
diff --git a/htdocs/langs/is_IS/admin.lang b/htdocs/langs/is_IS/admin.lang
index fcda617c4b1..9186d9f3e4e 100644
--- a/htdocs/langs/is_IS/admin.lang
+++ b/htdocs/langs/is_IS/admin.lang
@@ -400,6 +400,7 @@ OldVATRates=Old VAT rate
 NewVATRates=New VAT rate
 PriceBaseTypeToChange=Modify on prices with base reference value defined on
 MassConvert=Launch bulk conversion
+PriceFormatInCurrentLanguage=Price Format In Current Language
 String=String
 TextLong=Long text
 HtmlText=Html text
@@ -431,7 +432,7 @@ ExtrafieldParamHelpradio=List of values must be lines with format key,value (whe
 ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- idfilter is necessarly a primary int key<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=List of values 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>Examples:<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
-ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default)<br>Set this to 2 for a collapsing separator (collapsed by default)
+ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Library used for PDF generation
 LocalTaxDesc=Some countries may apply two or three taxes on each invoice line. If this is the case, choose the type for the 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)
 SMS=SMS
@@ -1695,7 +1696,7 @@ SuppliersInvoiceNumberingModel=Vendor invoices numbering models
 IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=GeoIP Maxmind mát skipulag
-PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat
+PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoLite2-Country.mmdb
 NoteOnPathLocation=Athugaðu að IP þinn til landsins gögn skrá verður inni í möppuna PHP geta lesið (Athugaðu PHP open_basedir skipulag og skráarkerfi leyfi).
 YouCanDownloadFreeDatFileTo=Þú getur sótt <b>ókeypis útgáfa</b> af Maxmind GeoIP landi skrá hjá %s .
 YouCanDownloadAdvancedDatFileTo=Þú getur einnig hlaðið niður fleiri <b>heill útgáfa með uppfærslum</b> á Maxmind GeoIP landi skrá hjá %s .
@@ -1926,14 +1927,13 @@ SmallerThan=Smaller than
 LargerThan=Larger than
 IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID is found into incoming email, the event will be automatically linked to the related objects.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
-IFTTTSetup=IFTTT module setup
-IFTTT_SERVICE_KEY=IFTTT Service key
-IFTTT_DOLIBARR_ENDPOINT_SECUREKEY=Security key to secure the endpoint URL used by IFTTT to send messages to your Dolibarr.
-IFTTTDesc=This module is designed to trigger events on IFTTT and/or to execute some action on external IFTTT triggers.
-UrlForIFTTT=URL endpoint for IFTTT
-YouWillFindItOnYourIFTTTAccount=You will find it on your IFTTT account
 EndPointFor=End point for %s : %s
 DeleteEmailCollector=Delete email collector
 ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
 RecipientEmailsWillBeReplacedWithThisValue=Recipient emails will be always replaced with this value
 AtLeastOneDefaultBankAccountMandatory=At least 1 default bank account must be defined
+RESTRICT_API_ON_IP=Allow available APIs to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can use the available APIs.
+RESTRICT_ON_IP=Allow access to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can access.
+BaseOnSabeDavVersion=Based on the library SabreDAV version
+NotAPublicIp=Not a public IP
+MakeAnonymousPing=Make an anonymous Ping '+1' to the Dolibarr foundation server (done 1 time only after installation) to allow the foundation to count the number of Dolibarr installation.
diff --git a/htdocs/langs/is_IS/banks.lang b/htdocs/langs/is_IS/banks.lang
index efa120a0412..97efd39bb93 100644
--- a/htdocs/langs/is_IS/banks.lang
+++ b/htdocs/langs/is_IS/banks.lang
@@ -73,6 +73,7 @@ BankTransaction=Bank entry
 ListTransactions=List entries
 ListTransactionsByCategory=List entries/category
 TransactionsToConciliate=Entries to reconcile
+TransactionsToConciliateShort=To reconcile
 Conciliable=Hægt að sættast
 Conciliate=Samræmdu
 Conciliation=Sættir
@@ -116,6 +117,7 @@ DeleteCheckReceipt=Delete this check receipt?
 ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
 BankChecks=Bank eftirlit
 BankChecksToReceipt=Checks awaiting deposit
+BankChecksToReceiptShort=Checks awaiting deposit
 ShowCheckReceipt=Sýna athuga innborgun berst
 NumberOfCheques=No. of check
 DeleteTransaction=Delete entry
diff --git a/htdocs/langs/is_IS/cashdesk.lang b/htdocs/langs/is_IS/cashdesk.lang
index e1add432dcf..7fdf576a180 100644
--- a/htdocs/langs/is_IS/cashdesk.lang
+++ b/htdocs/langs/is_IS/cashdesk.lang
@@ -62,6 +62,7 @@ TicketVatGrouped=Group VAT by rate in tickets
 AutoPrintTickets=Automatically print tickets
 EnableBarOrRestaurantFeatures=Enable features for Bar or Restaurant
 ConfirmDeletionOfThisPOSSale=Do your confirm the deletion of this current sale ?
+ConfirmDiscardOfThisPOSSale=Do you want to discard this current sale ?
 History=Saga
 ValidateAndClose=Validate and close
 Terminal=Terminal
@@ -69,3 +70,8 @@ NumberOfTerminals=Number of Terminals
 TerminalSelect=Select terminal you want to use:
 POSTicket=POS Ticket
 BasicPhoneLayout=Use basic layout for phones
+SetupOfTerminalNotComplete=Setup of terminal %s is not complete
+DirectPayment=Direct payment
+DirectPaymentButton=Direct cash payment button
+InvoiceIsAlreadyValidated=Invoice is already validated
+NoLinesToBill=No lines to bill
diff --git a/htdocs/langs/is_IS/companies.lang b/htdocs/langs/is_IS/companies.lang
index 29eb767e26f..9e85716b27b 100644
--- a/htdocs/langs/is_IS/companies.lang
+++ b/htdocs/langs/is_IS/companies.lang
@@ -54,6 +54,7 @@ Firstname=Firstname
 PostOrFunction=Job position
 UserTitle=Titill
 NatureOfThirdParty=Nature of Third party
+NatureOfContact=Nature of Contact
 Address=Heimilisfang
 State=Ríki / Hérað
 StateShort=State
diff --git a/htdocs/langs/is_IS/contracts.lang b/htdocs/langs/is_IS/contracts.lang
index b3fc7e85103..008a5ef67b0 100644
--- a/htdocs/langs/is_IS/contracts.lang
+++ b/htdocs/langs/is_IS/contracts.lang
@@ -51,6 +51,7 @@ ListOfClosedServices=Listi yfir loka þjónusta
 ListOfRunningServices=Listi af hlaupandi þjónusta
 NotActivatedServices=Óvirkur þjónustu (meðal gildi samninga)
 BoardNotActivatedServices=Þjónusta til virkja meðal gildi samninga
+BoardNotActivatedServicesShort=Services to activate
 LastContracts=Latest %s contracts
 LastModifiedServices=Latest %s modified services
 ContractStartDate=Upphafsdagur
@@ -64,7 +65,10 @@ DateStartRealShort=Real upphafsdagur
 DateEndReal=Real lokadagur
 DateEndRealShort=Real lokadagur
 CloseService=Loka þjónusta
-BoardRunningServices=Útrunnið hlaupandi þjónusta
+BoardRunningServices=Services running
+BoardRunningServicesShort=Services running
+BoardExpiredServices=Services expired
+BoardExpiredServicesShort=Services expired
 ServiceStatus=Staða þjónustu
 DraftContracts=Drög samninga
 CloseRefusedBecauseOneServiceActive=Contract can't be closed as there is at least one open service on it
diff --git a/htdocs/langs/is_IS/errors.lang b/htdocs/langs/is_IS/errors.lang
index eef5defc668..bafe6d3c438 100644
--- a/htdocs/langs/is_IS/errors.lang
+++ b/htdocs/langs/is_IS/errors.lang
@@ -218,6 +218,7 @@ ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text
 ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Error, delete payment linked to a closed invoice is not possible.
+ErrorSearchCriteriaTooSmall=Search criteria too small.
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 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/main.lang b/htdocs/langs/is_IS/main.lang
index 8e128f16e1f..23fea16f00f 100644
--- a/htdocs/langs/is_IS/main.lang
+++ b/htdocs/langs/is_IS/main.lang
@@ -28,6 +28,7 @@ NoTemplateDefined=No template available for this email type
 AvailableVariables=Available substitution variables
 NoTranslation=No translation
 Translation=Þýðing
+EmptySearchString=Enter a non empty search string
 NoRecordFound=No record found
 NoRecordDeleted=No record deleted
 NotEnoughDataYet=Not enough data
@@ -704,6 +705,7 @@ DateOfSignature=Date of signature
 HidePassword=Sýna stjórn með lykilorð falinn
 UnHidePassword=Sýna raunveruleg stjórn með skýrum lykilorð
 Root=Root
+RootOfMedias=Root of public medias (/medias)
 Informations=Information
 Page=Page
 Notes=Skýringar
@@ -981,3 +983,10 @@ PaymentInformation=Payment information
 ValidFrom=Valid from
 ValidUntil=Valid until
 NoRecordedUsers=No users
+ToClose=To close
+ToProcess=Til að ganga frá
+ToApprove=To approve
+GlobalOpenedElemView=Global view
+NoArticlesFoundForTheKeyword=No article found for the keyword '<strong>%s</strong>'
+NoArticlesFoundForTheCategory=No article found for the category
+ToAcceptRefuse=To accept | refuse
diff --git a/htdocs/langs/is_IS/members.lang b/htdocs/langs/is_IS/members.lang
index da75176581e..464075592a6 100644
--- a/htdocs/langs/is_IS/members.lang
+++ b/htdocs/langs/is_IS/members.lang
@@ -29,6 +29,7 @@ MenuMembersUpToDate=Upp til dagsetning meðlimi
 MenuMembersNotUpToDate=Út af meðlimum dagsetningu
 MenuMembersResiliated=Terminated members
 MembersWithSubscriptionToReceive=Meðlimir með áskrift að fá
+MembersWithSubscriptionToReceiveShort=Subscription to receive
 DateSubscription=Áskrift dagsetningu
 DateEndSubscription=Áskrift lokadagur
 EndSubscription=End áskrift
diff --git a/htdocs/langs/is_IS/projects.lang b/htdocs/langs/is_IS/projects.lang
index 34928a0a0c9..5146cecc3cb 100644
--- a/htdocs/langs/is_IS/projects.lang
+++ b/htdocs/langs/is_IS/projects.lang
@@ -76,7 +76,13 @@ MyProjects=Verkefnin mín
 MyProjectsArea=My projects Area
 DurationEffective=Árangursrík Lengd
 ProgressDeclared=Declared progress
+TaskProgressSummary=Task progress
+CurentlyOpenedTasks=Curently opened tasks
+TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared progress is less %s than the calculated progression
+TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared progress is more %s than the calculated progression
 ProgressCalculated=Calculated progress
+WhichIamLinkedTo=which I'm linked to
+WhichIamLinkedToProject=which I'm linked to project
 Time=Tími
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
diff --git a/htdocs/langs/is_IS/website.lang b/htdocs/langs/is_IS/website.lang
index c6b0f89f0b0..8118085294e 100644
--- a/htdocs/langs/is_IS/website.lang
+++ b/htdocs/langs/is_IS/website.lang
@@ -2,7 +2,7 @@
 Shortname=Code
 WebsiteSetupDesc=Create here the websites you wish to use. Then go into menu Websites to edit them.
 DeleteWebsite=Delete website
-ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed.
+ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed. The files uploaded (like into the medias directory, the ECM module, ...) will remain.
 WEBSITE_TYPE_CONTAINER=Type of page/container
 WEBSITE_PAGE_EXAMPLE=Web page to use as example
 WEBSITE_PAGENAME=Page name/alias
@@ -14,6 +14,9 @@ WEBSITE_JS_INLINE=Javascript file content (common to all pages)
 WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages)
 WEBSITE_ROBOT=Robot file (robots.txt)
 WEBSITE_HTACCESS=Website .htaccess file
+WEBSITE_MANIFEST_JSON=Website manifest.json file
+WEBSITE_README=README.md file
+EnterHereLicenseInformation=Enter here meta data or license information to fille a README.md file. if you distribute your website as a template, the file will be included into the temptate package.
 HtmlHeaderPage=HTML header (specific to this page only)
 PageNameAliasHelp=Name or alias of the page.<br>This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "<strong>%s</strong>" to edit this alias.
 EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container.
@@ -41,6 +44,7 @@ RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
 SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then set the name of the virtual host you have created in the properties of web site, so the preview can be done also using this dedicated web server access instead of the internal Dolibarr server.
 YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
 CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
 ReadPerm=Lesa
 WritePerm=Write
@@ -75,7 +79,8 @@ AddWebsiteAccount=Create web site account
 BackToListOfThirdParty=Back to list for Third Party
 DisableSiteFirst=Disable website first
 MyContainerTitle=My web site title
-AnotherContainer=Another container
+AnotherContainer=This is how to include content of another page/container (you may have an error here if you enable dynamic code because the embedded subcontainer may not exists)
+SorryWebsiteIsCurrentlyOffLine=Sorry, this website is currently off line. Please comme back later...
 WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / third party
 YouMustDefineTheHomePage=You must first define the default Home page
@@ -89,7 +94,8 @@ AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
 CorporateHomePage=Corporate Home page
 EmptyPage=Empty page
 ExternalURLMustStartWithHttp=External URL must start with http:// or https://
-ZipOfWebsitePackageToImport=Zip file of website package
+ZipOfWebsitePackageToImport=Upload the Zip file of the website template package
+ZipOfWebsitePackageToLoad=or Choose an available embedded website template package
 ShowSubcontainers=Include dynamic content
 InternalURLOfPage=Internal URL of page
 ThisPageIsTranslationOf=This page/container is a translation of
@@ -101,5 +107,10 @@ NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynam
 ReplaceWebsiteContent=Search or Replace website content
 DeleteAlsoJs=Delete also all javascript files specific to this website?
 DeleteAlsoMedias=Delete also all medias files specific to this website?
-# Export
 MyWebsitePages=My website pages
+SearchReplaceInto=Search | Replace into
+ReplaceString=New string
+CSSContentTooltipHelp=Enter here CSS content. To avoid any conflict with the CSS of the application, be sure to prepend all declaration with the .bodywebsite class. For example:<br><br>#mycssselector, input.myclass:hover { ... }<br>must be<br>.bodywebsite #mycssselector, .bodywebsite input.myclass:hover { ... }<br><br>Note: If you have a large file without this prefix, you can use 'lessc' to convert it to append the .bodywebsite prefix everywhere.
+LinkAndScriptsHereAreNotLoadedInEditor=Warning: This content is output only when site is accessed from a server. It is not used in Edit mode so if you need to load javascript files also in edit mode, just add your tag 'script src=...' into the page.
+Dynamiccontent=Sample of a page with dynamic content
+ImportSite=Import website template
diff --git a/htdocs/langs/it_IT/admin.lang b/htdocs/langs/it_IT/admin.lang
index 690abd0b4c7..13d79416542 100644
--- a/htdocs/langs/it_IT/admin.lang
+++ b/htdocs/langs/it_IT/admin.lang
@@ -400,6 +400,7 @@ OldVATRates=Vecchia aliquota IVA
 NewVATRates=Nuova aliquota IVA
 PriceBaseTypeToChange=Modifica i prezzi con la valuta di base definita.
 MassConvert=Launch bulk conversion
+PriceFormatInCurrentLanguage=Price Format In Current Language
 String=Stringa
 TextLong=Testo Lungo
 HtmlText=Testo html
@@ -431,7 +432,7 @@ ExtrafieldParamHelpradio=List of values must be lines with format key,value (whe
 ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- idfilter is necessarly a primary int key<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=List of values 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>Examples:<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
-ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default)<br>Set this to 2 for a collapsing separator (collapsed by default)
+ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Libreria utilizzata per generare PDF
 LocalTaxDesc=Some countries may apply two or three taxes on each invoice line. If this is the case, choose the type for the 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)
 SMS=SMS
@@ -1695,7 +1696,7 @@ SuppliersInvoiceNumberingModel=Vendor invoices numbering models
 IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=Impostazioni modulo GeoIP Maxmind
-PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat
+PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoLite2-Country.mmdb
 NoteOnPathLocation=Nota bene: il file deve trovarsi in una directory leggibile da PHP.
 YouCanDownloadFreeDatFileTo=È disponibile una <b>versione demo gratuita</b> del 'Maxmind GeoIP country file' su %s.
 YouCanDownloadAdvancedDatFileTo=Altrimenti è disponibile <b>una versione completa, con aggiornamenti</b> al seguente indirizzo: %s
@@ -1926,14 +1927,13 @@ SmallerThan=Smaller than
 LargerThan=Larger than
 IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID is found into incoming email, the event will be automatically linked to the related objects.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
-IFTTTSetup=IFTTT module setup
-IFTTT_SERVICE_KEY=IFTTT Service key
-IFTTT_DOLIBARR_ENDPOINT_SECUREKEY=Security key to secure the endpoint URL used by IFTTT to send messages to your Dolibarr.
-IFTTTDesc=This module is designed to trigger events on IFTTT and/or to execute some action on external IFTTT triggers.
-UrlForIFTTT=URL endpoint for IFTTT
-YouWillFindItOnYourIFTTTAccount=You will find it on your IFTTT account
 EndPointFor=End point for %s : %s
 DeleteEmailCollector=Delete email collector
 ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
 RecipientEmailsWillBeReplacedWithThisValue=Recipient emails will be always replaced with this value
 AtLeastOneDefaultBankAccountMandatory=At least 1 default bank account must be defined
+RESTRICT_API_ON_IP=Allow available APIs to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can use the available APIs.
+RESTRICT_ON_IP=Allow access to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can access.
+BaseOnSabeDavVersion=Based on the library SabreDAV version
+NotAPublicIp=Not a public IP
+MakeAnonymousPing=Make an anonymous Ping '+1' to the Dolibarr foundation server (done 1 time only after installation) to allow the foundation to count the number of Dolibarr installation.
diff --git a/htdocs/langs/it_IT/banks.lang b/htdocs/langs/it_IT/banks.lang
index 48a20673482..4ca5e56d5eb 100644
--- a/htdocs/langs/it_IT/banks.lang
+++ b/htdocs/langs/it_IT/banks.lang
@@ -73,6 +73,7 @@ BankTransaction=Transazione bancaria
 ListTransactions=Elenco transazioni
 ListTransactionsByCategory=Elenco transazioni per categoria
 TransactionsToConciliate=Transazioni da conciliare
+TransactionsToConciliateShort=To reconcile
 Conciliable=Conciliabile
 Conciliate=Concilia transazione
 Conciliation=Conciliazione
@@ -116,6 +117,7 @@ DeleteCheckReceipt=Eliminare questa ricevuta?
 ConfirmDeleteCheckReceipt=Vuoi davvero eliminare questa ricevuta?
 BankChecks=Assegni bancari
 BankChecksToReceipt=Assegni in attesa di deposito
+BankChecksToReceiptShort=Assegni in attesa di deposito
 ShowCheckReceipt=Mostra ricevuta di versamento assegni
 NumberOfCheques=Numero di assegni
 DeleteTransaction=Elimina transazione
diff --git a/htdocs/langs/it_IT/cashdesk.lang b/htdocs/langs/it_IT/cashdesk.lang
index 0a796faf9ab..ac969c01b3f 100644
--- a/htdocs/langs/it_IT/cashdesk.lang
+++ b/htdocs/langs/it_IT/cashdesk.lang
@@ -62,6 +62,7 @@ TicketVatGrouped=Group VAT by rate in tickets
 AutoPrintTickets=Automatically print tickets
 EnableBarOrRestaurantFeatures=Enable features for Bar or Restaurant
 ConfirmDeletionOfThisPOSSale=Do your confirm the deletion of this current sale ?
+ConfirmDiscardOfThisPOSSale=Do you want to discard this current sale ?
 History=Storico
 ValidateAndClose=Validate and close
 Terminal=Terminal
@@ -69,3 +70,8 @@ NumberOfTerminals=Number of Terminals
 TerminalSelect=Select terminal you want to use:
 POSTicket=POS Ticket
 BasicPhoneLayout=Use basic layout for phones
+SetupOfTerminalNotComplete=Setup of terminal %s is not complete
+DirectPayment=Direct payment
+DirectPaymentButton=Direct cash payment button
+InvoiceIsAlreadyValidated=Invoice is already validated
+NoLinesToBill=No lines to bill
diff --git a/htdocs/langs/it_IT/companies.lang b/htdocs/langs/it_IT/companies.lang
index e148e1d10ce..c1b46bdb45f 100644
--- a/htdocs/langs/it_IT/companies.lang
+++ b/htdocs/langs/it_IT/companies.lang
@@ -54,6 +54,7 @@ Firstname=Nome
 PostOrFunction=Posizione lavorativa
 UserTitle=Titolo
 NatureOfThirdParty=Natura
+NatureOfContact=Nature of Contact
 Address=Indirizzo
 State=Provincia/Cantone/Stato
 StateShort=Stato
diff --git a/htdocs/langs/it_IT/contracts.lang b/htdocs/langs/it_IT/contracts.lang
index 6cb5eca2c54..0463d6d3b86 100644
--- a/htdocs/langs/it_IT/contracts.lang
+++ b/htdocs/langs/it_IT/contracts.lang
@@ -51,6 +51,7 @@ ListOfClosedServices=Elenco dei servizi chiusi
 ListOfRunningServices=Elenco dei servizi in esecuzione
 NotActivatedServices=Servizi non attivati (con contratti convalidati)
 BoardNotActivatedServices=Servizi da attivare con contratti convalidati
+BoardNotActivatedServicesShort=Services to activate
 LastContracts=Ultimi %s contratti
 LastModifiedServices=Ultimi %s servizi modificati
 ContractStartDate=Data di inizio
@@ -64,7 +65,10 @@ DateStartRealShort=Inizio reale
 DateEndReal=Data di fine reale
 DateEndRealShort=Fine reale
 CloseService=Chiudere il servizio
-BoardRunningServices=Servizi scaduti attivi
+BoardRunningServices=Services running
+BoardRunningServicesShort=Services running
+BoardExpiredServices=Services expired
+BoardExpiredServicesShort=Services expired
 ServiceStatus=Stato di servizio
 DraftContracts=Bozze contratti
 CloseRefusedBecauseOneServiceActive=Il contratto non può essere chiuso in quanto vi è almeno un servizio attivo
diff --git a/htdocs/langs/it_IT/errors.lang b/htdocs/langs/it_IT/errors.lang
index 4625655d891..3107df0ac8e 100644
--- a/htdocs/langs/it_IT/errors.lang
+++ b/htdocs/langs/it_IT/errors.lang
@@ -218,6 +218,7 @@ ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text
 ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Error, delete payment linked to a closed invoice is not possible.
+ErrorSearchCriteriaTooSmall=Search criteria too small.
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 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/main.lang b/htdocs/langs/it_IT/main.lang
index de9aa73f69b..f7c96505172 100644
--- a/htdocs/langs/it_IT/main.lang
+++ b/htdocs/langs/it_IT/main.lang
@@ -28,6 +28,7 @@ NoTemplateDefined=Nessun tema disponibile per questo tipo di email
 AvailableVariables=Variabili di sostituzione disponibili
 NoTranslation=Nessuna traduzione
 Translation=Traduzioni
+EmptySearchString=Enter a non empty search string
 NoRecordFound=Nessun risultato trovato
 NoRecordDeleted=Nessun record eliminato
 NotEnoughDataYet=Dati insufficienti
@@ -704,6 +705,7 @@ DateOfSignature=Data della firma
 HidePassword=Mostra il comando con password offuscata
 UnHidePassword=Visualizza comando con password in chiaro
 Root=Root
+RootOfMedias=Root of public medias (/medias)
 Informations=Informazioni
 Page=Pagina
 Notes=Note
@@ -981,3 +983,10 @@ PaymentInformation=Payment information
 ValidFrom=Valid from
 ValidUntil=Valid until
 NoRecordedUsers=No users
+ToClose=To close
+ToProcess=Da lavorare
+ToApprove=To approve
+GlobalOpenedElemView=Global view
+NoArticlesFoundForTheKeyword=No article found for the keyword '<strong>%s</strong>'
+NoArticlesFoundForTheCategory=No article found for the category
+ToAcceptRefuse=To accept | refuse
diff --git a/htdocs/langs/it_IT/members.lang b/htdocs/langs/it_IT/members.lang
index 780c0003f30..09ec7fd6a3e 100644
--- a/htdocs/langs/it_IT/members.lang
+++ b/htdocs/langs/it_IT/members.lang
@@ -29,6 +29,7 @@ MenuMembersUpToDate=Membri aggiornati
 MenuMembersNotUpToDate=Membri non aggiornati
 MenuMembersResiliated=Terminated members
 MembersWithSubscriptionToReceive=Membri con adesione da riscuotere
+MembersWithSubscriptionToReceiveShort=Subscription to receive
 DateSubscription=Data di adesione
 DateEndSubscription=Data fine adesione
 EndSubscription=Scadenza adesione
diff --git a/htdocs/langs/it_IT/projects.lang b/htdocs/langs/it_IT/projects.lang
index 73615cae9f4..0dfe559108f 100644
--- a/htdocs/langs/it_IT/projects.lang
+++ b/htdocs/langs/it_IT/projects.lang
@@ -76,7 +76,13 @@ MyProjects=I miei progetti
 MyProjectsArea=Area progetti
 DurationEffective=Durata effettiva
 ProgressDeclared=Avanzamento dichiarato
+TaskProgressSummary=Task progress
+CurentlyOpenedTasks=Curently opened tasks
+TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared progress is less %s than the calculated progression
+TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared progress is more %s than the calculated progression
 ProgressCalculated=Avanzamento calcolato
+WhichIamLinkedTo=which I'm linked to
+WhichIamLinkedToProject=which I'm linked to project
 Time=Tempo
 ListOfTasks=Elenco dei compiti
 GoToListOfTimeConsumed=Vai all'elenco del tempo impiegato
diff --git a/htdocs/langs/it_IT/website.lang b/htdocs/langs/it_IT/website.lang
index 2cd44a0519c..8723af51098 100644
--- a/htdocs/langs/it_IT/website.lang
+++ b/htdocs/langs/it_IT/website.lang
@@ -2,7 +2,7 @@
 Shortname=Codice
 WebsiteSetupDesc=Create here the websites you wish to use. Then go into menu Websites to edit them.
 DeleteWebsite=Cancella sito web
-ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed.
+ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed. The files uploaded (like into the medias directory, the ECM module, ...) will remain.
 WEBSITE_TYPE_CONTAINER=Type of page/container
 WEBSITE_PAGE_EXAMPLE=Web page to use as example
 WEBSITE_PAGENAME=Titolo/alias della pagina
@@ -14,6 +14,9 @@ WEBSITE_JS_INLINE=Javascript file content (common to all pages)
 WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages)
 WEBSITE_ROBOT=File Robot (robots.txt)
 WEBSITE_HTACCESS=Website .htaccess file
+WEBSITE_MANIFEST_JSON=Website manifest.json file
+WEBSITE_README=README.md file
+EnterHereLicenseInformation=Enter here meta data or license information to fille a README.md file. if you distribute your website as a template, the file will be included into the temptate package.
 HtmlHeaderPage=HTML header (specific to this page only)
 PageNameAliasHelp=Name or alias of the page.<br>This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "<strong>%s</strong>" to edit this alias.
 EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container.
@@ -41,6 +44,7 @@ RealURL=Indirizzo URL vero
 ViewWebsiteInProduction=View web site using home URLs
 SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then set the name of the virtual host you have created in the properties of web site, so the preview can be done also using this dedicated web server access instead of the internal Dolibarr server.
 YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
 CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
 ReadPerm=Da leggere
 WritePerm=Write
@@ -75,7 +79,8 @@ AddWebsiteAccount=Create web site account
 BackToListOfThirdParty=Back to list for Third Party
 DisableSiteFirst=Disable website first
 MyContainerTitle=My web site title
-AnotherContainer=Another container
+AnotherContainer=This is how to include content of another page/container (you may have an error here if you enable dynamic code because the embedded subcontainer may not exists)
+SorryWebsiteIsCurrentlyOffLine=Sorry, this website is currently off line. Please comme back later...
 WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / third party
 YouMustDefineTheHomePage=You must first define the default Home page
@@ -89,7 +94,8 @@ AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
 CorporateHomePage=Corporate Home page
 EmptyPage=Empty page
 ExternalURLMustStartWithHttp=External URL must start with http:// or https://
-ZipOfWebsitePackageToImport=Zip file of website package
+ZipOfWebsitePackageToImport=Upload the Zip file of the website template package
+ZipOfWebsitePackageToLoad=or Choose an available embedded website template package
 ShowSubcontainers=Include dynamic content
 InternalURLOfPage=Internal URL of page
 ThisPageIsTranslationOf=This page/container is a translation of
@@ -101,5 +107,10 @@ NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynam
 ReplaceWebsiteContent=Search or Replace website content
 DeleteAlsoJs=Delete also all javascript files specific to this website?
 DeleteAlsoMedias=Delete also all medias files specific to this website?
-# Export
 MyWebsitePages=My website pages
+SearchReplaceInto=Search | Replace into
+ReplaceString=New string
+CSSContentTooltipHelp=Enter here CSS content. To avoid any conflict with the CSS of the application, be sure to prepend all declaration with the .bodywebsite class. For example:<br><br>#mycssselector, input.myclass:hover { ... }<br>must be<br>.bodywebsite #mycssselector, .bodywebsite input.myclass:hover { ... }<br><br>Note: If you have a large file without this prefix, you can use 'lessc' to convert it to append the .bodywebsite prefix everywhere.
+LinkAndScriptsHereAreNotLoadedInEditor=Warning: This content is output only when site is accessed from a server. It is not used in Edit mode so if you need to load javascript files also in edit mode, just add your tag 'script src=...' into the page.
+Dynamiccontent=Sample of a page with dynamic content
+ImportSite=Import website template
diff --git a/htdocs/langs/ja_JP/admin.lang b/htdocs/langs/ja_JP/admin.lang
index 995a7de34f0..62aa0ef32fe 100644
--- a/htdocs/langs/ja_JP/admin.lang
+++ b/htdocs/langs/ja_JP/admin.lang
@@ -400,6 +400,7 @@ OldVATRates=Old VAT rate
 NewVATRates=New VAT rate
 PriceBaseTypeToChange=Modify on prices with base reference value defined on
 MassConvert=Launch bulk conversion
+PriceFormatInCurrentLanguage=Price Format In Current Language
 String=文字列
 TextLong=Long text
 HtmlText=Html text
@@ -431,7 +432,7 @@ ExtrafieldParamHelpradio=List of values must be lines with format key,value (whe
 ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- idfilter is necessarly a primary int key<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=List of values 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>Examples:<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
-ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default)<br>Set this to 2 for a collapsing separator (collapsed by default)
+ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Library used for PDF generation
 LocalTaxDesc=Some countries may apply two or three taxes on each invoice line. If this is the case, choose the type for the 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)
 SMS=SMS
@@ -1695,7 +1696,7 @@ SuppliersInvoiceNumberingModel=Vendor invoices numbering models
 IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=のGeoIP Maxmindモジュールのセットアップ
-PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat
+PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoLite2-Country.mmdb
 NoteOnPathLocation=国のデータファイルへのあなたのIPは、PHPが読み取ることができるディレクトリ内になければならないことに注意してください（お使いのPHPのopen_basedirの設定とファイルシステムのアクセス権を確認します）。
 YouCanDownloadFreeDatFileTo=あなたは%sでMaxmindののGeoIP国ファイルの<b>無料デモ版を</b>ダウンロード<b>する</b>こと<b>が</b>できます。
 YouCanDownloadAdvancedDatFileTo=また、%sでMaxmindののGeoIP国のファイルの<b>更新と</b> 、より<b>完全なバージョンを、</b>ダウンロードすることができます。
@@ -1926,14 +1927,13 @@ SmallerThan=Smaller than
 LargerThan=Larger than
 IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID is found into incoming email, the event will be automatically linked to the related objects.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
-IFTTTSetup=IFTTT module setup
-IFTTT_SERVICE_KEY=IFTTT Service key
-IFTTT_DOLIBARR_ENDPOINT_SECUREKEY=Security key to secure the endpoint URL used by IFTTT to send messages to your Dolibarr.
-IFTTTDesc=This module is designed to trigger events on IFTTT and/or to execute some action on external IFTTT triggers.
-UrlForIFTTT=URL endpoint for IFTTT
-YouWillFindItOnYourIFTTTAccount=You will find it on your IFTTT account
 EndPointFor=End point for %s : %s
 DeleteEmailCollector=Delete email collector
 ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
 RecipientEmailsWillBeReplacedWithThisValue=Recipient emails will be always replaced with this value
 AtLeastOneDefaultBankAccountMandatory=At least 1 default bank account must be defined
+RESTRICT_API_ON_IP=Allow available APIs to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can use the available APIs.
+RESTRICT_ON_IP=Allow access to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can access.
+BaseOnSabeDavVersion=Based on the library SabreDAV version
+NotAPublicIp=Not a public IP
+MakeAnonymousPing=Make an anonymous Ping '+1' to the Dolibarr foundation server (done 1 time only after installation) to allow the foundation to count the number of Dolibarr installation.
diff --git a/htdocs/langs/ja_JP/banks.lang b/htdocs/langs/ja_JP/banks.lang
index 5dcef149672..87aa5a8e677 100644
--- a/htdocs/langs/ja_JP/banks.lang
+++ b/htdocs/langs/ja_JP/banks.lang
@@ -73,6 +73,7 @@ BankTransaction=Bank entry
 ListTransactions=List entries
 ListTransactionsByCategory=List entries/category
 TransactionsToConciliate=Entries to reconcile
+TransactionsToConciliateShort=To reconcile
 Conciliable=共存し得る
 Conciliate=調整する
 Conciliation=和解
@@ -116,6 +117,7 @@ DeleteCheckReceipt=Delete this check receipt?
 ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
 BankChecks=銀行小切手
 BankChecksToReceipt=Checks awaiting deposit
+BankChecksToReceiptShort=Checks awaiting deposit
 ShowCheckReceipt=預金証書を確認表示する
 NumberOfCheques=No. of check
 DeleteTransaction=Delete entry
diff --git a/htdocs/langs/ja_JP/cashdesk.lang b/htdocs/langs/ja_JP/cashdesk.lang
index 9b64d349fd6..5216330c49d 100644
--- a/htdocs/langs/ja_JP/cashdesk.lang
+++ b/htdocs/langs/ja_JP/cashdesk.lang
@@ -62,6 +62,7 @@ TicketVatGrouped=Group VAT by rate in tickets
 AutoPrintTickets=Automatically print tickets
 EnableBarOrRestaurantFeatures=Enable features for Bar or Restaurant
 ConfirmDeletionOfThisPOSSale=Do your confirm the deletion of this current sale ?
+ConfirmDiscardOfThisPOSSale=Do you want to discard this current sale ?
 History=歴史
 ValidateAndClose=Validate and close
 Terminal=Terminal
@@ -69,3 +70,8 @@ NumberOfTerminals=Number of Terminals
 TerminalSelect=Select terminal you want to use:
 POSTicket=POS Ticket
 BasicPhoneLayout=Use basic layout for phones
+SetupOfTerminalNotComplete=Setup of terminal %s is not complete
+DirectPayment=Direct payment
+DirectPaymentButton=Direct cash payment button
+InvoiceIsAlreadyValidated=Invoice is already validated
+NoLinesToBill=No lines to bill
diff --git a/htdocs/langs/ja_JP/companies.lang b/htdocs/langs/ja_JP/companies.lang
index 46d03183003..956a13b21ee 100644
--- a/htdocs/langs/ja_JP/companies.lang
+++ b/htdocs/langs/ja_JP/companies.lang
@@ -54,6 +54,7 @@ Firstname=ファーストネーム
 PostOrFunction=職位
 UserTitle=タイトル
 NatureOfThirdParty=Nature of Third party
+NatureOfContact=Nature of Contact
 Address=アドレス
 State=州/地方
 StateShort=State
diff --git a/htdocs/langs/ja_JP/contracts.lang b/htdocs/langs/ja_JP/contracts.lang
index b05a33faf1a..13cfee44922 100644
--- a/htdocs/langs/ja_JP/contracts.lang
+++ b/htdocs/langs/ja_JP/contracts.lang
@@ -51,6 +51,7 @@ ListOfClosedServices=クローズドサービスのリスト
 ListOfRunningServices=実行中のサービスのリスト
 NotActivatedServices=非アクティブなサービス（検証済みの契約の中で）
 BoardNotActivatedServices=検証済みの契約の中でアクティブにするサービス
+BoardNotActivatedServicesShort=Services to activate
 LastContracts=Latest %s contracts
 LastModifiedServices=Latest %s modified services
 ContractStartDate=開始日
@@ -64,7 +65,10 @@ DateStartRealShort=実際の開始日
 DateEndReal=実際の終了日
 DateEndRealShort=実際の終了日
 CloseService=サービスを閉じます
-BoardRunningServices=期限切れの実行中のサービス
+BoardRunningServices=Services running
+BoardRunningServicesShort=Services running
+BoardExpiredServices=Services expired
+BoardExpiredServicesShort=Services expired
 ServiceStatus=サービスのステータス
 DraftContracts=ドラフト契約
 CloseRefusedBecauseOneServiceActive=Contract can't be closed as there is at least one open service on it
diff --git a/htdocs/langs/ja_JP/errors.lang b/htdocs/langs/ja_JP/errors.lang
index 35e5c4e343e..885157f8deb 100644
--- a/htdocs/langs/ja_JP/errors.lang
+++ b/htdocs/langs/ja_JP/errors.lang
@@ -218,6 +218,7 @@ ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text
 ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Error, delete payment linked to a closed invoice is not possible.
+ErrorSearchCriteriaTooSmall=Search criteria too small.
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 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/main.lang b/htdocs/langs/ja_JP/main.lang
index a37b98039bd..6bf48f3dac4 100644
--- a/htdocs/langs/ja_JP/main.lang
+++ b/htdocs/langs/ja_JP/main.lang
@@ -28,6 +28,7 @@ NoTemplateDefined=No template available for this email type
 AvailableVariables=Available substitution variables
 NoTranslation=No translation
 Translation=翻訳
+EmptySearchString=Enter a non empty search string
 NoRecordFound=No record found
 NoRecordDeleted=No record deleted
 NotEnoughDataYet=Not enough data
@@ -704,6 +705,7 @@ DateOfSignature=Date of signature
 HidePassword=隠されたパスワードを使用してコマンドを表示する
 UnHidePassword=明確なパスワードを使用して実際のコマンドを表示する
 Root=ルート
+RootOfMedias=Root of public medias (/medias)
 Informations=Information
 Page=ページ
 Notes=注釈
@@ -981,3 +983,10 @@ PaymentInformation=Payment information
 ValidFrom=Valid from
 ValidUntil=Valid until
 NoRecordedUsers=No users
+ToClose=To close
+ToProcess=処理するには
+ToApprove=To approve
+GlobalOpenedElemView=Global view
+NoArticlesFoundForTheKeyword=No article found for the keyword '<strong>%s</strong>'
+NoArticlesFoundForTheCategory=No article found for the category
+ToAcceptRefuse=To accept | refuse
diff --git a/htdocs/langs/ja_JP/members.lang b/htdocs/langs/ja_JP/members.lang
index ed9b3c6c98f..ab811b3e348 100644
--- a/htdocs/langs/ja_JP/members.lang
+++ b/htdocs/langs/ja_JP/members.lang
@@ -29,6 +29,7 @@ MenuMembersUpToDate=最新のメンバーに
 MenuMembersNotUpToDate=日付メンバーのうち、
 MenuMembersResiliated=Terminated members
 MembersWithSubscriptionToReceive=受け取るために、サブスクリプションを持つメンバー
+MembersWithSubscriptionToReceiveShort=Subscription to receive
 DateSubscription=サブスクリプションの日付
 DateEndSubscription=サブスクリプションの終了日
 EndSubscription=エンドサブスクリプション
diff --git a/htdocs/langs/ja_JP/projects.lang b/htdocs/langs/ja_JP/projects.lang
index 81b1208fab4..df9d6c58fde 100644
--- a/htdocs/langs/ja_JP/projects.lang
+++ b/htdocs/langs/ja_JP/projects.lang
@@ -76,7 +76,13 @@ MyProjects=私のプロジェクト
 MyProjectsArea=My projects Area
 DurationEffective=実効デュレーション
 ProgressDeclared=Declared progress
+TaskProgressSummary=Task progress
+CurentlyOpenedTasks=Curently opened tasks
+TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared progress is less %s than the calculated progression
+TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared progress is more %s than the calculated progression
 ProgressCalculated=Calculated progress
+WhichIamLinkedTo=which I'm linked to
+WhichIamLinkedToProject=which I'm linked to project
 Time=時間
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
diff --git a/htdocs/langs/ja_JP/website.lang b/htdocs/langs/ja_JP/website.lang
index 5cd14c6da32..1931d1ed34c 100644
--- a/htdocs/langs/ja_JP/website.lang
+++ b/htdocs/langs/ja_JP/website.lang
@@ -2,7 +2,7 @@
 Shortname=コー​​ド
 WebsiteSetupDesc=Create here the websites you wish to use. Then go into menu Websites to edit them.
 DeleteWebsite=ウェブサイトを削除
-ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed.
+ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed. The files uploaded (like into the medias directory, the ECM module, ...) will remain.
 WEBSITE_TYPE_CONTAINER=Type of page/container
 WEBSITE_PAGE_EXAMPLE=Web page to use as example
 WEBSITE_PAGENAME=Page name/alias
@@ -14,6 +14,9 @@ WEBSITE_JS_INLINE=Javascript file content (common to all pages)
 WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages)
 WEBSITE_ROBOT=Robot file (robots.txt)
 WEBSITE_HTACCESS=Website .htaccess file
+WEBSITE_MANIFEST_JSON=Website manifest.json file
+WEBSITE_README=README.md file
+EnterHereLicenseInformation=Enter here meta data or license information to fille a README.md file. if you distribute your website as a template, the file will be included into the temptate package.
 HtmlHeaderPage=HTML header (specific to this page only)
 PageNameAliasHelp=Name or alias of the page.<br>This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "<strong>%s</strong>" to edit this alias.
 EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container.
@@ -41,6 +44,7 @@ RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
 SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then set the name of the virtual host you have created in the properties of web site, so the preview can be done also using this dedicated web server access instead of the internal Dolibarr server.
 YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
 CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
 ReadPerm=読む
 WritePerm=Write
@@ -75,7 +79,8 @@ AddWebsiteAccount=Create web site account
 BackToListOfThirdParty=Back to list for Third Party
 DisableSiteFirst=Disable website first
 MyContainerTitle=My web site title
-AnotherContainer=Another container
+AnotherContainer=This is how to include content of another page/container (you may have an error here if you enable dynamic code because the embedded subcontainer may not exists)
+SorryWebsiteIsCurrentlyOffLine=Sorry, this website is currently off line. Please comme back later...
 WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / third party
 YouMustDefineTheHomePage=You must first define the default Home page
@@ -89,7 +94,8 @@ AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
 CorporateHomePage=Corporate Home page
 EmptyPage=Empty page
 ExternalURLMustStartWithHttp=External URL must start with http:// or https://
-ZipOfWebsitePackageToImport=Zip file of website package
+ZipOfWebsitePackageToImport=Upload the Zip file of the website template package
+ZipOfWebsitePackageToLoad=or Choose an available embedded website template package
 ShowSubcontainers=Include dynamic content
 InternalURLOfPage=Internal URL of page
 ThisPageIsTranslationOf=This page/container is a translation of
@@ -101,5 +107,10 @@ NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynam
 ReplaceWebsiteContent=Search or Replace website content
 DeleteAlsoJs=Delete also all javascript files specific to this website?
 DeleteAlsoMedias=Delete also all medias files specific to this website?
-# Export
 MyWebsitePages=My website pages
+SearchReplaceInto=Search | Replace into
+ReplaceString=New string
+CSSContentTooltipHelp=Enter here CSS content. To avoid any conflict with the CSS of the application, be sure to prepend all declaration with the .bodywebsite class. For example:<br><br>#mycssselector, input.myclass:hover { ... }<br>must be<br>.bodywebsite #mycssselector, .bodywebsite input.myclass:hover { ... }<br><br>Note: If you have a large file without this prefix, you can use 'lessc' to convert it to append the .bodywebsite prefix everywhere.
+LinkAndScriptsHereAreNotLoadedInEditor=Warning: This content is output only when site is accessed from a server. It is not used in Edit mode so if you need to load javascript files also in edit mode, just add your tag 'script src=...' into the page.
+Dynamiccontent=Sample of a page with dynamic content
+ImportSite=Import website template
diff --git a/htdocs/langs/ka_GE/admin.lang b/htdocs/langs/ka_GE/admin.lang
index 2e27c6fe81f..1a1891009cf 100644
--- a/htdocs/langs/ka_GE/admin.lang
+++ b/htdocs/langs/ka_GE/admin.lang
@@ -400,6 +400,7 @@ OldVATRates=Old VAT rate
 NewVATRates=New VAT rate
 PriceBaseTypeToChange=Modify on prices with base reference value defined on
 MassConvert=Launch bulk conversion
+PriceFormatInCurrentLanguage=Price Format In Current Language
 String=String
 TextLong=Long text
 HtmlText=Html text
@@ -431,7 +432,7 @@ ExtrafieldParamHelpradio=List of values must be lines with format key,value (whe
 ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- idfilter is necessarly a primary int key<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=List of values 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>Examples:<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
-ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default)<br>Set this to 2 for a collapsing separator (collapsed by default)
+ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Library used for PDF generation
 LocalTaxDesc=Some countries may apply two or three taxes on each invoice line. If this is the case, choose the type for the 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)
 SMS=SMS
@@ -1695,7 +1696,7 @@ SuppliersInvoiceNumberingModel=Vendor invoices numbering models
 IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=GeoIP Maxmind module setup
-PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat
+PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoLite2-Country.mmdb
 NoteOnPathLocation=Note that your ip to country data file must be inside a directory your PHP can read (Check your PHP open_basedir setup and filesystem permissions).
 YouCanDownloadFreeDatFileTo=You can download a <b>free demo version</b> of the Maxmind GeoIP country file at %s.
 YouCanDownloadAdvancedDatFileTo=You can also download a more <b>complete version, with updates,</b> of the Maxmind GeoIP country file at %s.
@@ -1926,14 +1927,13 @@ SmallerThan=Smaller than
 LargerThan=Larger than
 IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID is found into incoming email, the event will be automatically linked to the related objects.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
-IFTTTSetup=IFTTT module setup
-IFTTT_SERVICE_KEY=IFTTT Service key
-IFTTT_DOLIBARR_ENDPOINT_SECUREKEY=Security key to secure the endpoint URL used by IFTTT to send messages to your Dolibarr.
-IFTTTDesc=This module is designed to trigger events on IFTTT and/or to execute some action on external IFTTT triggers.
-UrlForIFTTT=URL endpoint for IFTTT
-YouWillFindItOnYourIFTTTAccount=You will find it on your IFTTT account
 EndPointFor=End point for %s : %s
 DeleteEmailCollector=Delete email collector
 ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
 RecipientEmailsWillBeReplacedWithThisValue=Recipient emails will be always replaced with this value
 AtLeastOneDefaultBankAccountMandatory=At least 1 default bank account must be defined
+RESTRICT_API_ON_IP=Allow available APIs to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can use the available APIs.
+RESTRICT_ON_IP=Allow access to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can access.
+BaseOnSabeDavVersion=Based on the library SabreDAV version
+NotAPublicIp=Not a public IP
+MakeAnonymousPing=Make an anonymous Ping '+1' to the Dolibarr foundation server (done 1 time only after installation) to allow the foundation to count the number of Dolibarr installation.
diff --git a/htdocs/langs/ka_GE/banks.lang b/htdocs/langs/ka_GE/banks.lang
index c77158e07b7..47295ec7e31 100644
--- a/htdocs/langs/ka_GE/banks.lang
+++ b/htdocs/langs/ka_GE/banks.lang
@@ -73,6 +73,7 @@ BankTransaction=Bank entry
 ListTransactions=List entries
 ListTransactionsByCategory=List entries/category
 TransactionsToConciliate=Entries to reconcile
+TransactionsToConciliateShort=To reconcile
 Conciliable=Can be reconciled
 Conciliate=Reconcile
 Conciliation=Reconciliation
@@ -116,6 +117,7 @@ DeleteCheckReceipt=Delete this check receipt?
 ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
 BankChecks=Bank checks
 BankChecksToReceipt=Checks awaiting deposit
+BankChecksToReceiptShort=Checks awaiting deposit
 ShowCheckReceipt=Show check deposit receipt
 NumberOfCheques=No. of check
 DeleteTransaction=Delete entry
diff --git a/htdocs/langs/ka_GE/cashdesk.lang b/htdocs/langs/ka_GE/cashdesk.lang
index ea0e660ed2d..33ea50dfb0f 100644
--- a/htdocs/langs/ka_GE/cashdesk.lang
+++ b/htdocs/langs/ka_GE/cashdesk.lang
@@ -62,6 +62,7 @@ TicketVatGrouped=Group VAT by rate in tickets
 AutoPrintTickets=Automatically print tickets
 EnableBarOrRestaurantFeatures=Enable features for Bar or Restaurant
 ConfirmDeletionOfThisPOSSale=Do your confirm the deletion of this current sale ?
+ConfirmDiscardOfThisPOSSale=Do you want to discard this current sale ?
 History=History
 ValidateAndClose=Validate and close
 Terminal=Terminal
@@ -69,3 +70,8 @@ NumberOfTerminals=Number of Terminals
 TerminalSelect=Select terminal you want to use:
 POSTicket=POS Ticket
 BasicPhoneLayout=Use basic layout for phones
+SetupOfTerminalNotComplete=Setup of terminal %s is not complete
+DirectPayment=Direct payment
+DirectPaymentButton=Direct cash payment button
+InvoiceIsAlreadyValidated=Invoice is already validated
+NoLinesToBill=No lines to bill
diff --git a/htdocs/langs/ka_GE/companies.lang b/htdocs/langs/ka_GE/companies.lang
index 578f5cb8920..8235c74ddda 100644
--- a/htdocs/langs/ka_GE/companies.lang
+++ b/htdocs/langs/ka_GE/companies.lang
@@ -54,6 +54,7 @@ Firstname=First name
 PostOrFunction=Job position
 UserTitle=Title
 NatureOfThirdParty=Nature of Third party
+NatureOfContact=Nature of Contact
 Address=Address
 State=State/Province
 StateShort=State
diff --git a/htdocs/langs/ka_GE/contracts.lang b/htdocs/langs/ka_GE/contracts.lang
index 51b73423fb0..47572c355ab 100644
--- a/htdocs/langs/ka_GE/contracts.lang
+++ b/htdocs/langs/ka_GE/contracts.lang
@@ -51,6 +51,7 @@ ListOfClosedServices=List of closed services
 ListOfRunningServices=List of running services
 NotActivatedServices=Inactive services (among validated contracts)
 BoardNotActivatedServices=Services to activate among validated contracts
+BoardNotActivatedServicesShort=Services to activate
 LastContracts=Latest %s contracts
 LastModifiedServices=Latest %s modified services
 ContractStartDate=Start date
@@ -64,7 +65,10 @@ DateStartRealShort=Real start date
 DateEndReal=Real end date
 DateEndRealShort=Real end date
 CloseService=Close service
-BoardRunningServices=Expired running services
+BoardRunningServices=Services running
+BoardRunningServicesShort=Services running
+BoardExpiredServices=Services expired
+BoardExpiredServicesShort=Services expired
 ServiceStatus=Status of service
 DraftContracts=Drafts contracts
 CloseRefusedBecauseOneServiceActive=Contract can't be closed as there is at least one open service on it
diff --git a/htdocs/langs/ka_GE/errors.lang b/htdocs/langs/ka_GE/errors.lang
index 1ee46fdbb92..0c07b2eafc4 100644
--- a/htdocs/langs/ka_GE/errors.lang
+++ b/htdocs/langs/ka_GE/errors.lang
@@ -218,6 +218,7 @@ ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text
 ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Error, delete payment linked to a closed invoice is not possible.
+ErrorSearchCriteriaTooSmall=Search criteria too small.
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 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/main.lang b/htdocs/langs/ka_GE/main.lang
index 1cadc32f4ab..8ac9025f57c 100644
--- a/htdocs/langs/ka_GE/main.lang
+++ b/htdocs/langs/ka_GE/main.lang
@@ -28,6 +28,7 @@ NoTemplateDefined=No template available for this email type
 AvailableVariables=Available substitution variables
 NoTranslation=No translation
 Translation=Translation
+EmptySearchString=Enter a non empty search string
 NoRecordFound=No record found
 NoRecordDeleted=No record deleted
 NotEnoughDataYet=Not enough data
@@ -704,6 +705,7 @@ DateOfSignature=Date of signature
 HidePassword=Show command with password hidden
 UnHidePassword=Show real command with clear password
 Root=Root
+RootOfMedias=Root of public medias (/medias)
 Informations=Information
 Page=Page
 Notes=Notes
@@ -981,3 +983,10 @@ PaymentInformation=Payment information
 ValidFrom=Valid from
 ValidUntil=Valid until
 NoRecordedUsers=No users
+ToClose=To close
+ToProcess=To process
+ToApprove=To approve
+GlobalOpenedElemView=Global view
+NoArticlesFoundForTheKeyword=No article found for the keyword '<strong>%s</strong>'
+NoArticlesFoundForTheCategory=No article found for the category
+ToAcceptRefuse=To accept | refuse
diff --git a/htdocs/langs/ka_GE/members.lang b/htdocs/langs/ka_GE/members.lang
index 9993e05428f..5886c598d52 100644
--- a/htdocs/langs/ka_GE/members.lang
+++ b/htdocs/langs/ka_GE/members.lang
@@ -29,6 +29,7 @@ MenuMembersUpToDate=Up to date members
 MenuMembersNotUpToDate=Out of date members
 MenuMembersResiliated=Terminated members
 MembersWithSubscriptionToReceive=Members with subscription to receive
+MembersWithSubscriptionToReceiveShort=Subscription to receive
 DateSubscription=Subscription date
 DateEndSubscription=Subscription end date
 EndSubscription=End subscription
diff --git a/htdocs/langs/ka_GE/projects.lang b/htdocs/langs/ka_GE/projects.lang
index 76bd0ce597d..d144fccd272 100644
--- a/htdocs/langs/ka_GE/projects.lang
+++ b/htdocs/langs/ka_GE/projects.lang
@@ -76,7 +76,13 @@ MyProjects=My projects
 MyProjectsArea=My projects Area
 DurationEffective=Effective duration
 ProgressDeclared=Declared progress
+TaskProgressSummary=Task progress
+CurentlyOpenedTasks=Curently opened tasks
+TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared progress is less %s than the calculated progression
+TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared progress is more %s than the calculated progression
 ProgressCalculated=Calculated progress
+WhichIamLinkedTo=which I'm linked to
+WhichIamLinkedToProject=which I'm linked to project
 Time=Time
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
diff --git a/htdocs/langs/ka_GE/website.lang b/htdocs/langs/ka_GE/website.lang
index 0ee00aff7c0..9648ae48cc8 100644
--- a/htdocs/langs/ka_GE/website.lang
+++ b/htdocs/langs/ka_GE/website.lang
@@ -2,7 +2,7 @@
 Shortname=Code
 WebsiteSetupDesc=Create here the websites you wish to use. Then go into menu Websites to edit them.
 DeleteWebsite=Delete website
-ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed.
+ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed. The files uploaded (like into the medias directory, the ECM module, ...) will remain.
 WEBSITE_TYPE_CONTAINER=Type of page/container
 WEBSITE_PAGE_EXAMPLE=Web page to use as example
 WEBSITE_PAGENAME=Page name/alias
@@ -14,6 +14,9 @@ WEBSITE_JS_INLINE=Javascript file content (common to all pages)
 WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages)
 WEBSITE_ROBOT=Robot file (robots.txt)
 WEBSITE_HTACCESS=Website .htaccess file
+WEBSITE_MANIFEST_JSON=Website manifest.json file
+WEBSITE_README=README.md file
+EnterHereLicenseInformation=Enter here meta data or license information to fille a README.md file. if you distribute your website as a template, the file will be included into the temptate package.
 HtmlHeaderPage=HTML header (specific to this page only)
 PageNameAliasHelp=Name or alias of the page.<br>This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "<strong>%s</strong>" to edit this alias.
 EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container.
@@ -41,6 +44,7 @@ RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
 SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then set the name of the virtual host you have created in the properties of web site, so the preview can be done also using this dedicated web server access instead of the internal Dolibarr server.
 YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
 CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
 ReadPerm=Read
 WritePerm=Write
@@ -75,7 +79,8 @@ AddWebsiteAccount=Create web site account
 BackToListOfThirdParty=Back to list for Third Party
 DisableSiteFirst=Disable website first
 MyContainerTitle=My web site title
-AnotherContainer=Another container
+AnotherContainer=This is how to include content of another page/container (you may have an error here if you enable dynamic code because the embedded subcontainer may not exists)
+SorryWebsiteIsCurrentlyOffLine=Sorry, this website is currently off line. Please comme back later...
 WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / third party
 YouMustDefineTheHomePage=You must first define the default Home page
@@ -89,7 +94,8 @@ AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
 CorporateHomePage=Corporate Home page
 EmptyPage=Empty page
 ExternalURLMustStartWithHttp=External URL must start with http:// or https://
-ZipOfWebsitePackageToImport=Zip file of website package
+ZipOfWebsitePackageToImport=Upload the Zip file of the website template package
+ZipOfWebsitePackageToLoad=or Choose an available embedded website template package
 ShowSubcontainers=Include dynamic content
 InternalURLOfPage=Internal URL of page
 ThisPageIsTranslationOf=This page/container is a translation of
@@ -101,5 +107,10 @@ NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynam
 ReplaceWebsiteContent=Search or Replace website content
 DeleteAlsoJs=Delete also all javascript files specific to this website?
 DeleteAlsoMedias=Delete also all medias files specific to this website?
-# Export
 MyWebsitePages=My website pages
+SearchReplaceInto=Search | Replace into
+ReplaceString=New string
+CSSContentTooltipHelp=Enter here CSS content. To avoid any conflict with the CSS of the application, be sure to prepend all declaration with the .bodywebsite class. For example:<br><br>#mycssselector, input.myclass:hover { ... }<br>must be<br>.bodywebsite #mycssselector, .bodywebsite input.myclass:hover { ... }<br><br>Note: If you have a large file without this prefix, you can use 'lessc' to convert it to append the .bodywebsite prefix everywhere.
+LinkAndScriptsHereAreNotLoadedInEditor=Warning: This content is output only when site is accessed from a server. It is not used in Edit mode so if you need to load javascript files also in edit mode, just add your tag 'script src=...' into the page.
+Dynamiccontent=Sample of a page with dynamic content
+ImportSite=Import website template
diff --git a/htdocs/langs/km_KH/main.lang b/htdocs/langs/km_KH/main.lang
index 57b062774ea..ce6b846edb6 100644
--- a/htdocs/langs/km_KH/main.lang
+++ b/htdocs/langs/km_KH/main.lang
@@ -28,6 +28,7 @@ NoTemplateDefined=No template available for this email type
 AvailableVariables=Available substitution variables
 NoTranslation=No translation
 Translation=Translation
+EmptySearchString=Enter a non empty search string
 NoRecordFound=No record found
 NoRecordDeleted=No record deleted
 NotEnoughDataYet=Not enough data
@@ -704,6 +705,7 @@ DateOfSignature=Date of signature
 HidePassword=Show command with password hidden
 UnHidePassword=Show real command with clear password
 Root=Root
+RootOfMedias=Root of public medias (/medias)
 Informations=Information
 Page=Page
 Notes=Notes
@@ -981,3 +983,10 @@ PaymentInformation=Payment information
 ValidFrom=Valid from
 ValidUntil=Valid until
 NoRecordedUsers=No users
+ToClose=To close
+ToProcess=To process
+ToApprove=To approve
+GlobalOpenedElemView=Global view
+NoArticlesFoundForTheKeyword=No article found for the keyword '<strong>%s</strong>'
+NoArticlesFoundForTheCategory=No article found for the category
+ToAcceptRefuse=To accept | refuse
diff --git a/htdocs/langs/kn_IN/admin.lang b/htdocs/langs/kn_IN/admin.lang
index c0997f3eb4b..15c72011ef4 100644
--- a/htdocs/langs/kn_IN/admin.lang
+++ b/htdocs/langs/kn_IN/admin.lang
@@ -400,6 +400,7 @@ OldVATRates=Old VAT rate
 NewVATRates=New VAT rate
 PriceBaseTypeToChange=Modify on prices with base reference value defined on
 MassConvert=Launch bulk conversion
+PriceFormatInCurrentLanguage=Price Format In Current Language
 String=String
 TextLong=Long text
 HtmlText=Html text
@@ -431,7 +432,7 @@ ExtrafieldParamHelpradio=List of values must be lines with format key,value (whe
 ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- idfilter is necessarly a primary int key<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=List of values 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>Examples:<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
-ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default)<br>Set this to 2 for a collapsing separator (collapsed by default)
+ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Library used for PDF generation
 LocalTaxDesc=Some countries may apply two or three taxes on each invoice line. If this is the case, choose the type for the 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)
 SMS=SMS
@@ -1695,7 +1696,7 @@ SuppliersInvoiceNumberingModel=Vendor invoices numbering models
 IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=GeoIP Maxmind module setup
-PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat
+PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoLite2-Country.mmdb
 NoteOnPathLocation=Note that your ip to country data file must be inside a directory your PHP can read (Check your PHP open_basedir setup and filesystem permissions).
 YouCanDownloadFreeDatFileTo=You can download a <b>free demo version</b> of the Maxmind GeoIP country file at %s.
 YouCanDownloadAdvancedDatFileTo=You can also download a more <b>complete version, with updates,</b> of the Maxmind GeoIP country file at %s.
@@ -1926,14 +1927,13 @@ SmallerThan=Smaller than
 LargerThan=Larger than
 IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID is found into incoming email, the event will be automatically linked to the related objects.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
-IFTTTSetup=IFTTT module setup
-IFTTT_SERVICE_KEY=IFTTT Service key
-IFTTT_DOLIBARR_ENDPOINT_SECUREKEY=Security key to secure the endpoint URL used by IFTTT to send messages to your Dolibarr.
-IFTTTDesc=This module is designed to trigger events on IFTTT and/or to execute some action on external IFTTT triggers.
-UrlForIFTTT=URL endpoint for IFTTT
-YouWillFindItOnYourIFTTTAccount=You will find it on your IFTTT account
 EndPointFor=End point for %s : %s
 DeleteEmailCollector=Delete email collector
 ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
 RecipientEmailsWillBeReplacedWithThisValue=Recipient emails will be always replaced with this value
 AtLeastOneDefaultBankAccountMandatory=At least 1 default bank account must be defined
+RESTRICT_API_ON_IP=Allow available APIs to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can use the available APIs.
+RESTRICT_ON_IP=Allow access to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can access.
+BaseOnSabeDavVersion=Based on the library SabreDAV version
+NotAPublicIp=Not a public IP
+MakeAnonymousPing=Make an anonymous Ping '+1' to the Dolibarr foundation server (done 1 time only after installation) to allow the foundation to count the number of Dolibarr installation.
diff --git a/htdocs/langs/kn_IN/banks.lang b/htdocs/langs/kn_IN/banks.lang
index 4d19a8d2fda..f3b4290e38b 100644
--- a/htdocs/langs/kn_IN/banks.lang
+++ b/htdocs/langs/kn_IN/banks.lang
@@ -73,6 +73,7 @@ BankTransaction=Bank entry
 ListTransactions=List entries
 ListTransactionsByCategory=List entries/category
 TransactionsToConciliate=Entries to reconcile
+TransactionsToConciliateShort=To reconcile
 Conciliable=Can be reconciled
 Conciliate=Reconcile
 Conciliation=Reconciliation
@@ -116,6 +117,7 @@ DeleteCheckReceipt=Delete this check receipt?
 ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
 BankChecks=Bank checks
 BankChecksToReceipt=Checks awaiting deposit
+BankChecksToReceiptShort=Checks awaiting deposit
 ShowCheckReceipt=Show check deposit receipt
 NumberOfCheques=No. of check
 DeleteTransaction=Delete entry
diff --git a/htdocs/langs/kn_IN/cashdesk.lang b/htdocs/langs/kn_IN/cashdesk.lang
index 5af2778e374..144f371bf69 100644
--- a/htdocs/langs/kn_IN/cashdesk.lang
+++ b/htdocs/langs/kn_IN/cashdesk.lang
@@ -62,6 +62,7 @@ TicketVatGrouped=Group VAT by rate in tickets
 AutoPrintTickets=Automatically print tickets
 EnableBarOrRestaurantFeatures=Enable features for Bar or Restaurant
 ConfirmDeletionOfThisPOSSale=Do your confirm the deletion of this current sale ?
+ConfirmDiscardOfThisPOSSale=Do you want to discard this current sale ?
 History=History
 ValidateAndClose=Validate and close
 Terminal=Terminal
@@ -69,3 +70,8 @@ NumberOfTerminals=Number of Terminals
 TerminalSelect=Select terminal you want to use:
 POSTicket=POS Ticket
 BasicPhoneLayout=Use basic layout for phones
+SetupOfTerminalNotComplete=Setup of terminal %s is not complete
+DirectPayment=Direct payment
+DirectPaymentButton=Direct cash payment button
+InvoiceIsAlreadyValidated=Invoice is already validated
+NoLinesToBill=No lines to bill
diff --git a/htdocs/langs/kn_IN/companies.lang b/htdocs/langs/kn_IN/companies.lang
index b24894cd7f8..67b39834743 100644
--- a/htdocs/langs/kn_IN/companies.lang
+++ b/htdocs/langs/kn_IN/companies.lang
@@ -54,6 +54,7 @@ Firstname=ಮೊದಲ ಹೆಸರು
 PostOrFunction=Job position
 UserTitle=ಶೀರ್ಷಿಕೆ
 NatureOfThirdParty=Nature of Third party
+NatureOfContact=Nature of Contact
 Address=ವಿಳಾಸ
 State=ರಾಜ್ಯ / ಪ್ರಾಂತ್ಯ
 StateShort=State
diff --git a/htdocs/langs/kn_IN/contracts.lang b/htdocs/langs/kn_IN/contracts.lang
index f9fe6eb30db..7482566d6ae 100644
--- a/htdocs/langs/kn_IN/contracts.lang
+++ b/htdocs/langs/kn_IN/contracts.lang
@@ -51,6 +51,7 @@ ListOfClosedServices=List of closed services
 ListOfRunningServices=List of running services
 NotActivatedServices=Inactive services (among validated contracts)
 BoardNotActivatedServices=Services to activate among validated contracts
+BoardNotActivatedServicesShort=Services to activate
 LastContracts=Latest %s contracts
 LastModifiedServices=Latest %s modified services
 ContractStartDate=Start date
@@ -64,7 +65,10 @@ DateStartRealShort=Real start date
 DateEndReal=Real end date
 DateEndRealShort=Real end date
 CloseService=Close service
-BoardRunningServices=Expired running services
+BoardRunningServices=Services running
+BoardRunningServicesShort=Services running
+BoardExpiredServices=Services expired
+BoardExpiredServicesShort=Services expired
 ServiceStatus=Status of service
 DraftContracts=Drafts contracts
 CloseRefusedBecauseOneServiceActive=Contract can't be closed as there is at least one open service on it
diff --git a/htdocs/langs/kn_IN/errors.lang b/htdocs/langs/kn_IN/errors.lang
index 1ee46fdbb92..0c07b2eafc4 100644
--- a/htdocs/langs/kn_IN/errors.lang
+++ b/htdocs/langs/kn_IN/errors.lang
@@ -218,6 +218,7 @@ ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text
 ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Error, delete payment linked to a closed invoice is not possible.
+ErrorSearchCriteriaTooSmall=Search criteria too small.
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 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/main.lang b/htdocs/langs/kn_IN/main.lang
index aae0806ec95..ea8534194bb 100644
--- a/htdocs/langs/kn_IN/main.lang
+++ b/htdocs/langs/kn_IN/main.lang
@@ -28,6 +28,7 @@ NoTemplateDefined=No template available for this email type
 AvailableVariables=Available substitution variables
 NoTranslation=No translation
 Translation=Translation
+EmptySearchString=Enter a non empty search string
 NoRecordFound=No record found
 NoRecordDeleted=No record deleted
 NotEnoughDataYet=Not enough data
@@ -704,6 +705,7 @@ DateOfSignature=Date of signature
 HidePassword=Show command with password hidden
 UnHidePassword=Show real command with clear password
 Root=Root
+RootOfMedias=Root of public medias (/medias)
 Informations=Information
 Page=Page
 Notes=Notes
@@ -981,3 +983,10 @@ PaymentInformation=Payment information
 ValidFrom=Valid from
 ValidUntil=Valid until
 NoRecordedUsers=No users
+ToClose=To close
+ToProcess=To process
+ToApprove=To approve
+GlobalOpenedElemView=Global view
+NoArticlesFoundForTheKeyword=No article found for the keyword '<strong>%s</strong>'
+NoArticlesFoundForTheCategory=No article found for the category
+ToAcceptRefuse=To accept | refuse
diff --git a/htdocs/langs/kn_IN/members.lang b/htdocs/langs/kn_IN/members.lang
index 9993e05428f..5886c598d52 100644
--- a/htdocs/langs/kn_IN/members.lang
+++ b/htdocs/langs/kn_IN/members.lang
@@ -29,6 +29,7 @@ MenuMembersUpToDate=Up to date members
 MenuMembersNotUpToDate=Out of date members
 MenuMembersResiliated=Terminated members
 MembersWithSubscriptionToReceive=Members with subscription to receive
+MembersWithSubscriptionToReceiveShort=Subscription to receive
 DateSubscription=Subscription date
 DateEndSubscription=Subscription end date
 EndSubscription=End subscription
diff --git a/htdocs/langs/kn_IN/projects.lang b/htdocs/langs/kn_IN/projects.lang
index 76bd0ce597d..d144fccd272 100644
--- a/htdocs/langs/kn_IN/projects.lang
+++ b/htdocs/langs/kn_IN/projects.lang
@@ -76,7 +76,13 @@ MyProjects=My projects
 MyProjectsArea=My projects Area
 DurationEffective=Effective duration
 ProgressDeclared=Declared progress
+TaskProgressSummary=Task progress
+CurentlyOpenedTasks=Curently opened tasks
+TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared progress is less %s than the calculated progression
+TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared progress is more %s than the calculated progression
 ProgressCalculated=Calculated progress
+WhichIamLinkedTo=which I'm linked to
+WhichIamLinkedToProject=which I'm linked to project
 Time=Time
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
diff --git a/htdocs/langs/kn_IN/website.lang b/htdocs/langs/kn_IN/website.lang
index 0ee00aff7c0..9648ae48cc8 100644
--- a/htdocs/langs/kn_IN/website.lang
+++ b/htdocs/langs/kn_IN/website.lang
@@ -2,7 +2,7 @@
 Shortname=Code
 WebsiteSetupDesc=Create here the websites you wish to use. Then go into menu Websites to edit them.
 DeleteWebsite=Delete website
-ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed.
+ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed. The files uploaded (like into the medias directory, the ECM module, ...) will remain.
 WEBSITE_TYPE_CONTAINER=Type of page/container
 WEBSITE_PAGE_EXAMPLE=Web page to use as example
 WEBSITE_PAGENAME=Page name/alias
@@ -14,6 +14,9 @@ WEBSITE_JS_INLINE=Javascript file content (common to all pages)
 WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages)
 WEBSITE_ROBOT=Robot file (robots.txt)
 WEBSITE_HTACCESS=Website .htaccess file
+WEBSITE_MANIFEST_JSON=Website manifest.json file
+WEBSITE_README=README.md file
+EnterHereLicenseInformation=Enter here meta data or license information to fille a README.md file. if you distribute your website as a template, the file will be included into the temptate package.
 HtmlHeaderPage=HTML header (specific to this page only)
 PageNameAliasHelp=Name or alias of the page.<br>This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "<strong>%s</strong>" to edit this alias.
 EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container.
@@ -41,6 +44,7 @@ RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
 SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then set the name of the virtual host you have created in the properties of web site, so the preview can be done also using this dedicated web server access instead of the internal Dolibarr server.
 YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
 CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
 ReadPerm=Read
 WritePerm=Write
@@ -75,7 +79,8 @@ AddWebsiteAccount=Create web site account
 BackToListOfThirdParty=Back to list for Third Party
 DisableSiteFirst=Disable website first
 MyContainerTitle=My web site title
-AnotherContainer=Another container
+AnotherContainer=This is how to include content of another page/container (you may have an error here if you enable dynamic code because the embedded subcontainer may not exists)
+SorryWebsiteIsCurrentlyOffLine=Sorry, this website is currently off line. Please comme back later...
 WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / third party
 YouMustDefineTheHomePage=You must first define the default Home page
@@ -89,7 +94,8 @@ AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
 CorporateHomePage=Corporate Home page
 EmptyPage=Empty page
 ExternalURLMustStartWithHttp=External URL must start with http:// or https://
-ZipOfWebsitePackageToImport=Zip file of website package
+ZipOfWebsitePackageToImport=Upload the Zip file of the website template package
+ZipOfWebsitePackageToLoad=or Choose an available embedded website template package
 ShowSubcontainers=Include dynamic content
 InternalURLOfPage=Internal URL of page
 ThisPageIsTranslationOf=This page/container is a translation of
@@ -101,5 +107,10 @@ NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynam
 ReplaceWebsiteContent=Search or Replace website content
 DeleteAlsoJs=Delete also all javascript files specific to this website?
 DeleteAlsoMedias=Delete also all medias files specific to this website?
-# Export
 MyWebsitePages=My website pages
+SearchReplaceInto=Search | Replace into
+ReplaceString=New string
+CSSContentTooltipHelp=Enter here CSS content. To avoid any conflict with the CSS of the application, be sure to prepend all declaration with the .bodywebsite class. For example:<br><br>#mycssselector, input.myclass:hover { ... }<br>must be<br>.bodywebsite #mycssselector, .bodywebsite input.myclass:hover { ... }<br><br>Note: If you have a large file without this prefix, you can use 'lessc' to convert it to append the .bodywebsite prefix everywhere.
+LinkAndScriptsHereAreNotLoadedInEditor=Warning: This content is output only when site is accessed from a server. It is not used in Edit mode so if you need to load javascript files also in edit mode, just add your tag 'script src=...' into the page.
+Dynamiccontent=Sample of a page with dynamic content
+ImportSite=Import website template
diff --git a/htdocs/langs/ko_KR/admin.lang b/htdocs/langs/ko_KR/admin.lang
index 5a407bc2806..6d26f10e583 100644
--- a/htdocs/langs/ko_KR/admin.lang
+++ b/htdocs/langs/ko_KR/admin.lang
@@ -400,6 +400,7 @@ OldVATRates=Old VAT rate
 NewVATRates=New VAT rate
 PriceBaseTypeToChange=Modify on prices with base reference value defined on
 MassConvert=Launch bulk conversion
+PriceFormatInCurrentLanguage=Price Format In Current Language
 String=String
 TextLong=Long text
 HtmlText=Html text
@@ -431,7 +432,7 @@ ExtrafieldParamHelpradio=List of values must be lines with format key,value (whe
 ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- idfilter is necessarly a primary int key<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=List of values 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>Examples:<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
-ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default)<br>Set this to 2 for a collapsing separator (collapsed by default)
+ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Library used for PDF generation
 LocalTaxDesc=Some countries may apply two or three taxes on each invoice line. If this is the case, choose the type for the 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)
 SMS=SMS
@@ -1695,7 +1696,7 @@ SuppliersInvoiceNumberingModel=Vendor invoices numbering models
 IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=GeoIP Maxmind module setup
-PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat
+PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoLite2-Country.mmdb
 NoteOnPathLocation=Note that your ip to country data file must be inside a directory your PHP can read (Check your PHP open_basedir setup and filesystem permissions).
 YouCanDownloadFreeDatFileTo=You can download a <b>free demo version</b> of the Maxmind GeoIP country file at %s.
 YouCanDownloadAdvancedDatFileTo=You can also download a more <b>complete version, with updates,</b> of the Maxmind GeoIP country file at %s.
@@ -1926,14 +1927,13 @@ SmallerThan=Smaller than
 LargerThan=Larger than
 IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID is found into incoming email, the event will be automatically linked to the related objects.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
-IFTTTSetup=IFTTT module setup
-IFTTT_SERVICE_KEY=IFTTT Service key
-IFTTT_DOLIBARR_ENDPOINT_SECUREKEY=Security key to secure the endpoint URL used by IFTTT to send messages to your Dolibarr.
-IFTTTDesc=This module is designed to trigger events on IFTTT and/or to execute some action on external IFTTT triggers.
-UrlForIFTTT=URL endpoint for IFTTT
-YouWillFindItOnYourIFTTTAccount=You will find it on your IFTTT account
 EndPointFor=End point for %s : %s
 DeleteEmailCollector=Delete email collector
 ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
 RecipientEmailsWillBeReplacedWithThisValue=Recipient emails will be always replaced with this value
 AtLeastOneDefaultBankAccountMandatory=At least 1 default bank account must be defined
+RESTRICT_API_ON_IP=Allow available APIs to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can use the available APIs.
+RESTRICT_ON_IP=Allow access to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can access.
+BaseOnSabeDavVersion=Based on the library SabreDAV version
+NotAPublicIp=Not a public IP
+MakeAnonymousPing=Make an anonymous Ping '+1' to the Dolibarr foundation server (done 1 time only after installation) to allow the foundation to count the number of Dolibarr installation.
diff --git a/htdocs/langs/ko_KR/banks.lang b/htdocs/langs/ko_KR/banks.lang
index 0444805d5d2..2475323922b 100644
--- a/htdocs/langs/ko_KR/banks.lang
+++ b/htdocs/langs/ko_KR/banks.lang
@@ -73,6 +73,7 @@ BankTransaction=Bank entry
 ListTransactions=List entries
 ListTransactionsByCategory=List entries/category
 TransactionsToConciliate=Entries to reconcile
+TransactionsToConciliateShort=To reconcile
 Conciliable=Can be reconciled
 Conciliate=Reconcile
 Conciliation=Reconciliation
@@ -116,6 +117,7 @@ DeleteCheckReceipt=Delete this check receipt?
 ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
 BankChecks=Bank checks
 BankChecksToReceipt=Checks awaiting deposit
+BankChecksToReceiptShort=Checks awaiting deposit
 ShowCheckReceipt=Show check deposit receipt
 NumberOfCheques=No. of check
 DeleteTransaction=Delete entry
diff --git a/htdocs/langs/ko_KR/cashdesk.lang b/htdocs/langs/ko_KR/cashdesk.lang
index 12c39ff8a70..14d33ab71c0 100644
--- a/htdocs/langs/ko_KR/cashdesk.lang
+++ b/htdocs/langs/ko_KR/cashdesk.lang
@@ -62,6 +62,7 @@ TicketVatGrouped=Group VAT by rate in tickets
 AutoPrintTickets=Automatically print tickets
 EnableBarOrRestaurantFeatures=Enable features for Bar or Restaurant
 ConfirmDeletionOfThisPOSSale=Do your confirm the deletion of this current sale ?
+ConfirmDiscardOfThisPOSSale=Do you want to discard this current sale ?
 History=기록보기
 ValidateAndClose=Validate and close
 Terminal=Terminal
@@ -69,3 +70,8 @@ NumberOfTerminals=Number of Terminals
 TerminalSelect=Select terminal you want to use:
 POSTicket=POS Ticket
 BasicPhoneLayout=Use basic layout for phones
+SetupOfTerminalNotComplete=Setup of terminal %s is not complete
+DirectPayment=Direct payment
+DirectPaymentButton=Direct cash payment button
+InvoiceIsAlreadyValidated=Invoice is already validated
+NoLinesToBill=No lines to bill
diff --git a/htdocs/langs/ko_KR/companies.lang b/htdocs/langs/ko_KR/companies.lang
index d446029ff46..a0ee27ce3f0 100644
--- a/htdocs/langs/ko_KR/companies.lang
+++ b/htdocs/langs/ko_KR/companies.lang
@@ -54,6 +54,7 @@ Firstname=이름
 PostOrFunction=직위
 UserTitle=제목
 NatureOfThirdParty=Nature of Third party
+NatureOfContact=Nature of Contact
 Address=주소
 State=시 /도
 StateShort=상태
diff --git a/htdocs/langs/ko_KR/contracts.lang b/htdocs/langs/ko_KR/contracts.lang
index 2dd4c5f7d0d..87581aba72f 100644
--- a/htdocs/langs/ko_KR/contracts.lang
+++ b/htdocs/langs/ko_KR/contracts.lang
@@ -51,6 +51,7 @@ ListOfClosedServices=List of closed services
 ListOfRunningServices=List of running services
 NotActivatedServices=Inactive services (among validated contracts)
 BoardNotActivatedServices=Services to activate among validated contracts
+BoardNotActivatedServicesShort=Services to activate
 LastContracts=Latest %s contracts
 LastModifiedServices=Latest %s modified services
 ContractStartDate=시작일
@@ -64,7 +65,10 @@ DateStartRealShort=Real start date
 DateEndReal=Real end date
 DateEndRealShort=Real end date
 CloseService=Close service
-BoardRunningServices=Expired running services
+BoardRunningServices=Services running
+BoardRunningServicesShort=Services running
+BoardExpiredServices=Services expired
+BoardExpiredServicesShort=Services expired
 ServiceStatus=Status of service
 DraftContracts=Drafts contracts
 CloseRefusedBecauseOneServiceActive=Contract can't be closed as there is at least one open service on it
diff --git a/htdocs/langs/ko_KR/errors.lang b/htdocs/langs/ko_KR/errors.lang
index 1ee46fdbb92..0c07b2eafc4 100644
--- a/htdocs/langs/ko_KR/errors.lang
+++ b/htdocs/langs/ko_KR/errors.lang
@@ -218,6 +218,7 @@ ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text
 ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Error, delete payment linked to a closed invoice is not possible.
+ErrorSearchCriteriaTooSmall=Search criteria too small.
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 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/main.lang b/htdocs/langs/ko_KR/main.lang
index e3bfba6b683..e6d592fd919 100644
--- a/htdocs/langs/ko_KR/main.lang
+++ b/htdocs/langs/ko_KR/main.lang
@@ -28,6 +28,7 @@ NoTemplateDefined=No template available for this email type
 AvailableVariables=사용 가능한 대체 변수
 NoTranslation=번역 없음
 Translation=Translation
+EmptySearchString=Enter a non empty search string
 NoRecordFound=레코드를 찾을 수 없습니다
 NoRecordDeleted=레코드가 삭제되지 않았습니다.
 NotEnoughDataYet=데이터가 충분하지 않습니다.
@@ -704,6 +705,7 @@ DateOfSignature=서명 날짜
 HidePassword=암호가 숨겨진 명령 표시
 UnHidePassword=명확한 암호로 실제 명령 표시
 Root=루트
+RootOfMedias=Root of public medias (/medias)
 Informations=Information
 Page=페이지
 Notes=노트
@@ -981,3 +983,10 @@ PaymentInformation=Payment information
 ValidFrom=Valid from
 ValidUntil=Valid until
 NoRecordedUsers=No users
+ToClose=To close
+ToProcess=To process
+ToApprove=To approve
+GlobalOpenedElemView=Global view
+NoArticlesFoundForTheKeyword=No article found for the keyword '<strong>%s</strong>'
+NoArticlesFoundForTheCategory=No article found for the category
+ToAcceptRefuse=To accept | refuse
diff --git a/htdocs/langs/ko_KR/members.lang b/htdocs/langs/ko_KR/members.lang
index fd2f0bfb255..af849a915cc 100644
--- a/htdocs/langs/ko_KR/members.lang
+++ b/htdocs/langs/ko_KR/members.lang
@@ -29,6 +29,7 @@ MenuMembersUpToDate=Up to date members
 MenuMembersNotUpToDate=Out of date members
 MenuMembersResiliated=Terminated members
 MembersWithSubscriptionToReceive=Members with subscription to receive
+MembersWithSubscriptionToReceiveShort=Subscription to receive
 DateSubscription=Subscription date
 DateEndSubscription=Subscription end date
 EndSubscription=End subscription
diff --git a/htdocs/langs/ko_KR/projects.lang b/htdocs/langs/ko_KR/projects.lang
index ad3e07067cb..ecb377a3e50 100644
--- a/htdocs/langs/ko_KR/projects.lang
+++ b/htdocs/langs/ko_KR/projects.lang
@@ -76,7 +76,13 @@ MyProjects=My projects
 MyProjectsArea=My projects Area
 DurationEffective=Effective duration
 ProgressDeclared=Declared progress
+TaskProgressSummary=Task progress
+CurentlyOpenedTasks=Curently opened tasks
+TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared progress is less %s than the calculated progression
+TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared progress is more %s than the calculated progression
 ProgressCalculated=Calculated progress
+WhichIamLinkedTo=which I'm linked to
+WhichIamLinkedToProject=which I'm linked to project
 Time=Time
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
diff --git a/htdocs/langs/ko_KR/website.lang b/htdocs/langs/ko_KR/website.lang
index c73b128d7bc..5eb06621a51 100644
--- a/htdocs/langs/ko_KR/website.lang
+++ b/htdocs/langs/ko_KR/website.lang
@@ -2,7 +2,7 @@
 Shortname=암호
 WebsiteSetupDesc=Create here the websites you wish to use. Then go into menu Websites to edit them.
 DeleteWebsite=Delete website
-ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed.
+ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed. The files uploaded (like into the medias directory, the ECM module, ...) will remain.
 WEBSITE_TYPE_CONTAINER=Type of page/container
 WEBSITE_PAGE_EXAMPLE=Web page to use as example
 WEBSITE_PAGENAME=Page name/alias
@@ -14,6 +14,9 @@ WEBSITE_JS_INLINE=Javascript file content (common to all pages)
 WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages)
 WEBSITE_ROBOT=Robot file (robots.txt)
 WEBSITE_HTACCESS=Website .htaccess file
+WEBSITE_MANIFEST_JSON=Website manifest.json file
+WEBSITE_README=README.md file
+EnterHereLicenseInformation=Enter here meta data or license information to fille a README.md file. if you distribute your website as a template, the file will be included into the temptate package.
 HtmlHeaderPage=HTML header (specific to this page only)
 PageNameAliasHelp=Name or alias of the page.<br>This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "<strong>%s</strong>" to edit this alias.
 EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container.
@@ -41,6 +44,7 @@ RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
 SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then set the name of the virtual host you have created in the properties of web site, so the preview can be done also using this dedicated web server access instead of the internal Dolibarr server.
 YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
 CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
 ReadPerm=Read
 WritePerm=Write
@@ -75,7 +79,8 @@ AddWebsiteAccount=Create web site account
 BackToListOfThirdParty=Back to list for Third Party
 DisableSiteFirst=Disable website first
 MyContainerTitle=My web site title
-AnotherContainer=Another container
+AnotherContainer=This is how to include content of another page/container (you may have an error here if you enable dynamic code because the embedded subcontainer may not exists)
+SorryWebsiteIsCurrentlyOffLine=Sorry, this website is currently off line. Please comme back later...
 WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / third party
 YouMustDefineTheHomePage=You must first define the default Home page
@@ -89,7 +94,8 @@ AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
 CorporateHomePage=Corporate Home page
 EmptyPage=Empty page
 ExternalURLMustStartWithHttp=External URL must start with http:// or https://
-ZipOfWebsitePackageToImport=Zip file of website package
+ZipOfWebsitePackageToImport=Upload the Zip file of the website template package
+ZipOfWebsitePackageToLoad=or Choose an available embedded website template package
 ShowSubcontainers=Include dynamic content
 InternalURLOfPage=Internal URL of page
 ThisPageIsTranslationOf=This page/container is a translation of
@@ -101,5 +107,10 @@ NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynam
 ReplaceWebsiteContent=Search or Replace website content
 DeleteAlsoJs=Delete also all javascript files specific to this website?
 DeleteAlsoMedias=Delete also all medias files specific to this website?
-# Export
 MyWebsitePages=My website pages
+SearchReplaceInto=Search | Replace into
+ReplaceString=New string
+CSSContentTooltipHelp=Enter here CSS content. To avoid any conflict with the CSS of the application, be sure to prepend all declaration with the .bodywebsite class. For example:<br><br>#mycssselector, input.myclass:hover { ... }<br>must be<br>.bodywebsite #mycssselector, .bodywebsite input.myclass:hover { ... }<br><br>Note: If you have a large file without this prefix, you can use 'lessc' to convert it to append the .bodywebsite prefix everywhere.
+LinkAndScriptsHereAreNotLoadedInEditor=Warning: This content is output only when site is accessed from a server. It is not used in Edit mode so if you need to load javascript files also in edit mode, just add your tag 'script src=...' into the page.
+Dynamiccontent=Sample of a page with dynamic content
+ImportSite=Import website template
diff --git a/htdocs/langs/lo_LA/admin.lang b/htdocs/langs/lo_LA/admin.lang
index 4dad4d295f0..85b05c0bbf1 100644
--- a/htdocs/langs/lo_LA/admin.lang
+++ b/htdocs/langs/lo_LA/admin.lang
@@ -400,6 +400,7 @@ OldVATRates=Old VAT rate
 NewVATRates=New VAT rate
 PriceBaseTypeToChange=Modify on prices with base reference value defined on
 MassConvert=Launch bulk conversion
+PriceFormatInCurrentLanguage=Price Format In Current Language
 String=String
 TextLong=Long text
 HtmlText=Html text
@@ -431,7 +432,7 @@ ExtrafieldParamHelpradio=List of values must be lines with format key,value (whe
 ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- idfilter is necessarly a primary int key<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=List of values 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>Examples:<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
-ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default)<br>Set this to 2 for a collapsing separator (collapsed by default)
+ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Library used for PDF generation
 LocalTaxDesc=Some countries may apply two or three taxes on each invoice line. If this is the case, choose the type for the 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)
 SMS=SMS
@@ -1695,7 +1696,7 @@ SuppliersInvoiceNumberingModel=Vendor invoices numbering models
 IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=GeoIP Maxmind module setup
-PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat
+PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoLite2-Country.mmdb
 NoteOnPathLocation=Note that your ip to country data file must be inside a directory your PHP can read (Check your PHP open_basedir setup and filesystem permissions).
 YouCanDownloadFreeDatFileTo=You can download a <b>free demo version</b> of the Maxmind GeoIP country file at %s.
 YouCanDownloadAdvancedDatFileTo=You can also download a more <b>complete version, with updates,</b> of the Maxmind GeoIP country file at %s.
@@ -1926,14 +1927,13 @@ SmallerThan=Smaller than
 LargerThan=Larger than
 IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID is found into incoming email, the event will be automatically linked to the related objects.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
-IFTTTSetup=IFTTT module setup
-IFTTT_SERVICE_KEY=IFTTT Service key
-IFTTT_DOLIBARR_ENDPOINT_SECUREKEY=Security key to secure the endpoint URL used by IFTTT to send messages to your Dolibarr.
-IFTTTDesc=This module is designed to trigger events on IFTTT and/or to execute some action on external IFTTT triggers.
-UrlForIFTTT=URL endpoint for IFTTT
-YouWillFindItOnYourIFTTTAccount=You will find it on your IFTTT account
 EndPointFor=End point for %s : %s
 DeleteEmailCollector=Delete email collector
 ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
 RecipientEmailsWillBeReplacedWithThisValue=Recipient emails will be always replaced with this value
 AtLeastOneDefaultBankAccountMandatory=At least 1 default bank account must be defined
+RESTRICT_API_ON_IP=Allow available APIs to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can use the available APIs.
+RESTRICT_ON_IP=Allow access to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can access.
+BaseOnSabeDavVersion=Based on the library SabreDAV version
+NotAPublicIp=Not a public IP
+MakeAnonymousPing=Make an anonymous Ping '+1' to the Dolibarr foundation server (done 1 time only after installation) to allow the foundation to count the number of Dolibarr installation.
diff --git a/htdocs/langs/lo_LA/banks.lang b/htdocs/langs/lo_LA/banks.lang
index c57942bbef8..0803246e595 100644
--- a/htdocs/langs/lo_LA/banks.lang
+++ b/htdocs/langs/lo_LA/banks.lang
@@ -73,6 +73,7 @@ BankTransaction=Bank entry
 ListTransactions=List entries
 ListTransactionsByCategory=List entries/category
 TransactionsToConciliate=Entries to reconcile
+TransactionsToConciliateShort=To reconcile
 Conciliable=Can be reconciled
 Conciliate=Reconcile
 Conciliation=Reconciliation
@@ -116,6 +117,7 @@ DeleteCheckReceipt=Delete this check receipt?
 ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
 BankChecks=Bank checks
 BankChecksToReceipt=Checks awaiting deposit
+BankChecksToReceiptShort=Checks awaiting deposit
 ShowCheckReceipt=Show check deposit receipt
 NumberOfCheques=No. of check
 DeleteTransaction=Delete entry
diff --git a/htdocs/langs/lo_LA/cashdesk.lang b/htdocs/langs/lo_LA/cashdesk.lang
index ea0e660ed2d..33ea50dfb0f 100644
--- a/htdocs/langs/lo_LA/cashdesk.lang
+++ b/htdocs/langs/lo_LA/cashdesk.lang
@@ -62,6 +62,7 @@ TicketVatGrouped=Group VAT by rate in tickets
 AutoPrintTickets=Automatically print tickets
 EnableBarOrRestaurantFeatures=Enable features for Bar or Restaurant
 ConfirmDeletionOfThisPOSSale=Do your confirm the deletion of this current sale ?
+ConfirmDiscardOfThisPOSSale=Do you want to discard this current sale ?
 History=History
 ValidateAndClose=Validate and close
 Terminal=Terminal
@@ -69,3 +70,8 @@ NumberOfTerminals=Number of Terminals
 TerminalSelect=Select terminal you want to use:
 POSTicket=POS Ticket
 BasicPhoneLayout=Use basic layout for phones
+SetupOfTerminalNotComplete=Setup of terminal %s is not complete
+DirectPayment=Direct payment
+DirectPaymentButton=Direct cash payment button
+InvoiceIsAlreadyValidated=Invoice is already validated
+NoLinesToBill=No lines to bill
diff --git a/htdocs/langs/lo_LA/companies.lang b/htdocs/langs/lo_LA/companies.lang
index 20e74ab2ac1..c98cc7adbee 100644
--- a/htdocs/langs/lo_LA/companies.lang
+++ b/htdocs/langs/lo_LA/companies.lang
@@ -54,6 +54,7 @@ Firstname=ຊື່ແທ້
 PostOrFunction=Job position
 UserTitle=Title
 NatureOfThirdParty=Nature of Third party
+NatureOfContact=Nature of Contact
 Address=Address
 State=State/Province
 StateShort=State
diff --git a/htdocs/langs/lo_LA/contracts.lang b/htdocs/langs/lo_LA/contracts.lang
index 51b73423fb0..47572c355ab 100644
--- a/htdocs/langs/lo_LA/contracts.lang
+++ b/htdocs/langs/lo_LA/contracts.lang
@@ -51,6 +51,7 @@ ListOfClosedServices=List of closed services
 ListOfRunningServices=List of running services
 NotActivatedServices=Inactive services (among validated contracts)
 BoardNotActivatedServices=Services to activate among validated contracts
+BoardNotActivatedServicesShort=Services to activate
 LastContracts=Latest %s contracts
 LastModifiedServices=Latest %s modified services
 ContractStartDate=Start date
@@ -64,7 +65,10 @@ DateStartRealShort=Real start date
 DateEndReal=Real end date
 DateEndRealShort=Real end date
 CloseService=Close service
-BoardRunningServices=Expired running services
+BoardRunningServices=Services running
+BoardRunningServicesShort=Services running
+BoardExpiredServices=Services expired
+BoardExpiredServicesShort=Services expired
 ServiceStatus=Status of service
 DraftContracts=Drafts contracts
 CloseRefusedBecauseOneServiceActive=Contract can't be closed as there is at least one open service on it
diff --git a/htdocs/langs/lo_LA/errors.lang b/htdocs/langs/lo_LA/errors.lang
index 1ee46fdbb92..0c07b2eafc4 100644
--- a/htdocs/langs/lo_LA/errors.lang
+++ b/htdocs/langs/lo_LA/errors.lang
@@ -218,6 +218,7 @@ ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text
 ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Error, delete payment linked to a closed invoice is not possible.
+ErrorSearchCriteriaTooSmall=Search criteria too small.
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 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/main.lang b/htdocs/langs/lo_LA/main.lang
index ded9062fdce..0c6c518fbc0 100644
--- a/htdocs/langs/lo_LA/main.lang
+++ b/htdocs/langs/lo_LA/main.lang
@@ -28,6 +28,7 @@ NoTemplateDefined=No template available for this email type
 AvailableVariables=Available substitution variables
 NoTranslation=No translation
 Translation=Translation
+EmptySearchString=Enter a non empty search string
 NoRecordFound=No record found
 NoRecordDeleted=No record deleted
 NotEnoughDataYet=Not enough data
@@ -704,6 +705,7 @@ DateOfSignature=Date of signature
 HidePassword=Show command with password hidden
 UnHidePassword=Show real command with clear password
 Root=Root
+RootOfMedias=Root of public medias (/medias)
 Informations=Information
 Page=Page
 Notes=Notes
@@ -981,3 +983,10 @@ PaymentInformation=Payment information
 ValidFrom=Valid from
 ValidUntil=Valid until
 NoRecordedUsers=No users
+ToClose=To close
+ToProcess=To process
+ToApprove=To approve
+GlobalOpenedElemView=Global view
+NoArticlesFoundForTheKeyword=No article found for the keyword '<strong>%s</strong>'
+NoArticlesFoundForTheCategory=No article found for the category
+ToAcceptRefuse=To accept | refuse
diff --git a/htdocs/langs/lo_LA/members.lang b/htdocs/langs/lo_LA/members.lang
index 4f6335ca347..f3beb23deef 100644
--- a/htdocs/langs/lo_LA/members.lang
+++ b/htdocs/langs/lo_LA/members.lang
@@ -29,6 +29,7 @@ MenuMembersUpToDate=Up to date members
 MenuMembersNotUpToDate=Out of date members
 MenuMembersResiliated=Terminated members
 MembersWithSubscriptionToReceive=Members with subscription to receive
+MembersWithSubscriptionToReceiveShort=Subscription to receive
 DateSubscription=Subscription date
 DateEndSubscription=Subscription end date
 EndSubscription=End subscription
diff --git a/htdocs/langs/lo_LA/projects.lang b/htdocs/langs/lo_LA/projects.lang
index 6a9835d9bae..9aa633860ac 100644
--- a/htdocs/langs/lo_LA/projects.lang
+++ b/htdocs/langs/lo_LA/projects.lang
@@ -76,7 +76,13 @@ MyProjects=My projects
 MyProjectsArea=My projects Area
 DurationEffective=Effective duration
 ProgressDeclared=Declared progress
+TaskProgressSummary=Task progress
+CurentlyOpenedTasks=Curently opened tasks
+TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared progress is less %s than the calculated progression
+TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared progress is more %s than the calculated progression
 ProgressCalculated=Calculated progress
+WhichIamLinkedTo=which I'm linked to
+WhichIamLinkedToProject=which I'm linked to project
 Time=Time
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
diff --git a/htdocs/langs/lo_LA/website.lang b/htdocs/langs/lo_LA/website.lang
index 0ee00aff7c0..9648ae48cc8 100644
--- a/htdocs/langs/lo_LA/website.lang
+++ b/htdocs/langs/lo_LA/website.lang
@@ -2,7 +2,7 @@
 Shortname=Code
 WebsiteSetupDesc=Create here the websites you wish to use. Then go into menu Websites to edit them.
 DeleteWebsite=Delete website
-ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed.
+ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed. The files uploaded (like into the medias directory, the ECM module, ...) will remain.
 WEBSITE_TYPE_CONTAINER=Type of page/container
 WEBSITE_PAGE_EXAMPLE=Web page to use as example
 WEBSITE_PAGENAME=Page name/alias
@@ -14,6 +14,9 @@ WEBSITE_JS_INLINE=Javascript file content (common to all pages)
 WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages)
 WEBSITE_ROBOT=Robot file (robots.txt)
 WEBSITE_HTACCESS=Website .htaccess file
+WEBSITE_MANIFEST_JSON=Website manifest.json file
+WEBSITE_README=README.md file
+EnterHereLicenseInformation=Enter here meta data or license information to fille a README.md file. if you distribute your website as a template, the file will be included into the temptate package.
 HtmlHeaderPage=HTML header (specific to this page only)
 PageNameAliasHelp=Name or alias of the page.<br>This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "<strong>%s</strong>" to edit this alias.
 EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container.
@@ -41,6 +44,7 @@ RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
 SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then set the name of the virtual host you have created in the properties of web site, so the preview can be done also using this dedicated web server access instead of the internal Dolibarr server.
 YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
 CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
 ReadPerm=Read
 WritePerm=Write
@@ -75,7 +79,8 @@ AddWebsiteAccount=Create web site account
 BackToListOfThirdParty=Back to list for Third Party
 DisableSiteFirst=Disable website first
 MyContainerTitle=My web site title
-AnotherContainer=Another container
+AnotherContainer=This is how to include content of another page/container (you may have an error here if you enable dynamic code because the embedded subcontainer may not exists)
+SorryWebsiteIsCurrentlyOffLine=Sorry, this website is currently off line. Please comme back later...
 WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / third party
 YouMustDefineTheHomePage=You must first define the default Home page
@@ -89,7 +94,8 @@ AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
 CorporateHomePage=Corporate Home page
 EmptyPage=Empty page
 ExternalURLMustStartWithHttp=External URL must start with http:// or https://
-ZipOfWebsitePackageToImport=Zip file of website package
+ZipOfWebsitePackageToImport=Upload the Zip file of the website template package
+ZipOfWebsitePackageToLoad=or Choose an available embedded website template package
 ShowSubcontainers=Include dynamic content
 InternalURLOfPage=Internal URL of page
 ThisPageIsTranslationOf=This page/container is a translation of
@@ -101,5 +107,10 @@ NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynam
 ReplaceWebsiteContent=Search or Replace website content
 DeleteAlsoJs=Delete also all javascript files specific to this website?
 DeleteAlsoMedias=Delete also all medias files specific to this website?
-# Export
 MyWebsitePages=My website pages
+SearchReplaceInto=Search | Replace into
+ReplaceString=New string
+CSSContentTooltipHelp=Enter here CSS content. To avoid any conflict with the CSS of the application, be sure to prepend all declaration with the .bodywebsite class. For example:<br><br>#mycssselector, input.myclass:hover { ... }<br>must be<br>.bodywebsite #mycssselector, .bodywebsite input.myclass:hover { ... }<br><br>Note: If you have a large file without this prefix, you can use 'lessc' to convert it to append the .bodywebsite prefix everywhere.
+LinkAndScriptsHereAreNotLoadedInEditor=Warning: This content is output only when site is accessed from a server. It is not used in Edit mode so if you need to load javascript files also in edit mode, just add your tag 'script src=...' into the page.
+Dynamiccontent=Sample of a page with dynamic content
+ImportSite=Import website template
diff --git a/htdocs/langs/lt_LT/admin.lang b/htdocs/langs/lt_LT/admin.lang
index f8f1ab31a6c..b83aa13ed10 100644
--- a/htdocs/langs/lt_LT/admin.lang
+++ b/htdocs/langs/lt_LT/admin.lang
@@ -400,6 +400,7 @@ OldVATRates=Senas PVM tarifas
 NewVATRates=Naujas PVM tarifas
 PriceBaseTypeToChange=Modifikuoti kainas su apibrėžta bazinės vertės nuoroda
 MassConvert=Launch bulk conversion
+PriceFormatInCurrentLanguage=Price Format In Current Language
 String=Serija
 TextLong=Ilgas tekstas
 HtmlText=Html text
@@ -431,7 +432,7 @@ ExtrafieldParamHelpradio=List of values must be lines with format key,value (whe
 ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- idfilter is necessarly a primary int key<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=List of values 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>Examples:<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
-ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default)<br>Set this to 2 for a collapsing separator (collapsed by default)
+ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Library used for PDF generation
 LocalTaxDesc=Some countries may apply two or three taxes on each invoice line. If this is the case, choose the type for the 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)
 SMS=SMS
@@ -1695,7 +1696,7 @@ SuppliersInvoiceNumberingModel=Vendor invoices numbering models
 IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=GeoIP MaxMind modulio nustatymas
-PathToGeoIPMaxmindCountryDataFile=Kelias iki failo, kuriame yra MaxMind IP į šalies kalbą. <br> Pavyzdžiai: <br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat
+PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoLite2-Country.mmdb
 NoteOnPathLocation=Atkreipkite dėmesį, kad Jūsų IP į šalies duomenų bylos turi būti viduje katalogo, kurį Jūsų PHP gali skaityti (Patikrinkite savo PHP open_basedir nustatymus ir failų sistemos leidimus).
 YouCanDownloadFreeDatFileTo=Galite atsisiųsti <b> MaxMind GeoIP šalies failo nemokamą demonstracinę versiją</b> į %s.
 YouCanDownloadAdvancedDatFileTo=Taip pat galite atsisiųsti <b>pilnesnę versiją su atnaujinimais,</b> MaxMind GeoIP šalies failą %s.
@@ -1926,14 +1927,13 @@ SmallerThan=Smaller than
 LargerThan=Larger than
 IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID is found into incoming email, the event will be automatically linked to the related objects.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
-IFTTTSetup=IFTTT module setup
-IFTTT_SERVICE_KEY=IFTTT Service key
-IFTTT_DOLIBARR_ENDPOINT_SECUREKEY=Security key to secure the endpoint URL used by IFTTT to send messages to your Dolibarr.
-IFTTTDesc=This module is designed to trigger events on IFTTT and/or to execute some action on external IFTTT triggers.
-UrlForIFTTT=URL endpoint for IFTTT
-YouWillFindItOnYourIFTTTAccount=You will find it on your IFTTT account
 EndPointFor=End point for %s : %s
 DeleteEmailCollector=Delete email collector
 ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
 RecipientEmailsWillBeReplacedWithThisValue=Recipient emails will be always replaced with this value
 AtLeastOneDefaultBankAccountMandatory=At least 1 default bank account must be defined
+RESTRICT_API_ON_IP=Allow available APIs to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can use the available APIs.
+RESTRICT_ON_IP=Allow access to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can access.
+BaseOnSabeDavVersion=Based on the library SabreDAV version
+NotAPublicIp=Not a public IP
+MakeAnonymousPing=Make an anonymous Ping '+1' to the Dolibarr foundation server (done 1 time only after installation) to allow the foundation to count the number of Dolibarr installation.
diff --git a/htdocs/langs/lt_LT/banks.lang b/htdocs/langs/lt_LT/banks.lang
index 5b61ca31201..4ea72a853c8 100644
--- a/htdocs/langs/lt_LT/banks.lang
+++ b/htdocs/langs/lt_LT/banks.lang
@@ -73,6 +73,7 @@ BankTransaction=Bank entry
 ListTransactions=List entries
 ListTransactionsByCategory=List entries/category
 TransactionsToConciliate=Entries to reconcile
+TransactionsToConciliateShort=To reconcile
 Conciliable=Gali būti suderintos
 Conciliate=Suderinti
 Conciliation=Suderinimas
@@ -116,6 +117,7 @@ DeleteCheckReceipt=Delete this check receipt?
 ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
 BankChecks=Banko čekiai
 BankChecksToReceipt=Checks awaiting deposit
+BankChecksToReceiptShort=Checks awaiting deposit
 ShowCheckReceipt=Rodyti čekio depozito kvitą
 NumberOfCheques=No. of check
 DeleteTransaction=Delete entry
diff --git a/htdocs/langs/lt_LT/cashdesk.lang b/htdocs/langs/lt_LT/cashdesk.lang
index 3b2261d50b9..8d9f31ced4f 100644
--- a/htdocs/langs/lt_LT/cashdesk.lang
+++ b/htdocs/langs/lt_LT/cashdesk.lang
@@ -62,6 +62,7 @@ TicketVatGrouped=Group VAT by rate in tickets
 AutoPrintTickets=Automatically print tickets
 EnableBarOrRestaurantFeatures=Enable features for Bar or Restaurant
 ConfirmDeletionOfThisPOSSale=Do your confirm the deletion of this current sale ?
+ConfirmDiscardOfThisPOSSale=Do you want to discard this current sale ?
 History=Istorija
 ValidateAndClose=Validate and close
 Terminal=Terminal
@@ -69,3 +70,8 @@ NumberOfTerminals=Number of Terminals
 TerminalSelect=Select terminal you want to use:
 POSTicket=POS Ticket
 BasicPhoneLayout=Use basic layout for phones
+SetupOfTerminalNotComplete=Setup of terminal %s is not complete
+DirectPayment=Direct payment
+DirectPaymentButton=Direct cash payment button
+InvoiceIsAlreadyValidated=Invoice is already validated
+NoLinesToBill=No lines to bill
diff --git a/htdocs/langs/lt_LT/companies.lang b/htdocs/langs/lt_LT/companies.lang
index 4272211bf31..f51be47507d 100644
--- a/htdocs/langs/lt_LT/companies.lang
+++ b/htdocs/langs/lt_LT/companies.lang
@@ -54,6 +54,7 @@ Firstname=Vardas
 PostOrFunction=Job position
 UserTitle=Pavadinimas
 NatureOfThirdParty=Nature of Third party
+NatureOfContact=Nature of Contact
 Address=Adresas
 State=Valstybė/Regionas
 StateShort=Būklė
diff --git a/htdocs/langs/lt_LT/contracts.lang b/htdocs/langs/lt_LT/contracts.lang
index 26d352d5d01..4c68846c6ba 100644
--- a/htdocs/langs/lt_LT/contracts.lang
+++ b/htdocs/langs/lt_LT/contracts.lang
@@ -51,6 +51,7 @@ ListOfClosedServices=Uždarytų paslaugų sąrašas
 ListOfRunningServices=Veikiančių paslaugų sąrašas
 NotActivatedServices=Neaktyvios paslaugos (tarp patvirtintų sutarčių)
 BoardNotActivatedServices=Paslaugos aktyvavimui iš patvirtintų sutarčių
+BoardNotActivatedServicesShort=Services to activate
 LastContracts=Latest %s contracts
 LastModifiedServices=Latest %s modified services
 ContractStartDate=Pradžios data
@@ -64,7 +65,10 @@ DateStartRealShort=Reali pradžios data
 DateEndReal=Reali pabaigos data
 DateEndRealShort=Reali pabaigos data
 CloseService=Uždaryti paslaugą
-BoardRunningServices=Pasibaigusios veikiančios paslaugos
+BoardRunningServices=Services running
+BoardRunningServicesShort=Services running
+BoardExpiredServices=Services expired
+BoardExpiredServicesShort=Services expired
 ServiceStatus=Paslaugos būklė
 DraftContracts=Sutarčių projektai
 CloseRefusedBecauseOneServiceActive=Contract can't be closed as there is at least one open service on it
diff --git a/htdocs/langs/lt_LT/errors.lang b/htdocs/langs/lt_LT/errors.lang
index d3fcc029198..34013d888ec 100644
--- a/htdocs/langs/lt_LT/errors.lang
+++ b/htdocs/langs/lt_LT/errors.lang
@@ -218,6 +218,7 @@ ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text
 ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Error, delete payment linked to a closed invoice is not possible.
+ErrorSearchCriteriaTooSmall=Search criteria too small.
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 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/main.lang b/htdocs/langs/lt_LT/main.lang
index 78e8ba8df8f..f6de9abe29d 100644
--- a/htdocs/langs/lt_LT/main.lang
+++ b/htdocs/langs/lt_LT/main.lang
@@ -28,6 +28,7 @@ NoTemplateDefined=No template available for this email type
 AvailableVariables=Available substitution variables
 NoTranslation=Nėra vertimo
 Translation=Vertimas
+EmptySearchString=Enter a non empty search string
 NoRecordFound=Įrašų nerasta
 NoRecordDeleted=No record deleted
 NotEnoughDataYet=Not enough data
@@ -704,6 +705,7 @@ DateOfSignature=Date of signature
 HidePassword=Rodyti komandą su paslėptu slaptažodžiu
 UnHidePassword=Rodyti realią komandą su aiškiu slaptažodžiu
 Root=Pagrindinis (root)
+RootOfMedias=Root of public medias (/medias)
 Informations=Informacija
 Page=Puslapis
 Notes=Pastabos
@@ -981,3 +983,10 @@ PaymentInformation=Payment information
 ValidFrom=Valid from
 ValidUntil=Valid until
 NoRecordedUsers=No users
+ToClose=To close
+ToProcess=Apdoroti
+ToApprove=To approve
+GlobalOpenedElemView=Global view
+NoArticlesFoundForTheKeyword=No article found for the keyword '<strong>%s</strong>'
+NoArticlesFoundForTheCategory=No article found for the category
+ToAcceptRefuse=To accept | refuse
diff --git a/htdocs/langs/lt_LT/members.lang b/htdocs/langs/lt_LT/members.lang
index 71b8df4a92b..71838d720d7 100644
--- a/htdocs/langs/lt_LT/members.lang
+++ b/htdocs/langs/lt_LT/members.lang
@@ -29,6 +29,7 @@ MenuMembersUpToDate=Atnaujinti nariai
 MenuMembersNotUpToDate=Pasenę nariai
 MenuMembersResiliated=Terminated members
 MembersWithSubscriptionToReceive=Nariai, kurių pasirašymą reikia gauti
+MembersWithSubscriptionToReceiveShort=Subscription to receive
 DateSubscription=Pasirašymo data
 DateEndSubscription=Pasirašymo pabaigos data
 EndSubscription=Pasirašymo pabaiga
diff --git a/htdocs/langs/lt_LT/projects.lang b/htdocs/langs/lt_LT/projects.lang
index cba1bf3c405..126b855121b 100644
--- a/htdocs/langs/lt_LT/projects.lang
+++ b/htdocs/langs/lt_LT/projects.lang
@@ -76,7 +76,13 @@ MyProjects=Mano projektai
 MyProjectsArea=My projects Area
 DurationEffective=Efektyvi trukmė
 ProgressDeclared=Paskelbta pažanga
+TaskProgressSummary=Task progress
+CurentlyOpenedTasks=Curently opened tasks
+TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared progress is less %s than the calculated progression
+TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared progress is more %s than the calculated progression
 ProgressCalculated=Apskaičiuota pažanga
+WhichIamLinkedTo=which I'm linked to
+WhichIamLinkedToProject=which I'm linked to project
 Time=Laikas
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
diff --git a/htdocs/langs/lt_LT/website.lang b/htdocs/langs/lt_LT/website.lang
index 61265c3251d..6aa35b00e76 100644
--- a/htdocs/langs/lt_LT/website.lang
+++ b/htdocs/langs/lt_LT/website.lang
@@ -2,7 +2,7 @@
 Shortname=Kodas
 WebsiteSetupDesc=Create here the websites you wish to use. Then go into menu Websites to edit them.
 DeleteWebsite=Delete website
-ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed.
+ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed. The files uploaded (like into the medias directory, the ECM module, ...) will remain.
 WEBSITE_TYPE_CONTAINER=Type of page/container
 WEBSITE_PAGE_EXAMPLE=Web page to use as example
 WEBSITE_PAGENAME=Page name/alias
@@ -14,6 +14,9 @@ WEBSITE_JS_INLINE=Javascript file content (common to all pages)
 WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages)
 WEBSITE_ROBOT=Robot file (robots.txt)
 WEBSITE_HTACCESS=Website .htaccess file
+WEBSITE_MANIFEST_JSON=Website manifest.json file
+WEBSITE_README=README.md file
+EnterHereLicenseInformation=Enter here meta data or license information to fille a README.md file. if you distribute your website as a template, the file will be included into the temptate package.
 HtmlHeaderPage=HTML header (specific to this page only)
 PageNameAliasHelp=Name or alias of the page.<br>This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "<strong>%s</strong>" to edit this alias.
 EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container.
@@ -41,6 +44,7 @@ RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
 SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then set the name of the virtual host you have created in the properties of web site, so the preview can be done also using this dedicated web server access instead of the internal Dolibarr server.
 YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
 CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
 ReadPerm=Skaityti
 WritePerm=Write
@@ -75,7 +79,8 @@ AddWebsiteAccount=Create web site account
 BackToListOfThirdParty=Back to list for Third Party
 DisableSiteFirst=Disable website first
 MyContainerTitle=My web site title
-AnotherContainer=Another container
+AnotherContainer=This is how to include content of another page/container (you may have an error here if you enable dynamic code because the embedded subcontainer may not exists)
+SorryWebsiteIsCurrentlyOffLine=Sorry, this website is currently off line. Please comme back later...
 WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / third party
 YouMustDefineTheHomePage=You must first define the default Home page
@@ -89,7 +94,8 @@ AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
 CorporateHomePage=Corporate Home page
 EmptyPage=Empty page
 ExternalURLMustStartWithHttp=External URL must start with http:// or https://
-ZipOfWebsitePackageToImport=Zip file of website package
+ZipOfWebsitePackageToImport=Upload the Zip file of the website template package
+ZipOfWebsitePackageToLoad=or Choose an available embedded website template package
 ShowSubcontainers=Include dynamic content
 InternalURLOfPage=Internal URL of page
 ThisPageIsTranslationOf=This page/container is a translation of
@@ -101,5 +107,10 @@ NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynam
 ReplaceWebsiteContent=Search or Replace website content
 DeleteAlsoJs=Delete also all javascript files specific to this website?
 DeleteAlsoMedias=Delete also all medias files specific to this website?
-# Export
 MyWebsitePages=My website pages
+SearchReplaceInto=Search | Replace into
+ReplaceString=New string
+CSSContentTooltipHelp=Enter here CSS content. To avoid any conflict with the CSS of the application, be sure to prepend all declaration with the .bodywebsite class. For example:<br><br>#mycssselector, input.myclass:hover { ... }<br>must be<br>.bodywebsite #mycssselector, .bodywebsite input.myclass:hover { ... }<br><br>Note: If you have a large file without this prefix, you can use 'lessc' to convert it to append the .bodywebsite prefix everywhere.
+LinkAndScriptsHereAreNotLoadedInEditor=Warning: This content is output only when site is accessed from a server. It is not used in Edit mode so if you need to load javascript files also in edit mode, just add your tag 'script src=...' into the page.
+Dynamiccontent=Sample of a page with dynamic content
+ImportSite=Import website template
diff --git a/htdocs/langs/lv_LV/accountancy.lang b/htdocs/langs/lv_LV/accountancy.lang
index cd7a3f66474..9d5ece64725 100644
--- a/htdocs/langs/lv_LV/accountancy.lang
+++ b/htdocs/langs/lv_LV/accountancy.lang
@@ -226,8 +226,8 @@ Pcgtype=Kontu grupa
 Pcgsubtype=Konta apakšgrupa
 PcgtypeDesc=Kontu grupa un apakšgrupa tiek izmantota kā iepriekš definēts "filtru" un "grupēšanas" kritērijs dažiem grāmatvedības pārskatiem. Piemēram, "ienākumi" vai "IZDEVUMI" tiek izmantoti kā produktu grāmatvedības kontu grupas, lai izveidotu izdevumu / ienākumu pārskatu.
 
-TotalVente=Total turnover before tax
-TotalMarge=Total sales margin
+TotalVente=Kopējais apgrozījums pirms nodokļu nomaksas
+TotalMarge=Kopējā pārdošanas starpība
 
 DescVentilCustomer=Aplūkojiet šeit klienta rēķina līniju sarakstu, kas saistītas (vai nav) ar produktu grāmatvedības kontu
 DescVentilMore=Vairumā gadījumu, ja jūs izmantojat iepriekš definētus produktus vai pakalpojumus, un produkta / pakalpojuma kartē norādiet konta numuru, programma varēs veikt visu saistību starp jūsu rēķina līnijām un jūsu kontu plāna grāmatvedības kontu, tikai vienu klikšķi, izmantojot pogu <strong> "%s" </ strong>. Ja konts nav iestatīts uz produktu / pakalpojumu kartēm vai ja jums joprojām ir dažas līnijas, kurām nav saistības ar kontu, izvēlnē "<strong> %s </ strong>" būs jāveic manuāla piesaistīšana.
@@ -242,7 +242,7 @@ DescVentilExpenseReport=Konsultējieties šeit ar izdevumu pārskatu rindiņu sa
 DescVentilExpenseReportMore=Ja jūs izveidojat grāmatvedības kontu uz izdevumu pārskata rindiņu veida, programma varēs visu saistību starp jūsu rēķina pārskatu rindiņām un jūsu kontu diagrammas grāmatvedības kontu veikt tikai ar vienu klikšķi, izmantojot pogu <strong> "%s" </ strong>. Ja kontam nav iestatīta maksu vārdnīca vai ja jums joprojām ir dažas rindiņas, kurām nav saistības ar kādu kontu, izvēlnē "<strong> %s </ strong>" būs jāveic manuāla piesaistīšana.
 DescVentilDoneExpenseReport=Konsultējieties šeit ar izdevumu pārskatu rindu sarakstu un to maksu grāmatvedības kontu
 
-ValidateHistory=Bind automātiski
+ValidateHistory=Piesaistiet automātiski
 AutomaticBindingDone=Automātiskā piesaistīšana pabeigta
 
 ErrorAccountancyCodeIsAlreadyUse=Kļūda, nevarat izdzēst šo grāmatvedības kontu, jo tas tiek izmantots
@@ -265,7 +265,7 @@ AccountingJournals=Grāmatvedības žurnāli
 AccountingJournal=Grāmatvedības žurnāls
 NewAccountingJournal=Jauns grāmatvedības žurnāls
 ShowAccoutingJournal=Rādīt grāmatvedības žurnālu
-NatureOfJournal=Nature of Journal
+NatureOfJournal=Žurnāla raksturs
 AccountingJournalType1=Dažādas darbības
 AccountingJournalType2=Pārdošanas
 AccountingJournalType3=Pirkumi
@@ -291,7 +291,7 @@ Modelcsv_quadratus=Eksportēt Quadratus QuadraCompta
 Modelcsv_ebp=Eksportēt uz EBP
 Modelcsv_cogilog=Eksportēt uz Cogilog
 Modelcsv_agiris=Eksports uz Agiris
-Modelcsv_LDCompta=Export for LD Compta (v9 & higher) (Test)
+Modelcsv_LDCompta=Eksports LD Compta (v9 un jaunākiem) (pārbaude)
 Modelcsv_openconcerto=Eksportēt OpenConcerto (tests)
 Modelcsv_configurable=Eksportēt CSV konfigurējamu
 Modelcsv_FEC=Eksporta FEC
@@ -302,7 +302,7 @@ ChartofaccountsId=Kontu konts. Id
 InitAccountancy=Init grāmatvedība
 InitAccountancyDesc=Šo lapu var izmantot, lai inicializētu grāmatvedības kontu par produktiem un pakalpojumiem, kuriem nav noteikts grāmatvedības konts pārdošanai un pirkumiem.
 DefaultBindingDesc=Šo lapu var izmantot, lai iestatītu noklusēto kontu, ko izmantot, lai saistītu darījumu protokolu par algas, ziedojumiem, nodokļiem un PVN, ja neviens konkrēts grāmatvedības konts jau nav iestatīts.
-DefaultClosureDesc=This page can be used to set parameters used for accounting closures.
+DefaultClosureDesc=Šo lapu var izmantot, lai iestatītu parametrus, ko izmanto grāmatvedības slēgšanai.
 Options=Iespējas
 OptionModeProductSell=Mode pārdošana
 OptionModeProductSellIntra=Pārdošanas veids, ko eksportē EEK
@@ -324,7 +324,7 @@ SaleExport=Eksporta pārdošana
 SaleEEC=Pārdošana EEK
 
 ## Dictionary
-Range=Range of accounting account
+Range=Grāmatvedības konta diapazons
 Calculated=Aprēķināts
 Formula=Formula
 
diff --git a/htdocs/langs/lv_LV/admin.lang b/htdocs/langs/lv_LV/admin.lang
index 7eddfe886cf..c6858522a54 100644
--- a/htdocs/langs/lv_LV/admin.lang
+++ b/htdocs/langs/lv_LV/admin.lang
@@ -400,6 +400,7 @@ OldVATRates=Vecā PVN likme
 NewVATRates=Jaunā PVN likme
 PriceBaseTypeToChange=Pārveidot par cenām ar bāzes atsauces vērtību, kas definēta tālāk
 MassConvert=Uzsākt lielapjoma reklāmguvumu
+PriceFormatInCurrentLanguage=Cenas formāts pašreizējā valodā
 String=Rinda
 TextLong=Garš teksts
 HtmlText=Html teksts
@@ -431,7 +432,7 @@ ExtrafieldParamHelpradio=Vērtību sarakstam jābūt rindām ar formāta atslēg
 ExtrafieldParamHelpsellist=Vērtību saraksts nāk no tabulas <br> Sintakse: table_name: label_field: id_field :: filtrs <br> piemērs: c_typent: libelle: id :: filtrs <br> <br> - idfilter ir obligāti primārs int key | - filtrs var būt vienkāršs tests (piemēram, aktīvs = 1), lai parādītu tikai aktīvo vērtību <br> filtru raganā var izmantot arī $ ID $, kas ir pašreizējā objekta pašreizējais ID. $ <br>, ja vēlaties filtrēt uz ekrāna, izmantojiet sintaksi extra.fieldcode = ... (ja lauka kods ir extrafield kods) <br> <br> Lai saraksts būtu atkarīgs no cita papildu atribūtu saraksta: < br> c_typent: libelle: id: options_ <i> vecāku_list_code </i> | vecāku_krāsa: filtrs <br> <br> Lai iegūtu sarakstu atkarībā no cita saraksta: <br> c_typent: libelle: id: <i> parent_list_code </i> | vecāku_ sleja: filtrs
 ExtrafieldParamHelpchkbxlst=Vērtību saraksts nāk no tabulas <br> Sintakse: table_name: label_field: id_field :: filtrs <br> piemērs: c_typent: libelle: id :: filtrs <br> <br> filtrs var būt vienkāršs tests (piemēram, aktīvs = 1 ), lai parādītu tikai aktīvo vērtību <br> Jūs varat arī izmantot $ ID $ filtru raganā, kas ir pašreizējā objekta pašreizējais ID <br> Lai SELECT veiktu filtru, izmantojiet $ SEL $ <br>, ja vēlaties filtrēt uz ekrāna. syntax extra.fieldcode = ... (ja lauka kods ir extrafield kods) <br> <br> Lai iegūtu sarakstu atkarībā no cita papildu atribūtu saraksta: <br> c_typent: libelle: id: options_ <i> parent_list_code </i> | vecāku_krāsa: filtrs <br> <br> Lai iegūtu sarakstu atkarībā no cita saraksta: <br> c_typent: libelle: id: <i> vecāku saraksts_code </i> | vecāku_ sleja: filtrs
 ExtrafieldParamHelplink=Parametriem jābūt ObjectName: Classpath <br> Syntax: ObjectName: Classpath <br> Piemēri: <br> Societe: societe / class / societe.class.php <br> Kontakti: contact / class / contact.class.php
-ExtrafieldParamHelpSeparator=Vienkāršam atdalītājam jāglabā tukšs <br> Iestatiet to uz 1, lai atdalītu atdalītāju (atvērts pēc noklusējuma) <br> Iestatiet to uz 2, lai atdalītu atdalītāju (noklusēts pēc noklusējuma)
+ExtrafieldParamHelpSeparator=Vienkārša atdalītāja atstāšana tukša <br> Iestatiet to uz 1 sabrūkošajam atdalītājam (pēc noklusējuma atveriet jaunu sesiju, pēc tam katras lietotāja sesijai tiek saglabāts statuss) <br> Iestatiet to uz 2 sabrukušajam atdalītājam (jaunajai sesijai pēc noklusējuma sabrūk, pēc tam katras lietotāja sesijas laikā tiek saglabāts statuss)
 LibraryToBuildPDF=Bibliotēka, ko izmanto PDF veidošanai
 LocalTaxDesc=Dažas valstis var piemērot divus vai trīs nodokļus katrā rēķina rindā. Šādā gadījumā izvēlieties otrā un trešā nodokļa veidu un likmi. Iespējamie veidi ir: <br> 1: vietējais nodoklis attiecas uz produktiem un pakalpojumiem bez tvertnes (localtax tiek aprēķināts bez nodokļa) <br> 2: vietējie nodokļi attiecas uz produktiem un pakalpojumiem, ieskaitot vat (localtax tiek aprēķināta pēc summas + galvenais nodoklis) ) <br> 3: vietējie nodokļi attiecas uz produktiem bez cisternām (localtax tiek aprēķināta bez nodokļa) <br> 4: vietējie nodokļi attiecas uz produktiem, ieskaitot tvertni (localtax tiek aprēķināta pēc summas + galvenā tvertne) <br> 5: vietējais nodoklis, ko piemēro par pakalpojumiem bez vat (vietējais maksājums tiek aprēķināts bez nodokļa) <br> 6: vietējiem nodokļiem, kas attiecas uz pakalpojumiem, ieskaitot mucu (vietējais maksājums tiek aprēķināts pēc summas + nodokļa)
 SMS=SMS
@@ -574,7 +575,7 @@ Module510Name=Algas
 Module510Desc=Ierakstiet un sekojiet darbinieku maksājumiem
 Module520Name=Aizdevumi
 Module520Desc=Aizdevumu vadība
-Module600Name=Notifications on business event
+Module600Name=Paziņojumi par biznesa notikumu
 Module600Desc=Sūtiet e-pasta paziņojumus, ko izraisījis uzņēmuma notikums: katram lietotājam (iestatījums ir noteikts katram lietotājam), katram trešās puses kontaktpersonai (iestatīšana noteikta katrai trešajai pusei) vai konkrētiem e-pasta ziņojumiem
 Module600Long=Ņemiet vērā, ka šis modulis sūta e-pastus reālā laikā, kad notiek konkrēts biznesa notikums. Ja meklējat iespēju nosūtīt e-pasta atgādinājumus par dienas kārtības notikumiem, dodieties uz moduļa Agenda uzstādīšanu.
 Module610Name=Produkta varianti
@@ -878,7 +879,7 @@ Permission2403=Dzēst darbības (pasākumi vai uzdevumi), kas saistīti ar viņa
 Permission2411=Lasīt darbības (pasākumi vai uzdevumi) par citiem
 Permission2412=Izveidot / mainīt darbības (pasākumi vai uzdevumi), kas citiem
 Permission2413=Dzēst darbības (pasākumi vai uzdevumi), kas citiem
-Permission2414=Export actions/tasks of others
+Permission2414=Eksportēt citu darbības/uzdevumus
 Permission2501=Skatīt/Lejupielādēt dokumentus
 Permission2502=Lejupielādēt dokumentu
 Permission2503=Pievienot vai dzēst dokumentus
@@ -1137,7 +1138,7 @@ MAIN_MAX_DECIMALS_TOT=Maks. decimāldaļas kopējai cenai
 MAIN_MAX_DECIMALS_SHOWN=Maks. decimāldaļas cenām <b>parādītas ekrānā</b>. Pēc šī parametra pievienojiet daudzpunktes <b> ... </b> (piemēram, "2 ..."), ja vēlaties, lai "<b> ... </b>" tiktu pievienota samazinātai cenai.
 MAIN_ROUNDING_RULE_TOT=Noapaļošanas posma posms (valstīm, kurās noapaļošana notiek ar kaut ko citu, nevis 10. pamatu. Piemēram, ievietojiet 0,05, ja noapaļošana tiek veikta ar 0,05 soļiem)
 UnitPriceOfProduct=Neto vienības produkta cena
-TotalPriceAfterRounding=Kopējā cena (bez PVN / nodokļa) pēc noapaļošanas
+TotalPriceAfterRounding=Kopējā cena (bez PVN/ ar nodokļiem) pēc noapaļošanas
 ParameterActiveForNextInputOnly=Parametrs stājas spēkā no nākamās ievades
 NoEventOrNoAuditSetup=Drošības notikums nav reģistrēts. Tas ir normāli, ja lapa "Iestatīšana - Drošība - Notikumi" nav iespējota.
 NoEventFoundWithCriteria=Šim meklēšanas kritērijam nav atrasts neviens drošības notikums.
@@ -1155,7 +1156,7 @@ RestoreMySQL=MySQL imports
 ForcedToByAModule= Šis noteikums ir spiests <b>%s</b> ar aktivēto modulis
 PreviousDumpFiles=Esošie rezerves kopiju faili
 WeekStartOnDay=Nedēļas pirmā diena
-RunningUpdateProcessMayBeRequired=Šķiet, ka nepieciešams veikt jaunināšanas procesu (programmas versija %s atšķiras no datu bāzes versijas %s)
+RunningUpdateProcessMayBeRequired=Šķiet, ka nepieciešams veikt atjaunināšanas procesu (programmas versija %s atšķiras no datu bāzes versijas %s)
 YouMustRunCommandFromCommandLineAfterLoginToUser=Jums ir palaist šo komandu no komandrindas pēc pieteikšanās uz apvalks ar lietotāju <b>%s,</b> vai jums ir pievienot-W iespēju beigās komandrindas, lai sniegtu <b>%s</b> paroli.
 YourPHPDoesNotHaveSSLSupport=SSL funkcijas, kas nav pieejama jūsu PHP
 DownloadMoreSkins=Vairāki izskati lejupielādei
@@ -1193,10 +1194,10 @@ ExtraFieldsSupplierOrders=Papildinošas atribūti (rīkojumi)
 ExtraFieldsSupplierInvoices=Papildinošas atribūti (rēķini)
 ExtraFieldsProject=Papildinošas atribūti (projekti)
 ExtraFieldsProjectTask=Papildinošas atribūti (uzdevumi)
-ExtraFieldsSalaries=Complementary attributes (salaries)
+ExtraFieldsSalaries=Papildu atribūti (algas)
 ExtraFieldHasWrongValue=Parametram %s ir nepareiza vērtība.
 AlphaNumOnlyLowerCharsAndNoSpace=only alphanumericals and lower case characters without space
-SendmailOptionNotComplete=Brīdinājums, par dažiem Linux sistēmām, lai nosūtītu e-pastu no jūsu e-pastu, sendmail izpilde uzstādīšana ir iekļauti variants-ba (parametrs mail.force_extra_parameters savā php.ini failā). Ja daži saņēmēji nekad saņemt e-pastus, mēģina labot šo PHP parametru ar mail.force_extra_parameters =-BA).
+SendmailOptionNotComplete=Brīdinājums, dažām Linux sistēmām, lai nosūtītu e-pastu no jūsu e-pasta, sendmail izpildes iestatījumiem ir jāiekļauj parametrs -ba (parametrs mail.force_extra_parameters Jūsu php.ini failā). Ja daži saņēmēji nekad saņem e-pastus, mēģiniet labot šo PHP parametru ar mail.force_extra_parameters =-ba).
 PathToDocuments=Ceļš līdz dokumentiem
 PathDirectory=Katalogs
 SendmailOptionMayHurtBuggedMTA=Funkcija sūtīt vēstules, izmantojot metodi "PHP mail direct", ģenerēs pasta ziņojumu, kuru daži saņēmēji pasta serveri var nepareizi parsēt. Rezultāts ir tāds, ka atsevišķas vēstules nevar lasīt cilvēki, kurus ved uz šīm bugged platformām. Tas attiecas uz dažiem interneta pakalpojumu sniedzējiem (piem., Orange Francijā). Šī nav problēma ar Dolibarr vai PHP, bet ar saņēmēja pasta serveri. Tomēr, lai izvairītos no tā, var pievienot opciju MAIN_FIX_FOR_BUGGED_MTA līdz 1 iestatījumos - Citi, lai modificētu Dolibarr. Tomēr jums var rasties problēmas ar citiem serveriem, kas stingri izmanto SMTP standartu. Cits risinājums (ieteicams) ir izmantot metodi "SMTP ligzdu bibliotēka", kurai nav trūkumu.
@@ -1221,14 +1222,14 @@ SuhosinSessionEncrypt=Sesija uzglabāšana šifrēta ar Suhosin
 ConditionIsCurrently=Stāvoklis šobrīd ir %s
 YouUseBestDriver=Jūs izmantojat draiveri %s, kas ir labākais šobrīd pieejams draiveris.
 YouDoNotUseBestDriver=Jūs izmantojat draiveri %s, bet ieteicams ir %s.
-NbOfObjectIsLowerThanNoPb=You have only %s %s in the database. This does not require any particular optimization.
+NbOfObjectIsLowerThanNoPb=Jums datu bāzē ir tikai %s %s. Tam nav nepieciešama īpaša optimizācija.
 SearchOptim=Meklēšanas optimizācija
-YouHaveXObjectUseSearchOptim=You have %s %s in the database. You should add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
-YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to 1 in Home-Setup-Other.
+YouHaveXObjectUseSearchOptim=Jums datu bāzē ir %s %s. Jums konstante %s jāpievieno vienumam mapē Mājas iestatīšana-Cits. Ierobežojiet meklēšanu līdz virkņu sākumam, kas datu bāzei ļauj izmantot indeksus, un jums vajadzētu saņemt tūlītēju atbildi.
+YouHaveXObjectAndSearchOptimOn=Jums datu bāzē ir %s %s, un konstante %s mapē Mājas iestatīšana ir iestatīta uz 1.
 BrowserIsOK=Jūs izmantojat tīmekļa pārlūku %s. Šī pārlūkprogramma ir droša un ātrdarbīgs.
 BrowserIsKO=Jūs izmantojat tīmekļa pārlūku %s. Šī pārlūka informācija ir slikta izvēle drošībai, veiktspējai un uzticamībai. Mēs iesakām izmantot Firefox, Chrome, Opera vai Safari.
-PHPModuleLoaded=PHP component %s is loaded
-PreloadOPCode=Preloaded OPCode is used
+PHPModuleLoaded=Tiek ielādēts PHP komponents %s
+PreloadOPCode=Tiek izmantots iepriekš ielādēts OPCode
 AddRefInList=Rādīt klientu / pārdevēju ref. info saraksts (atlasiet sarakstu vai kombinēto) un lielākā daļa hipersaites. <br> Trešās puses parādīsies ar nosaukumu "CC12345 - SC45678 - Lielais uzņēmums". "Lielā uzņēmuma korpuss" vietā.
 AddAdressInList=Rādīt klienta / pārdevēja adrešu sarakstu (izvēlieties sarakstu vai kombināciju) <br> Trešās puses parādīsies ar nosaukumu "Lielās kompānijas korpuss - 21 lēkt iela 123456", nevis "Lielā uzņēmuma korpuss".
 AskForPreferredShippingMethod=Pieprasiet vēlamo piegādes metodi trešajām pusēm.
@@ -1456,7 +1457,7 @@ LDAPFieldEndLastSubscription=Datums, kad parakstīšanās beigu
 LDAPFieldTitle=Ieņemamais amats
 LDAPFieldTitleExample=Piemērs: virsraksts
 LDAPSetupNotComplete=LDAP uzstādīšana nav pilnīga (doties uz citām cilnēm)
-LDAPNoUserOrPasswordProvidedAccessIsReadOnly=Nav administrators vai parole sniegta. LDAP pieeja būs anonīmi un tikai lasīšanas režīmā.
+LDAPNoUserOrPasswordProvidedAccessIsReadOnly=Nav administratora parole. LDAP pieeja būs anonīmi un tikai lasīšanas režīmā.
 LDAPDescContact=Šī lapa ļauj definēt LDAP atribūti vārdu LDAP kokā uz katru datiem, uz Dolibarr kontaktiem.
 LDAPDescUsers=Šī lapa ļauj definēt LDAP atribūti vārdu LDAP kokā uz katru datiem, uz Dolibarr lietotājiem.
 LDAPDescGroups=Šī lapa ļauj definēt LDAP atribūti vārdu LDAP kokā uz katru datiem, uz Dolibarr grupām.
@@ -1558,8 +1559,8 @@ FixedEmailTarget=Saņēmējs
 ##### Sendings #####
 SendingsSetup=Piegādes moduļa iestatīšana
 SendingsReceiptModel=Nosūtot saņemšanas modeli
-SendingsNumberingModules=Sendings numerācijas moduļus
-SendingsAbility=Support shipping sheets for customer deliveries
+SendingsNumberingModules=Nosūtīšanas numerācijas moduļi
+SendingsAbility=Atbalsta piegādes lapas klientu piegādēm
 NoNeedForDeliveryReceipts=Lielākajā daļā gadījumu piegādes lapas tiek izmantotas gan kā klientu pasūtījumu lapas (nosūtāmo produktu saraksts), gan arī klienta saņemtas un parakstītas lapas. Tādējādi produktu piegādes kvīts ir dublēta funkcija un reti tiek aktivizēta.
 FreeLegalTextOnShippings=Brīvais teksts piegādēs
 ##### Deliveries #####
@@ -1590,7 +1591,7 @@ MenuHandler=Izvēlnes apstrādātājs
 MenuModule=Avota modulis
 HideUnauthorizedMenu= Slēpt neatļautās izvēlnes (pelēkas)
 DetailId=Id izvēlne
-DetailMenuHandler=Izvēlne kopējs, kur rādīt jaunu ēdienkarti
+DetailMenuHandler=Izvēlne administrators, kur rādīt jaunu izvēlni
 DetailMenuModule=Moduļa nosaukums, ja izvēlnes ierakstam nāk no moduļa
 DetailType=Izvēlnes veids (augšā vai pa kreisi)
 DetailTitre=Izvēlne etiķete vai etiķete kods tulkošanai
@@ -1614,7 +1615,7 @@ OptionVATDebitOption=Uzkrājumu princips
 OptionVatDefaultDesc=PVN ir jāmaksā: <br> - par preču piegādi (pamatojoties uz rēķina datumu) <br> - par maksājumiem par pakalpojumiem
 OptionVatDebitOptionDesc=PVN ir jāmaksā: <br> - par preču piegādi (pamatojoties uz faktūrrēķina datumu) <br> - par rēķinu (debeta) par pakalpojumiem
 OptionPaymentForProductAndServices=Naudas bāze produktiem un pakalpojumiem
-OptionPaymentForProductAndServicesDesc=PVN ir jāmaksā: <br> - par samaksu par precēm <br> - par maksājumiem par pakalpojumiem
+OptionPaymentForProductAndServicesDesc=PVN ir jāmaksā: <br> - par precēm <br> - par maksājumiem par pakalpojumiem
 SummaryOfVatExigibilityUsedByDefault=PVN piemērošanas laiks pēc noklusējuma saskaņā ar izvēlēto iespēju:
 OnDelivery=Piegādes brīdī
 OnPayment=Par samaksu
@@ -1678,7 +1679,7 @@ ApiKey=Key for API
 WarningAPIExplorerDisabled=API pētnieks ir atspējots. API pētnieks nav pienākums sniegt API pakalpojumus. Tas ir līdzeklis izstrādātājam, lai atrastu / pārbaudītu REST API. Ja jums ir nepieciešams šis rīks, dodieties uz moduļa API REST iestatīšanu, lai to aktivizētu.
 ##### Bank #####
 BankSetupModule=Bankas moduļa uzstādīšana
-FreeLegalTextOnChequeReceipts=Bezmaksas teksts čeku čekos
+FreeLegalTextOnChequeReceipts=Brīvais teksts čekos
 BankOrderShow=Displejs secībā bankas kontu valstīm, izmantojot "sīki bankas numurs"
 BankOrderGlobal=Vispārējs
 BankOrderGlobalDesc=Vispārējā displejs rīkojums
@@ -1695,7 +1696,7 @@ SuppliersInvoiceNumberingModel=Pārdevēja rēķinu numerācijas modeļi
 IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=GeoIP MaxMind moduļa iestatīšana
-PathToGeoIPMaxmindCountryDataFile=Ceļš uz failu, kas satur MaxMind ip uz valsti tulkojumu. <br> Piemēri: <br> / Usr / local / share / GeoIP / GeoIP.dat <br> / Usr / share / GeoIP / GeoIP.dat
+PathToGeoIPMaxmindCountryDataFile=Ceļš uz failu, kas satur Maxmind ip tulkojumu uz valsti. <br> Piemēri: <br> /usr/local/share/GeoIP/GeoIP.dat <br> /usr/share/GeoIP/GeoIP.dat <br> /usr/share/GeoIP/GeoLite2-Country.mmdb
 NoteOnPathLocation=Ņemiet vērā, ka jūsu ip uz valsts datu failā jābūt iekšā direktoriju jūsu PHP var lasīt (uz Jūsu PHP open_basedir iestatīšanu un filesystem atļaujas).
 YouCanDownloadFreeDatFileTo=Jūs varat lejupielādēt <b>bezmaksas demo versiju</b> MaxMind GeoIP valsts failu no %s.
 YouCanDownloadAdvancedDatFileTo=Jūs varat arī lejupielādēt <b>pilnīgāku versiju, ar jaunumiem,</b> no MaxMind GeoIP valsts failu no %s.
@@ -1736,9 +1737,9 @@ ExpenseReportsRulesSetup=Moduļa Expense Reports iestatīšana - noteikumi
 ExpenseReportNumberingModules=Izdevumu pārskatu numerācijas modulis
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
 YouMayFindNotificationsFeaturesIntoModuleNotification=Varat atrast e-pasta paziņojumu iespējas, iespējot un konfigurējot moduli "Paziņošana".
-ListOfNotificationsPerUser=List of automatic notifications per user*
-ListOfNotificationsPerUserOrContact=List of possible automatic notifications (on business event) available per user* or per contact**
-ListOfFixedNotifications=List of automatic fixed notifications
+ListOfNotificationsPerUser=Automātisko paziņojumu saraksts katram lietotājam*
+ListOfNotificationsPerUserOrContact=Iespējamo automātisko paziņojumu (par biznesa notikumu) saraksts, kas pieejams katram lietotājam* vai kontaktam**
+ListOfFixedNotifications=Automātisko fiksēto paziņojumu saraksts
 GoOntoUserCardToAddMore=Atveriet lietotāja cilni "Paziņojumi", lai pievienotu vai noņemtu paziņojumus lietotājiem
 GoOntoContactCardToAddMore=Atveriet trešās personas cilni "Paziņojumi", lai pievienotu vai noņemtu paziņojumus par kontaktpersonām / adresēm
 Threshold=Slieksnis
@@ -1804,7 +1805,7 @@ ExampleOfNewsMessageForMaintenanceRelease=Ir pieejams Dolibarr ERP & CRM %s. Ver
 MultiPriceRuleDesc=Ja ir iespējota opcija "Vairāki cenu līmeņi uz produktu / pakalpojumu", katram produktam varat noteikt dažādas cenas (vienu cenu līmenī). Lai ietaupītu laiku, šeit jūs varat ievadīt noteikumu, lai automātiski aprēķinātu cenu katram līmenim, pamatojoties uz pirmā līmeņa cenu, tāpēc katram produktam būs jāievada tikai pirmā līmeņa cena. Šī lapa ir izstrādāta, lai ietaupītu jūsu laiku, taču tā ir noderīga tikai tad, ja jūsu cenas katram līmenim ir saistītas ar pirmo līmeni. Vairumā gadījumu šo lapu varat ignorēt.
 ModelModulesProduct=Veidlapas produktu dokumentos
 ToGenerateCodeDefineAutomaticRuleFirst=Lai varētu automātiski ģenerēt kodus, vispirms jādefinē pārvaldnieks, lai automātiski definētu svītrkoda numuru.
-SeeSubstitutionVars=See * note for list of possible substitution variables
+SeeSubstitutionVars=Iespējamo aizvietojošo mainīgo sarakstu skatīt * piezīmē
 SeeChangeLog=Skatīt ChangeLog failu (tikai angļu valodā)
 AllPublishers=Visi izdevēji
 UnknownPublishers=Nezināmi izdevēji
@@ -1900,9 +1901,9 @@ OnMobileOnly=Tikai mazam ekrānam (viedtālrunim)
 DisableProspectCustomerType=Atspējojiet "Prospect + Customer" trešās puses veidu (tādēļ trešai personai jābūt Prospect vai Klientam, bet nevar būt abas)
 MAIN_OPTIMIZEFORTEXTBROWSER=Vienkāršot saskarni neredzīgajiem
 MAIN_OPTIMIZEFORTEXTBROWSERDesc=Iespējojiet šo opciju, ja esat akls cilvēks, vai lietojat programmu no teksta pārlūkprogrammas, piemēram, Lynx vai Links.
-MAIN_OPTIMIZEFORCOLORBLIND=Change  interface's color for color blind person
-MAIN_OPTIMIZEFORCOLORBLINDDesc=Enable this option if you are a color blind person, in some case interface will change color setup to increase contrast.
-Protanopia=Protanopia
+MAIN_OPTIMIZEFORCOLORBLIND=Mainīt interfeisa krāsu vājredzīgam cilvēkam
+MAIN_OPTIMIZEFORCOLORBLINDDesc=Iespējojiet šo opciju, ja esat daltoniķis, dažos gadījumos interfeiss mainīs krāsu iestatījumus, lai palielinātu kontrastu.
+Protanopia=Protanopija
 Deuteranopes=Deuteranopes
 Tritanopes=Tritanopes
 ThisValueCanOverwrittenOnUserLevel=Šo vērtību katrs lietotājs var pārrakstīt no lietotāja lapas - cilnes '%s'
@@ -1910,7 +1911,7 @@ DefaultCustomerType="Jaunā klienta" izveides veidlapas noklusējuma trešās pu
 ABankAccountMustBeDefinedOnPaymentModeSetup=Piezīme. Lai veiktu šo funkciju, katra maksājuma režīma modulī (Paypal, Stripe, ...) ir jānosaka bankas konts.
 RootCategoryForProductsToSell=Pārdodamo produktu sakņu kategorija
 RootCategoryForProductsToSellDesc=Ja tas ir definēts, tikai šajā kategorijā ietilpstošie produkti vai šīs kategorijas bērni būs pieejami pārdošanas vietā
-DebugBar=Debug Bar
+DebugBar=Atkļūdošanas josla
 DebugBarDesc=Rīkjosla, kurā ir daudz rīku, lai vienkāršotu atkļūdošanu
 DebugBarSetup=DebugBar iestatīšana
 GeneralOptions=Vispārīgās opcijas
@@ -1918,7 +1919,7 @@ LogsLinesNumber=Līniju skaits, kas jāparāda žurnāla cilnē
 UseDebugBar=Izmantojiet atkļūdošanas joslu
 DEBUGBAR_LOGS_LINES_NUMBER=Pēdējo žurnālu rindu skaits, kas jāsaglabā konsolē
 WarningValueHigherSlowsDramaticalyOutput=Brīdinājums, augstākas vērtības palēnina dramatisko izeju
-ModuleActivated=Module %s is activated and slows the interface
+ModuleActivated=Modulis %s ir aktivizēts un palēnina saskarni
 EXPORTS_SHARE_MODELS=Eksporta modeļi ir kopīgi ar visiem
 ExportSetup=Moduļa Eksportēšana iestatīšana
 InstanceUniqueID=Unikāls gadījuma ID
@@ -1926,14 +1927,13 @@ SmallerThan=Mazāks nekā
 LargerThan=Lielāks nekā
 IfTrackingIDFoundEventWillBeLinked=Ņemiet vērā, ka, ja ienākošajā e-pastā tiek atrasts izsekošanas ID, notikums tiks automātiski saistīts ar saistītajiem objektiem.
 WithGMailYouCanCreateADedicatedPassword=Izmantojot GMail kontu, ja esat iespējojis 2 soļu validāciju, ieteicams izveidot īpašu lietojumprogrammas otro paroli, nevis izmantot sava konta caurlaides paroli no https://myaccount.google.com/.
-IFTTTSetup=IFTTT moduļa iestatīšana
-IFTTT_SERVICE_KEY=IFTTT servisa atslēga
-IFTTT_DOLIBARR_ENDPOINT_SECUREKEY=Drošības atslēga, lai aizsargātu IFTTT izmantoto parametru URL, lai nosūtītu ziņas jūsu Dolibarr.
-IFTTTDesc=Šis modulis ir paredzēts, lai aktivizētu IFTTT notikumus un / vai veiktu kādu darbību, izmantojot ārējos IFTTT trigerus.
-UrlForIFTTT=URL beigu punkts IFTTT
-YouWillFindItOnYourIFTTTAccount=Jūs atradīsiet to savā IFTTT kontā
 EndPointFor=Beigu punkts %s: %s
 DeleteEmailCollector=Dzēst e-pasta kolekcionāru
 ConfirmDeleteEmailCollector=Vai tiešām vēlaties dzēst šo e-pasta kolekcionāru?
-RecipientEmailsWillBeReplacedWithThisValue=Recipient emails will be always replaced with this value
-AtLeastOneDefaultBankAccountMandatory=At least 1 default bank account must be defined
+RecipientEmailsWillBeReplacedWithThisValue=Adresātu e-pasti vienmēr tiks aizstāti ar šo vērtību
+AtLeastOneDefaultBankAccountMandatory=Jādefinē vismaz 1 noklusējuma bankas konts
+RESTRICT_API_ON_IP=Atļaut pieejamās API tikai dažam resursdatora IP (aizstājējzīme nav atļauta, izmantojiet atstarpi starp vērtībām). Tukša nozīmē, ka visi saimnieki var izmantot pieejamās API.
+RESTRICT_ON_IP=Atļaut piekļuvi tikai dažam resursdatora IP (aizstājējzīme nav atļauta, izmantojiet atstarpi starp vērtībām). Tukši nozīmē, ka ikviens saimnieks var tam piekļūt.
+BaseOnSabeDavVersion=Balstīts uz bibliotēkas SabreDAV versiju
+NotAPublicIp=Nav publiskā IP
+MakeAnonymousPing=Izveidojiet anonīmu Ping &#39;+1&#39; Dolibarr pamata serverim (to veic tikai vienu reizi pēc instalēšanas), lai fonds varētu uzskaitīt Dolibarr instalācijas skaitu.
diff --git a/htdocs/langs/lv_LV/agenda.lang b/htdocs/langs/lv_LV/agenda.lang
index e80bc475386..fc7dd659b9d 100644
--- a/htdocs/langs/lv_LV/agenda.lang
+++ b/htdocs/langs/lv_LV/agenda.lang
@@ -124,7 +124,7 @@ AgendaExtNb=Kalendāra Nr. %s
 ExtSiteUrlAgenda=URL, lai piekļūtu. ICal failam
 ExtSiteNoLabel=Nav Apraksta
 VisibleTimeRange=Visible time range
-VisibleDaysRange=Visible days range
+VisibleDaysRange=Redzamo dienu diapazons
 AddEvent=Izveidot notikumu
 MyAvailability=Mana pieejamība
 ActionType=Pasākuma veids
diff --git a/htdocs/langs/lv_LV/banks.lang b/htdocs/langs/lv_LV/banks.lang
index 8c1b9e53a95..18d308f56fd 100644
--- a/htdocs/langs/lv_LV/banks.lang
+++ b/htdocs/langs/lv_LV/banks.lang
@@ -73,6 +73,7 @@ BankTransaction=Bankas ieraksts
 ListTransactions=Saraksta ieraksti
 ListTransactionsByCategory=Ierakstu saraksti/ sadaļas
 TransactionsToConciliate=Ieraksti, kas jāsaskaņo
+TransactionsToConciliateShort=Lai samierinātos
 Conciliable=Var saskaņot
 Conciliate=Samierināt
 Conciliation=Samierināšanās
@@ -116,6 +117,7 @@ DeleteCheckReceipt=Dzēst šo čeku?
 ConfirmDeleteCheckReceipt=Vai tiešām vēlaties dzēst šo čeka kvīti?
 BankChecks=Bankas čeki
 BankChecksToReceipt=Pārbaudes, kas gaida noguldījumu
+BankChecksToReceiptShort=Pārbaudes, kas gaida noguldījumu
 ShowCheckReceipt=Rādīt pārbaude depozīta saņemšanu
 NumberOfCheques=Čeku skaits
 DeleteTransaction=Dzēst ierakstu
diff --git a/htdocs/langs/lv_LV/bills.lang b/htdocs/langs/lv_LV/bills.lang
index 1e20c7216ae..1798d492885 100644
--- a/htdocs/langs/lv_LV/bills.lang
+++ b/htdocs/langs/lv_LV/bills.lang
@@ -12,7 +12,7 @@ BillsLate=Kavētie maksājumi
 BillsStatistics=Klientu rēķinu statistika
 BillsStatisticsSuppliers=Pārdevēju rēķinu statistika
 DisabledBecauseDispatchedInBookkeeping=Atspējots, jo rēķins tika nosūtīts uzskaites veikšanai
-DisabledBecauseNotLastInvoice=Disabled because invoice is not erasable. Some invoices were recorded after this one and it will create holes in the counter.
+DisabledBecauseNotLastInvoice=Atspējots, jo rēķinu nevar izdzēst. Daži rēķini tika reģistrēti pēc šī rēķina, un tas radīs caurumus skaitītājā.
 DisabledBecauseNotErasable=Bloķēts, jo nedrīkst dzēst
 InvoiceStandard=Standarta rēķins
 InvoiceStandardAsk=Standarta rēķins
@@ -95,7 +95,7 @@ PaymentHigherThanReminderToPay=Maksājumu augstāka nekā atgādinājums par sam
 HelpPaymentHigherThanReminderToPay=Uzmanību! Viena vai vairāku rēķinu maksājuma summa ir lielāka par nesamaksāto summu. <br> Rediģējiet savu ierakstu, citādi apstipriniet un apsveriet iespēju izveidot kredītzīmi par pārsniegto saņemto summu par katru pārmaksāto rēķinu.
 HelpPaymentHigherThanReminderToPaySupplier=Uzmanību! Viena vai vairāku rēķinu maksājuma summa ir lielāka par nesamaksāto summu. <br> Rediģējiet savu ierakstu, citādi apstipriniet un apsveriet iespēju izveidot kredītzīmi par pārsniegto samaksu par katru pārmaksāto rēķinu.
 ClassifyPaid=Klasificēt "Apmaksāts"
-ClassifyUnPaid=Classify 'Unpaid'
+ClassifyUnPaid=Klasificēt “neapmaksāts”
 ClassifyPaidPartially=Klasificēt 'Apmaksāts daļēji'
 ClassifyCanceled=Klasificēt “pamestu”
 ClassifyClosed=Klasificēt 'Slēgts'
@@ -114,7 +114,7 @@ DoPaymentBack=Ievadiet atmaksu
 ConvertToReduc=Atzīmējiet kā kredītu
 ConvertExcessReceivedToReduc=Konvertēt iegūtos naudas līdzekļus par pieejamo kredītu
 ConvertExcessPaidToReduc=Konvertēt pārsniegto summu par atlaidi
-EnterPaymentReceivedFromCustomer=Ievadiet saņemto naudas summu no klienta
+EnterPaymentReceivedFromCustomer=Ievadiet no klienta saņemto naudas summu
 EnterPaymentDueToCustomer=Veikt maksājumu dēļ klientam
 DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
 PriceBase=Bāzes cena
@@ -193,7 +193,7 @@ ConfirmClassifyPaidPartiallyReasonOther=Summa pamesti cita iemesla dēļ
 ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=Šī izvēle ir iespējama, ja jūsu rēķinā tiek piedāvāti piemēroti komentāri. (Piemērs "Tikai nodoklis, kas atbilst faktiski samaksātajai cenai, dod tiesības uz atskaitījumu")
 ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=Dažās valstīs šī izvēle var būt iespējama tikai tad, ja jūsu rēķins satur pareizas piezīmes.
 ConfirmClassifyPaidPartiallyReasonAvoirDesc=Izmantojiet šo izvēli, ja visi citi neapmierina
-ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=<b> sliktais pircējs</b>  ir klients, kurš atsakās maksāt parādu.
+ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=<b>sliktais klients</b> ir klients, kurš atsakās maksāt parādu.
 ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=Šo izvēli izmanto, ja samaksa nav bijusi pilnīga, jo daži no produktiem, tika atgriezti
 ConfirmClassifyPaidPartiallyReasonOtherDesc=Izmantojiet šo izvēli, ja visi citi nav piemēroti, piemēram, šādā situācijā: <br> - maksājums nav pabeigts, jo daži produkti tika nosūtīti atpakaļ <br> - pieprasītā summa ir pārāk svarīga, jo atlaide tika aizmirsta <br> visos gadījumos summa Pārmērīgi liels pieprasījums ir jālabo grāmatvedības sistēmā, izveidojot kredītzīmi.
 ConfirmClassifyAbandonReasonOther=Cits
@@ -215,20 +215,20 @@ ShowInvoiceReplace=Rādīt aizstājošo rēķinu
 ShowInvoiceAvoir=Rādīt kredīta piezīmi
 ShowInvoiceDeposit=Parādiet maksājuma rēķinu
 ShowInvoiceSituation=Rādīt situāciju rēķinu
-UseSituationInvoices=Allow situation invoice
-UseSituationInvoicesCreditNote=Allow situation invoice credit note
-Retainedwarranty=Retained warranty
-RetainedwarrantyDefaultPercent=Retained warranty default percent
-ToPayOn=To pay on %s
-toPayOn=to pay on %s
-RetainedWarranty=Retained Warranty
-PaymentConditionsShortRetainedWarranty=Retained warranty payment terms
-DefaultPaymentConditionsRetainedWarranty=Default retained warranty payment terms
-setPaymentConditionsShortRetainedWarranty=Set retained warranty payment terms
-setretainedwarranty=Set retained warranty
-setretainedwarrantyDateLimit=Set retained warranty date limit
-RetainedWarrantyDateLimit=Retained warranty date limit
-RetainedWarrantyNeed100Percent=The situation invoice need to be at 100%% progress to be displayed on PDF
+UseSituationInvoices=Atļaut rēķinu par situāciju
+UseSituationInvoicesCreditNote=Atļaut situācijas rēķina kredītvēstuli
+Retainedwarranty=Saglabāta garantija
+RetainedwarrantyDefaultPercent=Saglabātais garantijas noklusējuma procents
+ToPayOn=Maksāt %s
+toPayOn=maksāt pa tālruni %s
+RetainedWarranty=Saglabātā garantija
+PaymentConditionsShortRetainedWarranty=Saglabāti garantijas apmaksas nosacījumi
+DefaultPaymentConditionsRetainedWarranty=Noklusētie garantijas apmaksas nosacījumi
+setPaymentConditionsShortRetainedWarranty=Iestatiet saglabāto garantijas apmaksas termiņu
+setretainedwarranty=Iestatiet saglabāto garantiju
+setretainedwarrantyDateLimit=Iestatiet saglabātā garantijas datuma ierobežojumu
+RetainedWarrantyDateLimit=Saglabātais garantijas termiņš
+RetainedWarrantyNeed100Percent=Situācijas rēķinam jābūt 100%% gaitai, lai tas tiktu parādīts PDF formātā
 ShowPayment=Rādīt maksājumu
 AlreadyPaid=Jau samaksāts
 AlreadyPaidBack=Jau atgriezta nauda
@@ -256,7 +256,7 @@ RemainderToBill=Jāsamaksā vēl
 SendBillByMail=Nosūtīt rēķinu pa e-pastu
 SendReminderBillByMail=Sūtīt atgādinājumu pa e-pastu
 RelatedCommercialProposals=Saistītie tirdzniecības priekšlikumi
-RelatedRecurringCustomerInvoices=Related recurring customer invoices
+RelatedRecurringCustomerInvoices=Saistītie atkārtotie klientu rēķini
 MenuToValid=Lai derīgs
 DateMaxPayment=Jāapmaksā līdz
 DateInvoice=Rēķina datums
@@ -380,8 +380,8 @@ NbOfGenerationDoneShort=Veicamās paaudzes skaits
 MaxGenerationReached=Maksimālais sasniegto paaudžu skaits
 InvoiceAutoValidate=Rēķinus automātiski apstiprināt
 GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
-DateIsNotEnough=Date not reached yet
-InvoiceGeneratedFromTemplate=Invoice %s generated from recurring template invoice %s
+DateIsNotEnough=Datums vēl nav sasniegts
+InvoiceGeneratedFromTemplate=Rēķins %s, kas ģenerēts no atkārtota rēķina rēķina %s
 GeneratedFromTemplate=Izveidots no veidnes rēķina %s
 WarningInvoiceDateInFuture=Brīdinājums! Rēķina datums ir lielāks par pašreizējo datumu
 WarningInvoiceDateTooFarInFuture=Brīdinājums, rēķina datums ir pārāk tālu no pašreizējā datuma
diff --git a/htdocs/langs/lv_LV/boxes.lang b/htdocs/langs/lv_LV/boxes.lang
index af341d818be..335b353a09b 100644
--- a/htdocs/langs/lv_LV/boxes.lang
+++ b/htdocs/langs/lv_LV/boxes.lang
@@ -27,7 +27,7 @@ BoxTitleLastModifiedSuppliers=Pārdevēji: pēdējais %s labotais
 BoxTitleLastModifiedCustomers=Klienti: pēdējais %s labotais
 BoxTitleLastCustomersOrProspects=Jaunākie %s klienti vai perspektīvas
 BoxTitleLastCustomerBills=Jaunākie %s klientu rēķini
-BoxTitleLastSupplierBills=Jaunākās %s Vendor rēķini
+BoxTitleLastSupplierBills=Jaunākie %s pārdevēju rēķini
 BoxTitleLastModifiedProspects=Perspektīvas: pēdējais %s modificēts
 BoxTitleLastModifiedMembers=Jaunākie %s dalībnieki
 BoxTitleLastFicheInter=Jaunākās %s izmaiņas iejaukšanās
@@ -84,4 +84,4 @@ ForProposals=Priekšlikumi
 LastXMonthRolling=Jaunākais %s mēnesis ritošais
 ChooseBoxToAdd=Pievienojiet logrīku savam informācijas panelim
 BoxAdded=Jūsu vadības panelī ir pievienots logrīks
-BoxTitleUserBirthdaysOfMonth=Šā mēneša dzimšanas dienas
+BoxTitleUserBirthdaysOfMonth=Šī mēneša dzimšanas dienas
diff --git a/htdocs/langs/lv_LV/cashdesk.lang b/htdocs/langs/lv_LV/cashdesk.lang
index 461fd16da52..74827bd7c80 100644
--- a/htdocs/langs/lv_LV/cashdesk.lang
+++ b/htdocs/langs/lv_LV/cashdesk.lang
@@ -62,6 +62,7 @@ TicketVatGrouped=Grupējiet PVN pēc likmes biļetēs
 AutoPrintTickets=Automātiski drukāt biļetes
 EnableBarOrRestaurantFeatures=Iespējot bāra vai restorāna funkcijas
 ConfirmDeletionOfThisPOSSale=Vai jūsu apstiprinājums ir šīs pašreizējās pārdošanas dzēšana?
+ConfirmDiscardOfThisPOSSale=Vai vēlaties atmest šo pašreizējo izpārdošanu?
 History=Vēsture
 ValidateAndClose=Apstipriniet un aizveriet
 Terminal=Terminal
@@ -69,3 +70,8 @@ NumberOfTerminals=Termināļu skaits
 TerminalSelect=Atlasiet termināli, kuru vēlaties izmantot:
 POSTicket=POS biļete
 BasicPhoneLayout=Izmantojiet telefonu pamata izkārtojumu
+SetupOfTerminalNotComplete=Termināļa %s iestatīšana nav pabeigta
+DirectPayment=Tiešais maksājums
+DirectPaymentButton=Poga Tiešais naudas maksājums
+InvoiceIsAlreadyValidated=Rēķins jau ir apstiprināts
+NoLinesToBill=Nav rēķinu
diff --git a/htdocs/langs/lv_LV/categories.lang b/htdocs/langs/lv_LV/categories.lang
index 623c8f570c2..79e6bc2cddd 100644
--- a/htdocs/langs/lv_LV/categories.lang
+++ b/htdocs/langs/lv_LV/categories.lang
@@ -81,7 +81,7 @@ CatProdLinks=Saiknes starp produktiem / pakalpojumiem un tagiem / kategorijām
 CatProJectLinks=Saiknes starp projektiem un tagiem / kategorijām
 DeleteFromCat=Noņemt no tagiem / kategorijas
 ExtraFieldsCategories=Complementary attributes
-CategoriesSetup=Tags/categories setup
+CategoriesSetup=Tagu / kategoriju iestatīšana
 CategorieRecursiv=Link with parent tag/category automatically
 CategorieRecursivHelp=Ja opcija ir ieslēgta, pievienojot produktu apakškategorijai, produkts tiks pievienots arī vecākajai kategorijai.
 AddProductServiceIntoCategory=Add the following product/service
diff --git a/htdocs/langs/lv_LV/companies.lang b/htdocs/langs/lv_LV/companies.lang
index aa373cac4f1..b1dc72a9f2a 100644
--- a/htdocs/langs/lv_LV/companies.lang
+++ b/htdocs/langs/lv_LV/companies.lang
@@ -54,6 +54,7 @@ Firstname=Vārds
 PostOrFunction=Ieņemamais amats
 UserTitle=Virsraksts
 NatureOfThirdParty=Trešo personu būtība
+NatureOfContact=Kontakta raksturs
 Address=Adrese
 State=Valsts / province
 StateShort=Valsts
@@ -428,7 +429,7 @@ MergeOriginThirdparty=Duplicate third party (third party you want to delete)
 MergeThirdparties=Merge third parties
 ConfirmMergeThirdparties=Vai tiešām vēlaties apvienot šo trešo personu ar pašreizējo? Visi saistītie objekti (rēķini, pasūtījumi, ...) tiks pārvietoti uz pašreizējo trešo pusi, tad trešā puse tiks dzēsta.
 ThirdpartiesMergeSuccess=Trešās puses ir apvienotas
-SaleRepresentativeLogin=Login of sales representative
+SaleRepresentativeLogin=Tirdzniecības pārstāvja pieteikšanās
 SaleRepresentativeFirstname=Tirdzniecības pārstāvja vārds
 SaleRepresentativeLastname=Tirdzniecības pārstāvja uzvārds
 ErrorThirdpartiesMerge=Pašalot trešās puses, radās kļūda. Lūdzu, pārbaudiet žurnālu. Izmaiņas ir atgrieztas.
diff --git a/htdocs/langs/lv_LV/compta.lang b/htdocs/langs/lv_LV/compta.lang
index 41f8c11125b..e39527fa195 100644
--- a/htdocs/langs/lv_LV/compta.lang
+++ b/htdocs/langs/lv_LV/compta.lang
@@ -238,8 +238,8 @@ OtherCountriesCustomersReport=Foreign customers report
 BasedOnTwoFirstLettersOfVATNumberBeingDifferentFromYourCompanyCountry=Based on the two first letters of the VAT number being different from your own company's country code
 SameCountryCustomersWithVAT=National customers report
 BasedOnTwoFirstLettersOfVATNumberBeingTheSameAsYourCompanyCountry=Based on the two first letters of the VAT number being the same as your own company's country code
-LinkedFichinter=Link to an intervention
-ImportDataset_tax_contrib=Social/fiscal taxes
+LinkedFichinter=Saikne ar intervenci
+ImportDataset_tax_contrib=Sociālie/fiskālie nodokļi
 ImportDataset_tax_vat=PVN Maksājumi
 ErrorBankAccountNotFound=Kļūda: Bankas konts nav atrasts
 FiscalPeriod=Pārskata periods
diff --git a/htdocs/langs/lv_LV/contracts.lang b/htdocs/langs/lv_LV/contracts.lang
index e001fd6e4aa..3a58b0ff03e 100644
--- a/htdocs/langs/lv_LV/contracts.lang
+++ b/htdocs/langs/lv_LV/contracts.lang
@@ -51,6 +51,7 @@ ListOfClosedServices=Saraksts slēgtiem pakalpojumiem
 ListOfRunningServices=Saraksts ar aktīvajiem pakalpojumiem
 NotActivatedServices=Neaktīvais pakalpojumi (starp apstiprinātiem līgumiem)
 BoardNotActivatedServices=Pakalpojumi aktivizēt starp apstiprinātiem līgumiem
+BoardNotActivatedServicesShort=Pakalpojumi aktivizēšanai
 LastContracts=Jaunākie %s līgumi
 LastModifiedServices=Jaunākais %s labotais pakalpojums
 ContractStartDate=Sākuma datums
@@ -65,12 +66,14 @@ DateEndReal=Real beigu datums
 DateEndRealShort=Real beigu datums
 CloseService=Aizvērt pakalpojumu
 BoardRunningServices=Pakalpojumi darbojas
+BoardRunningServicesShort=Pakalpojumi darbojas
 BoardExpiredServices=Pakalpojumi beidzās
+BoardExpiredServicesShort=Pakalpojumu termiņš beidzās
 ServiceStatus=Pakalpojuma statuss
 DraftContracts=Projektu līgumi
 CloseRefusedBecauseOneServiceActive=Līgumu nevar slēgt, jo tajā ir vismaz viens atvērts pakalpojums
 ActivateAllContracts=Aktivizējiet visas līguma līnijas
-CloseAllContracts=Aizveriet visus līguma līnijas
+CloseAllContracts=Aizvērt visas līguma līnijas
 DeleteContractLine=Izdzēst līgumu līniju
 ConfirmDeleteContractLine=Vai tiešām vēlaties dzēst šo līguma līniju?
 MoveToAnotherContract=Pārvietot servisu citā līgumā.
diff --git a/htdocs/langs/lv_LV/ecm.lang b/htdocs/langs/lv_LV/ecm.lang
index c0290037ad5..73d2f5e457d 100644
--- a/htdocs/langs/lv_LV/ecm.lang
+++ b/htdocs/langs/lv_LV/ecm.lang
@@ -47,6 +47,6 @@ ECMFileManager=Failu pārvaldnieks
 ECMSelectASection=Izvēlieties direktoriju kokā ...
 DirNotSynchronizedSyncFirst=Šķiet, ka šis direktorijs ir izveidots vai modificēts ārpus ECM moduļa. Vispirms noklikšķiniet uz pogas "Resync", lai sinhronizētu disku un datu bāzi, lai iegūtu saturu šajā direktorijā.
 ReSyncListOfDir=Pārsinhronizēt sadaļu sarakstu
-HashOfFileContent=Faila satura pārslēgs
+HashOfFileContent=Faila kontrolsumma
 NoDirectoriesFound=Nav atrastas direktorijas
 FileNotYetIndexedInDatabase=Fails vēl nav indeksēts datu bāzē (mēģiniet to atkārtoti augšupielādēt).
diff --git a/htdocs/langs/lv_LV/errors.lang b/htdocs/langs/lv_LV/errors.lang
index 27836af5be3..58bc4d20733 100644
--- a/htdocs/langs/lv_LV/errors.lang
+++ b/htdocs/langs/lv_LV/errors.lang
@@ -90,7 +90,7 @@ ErrorSpecialCharNotAllowedForField=Speciālās rakstzīmes nav atļautas laukam
 ErrorNumRefModel=Norāde pastāv to datubāzē (%s), un tas nav saderīgs ar šo numerācijas noteikuma. Noņemt ierakstu vai pārdēvēts atsauci, lai aktivizētu šo moduli.
 ErrorQtyTooLowForThisSupplier=Šim pārdevējam pārāk zems daudzums vai cena, kas šai precei nav noteikta šim pārdevējam
 ErrorOrdersNotCreatedQtyTooLow=Daži pasūtījumi nav izveidoti jo pārāk mazs daudzums
-ErrorModuleSetupNotComplete=Setup of module %s looks to be uncomplete. Go on Home - Setup - Modules to complete.
+ErrorModuleSetupNotComplete=%s moduļa iestatīšana izskatās nepilnīga. Dodieties uz sākumu - Iestatīšana - moduļi, lai pabeigtu.
 ErrorBadMask=Kļūda masku
 ErrorBadMaskFailedToLocatePosOfSequence=Kļūda, maska ​​bez kārtas numuru
 ErrorBadMaskBadRazMonth=Kļūdas, slikta reset vērtība
@@ -119,7 +119,7 @@ ErrorBadValueForCode=Nepareiza drošības koda vērtība. Mēģiniet vēlreiz ar
 ErrorBothFieldCantBeNegative=Lauki %s un %s nevar būt abi negatīvi
 ErrorFieldCantBeNegativeOnInvoice=Lauks <strong> %s </strong> nevar būt negatīvs uz šāda veida rēķina. Ja vēlaties pievienot atlaides līniju, vispirms izveidojiet atlaidi ar saiti %s uz ekrāna un piemērojiet to rēķinam. Varat arī lūgt administratoru iestatīt opciju FACTURE_ENABLE_NEGATIVE_LINES uz 1, lai atļautu veco darbību.
 ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative
-ErrorWebServerUserHasNotPermission=Lietotāja konts <b>%s</b> izmantot, lai veiktu web serveri nav atļauja, kas
+ErrorWebServerUserHasNotPermission=Lietotāja kontam <b>%s</b> kas tiek izmantots, lai startētu web serveri nav atļaujas to startēt 
 ErrorNoActivatedBarcode=Nav svītrkodu veids aktivizēts
 ErrUnzipFails=Neizdevās atarhivēt %s izmantojot ZipArchive
 ErrNoZipEngine=Nav dzinēja, lai zip / unzip %s failu šajā PHP
@@ -179,7 +179,7 @@ ErrorFailedToLoadModuleDescriptorForXXX=Neizdevās ielādēt moduļa deskriptoru
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
 ErrorSavingChanges=Saglabājot izmaiņas, radās kļūda
 ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
-ErrorFileMustHaveFormat=File must have format %s
+ErrorFileMustHaveFormat=Failam jābūt %s formātā
 ErrorSupplierCountryIsNotDefined=Šī piegādātāja valsts nav definēta. Vispirms labojiet to.
 ErrorsThirdpartyMerge=Neizdevās apvienot abus ierakstus. Pieprasījums ir atcelts.
 ErrorStockIsNotEnoughToAddProductOnOrder=Krājumu nepietiek ar produktu %s, lai to pievienotu jaunam pasūtījumam.
@@ -196,7 +196,7 @@ ErrorPhpMailDelivery=Pārbaudiet, vai nelietojat pārāk daudz saņēmēju un ka
 ErrorUserNotAssignedToTask=Lietotājam ir jāpiešķir uzdevums, lai varētu ievadīt patērēto laiku.
 ErrorTaskAlreadyAssigned=Uzdevums jau ir piešķirts lietotājam
 ErrorModuleFileSeemsToHaveAWrongFormat=Šķiet, ka moduļu pakotne ir nepareizā formātā.
-ErrorFilenameDosNotMatchDolibarrPackageRules=Moduļu pakotnes nosaukums (<strong> %s </ strong>) neatbilst paredzētā vārda sintaksei: <strong> %s </ strong>
+ErrorFilenameDosNotMatchDolibarrPackageRules=Moduļu pakotnes nosaukums (<strong>%s</strong>) neatbilst paredzētai sintaksei: <strong>%s</strong>
 ErrorDuplicateTrigger=Kļūda, dublikātu izraisītāja nosaukums %s. Jau piekrauts no %s.
 ErrorNoWarehouseDefined=Kļūda, noliktavas nav definētas.
 ErrorBadLinkSourceSetButBadValueForRef=Izmantotā saite nav derīga. Maksājuma avots ir definēts, bet "ref" vērtība nav derīga.
@@ -218,8 +218,9 @@ ErrorVariableKeyForContentMustBeSet=Kļūda, ir jāiestata konstants ar nosaukum
 ErrorURLMustStartWithHttp=URL %s jāsāk ar http: // vai https: //
 ErrorNewRefIsAlreadyUsed=Kļūda, jaunā atsauce jau ir izmantota
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Kļūda, dzēšot maksājumu, kas sasaistīts ar slēgtu rēķinu.
+ErrorSearchCriteriaTooSmall=Meklēšanas kritēriji ir pārāk mazi.
 # Warnings
-WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
+WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Jūsu PHP parametrs upload_max_filesize (%s) ir augstāks nekā PHP parametrs post_max_size (%s). Šī nav konsekventa iestatīšana.
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
 WarningMandatorySetupNotComplete=Noklikšķiniet šeit, lai iestatītu obligātos parametrus
 WarningEnableYourModulesApplications=Noklikšķiniet šeit, lai iespējotu moduļus un lietojumprogrammas
@@ -238,7 +239,7 @@ WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Iespēja bloķēta kad ie
 WarningPaymentDateLowerThanInvoiceDate=Apmaksas datums (%s) ir agrāks par rēķina datumu (%s) rēķinam %s.
 WarningTooManyDataPleaseUseMoreFilters=Too many data (more than %s lines). Please use more filters or set the constant %s to a higher limit.
 WarningSomeLinesWithNullHourlyRate=Daži lietotāji dažreiz ierakstīja, bet viņu stundas likme netika definēta. Tika izmantota vērtība 0 %s stundā, taču tas var novest pie nepareiza pavadītā laika vērtējuma.
-WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security purpose you will have to login with your new login before next action.
+WarningYourLoginWasModifiedPleaseLogin=Jūsu pieteikšanās tika mainīta. Drošības nolūkos pirms nākamās darbības jums būs jāpiesakās ar jauno pieteikumvārdu.
 WarningAnEntryAlreadyExistForTransKey=Šīs valodas tulkošanas taustiņam jau ir ieraksts
 WarningNumberOfRecipientIsRestrictedInMassAction=Brīdinājums, ja izmantojat masveida darbību sarakstos, saņēmēju skaits ir ierobežots <b>%s</b>
 WarningDateOfLineMustBeInExpenseReportRange=Brīdinājums, rindas datums nav izdevumu pārskata diapazonā
diff --git a/htdocs/langs/lv_LV/exports.lang b/htdocs/langs/lv_LV/exports.lang
index 4f7708caaea..c7e09f01185 100644
--- a/htdocs/langs/lv_LV/exports.lang
+++ b/htdocs/langs/lv_LV/exports.lang
@@ -49,7 +49,7 @@ LineTotalTTC=Summa ar nodokļiem līniju
 LineTotalVAT=PVN summu, par līnijas
 TypeOfLineServiceOrProduct=Veids (0=produkts, 1=pakalpojums)
 FileWithDataToImport=Fails ar datiem, lai importētu
-FileToImport=Avota failu, lai importētu
+FileToImport=Avota fails, kas jāimportē
 FileMustHaveOneOfFollowingFormat=Importa failam ir jābūt šādam formātam
 DownloadEmptyExample=Lejupielādēt veidlapas failu ar lauka satura informāciju (* ir obligāti aizpildāmie lauki)
 ChooseFormatOfFileToImport=Izvēlieties faila formātu, ko izmantot kā importa faila formātu, noklikšķinot uz %s ikonas, lai to atlasītu ...
@@ -112,7 +112,7 @@ ExportStringFilter=%% allows replacing one or more characters in the text
 ExportDateFilter=YYYY, YYYYMM, YYYYMMDD: filtri par vienu gadu / mēnesi / dienu, YYYY + YYYY, YYYYMM + YYYYMM, YYYYMMDD + YYYYMMDD: filtri ilgāk par gadiem / mēnešiem / dienām <br>> GGGG,> GGGGM,> GGGGMDD : filtri visos nākamajos gados / mēnešos / dienās, <YYYY, <YYYYMM, <YYYYMMDD: filtri visos iepriekšējos gados / mēnešos / dienās
 ExportNumericFilter=NNNNN filtrē ar vienu vērtību <br> NNNNN + NNNNN filtrus vērtību diapazonā <br> <NNNNN filtri ar zemākām vērtībām <br >> NNNNN filtri ar lielākām vērtībām
 ImportFromLine=Importēt, sākot ar līnijas numuru
-EndAtLineNb=End at line number
+EndAtLineNb=Beigt ar rindas numuru
 ImportFromToLine=Limit diapazons (no - līdz), piem. <b> lai izlaistu virsraksta rindu (-as) </b>
 SetThisValueTo2ToExcludeFirstLine=Piemēram, iestatiet šo vērtību uz 3, lai izslēgtu 2 pirmās rindas. <br> Ja galvenes rindas NAV izlaistas, tas izraisīs vairākas kļūdas importa modelēšanā.
 KeepEmptyToGoToEndOfFile=Saglabājiet šo lauku tukšu, lai apstrādātu visas rindas līdz faila beigām.
diff --git a/htdocs/langs/lv_LV/holiday.lang b/htdocs/langs/lv_LV/holiday.lang
index c47d52c0704..406894ff0c2 100644
--- a/htdocs/langs/lv_LV/holiday.lang
+++ b/htdocs/langs/lv_LV/holiday.lang
@@ -52,7 +52,7 @@ TitleDeleteCP=Dzēst atvaļinājuma pieprasījumu
 ConfirmDeleteCP=Apstiprināt šī atvaļinājuma pieprasījuma dzēšanu?
 ErrorCantDeleteCP=Error you don't have the right to delete this leave request.
 CantCreateCP=Jums nav tiesību veikt atvaļinājumu pieprasījumus.
-InvalidValidatorCP=You must choose an approbator to your leave request.
+InvalidValidatorCP=Jūsu atvaļinājuma pieprasījumam jāizvēlas apstiprinātājs.
 NoDateDebut=Jums ir jāizvēlas sākuma datums.
 NoDateFin=Jums ir jāizvēlas beigu datums.
 ErrorDureeCP=Jūsu atvaļinājuma pieprasījumā nav darba dienas.
diff --git a/htdocs/langs/lv_LV/install.lang b/htdocs/langs/lv_LV/install.lang
index 28d768c312e..39b536fd433 100644
--- a/htdocs/langs/lv_LV/install.lang
+++ b/htdocs/langs/lv_LV/install.lang
@@ -32,7 +32,7 @@ ErrorDatabaseVersionTooLow=Datu bāzes versija (%s) pārāk veca. Versija %s vai
 ErrorPHPVersionTooLow=PHP versija ir pārāk veca. Versija %s ir nepieciešama.
 ErrorConnectedButDatabaseNotFound=Savienojums ar serveri ir veiksmīgs, bet datubāze '%s' nav atrasta.
 ErrorDatabaseAlreadyExists=Datubāze '%s' jau eksistē.
-IfDatabaseNotExistsGoBackAndUncheckCreate=Ja datubāze nepastāv, atveriet un atzīmējiet opciju "Izveidot datubāzi".
+IfDatabaseNotExistsGoBackAndUncheckCreate=Ja datubāze neeksistē, atgriezieties un atzīmējiet opciju "Izveidot datubāzi".
 IfDatabaseExistsGoBackAndCheckCreate=Ja datu bāze jau pastāv, dodieties atpakaļ un izņemiet ķeksi "Izveidot datu bāzi".
 WarningBrowserTooOld=Pārlūkprogrammas versija ir pārāk veca. Ir ļoti ieteicams jaunināt pārlūku uz jaunāko Firefox, Chrome vai Opera versiju.
 PHPVersion=PHP versija
@@ -92,7 +92,7 @@ LoginAlreadyExists=Jau eksistē
 DolibarrAdminLogin=Dolibarr administratora lietotāja vārds
 AdminLoginAlreadyExists=Dolibarr administratora konts '<b>%s</b>' jau pastāv. Atgriezieties, ja vēlaties izveidot vēl vienu.
 FailedToCreateAdminLogin=Neizdevās izveidot Dolibarr administratora kontu.
-WarningRemoveInstallDir=Drošības apsvērumu dēļ, instalēšanas vai jaunināšanas pabeigšanas brīdī drošības nolūkos Dolibarr dokumentu direktorijā jāievieto fails <b> install.lock </ b>, lai novērstu nejaušu / ļaunprātīgu instalēšanas rīku lietošanu.
+WarningRemoveInstallDir=Drošības apsvērumu dēļ, instalēšanas vai atjaunināšanas pabeigšanas brīdī drošības nolūkos Dolibarr dokumentu direktorijā jāievieto fails <b>install.lock</b>, lai novērstu nejaušu/ļaunprātīgu instalēšanas rīku lietošanu.
 FunctionNotAvailableInThisPHP=Nav pieejams šajā PHP
 ChoosedMigrateScript=Izvēlieties migrācijas skriptu
 DataMigration=Datubāzes migrācijas (dati)
@@ -133,7 +133,7 @@ MigrationCustomerOrderShipping=Pārsūtīt sūtījumus pārdošanas pasūtījumu
 MigrationShippingDelivery=Upgrade uzglabāšanu kuģniecības
 MigrationShippingDelivery2=Upgrade uzglabāšanu 2 kuģniecības
 MigrationFinished=Migrācija pabeigta
-LastStepDesc=<strong> Pēdējais solis </ strong>: šeit norādiet pieteikšanos un paroli, kuru vēlaties izmantot, lai izveidotu savienojumu ar Dolibarr. <b> Nepalaidiet to, jo tas ir galvenais konts, lai pārvaldītu visus pārējos / papildu lietotāju kontus. </ b>
+LastStepDesc=<strong>Pēdējais solis</strong>: šeit norādiet lietotāja vārdu un paroli, kuru vēlaties izmantot, lai izveidotu savienojumu ar Dolibarr. <b>Nepazaudējiet to, jo tas ir galvenais konts, lai pārvaldītu visus pārējos/papildus lietotāju kontus.</b>
 ActivateModule=Aktivizēt moduli %s
 ShowEditTechnicalParameters=Noklikšķiniet šeit, lai parādītu / rediģēt papildu parametrus (ekspertu režīmā)
 WarningUpgrade=Brīdinājums:\nVai vispirms izmantojāt datu bāzi?\nTas ir ļoti ieteicams. Šajā procesā var būt iespējama datu zudums (piemēram, kļūdas mysql versijā 5.5.40 / 41/42/43), tāpēc pirms migrēšanas sākuma ir svarīgi veikt pilnīgu datplūsmas noņemšanu.\n\nNoklikšķiniet uz OK, lai sāktu migrācijas procesu ...
@@ -163,7 +163,7 @@ MigrationProcessPaymentUpdate=Atjaunināt maksājumu(-us) %s
 MigrationPaymentsNothingToUpdate=Nav vairāk lietu ko darīt
 MigrationPaymentsNothingUpdatable=Ne vairāk maksājumus, kas var tikt izlabotas
 MigrationContractsUpdate=Līgumu datu korekcija
-MigrationContractsNumberToUpdate=%s līgumu (-iem), lai atjauninātu
+MigrationContractsNumberToUpdate=%slīgums(-i), kas jāatjauno
 MigrationContractsLineCreation=Izveidot līgumu līniju līguma ref %s
 MigrationContractsNothingToUpdate=Nav daudz lietu ko darīt
 MigrationContractsFieldDontExist=Lauks fk_facture vairs nepastāv. Nav ko darīt.
diff --git a/htdocs/langs/lv_LV/interventions.lang b/htdocs/langs/lv_LV/interventions.lang
index 06d132fd40d..9e2da9d3bbc 100644
--- a/htdocs/langs/lv_LV/interventions.lang
+++ b/htdocs/langs/lv_LV/interventions.lang
@@ -30,8 +30,8 @@ InterventionClassifyDone=Klasificēt "Pabeigts"
 StatusInterInvoiced=Jāmaksā
 SendInterventionRef=Submission of intervention %s
 SendInterventionByMail=Sūtīt interviju pa e-pastu
-InterventionCreatedInDolibarr=Intervention %s created
-InterventionValidatedInDolibarr=Intervention %s validated
+InterventionCreatedInDolibarr=Izveidota intervence %s
+InterventionValidatedInDolibarr=Intervence %s validēta
 InterventionModifiedInDolibarr=Intervention %s modified
 InterventionClassifiedBilledInDolibarr=Intervention %s set as billed
 InterventionClassifiedUnbilledInDolibarr=Intervention %s set as unbilled
@@ -39,7 +39,7 @@ InterventionSentByEMail=Intervence %s nosūtīta pa e-pastu
 InterventionDeletedInDolibarr=Intervention %s deleted
 InterventionsArea=Interventions area
 DraftFichinter=Draft interventions
-LastModifiedInterventions=Latest %s modified interventions
+LastModifiedInterventions=Jaunākās %s labotās iejaukšanās
 FichinterToProcess=Intervences process
 ##### Types de contacts #####
 TypeContact_fichinter_external_CUSTOMER=Šādi-up klientu kontaktu
diff --git a/htdocs/langs/lv_LV/mails.lang b/htdocs/langs/lv_LV/mails.lang
index 9eaa536b32c..0155c024f92 100644
--- a/htdocs/langs/lv_LV/mails.lang
+++ b/htdocs/langs/lv_LV/mails.lang
@@ -136,8 +136,8 @@ MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Se
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
 YouCanAlsoUseSupervisorKeyword=You can also add the keyword <strong>__SUPERVISOREMAIL__</strong> to have email being sent to the supervisor of user (works only if an email is defined for this supervisor)
 NbOfTargetedContacts=Current number of targeted contact emails
-UseFormatFileEmailToTarget=Importētajam failam jābūt formatētam <strong> e-pasts; vārds; uzvārds; cits </ strong>
-UseFormatInputEmailToTarget=Ievadiet virkni ar formātu <strong> e-pasts; vārds; uzvārds; cits </ strong>
+UseFormatFileEmailToTarget=Importētajam failam jābūt formatētam <strong>e-pasts; nosaukums; vārds;cits</strong>
+UseFormatInputEmailToTarget=Ievadiet virkni ar formātu <strong>e-pasts;nosaukums;vārds;cits</strong>
 MailAdvTargetRecipients=Saņēmēji (papildu izvēle)
 AdvTgtTitle=Aizpildiet ievades laukus, lai iepriekš atlasītu mērķauditoriju trešajām personām vai kontaktpersonām / adresēm
 AdvTgtSearchTextHelp=Izmantojiet %% kā aizstājējzīmes. Piemēram, lai atrastu visu objektu, piemēram, <b> jean, joe, jim </ b>, jūs varat ievadīt <b> j%% </ b>, kuru varat arī izmantot; kā atdalītājs par vērtību, un izmantot! izņemot šo vērtību. Piemēram, <b> jean; joe; jim%%;! Jimo;! Jima% </ b> tiks mērķētas uz visiem jean, joe, sākt ar jim, bet ne jimo, un ne visu, kas sākas ar jima
diff --git a/htdocs/langs/lv_LV/main.lang b/htdocs/langs/lv_LV/main.lang
index 567160c1ec8..f1e4971c696 100644
--- a/htdocs/langs/lv_LV/main.lang
+++ b/htdocs/langs/lv_LV/main.lang
@@ -28,6 +28,7 @@ NoTemplateDefined=Šim e-pasta veidam nav pieejamas veidnes
 AvailableVariables=Pieejamie aizstāšanas mainīgie
 NoTranslation=Nav iztulkots
 Translation=Tulkošana
+EmptySearchString=Ievadiet ne tukšu meklēšanas virkni
 NoRecordFound=Nav atrasti ieraksti
 NoRecordDeleted=Neviens ieraksts nav dzēsts
 NotEnoughDataYet=Nepietiek datu
@@ -333,7 +334,7 @@ Copy=Kopēt
 Paste=Ielīmēt
 Default=Noklusējums
 DefaultValue=Noklusējuma vērtība
-DefaultValues=Noklusētās vērtības / filtri / šķirošana
+DefaultValues=Noklusētās vērtības/filtri/kārtošana
 Price=Cena
 PriceCurrency=Cena (valūta)
 UnitPrice=Vienības cena
@@ -445,7 +446,7 @@ ContactsAddressesForCompany=Kontakti / adreses par šīs trešās personas
 AddressesForCompany=Šīs trešās puses adreses
 ActionsOnCompany=Notikumi šai trešajai pusei
 ActionsOnContact=Notikumi šim kontaktam / adresei
-ActionsOnContract=Events for this contract
+ActionsOnContract=Notikumi šim līgumam
 ActionsOnMember=Pasākumi par šo locekli
 ActionsOnProduct=Notikumi ar šo produktu
 NActionsLate=%s vēlu
@@ -704,6 +705,7 @@ DateOfSignature=Parakstīšanas datums
 HidePassword=Rādīt komandu ar slēptu paroli
 UnHidePassword=Parādīt komandu bez paroles
 Root=Sakne
+RootOfMedias=Sabiedrisko mediju (/ mediju) sakne
 Informations=Informācija
 Page=Lappuse
 Notes=Piezīmes
@@ -752,7 +754,7 @@ URLPhoto=Saite bildei/logo
 SetLinkToAnotherThirdParty=Saite uz citu trešo personu
 LinkTo=Saite uz
 LinkToProposal=Saite uz priekšlikumu
-LinkToOrder=Link to order
+LinkToOrder=Saite uz pasūtījumu
 LinkToInvoice=Saite uz rēķinu
 LinkToTemplateInvoice=Saite uz veidnes rēķinu
 LinkToSupplierOrder=Saite uz pirkuma pasūtījumu
@@ -760,7 +762,7 @@ LinkToSupplierProposal=Saite uz pārdevēja priekšlikumu
 LinkToSupplierInvoice=Saite uz piegādātāja rēķinu
 LinkToContract=Saite uz līgumu
 LinkToIntervention=Saikne ar intervenci
-LinkToTicket=Link to ticket
+LinkToTicket=Saite uz pieteikumu
 CreateDraft=Izveidot melnrakstu
 SetToDraft=Atpakaļ uz melnrakstu
 ClickToEdit=Klikšķiniet, lai rediģētu
@@ -779,7 +781,7 @@ ByDay=Pēc dienas
 BySalesRepresentative=Pēc tirdzniecības pārstāvja
 LinkedToSpecificUsers=Saistītas ar noteiktu lietotāja kontaktu
 NoResults=Nav rezultātu
-AdminTools=Admin Tools
+AdminTools=Administratora rīki
 SystemTools=Sistēmas rīki
 ModulesSystemTools=Moduļu instrumenti
 Test=Pārbaude
@@ -792,7 +794,7 @@ from=no
 toward=uz
 Access=Pieeja
 SelectAction=Izvēlēties darbību
-SelectTargetUser=Atlasiet mērķa lietotāju / darbinieku
+SelectTargetUser=Atlasiet mērķa lietotāju/darbinieku
 HelpCopyToClipboard=Izmantot taustiņu kombināciju Ctrl + C, lai kopētu
 SaveUploadedFileWithMask=Saglabāt failu uz servera ar nosaukumu "<strong>%s</strong>" (citādi "%s")
 OriginFileName=Oriģinālais faila nosaukums
@@ -822,12 +824,12 @@ Mandatory=Mandatory
 Hello=Labdien
 GoodBye=Uz redzēšanos
 Sincerely=Ar cieņu
-DeleteLine=Delete line
+DeleteLine=Dzēst rindu
 ConfirmDeleteLine=Vai Jūs tiešām vēlaties izdzēst šo līniju?
 NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked record
 TooManyRecordForMassAction=Pārāk daudzi ieraksti atlasīti masveida rīcībai. Darbība ir ierobežota ar %s ierakstu sarakstu.
 NoRecordSelected=Nav atlasīts neviens ieraksts
-MassFilesArea=Area for files built by mass actions
+MassFilesArea=Platība failiem, kurus izveido masveida darbības
 ShowTempMassFilesArea=Show area of files built by mass actions
 ConfirmMassDeletion=Bulk Delete apstiprinājums
 ConfirmMassDeletionQuestion=Vai tiešām vēlaties dzēst atlasīto(-s) ierakstu(-s) %s?
@@ -981,3 +983,10 @@ PaymentInformation=Informācija par maksājumu
 ValidFrom=Derīgs no
 ValidUntil=Derīgs līdz
 NoRecordedUsers=Nav lietotāju
+ToClose=Aizvērt
+ToProcess=Jāapstrādā
+ToApprove=Apstiprināt
+GlobalOpenedElemView=Globālais izskats
+NoArticlesFoundForTheKeyword=Raksts nav atrasts atslēgvārdam '<strong>%s</strong>'
+NoArticlesFoundForTheCategory=Šai kategorijai nav atrasts neviens raksts
+ToAcceptRefuse=Pieņemt | atteikties
diff --git a/htdocs/langs/lv_LV/margins.lang b/htdocs/langs/lv_LV/margins.lang
index 2c4bd11ab3d..760cadf3fd9 100644
--- a/htdocs/langs/lv_LV/margins.lang
+++ b/htdocs/langs/lv_LV/margins.lang
@@ -31,14 +31,14 @@ MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
 MargeType1=Marža par labāko pārdevēja cenu
 MargeType2=Margin on Weighted Average Price (WAP)
 MargeType3=Ienesīguma cena
-MarginTypeDesc=* Marka par labāko pirkšanas cenu = Pārdošanas cena - Labākā pārdevēju cena, kas noteikta produkta kartē <br> * Vidējā svērtā vidējā cena (WAP) = pārdošanas cena - produkta vidējā svērtā cena (WAP) vai labākā piegādātāja cena, ja WAP vēl nav definēts < br> * Marža par izmaksu cenu = Pārdošanas cena - Izmaksu cena, kas noteikta produkta kartē vai WAP, ja nav noteikta izmaksu cena, vai labākā piegādātāja cena, ja WAP vēl nav definēts
+MarginTypeDesc=* Marža par labāko iepirkuma cenu = Pārdošanas cena - Labākā pārdevēja cena, kas noteikta uz produkta kartes <br> * Maržināmais vidējais cena (WAP) = Pārdošanas cena - Produkta vidējā cena (WAP) vai labākā pārdevēja cena, ja WAP vēl nav definēts < br> * Marža par izmaksām = Pārdošanas cena - Izmaksas, kas noteiktas uz produkta kartes vai WAP, ja nav noteikta izmaksu cena vai labākā pārdevēja cena, ja WAP vēl nav definēts
 CostPrice=Pašizmaksa
 UnitCharges=Vienības izmaksas
 Charges=Maksas
 AgentContactType=Commercial agent contact type
 AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per sale representative
 rateMustBeNumeric=Likmei jābūt skaitliskai vērtībai
-markRateShouldBeLesserThan100=Mark rate should be lower than 100
+markRateShouldBeLesserThan100=Likmei jābūt zemākai par 100
 ShowMarginInfos=Show margin infos
 CheckMargins=Margins detail
-MarginPerSaleRepresentativeWarning=Atskaites par starpību katram lietotājam izmanto saiti starp trešajām personām un tirdzniecības pārstāvjiem, lai aprēķinātu katra pārdošanas pārstāvja rezervi. Tā kā dažām trešām pusēm var nebūt tirdzniecības pārstāvniecības, un dažas trešās puses var būt saistītas ar vairākām, dažas summas var neiekļaut šajā pārskatā (ja pārdošanas pārstāvis nav pieejams), un daži var parādīties dažādās pozīcijās (katram pārdošanas pārstāvim).
+MarginPerSaleRepresentativeWarning=Atskaites par starpību katram lietotājam izmanto saiti starp trešajām personām un tirdzniecības pārstāvjiem, lai aprēķinātu katra pārdošanas pārstāvja rezervi. Tā kā dažām trešajām pusēm var nebūt īpaša pārdošanas pārstāvja, un dažas trešās personas var būt saistītas ar vairākām, dažas summas var neiekļaut šajā pārskatā (ja nav pārdošanas pārstāvja), un daži var parādīties dažādās pozīcijās (par katru pārdošanas pārstāvi) .
diff --git a/htdocs/langs/lv_LV/members.lang b/htdocs/langs/lv_LV/members.lang
index 03971532446..3f7ae46d252 100644
--- a/htdocs/langs/lv_LV/members.lang
+++ b/htdocs/langs/lv_LV/members.lang
@@ -29,6 +29,7 @@ MenuMembersUpToDate=Aktuālie dalībnieki
 MenuMembersNotUpToDate=Novecojušie dalībnieki
 MenuMembersResiliated=Izslēgtie dalībnieki
 MembersWithSubscriptionToReceive=Dalībniekiem ar abonementu, lai saņemtu
+MembersWithSubscriptionToReceiveShort=Abonēšana saņemt
 DateSubscription=Abonēšanas datums
 DateEndSubscription=Abonēšanas beigu datums
 EndSubscription=Beigt abonementu
@@ -52,7 +53,7 @@ MemberStatusResiliatedShort=Izbeigta
 MembersStatusToValid=Projektu dalībnieki
 MembersStatusResiliated=Izbeigti dalībnieki
 NewCotisation=Jauns ieguldījums
-PaymentSubscription=Jauns ieguldījums maksājums
+PaymentSubscription=Jauns ieguldījums, maksājums
 SubscriptionEndDate=Abonēšanas beigu datums
 MembersTypeSetup=Dalībnieku veida iestatīšana
 MemberTypeModified=Dalībnieka veids ir labots
@@ -78,7 +79,7 @@ VoteAllowed=Balsot atļauts
 Physical=Fizisks
 Moral=Morāls
 MorPhy=Morālā/Fiziskā
-Reenable=Reenable
+Reenable=Atkārtoti ieslēdzams
 ResiliateMember=Izslēgt dalībnieku
 ConfirmResiliateMember=Vai tiešām vēlaties pārtraukt šo dalībnieku?
 DeleteMember=Dzēst dalībnieku
@@ -87,7 +88,7 @@ DeleteSubscription=Dzēst abonementu
 ConfirmDeleteSubscription=Vai tiešām vēlaties dzēst šo abonementu?
 Filehtpasswd=Htpasswd fails
 ValidateMember=Apstiprināt dalībnieku
-ConfirmValidateMember=Are you sure you want to validate this member?
+ConfirmValidateMember=Vai tiešām vēlaties apstiprināt šo dalībnieku?
 FollowingLinksArePublic=Šīs saites ir atvērtas lapas, kuras nav aizsargātas ar Dolibarr atļaujām. Tās nav formatētas lapas, kas tiek piedāvātas kā piemērs, lai parādītu, kā sarakstu dalībnieku datu bāzi.
 PublicMemberList=Sabiedrības Biedru saraksts
 BlankSubscriptionForm=Publiska pašapkalpošanās veidlapa
@@ -161,7 +162,7 @@ LastSubscriptionAmount=Jaunākās abonēšanas summa
 MembersStatisticsByCountries=Dalībnieku statistika pa valstīm
 MembersStatisticsByState=Dalībnieku statistika pēc štatiem/provincēm
 MembersStatisticsByTown=Dalībnieku statistika pa pilsētām
-MembersStatisticsByRegion=Members statistics by region
+MembersStatisticsByRegion=Dalībnieku statistika pa reģioniem
 NbOfMembers=Biedru skaits
 NoValidatedMemberYet=Nav apstiprinātas locekļi atrasti
 MembersByCountryDesc=Šis ekrāns parādīs statistiku par biedriem pa valstīm. Grafiskais tomēr ir atkarīga Google tiešsaistes grafiku pakalpojums un ir pieejama tikai tad, ja interneta pieslēgums darbojas.
diff --git a/htdocs/langs/lv_LV/oauth.lang b/htdocs/langs/lv_LV/oauth.lang
index b67aac6cba1..c2ceca52604 100644
--- a/htdocs/langs/lv_LV/oauth.lang
+++ b/htdocs/langs/lv_LV/oauth.lang
@@ -1,30 +1,30 @@
 # Dolibarr language file - Source file is en_US - oauth
-ConfigOAuth=Oauth Configuration
-OAuthServices=OAuth services
+ConfigOAuth=OAuth konfigurācija
+OAuthServices=OAuth pakalpojumi
 ManualTokenGeneration=Manual token generation
-TokenManager=Token manager
-IsTokenGenerated=Is token generated ?
+TokenManager=Žetonu pārvaldnieks
+IsTokenGenerated=Vai tiek ģenerēts marķieris?
 NoAccessToken=No access token saved into local database
 HasAccessToken=A token was generated and saved into local database
 NewTokenStored=Token received and saved
 ToCheckDeleteTokenOnProvider=Click here to check/delete authorization saved by %s OAuth provider
-TokenDeleted=Token deleted
+TokenDeleted=Tokens dzēsts
 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.
+DeleteAccess=Noklikšķiniet šeit, lai izdzēstu marķieri
+UseTheFollowingUrlAsRedirectURI=Izmantot savu akreditācijas datus ar OAuth pakalpojumu sniedzēju, izmantojiet šādu URL kā novirzīšanas URI:
+ListOfSupportedOauthProviders=Ievadiet OAuth2 sniedzēja sniegtos akreditācijas datus. Šeit ir uzskaitīti tikai atbalstītie OAuth2 pakalpojumu sniedzēji. Šos pakalpojumus var izmantot citi moduļi, kuriem nepieciešama OAuth2 autentifikācija.
 OAuthSetupForLogin=Page to generate an OAuth token
 SeePreviousTab=Skatīt iepriekšējo cilni
-OAuthIDSecret=OAuth ID and Secret
+OAuthIDSecret=OAuth ID un slepenais
 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
+TOKEN_EXPIRED=Derīguma termiņš ir beidzies
+TOKEN_EXPIRE_AT=Token beidzas līdz
+TOKEN_DELETE=Dzēst saglabāto pilnvaru
+OAUTH_GOOGLE_NAME=OAuth Google pakalpojums
+OAUTH_GOOGLE_ID=OAuth Google ID
+OAUTH_GOOGLE_SECRET=OAuth Google Secret
+OAUTH_GOOGLE_DESC=Lai izveidotu OAuth akreditācijas datus, dodieties uz <a class="notasortlink" href="https://console.developers.google.com/" target="_blank"> šo lapu </a> un pēc tam "Kvalifikācijas dati"
+OAUTH_GITHUB_NAME=OAuth GitHub pakalpojums
+OAUTH_GITHUB_ID=OAuth GitHub ID
+OAUTH_GITHUB_SECRET=OAuth GitHub noslēpums
+OAUTH_GITHUB_DESC=Dodieties uz <a class="notasortlink" href="https://github.com/settings/developers" target="_blank"> šo lapu </a> un pēc tam "Reģistrējiet jaunu pieteikumu", lai izveidotu OAuth akreditācijas datus
diff --git a/htdocs/langs/lv_LV/products.lang b/htdocs/langs/lv_LV/products.lang
index afa35a4b839..81868030ae8 100644
--- a/htdocs/langs/lv_LV/products.lang
+++ b/htdocs/langs/lv_LV/products.lang
@@ -2,7 +2,7 @@
 ProductRef=Produkta ref.
 ProductLabel=Produkta marķējums
 ProductLabelTranslated=Tulkots produkta nosaukums
-ProductDescription=Product description
+ProductDescription=Produkta apraksts
 ProductDescriptionTranslated=Tulkotā produkta apraksts
 ProductNoteTranslated=Tulkota produkta piezīme
 ProductServiceCard=Produktu / Pakalpojumu kartiņa
@@ -215,7 +215,7 @@ Build=Ražot
 ProductsMultiPrice=Produkti un cenas katram cenu segmentam
 ProductsOrServiceMultiPrice=Customer prices (of products or services, multi-prices)
 ProductSellByQuarterHT=Products turnover quarterly before tax
-ServiceSellByQuarterHT=Services turnover quarterly before tax
+ServiceSellByQuarterHT=Pakalpojumu apgrozījums ceturksnī pirms nodokļu nomaksas
 Quarter1=1. Ceturksnis
 Quarter2=2. Ceturksnis
 Quarter3=3. Ceturksnis
@@ -281,7 +281,7 @@ NbOfQtyInProposals=Daudzums priekšlikumos
 ClinkOnALinkOfColumn=Click on a link of column %s to get a detailed view...
 ProductsOrServicesTranslations=Produktu / pakalpojumu tulkojumi
 TranslatedLabel=Tulkota etiķete
-TranslatedDescription=Translated description
+TranslatedDescription=Tulkots apraksts
 TranslatedNote=Tulkotās piezīmes
 ProductWeight=Svars 1 precei
 ProductVolume=Apjoms 1 precei
diff --git a/htdocs/langs/lv_LV/projects.lang b/htdocs/langs/lv_LV/projects.lang
index 15c9f678b62..e2013ce8101 100644
--- a/htdocs/langs/lv_LV/projects.lang
+++ b/htdocs/langs/lv_LV/projects.lang
@@ -76,10 +76,16 @@ MyProjects=Mani projekti
 MyProjectsArea=Manu projektu sadaļa
 DurationEffective=Efektīvais ilgums
 ProgressDeclared=Deklarētais progress
+TaskProgressSummary=Uzdevuma virzība
+CurentlyOpenedTasks=Saudzīgi atvērti uzdevumi
+TheReportedProgressIsLessThanTheCalculatedProgressionByX=Deklarētā progresija ir mazāka par %s nekā aprēķinātā progresija
+TheReportedProgressIsMoreThanTheCalculatedProgressionByX=Deklarētais progress ir vairāk %s nekā aprēķinātā progresija
 ProgressCalculated=Aprēķinātais progress
+WhichIamLinkedTo=ar kuru esmu saistīts
+WhichIamLinkedToProject=kuru esmu piesaistījis projektam
 Time=Laiks
 ListOfTasks=Uzdevumu saraksts
-GoToListOfTimeConsumed=Go to list of time consumed
+GoToListOfTimeConsumed=Pāriet uz patērētā laika sarakstu
 GoToListOfTasks=Doties uz uzdevumu sarakstu
 GoToGanttView=Doties uz Ganta skatu
 GanttView=Ganta skats
diff --git a/htdocs/langs/lv_LV/stocks.lang b/htdocs/langs/lv_LV/stocks.lang
index 7a6ff663492..4b0596ac745 100644
--- a/htdocs/langs/lv_LV/stocks.lang
+++ b/htdocs/langs/lv_LV/stocks.lang
@@ -200,7 +200,7 @@ AddProduct=Pievienot
 ApplyPMP=Piesakies PMP
 FlushInventory=Ielieciet inventāru
 ConfirmFlushInventory=Vai jūs apstiprināt šo darbību?
-InventoryFlushed=Inventory flushed
+InventoryFlushed=Krājumi ir izskaloti
 ExitEditMode=Iziet no labošanas
 inventoryDeleteLine=Dzēst rindu
 RegulateStock=Regulēt krājumus
diff --git a/htdocs/langs/lv_LV/stripe.lang b/htdocs/langs/lv_LV/stripe.lang
index ae403d0fee8..85fcb475179 100644
--- a/htdocs/langs/lv_LV/stripe.lang
+++ b/htdocs/langs/lv_LV/stripe.lang
@@ -6,7 +6,7 @@ FollowingUrlAreAvailableToMakePayments=Pēc URL ir pieejami, lai piedāvātu lap
 PaymentForm=Maksājuma forma
 WelcomeOnPaymentPage=Laipni lūdzam mūsu tiešsaistes maksājumu pakalpojumu
 ThisScreenAllowsYouToPay=Šis logs ļauj jums veikt tiešsaistes maksājumu %s.
-ThisIsInformationOnPayment=Šī ir informācija par maksājumu, kas darīt
+ThisIsInformationOnPayment=Šī ir informācija par maksājumu, kas jādara
 ToComplete=Lai pabeigtu
 YourEMail=Nosūtīt saņemt maksājuma apstiprinājumu
 STRIPE_PAYONLINE_SENDEMAIL=E-pasta paziņojums pēc maksājuma mēģinājuma (veiksmes vai neveiksmes)
@@ -65,5 +65,5 @@ StripeUserAccountForActions=Lietotāja konts, lai izmantotu e-pasta paziņojumu
 StripePayoutList=Svītru izmaksu saraksts
 ToOfferALinkForTestWebhook=Saite uz iestatījumu Stripe WebHook, lai izsauktu IPN (testa režīms)
 ToOfferALinkForLiveWebhook=Saite uz iestatījumu Stripe WebHook, lai izsauktu IPN (tiešraides režīms)
-PaymentWillBeRecordedForNextPeriod=Payment will be recorded for the next period.
-ClickHereToTryAgain=<a href="%s">Click here to try again...</a>
+PaymentWillBeRecordedForNextPeriod=Maksājums tiks reģistrēts par nākamo periodu.
+ClickHereToTryAgain=<a href="%s">Noklikšķiniet šeit, lai mēģinātu vēlreiz ...</a>
diff --git a/htdocs/langs/lv_LV/suppliers.lang b/htdocs/langs/lv_LV/suppliers.lang
index 4db0e85c2c9..1045e43c00d 100644
--- a/htdocs/langs/lv_LV/suppliers.lang
+++ b/htdocs/langs/lv_LV/suppliers.lang
@@ -1,47 +1,47 @@
-# Dolibarr language file - Source file is en_US - suppliers
-Suppliers=Vendors
-SuppliersInvoice=Vendor invoice
-ShowSupplierInvoice=Show Vendor Invoice
-NewSupplier=New vendor
+# Dolibarr language file - Source file is en_US - vendors
+Suppliers=Pārdevēji
+SuppliersInvoice=Piegādātāja rēķins
+ShowSupplierInvoice=Rādīt piegādātāja rēķinu
+NewSupplier=Jauns pārdevējs
 History=Vēsture
-ListOfSuppliers=List of vendors
-ShowSupplier=Show vendor
+ListOfSuppliers=Pārdevēju saraksts
+ShowSupplier=Rādīt pārdevēju
 OrderDate=Pasūtīt datumu
-BuyingPriceMin=Best buying price
-BuyingPriceMinShort=Best buying price
+BuyingPriceMin=Labākā pirkuma cena
+BuyingPriceMinShort=Labākā pirkuma cena
 TotalBuyingPriceMinShort=Total of subproducts buying prices
-TotalSellingPriceMinShort=Total of subproducts selling prices
+TotalSellingPriceMinShort=Kopproduktu pārdošanas cenas kopā
 SomeSubProductHaveNoPrices=Dažiem apakšproduktiem nav norādītas cenas
 AddSupplierPrice=Pievienot pirkšanas cenu
 ChangeSupplierPrice=Mainīt piegādātāja cenu
-SupplierPrices=Vendor prices
-ReferenceSupplierIsAlreadyAssociatedWithAProduct=Šī atsauce piegādātājam jau ir saistīta ar atsauci: %s
-NoRecordedSuppliers=No vendor recorded
-SupplierPayment=Vendor payment
-SuppliersArea=Vendor area
-RefSupplierShort=Ref. vendor
+SupplierPrices=Pārdevēja cenas
+ReferenceSupplierIsAlreadyAssociatedWithAProduct=Šī pārdevēja atsauce jau ir saistīta ar produktu: %s
+NoRecordedSuppliers=Neviens pārdevējs nav reģistrēts
+SupplierPayment=Piegādātāja maksājums
+SuppliersArea=Pārdevēja apgabals
+RefSupplierShort=Atsauces pārdevējs
 Availability=Pieejamība
-ExportDataset_fournisseur_1=Vendor invoices list and invoice lines
-ExportDataset_fournisseur_2=Vendor invoices and payments
-ExportDataset_fournisseur_3=Purchase orders and order lines
+ExportDataset_fournisseur_1=Piegādātāja rēķini un faktūrrēķina dati
+ExportDataset_fournisseur_2=Pārdevēja rēķini un maksājumi
+ExportDataset_fournisseur_3=Iepirkumu pasūtījumi un pasūtījuma dati
 ApproveThisOrder=Apstiprināt šo pasūtījumu
 ConfirmApproveThisOrder=Vai jūs tiešām vēlaties apstiprināt pasūtījumu <b>%s?</b>
-DenyingThisOrder=Deny this order
+DenyingThisOrder=Aizliegt šo pasūtījumu
 ConfirmDenyingThisOrder=Vai jūs tiešām vēlaties aizliegt šo pasūtījumu <b>%s</b> ?
 ConfirmCancelThisOrder=Vai esat pārliecināts, ka vēlaties atcelt šo pasūtījumu <b>%s</b> ?
-AddSupplierOrder=Create Purchase Order
-AddSupplierInvoice=Create vendor invoice
-ListOfSupplierProductForSupplier=List of products and prices for vendor <b>%s</b>
-SentToSuppliers=Sent to vendors
-ListOfSupplierOrders=List of purchase orders
-MenuOrdersSupplierToBill=Purchase orders to invoice
-NbDaysToDelivery=Piegādes kavēšanās dienās
-DescNbDaysToDelivery=The biggest deliver delay of the products from this order
-SupplierReputation=Vendor reputation
+AddSupplierOrder=Izveidot iepirkuma pasūtījumu
+AddSupplierInvoice=Izveidot pārdevēja rēķinu
+ListOfSupplierProductForSupplier=Pārdevējs <b> %s </b> produktu un cenu saraksts
+SentToSuppliers=Nosūtīts pārdevējiem
+ListOfSupplierOrders=Pirkumu pasūtījumu saraksts
+MenuOrdersSupplierToBill=Pirkuma pasūtījumi rēķinam
+NbDaysToDelivery=Piegādes termiņš (dienas)
+DescNbDaysToDelivery=Šī pasūtījuma produktu ilgākais piegādes termiņš
+SupplierReputation=Pārdevēja reputācija
 DoNotOrderThisProductToThisSupplier=Nepasūtīt
-NotTheGoodQualitySupplier=Nepareizs daudzums
+NotTheGoodQualitySupplier=Zemas kvalitātes
 ReputationForThisProduct=Reputācija
 BuyerName=Pircēja vārds
 AllProductServicePrices=Visas produktu / pakalpojumu cenas
-AllProductReferencesOfSupplier=All product / service references of supplier
-BuyingPriceNumShort=Vendor prices
+AllProductReferencesOfSupplier=Visas pārdevēja produktu / pakalpojumu atsauces
+BuyingPriceNumShort=Pārdevēja cenas
diff --git a/htdocs/langs/lv_LV/ticket.lang b/htdocs/langs/lv_LV/ticket.lang
index 1b549ae0871..26c58fc430b 100644
--- a/htdocs/langs/lv_LV/ticket.lang
+++ b/htdocs/langs/lv_LV/ticket.lang
@@ -31,7 +31,7 @@ TicketDictType=Pieteikumu veids
 TicketDictCategory=Pieteikumu - grupas
 TicketDictSeverity=Pieteikuma svarīgums
 TicketTypeShortBUGSOFT=Dysfontionnement logiciel
-TicketTypeShortBUGHARD=Dysfontionnement matériel
+TicketTypeShortBUGHARD=Dysfonctionnement matériel
 TicketTypeShortCOM=Tirdzniecības jautājums
 TicketTypeShortINCIDENT=Palīdzības pieprasījums
 TicketTypeShortPROJET=Projekts
@@ -269,8 +269,8 @@ TicketPublicInterfaceForbidden=Pieteikumu publiskā saskarne nav iespējota
 ErrorEmailOrTrackingInvalid=Slikta vērtība izsekošanas ID vai e-pasta ziņojumam
 OldUser=Vecais lietotājs
 NewUser=Jauns lietotājs
-NumberOfTicketsByMonth=Biļešu skaits mēnesī
-NbOfTickets=Biļešu skaits
+NumberOfTicketsByMonth=Pieteikumu skaits mēnesī
+NbOfTickets=Pieteikumu skaits
 # notifications
 TicketNotificationEmailSubject=Pieteikums %s ir atjaunots
 TicketNotificationEmailBody=Šī ir automātiska ziņa, kas informē jūs, ka biļete %s tikko atjaunināta
diff --git a/htdocs/langs/lv_LV/website.lang b/htdocs/langs/lv_LV/website.lang
index b751bddd422..3b1dfc0fda8 100644
--- a/htdocs/langs/lv_LV/website.lang
+++ b/htdocs/langs/lv_LV/website.lang
@@ -2,7 +2,7 @@
 Shortname=Kods
 WebsiteSetupDesc=Izveidojiet šeit vietnes, kuras vēlaties izmantot. Pēc tam dodieties uz izvēlņu vietnes, lai tās rediģētu.
 DeleteWebsite=Dzēst mājaslapu
-ConfirmDeleteWebsite=Vai tiešām vēlaties dzēst šo vietni? Visas tās lapas un saturs tiks noņemtas.
+ConfirmDeleteWebsite=Vai tiešām vēlaties izdzēst šo vietni? Tiks noņemtas arī visas tā lapas un saturs. Augšupielādētie faili (piemēram, datu nesēju direktorijā, ECM modulī utt.) Paliks.
 WEBSITE_TYPE_CONTAINER=Lapas / konteinera veids
 WEBSITE_PAGE_EXAMPLE=Tīmekļa lapa, ko izmantot kā piemēru
 WEBSITE_PAGENAME=Lapas nosaukums / pseidonīms
@@ -11,9 +11,12 @@ WEBSITE_ALIASALTDesc=Izmantojiet šeit citu nosaukumu / aizstājvārdu sarakstu,
 WEBSITE_CSS_URL=URL of external CSS file
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript failu saturs (kopīgs visām lapām)
-WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages)
+WEBSITE_HTML_HEADER=Papildinājums HTML galvenes apakšā (kopīgs visām lapām)
 WEBSITE_ROBOT=Robotfails (robots.txt)
 WEBSITE_HTACCESS=Tīmekļa vietne .htaccess fails
+WEBSITE_MANIFEST_JSON=Vietnes manifest.json fails
+WEBSITE_README=Fails README.md
+EnterHereLicenseInformation=Ievadiet šeit meta datus vai licences informāciju, lai aizpildītu README.md failu. ja jūs izplatīsit savu vietni kā veidni, fails tiks iekļauts veidņu paketē.
 HtmlHeaderPage=HTML virsraksts (tikai šai lapai)
 PageNameAliasHelp=Lapas nosaukums vai pseidonīms. <br> Šis aizstājvārds tiek izmantots arī, lai izveidotu SEO vietrādi, ja vietne tiek izmantota no Web servera virtuālās saimniekdatora (piemēram, Apacke, Nginx, ...). Izmantojiet pogu "<strong> %s </strong>, lai rediģētu šo aizstājvārdu.
 EditTheWebSiteForACommonHeader=Piezīme: ja vēlaties norādīt personalizētu galveni visām lapām, rediģējiet virsrakstu vietnes līmenī, nevis lapā / konteinerā.
@@ -41,6 +44,7 @@ RealURL=Reāls URL
 ViewWebsiteInProduction=Apskatīt vietni, izmantojot mājas URL
 SetHereVirtualHost=<u> Lietošana ar Apache / NGinx / ... </u> <br> Ja jūs savā tīmekļa serverī (Apache, Nginx, ...) varat izveidot īpašu virtuālo resursdatoru ar iespējotu PHP un saknes direktoriju <br> <strong> %s </strong> <br> pēc tam iestatiet virtuālā uzņēmēja nosaukumu, kuru esat izveidojis tīmekļa vietnes īpašībās, tāpēc priekšskatījumu var izdarīt arī, izmantojot šo īpašo tīmekļa servera piekļuvi vietējā Dolibarr vietā serveri.
 YouCanAlsoTestWithPHPS=<u> Izmantojiet ar PHP serveri. </u> <br> Izstrādājot vidi, jūs varat izvēlēties testēt vietni ar PHP tīmekļa serveri (nepieciešams PHP 5.5), palaižot <br><strong> php -S 0.0. 0.0 8080-t %s</strong>
+YouCanAlsoDeployToAnotherWHP=<u>Izmantojiet savu vietni kopā ar citu Dolibarr mitināšanas pakalpojumu sniedzēju</u> <br> Ja jums nav pieejams tāds interneta serveris kā Apache vai NGinx, varat eksportēt un importēt savu vietni citā Dolibarr instancē, kuru nodrošina cits Dolibarr mitināšanas pakalpojumu sniedzējs un kas nodrošina pilnīgu integrāciju ar vietnes moduli. Dažu Dolibarr mitināšanas pakalpojumu sniedzēju sarakstu varat atrast vietnē <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
 CheckVirtualHostPerms=Pārbaudiet arī to, vai virtuālajam serverim ir atļauja <strong>%s</strong> failiem vietnē <br><strong>%s</strong>
 ReadPerm=Lasīt
 WritePerm=Rakstīt
@@ -75,7 +79,8 @@ AddWebsiteAccount=Izveidot mājas lapas kontu
 BackToListOfThirdParty=Atpakaļ uz trešo pušu sarakstu
 DisableSiteFirst=Vispirms atspējojiet vietni
 MyContainerTitle=Manas tīmekļa vietnes virsraksts
-AnotherContainer=Vēl viens konteiners
+AnotherContainer=Šis ir veids, kā iekļaut citas lapas / konteinera saturu (šeit, iespējams, iespējot dinamisko kodu, iespējams, ir kļūda, jo iegultais apakštvertne, iespējams, neeksistē)
+SorryWebsiteIsCurrentlyOffLine=Diemžēl šī vietne pašlaik nav pieejama. Lūdzu, atgriezieties vēlāk ...
 WEBSITE_USE_WEBSITE_ACCOUNTS=Iespējot tīmekļa vietnes kontu tabulu
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Ļauj tabulai saglabāt tīmekļa vietņu kontus (pieteikšanās / caurlaide) katrai vietnei / trešajai pusei
 YouMustDefineTheHomePage=Vispirms ir jādefinē noklusējuma sākumlapa
@@ -89,7 +94,8 @@ AliasPageAlreadyExists=Aliases lapa <strong>%s</strong> jau pastāv
 CorporateHomePage=Korporatīvā mājas lapa
 EmptyPage=Tukša lapa
 ExternalURLMustStartWithHttp=Ārējam URL ir jāsākas ar http: // vai https: //
-ZipOfWebsitePackageToImport=Zip faila vietnes pakotne
+ZipOfWebsitePackageToImport=Augšupielādējiet vietnes veidņu pakotnes ZIP failu
+ZipOfWebsitePackageToLoad=vai izvēlieties pieejamo iegultās vietnes veidņu paketi
 ShowSubcontainers=Iekļaut dinamisko saturu
 InternalURLOfPage=Lapas iekšējais URL
 ThisPageIsTranslationOf=Šī lapa / konteiners ir tulkojums
@@ -101,5 +107,10 @@ NotAllowedToAddDynamicContent=Jums nav atļaujas pievienot vai rediģēt PHP din
 ReplaceWebsiteContent=Meklēt vai aizstāt vietnes saturu
 DeleteAlsoJs=Vai arī dzēst visus šajā tīmekļa vietnē raksturīgos javascript failus?
 DeleteAlsoMedias=Vai arī dzēst visus šajā tīmekļa vietnē esošos mediju failus?
-# Export
 MyWebsitePages=Manas vietnes lapas
+SearchReplaceInto=Meklēt | Nomainiet uz
+ReplaceString=Jauna virkne
+CSSContentTooltipHelp=Ievadiet šeit CSS saturu. Lai izvairītos no konfliktiem ar lietojumprogrammas CSS, pārliecinieties, ka visa deklarācija ir jāpapildina ar .bodywebsite klasi. Piemēram: <br><br> #mycssselector, input.myclass: virziet kursoru {...} <br> jābūt <br> .bodywebsite #mycssselector, .bodywebsite input.myclass: hover {...} <br><br> Piezīme: ja jums ir liels fails bez šī prefiksa, varat izmantot “lessc”, lai to pārveidotu, lai visur pievienotu .bodywebsite prefiksu.
+LinkAndScriptsHereAreNotLoadedInEditor=Brīdinājums: Šis saturs tiek izvadīts tikai tad, ja vietnei piekļūst no servera. Tas netiek izmantots rediģēšanas režīmā, tāpēc, ja javascript faili ir jāielādē arī rediģēšanas režīmā, vienkārši pievienojiet lapā tagu &#39;script src = ...&#39;.
+Dynamiccontent=Lapas ar dinamisku saturu paraugs
+ImportSite=Importēt vietnes veidni
diff --git a/htdocs/langs/lv_LV/withdrawals.lang b/htdocs/langs/lv_LV/withdrawals.lang
index f91254633f6..31443407ada 100644
--- a/htdocs/langs/lv_LV/withdrawals.lang
+++ b/htdocs/langs/lv_LV/withdrawals.lang
@@ -76,8 +76,8 @@ WithdrawalFile=Izstāšanās fails
 SetToStatusSent=Nomainīt uz statusu "Fails nosūtīts"
 ThisWillAlsoAddPaymentOnInvoice=Tas arī ierakstīs maksājumus rēķiniem un klasificēs tos kā "Apmaksātais", ja atlikušais maksājums ir nulle
 StatisticsByLineStatus=Statistics by status of lines
-RUM=Unique Mandate Reference (UMR)
-DateRUM=Mandate signature date
+RUM=Unikālā pilnvaru atsauce (UMR)
+DateRUM=Pilnvaras parakstīšanas datums
 RUMLong=Unikāla pilnvaru atsauce
 RUMWillBeGenerated=Ja tukša, UMR (Unique Mandate Reference) tiks ģenerēta, tiklīdz tiks saglabāta bankas konta informācija.
 WithdrawMode=Tiešā debeta režīms (FRST vai RECUR)
diff --git a/htdocs/langs/mk_MK/admin.lang b/htdocs/langs/mk_MK/admin.lang
index fc4715fc86d..df0020f80e5 100644
--- a/htdocs/langs/mk_MK/admin.lang
+++ b/htdocs/langs/mk_MK/admin.lang
@@ -400,6 +400,7 @@ OldVATRates=Old VAT rate
 NewVATRates=New VAT rate
 PriceBaseTypeToChange=Modify on prices with base reference value defined on
 MassConvert=Launch bulk conversion
+PriceFormatInCurrentLanguage=Price Format In Current Language
 String=String
 TextLong=Long text
 HtmlText=Html text
@@ -431,7 +432,7 @@ ExtrafieldParamHelpradio=List of values must be lines with format key,value (whe
 ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- idfilter is necessarly a primary int key<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=List of values 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>Examples:<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
-ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default)<br>Set this to 2 for a collapsing separator (collapsed by default)
+ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Library used for PDF generation
 LocalTaxDesc=Some countries may apply two or three taxes on each invoice line. If this is the case, choose the type for the 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)
 SMS=SMS
@@ -1023,11 +1024,11 @@ WebServer=Web server
 DocumentRootServer=Web server's root directory
 DataRootServer=Data files directory
 IP=IP
-Port=Port
+Port=Порта
 VirtualServerName=Virtual server name
 OS=OS
 PhpWebLink=Web-Php link
-Server=Server
+Server=Сервер
 Database=Database
 DatabaseServer=Database host
 DatabaseName=Database name
@@ -1037,7 +1038,7 @@ DatabasePassword=Database password
 Tables=Tables
 TableName=Table name
 NbOfRecord=No. of records
-Host=Server
+Host=Сервер
 DriverType=Driver type
 SummarySystem=System information summary
 SummaryConst=List of all Dolibarr setup parameters
@@ -1695,7 +1696,7 @@ SuppliersInvoiceNumberingModel=Vendor invoices numbering models
 IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=GeoIP Maxmind module setup
-PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat
+PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoLite2-Country.mmdb
 NoteOnPathLocation=Note that your ip to country data file must be inside a directory your PHP can read (Check your PHP open_basedir setup and filesystem permissions).
 YouCanDownloadFreeDatFileTo=You can download a <b>free demo version</b> of the Maxmind GeoIP country file at %s.
 YouCanDownloadAdvancedDatFileTo=You can also download a more <b>complete version, with updates,</b> of the Maxmind GeoIP country file at %s.
@@ -1926,14 +1927,13 @@ SmallerThan=Smaller than
 LargerThan=Larger than
 IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID is found into incoming email, the event will be automatically linked to the related objects.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
-IFTTTSetup=IFTTT module setup
-IFTTT_SERVICE_KEY=IFTTT Service key
-IFTTT_DOLIBARR_ENDPOINT_SECUREKEY=Security key to secure the endpoint URL used by IFTTT to send messages to your Dolibarr.
-IFTTTDesc=This module is designed to trigger events on IFTTT and/or to execute some action on external IFTTT triggers.
-UrlForIFTTT=URL endpoint for IFTTT
-YouWillFindItOnYourIFTTTAccount=You will find it on your IFTTT account
 EndPointFor=End point for %s : %s
 DeleteEmailCollector=Delete email collector
 ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
 RecipientEmailsWillBeReplacedWithThisValue=Recipient emails will be always replaced with this value
 AtLeastOneDefaultBankAccountMandatory=At least 1 default bank account must be defined
+RESTRICT_API_ON_IP=Allow available APIs to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can use the available APIs.
+RESTRICT_ON_IP=Allow access to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can access.
+BaseOnSabeDavVersion=Based on the library SabreDAV version
+NotAPublicIp=Not a public IP
+MakeAnonymousPing=Make an anonymous Ping '+1' to the Dolibarr foundation server (done 1 time only after installation) to allow the foundation to count the number of Dolibarr installation.
diff --git a/htdocs/langs/mk_MK/banks.lang b/htdocs/langs/mk_MK/banks.lang
index c77158e07b7..47295ec7e31 100644
--- a/htdocs/langs/mk_MK/banks.lang
+++ b/htdocs/langs/mk_MK/banks.lang
@@ -73,6 +73,7 @@ BankTransaction=Bank entry
 ListTransactions=List entries
 ListTransactionsByCategory=List entries/category
 TransactionsToConciliate=Entries to reconcile
+TransactionsToConciliateShort=To reconcile
 Conciliable=Can be reconciled
 Conciliate=Reconcile
 Conciliation=Reconciliation
@@ -116,6 +117,7 @@ DeleteCheckReceipt=Delete this check receipt?
 ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
 BankChecks=Bank checks
 BankChecksToReceipt=Checks awaiting deposit
+BankChecksToReceiptShort=Checks awaiting deposit
 ShowCheckReceipt=Show check deposit receipt
 NumberOfCheques=No. of check
 DeleteTransaction=Delete entry
diff --git a/htdocs/langs/mk_MK/cashdesk.lang b/htdocs/langs/mk_MK/cashdesk.lang
index ea0e660ed2d..33ea50dfb0f 100644
--- a/htdocs/langs/mk_MK/cashdesk.lang
+++ b/htdocs/langs/mk_MK/cashdesk.lang
@@ -62,6 +62,7 @@ TicketVatGrouped=Group VAT by rate in tickets
 AutoPrintTickets=Automatically print tickets
 EnableBarOrRestaurantFeatures=Enable features for Bar or Restaurant
 ConfirmDeletionOfThisPOSSale=Do your confirm the deletion of this current sale ?
+ConfirmDiscardOfThisPOSSale=Do you want to discard this current sale ?
 History=History
 ValidateAndClose=Validate and close
 Terminal=Terminal
@@ -69,3 +70,8 @@ NumberOfTerminals=Number of Terminals
 TerminalSelect=Select terminal you want to use:
 POSTicket=POS Ticket
 BasicPhoneLayout=Use basic layout for phones
+SetupOfTerminalNotComplete=Setup of terminal %s is not complete
+DirectPayment=Direct payment
+DirectPaymentButton=Direct cash payment button
+InvoiceIsAlreadyValidated=Invoice is already validated
+NoLinesToBill=No lines to bill
diff --git a/htdocs/langs/mk_MK/companies.lang b/htdocs/langs/mk_MK/companies.lang
index 5a6e506d90e..24a43c08230 100644
--- a/htdocs/langs/mk_MK/companies.lang
+++ b/htdocs/langs/mk_MK/companies.lang
@@ -54,6 +54,7 @@ Firstname=First name
 PostOrFunction=Job position
 UserTitle=Title
 NatureOfThirdParty=Nature of Third party
+NatureOfContact=Nature of Contact
 Address=Address
 State=State/Province
 StateShort=State
diff --git a/htdocs/langs/mk_MK/contracts.lang b/htdocs/langs/mk_MK/contracts.lang
index 51b73423fb0..47572c355ab 100644
--- a/htdocs/langs/mk_MK/contracts.lang
+++ b/htdocs/langs/mk_MK/contracts.lang
@@ -51,6 +51,7 @@ ListOfClosedServices=List of closed services
 ListOfRunningServices=List of running services
 NotActivatedServices=Inactive services (among validated contracts)
 BoardNotActivatedServices=Services to activate among validated contracts
+BoardNotActivatedServicesShort=Services to activate
 LastContracts=Latest %s contracts
 LastModifiedServices=Latest %s modified services
 ContractStartDate=Start date
@@ -64,7 +65,10 @@ DateStartRealShort=Real start date
 DateEndReal=Real end date
 DateEndRealShort=Real end date
 CloseService=Close service
-BoardRunningServices=Expired running services
+BoardRunningServices=Services running
+BoardRunningServicesShort=Services running
+BoardExpiredServices=Services expired
+BoardExpiredServicesShort=Services expired
 ServiceStatus=Status of service
 DraftContracts=Drafts contracts
 CloseRefusedBecauseOneServiceActive=Contract can't be closed as there is at least one open service on it
diff --git a/htdocs/langs/mk_MK/errors.lang b/htdocs/langs/mk_MK/errors.lang
index 1ee46fdbb92..0c07b2eafc4 100644
--- a/htdocs/langs/mk_MK/errors.lang
+++ b/htdocs/langs/mk_MK/errors.lang
@@ -218,6 +218,7 @@ ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text
 ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Error, delete payment linked to a closed invoice is not possible.
+ErrorSearchCriteriaTooSmall=Search criteria too small.
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 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/install.lang b/htdocs/langs/mk_MK/install.lang
index 2fe7dc8c038..867f82f2ca0 100644
--- a/htdocs/langs/mk_MK/install.lang
+++ b/htdocs/langs/mk_MK/install.lang
@@ -46,7 +46,7 @@ CheckToForceHttps=Check this option to force secure connections (https).<br>This
 DolibarrDatabase=Dolibarr Database
 DatabaseType=Database type
 DriverType=Driver type
-Server=Server
+Server=Сервер
 ServerAddressDescription=Name or ip address for the database server. Usually 'localhost' when the database server is hosted on the same server as the web server.
 ServerPortDescription=Database server port. Keep empty if unknown.
 DatabaseServer=Database server
diff --git a/htdocs/langs/mk_MK/main.lang b/htdocs/langs/mk_MK/main.lang
index 0982c8b0195..033f7c8fb06 100644
--- a/htdocs/langs/mk_MK/main.lang
+++ b/htdocs/langs/mk_MK/main.lang
@@ -28,6 +28,7 @@ NoTemplateDefined=No template available for this email type
 AvailableVariables=Available substitution variables
 NoTranslation=No translation
 Translation=Translation
+EmptySearchString=Enter a non empty search string
 NoRecordFound=No record found
 NoRecordDeleted=No record deleted
 NotEnoughDataYet=Not enough data
@@ -704,6 +705,7 @@ DateOfSignature=Date of signature
 HidePassword=Show command with password hidden
 UnHidePassword=Show real command with clear password
 Root=Root
+RootOfMedias=Root of public medias (/medias)
 Informations=Information
 Page=Page
 Notes=Notes
@@ -981,3 +983,10 @@ PaymentInformation=Payment information
 ValidFrom=Valid from
 ValidUntil=Valid until
 NoRecordedUsers=No users
+ToClose=To close
+ToProcess=To process
+ToApprove=To approve
+GlobalOpenedElemView=Global view
+NoArticlesFoundForTheKeyword=No article found for the keyword '<strong>%s</strong>'
+NoArticlesFoundForTheCategory=No article found for the category
+ToAcceptRefuse=To accept | refuse
diff --git a/htdocs/langs/mk_MK/members.lang b/htdocs/langs/mk_MK/members.lang
index 9993e05428f..5886c598d52 100644
--- a/htdocs/langs/mk_MK/members.lang
+++ b/htdocs/langs/mk_MK/members.lang
@@ -29,6 +29,7 @@ MenuMembersUpToDate=Up to date members
 MenuMembersNotUpToDate=Out of date members
 MenuMembersResiliated=Terminated members
 MembersWithSubscriptionToReceive=Members with subscription to receive
+MembersWithSubscriptionToReceiveShort=Subscription to receive
 DateSubscription=Subscription date
 DateEndSubscription=Subscription end date
 EndSubscription=End subscription
diff --git a/htdocs/langs/mk_MK/projects.lang b/htdocs/langs/mk_MK/projects.lang
index 76bd0ce597d..d144fccd272 100644
--- a/htdocs/langs/mk_MK/projects.lang
+++ b/htdocs/langs/mk_MK/projects.lang
@@ -76,7 +76,13 @@ MyProjects=My projects
 MyProjectsArea=My projects Area
 DurationEffective=Effective duration
 ProgressDeclared=Declared progress
+TaskProgressSummary=Task progress
+CurentlyOpenedTasks=Curently opened tasks
+TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared progress is less %s than the calculated progression
+TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared progress is more %s than the calculated progression
 ProgressCalculated=Calculated progress
+WhichIamLinkedTo=which I'm linked to
+WhichIamLinkedToProject=which I'm linked to project
 Time=Time
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
diff --git a/htdocs/langs/mk_MK/website.lang b/htdocs/langs/mk_MK/website.lang
index 0ee00aff7c0..9648ae48cc8 100644
--- a/htdocs/langs/mk_MK/website.lang
+++ b/htdocs/langs/mk_MK/website.lang
@@ -2,7 +2,7 @@
 Shortname=Code
 WebsiteSetupDesc=Create here the websites you wish to use. Then go into menu Websites to edit them.
 DeleteWebsite=Delete website
-ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed.
+ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed. The files uploaded (like into the medias directory, the ECM module, ...) will remain.
 WEBSITE_TYPE_CONTAINER=Type of page/container
 WEBSITE_PAGE_EXAMPLE=Web page to use as example
 WEBSITE_PAGENAME=Page name/alias
@@ -14,6 +14,9 @@ WEBSITE_JS_INLINE=Javascript file content (common to all pages)
 WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages)
 WEBSITE_ROBOT=Robot file (robots.txt)
 WEBSITE_HTACCESS=Website .htaccess file
+WEBSITE_MANIFEST_JSON=Website manifest.json file
+WEBSITE_README=README.md file
+EnterHereLicenseInformation=Enter here meta data or license information to fille a README.md file. if you distribute your website as a template, the file will be included into the temptate package.
 HtmlHeaderPage=HTML header (specific to this page only)
 PageNameAliasHelp=Name or alias of the page.<br>This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "<strong>%s</strong>" to edit this alias.
 EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container.
@@ -41,6 +44,7 @@ RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
 SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then set the name of the virtual host you have created in the properties of web site, so the preview can be done also using this dedicated web server access instead of the internal Dolibarr server.
 YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
 CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
 ReadPerm=Read
 WritePerm=Write
@@ -75,7 +79,8 @@ AddWebsiteAccount=Create web site account
 BackToListOfThirdParty=Back to list for Third Party
 DisableSiteFirst=Disable website first
 MyContainerTitle=My web site title
-AnotherContainer=Another container
+AnotherContainer=This is how to include content of another page/container (you may have an error here if you enable dynamic code because the embedded subcontainer may not exists)
+SorryWebsiteIsCurrentlyOffLine=Sorry, this website is currently off line. Please comme back later...
 WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / third party
 YouMustDefineTheHomePage=You must first define the default Home page
@@ -89,7 +94,8 @@ AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
 CorporateHomePage=Corporate Home page
 EmptyPage=Empty page
 ExternalURLMustStartWithHttp=External URL must start with http:// or https://
-ZipOfWebsitePackageToImport=Zip file of website package
+ZipOfWebsitePackageToImport=Upload the Zip file of the website template package
+ZipOfWebsitePackageToLoad=or Choose an available embedded website template package
 ShowSubcontainers=Include dynamic content
 InternalURLOfPage=Internal URL of page
 ThisPageIsTranslationOf=This page/container is a translation of
@@ -101,5 +107,10 @@ NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynam
 ReplaceWebsiteContent=Search or Replace website content
 DeleteAlsoJs=Delete also all javascript files specific to this website?
 DeleteAlsoMedias=Delete also all medias files specific to this website?
-# Export
 MyWebsitePages=My website pages
+SearchReplaceInto=Search | Replace into
+ReplaceString=New string
+CSSContentTooltipHelp=Enter here CSS content. To avoid any conflict with the CSS of the application, be sure to prepend all declaration with the .bodywebsite class. For example:<br><br>#mycssselector, input.myclass:hover { ... }<br>must be<br>.bodywebsite #mycssselector, .bodywebsite input.myclass:hover { ... }<br><br>Note: If you have a large file without this prefix, you can use 'lessc' to convert it to append the .bodywebsite prefix everywhere.
+LinkAndScriptsHereAreNotLoadedInEditor=Warning: This content is output only when site is accessed from a server. It is not used in Edit mode so if you need to load javascript files also in edit mode, just add your tag 'script src=...' into the page.
+Dynamiccontent=Sample of a page with dynamic content
+ImportSite=Import website template
diff --git a/htdocs/langs/mn_MN/admin.lang b/htdocs/langs/mn_MN/admin.lang
index 2e27c6fe81f..1a1891009cf 100644
--- a/htdocs/langs/mn_MN/admin.lang
+++ b/htdocs/langs/mn_MN/admin.lang
@@ -400,6 +400,7 @@ OldVATRates=Old VAT rate
 NewVATRates=New VAT rate
 PriceBaseTypeToChange=Modify on prices with base reference value defined on
 MassConvert=Launch bulk conversion
+PriceFormatInCurrentLanguage=Price Format In Current Language
 String=String
 TextLong=Long text
 HtmlText=Html text
@@ -431,7 +432,7 @@ ExtrafieldParamHelpradio=List of values must be lines with format key,value (whe
 ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- idfilter is necessarly a primary int key<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=List of values 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>Examples:<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
-ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default)<br>Set this to 2 for a collapsing separator (collapsed by default)
+ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Library used for PDF generation
 LocalTaxDesc=Some countries may apply two or three taxes on each invoice line. If this is the case, choose the type for the 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)
 SMS=SMS
@@ -1695,7 +1696,7 @@ SuppliersInvoiceNumberingModel=Vendor invoices numbering models
 IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=GeoIP Maxmind module setup
-PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat
+PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoLite2-Country.mmdb
 NoteOnPathLocation=Note that your ip to country data file must be inside a directory your PHP can read (Check your PHP open_basedir setup and filesystem permissions).
 YouCanDownloadFreeDatFileTo=You can download a <b>free demo version</b> of the Maxmind GeoIP country file at %s.
 YouCanDownloadAdvancedDatFileTo=You can also download a more <b>complete version, with updates,</b> of the Maxmind GeoIP country file at %s.
@@ -1926,14 +1927,13 @@ SmallerThan=Smaller than
 LargerThan=Larger than
 IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID is found into incoming email, the event will be automatically linked to the related objects.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
-IFTTTSetup=IFTTT module setup
-IFTTT_SERVICE_KEY=IFTTT Service key
-IFTTT_DOLIBARR_ENDPOINT_SECUREKEY=Security key to secure the endpoint URL used by IFTTT to send messages to your Dolibarr.
-IFTTTDesc=This module is designed to trigger events on IFTTT and/or to execute some action on external IFTTT triggers.
-UrlForIFTTT=URL endpoint for IFTTT
-YouWillFindItOnYourIFTTTAccount=You will find it on your IFTTT account
 EndPointFor=End point for %s : %s
 DeleteEmailCollector=Delete email collector
 ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
 RecipientEmailsWillBeReplacedWithThisValue=Recipient emails will be always replaced with this value
 AtLeastOneDefaultBankAccountMandatory=At least 1 default bank account must be defined
+RESTRICT_API_ON_IP=Allow available APIs to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can use the available APIs.
+RESTRICT_ON_IP=Allow access to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can access.
+BaseOnSabeDavVersion=Based on the library SabreDAV version
+NotAPublicIp=Not a public IP
+MakeAnonymousPing=Make an anonymous Ping '+1' to the Dolibarr foundation server (done 1 time only after installation) to allow the foundation to count the number of Dolibarr installation.
diff --git a/htdocs/langs/mn_MN/banks.lang b/htdocs/langs/mn_MN/banks.lang
index c77158e07b7..47295ec7e31 100644
--- a/htdocs/langs/mn_MN/banks.lang
+++ b/htdocs/langs/mn_MN/banks.lang
@@ -73,6 +73,7 @@ BankTransaction=Bank entry
 ListTransactions=List entries
 ListTransactionsByCategory=List entries/category
 TransactionsToConciliate=Entries to reconcile
+TransactionsToConciliateShort=To reconcile
 Conciliable=Can be reconciled
 Conciliate=Reconcile
 Conciliation=Reconciliation
@@ -116,6 +117,7 @@ DeleteCheckReceipt=Delete this check receipt?
 ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
 BankChecks=Bank checks
 BankChecksToReceipt=Checks awaiting deposit
+BankChecksToReceiptShort=Checks awaiting deposit
 ShowCheckReceipt=Show check deposit receipt
 NumberOfCheques=No. of check
 DeleteTransaction=Delete entry
diff --git a/htdocs/langs/mn_MN/cashdesk.lang b/htdocs/langs/mn_MN/cashdesk.lang
index ea0e660ed2d..33ea50dfb0f 100644
--- a/htdocs/langs/mn_MN/cashdesk.lang
+++ b/htdocs/langs/mn_MN/cashdesk.lang
@@ -62,6 +62,7 @@ TicketVatGrouped=Group VAT by rate in tickets
 AutoPrintTickets=Automatically print tickets
 EnableBarOrRestaurantFeatures=Enable features for Bar or Restaurant
 ConfirmDeletionOfThisPOSSale=Do your confirm the deletion of this current sale ?
+ConfirmDiscardOfThisPOSSale=Do you want to discard this current sale ?
 History=History
 ValidateAndClose=Validate and close
 Terminal=Terminal
@@ -69,3 +70,8 @@ NumberOfTerminals=Number of Terminals
 TerminalSelect=Select terminal you want to use:
 POSTicket=POS Ticket
 BasicPhoneLayout=Use basic layout for phones
+SetupOfTerminalNotComplete=Setup of terminal %s is not complete
+DirectPayment=Direct payment
+DirectPaymentButton=Direct cash payment button
+InvoiceIsAlreadyValidated=Invoice is already validated
+NoLinesToBill=No lines to bill
diff --git a/htdocs/langs/mn_MN/companies.lang b/htdocs/langs/mn_MN/companies.lang
index 578f5cb8920..8235c74ddda 100644
--- a/htdocs/langs/mn_MN/companies.lang
+++ b/htdocs/langs/mn_MN/companies.lang
@@ -54,6 +54,7 @@ Firstname=First name
 PostOrFunction=Job position
 UserTitle=Title
 NatureOfThirdParty=Nature of Third party
+NatureOfContact=Nature of Contact
 Address=Address
 State=State/Province
 StateShort=State
diff --git a/htdocs/langs/mn_MN/contracts.lang b/htdocs/langs/mn_MN/contracts.lang
index 51b73423fb0..47572c355ab 100644
--- a/htdocs/langs/mn_MN/contracts.lang
+++ b/htdocs/langs/mn_MN/contracts.lang
@@ -51,6 +51,7 @@ ListOfClosedServices=List of closed services
 ListOfRunningServices=List of running services
 NotActivatedServices=Inactive services (among validated contracts)
 BoardNotActivatedServices=Services to activate among validated contracts
+BoardNotActivatedServicesShort=Services to activate
 LastContracts=Latest %s contracts
 LastModifiedServices=Latest %s modified services
 ContractStartDate=Start date
@@ -64,7 +65,10 @@ DateStartRealShort=Real start date
 DateEndReal=Real end date
 DateEndRealShort=Real end date
 CloseService=Close service
-BoardRunningServices=Expired running services
+BoardRunningServices=Services running
+BoardRunningServicesShort=Services running
+BoardExpiredServices=Services expired
+BoardExpiredServicesShort=Services expired
 ServiceStatus=Status of service
 DraftContracts=Drafts contracts
 CloseRefusedBecauseOneServiceActive=Contract can't be closed as there is at least one open service on it
diff --git a/htdocs/langs/mn_MN/errors.lang b/htdocs/langs/mn_MN/errors.lang
index 1ee46fdbb92..0c07b2eafc4 100644
--- a/htdocs/langs/mn_MN/errors.lang
+++ b/htdocs/langs/mn_MN/errors.lang
@@ -218,6 +218,7 @@ ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text
 ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Error, delete payment linked to a closed invoice is not possible.
+ErrorSearchCriteriaTooSmall=Search criteria too small.
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 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/main.lang b/htdocs/langs/mn_MN/main.lang
index 5f83892413d..bfd0f29e748 100644
--- a/htdocs/langs/mn_MN/main.lang
+++ b/htdocs/langs/mn_MN/main.lang
@@ -28,6 +28,7 @@ NoTemplateDefined=No template available for this email type
 AvailableVariables=Available substitution variables
 NoTranslation=No translation
 Translation=Translation
+EmptySearchString=Enter a non empty search string
 NoRecordFound=No record found
 NoRecordDeleted=No record deleted
 NotEnoughDataYet=Not enough data
@@ -704,6 +705,7 @@ DateOfSignature=Date of signature
 HidePassword=Show command with password hidden
 UnHidePassword=Show real command with clear password
 Root=Root
+RootOfMedias=Root of public medias (/medias)
 Informations=Information
 Page=Page
 Notes=Notes
@@ -981,3 +983,10 @@ PaymentInformation=Payment information
 ValidFrom=Valid from
 ValidUntil=Valid until
 NoRecordedUsers=No users
+ToClose=To close
+ToProcess=To process
+ToApprove=To approve
+GlobalOpenedElemView=Global view
+NoArticlesFoundForTheKeyword=No article found for the keyword '<strong>%s</strong>'
+NoArticlesFoundForTheCategory=No article found for the category
+ToAcceptRefuse=To accept | refuse
diff --git a/htdocs/langs/mn_MN/members.lang b/htdocs/langs/mn_MN/members.lang
index 9993e05428f..5886c598d52 100644
--- a/htdocs/langs/mn_MN/members.lang
+++ b/htdocs/langs/mn_MN/members.lang
@@ -29,6 +29,7 @@ MenuMembersUpToDate=Up to date members
 MenuMembersNotUpToDate=Out of date members
 MenuMembersResiliated=Terminated members
 MembersWithSubscriptionToReceive=Members with subscription to receive
+MembersWithSubscriptionToReceiveShort=Subscription to receive
 DateSubscription=Subscription date
 DateEndSubscription=Subscription end date
 EndSubscription=End subscription
diff --git a/htdocs/langs/mn_MN/projects.lang b/htdocs/langs/mn_MN/projects.lang
index 76bd0ce597d..d144fccd272 100644
--- a/htdocs/langs/mn_MN/projects.lang
+++ b/htdocs/langs/mn_MN/projects.lang
@@ -76,7 +76,13 @@ MyProjects=My projects
 MyProjectsArea=My projects Area
 DurationEffective=Effective duration
 ProgressDeclared=Declared progress
+TaskProgressSummary=Task progress
+CurentlyOpenedTasks=Curently opened tasks
+TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared progress is less %s than the calculated progression
+TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared progress is more %s than the calculated progression
 ProgressCalculated=Calculated progress
+WhichIamLinkedTo=which I'm linked to
+WhichIamLinkedToProject=which I'm linked to project
 Time=Time
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
diff --git a/htdocs/langs/mn_MN/website.lang b/htdocs/langs/mn_MN/website.lang
index 0ee00aff7c0..9648ae48cc8 100644
--- a/htdocs/langs/mn_MN/website.lang
+++ b/htdocs/langs/mn_MN/website.lang
@@ -2,7 +2,7 @@
 Shortname=Code
 WebsiteSetupDesc=Create here the websites you wish to use. Then go into menu Websites to edit them.
 DeleteWebsite=Delete website
-ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed.
+ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed. The files uploaded (like into the medias directory, the ECM module, ...) will remain.
 WEBSITE_TYPE_CONTAINER=Type of page/container
 WEBSITE_PAGE_EXAMPLE=Web page to use as example
 WEBSITE_PAGENAME=Page name/alias
@@ -14,6 +14,9 @@ WEBSITE_JS_INLINE=Javascript file content (common to all pages)
 WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages)
 WEBSITE_ROBOT=Robot file (robots.txt)
 WEBSITE_HTACCESS=Website .htaccess file
+WEBSITE_MANIFEST_JSON=Website manifest.json file
+WEBSITE_README=README.md file
+EnterHereLicenseInformation=Enter here meta data or license information to fille a README.md file. if you distribute your website as a template, the file will be included into the temptate package.
 HtmlHeaderPage=HTML header (specific to this page only)
 PageNameAliasHelp=Name or alias of the page.<br>This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "<strong>%s</strong>" to edit this alias.
 EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container.
@@ -41,6 +44,7 @@ RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
 SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then set the name of the virtual host you have created in the properties of web site, so the preview can be done also using this dedicated web server access instead of the internal Dolibarr server.
 YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
 CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
 ReadPerm=Read
 WritePerm=Write
@@ -75,7 +79,8 @@ AddWebsiteAccount=Create web site account
 BackToListOfThirdParty=Back to list for Third Party
 DisableSiteFirst=Disable website first
 MyContainerTitle=My web site title
-AnotherContainer=Another container
+AnotherContainer=This is how to include content of another page/container (you may have an error here if you enable dynamic code because the embedded subcontainer may not exists)
+SorryWebsiteIsCurrentlyOffLine=Sorry, this website is currently off line. Please comme back later...
 WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / third party
 YouMustDefineTheHomePage=You must first define the default Home page
@@ -89,7 +94,8 @@ AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
 CorporateHomePage=Corporate Home page
 EmptyPage=Empty page
 ExternalURLMustStartWithHttp=External URL must start with http:// or https://
-ZipOfWebsitePackageToImport=Zip file of website package
+ZipOfWebsitePackageToImport=Upload the Zip file of the website template package
+ZipOfWebsitePackageToLoad=or Choose an available embedded website template package
 ShowSubcontainers=Include dynamic content
 InternalURLOfPage=Internal URL of page
 ThisPageIsTranslationOf=This page/container is a translation of
@@ -101,5 +107,10 @@ NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynam
 ReplaceWebsiteContent=Search or Replace website content
 DeleteAlsoJs=Delete also all javascript files specific to this website?
 DeleteAlsoMedias=Delete also all medias files specific to this website?
-# Export
 MyWebsitePages=My website pages
+SearchReplaceInto=Search | Replace into
+ReplaceString=New string
+CSSContentTooltipHelp=Enter here CSS content. To avoid any conflict with the CSS of the application, be sure to prepend all declaration with the .bodywebsite class. For example:<br><br>#mycssselector, input.myclass:hover { ... }<br>must be<br>.bodywebsite #mycssselector, .bodywebsite input.myclass:hover { ... }<br><br>Note: If you have a large file without this prefix, you can use 'lessc' to convert it to append the .bodywebsite prefix everywhere.
+LinkAndScriptsHereAreNotLoadedInEditor=Warning: This content is output only when site is accessed from a server. It is not used in Edit mode so if you need to load javascript files also in edit mode, just add your tag 'script src=...' into the page.
+Dynamiccontent=Sample of a page with dynamic content
+ImportSite=Import website template
diff --git a/htdocs/langs/nb_NO/admin.lang b/htdocs/langs/nb_NO/admin.lang
index 850c648f279..f15d8c0249b 100644
--- a/htdocs/langs/nb_NO/admin.lang
+++ b/htdocs/langs/nb_NO/admin.lang
@@ -400,6 +400,7 @@ OldVATRates=Gammel MVA-sats
 NewVATRates=Ny MVA-sats
 PriceBaseTypeToChange=Endre på prisene med base referanseverdi definert på
 MassConvert=Start massekonvertering
+PriceFormatInCurrentLanguage=Price Format In Current Language
 String=Streng
 TextLong=Lang tekst
 HtmlText=HTML-tekst
@@ -431,7 +432,7 @@ ExtrafieldParamHelpradio=Liste over verdier må være linjer med formatet nøkke
 ExtrafieldParamHelpsellist=Liste over verdier kommer fra en tabell<br>Syntaks: tabellnavn: label_field: id_field::filter<br> Eksempel: c_typent: libelle:id::filter<br><br>- idfilter er nødvendigvis en primær int nøkkel<br>- filteret kan være en enkel test (f.eks. aktiv = 1) for å vise bare aktiv verdi <br> Du kan også bruke $ID$ i filtre, som er gjeldende ID for nåværende objekt <br> For å utføre en SELECT i filtre, bruk $SEL$<br> Hvis du vil filtrere på ekstrafelt, bruk syntaks extra.fieldcode=... (der feltkoden er koden til ekstrafelt)<br><br>For å få listen avhengig av en annen komplementær attributtliste: <br>c_typent:libelle:id:options_<i>parent_list_code</i> | parent_column:filter <br><br>For å få listen avhengig av en annen liste:<br>c_typent:libelle:id:<i>parent_list_code </i>|parent_column:filter
 ExtrafieldParamHelpchkbxlst=Liste over verdier kommer fra en tabell <br> Syntaks: table_name:label_field:id_field::filter <br> Eksempel: c_typent:libelle:id::filter<br><br> filter kan være en enkel test (f.eks. Aktiv=1 ) for å vise bare aktiv verdi<br>Du kan også bruke $ID$ i filter, som er gjeldende ID for nåværende objekt<br>For å utføre en SELECT i filter, bruk $SEL$<br>Hvis du vil filtrere på ekstrafeltbruk bruk syntaks extra.fieldcode=... (der feltkoden er koden til ekstrafelt)<br><br>For å få listen avhengig av en annen komplementær attributtliste:<br>c_typent:libelle:id:options_<i>parent_list_code </i> |parent_column:filter<br><br>For å få listen avhengig av en annen liste:<br>c_typent:libelle:id:<i>parent_list_code</i> |parent_column:filter
 ExtrafieldParamHelplink=Parametere må være ObjectName: Classpath <br> Syntax: ObjectName: Classpath <br> Eksempler: <br> Societe: societe / class / societe.class.php <br> Kontakt: kontakt / class / contact.class.php
-ExtrafieldParamHelpSeparator=Hold tom for en enkel separator <br> Sett dette til 1 for en kollapserende separator (åpen som standard) <br> Sett dette til 2 for en kollapserende separator (kollapset som standard)
+ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Bibliotek brukt for PDF-generering
 LocalTaxDesc=For noen land gjelder to eller tre skatter på hver fakturalinje. Dersom dette er tilfelle, velg type for andre og tredje skatt, samt sats. Mulig type: <br> 1: lokalavgift gjelder på varer og tjenester uten mva (lokal avgift er beregnet beløp uten mva) <br> 2: lokalavgift gjelder på varer og tjenester, inkludert merverdiavgift (lokalavgift beregnes på beløpet + hovedavgift) <br> 3: lokalavgift gjelder på varer uten mva (lokalavgift er beregnet beløp uten mva) <br> 4: lokalagift gjelder på varer inkludert mva (lokalavgift beregnes på beløpet + hovedavgift) <br> 5: lokal skatt gjelder tjenester uten mva (lokalavgift er beregnet beløp uten mva) <br> 6: lokalavgift gjelder på tjenester inkludert mva (lokalavgift beregnes på beløpet + mva)
 SMS=SMS
@@ -1695,7 +1696,7 @@ SuppliersInvoiceNumberingModel=Leverandørfaktura nummereringsmodeller
 IfSetToYesDontForgetPermission=Hvis ja, ikke glem å gi tillatelser til grupper eller brukere tillatt for 2. godkjenning
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=GeoIP Maxmind modul-oppsett
-PathToGeoIPMaxmindCountryDataFile=Bane til fil som inneholder Maxmind IP til oversetting av land.<br>Eksempler:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat
+PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoLite2-Country.mmdb
 NoteOnPathLocation=Merk at din IP til landdata-filen må være i en mappe som PHP kan lese (Sjekk din PHP open_basedir oppsett og filsystem-tillatelser).
 YouCanDownloadFreeDatFileTo=Du kan laste ned en <b>gratis demoversjon</b> av Maxmind GeoIP landfil på %s.
 YouCanDownloadAdvancedDatFileTo=Du kan også laste ned en mer <b>komplett utgave, med oppdateringer,</b> av Maxmind GeoIP landfil på %s.
@@ -1926,14 +1927,13 @@ SmallerThan=Mindre enn
 LargerThan=Større enn
 IfTrackingIDFoundEventWillBeLinked=Merk at hvis en sporings-ID er funnet i innkommende e-post, blir hendelsen automatisk koblet til relaterte objekter.
 WithGMailYouCanCreateADedicatedPassword=Med en Gmail-konto, hvis du aktiverte 2-trinns validering, anbefales det å opprette et dedikert annet passord for applikasjonen, i stedet for å bruke ditt eget kontopassord fra https://myaccount.google.com/.
-IFTTTSetup=IFTTT-moduloppsett
-IFTTT_SERVICE_KEY=IFTTT tjenestenøkkel
-IFTTT_DOLIBARR_ENDPOINT_SECUREKEY=Sikkerhetsnøkkel for å sikre sluttpunktsadressen som brukes av IFTTT for å sende meldinger til Dolibarr.
-IFTTTDesc=Denne modulen er utformet for å utløse hendelser på IFTTT og/eller for å utføre en handling på eksterne IFTTT utløsere.
-UrlForIFTTT=URL-endepunkt for IFTTT
-YouWillFindItOnYourIFTTTAccount=Du finner den på din IFTTT-konto
 EndPointFor=Sluttpunkt for %s: %s
 DeleteEmailCollector=Slett e-postsamler
 ConfirmDeleteEmailCollector=Er du sikker på at du vil slette denne e-postsamleren?
 RecipientEmailsWillBeReplacedWithThisValue=Recipient emails will be always replaced with this value
 AtLeastOneDefaultBankAccountMandatory=At least 1 default bank account must be defined
+RESTRICT_API_ON_IP=Allow available APIs to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can use the available APIs.
+RESTRICT_ON_IP=Allow access to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can access.
+BaseOnSabeDavVersion=Based on the library SabreDAV version
+NotAPublicIp=Not a public IP
+MakeAnonymousPing=Make an anonymous Ping '+1' to the Dolibarr foundation server (done 1 time only after installation) to allow the foundation to count the number of Dolibarr installation.
diff --git a/htdocs/langs/nb_NO/banks.lang b/htdocs/langs/nb_NO/banks.lang
index 5fadb7f2217..d8af2b40f0e 100644
--- a/htdocs/langs/nb_NO/banks.lang
+++ b/htdocs/langs/nb_NO/banks.lang
@@ -73,6 +73,7 @@ BankTransaction=Bankoppføring
 ListTransactions=List oppføringer
 ListTransactionsByCategory=List oppføringer/kategori
 TransactionsToConciliate=Oppføringer til avstemming
+TransactionsToConciliateShort=To reconcile
 Conciliable=Kan avstemmes
 Conciliate=Avstem
 Conciliation=Avstemming
@@ -116,6 +117,7 @@ DeleteCheckReceipt=Slett denne sjekkvitteringen?
 ConfirmDeleteCheckReceipt=Er du sikker på at du vil slette denne sjekkvitteringen?
 BankChecks=Banksjekker
 BankChecksToReceipt=Ventende sjekkinnskudd
+BankChecksToReceiptShort=Ventende sjekkinnskudd
 ShowCheckReceipt=Vis sjekkinnskuddskvittering
 NumberOfCheques=Antall sjekker
 DeleteTransaction=Slett oppføring
diff --git a/htdocs/langs/nb_NO/cashdesk.lang b/htdocs/langs/nb_NO/cashdesk.lang
index 9a1c46f65a2..14291aeeaf0 100644
--- a/htdocs/langs/nb_NO/cashdesk.lang
+++ b/htdocs/langs/nb_NO/cashdesk.lang
@@ -62,6 +62,7 @@ TicketVatGrouped=Grupper MVA etter sats i kvitteringer
 AutoPrintTickets=Skriv ut kvitteringer automatisk
 EnableBarOrRestaurantFeatures=Aktiver funksjoner for Bar eller Restaurant
 ConfirmDeletionOfThisPOSSale=Bekrefter du slettingen av pågående salg?
+ConfirmDiscardOfThisPOSSale=Do you want to discard this current sale ?
 History=Historikk
 ValidateAndClose=Valider og lukk
 Terminal=Terminal
@@ -69,3 +70,8 @@ NumberOfTerminals=Antall terminaler
 TerminalSelect=Velg terminalen du vil bruke:
 POSTicket=POS Billett
 BasicPhoneLayout=Bruk grunnleggende oppsett for telefoner
+SetupOfTerminalNotComplete=Setup of terminal %s is not complete
+DirectPayment=Direct payment
+DirectPaymentButton=Direct cash payment button
+InvoiceIsAlreadyValidated=Invoice is already validated
+NoLinesToBill=No lines to bill
diff --git a/htdocs/langs/nb_NO/companies.lang b/htdocs/langs/nb_NO/companies.lang
index 96cb91248e5..0083ae28753 100644
--- a/htdocs/langs/nb_NO/companies.lang
+++ b/htdocs/langs/nb_NO/companies.lang
@@ -54,6 +54,7 @@ Firstname=Fornavn
 PostOrFunction=Stilling
 UserTitle=Tittel
 NatureOfThirdParty=Tredjeparts art
+NatureOfContact=Nature of Contact
 Address=Adresse
 State=Fylke(delstat)
 StateShort=Stat
diff --git a/htdocs/langs/nb_NO/contracts.lang b/htdocs/langs/nb_NO/contracts.lang
index fef5cf9f5ad..7e40d6d1ccb 100644
--- a/htdocs/langs/nb_NO/contracts.lang
+++ b/htdocs/langs/nb_NO/contracts.lang
@@ -51,6 +51,7 @@ ListOfClosedServices=Liste over lukkede tjenester
 ListOfRunningServices=Overikt over løpende tjenster
 NotActivatedServices=Ikke aktive tjenester (blant validerte kontrakter)
 BoardNotActivatedServices=Tjenester til aktivering blant validerte kontrakter
+BoardNotActivatedServicesShort=Services to activate
 LastContracts=Siste %s kontrakter
 LastModifiedServices=Siste %s endrede tjenester
 ContractStartDate=Startdato
@@ -65,7 +66,9 @@ DateEndReal=Virkelig sluttdato
 DateEndRealShort=Virkelig sluttdato
 CloseService=Lukk tjeneste
 BoardRunningServices=Tjenester som kjører
+BoardRunningServicesShort=Tjenester som kjører
 BoardExpiredServices=Tjenester utløpt
+BoardExpiredServicesShort=Tjenester utløpt
 ServiceStatus=Tjenestestatus
 DraftContracts=Kontraktskladder
 CloseRefusedBecauseOneServiceActive=Kontrakten kan ikke lukkes fordi det er minst en åpen tjeneste på den
diff --git a/htdocs/langs/nb_NO/errors.lang b/htdocs/langs/nb_NO/errors.lang
index 0e078b11525..51d3d4907d0 100644
--- a/htdocs/langs/nb_NO/errors.lang
+++ b/htdocs/langs/nb_NO/errors.lang
@@ -218,6 +218,7 @@ ErrorVariableKeyForContentMustBeSet=Feil, konstanten med navn %s (med tekstinnho
 ErrorURLMustStartWithHttp=URL %s må starte med http:// eller https://
 ErrorNewRefIsAlreadyUsed=Feil, den nye referansen er allerede brukt
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Feil, å slette betaling knyttet til en lukket faktura er ikke mulig.
+ErrorSearchCriteriaTooSmall=Search criteria too small.
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 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/main.lang b/htdocs/langs/nb_NO/main.lang
index 12ce6966c2f..ea33ffe8a35 100644
--- a/htdocs/langs/nb_NO/main.lang
+++ b/htdocs/langs/nb_NO/main.lang
@@ -28,6 +28,7 @@ NoTemplateDefined=Ingen mal tilgjengelig for denne e-posttypen
 AvailableVariables=Tilgjengelige erstatningsverdier
 NoTranslation=Ingen oversettelse
 Translation=Oversettelse
+EmptySearchString=Enter a non empty search string
 NoRecordFound=Ingen post funnet
 NoRecordDeleted=Ingen poster slettet
 NotEnoughDataYet=Ikke nok data
@@ -704,6 +705,7 @@ DateOfSignature=Signaturdato
 HidePassword=Vis kommando med skjult passord
 UnHidePassword=Vis virkelig kommando med synlig passord
 Root=Rot
+RootOfMedias=Root of public medias (/medias)
 Informations=Informasjon
 Page=Side
 Notes=Merknader
@@ -981,3 +983,10 @@ PaymentInformation=Betalingsinformasjon
 ValidFrom=Gyldig fra
 ValidUntil=Gyldig til
 NoRecordedUsers=Ingen brukere
+ToClose=To close
+ToProcess=Til behandling
+ToApprove=To approve
+GlobalOpenedElemView=Global view
+NoArticlesFoundForTheKeyword=No article found for the keyword '<strong>%s</strong>'
+NoArticlesFoundForTheCategory=No article found for the category
+ToAcceptRefuse=To accept | refuse
diff --git a/htdocs/langs/nb_NO/members.lang b/htdocs/langs/nb_NO/members.lang
index 5949a5b499a..2c81e953545 100644
--- a/htdocs/langs/nb_NO/members.lang
+++ b/htdocs/langs/nb_NO/members.lang
@@ -29,6 +29,7 @@ MenuMembersUpToDate=Oppdaterte medlemmer
 MenuMembersNotUpToDate=Utdaterte medlemmer
 MenuMembersResiliated=Terminerte medlemmer
 MembersWithSubscriptionToReceive=Medlemmer som venter på abonnement
+MembersWithSubscriptionToReceiveShort=Subscription to receive
 DateSubscription=Abonnement dato
 DateEndSubscription=Abonnement sluttdato
 EndSubscription=Avslutt abonnement
diff --git a/htdocs/langs/nb_NO/projects.lang b/htdocs/langs/nb_NO/projects.lang
index 0ce0327f3e7..942c259842b 100644
--- a/htdocs/langs/nb_NO/projects.lang
+++ b/htdocs/langs/nb_NO/projects.lang
@@ -76,7 +76,13 @@ MyProjects=Mine prosjekter
 MyProjectsArea=Område for mine prosjekt
 DurationEffective=Effektiv varighet
 ProgressDeclared=Erklært progresjon
+TaskProgressSummary=Task progress
+CurentlyOpenedTasks=Curently opened tasks
+TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared progress is less %s than the calculated progression
+TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared progress is more %s than the calculated progression
 ProgressCalculated=Kalkulert progresjon
+WhichIamLinkedTo=which I'm linked to
+WhichIamLinkedToProject=which I'm linked to project
 Time=Tid
 ListOfTasks=Oppgaveliste
 GoToListOfTimeConsumed=Gå til liste for tidsbruk
diff --git a/htdocs/langs/nb_NO/website.lang b/htdocs/langs/nb_NO/website.lang
index e4203fc4edb..be744482baa 100644
--- a/htdocs/langs/nb_NO/website.lang
+++ b/htdocs/langs/nb_NO/website.lang
@@ -2,7 +2,7 @@
 Shortname=Kode
 WebsiteSetupDesc=Opprett de nettstedene du ønsker å bruke her. Deretter går du inn i meny Nettsteder for å redigere dem.
 DeleteWebsite=Slett wedside
-ConfirmDeleteWebsite=Er du sikker på at du vil slette dette nettstedet? Alle sidene og innholdet blir også fjernet.
+ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed. The files uploaded (like into the medias directory, the ECM module, ...) will remain.
 WEBSITE_TYPE_CONTAINER=Type side/container
 WEBSITE_PAGE_EXAMPLE=Webside for bruk som eksempel
 WEBSITE_PAGENAME=Sidenavn/alias
@@ -14,6 +14,9 @@ WEBSITE_JS_INLINE=Javascript-filinnhold (felles for alle sider)
 WEBSITE_HTML_HEADER=Tillegg nederst på HTML-header(felles for alle sider)
 WEBSITE_ROBOT=Robotfil (robots.txt)
 WEBSITE_HTACCESS=Nettstedets .htaccess-fil
+WEBSITE_MANIFEST_JSON=Website manifest.json file
+WEBSITE_README=README.md file
+EnterHereLicenseInformation=Enter here meta data or license information to fille a README.md file. if you distribute your website as a template, the file will be included into the temptate package.
 HtmlHeaderPage=HTML-header (kun for denne siden)
 PageNameAliasHelp=Navn eller alias på siden. <br> Dette aliaset brukes også til å lage en SEO-URL når nettsiden blir kjørt fra en virtuell vert til en webserver (som Apacke, Nginx, ...). Bruk knappen "<strong>%s</strong>" for å redigere dette aliaset.
 EditTheWebSiteForACommonHeader=Merk: Hvis du vil definere en personlig topptekst for alle sider, redigerer du overskriften på nettstedsnivå i stedet for på siden/containeren.
@@ -41,6 +44,7 @@ RealURL=Virkelig URL
 ViewWebsiteInProduction=Vis webside ved hjelp av  hjemme-URL
 SetHereVirtualHost= <u> Bruk med Apache/NGinx/... </u> <br> Hvis du kan opprette, på webserveren din (Apache, Nginx, ...), en dedikert Virtuell Vert med PHP-aktivert og en Root-katalog på <br> <strong> %s </strong> <br> deretter satt navnet på den virtuelle verten du har opprettet i egenskapene til nettstedet, slik at forhåndsvisningen kan gjøres også ved hjelp av denne dedikerte webservertilgangen i stedet for den interne Dolibarr-serveren.
 YouCanAlsoTestWithPHPS= <u> Bruk med PHP-innebygd server </u> <br> I utviklingsmiljø kan du foretrekke å teste nettstedet med PHP-innebygd webserver (PHP 5.5 nødvendig) ved å kjøre <br> <strong> php -S 0.0.0.0:8080 -t %s </strong>
+YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
 CheckVirtualHostPerms=Sjekk også at virtuell vert har tillatelse <strong>%s</strong> på filer til <br><strong>%s</strong>
 ReadPerm=Les
 WritePerm=Skriv
@@ -75,7 +79,8 @@ AddWebsiteAccount=Opprett nettsidekonto
 BackToListOfThirdParty=Tilbake til listen over tredjeparter
 DisableSiteFirst=Deaktiver nettsted først
 MyContainerTitle=Mitt nettsteds tittel
-AnotherContainer=En annen container
+AnotherContainer=This is how to include content of another page/container (you may have an error here if you enable dynamic code because the embedded subcontainer may not exists)
+SorryWebsiteIsCurrentlyOffLine=Sorry, this website is currently off line. Please comme back later...
 WEBSITE_USE_WEBSITE_ACCOUNTS=Aktiver nettstedkontotabellen
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Aktiver tabellen for å lagre nettstedkontoer (innlogging/pass) for hvert nettsted/tredjepart
 YouMustDefineTheHomePage=Du må først definere standard startside
@@ -89,7 +94,8 @@ AliasPageAlreadyExists=Alias ​side <strong> %s </strong> eksisterer allerede
 CorporateHomePage=Firma hjemmeside
 EmptyPage=Tom side
 ExternalURLMustStartWithHttp=Ekstern nettadresse må starte med http:// eller https://
-ZipOfWebsitePackageToImport=Zip-fil av nettstedspakken
+ZipOfWebsitePackageToImport=Upload the Zip file of the website template package
+ZipOfWebsitePackageToLoad=or Choose an available embedded website template package
 ShowSubcontainers=Inkluder dynamisk innhold
 InternalURLOfPage=Intern URL til siden
 ThisPageIsTranslationOf=Denne siden/containeren er en oversettelse av
@@ -101,5 +107,10 @@ NotAllowedToAddDynamicContent=Du har ikke tillatelse til å legge til eller redi
 ReplaceWebsiteContent=Søk eller erstatt nettstedsinnhold
 DeleteAlsoJs=Slett også alle javascript-filer som er spesifikke for denne nettsiden?
 DeleteAlsoMedias=Slett også alle mediefiler som er spesifikke for denne nettsiden?
-# Export
 MyWebsitePages=Mine nettsider
+SearchReplaceInto=Search | Replace into
+ReplaceString=New string
+CSSContentTooltipHelp=Enter here CSS content. To avoid any conflict with the CSS of the application, be sure to prepend all declaration with the .bodywebsite class. For example:<br><br>#mycssselector, input.myclass:hover { ... }<br>must be<br>.bodywebsite #mycssselector, .bodywebsite input.myclass:hover { ... }<br><br>Note: If you have a large file without this prefix, you can use 'lessc' to convert it to append the .bodywebsite prefix everywhere.
+LinkAndScriptsHereAreNotLoadedInEditor=Warning: This content is output only when site is accessed from a server. It is not used in Edit mode so if you need to load javascript files also in edit mode, just add your tag 'script src=...' into the page.
+Dynamiccontent=Sample of a page with dynamic content
+ImportSite=Importer nettstedsmal
diff --git a/htdocs/langs/nl_NL/admin.lang b/htdocs/langs/nl_NL/admin.lang
index b31c1579740..f5f9dc90fb9 100644
--- a/htdocs/langs/nl_NL/admin.lang
+++ b/htdocs/langs/nl_NL/admin.lang
@@ -400,6 +400,7 @@ OldVATRates=Oud BTW tarief
 NewVATRates=Nieuw BTW tarief
 PriceBaseTypeToChange=Wijzig op prijzen waarop een base reference waarde gedefiniëerd is
 MassConvert=Start conversie
+PriceFormatInCurrentLanguage=Price Format In Current Language
 String=String
 TextLong=Lange tekst
 HtmlText=HTML-tekst
@@ -431,7 +432,7 @@ ExtrafieldParamHelpradio=List of values must be lines with format key,value (whe
 ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- idfilter is necessarly a primary int key<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=List of values 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>Examples:<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
-ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default)<br>Set this to 2 for a collapsing separator (collapsed by default)
+ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Gebruikte library voor generen PDF
 LocalTaxDesc=Some countries may apply two or three taxes on each invoice line. If this is the case, choose the type for the 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)
 SMS=SMS
@@ -1695,7 +1696,7 @@ SuppliersInvoiceNumberingModel=Vendor invoices numbering models
 IfSetToYesDontForgetPermission=Indien ingesteld op ja, vergeet dan niet om machtigingen te verlenen aan groepen of gebruikers ​​voor het toestaan van de tweede goedkeuring
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup="GeoIP Maxmind"-moduleinstellingen
-PathToGeoIPMaxmindCountryDataFile=Pad naar bestand met Maxmind ip tot land vertaling. <br>Voorbeelden: <br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat
+PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoLite2-Country.mmdb
 NoteOnPathLocation=Let op dat uw "GeoIP Maxmind"-landbestand zich bevind in een map die door uw PHP-installatie kan worden gelezen (Controleer uwPHP open_basedir instelling en de bestandsrechten).
 YouCanDownloadFreeDatFileTo=U kunt een <b>gratis demo versie</b> downloaden van een "Maxmind GeoIP"-landbestand op het adres %s.
 YouCanDownloadAdvancedDatFileTo=U kunt ook een <b>completere versie, met updates</b> downloaden van het "Maxmind GeoIP"-landbestand op het adres %s.
@@ -1926,14 +1927,13 @@ SmallerThan=Smaller than
 LargerThan=Larger than
 IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID is found into incoming email, the event will be automatically linked to the related objects.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
-IFTTTSetup=IFTTT module setup
-IFTTT_SERVICE_KEY=IFTTT Service key
-IFTTT_DOLIBARR_ENDPOINT_SECUREKEY=Security key to secure the endpoint URL used by IFTTT to send messages to your Dolibarr.
-IFTTTDesc=This module is designed to trigger events on IFTTT and/or to execute some action on external IFTTT triggers.
-UrlForIFTTT=URL endpoint for IFTTT
-YouWillFindItOnYourIFTTTAccount=You will find it on your IFTTT account
 EndPointFor=End point for %s : %s
 DeleteEmailCollector=Delete email collector
 ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
 RecipientEmailsWillBeReplacedWithThisValue=Recipient emails will be always replaced with this value
 AtLeastOneDefaultBankAccountMandatory=At least 1 default bank account must be defined
+RESTRICT_API_ON_IP=Allow available APIs to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can use the available APIs.
+RESTRICT_ON_IP=Allow access to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can access.
+BaseOnSabeDavVersion=Based on the library SabreDAV version
+NotAPublicIp=Not a public IP
+MakeAnonymousPing=Make an anonymous Ping '+1' to the Dolibarr foundation server (done 1 time only after installation) to allow the foundation to count the number of Dolibarr installation.
diff --git a/htdocs/langs/nl_NL/banks.lang b/htdocs/langs/nl_NL/banks.lang
index 5797ca94e03..6e1484c2404 100644
--- a/htdocs/langs/nl_NL/banks.lang
+++ b/htdocs/langs/nl_NL/banks.lang
@@ -73,6 +73,7 @@ BankTransaction=Bankmutatie
 ListTransactions=Lijst items
 ListTransactionsByCategory=Lijst items/categorie
 TransactionsToConciliate=Items af te stemmen
+TransactionsToConciliateShort=To reconcile
 Conciliable=Kunnen worden afgestemd
 Conciliate=Afstemmen
 Conciliation=Afstemming
@@ -116,6 +117,7 @@ DeleteCheckReceipt=Dit chequebewijs verwijderen?
 ConfirmDeleteCheckReceipt=Weet u zeker dat u deze betaling via cheque wilt verwijderen?
 BankChecks=Bankcheque
 BankChecksToReceipt=Cheques in afwachting van storting
+BankChecksToReceiptShort=Cheques in afwachting van storting
 ShowCheckReceipt=Toon controleren stortingsbewijs
 NumberOfCheques=Checknr.
 DeleteTransaction=Ingave verwijderen
diff --git a/htdocs/langs/nl_NL/cashdesk.lang b/htdocs/langs/nl_NL/cashdesk.lang
index 53c684b6d19..3f71409e242 100644
--- a/htdocs/langs/nl_NL/cashdesk.lang
+++ b/htdocs/langs/nl_NL/cashdesk.lang
@@ -62,6 +62,7 @@ TicketVatGrouped=Group VAT by rate in tickets
 AutoPrintTickets=Automatically print tickets
 EnableBarOrRestaurantFeatures=Enable features for Bar or Restaurant
 ConfirmDeletionOfThisPOSSale=Do your confirm the deletion of this current sale ?
+ConfirmDiscardOfThisPOSSale=Do you want to discard this current sale ?
 History=Geschiedenis
 ValidateAndClose=Validate and close
 Terminal=Terminal
@@ -69,3 +70,8 @@ NumberOfTerminals=Number of Terminals
 TerminalSelect=Select terminal you want to use:
 POSTicket=POS Ticket
 BasicPhoneLayout=Use basic layout for phones
+SetupOfTerminalNotComplete=Setup of terminal %s is not complete
+DirectPayment=Direct payment
+DirectPaymentButton=Direct cash payment button
+InvoiceIsAlreadyValidated=Invoice is already validated
+NoLinesToBill=No lines to bill
diff --git a/htdocs/langs/nl_NL/companies.lang b/htdocs/langs/nl_NL/companies.lang
index 2b869938cff..9c641eddb70 100644
--- a/htdocs/langs/nl_NL/companies.lang
+++ b/htdocs/langs/nl_NL/companies.lang
@@ -54,6 +54,7 @@ Firstname=Voornaam
 PostOrFunction=Functie
 UserTitle=Titel
 NatureOfThirdParty=Aard van relatie
+NatureOfContact=Nature of Contact
 Address=Adres
 State=Provincie
 StateShort=Provincie
diff --git a/htdocs/langs/nl_NL/contracts.lang b/htdocs/langs/nl_NL/contracts.lang
index fc1d50ece10..3b55a66e647 100644
--- a/htdocs/langs/nl_NL/contracts.lang
+++ b/htdocs/langs/nl_NL/contracts.lang
@@ -51,6 +51,7 @@ ListOfClosedServices=Lijst van gesloten diensten
 ListOfRunningServices=Lijst van lppende diensten
 NotActivatedServices=Inactieve diensten (onder gevalideerde contracten)
 BoardNotActivatedServices=Diensten te activeren onder gevalideerde contracten
+BoardNotActivatedServicesShort=Services to activate
 LastContracts=Laatste %s contracten
 LastModifiedServices=Laaste %s aangepaste diensten
 ContractStartDate=Begindatum
@@ -64,7 +65,10 @@ DateStartRealShort=Werkelijke startdatum
 DateEndReal=Werkelijke einddatum
 DateEndRealShort=Werkelijke einddatum
 CloseService=Dienst sluiten
-BoardRunningServices=Verlopen diensten
+BoardRunningServices=Services running
+BoardRunningServicesShort=Services running
+BoardExpiredServices=Services expired
+BoardExpiredServicesShort=Services expired
 ServiceStatus=Status van de dienst
 DraftContracts=Conceptcontracten
 CloseRefusedBecauseOneServiceActive=Contract can't be closed as there is at least one open service on it
diff --git a/htdocs/langs/nl_NL/errors.lang b/htdocs/langs/nl_NL/errors.lang
index 5417ae6daf2..da1d8737f25 100644
--- a/htdocs/langs/nl_NL/errors.lang
+++ b/htdocs/langs/nl_NL/errors.lang
@@ -218,6 +218,7 @@ ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text
 ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Error, delete payment linked to a closed invoice is not possible.
+ErrorSearchCriteriaTooSmall=Search criteria too small.
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 WarningPasswordSetWithNoAccount=Er is een wachtwoord ingesteld voor dit lid. Er is echter geen gebruikersaccount gemaakt. Dus dit wachtwoord is opgeslagen maar kan niet worden gebruikt om in te loggen bij Dolibarr. Het kan worden gebruikt door een externe module / interface, maar als u geen gebruikersnaam of wachtwoord voor een lid hoeft aan te maken, kunt u de optie "Beheer een login voor elk lid" in de module-setup van Member uitschakelen. Als u een login moet beheren maar geen wachtwoord nodig heeft, kunt u dit veld leeg houden om deze waarschuwing te voorkomen. Opmerking: e-mail kan ook worden gebruikt als login als het lid aan een gebruiker is gekoppeld.
diff --git a/htdocs/langs/nl_NL/main.lang b/htdocs/langs/nl_NL/main.lang
index a4195e82691..4da979aa9f6 100644
--- a/htdocs/langs/nl_NL/main.lang
+++ b/htdocs/langs/nl_NL/main.lang
@@ -28,6 +28,7 @@ NoTemplateDefined=Geen sjabloon beschikbaar voor dit e-mailtype
 AvailableVariables=Beschikbare substitutievariabelen
 NoTranslation=Geen vertaling
 Translation=Vertaling
+EmptySearchString=Enter a non empty search string
 NoRecordFound=Geen item gevonden
 NoRecordDeleted=Geen record verwijderd
 NotEnoughDataYet=Niet genoeg data
@@ -704,6 +705,7 @@ DateOfSignature=Datum van ondertekening
 HidePassword=Toon opdracht met verborgen wachtwoord
 UnHidePassword=Toon opdracht met zichtbaar wachtwoord
 Root=Root
+RootOfMedias=Root of public medias (/medias)
 Informations=Informatie
 Page=Pagina
 Notes=Notitie
@@ -981,3 +983,10 @@ PaymentInformation=Payment information
 ValidFrom=Valid from
 ValidUntil=Valid until
 NoRecordedUsers=No users
+ToClose=To close
+ToProcess=Te verwerken
+ToApprove=To approve
+GlobalOpenedElemView=Global view
+NoArticlesFoundForTheKeyword=No article found for the keyword '<strong>%s</strong>'
+NoArticlesFoundForTheCategory=No article found for the category
+ToAcceptRefuse=To accept | refuse
diff --git a/htdocs/langs/nl_NL/members.lang b/htdocs/langs/nl_NL/members.lang
index 8397f7fe7c2..1f4e40f5769 100644
--- a/htdocs/langs/nl_NL/members.lang
+++ b/htdocs/langs/nl_NL/members.lang
@@ -29,6 +29,7 @@ MenuMembersUpToDate=Bijgewerkte leden
 MenuMembersNotUpToDate=Niet bijgewerkte leden
 MenuMembersResiliated=Verwijderde leden
 MembersWithSubscriptionToReceive=Leden die abonnement moeten ontvangen
+MembersWithSubscriptionToReceiveShort=Subscription to receive
 DateSubscription=Inschrijvingsdatum
 DateEndSubscription=Einddatum abonnement
 EndSubscription=Einde abonnement
diff --git a/htdocs/langs/nl_NL/projects.lang b/htdocs/langs/nl_NL/projects.lang
index 94fcd53fc77..8358643bade 100644
--- a/htdocs/langs/nl_NL/projects.lang
+++ b/htdocs/langs/nl_NL/projects.lang
@@ -76,7 +76,13 @@ MyProjects=Mijn projecten
 MyProjectsArea=Mijn projecten omgeving
 DurationEffective=Effectieve duur
 ProgressDeclared=Ingegeven voorgang
+TaskProgressSummary=Task progress
+CurentlyOpenedTasks=Curently opened tasks
+TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared progress is less %s than the calculated progression
+TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared progress is more %s than the calculated progression
 ProgressCalculated=Berekende voorgang
+WhichIamLinkedTo=which I'm linked to
+WhichIamLinkedToProject=which I'm linked to project
 Time=Tijd
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
diff --git a/htdocs/langs/nl_NL/website.lang b/htdocs/langs/nl_NL/website.lang
index 024e1b4b6e6..22cd02b3a3a 100644
--- a/htdocs/langs/nl_NL/website.lang
+++ b/htdocs/langs/nl_NL/website.lang
@@ -2,7 +2,7 @@
 Shortname=Code
 WebsiteSetupDesc=Create here the websites you wish to use. Then go into menu Websites to edit them.
 DeleteWebsite=Website verwijderen
-ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed.
+ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed. The files uploaded (like into the medias directory, the ECM module, ...) will remain.
 WEBSITE_TYPE_CONTAINER=Soort pagina / container
 WEBSITE_PAGE_EXAMPLE=Webpagina om als voorbeeld te gebruiken
 WEBSITE_PAGENAME=Paginanaam/alias
@@ -14,6 +14,9 @@ WEBSITE_JS_INLINE=Javascript file content (common to all pages)
 WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages)
 WEBSITE_ROBOT=Robotbestand (robots.txt)
 WEBSITE_HTACCESS=Website .htaccess file
+WEBSITE_MANIFEST_JSON=Website manifest.json file
+WEBSITE_README=README.md file
+EnterHereLicenseInformation=Enter here meta data or license information to fille a README.md file. if you distribute your website as a template, the file will be included into the temptate package.
 HtmlHeaderPage=HTML-header (alleen voor deze pagina)
 PageNameAliasHelp=Name or alias of the page.<br>This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "<strong>%s</strong>" to edit this alias.
 EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container.
@@ -41,6 +44,7 @@ RealURL=Echte URL
 ViewWebsiteInProduction=Bekijk website met behulp van eigen URL's
 SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then set the name of the virtual host you have created in the properties of web site, so the preview can be done also using this dedicated web server access instead of the internal Dolibarr server.
 YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
 CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
 ReadPerm=Lezen
 WritePerm=Write
@@ -75,7 +79,8 @@ AddWebsiteAccount=Create web site account
 BackToListOfThirdParty=Back to list for Third Party
 DisableSiteFirst=Disable website first
 MyContainerTitle=My web site title
-AnotherContainer=Another container
+AnotherContainer=This is how to include content of another page/container (you may have an error here if you enable dynamic code because the embedded subcontainer may not exists)
+SorryWebsiteIsCurrentlyOffLine=Sorry, this website is currently off line. Please comme back later...
 WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / third party
 YouMustDefineTheHomePage=You must first define the default Home page
@@ -89,7 +94,8 @@ AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
 CorporateHomePage=Corporate Home page
 EmptyPage=Empty page
 ExternalURLMustStartWithHttp=External URL must start with http:// or https://
-ZipOfWebsitePackageToImport=Zip file of website package
+ZipOfWebsitePackageToImport=Upload the Zip file of the website template package
+ZipOfWebsitePackageToLoad=or Choose an available embedded website template package
 ShowSubcontainers=Include dynamic content
 InternalURLOfPage=Internal URL of page
 ThisPageIsTranslationOf=This page/container is a translation of
@@ -101,5 +107,10 @@ NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynam
 ReplaceWebsiteContent=Search or Replace website content
 DeleteAlsoJs=Delete also all javascript files specific to this website?
 DeleteAlsoMedias=Delete also all medias files specific to this website?
-# Export
 MyWebsitePages=My website pages
+SearchReplaceInto=Search | Replace into
+ReplaceString=New string
+CSSContentTooltipHelp=Enter here CSS content. To avoid any conflict with the CSS of the application, be sure to prepend all declaration with the .bodywebsite class. For example:<br><br>#mycssselector, input.myclass:hover { ... }<br>must be<br>.bodywebsite #mycssselector, .bodywebsite input.myclass:hover { ... }<br><br>Note: If you have a large file without this prefix, you can use 'lessc' to convert it to append the .bodywebsite prefix everywhere.
+LinkAndScriptsHereAreNotLoadedInEditor=Warning: This content is output only when site is accessed from a server. It is not used in Edit mode so if you need to load javascript files also in edit mode, just add your tag 'script src=...' into the page.
+Dynamiccontent=Sample of a page with dynamic content
+ImportSite=Import website template
diff --git a/htdocs/langs/pl_PL/admin.lang b/htdocs/langs/pl_PL/admin.lang
index e3e453b3b20..3f2dd0901b4 100644
--- a/htdocs/langs/pl_PL/admin.lang
+++ b/htdocs/langs/pl_PL/admin.lang
@@ -400,6 +400,7 @@ OldVATRates=Poprzednia stawka VAT
 NewVATRates=Nowa stawka VAT
 PriceBaseTypeToChange=Zmiana dla cen opartych na wartości referencyjnej ustalonej na
 MassConvert=Launch bulk conversion
+PriceFormatInCurrentLanguage=Price Format In Current Language
 String=Ciąg znaków
 TextLong=Długi tekst
 HtmlText=Html text
@@ -431,7 +432,7 @@ ExtrafieldParamHelpradio=List of values must be lines with format key,value (whe
 ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- idfilter is necessarly a primary int key<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=List of values 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>Examples:<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
-ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default)<br>Set this to 2 for a collapsing separator (collapsed by default)
+ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Biblioteka używana do generowania plików PDF
 LocalTaxDesc=Some countries may apply two or three taxes on each invoice line. If this is the case, choose the type for the 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)
 SMS=SMS
@@ -1695,7 +1696,7 @@ SuppliersInvoiceNumberingModel=Vendor invoices numbering models
 IfSetToYesDontForgetPermission=Jeśli jest ustawiona na yes, nie zapomnij, aby zapewnić uprawnień do grup lub użytkowników dopuszczonych do drugiego zatwierdzenia
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=GeoIP Maxmind konfiguracji modułu
-PathToGeoIPMaxmindCountryDataFile=Ścieżka dostępu do pliku zawierającego MaxMind ip do tłumaczenia kraju. <br> Przykłady: <br> /usr/local/share/GeoIP/GeoIP.dat <br> /usr/share/GeoIP/GeoIP.dat
+PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoLite2-Country.mmdb
 NoteOnPathLocation=Pamiętać, że dane państwo ip do pliku musi być wewnątrz katalogu PHP może odczytać (sprawdzenie konfiguracji PHP open_basedir i uprawnienia systemu plików).
 YouCanDownloadFreeDatFileTo=Możesz <b>pobrać</b> darmową <b>wersję demo</b> kraju GeoIP plik Maxmind w %s.
 YouCanDownloadAdvancedDatFileTo=Możesz także pobrać bardziej <b>kompletna wersja, z aktualizacjami,</b> kraju GeoIP plik Maxmind w %s.
@@ -1926,14 +1927,13 @@ SmallerThan=Smaller than
 LargerThan=Larger than
 IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID is found into incoming email, the event will be automatically linked to the related objects.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
-IFTTTSetup=IFTTT module setup
-IFTTT_SERVICE_KEY=IFTTT Service key
-IFTTT_DOLIBARR_ENDPOINT_SECUREKEY=Security key to secure the endpoint URL used by IFTTT to send messages to your Dolibarr.
-IFTTTDesc=This module is designed to trigger events on IFTTT and/or to execute some action on external IFTTT triggers.
-UrlForIFTTT=URL endpoint for IFTTT
-YouWillFindItOnYourIFTTTAccount=You will find it on your IFTTT account
 EndPointFor=End point for %s : %s
 DeleteEmailCollector=Delete email collector
 ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
 RecipientEmailsWillBeReplacedWithThisValue=Recipient emails will be always replaced with this value
 AtLeastOneDefaultBankAccountMandatory=At least 1 default bank account must be defined
+RESTRICT_API_ON_IP=Allow available APIs to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can use the available APIs.
+RESTRICT_ON_IP=Allow access to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can access.
+BaseOnSabeDavVersion=Based on the library SabreDAV version
+NotAPublicIp=Not a public IP
+MakeAnonymousPing=Make an anonymous Ping '+1' to the Dolibarr foundation server (done 1 time only after installation) to allow the foundation to count the number of Dolibarr installation.
diff --git a/htdocs/langs/pl_PL/banks.lang b/htdocs/langs/pl_PL/banks.lang
index e78818fc226..9676cd2311f 100644
--- a/htdocs/langs/pl_PL/banks.lang
+++ b/htdocs/langs/pl_PL/banks.lang
@@ -73,6 +73,7 @@ BankTransaction=Wpis bankowy
 ListTransactions=Lista wpisów
 ListTransactionsByCategory=Lista wpisów/kategorii
 TransactionsToConciliate=Wpisy do zaksięgowania
+TransactionsToConciliateShort=To reconcile
 Conciliable=Może być rekoncyliowane
 Conciliate=Uzgodnienie sald
 Conciliation=Rekoncyliacja
@@ -116,6 +117,7 @@ DeleteCheckReceipt=Delete this check receipt?
 ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
 BankChecks=Czeki bankowe
 BankChecksToReceipt=Checks awaiting deposit
+BankChecksToReceiptShort=Checks awaiting deposit
 ShowCheckReceipt=Pokaż sprawdzić otrzymania wpłaty
 NumberOfCheques=No. of check
 DeleteTransaction=Usuń wpis
diff --git a/htdocs/langs/pl_PL/cashdesk.lang b/htdocs/langs/pl_PL/cashdesk.lang
index 2387ed10d7b..384c6417daa 100644
--- a/htdocs/langs/pl_PL/cashdesk.lang
+++ b/htdocs/langs/pl_PL/cashdesk.lang
@@ -62,6 +62,7 @@ TicketVatGrouped=Group VAT by rate in tickets
 AutoPrintTickets=Automatically print tickets
 EnableBarOrRestaurantFeatures=Enable features for Bar or Restaurant
 ConfirmDeletionOfThisPOSSale=Do your confirm the deletion of this current sale ?
+ConfirmDiscardOfThisPOSSale=Do you want to discard this current sale ?
 History=Historia
 ValidateAndClose=Validate and close
 Terminal=Terminal
@@ -69,3 +70,8 @@ NumberOfTerminals=Number of Terminals
 TerminalSelect=Select terminal you want to use:
 POSTicket=POS Ticket
 BasicPhoneLayout=Use basic layout for phones
+SetupOfTerminalNotComplete=Setup of terminal %s is not complete
+DirectPayment=Direct payment
+DirectPaymentButton=Direct cash payment button
+InvoiceIsAlreadyValidated=Invoice is already validated
+NoLinesToBill=No lines to bill
diff --git a/htdocs/langs/pl_PL/companies.lang b/htdocs/langs/pl_PL/companies.lang
index 42623e23dd3..75c648d4f0b 100644
--- a/htdocs/langs/pl_PL/companies.lang
+++ b/htdocs/langs/pl_PL/companies.lang
@@ -54,6 +54,7 @@ Firstname=Imię
 PostOrFunction=Stanowisko
 UserTitle=Tytuł
 NatureOfThirdParty=Rodzaj kontrahenta
+NatureOfContact=Nature of Contact
 Address=Adres
 State=Województwo
 StateShort=Województwo
diff --git a/htdocs/langs/pl_PL/contracts.lang b/htdocs/langs/pl_PL/contracts.lang
index 7313e070d1c..b3125c4b26d 100644
--- a/htdocs/langs/pl_PL/contracts.lang
+++ b/htdocs/langs/pl_PL/contracts.lang
@@ -51,6 +51,7 @@ ListOfClosedServices=Lista zamkniętych usług
 ListOfRunningServices=Lista uruchomionych usług
 NotActivatedServices=Nie aktywacji usług (wśród zatwierdzonych umów)
 BoardNotActivatedServices=Usługi uaktywnić wśród zatwierdzonych umów
+BoardNotActivatedServicesShort=Services to activate
 LastContracts=Ostatnie %s kontaktów
 LastModifiedServices=Ostatnie %s zmodyfikowanych usług
 ContractStartDate=Data rozpoczęcia
@@ -64,7 +65,10 @@ DateStartRealShort=Rzeczywista data rozpoczęcia
 DateEndReal=Rzeczywista data zakończenia
 DateEndRealShort=Rzeczywista data zakończenia
 CloseService=Zamknij usługi
-BoardRunningServices=Wygasłe działające usługi
+BoardRunningServices=Services running
+BoardRunningServicesShort=Services running
+BoardExpiredServices=Services expired
+BoardExpiredServicesShort=Services expired
 ServiceStatus=Status usługi
 DraftContracts=Szkice kontaktów
 CloseRefusedBecauseOneServiceActive=Contract can't be closed as there is at least one open service on it
diff --git a/htdocs/langs/pl_PL/errors.lang b/htdocs/langs/pl_PL/errors.lang
index 5ba2ccf5418..d7c7c0f14ba 100644
--- a/htdocs/langs/pl_PL/errors.lang
+++ b/htdocs/langs/pl_PL/errors.lang
@@ -218,6 +218,7 @@ ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text
 ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Error, delete payment linked to a closed invoice is not possible.
+ErrorSearchCriteriaTooSmall=Search criteria too small.
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 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/main.lang b/htdocs/langs/pl_PL/main.lang
index 80fa7e37072..1bf79286a44 100644
--- a/htdocs/langs/pl_PL/main.lang
+++ b/htdocs/langs/pl_PL/main.lang
@@ -28,6 +28,7 @@ NoTemplateDefined=Szablon niedostępny dla tego typu wiadomości email
 AvailableVariables=Dostępne zmienne substytucji
 NoTranslation=Brak tłumaczenia
 Translation=Tłumaczenie
+EmptySearchString=Enter a non empty search string
 NoRecordFound=Rekord nie został znaleziony.
 NoRecordDeleted=Brak usuniętych rekordów
 NotEnoughDataYet=Za mało danych
@@ -704,6 +705,7 @@ DateOfSignature=Data podpisu
 HidePassword=Pokaż polecenie z ukrytym hasłem
 UnHidePassword=Pokaż prawdziwe polecenie z otwartym hasłem
 Root=Root
+RootOfMedias=Root of public medias (/medias)
 Informations=Informacja
 Page=Strona
 Notes=Uwagi
@@ -981,3 +983,10 @@ PaymentInformation=Payment information
 ValidFrom=Valid from
 ValidUntil=Valid until
 NoRecordedUsers=No users
+ToClose=To close
+ToProcess=Do przetworzenia
+ToApprove=To approve
+GlobalOpenedElemView=Global view
+NoArticlesFoundForTheKeyword=No article found for the keyword '<strong>%s</strong>'
+NoArticlesFoundForTheCategory=No article found for the category
+ToAcceptRefuse=To accept | refuse
diff --git a/htdocs/langs/pl_PL/members.lang b/htdocs/langs/pl_PL/members.lang
index 063cd3e446a..99c90443f4d 100644
--- a/htdocs/langs/pl_PL/members.lang
+++ b/htdocs/langs/pl_PL/members.lang
@@ -29,6 +29,7 @@ MenuMembersUpToDate=Aktualni członkowie
 MenuMembersNotUpToDate=Nieaktualni człokowie
 MenuMembersResiliated=członkowie zakończone
 MembersWithSubscriptionToReceive=Użytkownicy z subskrypcji otrzymują
+MembersWithSubscriptionToReceiveShort=Subscription to receive
 DateSubscription=Data subskrypcji
 DateEndSubscription=Data końca subskrypcji
 EndSubscription=Koniec subskrypcji
diff --git a/htdocs/langs/pl_PL/projects.lang b/htdocs/langs/pl_PL/projects.lang
index d2c5109c977..d7d53c68e46 100644
--- a/htdocs/langs/pl_PL/projects.lang
+++ b/htdocs/langs/pl_PL/projects.lang
@@ -76,7 +76,13 @@ MyProjects=Moje projekty
 MyProjectsArea=Obszar moich projektów
 DurationEffective=Efektywny czas trwania
 ProgressDeclared=Deklarowany postęp
+TaskProgressSummary=Task progress
+CurentlyOpenedTasks=Curently opened tasks
+TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared progress is less %s than the calculated progression
+TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared progress is more %s than the calculated progression
 ProgressCalculated=Obliczony postęp
+WhichIamLinkedTo=which I'm linked to
+WhichIamLinkedToProject=which I'm linked to project
 Time=Czas
 ListOfTasks=Lista zadań
 GoToListOfTimeConsumed=Go to list of time consumed
diff --git a/htdocs/langs/pl_PL/website.lang b/htdocs/langs/pl_PL/website.lang
index be2a003ec32..5206b78b885 100644
--- a/htdocs/langs/pl_PL/website.lang
+++ b/htdocs/langs/pl_PL/website.lang
@@ -2,7 +2,7 @@
 Shortname=Kod
 WebsiteSetupDesc=Create here the websites you wish to use. Then go into menu Websites to edit them.
 DeleteWebsite=Skasuj stronę
-ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed.
+ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed. The files uploaded (like into the medias directory, the ECM module, ...) will remain.
 WEBSITE_TYPE_CONTAINER=Type of page/container
 WEBSITE_PAGE_EXAMPLE=Web page to use as example
 WEBSITE_PAGENAME=Nazwa strony
@@ -14,6 +14,9 @@ WEBSITE_JS_INLINE=Javascript file content (common to all pages)
 WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages)
 WEBSITE_ROBOT=Robot file (robots.txt)
 WEBSITE_HTACCESS=Website .htaccess file
+WEBSITE_MANIFEST_JSON=Website manifest.json file
+WEBSITE_README=README.md file
+EnterHereLicenseInformation=Enter here meta data or license information to fille a README.md file. if you distribute your website as a template, the file will be included into the temptate package.
 HtmlHeaderPage=HTML header (specific to this page only)
 PageNameAliasHelp=Name or alias of the page.<br>This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "<strong>%s</strong>" to edit this alias.
 EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container.
@@ -41,6 +44,7 @@ RealURL=Prawdziwy link
 ViewWebsiteInProduction=Zobacz stronę używając linków ze strony głównej
 SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then set the name of the virtual host you have created in the properties of web site, so the preview can be done also using this dedicated web server access instead of the internal Dolibarr server.
 YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
 CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
 ReadPerm=Czytać
 WritePerm=Write
@@ -75,7 +79,8 @@ AddWebsiteAccount=Create web site account
 BackToListOfThirdParty=Back to list for Third Party
 DisableSiteFirst=Disable website first
 MyContainerTitle=My web site title
-AnotherContainer=Another container
+AnotherContainer=This is how to include content of another page/container (you may have an error here if you enable dynamic code because the embedded subcontainer may not exists)
+SorryWebsiteIsCurrentlyOffLine=Sorry, this website is currently off line. Please comme back later...
 WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / third party
 YouMustDefineTheHomePage=You must first define the default Home page
@@ -89,7 +94,8 @@ AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
 CorporateHomePage=Corporate Home page
 EmptyPage=Empty page
 ExternalURLMustStartWithHttp=External URL must start with http:// or https://
-ZipOfWebsitePackageToImport=Zip file of website package
+ZipOfWebsitePackageToImport=Upload the Zip file of the website template package
+ZipOfWebsitePackageToLoad=or Choose an available embedded website template package
 ShowSubcontainers=Include dynamic content
 InternalURLOfPage=Internal URL of page
 ThisPageIsTranslationOf=This page/container is a translation of
@@ -101,5 +107,10 @@ NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynam
 ReplaceWebsiteContent=Search or Replace website content
 DeleteAlsoJs=Delete also all javascript files specific to this website?
 DeleteAlsoMedias=Delete also all medias files specific to this website?
-# Export
 MyWebsitePages=My website pages
+SearchReplaceInto=Search | Replace into
+ReplaceString=New string
+CSSContentTooltipHelp=Enter here CSS content. To avoid any conflict with the CSS of the application, be sure to prepend all declaration with the .bodywebsite class. For example:<br><br>#mycssselector, input.myclass:hover { ... }<br>must be<br>.bodywebsite #mycssselector, .bodywebsite input.myclass:hover { ... }<br><br>Note: If you have a large file without this prefix, you can use 'lessc' to convert it to append the .bodywebsite prefix everywhere.
+LinkAndScriptsHereAreNotLoadedInEditor=Warning: This content is output only when site is accessed from a server. It is not used in Edit mode so if you need to load javascript files also in edit mode, just add your tag 'script src=...' into the page.
+Dynamiccontent=Sample of a page with dynamic content
+ImportSite=Import website template
diff --git a/htdocs/langs/pt_PT/admin.lang b/htdocs/langs/pt_PT/admin.lang
index 9fb236effd4..5822eec5053 100644
--- a/htdocs/langs/pt_PT/admin.lang
+++ b/htdocs/langs/pt_PT/admin.lang
@@ -400,6 +400,7 @@ OldVATRates=Taxa de IVA antiga
 NewVATRates=Nova taxa de IVA
 PriceBaseTypeToChange=Modificar nos preços com valor de referência base definido em
 MassConvert=Launch bulk conversion
+PriceFormatInCurrentLanguage=Price Format In Current Language
 String=Sequencia de caracteres
 TextLong=Texto longo
 HtmlText=Texto HTML
@@ -431,7 +432,7 @@ ExtrafieldParamHelpradio=List of values must be lines with format key,value (whe
 ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- idfilter is necessarly a primary int key<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=List of values 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>Examples:<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
-ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default)<br>Set this to 2 for a collapsing separator (collapsed by default)
+ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Biblioteca utilizada para gerar PDF
 LocalTaxDesc=Some countries may apply two or three taxes on each invoice line. If this is the case, choose the type for the 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)
 SMS=SMS
@@ -1695,7 +1696,7 @@ SuppliersInvoiceNumberingModel=Vendor invoices numbering models
 IfSetToYesDontForgetPermission=Se definido a "sim", não se esqueça de atribuir permissões a utilizadores ou grupos de utilizadores que possam efetuar a segunda aprovação
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=Configuração do módulo "GeoIP Maxmind"
-PathToGeoIPMaxmindCountryDataFile=Caminho para o ficheiro que contém o IP do Maxmind para tradução do país.<br>Exemplos:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat
+PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoLite2-Country.mmdb
 NoteOnPathLocation=Note que o endereço IP de dados do país/arquivo deve estar dentro de um diretório do seu PHP (Verifique a configuração do PHP open_basedir e permissões de ficheiros de sistema).
 YouCanDownloadFreeDatFileTo=Você pode descarregar uma <b>versão demo gratuita</b> do ficheiro país Maxmind GeoIP em %s.
 YouCanDownloadAdvancedDatFileTo=Você também pode baixar uma <b>versão</b> mais <b>completa, com atualizações</b> do país arquivo GeoIP MaxMind em %s.
@@ -1926,14 +1927,13 @@ SmallerThan=Smaller than
 LargerThan=Larger than
 IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID is found into incoming email, the event will be automatically linked to the related objects.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
-IFTTTSetup=IFTTT module setup
-IFTTT_SERVICE_KEY=IFTTT Service key
-IFTTT_DOLIBARR_ENDPOINT_SECUREKEY=Security key to secure the endpoint URL used by IFTTT to send messages to your Dolibarr.
-IFTTTDesc=This module is designed to trigger events on IFTTT and/or to execute some action on external IFTTT triggers.
-UrlForIFTTT=URL endpoint for IFTTT
-YouWillFindItOnYourIFTTTAccount=You will find it on your IFTTT account
 EndPointFor=End point for %s : %s
 DeleteEmailCollector=Delete email collector
 ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
 RecipientEmailsWillBeReplacedWithThisValue=Recipient emails will be always replaced with this value
 AtLeastOneDefaultBankAccountMandatory=At least 1 default bank account must be defined
+RESTRICT_API_ON_IP=Allow available APIs to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can use the available APIs.
+RESTRICT_ON_IP=Allow access to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can access.
+BaseOnSabeDavVersion=Based on the library SabreDAV version
+NotAPublicIp=Not a public IP
+MakeAnonymousPing=Make an anonymous Ping '+1' to the Dolibarr foundation server (done 1 time only after installation) to allow the foundation to count the number of Dolibarr installation.
diff --git a/htdocs/langs/pt_PT/banks.lang b/htdocs/langs/pt_PT/banks.lang
index 64adbecba0e..2608ad7bc5b 100644
--- a/htdocs/langs/pt_PT/banks.lang
+++ b/htdocs/langs/pt_PT/banks.lang
@@ -73,6 +73,7 @@ BankTransaction=Entrada bancária
 ListTransactions=Lista de entradas
 ListTransactionsByCategory=Lista de entradas/categorias
 TransactionsToConciliate=Entradas para reconciliar
+TransactionsToConciliateShort=To reconcile
 Conciliable=Conciliável
 Conciliate=Conciliar
 Conciliation=Conciliação
@@ -116,6 +117,7 @@ DeleteCheckReceipt=Eliminar este recibo do cheque?
 ConfirmDeleteCheckReceipt=Tem a certeza que deseja eliminar este recibo do cheque?
 BankChecks=Cheques
 BankChecksToReceipt=Cheques a aguardar depósito
+BankChecksToReceiptShort=Cheques a aguardar depósito
 ShowCheckReceipt=Mostrar recibo de depósito
 NumberOfCheques=Não de cheque
 DeleteTransaction=Eliminar entrada
diff --git a/htdocs/langs/pt_PT/cashdesk.lang b/htdocs/langs/pt_PT/cashdesk.lang
index 5146c9f9ddc..fd28a55ea80 100644
--- a/htdocs/langs/pt_PT/cashdesk.lang
+++ b/htdocs/langs/pt_PT/cashdesk.lang
@@ -62,6 +62,7 @@ TicketVatGrouped=Group VAT by rate in tickets
 AutoPrintTickets=Automatically print tickets
 EnableBarOrRestaurantFeatures=Enable features for Bar or Restaurant
 ConfirmDeletionOfThisPOSSale=Do your confirm the deletion of this current sale ?
+ConfirmDiscardOfThisPOSSale=Do you want to discard this current sale ?
 History=Histórico
 ValidateAndClose=Validate and close
 Terminal=Terminal
@@ -69,3 +70,8 @@ NumberOfTerminals=Number of Terminals
 TerminalSelect=Select terminal you want to use:
 POSTicket=POS Ticket
 BasicPhoneLayout=Use basic layout for phones
+SetupOfTerminalNotComplete=Setup of terminal %s is not complete
+DirectPayment=Direct payment
+DirectPaymentButton=Direct cash payment button
+InvoiceIsAlreadyValidated=Invoice is already validated
+NoLinesToBill=No lines to bill
diff --git a/htdocs/langs/pt_PT/companies.lang b/htdocs/langs/pt_PT/companies.lang
index 393abc36064..1de7e2cf941 100644
--- a/htdocs/langs/pt_PT/companies.lang
+++ b/htdocs/langs/pt_PT/companies.lang
@@ -54,6 +54,7 @@ Firstname=Primeiro Nome
 PostOrFunction=Posição da tarefa
 UserTitle=Título
 NatureOfThirdParty=Natureza do terceiro
+NatureOfContact=Nature of Contact
 Address=Direcção
 State=Concelho
 StateShort=Concelho
diff --git a/htdocs/langs/pt_PT/contracts.lang b/htdocs/langs/pt_PT/contracts.lang
index 04a3ed5a02f..7554aec83ed 100644
--- a/htdocs/langs/pt_PT/contracts.lang
+++ b/htdocs/langs/pt_PT/contracts.lang
@@ -51,6 +51,7 @@ ListOfClosedServices=Lista de serviços fechados
 ListOfRunningServices=Lista de serviços ativos
 NotActivatedServices=Serviços inativos (em contractos validados)
 BoardNotActivatedServices=Serviços a ativar (em contratos validados)
+BoardNotActivatedServicesShort=Services to activate
 LastContracts=Os últimos %s contratos
 LastModifiedServices=Últimos %s serviços modificados
 ContractStartDate=Data de inicio
@@ -64,7 +65,10 @@ DateStartRealShort=Data de início real
 DateEndReal=Data de término real
 DateEndRealShort=Data de término real
 CloseService=Fechar serviço
-BoardRunningServices=Serviços ativos expirados
+BoardRunningServices=Services running
+BoardRunningServicesShort=Services running
+BoardExpiredServices=Services expired
+BoardExpiredServicesShort=Services expired
 ServiceStatus=Estado do serviço
 DraftContracts=Contratos rascunho
 CloseRefusedBecauseOneServiceActive=Contract can't be closed as there is at least one open service on it
diff --git a/htdocs/langs/pt_PT/errors.lang b/htdocs/langs/pt_PT/errors.lang
index 886d1ba6642..8dd5791b6f2 100644
--- a/htdocs/langs/pt_PT/errors.lang
+++ b/htdocs/langs/pt_PT/errors.lang
@@ -218,6 +218,7 @@ ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text
 ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Error, delete payment linked to a closed invoice is not possible.
+ErrorSearchCriteriaTooSmall=Search criteria too small.
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 WarningPasswordSetWithNoAccount=Uma senha foi definida para este membro. No entanto, nenhuma conta de usuário foi criada. Portanto, essa senha é armazenada, mas não pode ser usada para fazer login no Dolibarr. Pode ser usado por um módulo externo / interface, mas se você não precisa definir nenhum login nem senha para um membro, você pode desativar a opção "Gerenciar um login para cada membro" da configuração do módulo de membro. Se você precisar gerenciar um login, mas não precisar de nenhuma senha, poderá manter esse campo vazio para evitar esse aviso. Nota: O email também pode ser usado como um login se o membro estiver vinculado a um usuário.
diff --git a/htdocs/langs/pt_PT/main.lang b/htdocs/langs/pt_PT/main.lang
index 2ff9c3ef136..73c503925f9 100644
--- a/htdocs/langs/pt_PT/main.lang
+++ b/htdocs/langs/pt_PT/main.lang
@@ -28,6 +28,7 @@ NoTemplateDefined=Nenhum modelo disponível para este tipo de e-mail
 AvailableVariables=Variáveis de substituição disponíveis
 NoTranslation=Sem tradução
 Translation=Tradução
+EmptySearchString=Enter a non empty search string
 NoRecordFound=Nenhum foi encontrado nenhum registo
 NoRecordDeleted=Nenhum registo eliminado
 NotEnoughDataYet=Não existe dados suficientes
@@ -704,6 +705,7 @@ DateOfSignature=Data da assinatura
 HidePassword=Esconder password
 UnHidePassword=Mostrar caracteres da password
 Root=Raíz
+RootOfMedias=Root of public medias (/medias)
 Informations=Informação
 Page=Página
 Notes=Notas
@@ -981,3 +983,10 @@ PaymentInformation=Payment information
 ValidFrom=Valid from
 ValidUntil=Valid until
 NoRecordedUsers=No users
+ToClose=To close
+ToProcess=Por processar
+ToApprove=To approve
+GlobalOpenedElemView=Global view
+NoArticlesFoundForTheKeyword=No article found for the keyword '<strong>%s</strong>'
+NoArticlesFoundForTheCategory=No article found for the category
+ToAcceptRefuse=To accept | refuse
diff --git a/htdocs/langs/pt_PT/members.lang b/htdocs/langs/pt_PT/members.lang
index 36f6e87bdac..fcf41de278b 100644
--- a/htdocs/langs/pt_PT/members.lang
+++ b/htdocs/langs/pt_PT/members.lang
@@ -29,6 +29,7 @@ MenuMembersUpToDate=Membros actualizados
 MenuMembersNotUpToDate=Membros não actualizados
 MenuMembersResiliated=Membros inativos
 MembersWithSubscriptionToReceive=Membros com assinatura para receber
+MembersWithSubscriptionToReceiveShort=Subscription to receive
 DateSubscription=Data filiação
 DateEndSubscription=Data fim filiação
 EndSubscription=Fim filiação
diff --git a/htdocs/langs/pt_PT/projects.lang b/htdocs/langs/pt_PT/projects.lang
index bdc40a6cc22..6e0e855c58e 100644
--- a/htdocs/langs/pt_PT/projects.lang
+++ b/htdocs/langs/pt_PT/projects.lang
@@ -76,7 +76,13 @@ MyProjects=Os Meus Projetos
 MyProjectsArea=A Minha Área de Projetos
 DurationEffective=Duração Efetiva
 ProgressDeclared=Progresso declarado
+TaskProgressSummary=Task progress
+CurentlyOpenedTasks=Curently opened tasks
+TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared progress is less %s than the calculated progression
+TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared progress is more %s than the calculated progression
 ProgressCalculated=Progresso calculado
+WhichIamLinkedTo=which I'm linked to
+WhichIamLinkedToProject=which I'm linked to project
 Time=Tempo
 ListOfTasks=Lista de tarefas
 GoToListOfTimeConsumed=Ir para a lista de tempo consumido
diff --git a/htdocs/langs/pt_PT/website.lang b/htdocs/langs/pt_PT/website.lang
index 45e4472c601..78b884449b1 100644
--- a/htdocs/langs/pt_PT/website.lang
+++ b/htdocs/langs/pt_PT/website.lang
@@ -2,7 +2,7 @@
 Shortname=Código
 WebsiteSetupDesc=Crie aqui os sites que você deseja usar. Em seguida, vá para o menu Websites para editá-los.
 DeleteWebsite=Eliminar site da Web
-ConfirmDeleteWebsite=Tem certeza de que deseja excluir este site? Todas as suas páginas e conteúdo também serão removidos.
+ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed. The files uploaded (like into the medias directory, the ECM module, ...) will remain.
 WEBSITE_TYPE_CONTAINER=Tipo de página / recipiente
 WEBSITE_PAGE_EXAMPLE=Página da Web para utilizar como exemplo
 WEBSITE_PAGENAME=Nome/pseudonimo da página
@@ -14,6 +14,9 @@ WEBSITE_JS_INLINE=Conteúdo do arquivo Javascript (comum a todas as páginas)
 WEBSITE_HTML_HEADER=Inclusão na parte inferior do cabeçalho HTML (comum a todas as páginas)
 WEBSITE_ROBOT=Arquivo Robot (robots.txt)
 WEBSITE_HTACCESS=Arquivo .htaccess do site
+WEBSITE_MANIFEST_JSON=Website manifest.json file
+WEBSITE_README=README.md file
+EnterHereLicenseInformation=Enter here meta data or license information to fille a README.md file. if you distribute your website as a template, the file will be included into the temptate package.
 HtmlHeaderPage=Cabeçalho HTML (especificar apenas para  esta página)
 PageNameAliasHelp=Nome ou alias da página. <br> Este alias também é usado para forjar uma URL SEO quando o site é executado a partir de um host virtual de um servidor Web (como Apacke, Nginx, ...). Use o botão "<strong> %s </ strong>" para editar este alias.
 EditTheWebSiteForACommonHeader=Nota: Se você quiser definir um cabeçalho personalizado para todas as páginas, edite o cabeçalho no nível do site em vez de na página / container.
@@ -41,6 +44,7 @@ RealURL=URL Real
 ViewWebsiteInProduction=Ver site da Web utilizando URLs de início
 SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then set the name of the virtual host you have created in the properties of web site, so the preview can be done also using this dedicated web server access instead of the internal Dolibarr server.
 YouCanAlsoTestWithPHPS=<u> Usar com servidor embutido em PHP </ u> <br> No ambiente de desenvolvimento, você pode preferir testar o site com o servidor da Web incorporado em PHP (requer PHP 5.5) executando <strong> php -S 0.0. 0,0: 8080 -t %s </ strong>
+YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
 CheckVirtualHostPerms=Verifique também se o host virtual tem permissão <strong> %s </ strong> em arquivos para o <strong> %s </ strong>
 ReadPerm=Ler
 WritePerm=Escrever
@@ -75,7 +79,8 @@ AddWebsiteAccount=Crie uma conta do site
 BackToListOfThirdParty=Voltar para lista de terceiros
 DisableSiteFirst=Desativar primeiro site
 MyContainerTitle=Meu título do site
-AnotherContainer=Outro recipiente
+AnotherContainer=This is how to include content of another page/container (you may have an error here if you enable dynamic code because the embedded subcontainer may not exists)
+SorryWebsiteIsCurrentlyOffLine=Sorry, this website is currently off line. Please comme back later...
 WEBSITE_USE_WEBSITE_ACCOUNTS=Ativar a tabela de contas do site
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / third party
 YouMustDefineTheHomePage=Primeiro deve definir a página de Início predefinida
@@ -89,7 +94,8 @@ AliasPageAlreadyExists=A página de alias <strong> %s </ strong> já existe
 CorporateHomePage=Página de Início da Empresa
 EmptyPage=Página vazia
 ExternalURLMustStartWithHttp=O URL externo deve começar com http: // ou https: //
-ZipOfWebsitePackageToImport=Arquivo zip do pacote do site
+ZipOfWebsitePackageToImport=Upload the Zip file of the website template package
+ZipOfWebsitePackageToLoad=or Choose an available embedded website template package
 ShowSubcontainers=Incluir conteúdo dinâmico
 InternalURLOfPage=URL interno da página
 ThisPageIsTranslationOf=This page/container is a translation of
@@ -101,5 +107,10 @@ NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynam
 ReplaceWebsiteContent=Search or Replace website content
 DeleteAlsoJs=Delete also all javascript files specific to this website?
 DeleteAlsoMedias=Delete also all medias files specific to this website?
-# Export
 MyWebsitePages=My website pages
+SearchReplaceInto=Search | Replace into
+ReplaceString=New string
+CSSContentTooltipHelp=Enter here CSS content. To avoid any conflict with the CSS of the application, be sure to prepend all declaration with the .bodywebsite class. For example:<br><br>#mycssselector, input.myclass:hover { ... }<br>must be<br>.bodywebsite #mycssselector, .bodywebsite input.myclass:hover { ... }<br><br>Note: If you have a large file without this prefix, you can use 'lessc' to convert it to append the .bodywebsite prefix everywhere.
+LinkAndScriptsHereAreNotLoadedInEditor=Warning: This content is output only when site is accessed from a server. It is not used in Edit mode so if you need to load javascript files also in edit mode, just add your tag 'script src=...' into the page.
+Dynamiccontent=Sample of a page with dynamic content
+ImportSite=Importar modelo de site
diff --git a/htdocs/langs/ro_RO/admin.lang b/htdocs/langs/ro_RO/admin.lang
index ca53c0a762f..3c09b5fc4b3 100644
--- a/htdocs/langs/ro_RO/admin.lang
+++ b/htdocs/langs/ro_RO/admin.lang
@@ -400,6 +400,7 @@ OldVATRates=Vechea rată TVA
 NewVATRates=Noua rată TVA
 PriceBaseTypeToChange=Modifică la prețuri cu valoarea de referință de bază definit pe
 MassConvert=Lansați conversia în bloc
+PriceFormatInCurrentLanguage=Price Format In Current Language
 String=String
 TextLong=Long text
 HtmlText=Text HTML
@@ -431,7 +432,7 @@ ExtrafieldParamHelpradio=Lista de valori trebuie să fie linii cu format cheie,v
 ExtrafieldParamHelpsellist=Lista de valori provine dintr-un tabel <br> Sintaxă: table_name: label_field: id_field :: filter <br> Exemplu: c_typent: libelle: id :: filter <br> <br> - idfilter este obligatoriu o cheie primară <br> - filtrul poate fi un test simplu (de exemplu, activ = 1) pentru a afișa numai valoarea activă <br> Puteți utiliza, de asemenea, $ID$ în filtrul care este ID-ul curent al obiectului curent <br> Pentru a face SELECT în filtru utilizați $SEL$ <br> dacă vrei să filtrezi în extracâmpuri foloseste sintaxa extra.fieldcode = ... (unde codul de câmp este codul extra-câmpului) <br> <br> Pentru a avea lista în funcție de o altă listă de atribute complementare: <br> c_typent: libelle: id: options_ <i> parent_list_code </i> |parent_column: filter <br> <br> Pentru a avea lista în funcție de altă listă: <br> c_typent: libelle: id: <i> parent_list_code </i> | parent_column: filtru
 ExtrafieldParamHelpchkbxlst=Lista de valori vine dintr-un tabel<br>Sintaxă: table_name:label_field:id_field::filter<br>Examplu: c_typent:libelle:id::filter<br><br>filtrul poate fi un simplu test (ex active=1) pentru a afişa doar valoarea activă<br>De asemenea se poate utiliza $ID$ în filtrul care este ID-ul curent al obiectului curent<br>Pentru a face o SELECTARE în filtru folosiţi $SEL$<br>dacă doriţi să filtraţi în extracâmpuri folosiţi sintaxa extra.fieldcode=... (unde codul câmpului este codul extracâmpului)<br><br>Pentru a avea lista în funcție de o altă listă de atribute complementare:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>Pentru a avea lista în funcție de o altă listă :<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parametrii trebuie să fie ObjectName: Classpath <br> Sintaxă: ObjectName: Classpath <br> Exemple: <br> Societe:societe/class/societe.class.php <br> Contact: contact/class/contact.class.php
-ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default)<br>Set this to 2 for a collapsing separator (collapsed by default)
+ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Bibliotecă utilizată pentru generarea PDF-urilor
 LocalTaxDesc=Unele țări pot aplica două sau trei taxe pe fiecare linie de facturare. Dacă este cazul, alegeți tipul pentru a doua și a treia taxă și rata acestora. Tipuri posibile sunt: <br> 1: taxa locală se aplică produselor și serviciilor fără TVA (localtax se calculează pe valoare fără taxă)<br> 2: taxa locală se aplică produselor și serviciilor, inclusiv TVA (localtax se calculează în funcție de valoare+ taxa principală ) <br>3: taxa locală se aplică produselor fără TVA (localtax se calculează pe valoare fără taxă) <br>4: taxa locală se aplică produselor şi includ tva (localtax  se calculeaza pe valoare + TVA principală) <br> 5: taxa locală se aplică serviciilor fără TVA (localtax se calculează pe valoarea fără TVA) <br> 6: taxa locală se aplică serviciilor, inclusiv TVA (localtax se calculează pe sumă + taxă)
 SMS=SMS
@@ -1695,7 +1696,7 @@ SuppliersInvoiceNumberingModel=Modele de numerotare a facturilor furnizorilor
 IfSetToYesDontForgetPermission=Dacă este setat la da, nu uitați să furnizați permisiuni grupurilor sau utilizatorilor cărora li se permite a doua aprobare
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=GeoIP Maxmind modul de configurare
-PathToGeoIPMaxmindCountryDataFile=Calea către fișierul care conține Maxmind  tranlatarea IP la  țară. <br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat
+PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoLite2-Country.mmdb
 NoteOnPathLocation=Reţineţi că dvs. de IP la datele din ţara Dosarul trebuie să fie într-un director PHP poate citi (Verificaţi configurarea PHP open_basedir şi permisiunile de fişiere).
 YouCanDownloadFreeDatFileTo=Puteţi descărca o <b>versiune demo gratuită</b> a ţării dosar GeoIP Maxmind la %s.
 YouCanDownloadAdvancedDatFileTo=Puteţi descărca de asemenea, o <b>versiune</b> mai <b>completă, cu actualizari ale</b> ţării dosar GeoIP Maxmind la %s.
@@ -1926,14 +1927,13 @@ SmallerThan=Smaller than
 LargerThan=Larger than
 IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID is found into incoming email, the event will be automatically linked to the related objects.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
-IFTTTSetup=IFTTT module setup
-IFTTT_SERVICE_KEY=IFTTT Service key
-IFTTT_DOLIBARR_ENDPOINT_SECUREKEY=Security key to secure the endpoint URL used by IFTTT to send messages to your Dolibarr.
-IFTTTDesc=This module is designed to trigger events on IFTTT and/or to execute some action on external IFTTT triggers.
-UrlForIFTTT=URL endpoint for IFTTT
-YouWillFindItOnYourIFTTTAccount=You will find it on your IFTTT account
 EndPointFor=End point for %s : %s
 DeleteEmailCollector=Delete email collector
 ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
 RecipientEmailsWillBeReplacedWithThisValue=Recipient emails will be always replaced with this value
 AtLeastOneDefaultBankAccountMandatory=At least 1 default bank account must be defined
+RESTRICT_API_ON_IP=Allow available APIs to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can use the available APIs.
+RESTRICT_ON_IP=Allow access to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can access.
+BaseOnSabeDavVersion=Based on the library SabreDAV version
+NotAPublicIp=Not a public IP
+MakeAnonymousPing=Make an anonymous Ping '+1' to the Dolibarr foundation server (done 1 time only after installation) to allow the foundation to count the number of Dolibarr installation.
diff --git a/htdocs/langs/ro_RO/banks.lang b/htdocs/langs/ro_RO/banks.lang
index fde1561a69e..4992eb41f50 100644
--- a/htdocs/langs/ro_RO/banks.lang
+++ b/htdocs/langs/ro_RO/banks.lang
@@ -73,6 +73,7 @@ BankTransaction=Intrare bancară
 ListTransactions=Lista înregistrări
 ListTransactionsByCategory=Lista înregistrări/categorii
 TransactionsToConciliate=Intrări pentru reconciliere
+TransactionsToConciliateShort=To reconcile
 Conciliable=Decontabil
 Conciliate=Deconteaza
 Conciliation=Conciliere
@@ -116,6 +117,7 @@ DeleteCheckReceipt=Ștergeți această chitanță de confirmare?
 ConfirmDeleteCheckReceipt=Sigur stergeți această chitanță de confirmare? 
 BankChecks=Cecuri bancare
 BankChecksToReceipt=CEC-uri spre încasare
+BankChecksToReceiptShort=CEC-uri spre încasare
 ShowCheckReceipt=Arată borderou de cecuri remise
 NumberOfCheques=Nr. cecului
 DeleteTransaction=Ștergeți intrarea
diff --git a/htdocs/langs/ro_RO/cashdesk.lang b/htdocs/langs/ro_RO/cashdesk.lang
index e2a977af7b8..2d243deee8c 100644
--- a/htdocs/langs/ro_RO/cashdesk.lang
+++ b/htdocs/langs/ro_RO/cashdesk.lang
@@ -62,6 +62,7 @@ TicketVatGrouped=Group VAT by rate in tickets
 AutoPrintTickets=Automatically print tickets
 EnableBarOrRestaurantFeatures=Enable features for Bar or Restaurant
 ConfirmDeletionOfThisPOSSale=Do your confirm the deletion of this current sale ?
+ConfirmDiscardOfThisPOSSale=Do you want to discard this current sale ?
 History=Istoric
 ValidateAndClose=Validate and close
 Terminal=Terminal
@@ -69,3 +70,8 @@ NumberOfTerminals=Number of Terminals
 TerminalSelect=Select terminal you want to use:
 POSTicket=POS Ticket
 BasicPhoneLayout=Use basic layout for phones
+SetupOfTerminalNotComplete=Setup of terminal %s is not complete
+DirectPayment=Direct payment
+DirectPaymentButton=Direct cash payment button
+InvoiceIsAlreadyValidated=Invoice is already validated
+NoLinesToBill=No lines to bill
diff --git a/htdocs/langs/ro_RO/companies.lang b/htdocs/langs/ro_RO/companies.lang
index a109434b4bb..46643e7d7e1 100644
--- a/htdocs/langs/ro_RO/companies.lang
+++ b/htdocs/langs/ro_RO/companies.lang
@@ -54,6 +54,7 @@ Firstname=Prenume
 PostOrFunction=Funcţie
 UserTitle=Titlu
 NatureOfThirdParty=Natura terților
+NatureOfContact=Nature of Contact
 Address=Adresă
 State=Regiune / Judeţ
 StateShort=Stare
diff --git a/htdocs/langs/ro_RO/contracts.lang b/htdocs/langs/ro_RO/contracts.lang
index d9c3151263a..617f13bc402 100644
--- a/htdocs/langs/ro_RO/contracts.lang
+++ b/htdocs/langs/ro_RO/contracts.lang
@@ -51,6 +51,7 @@ ListOfClosedServices=Lista  servicii închise
 ListOfRunningServices=Lista servicii active
 NotActivatedServices=Servicii  inactive (printre contracte validate  )
 BoardNotActivatedServices=Servicii de activat în contractele validate
+BoardNotActivatedServicesShort=Services to activate
 LastContracts=Ultimele %s contracte
 LastModifiedServices=Ultimele %s servicii modificate 
 ContractStartDate=Data începerii
@@ -64,7 +65,10 @@ DateStartRealShort=Data începerii efectivă
 DateEndReal=Data terminăriii efectivă
 DateEndRealShort=Data terminăriii efectivă
 CloseService=Inchide serviciu
-BoardRunningServices=Servicii active şi expirate ăn contract
+BoardRunningServices=Services running
+BoardRunningServicesShort=Services running
+BoardExpiredServices=Services expired
+BoardExpiredServicesShort=Services expired
 ServiceStatus=Status  serviciu
 DraftContracts=Contracte schiţă
 CloseRefusedBecauseOneServiceActive=Contractul nu poate fi închis, deoarece există cel puțin un serviciu deschis pe acesta
diff --git a/htdocs/langs/ro_RO/errors.lang b/htdocs/langs/ro_RO/errors.lang
index 3402e4a690e..c82e59110ab 100644
--- a/htdocs/langs/ro_RO/errors.lang
+++ b/htdocs/langs/ro_RO/errors.lang
@@ -218,6 +218,7 @@ ErrorVariableKeyForContentMustBeSet=Eroare, trebuie să fie setată constanta cu
 ErrorURLMustStartWithHttp=URL-ul %s trebuie să înceapă cu http:// sau https://
 ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Error, delete payment linked to a closed invoice is not possible.
+ErrorSearchCriteriaTooSmall=Search criteria too small.
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 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/main.lang b/htdocs/langs/ro_RO/main.lang
index e5d109c0da2..0b65a33ae32 100644
--- a/htdocs/langs/ro_RO/main.lang
+++ b/htdocs/langs/ro_RO/main.lang
@@ -28,6 +28,7 @@ NoTemplateDefined=Nu există șablon disponibil pentru acest tip de email
 AvailableVariables=Variabile  substitutie disponibil
 NoTranslation=Fără traducere
 Translation=Traduceri
+EmptySearchString=Enter a non empty search string
 NoRecordFound=Nicio înregistrare  gasită
 NoRecordDeleted=Nu s-au șters înregistrări
 NotEnoughDataYet=Nu sunt date 
@@ -704,6 +705,7 @@ DateOfSignature=Data semnării
 HidePassword=Afișare comanda cu parola ascunsă
 UnHidePassword=Afișare comanda reală cu parola în clar
 Root=Rădăcină
+RootOfMedias=Root of public medias (/medias)
 Informations=Informatie
 Page=Pagină
 Notes=Note
@@ -981,3 +983,10 @@ PaymentInformation=Payment information
 ValidFrom=Valid from
 ValidUntil=Valid until
 NoRecordedUsers=No users
+ToClose=To close
+ToProcess=De procesat
+ToApprove=To approve
+GlobalOpenedElemView=Global view
+NoArticlesFoundForTheKeyword=No article found for the keyword '<strong>%s</strong>'
+NoArticlesFoundForTheCategory=No article found for the category
+ToAcceptRefuse=To accept | refuse
diff --git a/htdocs/langs/ro_RO/members.lang b/htdocs/langs/ro_RO/members.lang
index 531ffe93732..e309826e690 100644
--- a/htdocs/langs/ro_RO/members.lang
+++ b/htdocs/langs/ro_RO/members.lang
@@ -29,6 +29,7 @@ MenuMembersUpToDate=Membri cu cotizaţia la zi
 MenuMembersNotUpToDate=Membri fără  cotizaţia la zi
 MenuMembersResiliated=Membrii desființați
 MembersWithSubscriptionToReceive=Membri cu cotizaţia de încasat
+MembersWithSubscriptionToReceiveShort=Subscription to receive
 DateSubscription=Data Adeziune
 DateEndSubscription=Dată Sfârşit Adeziune
 EndSubscription=Sfârşit Adeziune
diff --git a/htdocs/langs/ro_RO/projects.lang b/htdocs/langs/ro_RO/projects.lang
index 36de3c1d572..ede6195e1a2 100644
--- a/htdocs/langs/ro_RO/projects.lang
+++ b/htdocs/langs/ro_RO/projects.lang
@@ -76,7 +76,13 @@ MyProjects=Proiectele mele
 MyProjectsArea=Zona proiectelor mele
 DurationEffective=Durata efectivă
 ProgressDeclared=Progres calculat
+TaskProgressSummary=Task progress
+CurentlyOpenedTasks=Curently opened tasks
+TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared progress is less %s than the calculated progression
+TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared progress is more %s than the calculated progression
 ProgressCalculated=Progres calculat
+WhichIamLinkedTo=which I'm linked to
+WhichIamLinkedToProject=which I'm linked to project
 Time=Timp
 ListOfTasks=Lista de sarcini
 GoToListOfTimeConsumed=Accesați lista de timp consumată
diff --git a/htdocs/langs/ro_RO/website.lang b/htdocs/langs/ro_RO/website.lang
index 5a688b89cce..d4160b2d8d5 100644
--- a/htdocs/langs/ro_RO/website.lang
+++ b/htdocs/langs/ro_RO/website.lang
@@ -2,7 +2,7 @@
 Shortname=Cod
 WebsiteSetupDesc=Creați aici site-urile pe care doriți să le utilizați. Apoi intrați în meniul Websites pentru a le edita.
 DeleteWebsite=Şterge website
-ConfirmDeleteWebsite=Sigur doriți să ștergeți acest site web? Toate paginile și conținutul acestuia vor fi, de asemenea, eliminate.
+ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed. The files uploaded (like into the medias directory, the ECM module, ...) will remain.
 WEBSITE_TYPE_CONTAINER=Tipul paginii/recipientului
 WEBSITE_PAGE_EXAMPLE=Pagină web pentru utilizare ca exemplu
 WEBSITE_PAGENAME=Pagina nume/alias
@@ -14,6 +14,9 @@ WEBSITE_JS_INLINE=Conținutul fișierului Javascript (comun tuturor paginilor)
 WEBSITE_HTML_HEADER=Adăugarea în partea de jos a antetului HTML (comun pentru toate paginile)
 WEBSITE_ROBOT=Fișier robot (robots.txt)
 WEBSITE_HTACCESS=Fișier .htaccess de pe site
+WEBSITE_MANIFEST_JSON=Website manifest.json file
+WEBSITE_README=README.md file
+EnterHereLicenseInformation=Enter here meta data or license information to fille a README.md file. if you distribute your website as a template, the file will be included into the temptate package.
 HtmlHeaderPage=Antet HTML (specific numai pentru această pagină)
 PageNameAliasHelp=Numele sau aliasul paginii. <br> Acest alias este, de asemenea, folosit pentru a crea un URL SEO când site-ul web este rulat de o gazdă virtuală a unui server Web (cum ar fi Apacke, Nginx, ...). Utilizați butonul "<strong> %s </strong>" pentru a edita acest alias.
 EditTheWebSiteForACommonHeader=Notă: dacă doriți să definiți un antet personalizat pentru toate paginile, modificați antetul la nivelul site-ului în locul paginii / containerului.
@@ -41,6 +44,7 @@ RealURL=Real URL
 ViewWebsiteInProduction=Vizualizați site-ul web utilizând URL-urile de home
 SetHereVirtualHost= <u> Utilizați cu Apache / NGinx / ... </u> <br> Dacă puteți crea, pe serverul dvs. de web (Apache, Nginx, ...), un gazdă dedicat cu PHP activat și un director Root pe <br> <strong> %s </strong> <br> apoi setați numele gazdei virtuale pe care ați creat-o în proprietățile site-ului web, astfel încât previzualizarea poate fi făcută și utilizând acest acces dedicat serverului web în loc de serverul intern Dolibarr.
 YouCanAlsoTestWithPHPS=<u> Utilizarea cu serverul încorporat PHP </u> <br> În mediul de dezvoltare, puteți prefera să testați site-ul cu serverul web încorporat PHP (PHP 5.5 necesar) executând <br> <strong> php -S 0.0.0.0:8080 -t %s </strong>
+YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
 CheckVirtualHostPerms=Verificați, de asemenea, că gazda virtuală are permisiunea <strong> %s </strong> pe fișiere în <br> <strong> %s </strong>
 ReadPerm=Citit
 WritePerm=Scrie
@@ -75,7 +79,8 @@ AddWebsiteAccount=Creați un cont de site web
 BackToListOfThirdParty=Înapoi la listă pentru terți
 DisableSiteFirst=Dezactivați mai întâi site-ul web
 MyContainerTitle=Titlul site-ului meu web
-AnotherContainer=Alt recipient
+AnotherContainer=This is how to include content of another page/container (you may have an error here if you enable dynamic code because the embedded subcontainer may not exists)
+SorryWebsiteIsCurrentlyOffLine=Sorry, this website is currently off line. Please comme back later...
 WEBSITE_USE_WEBSITE_ACCOUNTS=Activați tabelul contului site-ului web
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Activați tabelul pentru a stoca conturile site-urilor web (Autentificare/parola) pentru fiecare site / terț
 YouMustDefineTheHomePage=Mai întâi trebuie să definiți pagina de Home implicită
@@ -89,7 +94,8 @@ AliasPageAlreadyExists=Pagina Alias <strong> %s </strong> există deja
 CorporateHomePage=Pagina de Home a companiei
 EmptyPage=Pagina goală
 ExternalURLMustStartWithHttp=Adresa URL externă trebuie să înceapă cu http:// sau https://
-ZipOfWebsitePackageToImport=Fisier zip al pachetului de site-uri web
+ZipOfWebsitePackageToImport=Upload the Zip file of the website template package
+ZipOfWebsitePackageToLoad=or Choose an available embedded website template package
 ShowSubcontainers=Includeți conținut dinamic
 InternalURLOfPage=Adresa URL internă a paginii
 ThisPageIsTranslationOf=Această pagină/recipient este o traducere a
@@ -101,5 +107,10 @@ NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynam
 ReplaceWebsiteContent=Search or Replace website content
 DeleteAlsoJs=Delete also all javascript files specific to this website?
 DeleteAlsoMedias=Delete also all medias files specific to this website?
-# Export
 MyWebsitePages=My website pages
+SearchReplaceInto=Search | Replace into
+ReplaceString=New string
+CSSContentTooltipHelp=Enter here CSS content. To avoid any conflict with the CSS of the application, be sure to prepend all declaration with the .bodywebsite class. For example:<br><br>#mycssselector, input.myclass:hover { ... }<br>must be<br>.bodywebsite #mycssselector, .bodywebsite input.myclass:hover { ... }<br><br>Note: If you have a large file without this prefix, you can use 'lessc' to convert it to append the .bodywebsite prefix everywhere.
+LinkAndScriptsHereAreNotLoadedInEditor=Warning: This content is output only when site is accessed from a server. It is not used in Edit mode so if you need to load javascript files also in edit mode, just add your tag 'script src=...' into the page.
+Dynamiccontent=Sample of a page with dynamic content
+ImportSite=Importați șablonul de site web
diff --git a/htdocs/langs/ru_RU/admin.lang b/htdocs/langs/ru_RU/admin.lang
index 1b274768ca4..573fb6c6efb 100644
--- a/htdocs/langs/ru_RU/admin.lang
+++ b/htdocs/langs/ru_RU/admin.lang
@@ -400,6 +400,7 @@ OldVATRates=Предыдущее значение НДС
 NewVATRates=Новое значение НДС
 PriceBaseTypeToChange=Изменять базовые цены на определенную величину
 MassConvert=Запустить пакетное преобразование
+PriceFormatInCurrentLanguage=Price Format In Current Language
 String=Строка
 TextLong=Длинный текст
 HtmlText=Html текст
@@ -431,7 +432,7 @@ ExtrafieldParamHelpradio=Список значений должен быть с
 ExtrafieldParamHelpsellist=Список значений поступает из таблицы <br> Синтаксис: table_name:label_field:id_field::filter <br> Пример: c_typent:libelle:id:: filter<br><br> -idfilter - обязательно первичный ключ int <br> - фильтр может быть простым тестом (например, active = 1) для отображения только активного значения <br> Вы также можете использовать $ID$ в фильтре с текущим идентификатором текущего объекта. <br> Чтобы сделать SELECT в фильтре, используйте $SEL$ <br> если вы хотите фильтровать extrafields, используйте синтаксис extra.fieldcode = ... (где code field - это код extrafields) <br><br> Чтобы иметь список в зависимости от другого списка дополнительных атрибутов: <br> c_typent:libelle:id:options_ <i>parent_list_code</i>|parent_column:filter <br><br> Чтобы иметь список в зависимости от другого списка: <br> c_typent:libelle:id: <i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelpchkbxlst=Список значений поступает из таблицы <br> Синтаксис: table_name:label_field:id_field::filter <br> Пример: c_typent: libelle:id::filter <br><br> Фильтр может быть простым тестом (например, active = 1) для отображения только активного значения <br> Вы также можете использовать $ID$ в фильтре с текущим идентификатором текущего объекта. <br> Чтобы сделать SELECT в фильтре, используйте $SEL$ <br> если вы хотите фильтровать extrafield, используйте синтаксис extra.fieldcode = ... (где code field - это код extrafield) <br><br> Чтобы иметь список в зависимости от другого списка дополнительных атрибутов: <br> c_typent:libelle:id: options_ <i>parent_list_code</i>|parent_column: filter <br><br> Чтобы иметь список в зависимости от другого списка: <br> c_typent: ibelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Параметры должны быть ObjectName:Classpath <br> Синтаксис: ObjectName:Classpath <br> Примеры: <br> Societe:societe/class/societe.class.php <br> Contact:contact/class/contact.class.php
-ExtrafieldParamHelpSeparator=Оставьте пустым для простого разделителя <br> Установите  1 для сворачивающегося разделителя (открытый по умолчанию) <br> Установите  2 для сворачивающегося разделителя (свернут по умолчанию)
+ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Библиотека используемая для создания PDF-файлов
 LocalTaxDesc=Некоторые страны могут применять два или три налога на каждую позицию счета. Если это так, выберите тип второго и третьего налога и его ставку. Возможные типы: <br> 1: местный налог применяется к продуктам и услугам без НДС (местный налог рассчитывается на сумму без налога) <br> 2: местный налог применяется к продуктам и услугам, включая НДС (местный налог рассчитывается на сумму + основной налог) <br> 3: местный налог применяется к продуктам без НДС (местный налог рассчитывается на сумму без налога) <br> 4: местный налог применяется к продуктам, включая НДС (местный налог рассчитывается на сумму + основной НДС) <br> 5: местный налог применяется к услугам без НДС (местный налог рассчитывается на сумму без налога) <br> 6: местный налог применяется к услугам, включая НДС (местный налог рассчитывается на сумму + налог)
 SMS=SMS
@@ -1695,7 +1696,7 @@ SuppliersInvoiceNumberingModel=Vendor invoices numbering models
 IfSetToYesDontForgetPermission=Если установлено "Да", не забудьте дать доступ группам или пользователям, разрешённым для повторного утверждения
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=Настройка модуля GeoIP Maxmind
-PathToGeoIPMaxmindCountryDataFile=Путь к файлу Maxmind, который требуется для геолокации. <br>Например,<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat
+PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoLite2-Country.mmdb
 NoteOnPathLocation=Обратите внимание, что Ваш IP, чтобы страны файл данных должен быть в директории вашего PHP может читать (Проверьте ваши установки PHP open_basedir и файловой системы разрешений).
 YouCanDownloadFreeDatFileTo=Вы можете <b>скачать</b> бесплатную <b>демонстрационную версию</b> страны GeoIP MaxMind файл на %s.
 YouCanDownloadAdvancedDatFileTo=Вы также можете скачать более <b>полную версию, с обновлениями,</b> в стране GeoIP MaxMind файл на %s.
@@ -1926,14 +1927,13 @@ SmallerThan=Smaller than
 LargerThan=Larger than
 IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID is found into incoming email, the event will be automatically linked to the related objects.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
-IFTTTSetup=IFTTT module setup
-IFTTT_SERVICE_KEY=IFTTT Service key
-IFTTT_DOLIBARR_ENDPOINT_SECUREKEY=Security key to secure the endpoint URL used by IFTTT to send messages to your Dolibarr.
-IFTTTDesc=This module is designed to trigger events on IFTTT and/or to execute some action on external IFTTT triggers.
-UrlForIFTTT=URL endpoint for IFTTT
-YouWillFindItOnYourIFTTTAccount=You will find it on your IFTTT account
 EndPointFor=End point for %s : %s
 DeleteEmailCollector=Delete email collector
 ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
 RecipientEmailsWillBeReplacedWithThisValue=Recipient emails will be always replaced with this value
 AtLeastOneDefaultBankAccountMandatory=At least 1 default bank account must be defined
+RESTRICT_API_ON_IP=Allow available APIs to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can use the available APIs.
+RESTRICT_ON_IP=Allow access to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can access.
+BaseOnSabeDavVersion=Based on the library SabreDAV version
+NotAPublicIp=Not a public IP
+MakeAnonymousPing=Make an anonymous Ping '+1' to the Dolibarr foundation server (done 1 time only after installation) to allow the foundation to count the number of Dolibarr installation.
diff --git a/htdocs/langs/ru_RU/banks.lang b/htdocs/langs/ru_RU/banks.lang
index a7b6fd67d61..1ecb76b5709 100644
--- a/htdocs/langs/ru_RU/banks.lang
+++ b/htdocs/langs/ru_RU/banks.lang
@@ -73,6 +73,7 @@ BankTransaction=Банковская запись
 ListTransactions=Список записей
 ListTransactionsByCategory=Список записей/категория
 TransactionsToConciliate=Записи для согласования
+TransactionsToConciliateShort=To reconcile
 Conciliable=Conciliable
 Conciliate=Согласительной
 Conciliation=Согласительная
@@ -116,6 +117,7 @@ DeleteCheckReceipt=Удалить эту квитанцию?
 ConfirmDeleteCheckReceipt=Вы действительно хотите удалить эту квитанцию?
 BankChecks=Банковские чеки
 BankChecksToReceipt=Проверки, ожидающие внесения депозита
+BankChecksToReceiptShort=Проверки, ожидающие внесения депозита
 ShowCheckReceipt=Показать проверить депозита получения
 NumberOfCheques=No. of check
 DeleteTransaction=Удалить запись
diff --git a/htdocs/langs/ru_RU/cashdesk.lang b/htdocs/langs/ru_RU/cashdesk.lang
index b6ea72c8f0c..47f27460318 100644
--- a/htdocs/langs/ru_RU/cashdesk.lang
+++ b/htdocs/langs/ru_RU/cashdesk.lang
@@ -62,6 +62,7 @@ TicketVatGrouped=Group VAT by rate in tickets
 AutoPrintTickets=Automatically print tickets
 EnableBarOrRestaurantFeatures=Enable features for Bar or Restaurant
 ConfirmDeletionOfThisPOSSale=Подтверждаете ли вы удаление этой  продажи?
+ConfirmDiscardOfThisPOSSale=Do you want to discard this current sale ?
 History=История
 ValidateAndClose=Подтвердить и закрыть
 Terminal=Терминал
@@ -69,3 +70,8 @@ NumberOfTerminals=Количество терминалов
 TerminalSelect=Выберите терминал, который хотите использовать:
 POSTicket=POS Ticket
 BasicPhoneLayout=Use basic layout for phones
+SetupOfTerminalNotComplete=Setup of terminal %s is not complete
+DirectPayment=Direct payment
+DirectPaymentButton=Direct cash payment button
+InvoiceIsAlreadyValidated=Invoice is already validated
+NoLinesToBill=No lines to bill
diff --git a/htdocs/langs/ru_RU/companies.lang b/htdocs/langs/ru_RU/companies.lang
index 75936a1639c..2bf3a6bd380 100644
--- a/htdocs/langs/ru_RU/companies.lang
+++ b/htdocs/langs/ru_RU/companies.lang
@@ -54,6 +54,7 @@ Firstname=Имя
 PostOrFunction=Должность
 UserTitle=Название
 NatureOfThirdParty=Свойство контрагента
+NatureOfContact=Nature of Contact
 Address=Адрес
 State=Штат/Провинция
 StateShort=Штат
diff --git a/htdocs/langs/ru_RU/contracts.lang b/htdocs/langs/ru_RU/contracts.lang
index ae376c0ebc6..4998f074e06 100644
--- a/htdocs/langs/ru_RU/contracts.lang
+++ b/htdocs/langs/ru_RU/contracts.lang
@@ -51,6 +51,7 @@ ListOfClosedServices=Список закрытых услуги
 ListOfRunningServices=Список запущенных служб
 NotActivatedServices=Не активируется услуг (в том числе утверждены контракты)
 BoardNotActivatedServices=Услуги для активации среди подтвержденных договоров
+BoardNotActivatedServicesShort=Services to activate
 LastContracts=Latest %s contracts
 LastModifiedServices=Latest %s modified services
 ContractStartDate=Начальная дата
@@ -65,7 +66,9 @@ DateEndReal=Реальная дата окончания
 DateEndRealShort=Реальная дата окончания
 CloseService=Закрыть услугу
 BoardRunningServices=Services running
+BoardRunningServicesShort=Services running
 BoardExpiredServices=Просроченные услуги
+BoardExpiredServicesShort=Просроченные услуги
 ServiceStatus=Статус услуги
 DraftContracts=Проекты договоров
 CloseRefusedBecauseOneServiceActive=Contract can't be closed as there is at least one open service on it
diff --git a/htdocs/langs/ru_RU/errors.lang b/htdocs/langs/ru_RU/errors.lang
index ef954ee19b7..3c9849e008e 100644
--- a/htdocs/langs/ru_RU/errors.lang
+++ b/htdocs/langs/ru_RU/errors.lang
@@ -218,6 +218,7 @@ ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text
 ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Error, delete payment linked to a closed invoice is not possible.
+ErrorSearchCriteriaTooSmall=Search criteria too small.
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 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/main.lang b/htdocs/langs/ru_RU/main.lang
index 4bea2a8d3e2..36cfc69834b 100644
--- a/htdocs/langs/ru_RU/main.lang
+++ b/htdocs/langs/ru_RU/main.lang
@@ -28,6 +28,7 @@ NoTemplateDefined=Для этого типа электронной почты 
 AvailableVariables=Доступны переменные для замены
 NoTranslation=Нет перевода
 Translation=Перевод
+EmptySearchString=Enter a non empty search string
 NoRecordFound=Запись не найдена
 NoRecordDeleted=Нет удаленных записей
 NotEnoughDataYet=Недостаточно данных
@@ -704,6 +705,7 @@ DateOfSignature=Дата подписи
 HidePassword=Показать команду со скрытым паролем
 UnHidePassword=Показать реальную команду с открытым паролем
 Root=Корень
+RootOfMedias=Root of public medias (/medias)
 Informations=Информация
 Page=Страница
 Notes=Примечания
@@ -981,3 +983,10 @@ PaymentInformation=Платежная информация
 ValidFrom=Действительно с
 ValidUntil=Действительно до
 NoRecordedUsers=Нет пользователей
+ToClose=To close
+ToProcess=Для обработки
+ToApprove=To approve
+GlobalOpenedElemView=Global view
+NoArticlesFoundForTheKeyword=No article found for the keyword '<strong>%s</strong>'
+NoArticlesFoundForTheCategory=No article found for the category
+ToAcceptRefuse=To accept | refuse
diff --git a/htdocs/langs/ru_RU/members.lang b/htdocs/langs/ru_RU/members.lang
index bb7d48fff39..a43ce93ccef 100644
--- a/htdocs/langs/ru_RU/members.lang
+++ b/htdocs/langs/ru_RU/members.lang
@@ -29,6 +29,7 @@ MenuMembersUpToDate=На сегодняшний день членами
 MenuMembersNotUpToDate=За сегодняшний день члены
 MenuMembersResiliated=Terminated members
 MembersWithSubscriptionToReceive=Члены с подпиской на получение
+MembersWithSubscriptionToReceiveShort=Subscription to receive
 DateSubscription=Дата подписки
 DateEndSubscription=Дата окончания подписки
 EndSubscription=Конец подписке
diff --git a/htdocs/langs/ru_RU/projects.lang b/htdocs/langs/ru_RU/projects.lang
index 2535b60885f..1a0768b2a27 100644
--- a/htdocs/langs/ru_RU/projects.lang
+++ b/htdocs/langs/ru_RU/projects.lang
@@ -76,7 +76,13 @@ MyProjects=Мои проекты
 MyProjectsArea=My projects Area
 DurationEffective=Эффективная длительность
 ProgressDeclared=Заданный ход выполнения проекта
+TaskProgressSummary=Task progress
+CurentlyOpenedTasks=Curently opened tasks
+TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared progress is less %s than the calculated progression
+TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared progress is more %s than the calculated progression
 ProgressCalculated=Вычисленный  ход выполнения проекта
+WhichIamLinkedTo=which I'm linked to
+WhichIamLinkedToProject=which I'm linked to project
 Time=Время
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
diff --git a/htdocs/langs/ru_RU/website.lang b/htdocs/langs/ru_RU/website.lang
index 619b8022065..5baee85a224 100644
--- a/htdocs/langs/ru_RU/website.lang
+++ b/htdocs/langs/ru_RU/website.lang
@@ -2,7 +2,7 @@
 Shortname=Код
 WebsiteSetupDesc=Create here the websites you wish to use. Then go into menu Websites to edit them.
 DeleteWebsite=Удалить сайт
-ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed.
+ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed. The files uploaded (like into the medias directory, the ECM module, ...) will remain.
 WEBSITE_TYPE_CONTAINER=Type of page/container
 WEBSITE_PAGE_EXAMPLE=Web page to use as example
 WEBSITE_PAGENAME=Page name/alias
@@ -14,6 +14,9 @@ WEBSITE_JS_INLINE=Javascript file content (common to all pages)
 WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages)
 WEBSITE_ROBOT=Robot file (robots.txt)
 WEBSITE_HTACCESS=Website .htaccess file
+WEBSITE_MANIFEST_JSON=Website manifest.json file
+WEBSITE_README=README.md file
+EnterHereLicenseInformation=Enter here meta data or license information to fille a README.md file. if you distribute your website as a template, the file will be included into the temptate package.
 HtmlHeaderPage=HTML header (specific to this page only)
 PageNameAliasHelp=Name or alias of the page.<br>This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "<strong>%s</strong>" to edit this alias.
 EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container.
@@ -41,6 +44,7 @@ RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
 SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then set the name of the virtual host you have created in the properties of web site, so the preview can be done also using this dedicated web server access instead of the internal Dolibarr server.
 YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
 CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
 ReadPerm=Читать
 WritePerm=Write
@@ -75,7 +79,8 @@ AddWebsiteAccount=Create web site account
 BackToListOfThirdParty=Back to list for Third Party
 DisableSiteFirst=Disable website first
 MyContainerTitle=My web site title
-AnotherContainer=Another container
+AnotherContainer=This is how to include content of another page/container (you may have an error here if you enable dynamic code because the embedded subcontainer may not exists)
+SorryWebsiteIsCurrentlyOffLine=Sorry, this website is currently off line. Please comme back later...
 WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / third party
 YouMustDefineTheHomePage=You must first define the default Home page
@@ -89,7 +94,8 @@ AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
 CorporateHomePage=Corporate Home page
 EmptyPage=Empty page
 ExternalURLMustStartWithHttp=External URL must start with http:// or https://
-ZipOfWebsitePackageToImport=Zip file of website package
+ZipOfWebsitePackageToImport=Upload the Zip file of the website template package
+ZipOfWebsitePackageToLoad=or Choose an available embedded website template package
 ShowSubcontainers=Include dynamic content
 InternalURLOfPage=Internal URL of page
 ThisPageIsTranslationOf=This page/container is a translation of
@@ -101,5 +107,10 @@ NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynam
 ReplaceWebsiteContent=Search or Replace website content
 DeleteAlsoJs=Delete also all javascript files specific to this website?
 DeleteAlsoMedias=Delete also all medias files specific to this website?
-# Export
 MyWebsitePages=My website pages
+SearchReplaceInto=Search | Replace into
+ReplaceString=New string
+CSSContentTooltipHelp=Enter here CSS content. To avoid any conflict with the CSS of the application, be sure to prepend all declaration with the .bodywebsite class. For example:<br><br>#mycssselector, input.myclass:hover { ... }<br>must be<br>.bodywebsite #mycssselector, .bodywebsite input.myclass:hover { ... }<br><br>Note: If you have a large file without this prefix, you can use 'lessc' to convert it to append the .bodywebsite prefix everywhere.
+LinkAndScriptsHereAreNotLoadedInEditor=Warning: This content is output only when site is accessed from a server. It is not used in Edit mode so if you need to load javascript files also in edit mode, just add your tag 'script src=...' into the page.
+Dynamiccontent=Sample of a page with dynamic content
+ImportSite=Import website template
diff --git a/htdocs/langs/sk_SK/admin.lang b/htdocs/langs/sk_SK/admin.lang
index 4546efba5d7..f68f5f3b0f5 100644
--- a/htdocs/langs/sk_SK/admin.lang
+++ b/htdocs/langs/sk_SK/admin.lang
@@ -400,6 +400,7 @@ OldVATRates=Staré Sadzba DPH
 NewVATRates=Nová sadzba DPH
 PriceBaseTypeToChange=Zmeniť na cenách s hodnotou základného odkazu uvedeného na
 MassConvert=Launch bulk conversion
+PriceFormatInCurrentLanguage=Price Format In Current Language
 String=Reťaz
 TextLong=Dlhý text
 HtmlText=Html text
@@ -431,7 +432,7 @@ ExtrafieldParamHelpradio=List of values must be lines with format key,value (whe
 ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- idfilter is necessarly a primary int key<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=List of values 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>Examples:<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
-ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default)<br>Set this to 2 for a collapsing separator (collapsed by default)
+ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Knižnica používaná pre generovanie PDF
 LocalTaxDesc=Some countries may apply two or three taxes on each invoice line. If this is the case, choose the type for the 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)
 SMS=SMS
@@ -1695,7 +1696,7 @@ SuppliersInvoiceNumberingModel=Vendor invoices numbering models
 IfSetToYesDontForgetPermission=Ak nastavené ANO, nezabudnite poskytnúť povolenia pre skupiny alebo užívateľov oprávnených pre povoľovanie 2. stupňa
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=GeoIP MaxMind modul nastavenia
-PathToGeoIPMaxmindCountryDataFile=Cesta k súboru obsahujúci MaxMind IP pre krajiny preklade. <br> Príklady: <br> / Usr / local / share / GeoIP / GeoIP.dat <br> / Usr / share / GeoIP / GeoIP.dat
+PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoLite2-Country.mmdb
 NoteOnPathLocation=Všimnite si, že Vaša IP do súboru záznamu krajiny musia byť vo vnútri adresára si môžete prečítať PHP (PHP open_basedir Skontrolujte nastavenia a oprávnenia súborového systému).
 YouCanDownloadFreeDatFileTo=Tu si môžete stiahnuť <b>zadarmo demo verziu</b> krajiny GeoIP MaxMind súbor na %s.
 YouCanDownloadAdvancedDatFileTo=Môžete si tiež stiahnuť <b>úplnejší verziu s aktualizáciou,</b> zo zeme GeoIP MaxMind súbor na %s.
@@ -1926,14 +1927,13 @@ SmallerThan=Smaller than
 LargerThan=Larger than
 IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID is found into incoming email, the event will be automatically linked to the related objects.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
-IFTTTSetup=IFTTT module setup
-IFTTT_SERVICE_KEY=IFTTT Service key
-IFTTT_DOLIBARR_ENDPOINT_SECUREKEY=Security key to secure the endpoint URL used by IFTTT to send messages to your Dolibarr.
-IFTTTDesc=This module is designed to trigger events on IFTTT and/or to execute some action on external IFTTT triggers.
-UrlForIFTTT=URL endpoint for IFTTT
-YouWillFindItOnYourIFTTTAccount=You will find it on your IFTTT account
 EndPointFor=End point for %s : %s
 DeleteEmailCollector=Delete email collector
 ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
 RecipientEmailsWillBeReplacedWithThisValue=Recipient emails will be always replaced with this value
 AtLeastOneDefaultBankAccountMandatory=At least 1 default bank account must be defined
+RESTRICT_API_ON_IP=Allow available APIs to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can use the available APIs.
+RESTRICT_ON_IP=Allow access to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can access.
+BaseOnSabeDavVersion=Based on the library SabreDAV version
+NotAPublicIp=Not a public IP
+MakeAnonymousPing=Make an anonymous Ping '+1' to the Dolibarr foundation server (done 1 time only after installation) to allow the foundation to count the number of Dolibarr installation.
diff --git a/htdocs/langs/sk_SK/banks.lang b/htdocs/langs/sk_SK/banks.lang
index 266eda50852..815e318f1af 100644
--- a/htdocs/langs/sk_SK/banks.lang
+++ b/htdocs/langs/sk_SK/banks.lang
@@ -73,6 +73,7 @@ BankTransaction=Bank entry
 ListTransactions=List entries
 ListTransactionsByCategory=List entries/category
 TransactionsToConciliate=Entries to reconcile
+TransactionsToConciliateShort=To reconcile
 Conciliable=Môže byť porovnaná
 Conciliate=Zmieriť
 Conciliation=Zmierenie
@@ -116,6 +117,7 @@ DeleteCheckReceipt=Zmazať túto potvrdenku ?
 ConfirmDeleteCheckReceipt=Určite chcete zmazať túto potvrdenku ?
 BankChecks=Bankové šeky
 BankChecksToReceipt=Šeký čakajúce na zaplatenie
+BankChecksToReceiptShort=Šeký čakajúce na zaplatenie
 ShowCheckReceipt=Zobraziť skontrolovať depozitné potvrdenie
 NumberOfCheques=No. of check
 DeleteTransaction=Delete entry
diff --git a/htdocs/langs/sk_SK/cashdesk.lang b/htdocs/langs/sk_SK/cashdesk.lang
index 0dce714a7a0..e2e87644ff9 100644
--- a/htdocs/langs/sk_SK/cashdesk.lang
+++ b/htdocs/langs/sk_SK/cashdesk.lang
@@ -62,6 +62,7 @@ TicketVatGrouped=Group VAT by rate in tickets
 AutoPrintTickets=Automatically print tickets
 EnableBarOrRestaurantFeatures=Enable features for Bar or Restaurant
 ConfirmDeletionOfThisPOSSale=Do your confirm the deletion of this current sale ?
+ConfirmDiscardOfThisPOSSale=Do you want to discard this current sale ?
 History=História
 ValidateAndClose=Validate and close
 Terminal=Terminal
@@ -69,3 +70,8 @@ NumberOfTerminals=Number of Terminals
 TerminalSelect=Select terminal you want to use:
 POSTicket=POS Ticket
 BasicPhoneLayout=Use basic layout for phones
+SetupOfTerminalNotComplete=Setup of terminal %s is not complete
+DirectPayment=Direct payment
+DirectPaymentButton=Direct cash payment button
+InvoiceIsAlreadyValidated=Invoice is already validated
+NoLinesToBill=No lines to bill
diff --git a/htdocs/langs/sk_SK/companies.lang b/htdocs/langs/sk_SK/companies.lang
index 30d71912379..2a77687d799 100644
--- a/htdocs/langs/sk_SK/companies.lang
+++ b/htdocs/langs/sk_SK/companies.lang
@@ -54,6 +54,7 @@ Firstname=Krstné meno
 PostOrFunction=Poradie úlohy
 UserTitle=Názov
 NatureOfThirdParty=Nature of Third party
+NatureOfContact=Nature of Contact
 Address=Adresa
 State=Štát / Provincia
 StateShort=State
diff --git a/htdocs/langs/sk_SK/contracts.lang b/htdocs/langs/sk_SK/contracts.lang
index 7a77c115331..86ff6082c37 100644
--- a/htdocs/langs/sk_SK/contracts.lang
+++ b/htdocs/langs/sk_SK/contracts.lang
@@ -51,6 +51,7 @@ ListOfClosedServices=Zoznam uzavretých služieb
 ListOfRunningServices=Zoznam spustených služieb
 NotActivatedServices=Neaktívne služby (u overených zmlúv)
 BoardNotActivatedServices=Služby pre aktiváciu u overených zmlúv
+BoardNotActivatedServicesShort=Services to activate
 LastContracts=Najnovšie %s zmluvy
 LastModifiedServices=Posledné %s upravené služby
 ContractStartDate=Dátum začatia
@@ -64,7 +65,10 @@ DateStartRealShort=Skutočné dátum začatia
 DateEndReal=Skutočný dátum ukončenia
 DateEndRealShort=Skutočný dátum ukončenia
 CloseService=Zavrieť služby
-BoardRunningServices=Neaktuálne spustené služby
+BoardRunningServices=Services running
+BoardRunningServicesShort=Services running
+BoardExpiredServices=Services expired
+BoardExpiredServicesShort=Services expired
 ServiceStatus=Stav služby
 DraftContracts=Koncepty zmluvy
 CloseRefusedBecauseOneServiceActive=Contract can't be closed as there is at least one open service on it
diff --git a/htdocs/langs/sk_SK/errors.lang b/htdocs/langs/sk_SK/errors.lang
index 5f0b4926d2e..61368920351 100644
--- a/htdocs/langs/sk_SK/errors.lang
+++ b/htdocs/langs/sk_SK/errors.lang
@@ -218,6 +218,7 @@ ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text
 ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Error, delete payment linked to a closed invoice is not possible.
+ErrorSearchCriteriaTooSmall=Search criteria too small.
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 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/main.lang b/htdocs/langs/sk_SK/main.lang
index ef836241865..78ff6844d1e 100644
--- a/htdocs/langs/sk_SK/main.lang
+++ b/htdocs/langs/sk_SK/main.lang
@@ -28,6 +28,7 @@ NoTemplateDefined=No template available for this email type
 AvailableVariables=Available substitution variables
 NoTranslation=Preklad neexistuje
 Translation=Preklad
+EmptySearchString=Enter a non empty search string
 NoRecordFound=Nebol nájdený žiadny záznam
 NoRecordDeleted=No record deleted
 NotEnoughDataYet=Not enough data
@@ -704,6 +705,7 @@ DateOfSignature=Date of signature
 HidePassword=Zobraziť príkaz s heslom skryté
 UnHidePassword=Zobraziť skutočné velenie s jasným heslom
 Root=Koreň
+RootOfMedias=Root of public medias (/medias)
 Informations=Informácie
 Page=Strana
 Notes=Poznámky
@@ -981,3 +983,10 @@ PaymentInformation=Payment information
 ValidFrom=Valid from
 ValidUntil=Valid until
 NoRecordedUsers=No users
+ToClose=To close
+ToProcess=Ak chcete spracovať
+ToApprove=To approve
+GlobalOpenedElemView=Global view
+NoArticlesFoundForTheKeyword=No article found for the keyword '<strong>%s</strong>'
+NoArticlesFoundForTheCategory=No article found for the category
+ToAcceptRefuse=To accept | refuse
diff --git a/htdocs/langs/sk_SK/members.lang b/htdocs/langs/sk_SK/members.lang
index bfd88b2253b..26a80b0c1db 100644
--- a/htdocs/langs/sk_SK/members.lang
+++ b/htdocs/langs/sk_SK/members.lang
@@ -29,6 +29,7 @@ MenuMembersUpToDate=Aktuálne členmi
 MenuMembersNotUpToDate=Neaktuálne členov
 MenuMembersResiliated=Terminated members
 MembersWithSubscriptionToReceive=Členovia s predplatným dostávať
+MembersWithSubscriptionToReceiveShort=Subscription to receive
 DateSubscription=Vstupné dáta
 DateEndSubscription=Zasielanie noviniek dátum ukončenia
 EndSubscription=Koniec predplatné
diff --git a/htdocs/langs/sk_SK/projects.lang b/htdocs/langs/sk_SK/projects.lang
index 353ae6a2ef0..b22b6c7c4b6 100644
--- a/htdocs/langs/sk_SK/projects.lang
+++ b/htdocs/langs/sk_SK/projects.lang
@@ -76,7 +76,13 @@ MyProjects=Moje projekty
 MyProjectsArea=My projects Area
 DurationEffective=Efektívny čas
 ProgressDeclared=Deklarovaná pokrok
+TaskProgressSummary=Task progress
+CurentlyOpenedTasks=Curently opened tasks
+TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared progress is less %s than the calculated progression
+TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared progress is more %s than the calculated progression
 ProgressCalculated=Vypočítaná pokrok
+WhichIamLinkedTo=which I'm linked to
+WhichIamLinkedToProject=which I'm linked to project
 Time=Čas
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
diff --git a/htdocs/langs/sk_SK/website.lang b/htdocs/langs/sk_SK/website.lang
index 00ccd033492..e4d36791a04 100644
--- a/htdocs/langs/sk_SK/website.lang
+++ b/htdocs/langs/sk_SK/website.lang
@@ -2,7 +2,7 @@
 Shortname=Kód
 WebsiteSetupDesc=Create here the websites you wish to use. Then go into menu Websites to edit them.
 DeleteWebsite=Zmazať webstránku
-ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed.
+ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed. The files uploaded (like into the medias directory, the ECM module, ...) will remain.
 WEBSITE_TYPE_CONTAINER=Type of page/container
 WEBSITE_PAGE_EXAMPLE=Web page to use as example
 WEBSITE_PAGENAME=Meno stránky
@@ -14,6 +14,9 @@ WEBSITE_JS_INLINE=Javascript file content (common to all pages)
 WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages)
 WEBSITE_ROBOT=Robot file (robots.txt)
 WEBSITE_HTACCESS=Website .htaccess file
+WEBSITE_MANIFEST_JSON=Website manifest.json file
+WEBSITE_README=README.md file
+EnterHereLicenseInformation=Enter here meta data or license information to fille a README.md file. if you distribute your website as a template, the file will be included into the temptate package.
 HtmlHeaderPage=HTML header (specific to this page only)
 PageNameAliasHelp=Name or alias of the page.<br>This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "<strong>%s</strong>" to edit this alias.
 EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container.
@@ -41,6 +44,7 @@ RealURL=Skutočná URL
 ViewWebsiteInProduction=Zobraziť web stránku použitím domovskej URL
 SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then set the name of the virtual host you have created in the properties of web site, so the preview can be done also using this dedicated web server access instead of the internal Dolibarr server.
 YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
 CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
 ReadPerm=Čítať
 WritePerm=Write
@@ -75,7 +79,8 @@ AddWebsiteAccount=Create web site account
 BackToListOfThirdParty=Back to list for Third Party
 DisableSiteFirst=Disable website first
 MyContainerTitle=My web site title
-AnotherContainer=Another container
+AnotherContainer=This is how to include content of another page/container (you may have an error here if you enable dynamic code because the embedded subcontainer may not exists)
+SorryWebsiteIsCurrentlyOffLine=Sorry, this website is currently off line. Please comme back later...
 WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / third party
 YouMustDefineTheHomePage=You must first define the default Home page
@@ -89,7 +94,8 @@ AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
 CorporateHomePage=Corporate Home page
 EmptyPage=Empty page
 ExternalURLMustStartWithHttp=External URL must start with http:// or https://
-ZipOfWebsitePackageToImport=Zip file of website package
+ZipOfWebsitePackageToImport=Upload the Zip file of the website template package
+ZipOfWebsitePackageToLoad=or Choose an available embedded website template package
 ShowSubcontainers=Include dynamic content
 InternalURLOfPage=Internal URL of page
 ThisPageIsTranslationOf=This page/container is a translation of
@@ -101,5 +107,10 @@ NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynam
 ReplaceWebsiteContent=Search or Replace website content
 DeleteAlsoJs=Delete also all javascript files specific to this website?
 DeleteAlsoMedias=Delete also all medias files specific to this website?
-# Export
 MyWebsitePages=My website pages
+SearchReplaceInto=Search | Replace into
+ReplaceString=New string
+CSSContentTooltipHelp=Enter here CSS content. To avoid any conflict with the CSS of the application, be sure to prepend all declaration with the .bodywebsite class. For example:<br><br>#mycssselector, input.myclass:hover { ... }<br>must be<br>.bodywebsite #mycssselector, .bodywebsite input.myclass:hover { ... }<br><br>Note: If you have a large file without this prefix, you can use 'lessc' to convert it to append the .bodywebsite prefix everywhere.
+LinkAndScriptsHereAreNotLoadedInEditor=Warning: This content is output only when site is accessed from a server. It is not used in Edit mode so if you need to load javascript files also in edit mode, just add your tag 'script src=...' into the page.
+Dynamiccontent=Sample of a page with dynamic content
+ImportSite=Import website template
diff --git a/htdocs/langs/sl_SI/admin.lang b/htdocs/langs/sl_SI/admin.lang
index 3a342353e7b..859e0a05145 100644
--- a/htdocs/langs/sl_SI/admin.lang
+++ b/htdocs/langs/sl_SI/admin.lang
@@ -400,6 +400,7 @@ OldVATRates=Stara stopnja DDV
 NewVATRates=Nova stopnja DDV
 PriceBaseTypeToChange=Sprememba cen z definirano osnovno referenčno vrednostjo
 MassConvert=Launch bulk conversion
+PriceFormatInCurrentLanguage=Price Format In Current Language
 String=Niz
 TextLong=Dolgo besedilo
 HtmlText=Html text
@@ -431,7 +432,7 @@ ExtrafieldParamHelpradio=List of values must be lines with format key,value (whe
 ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- idfilter is necessarly a primary int key<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=List of values 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>Examples:<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
-ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default)<br>Set this to 2 for a collapsing separator (collapsed by default)
+ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Library used for PDF generation
 LocalTaxDesc=Some countries may apply two or three taxes on each invoice line. If this is the case, choose the type for the 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)
 SMS=SMS
@@ -1695,7 +1696,7 @@ SuppliersInvoiceNumberingModel=Vendor invoices numbering models
 IfSetToYesDontForgetPermission=Če je nastavljeno na "da", ne pozabite zagotoviti dovoljenj skupinam ali uporabnikom za drugo odobritev
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=Nastavitev modula GeoIP Maxmind
-PathToGeoIPMaxmindCountryDataFile=Pot do datoteke, ki vsebuje Maxmind ip za prevode po državah.<br>Primer:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat
+PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoLite2-Country.mmdb
 NoteOnPathLocation=Pazite, da je mora biti vaš ip do datoteke s podatki o državi znotraj mape, ki jo PHP lahko bere (Na vašem PHP preverite nastavitve 'open_basedir' in dovoljenja za datotečni sistem).
 YouCanDownloadFreeDatFileTo=<b>Brezplačno demo različico</b> Maxmind GeoIP deželne datoteke lahko prenesete z %s.
 YouCanDownloadAdvancedDatFileTo=Lahko tudi prenesete bolj <b>popolno različico, s posodobitvami,</b> deželne datoteke Maxmind GeoIP z %s.
@@ -1926,14 +1927,13 @@ SmallerThan=Smaller than
 LargerThan=Larger than
 IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID is found into incoming email, the event will be automatically linked to the related objects.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
-IFTTTSetup=IFTTT module setup
-IFTTT_SERVICE_KEY=IFTTT Service key
-IFTTT_DOLIBARR_ENDPOINT_SECUREKEY=Security key to secure the endpoint URL used by IFTTT to send messages to your Dolibarr.
-IFTTTDesc=This module is designed to trigger events on IFTTT and/or to execute some action on external IFTTT triggers.
-UrlForIFTTT=URL endpoint for IFTTT
-YouWillFindItOnYourIFTTTAccount=You will find it on your IFTTT account
 EndPointFor=End point for %s : %s
 DeleteEmailCollector=Delete email collector
 ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
 RecipientEmailsWillBeReplacedWithThisValue=Recipient emails will be always replaced with this value
 AtLeastOneDefaultBankAccountMandatory=At least 1 default bank account must be defined
+RESTRICT_API_ON_IP=Allow available APIs to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can use the available APIs.
+RESTRICT_ON_IP=Allow access to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can access.
+BaseOnSabeDavVersion=Based on the library SabreDAV version
+NotAPublicIp=Not a public IP
+MakeAnonymousPing=Make an anonymous Ping '+1' to the Dolibarr foundation server (done 1 time only after installation) to allow the foundation to count the number of Dolibarr installation.
diff --git a/htdocs/langs/sl_SI/banks.lang b/htdocs/langs/sl_SI/banks.lang
index b63d23868e5..b3b70aa3549 100644
--- a/htdocs/langs/sl_SI/banks.lang
+++ b/htdocs/langs/sl_SI/banks.lang
@@ -73,6 +73,7 @@ BankTransaction=Bank entry
 ListTransactions=List entries
 ListTransactionsByCategory=List entries/category
 TransactionsToConciliate=Entries to reconcile
+TransactionsToConciliateShort=To reconcile
 Conciliable=Se lahko uskladi
 Conciliate=Uskladi
 Conciliation=Uskladitev
@@ -116,6 +117,7 @@ DeleteCheckReceipt=Delete this check receipt?
 ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
 BankChecks=Bančni čeki
 BankChecksToReceipt=Checks awaiting deposit
+BankChecksToReceiptShort=Checks awaiting deposit
 ShowCheckReceipt=Prikaži prevzemnico čekovnih nakazil
 NumberOfCheques=No. of check
 DeleteTransaction=Delete entry
diff --git a/htdocs/langs/sl_SI/cashdesk.lang b/htdocs/langs/sl_SI/cashdesk.lang
index 71f3c65269d..b525c51dc38 100644
--- a/htdocs/langs/sl_SI/cashdesk.lang
+++ b/htdocs/langs/sl_SI/cashdesk.lang
@@ -62,6 +62,7 @@ TicketVatGrouped=Group VAT by rate in tickets
 AutoPrintTickets=Automatically print tickets
 EnableBarOrRestaurantFeatures=Enable features for Bar or Restaurant
 ConfirmDeletionOfThisPOSSale=Do your confirm the deletion of this current sale ?
+ConfirmDiscardOfThisPOSSale=Do you want to discard this current sale ?
 History=Zgodovina
 ValidateAndClose=Validate and close
 Terminal=Terminal
@@ -69,3 +70,8 @@ NumberOfTerminals=Number of Terminals
 TerminalSelect=Select terminal you want to use:
 POSTicket=POS Ticket
 BasicPhoneLayout=Use basic layout for phones
+SetupOfTerminalNotComplete=Setup of terminal %s is not complete
+DirectPayment=Direct payment
+DirectPaymentButton=Direct cash payment button
+InvoiceIsAlreadyValidated=Invoice is already validated
+NoLinesToBill=No lines to bill
diff --git a/htdocs/langs/sl_SI/companies.lang b/htdocs/langs/sl_SI/companies.lang
index ab68d02ed39..50dec6f5bf8 100644
--- a/htdocs/langs/sl_SI/companies.lang
+++ b/htdocs/langs/sl_SI/companies.lang
@@ -54,6 +54,7 @@ Firstname=Ime
 PostOrFunction=Job position
 UserTitle=Naziv
 NatureOfThirdParty=Nature of Third party
+NatureOfContact=Nature of Contact
 Address=Naslov
 State=Dežela/Provinca
 StateShort=Država
diff --git a/htdocs/langs/sl_SI/contracts.lang b/htdocs/langs/sl_SI/contracts.lang
index 8203422a3db..307265865df 100644
--- a/htdocs/langs/sl_SI/contracts.lang
+++ b/htdocs/langs/sl_SI/contracts.lang
@@ -51,6 +51,7 @@ ListOfClosedServices=Seznam zaključenih storitev
 ListOfRunningServices=Seznam aktivnih storitev
 NotActivatedServices=Neaktivne storitve (med potrjenimi pogodbami)
 BoardNotActivatedServices=Storitve, ki jih je potrebno aktivirati (med potrjenimi pogodbami)
+BoardNotActivatedServicesShort=Services to activate
 LastContracts=Latest %s contracts
 LastModifiedServices=Latest %s modified services
 ContractStartDate=Začetni datum
@@ -64,7 +65,10 @@ DateStartRealShort=Dejanski začetni datum
 DateEndReal=Dejanski končni datum
 DateEndRealShort=Dejanski končni datum
 CloseService=Zaključek storitve
-BoardRunningServices=Pretečene aktivne storitve
+BoardRunningServices=Services running
+BoardRunningServicesShort=Services running
+BoardExpiredServices=Services expired
+BoardExpiredServicesShort=Services expired
 ServiceStatus=Status storitve
 DraftContracts=Osnutki pogodb
 CloseRefusedBecauseOneServiceActive=Contract can't be closed as there is at least one open service on it
diff --git a/htdocs/langs/sl_SI/errors.lang b/htdocs/langs/sl_SI/errors.lang
index 01117e09985..d15af4ff712 100644
--- a/htdocs/langs/sl_SI/errors.lang
+++ b/htdocs/langs/sl_SI/errors.lang
@@ -218,6 +218,7 @@ ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text
 ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Error, delete payment linked to a closed invoice is not possible.
+ErrorSearchCriteriaTooSmall=Search criteria too small.
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 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/main.lang b/htdocs/langs/sl_SI/main.lang
index 81c4b2c3b23..14cd981ca95 100644
--- a/htdocs/langs/sl_SI/main.lang
+++ b/htdocs/langs/sl_SI/main.lang
@@ -28,6 +28,7 @@ NoTemplateDefined=No template available for this email type
 AvailableVariables=Available substitution variables
 NoTranslation=Ni prevoda
 Translation=Prevod
+EmptySearchString=Enter a non empty search string
 NoRecordFound=Ni najden zapis
 NoRecordDeleted=No record deleted
 NotEnoughDataYet=Not enough data
@@ -704,6 +705,7 @@ DateOfSignature=Date of signature
 HidePassword=Prikaži komande s skritim geslom
 UnHidePassword=Prikaži resnične komande z vidnim geslom
 Root=Koren
+RootOfMedias=Root of public medias (/medias)
 Informations=Informacija
 Page=Stran
 Notes=Opombe
@@ -981,3 +983,10 @@ PaymentInformation=Payment information
 ValidFrom=Valid from
 ValidUntil=Valid until
 NoRecordedUsers=No users
+ToClose=To close
+ToProcess=Za obdelavo
+ToApprove=To approve
+GlobalOpenedElemView=Global view
+NoArticlesFoundForTheKeyword=No article found for the keyword '<strong>%s</strong>'
+NoArticlesFoundForTheCategory=No article found for the category
+ToAcceptRefuse=To accept | refuse
diff --git a/htdocs/langs/sl_SI/members.lang b/htdocs/langs/sl_SI/members.lang
index 1133d92665d..345902d0348 100644
--- a/htdocs/langs/sl_SI/members.lang
+++ b/htdocs/langs/sl_SI/members.lang
@@ -29,6 +29,7 @@ MenuMembersUpToDate=Posodobljeno članstvo
 MenuMembersNotUpToDate=Pretečeno članstvo
 MenuMembersResiliated=Terminated members
 MembersWithSubscriptionToReceive=Člani, ki morajo plačati članarino
+MembersWithSubscriptionToReceiveShort=Subscription to receive
 DateSubscription=Datum vpisa
 DateEndSubscription=Datum zadnje članarine
 EndSubscription=Veljavnost članarine
diff --git a/htdocs/langs/sl_SI/projects.lang b/htdocs/langs/sl_SI/projects.lang
index 93ca5bc454a..14012d24570 100644
--- a/htdocs/langs/sl_SI/projects.lang
+++ b/htdocs/langs/sl_SI/projects.lang
@@ -76,7 +76,13 @@ MyProjects=Moji projekti
 MyProjectsArea=My projects Area
 DurationEffective=Efektivno trajanje
 ProgressDeclared=Declared progress
+TaskProgressSummary=Task progress
+CurentlyOpenedTasks=Curently opened tasks
+TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared progress is less %s than the calculated progression
+TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared progress is more %s than the calculated progression
 ProgressCalculated=Calculated progress
+WhichIamLinkedTo=which I'm linked to
+WhichIamLinkedToProject=which I'm linked to project
 Time=Čas
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
diff --git a/htdocs/langs/sl_SI/website.lang b/htdocs/langs/sl_SI/website.lang
index 3244952145a..6a4f0589881 100644
--- a/htdocs/langs/sl_SI/website.lang
+++ b/htdocs/langs/sl_SI/website.lang
@@ -2,7 +2,7 @@
 Shortname=Koda
 WebsiteSetupDesc=Create here the websites you wish to use. Then go into menu Websites to edit them.
 DeleteWebsite=Izbriši spletno stran
-ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed.
+ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed. The files uploaded (like into the medias directory, the ECM module, ...) will remain.
 WEBSITE_TYPE_CONTAINER=Type of page/container
 WEBSITE_PAGE_EXAMPLE=Web page to use as example
 WEBSITE_PAGENAME=Page name/alias
@@ -14,6 +14,9 @@ WEBSITE_JS_INLINE=Javascript file content (common to all pages)
 WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages)
 WEBSITE_ROBOT=Robot file (robots.txt)
 WEBSITE_HTACCESS=Website .htaccess file
+WEBSITE_MANIFEST_JSON=Website manifest.json file
+WEBSITE_README=README.md file
+EnterHereLicenseInformation=Enter here meta data or license information to fille a README.md file. if you distribute your website as a template, the file will be included into the temptate package.
 HtmlHeaderPage=HTML header (specific to this page only)
 PageNameAliasHelp=Name or alias of the page.<br>This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "<strong>%s</strong>" to edit this alias.
 EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container.
@@ -41,6 +44,7 @@ RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
 SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then set the name of the virtual host you have created in the properties of web site, so the preview can be done also using this dedicated web server access instead of the internal Dolibarr server.
 YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
 CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
 ReadPerm=Preberite
 WritePerm=Write
@@ -75,7 +79,8 @@ AddWebsiteAccount=Create web site account
 BackToListOfThirdParty=Back to list for Third Party
 DisableSiteFirst=Disable website first
 MyContainerTitle=My web site title
-AnotherContainer=Another container
+AnotherContainer=This is how to include content of another page/container (you may have an error here if you enable dynamic code because the embedded subcontainer may not exists)
+SorryWebsiteIsCurrentlyOffLine=Sorry, this website is currently off line. Please comme back later...
 WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / third party
 YouMustDefineTheHomePage=You must first define the default Home page
@@ -89,7 +94,8 @@ AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
 CorporateHomePage=Corporate Home page
 EmptyPage=Empty page
 ExternalURLMustStartWithHttp=External URL must start with http:// or https://
-ZipOfWebsitePackageToImport=Zip file of website package
+ZipOfWebsitePackageToImport=Upload the Zip file of the website template package
+ZipOfWebsitePackageToLoad=or Choose an available embedded website template package
 ShowSubcontainers=Include dynamic content
 InternalURLOfPage=Internal URL of page
 ThisPageIsTranslationOf=This page/container is a translation of
@@ -101,5 +107,10 @@ NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynam
 ReplaceWebsiteContent=Search or Replace website content
 DeleteAlsoJs=Delete also all javascript files specific to this website?
 DeleteAlsoMedias=Delete also all medias files specific to this website?
-# Export
 MyWebsitePages=My website pages
+SearchReplaceInto=Search | Replace into
+ReplaceString=New string
+CSSContentTooltipHelp=Enter here CSS content. To avoid any conflict with the CSS of the application, be sure to prepend all declaration with the .bodywebsite class. For example:<br><br>#mycssselector, input.myclass:hover { ... }<br>must be<br>.bodywebsite #mycssselector, .bodywebsite input.myclass:hover { ... }<br><br>Note: If you have a large file without this prefix, you can use 'lessc' to convert it to append the .bodywebsite prefix everywhere.
+LinkAndScriptsHereAreNotLoadedInEditor=Warning: This content is output only when site is accessed from a server. It is not used in Edit mode so if you need to load javascript files also in edit mode, just add your tag 'script src=...' into the page.
+Dynamiccontent=Sample of a page with dynamic content
+ImportSite=Import website template
diff --git a/htdocs/langs/sq_AL/admin.lang b/htdocs/langs/sq_AL/admin.lang
index c4296b44853..94831d99526 100644
--- a/htdocs/langs/sq_AL/admin.lang
+++ b/htdocs/langs/sq_AL/admin.lang
@@ -400,6 +400,7 @@ OldVATRates=Old VAT rate
 NewVATRates=New VAT rate
 PriceBaseTypeToChange=Modify on prices with base reference value defined on
 MassConvert=Launch bulk conversion
+PriceFormatInCurrentLanguage=Price Format In Current Language
 String=String
 TextLong=Long text
 HtmlText=Html text
@@ -431,7 +432,7 @@ ExtrafieldParamHelpradio=List of values must be lines with format key,value (whe
 ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- idfilter is necessarly a primary int key<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=List of values 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>Examples:<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
-ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default)<br>Set this to 2 for a collapsing separator (collapsed by default)
+ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Library used for PDF generation
 LocalTaxDesc=Some countries may apply two or three taxes on each invoice line. If this is the case, choose the type for the 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)
 SMS=SMS
@@ -1695,7 +1696,7 @@ SuppliersInvoiceNumberingModel=Vendor invoices numbering models
 IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=GeoIP Maxmind module setup
-PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat
+PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoLite2-Country.mmdb
 NoteOnPathLocation=Note that your ip to country data file must be inside a directory your PHP can read (Check your PHP open_basedir setup and filesystem permissions).
 YouCanDownloadFreeDatFileTo=You can download a <b>free demo version</b> of the Maxmind GeoIP country file at %s.
 YouCanDownloadAdvancedDatFileTo=You can also download a more <b>complete version, with updates,</b> of the Maxmind GeoIP country file at %s.
@@ -1926,14 +1927,13 @@ SmallerThan=Smaller than
 LargerThan=Larger than
 IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID is found into incoming email, the event will be automatically linked to the related objects.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
-IFTTTSetup=IFTTT module setup
-IFTTT_SERVICE_KEY=IFTTT Service key
-IFTTT_DOLIBARR_ENDPOINT_SECUREKEY=Security key to secure the endpoint URL used by IFTTT to send messages to your Dolibarr.
-IFTTTDesc=This module is designed to trigger events on IFTTT and/or to execute some action on external IFTTT triggers.
-UrlForIFTTT=URL endpoint for IFTTT
-YouWillFindItOnYourIFTTTAccount=You will find it on your IFTTT account
 EndPointFor=End point for %s : %s
 DeleteEmailCollector=Delete email collector
 ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
 RecipientEmailsWillBeReplacedWithThisValue=Recipient emails will be always replaced with this value
 AtLeastOneDefaultBankAccountMandatory=At least 1 default bank account must be defined
+RESTRICT_API_ON_IP=Allow available APIs to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can use the available APIs.
+RESTRICT_ON_IP=Allow access to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can access.
+BaseOnSabeDavVersion=Based on the library SabreDAV version
+NotAPublicIp=Not a public IP
+MakeAnonymousPing=Make an anonymous Ping '+1' to the Dolibarr foundation server (done 1 time only after installation) to allow the foundation to count the number of Dolibarr installation.
diff --git a/htdocs/langs/sq_AL/banks.lang b/htdocs/langs/sq_AL/banks.lang
index 96427635739..b720aff4d1a 100644
--- a/htdocs/langs/sq_AL/banks.lang
+++ b/htdocs/langs/sq_AL/banks.lang
@@ -73,6 +73,7 @@ BankTransaction=Bank entry
 ListTransactions=List entries
 ListTransactionsByCategory=List entries/category
 TransactionsToConciliate=Entries to reconcile
+TransactionsToConciliateShort=To reconcile
 Conciliable=Can be reconciled
 Conciliate=Reconcile
 Conciliation=Reconciliation
@@ -116,6 +117,7 @@ DeleteCheckReceipt=Delete this check receipt?
 ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
 BankChecks=Bank checks
 BankChecksToReceipt=Checks awaiting deposit
+BankChecksToReceiptShort=Checks awaiting deposit
 ShowCheckReceipt=Show check deposit receipt
 NumberOfCheques=No. of check
 DeleteTransaction=Delete entry
diff --git a/htdocs/langs/sq_AL/cashdesk.lang b/htdocs/langs/sq_AL/cashdesk.lang
index d9144606356..cdbd5500240 100644
--- a/htdocs/langs/sq_AL/cashdesk.lang
+++ b/htdocs/langs/sq_AL/cashdesk.lang
@@ -62,6 +62,7 @@ TicketVatGrouped=Group VAT by rate in tickets
 AutoPrintTickets=Automatically print tickets
 EnableBarOrRestaurantFeatures=Enable features for Bar or Restaurant
 ConfirmDeletionOfThisPOSSale=Do your confirm the deletion of this current sale ?
+ConfirmDiscardOfThisPOSSale=Do you want to discard this current sale ?
 History=History
 ValidateAndClose=Validate and close
 Terminal=Terminal
@@ -69,3 +70,8 @@ NumberOfTerminals=Number of Terminals
 TerminalSelect=Select terminal you want to use:
 POSTicket=POS Ticket
 BasicPhoneLayout=Use basic layout for phones
+SetupOfTerminalNotComplete=Setup of terminal %s is not complete
+DirectPayment=Direct payment
+DirectPaymentButton=Direct cash payment button
+InvoiceIsAlreadyValidated=Invoice is already validated
+NoLinesToBill=No lines to bill
diff --git a/htdocs/langs/sq_AL/companies.lang b/htdocs/langs/sq_AL/companies.lang
index c4d7ea97a06..507482ccd3a 100644
--- a/htdocs/langs/sq_AL/companies.lang
+++ b/htdocs/langs/sq_AL/companies.lang
@@ -54,6 +54,7 @@ Firstname=Emri
 PostOrFunction=Job position
 UserTitle=Title
 NatureOfThirdParty=Nature of Third party
+NatureOfContact=Nature of Contact
 Address=Adresa
 State=Shteti/Provinca
 StateShort=State
diff --git a/htdocs/langs/sq_AL/contracts.lang b/htdocs/langs/sq_AL/contracts.lang
index 27139599134..0d76016664b 100644
--- a/htdocs/langs/sq_AL/contracts.lang
+++ b/htdocs/langs/sq_AL/contracts.lang
@@ -51,6 +51,7 @@ ListOfClosedServices=List of closed services
 ListOfRunningServices=List of running services
 NotActivatedServices=Inactive services (among validated contracts)
 BoardNotActivatedServices=Services to activate among validated contracts
+BoardNotActivatedServicesShort=Services to activate
 LastContracts=Latest %s contracts
 LastModifiedServices=Latest %s modified services
 ContractStartDate=Start date
@@ -64,7 +65,10 @@ DateStartRealShort=Real start date
 DateEndReal=Real end date
 DateEndRealShort=Real end date
 CloseService=Close service
-BoardRunningServices=Expired running services
+BoardRunningServices=Services running
+BoardRunningServicesShort=Services running
+BoardExpiredServices=Services expired
+BoardExpiredServicesShort=Services expired
 ServiceStatus=Status of service
 DraftContracts=Drafts contracts
 CloseRefusedBecauseOneServiceActive=Contract can't be closed as there is at least one open service on it
diff --git a/htdocs/langs/sq_AL/errors.lang b/htdocs/langs/sq_AL/errors.lang
index 1ee46fdbb92..0c07b2eafc4 100644
--- a/htdocs/langs/sq_AL/errors.lang
+++ b/htdocs/langs/sq_AL/errors.lang
@@ -218,6 +218,7 @@ ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text
 ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Error, delete payment linked to a closed invoice is not possible.
+ErrorSearchCriteriaTooSmall=Search criteria too small.
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 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/main.lang b/htdocs/langs/sq_AL/main.lang
index 4335079179b..b667833dbf9 100644
--- a/htdocs/langs/sq_AL/main.lang
+++ b/htdocs/langs/sq_AL/main.lang
@@ -28,6 +28,7 @@ NoTemplateDefined=No template available for this email type
 AvailableVariables=Available substitution variables
 NoTranslation=No translation
 Translation=Translation
+EmptySearchString=Enter a non empty search string
 NoRecordFound=No record found
 NoRecordDeleted=No record deleted
 NotEnoughDataYet=Not enough data
@@ -704,6 +705,7 @@ DateOfSignature=Date of signature
 HidePassword=Show command with password hidden
 UnHidePassword=Show real command with clear password
 Root=Root
+RootOfMedias=Root of public medias (/medias)
 Informations=Information
 Page=Page
 Notes=Notes
@@ -981,3 +983,10 @@ PaymentInformation=Payment information
 ValidFrom=Valid from
 ValidUntil=Valid until
 NoRecordedUsers=No users
+ToClose=To close
+ToProcess=To process
+ToApprove=To approve
+GlobalOpenedElemView=Global view
+NoArticlesFoundForTheKeyword=No article found for the keyword '<strong>%s</strong>'
+NoArticlesFoundForTheCategory=No article found for the category
+ToAcceptRefuse=To accept | refuse
diff --git a/htdocs/langs/sq_AL/members.lang b/htdocs/langs/sq_AL/members.lang
index aea5c761758..7b185a09616 100644
--- a/htdocs/langs/sq_AL/members.lang
+++ b/htdocs/langs/sq_AL/members.lang
@@ -29,6 +29,7 @@ MenuMembersUpToDate=Up to date members
 MenuMembersNotUpToDate=Out of date members
 MenuMembersResiliated=Terminated members
 MembersWithSubscriptionToReceive=Members with subscription to receive
+MembersWithSubscriptionToReceiveShort=Subscription to receive
 DateSubscription=Subscription date
 DateEndSubscription=Subscription end date
 EndSubscription=End subscription
diff --git a/htdocs/langs/sq_AL/projects.lang b/htdocs/langs/sq_AL/projects.lang
index b064f742e9a..1d33603e730 100644
--- a/htdocs/langs/sq_AL/projects.lang
+++ b/htdocs/langs/sq_AL/projects.lang
@@ -76,7 +76,13 @@ MyProjects=My projects
 MyProjectsArea=My projects Area
 DurationEffective=Effective duration
 ProgressDeclared=Declared progress
+TaskProgressSummary=Task progress
+CurentlyOpenedTasks=Curently opened tasks
+TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared progress is less %s than the calculated progression
+TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared progress is more %s than the calculated progression
 ProgressCalculated=Calculated progress
+WhichIamLinkedTo=which I'm linked to
+WhichIamLinkedToProject=which I'm linked to project
 Time=Time
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
diff --git a/htdocs/langs/sq_AL/website.lang b/htdocs/langs/sq_AL/website.lang
index 0ee00aff7c0..9648ae48cc8 100644
--- a/htdocs/langs/sq_AL/website.lang
+++ b/htdocs/langs/sq_AL/website.lang
@@ -2,7 +2,7 @@
 Shortname=Code
 WebsiteSetupDesc=Create here the websites you wish to use. Then go into menu Websites to edit them.
 DeleteWebsite=Delete website
-ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed.
+ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed. The files uploaded (like into the medias directory, the ECM module, ...) will remain.
 WEBSITE_TYPE_CONTAINER=Type of page/container
 WEBSITE_PAGE_EXAMPLE=Web page to use as example
 WEBSITE_PAGENAME=Page name/alias
@@ -14,6 +14,9 @@ WEBSITE_JS_INLINE=Javascript file content (common to all pages)
 WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages)
 WEBSITE_ROBOT=Robot file (robots.txt)
 WEBSITE_HTACCESS=Website .htaccess file
+WEBSITE_MANIFEST_JSON=Website manifest.json file
+WEBSITE_README=README.md file
+EnterHereLicenseInformation=Enter here meta data or license information to fille a README.md file. if you distribute your website as a template, the file will be included into the temptate package.
 HtmlHeaderPage=HTML header (specific to this page only)
 PageNameAliasHelp=Name or alias of the page.<br>This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "<strong>%s</strong>" to edit this alias.
 EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container.
@@ -41,6 +44,7 @@ RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
 SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then set the name of the virtual host you have created in the properties of web site, so the preview can be done also using this dedicated web server access instead of the internal Dolibarr server.
 YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
 CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
 ReadPerm=Read
 WritePerm=Write
@@ -75,7 +79,8 @@ AddWebsiteAccount=Create web site account
 BackToListOfThirdParty=Back to list for Third Party
 DisableSiteFirst=Disable website first
 MyContainerTitle=My web site title
-AnotherContainer=Another container
+AnotherContainer=This is how to include content of another page/container (you may have an error here if you enable dynamic code because the embedded subcontainer may not exists)
+SorryWebsiteIsCurrentlyOffLine=Sorry, this website is currently off line. Please comme back later...
 WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / third party
 YouMustDefineTheHomePage=You must first define the default Home page
@@ -89,7 +94,8 @@ AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
 CorporateHomePage=Corporate Home page
 EmptyPage=Empty page
 ExternalURLMustStartWithHttp=External URL must start with http:// or https://
-ZipOfWebsitePackageToImport=Zip file of website package
+ZipOfWebsitePackageToImport=Upload the Zip file of the website template package
+ZipOfWebsitePackageToLoad=or Choose an available embedded website template package
 ShowSubcontainers=Include dynamic content
 InternalURLOfPage=Internal URL of page
 ThisPageIsTranslationOf=This page/container is a translation of
@@ -101,5 +107,10 @@ NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynam
 ReplaceWebsiteContent=Search or Replace website content
 DeleteAlsoJs=Delete also all javascript files specific to this website?
 DeleteAlsoMedias=Delete also all medias files specific to this website?
-# Export
 MyWebsitePages=My website pages
+SearchReplaceInto=Search | Replace into
+ReplaceString=New string
+CSSContentTooltipHelp=Enter here CSS content. To avoid any conflict with the CSS of the application, be sure to prepend all declaration with the .bodywebsite class. For example:<br><br>#mycssselector, input.myclass:hover { ... }<br>must be<br>.bodywebsite #mycssselector, .bodywebsite input.myclass:hover { ... }<br><br>Note: If you have a large file without this prefix, you can use 'lessc' to convert it to append the .bodywebsite prefix everywhere.
+LinkAndScriptsHereAreNotLoadedInEditor=Warning: This content is output only when site is accessed from a server. It is not used in Edit mode so if you need to load javascript files also in edit mode, just add your tag 'script src=...' into the page.
+Dynamiccontent=Sample of a page with dynamic content
+ImportSite=Import website template
diff --git a/htdocs/langs/sr_RS/admin.lang b/htdocs/langs/sr_RS/admin.lang
index 939e248f1d6..bc536c39417 100644
--- a/htdocs/langs/sr_RS/admin.lang
+++ b/htdocs/langs/sr_RS/admin.lang
@@ -400,6 +400,7 @@ OldVATRates=Old VAT rate
 NewVATRates=New VAT rate
 PriceBaseTypeToChange=Modify on prices with base reference value defined on
 MassConvert=Launch bulk conversion
+PriceFormatInCurrentLanguage=Price Format In Current Language
 String=String
 TextLong=Long text
 HtmlText=Html text
@@ -431,7 +432,7 @@ ExtrafieldParamHelpradio=List of values must be lines with format key,value (whe
 ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- idfilter is necessarly a primary int key<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=List of values 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>Examples:<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
-ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default)<br>Set this to 2 for a collapsing separator (collapsed by default)
+ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Library used for PDF generation
 LocalTaxDesc=Some countries may apply two or three taxes on each invoice line. If this is the case, choose the type for the 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)
 SMS=SMS
@@ -1695,7 +1696,7 @@ SuppliersInvoiceNumberingModel=Vendor invoices numbering models
 IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=GeoIP Maxmind module setup
-PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat
+PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoLite2-Country.mmdb
 NoteOnPathLocation=Note that your ip to country data file must be inside a directory your PHP can read (Check your PHP open_basedir setup and filesystem permissions).
 YouCanDownloadFreeDatFileTo=You can download a <b>free demo version</b> of the Maxmind GeoIP country file at %s.
 YouCanDownloadAdvancedDatFileTo=You can also download a more <b>complete version, with updates,</b> of the Maxmind GeoIP country file at %s.
@@ -1926,14 +1927,13 @@ SmallerThan=Smaller than
 LargerThan=Larger than
 IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID is found into incoming email, the event will be automatically linked to the related objects.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
-IFTTTSetup=IFTTT module setup
-IFTTT_SERVICE_KEY=IFTTT Service key
-IFTTT_DOLIBARR_ENDPOINT_SECUREKEY=Security key to secure the endpoint URL used by IFTTT to send messages to your Dolibarr.
-IFTTTDesc=This module is designed to trigger events on IFTTT and/or to execute some action on external IFTTT triggers.
-UrlForIFTTT=URL endpoint for IFTTT
-YouWillFindItOnYourIFTTTAccount=You will find it on your IFTTT account
 EndPointFor=End point for %s : %s
 DeleteEmailCollector=Delete email collector
 ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
 RecipientEmailsWillBeReplacedWithThisValue=Recipient emails will be always replaced with this value
 AtLeastOneDefaultBankAccountMandatory=At least 1 default bank account must be defined
+RESTRICT_API_ON_IP=Allow available APIs to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can use the available APIs.
+RESTRICT_ON_IP=Allow access to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can access.
+BaseOnSabeDavVersion=Based on the library SabreDAV version
+NotAPublicIp=Not a public IP
+MakeAnonymousPing=Make an anonymous Ping '+1' to the Dolibarr foundation server (done 1 time only after installation) to allow the foundation to count the number of Dolibarr installation.
diff --git a/htdocs/langs/sr_RS/banks.lang b/htdocs/langs/sr_RS/banks.lang
index 3121ae02f40..d415f37bca1 100644
--- a/htdocs/langs/sr_RS/banks.lang
+++ b/htdocs/langs/sr_RS/banks.lang
@@ -73,6 +73,7 @@ BankTransaction=Bank entry
 ListTransactions=List entries
 ListTransactionsByCategory=List entries/category
 TransactionsToConciliate=Entries to reconcile
+TransactionsToConciliateShort=To reconcile
 Conciliable=Ne može se poravnati
 Conciliate=Poravnati
 Conciliation=Poravnanje
@@ -116,6 +117,7 @@ DeleteCheckReceipt=Delete this check receipt?
 ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
 BankChecks=Bankovni ček
 BankChecksToReceipt=Checks awaiting deposit
+BankChecksToReceiptShort=Checks awaiting deposit
 ShowCheckReceipt=Prikaži unovčen ček
 NumberOfCheques=No. of check
 DeleteTransaction=Delete entry
diff --git a/htdocs/langs/sr_RS/cashdesk.lang b/htdocs/langs/sr_RS/cashdesk.lang
index 1e992953e50..f9c9b2d5c36 100644
--- a/htdocs/langs/sr_RS/cashdesk.lang
+++ b/htdocs/langs/sr_RS/cashdesk.lang
@@ -62,6 +62,7 @@ TicketVatGrouped=Group VAT by rate in tickets
 AutoPrintTickets=Automatically print tickets
 EnableBarOrRestaurantFeatures=Enable features for Bar or Restaurant
 ConfirmDeletionOfThisPOSSale=Do your confirm the deletion of this current sale ?
+ConfirmDiscardOfThisPOSSale=Do you want to discard this current sale ?
 History=Istorija
 ValidateAndClose=Validate and close
 Terminal=Terminal
@@ -69,3 +70,8 @@ NumberOfTerminals=Number of Terminals
 TerminalSelect=Select terminal you want to use:
 POSTicket=POS Ticket
 BasicPhoneLayout=Use basic layout for phones
+SetupOfTerminalNotComplete=Setup of terminal %s is not complete
+DirectPayment=Direct payment
+DirectPaymentButton=Direct cash payment button
+InvoiceIsAlreadyValidated=Invoice is already validated
+NoLinesToBill=No lines to bill
diff --git a/htdocs/langs/sr_RS/companies.lang b/htdocs/langs/sr_RS/companies.lang
index 039365081a4..01acdf7c07d 100644
--- a/htdocs/langs/sr_RS/companies.lang
+++ b/htdocs/langs/sr_RS/companies.lang
@@ -54,6 +54,7 @@ Firstname=Ime
 PostOrFunction=Job position
 UserTitle=Title
 NatureOfThirdParty=Nature of Third party
+NatureOfContact=Nature of Contact
 Address=Adresa
 State=Država/Provincija
 StateShort=Stanje
diff --git a/htdocs/langs/sr_RS/contracts.lang b/htdocs/langs/sr_RS/contracts.lang
index e4014c92506..90f44629b99 100644
--- a/htdocs/langs/sr_RS/contracts.lang
+++ b/htdocs/langs/sr_RS/contracts.lang
@@ -51,6 +51,7 @@ ListOfClosedServices=Lista zatvorenih usluga
 ListOfRunningServices=Lista aktivnih usluga
 NotActivatedServices=Neaktivne usluge (među odobrenim ugovorima)
 BoardNotActivatedServices=Usluge za aktivaciju među odobrenim ugovorima
+BoardNotActivatedServicesShort=Services to activate
 LastContracts=Latest %s contracts
 LastModifiedServices=Latest %s modified services
 ContractStartDate=Početak
@@ -64,7 +65,10 @@ DateStartRealShort=Stvarni početak
 DateEndReal=Stvarni kraj
 DateEndRealShort=Stvarni kraj
 CloseService=Zatvori uslugu
-BoardRunningServices=Istekle aktivne usluge
+BoardRunningServices=Services running
+BoardRunningServicesShort=Services running
+BoardExpiredServices=Services expired
+BoardExpiredServicesShort=Services expired
 ServiceStatus=Status usluge
 DraftContracts=Draft ugovori
 CloseRefusedBecauseOneServiceActive=Contract can't be closed as there is at least one open service on it
diff --git a/htdocs/langs/sr_RS/errors.lang b/htdocs/langs/sr_RS/errors.lang
index f83d78fb8e2..6d16c3372b4 100644
--- a/htdocs/langs/sr_RS/errors.lang
+++ b/htdocs/langs/sr_RS/errors.lang
@@ -218,6 +218,7 @@ ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text
 ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Error, delete payment linked to a closed invoice is not possible.
+ErrorSearchCriteriaTooSmall=Search criteria too small.
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 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/main.lang b/htdocs/langs/sr_RS/main.lang
index d75b23dfee9..c79e4a92183 100644
--- a/htdocs/langs/sr_RS/main.lang
+++ b/htdocs/langs/sr_RS/main.lang
@@ -28,6 +28,7 @@ NoTemplateDefined=No template available for this email type
 AvailableVariables=Dostupne zamenske promenljive
 NoTranslation=Nema prevoda
 Translation=Prevod
+EmptySearchString=Enter a non empty search string
 NoRecordFound=Nema rezultata
 NoRecordDeleted=No record deleted
 NotEnoughDataYet=Not enough data
@@ -704,6 +705,7 @@ DateOfSignature=Date of signature
 HidePassword=Prikaži komandu sa sakrivenom lozinkom
 UnHidePassword=Prikaži realnu komandu sa vidljivom lozinkom
 Root=Root
+RootOfMedias=Root of public medias (/medias)
 Informations=Informacija
 Page=Strana
 Notes=Beleške
@@ -981,3 +983,10 @@ PaymentInformation=Payment information
 ValidFrom=Valid from
 ValidUntil=Valid until
 NoRecordedUsers=No users
+ToClose=To close
+ToProcess=Za procesuiranje
+ToApprove=To approve
+GlobalOpenedElemView=Global view
+NoArticlesFoundForTheKeyword=No article found for the keyword '<strong>%s</strong>'
+NoArticlesFoundForTheCategory=No article found for the category
+ToAcceptRefuse=To accept | refuse
diff --git a/htdocs/langs/sr_RS/members.lang b/htdocs/langs/sr_RS/members.lang
index ef9b8395290..edf0abd4c69 100644
--- a/htdocs/langs/sr_RS/members.lang
+++ b/htdocs/langs/sr_RS/members.lang
@@ -29,6 +29,7 @@ MenuMembersUpToDate=Ažurni članovi
 MenuMembersNotUpToDate=Istekli članovi
 MenuMembersResiliated=Terminated members
 MembersWithSubscriptionToReceive=Članovi koji treba da prime pretplatu
+MembersWithSubscriptionToReceiveShort=Subscription to receive
 DateSubscription=Datum pretplate
 DateEndSubscription=Kraj pretplate
 EndSubscription=Kraj pretplate
diff --git a/htdocs/langs/sr_RS/projects.lang b/htdocs/langs/sr_RS/projects.lang
index b5cef16aac1..f761e886af9 100644
--- a/htdocs/langs/sr_RS/projects.lang
+++ b/htdocs/langs/sr_RS/projects.lang
@@ -76,7 +76,13 @@ MyProjects=Moji projekti
 MyProjectsArea=Moja zona projekata
 DurationEffective=Efektivno trajanje
 ProgressDeclared=Prijavljeni napredak
+TaskProgressSummary=Task progress
+CurentlyOpenedTasks=Curently opened tasks
+TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared progress is less %s than the calculated progression
+TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared progress is more %s than the calculated progression
 ProgressCalculated=Izračunati napredak
+WhichIamLinkedTo=which I'm linked to
+WhichIamLinkedToProject=which I'm linked to project
 Time=Vreme
 ListOfTasks=Lista zadataka
 GoToListOfTimeConsumed=Idi na listu utrošenog vremena
diff --git a/htdocs/langs/sv_SE/admin.lang b/htdocs/langs/sv_SE/admin.lang
index 13e135c84d8..784d8796adf 100644
--- a/htdocs/langs/sv_SE/admin.lang
+++ b/htdocs/langs/sv_SE/admin.lang
@@ -400,6 +400,7 @@ OldVATRates=Gammal momssats
 NewVATRates=Ny momssats
 PriceBaseTypeToChange=Ändra om priser med bas referensvärde som definieras på
 MassConvert=Starta masskonvertering
+PriceFormatInCurrentLanguage=Price Format In Current Language
 String=String
 TextLong=Lång text
 HtmlText=Html-text
@@ -431,7 +432,7 @@ ExtrafieldParamHelpradio=Lista över värden måste vara rader med formatnyckel,
 ExtrafieldParamHelpsellist=Lista över värden kommer från en tabell <br> Syntax: tabellnamn: label_field: id_field :: filter <br> Exempel: c_typent: libelle: id :: filter <br> <br> - idfilter är nödvändigtvis en primär int nyckel <br> - filtret kan vara ett enkelt test = 1) för att visa endast aktivt värde <br> Du kan också använda $ ID $ i filterhäxa är det aktuella idet av nuvarande objekt <br> För att göra ett SELECT i filter använder du $ SEL $ <br> om du vill filtrera på extrafält använder du syntax extra.fieldcode = ... (där fältkoden är koden för extrafältet) <br> <br> För att få listan beroende på en annan komplementär attributlista: <br> c_typent: libelle: id: options_ <i> parent_list_code </i> | parent_column: filter <br> <br> För att ha listan beror på en annan lista: <br> c_typent: libelle: id: <i> parent_list_code </i> | parent_column: filter
 ExtrafieldParamHelpchkbxlst=Lista över värden kommer från en tabell <br> Syntax: tabellnamn: label_field: id_field :: filter <br> Exempel: c_typent: libelle: id :: filter <br> <br> filtret kan vara ett enkelt test (t.ex. aktiv = 1) för att visa endast aktivt värde <br> Du kan också använda $ ID $ i filterhäxa är nuvarande ID för nuvarande objekt <br> För att göra ett SELECT i filter använd $ SEL $ <br> om du vill filtrera på extrafält använder syntax extra.fieldcode = ... (där fältkoden är kod för extrafält) <br> <br> För att få listan beroende på en annan komplementär attributlista: <br> c_typent: libelle: id: options_ <i> parent_list_code </i> | parent_column: filter <br> <br> För att få listan beroende på en annan lista: <br> c_typent: libelle: id: <i> parent_list_code </i> | parent_column: filter
 ExtrafieldParamHelplink=Parametrar måste vara ObjectName: Classpath <br> Syntax: ObjectName: Classpath <br> Exempel: <br> Societe: societe / class / societe.class.php <br> Kontakt: kontakt / class / contact.class.php
-ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default)<br>Set this to 2 for a collapsing separator (collapsed by default)
+ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Bibliotek som används för PDF-generering
 LocalTaxDesc=Vissa länder kan ansöka om två eller tre skatter på varje faktura. Om så är fallet, välj typ för andra och tredje skatt och dess skattesats. Möjlig typ är: <br> 1: Lokal skatt gäller för produkter och tjänster utan moms (localtax beräknas på belopp utan skatt) <br> 2: Lokal skatt gäller för produkter och tjänster inklusive moms (lokal skatt beräknas på belopp + huvudskatt) <br> 3: lokal skatt tillämpas på varor utan moms (lokal skatt beräknas på belopp utan skatt) <br> 4: Lokal skatt gäller för produkter inklusive moms (lokal skatt beräknas på belopp + huvudskatt) <br> 5: Lokal skatt gäller för tjänster utan moms (lokal skatt beräknas på belopp utan skatt) <br> 6: Lokal skatt gäller för tjänster inklusive moms (lokal skatt beräknas på belopp + skatt)
 SMS=SMS
@@ -1695,7 +1696,7 @@ SuppliersInvoiceNumberingModel=Leverantörsfakturor nummereringsmodeller
 IfSetToYesDontForgetPermission=Om satt till ja, glöm inte att ge behörighet till grupper eller användare som tillåts för den andra godkännande
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=GeoIP Maxmind modul inställning
-PathToGeoIPMaxmindCountryDataFile=Sökväg till fil innehåller MaxMind ip till land översättning. <br> Exempel: <br> /usr/local/share/GeoIP/GeoIP.dat <br> /usr/share/GeoIP/GeoIP.dat
+PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoLite2-Country.mmdb
 NoteOnPathLocation=Observera att ditt ip till land datafil måste vara inne i en katalog din PHP kan läsa (Kolla din PHP open_basedir inställningar och behörigheter filsystem).
 YouCanDownloadFreeDatFileTo=Du kan ladda ner en <b>gratis demoversion</b> av Maxmind GeoIP landet filen på %s.
 YouCanDownloadAdvancedDatFileTo=Du kan också ladda ner en mer <b>komplett version, med uppdateringar av</b> de Maxmind GeoIP landet filen på %s.
@@ -1926,14 +1927,13 @@ SmallerThan=Mindre än
 LargerThan=Större än
 IfTrackingIDFoundEventWillBeLinked=Observera att Om ett spårnings-ID finns i inkommande e-post, kopplas händelsen automatiskt till relaterade objekt.
 WithGMailYouCanCreateADedicatedPassword=Med ett GMail-konto, om du aktiverade valet av 2 steg, rekommenderas att du skapar ett dedikerat andra lösenord för programmet istället för att använda ditt eget lösenordsord från https://myaccount.google.com/.
-IFTTTSetup=IFTTT module setup
-IFTTT_SERVICE_KEY=IFTTT Service key
-IFTTT_DOLIBARR_ENDPOINT_SECUREKEY=Security key to secure the endpoint URL used by IFTTT to send messages to your Dolibarr.
-IFTTTDesc=This module is designed to trigger events on IFTTT and/or to execute some action on external IFTTT triggers.
-UrlForIFTTT=URL endpoint for IFTTT
-YouWillFindItOnYourIFTTTAccount=You will find it on your IFTTT account
 EndPointFor=End point for %s : %s
 DeleteEmailCollector=Delete email collector
 ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
 RecipientEmailsWillBeReplacedWithThisValue=Recipient emails will be always replaced with this value
 AtLeastOneDefaultBankAccountMandatory=At least 1 default bank account must be defined
+RESTRICT_API_ON_IP=Allow available APIs to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can use the available APIs.
+RESTRICT_ON_IP=Allow access to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can access.
+BaseOnSabeDavVersion=Based on the library SabreDAV version
+NotAPublicIp=Not a public IP
+MakeAnonymousPing=Make an anonymous Ping '+1' to the Dolibarr foundation server (done 1 time only after installation) to allow the foundation to count the number of Dolibarr installation.
diff --git a/htdocs/langs/sv_SE/banks.lang b/htdocs/langs/sv_SE/banks.lang
index 362ce017000..54a37e82812 100644
--- a/htdocs/langs/sv_SE/banks.lang
+++ b/htdocs/langs/sv_SE/banks.lang
@@ -73,6 +73,7 @@ BankTransaction=Bankpost
 ListTransactions=Lista poster
 ListTransactionsByCategory=Lista poster / kategori
 TransactionsToConciliate=Inlägg för att förena
+TransactionsToConciliateShort=To reconcile
 Conciliable=Kan förenas
 Conciliate=Reconcile
 Conciliation=Avstämning
@@ -116,6 +117,7 @@ DeleteCheckReceipt=Ta bort detta kvitto?
 ConfirmDeleteCheckReceipt=Är du säker på att du vill radera detta kvitto?
 BankChecks=Bankcheckar
 BankChecksToReceipt=Checkar väntar på insättning
+BankChecksToReceiptShort=Checks awaiting deposit
 ShowCheckReceipt=Visar kontrollera insättning mottagande
 NumberOfCheques=Antal checkar
 DeleteTransaction=Ta bort post
diff --git a/htdocs/langs/sv_SE/cashdesk.lang b/htdocs/langs/sv_SE/cashdesk.lang
index 3198cfb4ebe..8cc98199a00 100644
--- a/htdocs/langs/sv_SE/cashdesk.lang
+++ b/htdocs/langs/sv_SE/cashdesk.lang
@@ -62,6 +62,7 @@ TicketVatGrouped=Grupp moms enligt sats i biljetter
 AutoPrintTickets=Skriv ut biljetter automatiskt
 EnableBarOrRestaurantFeatures=Aktivera funktioner för bar eller restaurang
 ConfirmDeletionOfThisPOSSale=Bekräftar du att du har raderat den aktuella försäljningen?
+ConfirmDiscardOfThisPOSSale=Do you want to discard this current sale ?
 History=Historia
 ValidateAndClose=Validate and close
 Terminal=Terminal
@@ -69,3 +70,8 @@ NumberOfTerminals=Number of Terminals
 TerminalSelect=Select terminal you want to use:
 POSTicket=POS Ticket
 BasicPhoneLayout=Use basic layout for phones
+SetupOfTerminalNotComplete=Setup of terminal %s is not complete
+DirectPayment=Direct payment
+DirectPaymentButton=Direct cash payment button
+InvoiceIsAlreadyValidated=Invoice is already validated
+NoLinesToBill=No lines to bill
diff --git a/htdocs/langs/sv_SE/companies.lang b/htdocs/langs/sv_SE/companies.lang
index 098c3c073b4..e5710cc7ad9 100644
--- a/htdocs/langs/sv_SE/companies.lang
+++ b/htdocs/langs/sv_SE/companies.lang
@@ -54,6 +54,7 @@ Firstname=Förnamn
 PostOrFunction=Befattning
 UserTitle=Titel
 NatureOfThirdParty=Tredjepartens art
+NatureOfContact=Nature of Contact
 Address=Adress
 State=Delstat / provins
 StateShort=stat
diff --git a/htdocs/langs/sv_SE/contracts.lang b/htdocs/langs/sv_SE/contracts.lang
index 543928bf3c8..98b9288e837 100644
--- a/htdocs/langs/sv_SE/contracts.lang
+++ b/htdocs/langs/sv_SE/contracts.lang
@@ -5,7 +5,7 @@ AllContracts=Alla kontrakt
 ContractCard=Kontrakt kort
 ContractStatusNotRunning=Inte kör
 ContractStatusDraft=Förslag
-ContractStatusValidated=Validerad
+ContractStatusValidated=Bekräftat
 ContractStatusClosed=Stängt
 ServiceStatusInitial=Inte löpande
 ServiceStatusRunning=Löpande
@@ -34,11 +34,11 @@ DeleteAContract=Ta bort ett kontrakt
 ActivateAllOnContract=Aktivera alla tjänster
 CloseAContract=Stäng ett kontrakt
 ConfirmDeleteAContract=Är du säker på att du vill radera detta kontrakt och alla dess tjänster?
-ConfirmValidateContract=Är du säker på att du vill validera detta kontrakt under namnet <b> %s </b>?
+ConfirmValidateContract=Är du säker på att du vill bekräfta detta kontrakt under namnet <b> %s </b>?
 ConfirmActivateAllOnContract=Detta öppnar alla tjänster (ännu inte aktiva). Är du säker på att du vill öppna alla tjänster?
 ConfirmCloseContract=Detta stänger alla tjänster (aktiv eller ej). Är du säker på att du vill stänga detta kontrakt?
 ConfirmCloseService=Är du säker på att du vill stänga den här tjänsten med datum <b> %s </b>?
-ValidateAContract=Validera ett kontrakt
+ValidateAContract=Bekräfta ett kontrakt
 ActivateService=Aktivera tjänsten
 ConfirmActivateService=Är du säker på att du vill aktivera den här tjänsten med datum <b> %s </b>?
 RefContract=Avtalsreferens
@@ -49,8 +49,9 @@ ListOfInactiveServices=Förteckning över ej aktiva tjänster
 ListOfExpiredServices=Förteckning över utlöpta aktiva tjänster
 ListOfClosedServices=Lista över stängda tjänster
 ListOfRunningServices=Förteckning över löpande tjänster
-NotActivatedServices=Inaktiva tjänster (bland validerade kontrakt)
-BoardNotActivatedServices=Tjänster att aktivera bland validerade kontrakt
+NotActivatedServices=Inaktiva tjänster (bland bekräftades kontrakt)
+BoardNotActivatedServices=Tjänster att aktivera bland bekräftades kontrakt
+BoardNotActivatedServicesShort=Services to activate
 LastContracts=Senaste %s kontrakten
 LastModifiedServices=Senaste %s modifierade tjänster
 ContractStartDate=Startdatum
@@ -64,7 +65,10 @@ DateStartRealShort=Verkligt startdatum
 DateEndReal=Verkligt slutdatum
 DateEndRealShort=Verkligt slutdatum
 CloseService=Stäng tjänst
-BoardRunningServices=Utlöpta löpande tjänster
+BoardRunningServices=Services running
+BoardRunningServicesShort=Services running
+BoardExpiredServices=Services expired
+BoardExpiredServicesShort=Services expired
 ServiceStatus=Status för tjänst
 DraftContracts=Utkast avtal
 CloseRefusedBecauseOneServiceActive=Kontraktet kan inte stängas eftersom det finns minst en öppen tjänst på den
diff --git a/htdocs/langs/sv_SE/errors.lang b/htdocs/langs/sv_SE/errors.lang
index f4e435871f1..f37a7002e0a 100644
--- a/htdocs/langs/sv_SE/errors.lang
+++ b/htdocs/langs/sv_SE/errors.lang
@@ -218,6 +218,7 @@ ErrorVariableKeyForContentMustBeSet=Fel, konstanten med namnet %s (med textinneh
 ErrorURLMustStartWithHttp=URL %s måste börja med http: // eller https: //
 ErrorNewRefIsAlreadyUsed=Fel, den nya referensen används redan
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Error, delete payment linked to a closed invoice is not possible.
+ErrorSearchCriteriaTooSmall=Search criteria too small.
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 WarningPasswordSetWithNoAccount=Ett lösenord har ställts för den här medlemmen. Men inget användarkonto skapades. Så det här lösenordet är lagrat men kan inte användas för att logga in till Dolibarr. Den kan användas av en extern modul / gränssnitt men om du inte behöver definiera någon inloggning eller ett lösenord för en medlem kan du inaktivera alternativet "Hantera en inloggning för varje medlem" från inställningen av medlemsmodulen. Om du behöver hantera en inloggning men inte behöver något lösenord, kan du hålla fältet tomt för att undvika denna varning. Obs! Email kan också användas som inloggning om medlemmen är länkad till en användare.
diff --git a/htdocs/langs/sv_SE/main.lang b/htdocs/langs/sv_SE/main.lang
index ccc0b9aca07..902bf46b469 100644
--- a/htdocs/langs/sv_SE/main.lang
+++ b/htdocs/langs/sv_SE/main.lang
@@ -28,6 +28,7 @@ NoTemplateDefined=Ingen mall tillgänglig för denna e-posttyp
 AvailableVariables=Tillgängliga substitutionsvariabler
 NoTranslation=Ingen översättning
 Translation=Översättning
+EmptySearchString=Enter a non empty search string
 NoRecordFound=Ingen post funnen
 NoRecordDeleted=Ingen post borttagen
 NotEnoughDataYet=Inte tillräckligt med data
@@ -704,6 +705,7 @@ DateOfSignature=Datum för underskrift
 HidePassword=Visa kommando med dolt lösenord
 UnHidePassword=Visa riktiga kommandot med lösenord i klartext
 Root=Root
+RootOfMedias=Root of public medias (/medias)
 Informations=Information
 Page=Sida
 Notes=Anteckningar
@@ -981,3 +983,10 @@ PaymentInformation=Payment information
 ValidFrom=Valid from
 ValidUntil=Valid until
 NoRecordedUsers=No users
+ToClose=To close
+ToProcess=För att kunna behandla
+ToApprove=To approve
+GlobalOpenedElemView=Global view
+NoArticlesFoundForTheKeyword=No article found for the keyword '<strong>%s</strong>'
+NoArticlesFoundForTheCategory=No article found for the category
+ToAcceptRefuse=To accept | refuse
diff --git a/htdocs/langs/sv_SE/members.lang b/htdocs/langs/sv_SE/members.lang
index c9a52db62c9..1c6b81dbaac 100644
--- a/htdocs/langs/sv_SE/members.lang
+++ b/htdocs/langs/sv_SE/members.lang
@@ -29,6 +29,7 @@ MenuMembersUpToDate=Hittills medlemmar
 MenuMembersNotUpToDate=Föråldrad medlemmar
 MenuMembersResiliated=Avslutade medlemmar
 MembersWithSubscriptionToReceive=Medlemmar med abonnemang för att ta emot
+MembersWithSubscriptionToReceiveShort=Subscription to receive
 DateSubscription=Teckningsdag
 DateEndSubscription=Prenumeration slutdatum
 EndSubscription=Avsluta prenumeration
diff --git a/htdocs/langs/sv_SE/projects.lang b/htdocs/langs/sv_SE/projects.lang
index bdba6e72f88..2abcd5686e2 100644
--- a/htdocs/langs/sv_SE/projects.lang
+++ b/htdocs/langs/sv_SE/projects.lang
@@ -76,7 +76,13 @@ MyProjects=Mina projekt
 MyProjectsArea=Mina projektområde
 DurationEffective=Effektiv längd
 ProgressDeclared=Förklarades framsteg
+TaskProgressSummary=Task progress
+CurentlyOpenedTasks=Curently opened tasks
+TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared progress is less %s than the calculated progression
+TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared progress is more %s than the calculated progression
 ProgressCalculated=Beräknat framsteg
+WhichIamLinkedTo=which I'm linked to
+WhichIamLinkedToProject=which I'm linked to project
 Time=Tid
 ListOfTasks=Lista över uppgifter
 GoToListOfTimeConsumed=Gå till listan över tidskrävt
diff --git a/htdocs/langs/sv_SE/website.lang b/htdocs/langs/sv_SE/website.lang
index cc934e66abc..a200732f3aa 100644
--- a/htdocs/langs/sv_SE/website.lang
+++ b/htdocs/langs/sv_SE/website.lang
@@ -2,7 +2,7 @@
 Shortname=Kod
 WebsiteSetupDesc=Skapa här de webbplatser du vill använda. Gå sedan till menyn webbplatser för att redigera dem.
 DeleteWebsite=Ta bort webbplats
-ConfirmDeleteWebsite=Är du säker på att du vill radera den här webbplatsen? Alla sidor och innehåll kommer också att tas bort.
+ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed. The files uploaded (like into the medias directory, the ECM module, ...) will remain.
 WEBSITE_TYPE_CONTAINER=Typ av sida / container
 WEBSITE_PAGE_EXAMPLE=Webbplats som ska användas som exempel
 WEBSITE_PAGENAME=Sidnamn / alias
@@ -14,6 +14,9 @@ WEBSITE_JS_INLINE=Javascript-filinnehåll (vanligt för alla sidor)
 WEBSITE_HTML_HEADER=Tillägg längst ner i HTML-rubrik (vanligt för alla sidor)
 WEBSITE_ROBOT=Robotfil (robots.txt)
 WEBSITE_HTACCESS=Webbsida. Htaccess-fil
+WEBSITE_MANIFEST_JSON=Website manifest.json file
+WEBSITE_README=README.md file
+EnterHereLicenseInformation=Enter here meta data or license information to fille a README.md file. if you distribute your website as a template, the file will be included into the temptate package.
 HtmlHeaderPage=HTML-rubrik (endast för den här sidan)
 PageNameAliasHelp=Namn eller alias på sidan. <br> Detta alias används också för att skapa en SEO-URL när webbplatsen springer från en virtuell värd på en webbserver (som Apacke, Nginx, ...). Använd knappen "<strong> %s </strong>" för att redigera detta alias.
 EditTheWebSiteForACommonHeader=Obs! Om du vill definiera en personlig rubrik för alla sidor, redigera rubriken på sidnivån istället för på sidan / behållaren.
@@ -41,6 +44,7 @@ RealURL=Verklig URL
 ViewWebsiteInProduction=Visa webbplats med hjälp av hemadresser
 SetHereVirtualHost=<u> Använd med Apache / NGinx / ... </u> <br> Om du kan skapa, på din webbserver (Apache, Nginx, ...), en dedikerad Virtual Host med PHP aktiverad och en Root-katalog på <br><strong> %s </strong><br> sedan ställa in namnet på den virtuella värd som du har skapat i egenskaperna hos webbplatsen, så förhandsgranskningen kan också göras med hjälp av den här dedicerade webbserveråtkomsten i stället för den interna Dolibarr-servern.
 YouCanAlsoTestWithPHPS= <u> Använd med PHP-inbäddad server </u> <br> På utvecklingsmiljö kan du föredra att testa webbplatsen med PHP-inbäddad webbserver (PHP 5.5 krävs) genom att köra <br> <strong> php -S 0.0.0.0:8080 -t %s </strong>
+YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
 CheckVirtualHostPerms=Kontrollera också att virtuell värd har tillstånd <strong> %s </strong> på filer i <br> <strong> %s </strong>
 ReadPerm=Läsa
 WritePerm=Skriva
@@ -75,7 +79,8 @@ AddWebsiteAccount=Skapa webbplatskonto
 BackToListOfThirdParty=Tillbaka till listan för tredje part
 DisableSiteFirst=Inaktivera webbplats först
 MyContainerTitle=Min webbplatstitel
-AnotherContainer=En annan behållare
+AnotherContainer=This is how to include content of another page/container (you may have an error here if you enable dynamic code because the embedded subcontainer may not exists)
+SorryWebsiteIsCurrentlyOffLine=Sorry, this website is currently off line. Please comme back later...
 WEBSITE_USE_WEBSITE_ACCOUNTS=Aktivera webbsidokontotabellen
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Aktivera tabellen för att lagra webbplatskonton (inloggning / överföring) för varje webbplats / tredje part
 YouMustDefineTheHomePage=Du måste först definiera standard startsida
@@ -89,7 +94,8 @@ AliasPageAlreadyExists=Alias sida <strong> %s </strong> existerar redan
 CorporateHomePage=Företagets hemsida
 EmptyPage=Tom sida
 ExternalURLMustStartWithHttp=Extern webbadress måste börja med http: // eller https: //
-ZipOfWebsitePackageToImport=Zip-fil av webbpaketet
+ZipOfWebsitePackageToImport=Upload the Zip file of the website template package
+ZipOfWebsitePackageToLoad=or Choose an available embedded website template package
 ShowSubcontainers=Inkludera dynamiskt innehåll
 InternalURLOfPage=Intern webbadress
 ThisPageIsTranslationOf=Den här sidan / behållaren är en översättning av
@@ -101,5 +107,10 @@ NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynam
 ReplaceWebsiteContent=Search or Replace website content
 DeleteAlsoJs=Delete also all javascript files specific to this website?
 DeleteAlsoMedias=Delete also all medias files specific to this website?
-# Export
 MyWebsitePages=My website pages
+SearchReplaceInto=Search | Replace into
+ReplaceString=New string
+CSSContentTooltipHelp=Enter here CSS content. To avoid any conflict with the CSS of the application, be sure to prepend all declaration with the .bodywebsite class. For example:<br><br>#mycssselector, input.myclass:hover { ... }<br>must be<br>.bodywebsite #mycssselector, .bodywebsite input.myclass:hover { ... }<br><br>Note: If you have a large file without this prefix, you can use 'lessc' to convert it to append the .bodywebsite prefix everywhere.
+LinkAndScriptsHereAreNotLoadedInEditor=Warning: This content is output only when site is accessed from a server. It is not used in Edit mode so if you need to load javascript files also in edit mode, just add your tag 'script src=...' into the page.
+Dynamiccontent=Sample of a page with dynamic content
+ImportSite=Importera webbsidans mall
diff --git a/htdocs/langs/sw_SW/admin.lang b/htdocs/langs/sw_SW/admin.lang
index 2e27c6fe81f..1a1891009cf 100644
--- a/htdocs/langs/sw_SW/admin.lang
+++ b/htdocs/langs/sw_SW/admin.lang
@@ -400,6 +400,7 @@ OldVATRates=Old VAT rate
 NewVATRates=New VAT rate
 PriceBaseTypeToChange=Modify on prices with base reference value defined on
 MassConvert=Launch bulk conversion
+PriceFormatInCurrentLanguage=Price Format In Current Language
 String=String
 TextLong=Long text
 HtmlText=Html text
@@ -431,7 +432,7 @@ ExtrafieldParamHelpradio=List of values must be lines with format key,value (whe
 ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- idfilter is necessarly a primary int key<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=List of values 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>Examples:<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
-ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default)<br>Set this to 2 for a collapsing separator (collapsed by default)
+ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Library used for PDF generation
 LocalTaxDesc=Some countries may apply two or three taxes on each invoice line. If this is the case, choose the type for the 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)
 SMS=SMS
@@ -1695,7 +1696,7 @@ SuppliersInvoiceNumberingModel=Vendor invoices numbering models
 IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=GeoIP Maxmind module setup
-PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat
+PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoLite2-Country.mmdb
 NoteOnPathLocation=Note that your ip to country data file must be inside a directory your PHP can read (Check your PHP open_basedir setup and filesystem permissions).
 YouCanDownloadFreeDatFileTo=You can download a <b>free demo version</b> of the Maxmind GeoIP country file at %s.
 YouCanDownloadAdvancedDatFileTo=You can also download a more <b>complete version, with updates,</b> of the Maxmind GeoIP country file at %s.
@@ -1926,14 +1927,13 @@ SmallerThan=Smaller than
 LargerThan=Larger than
 IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID is found into incoming email, the event will be automatically linked to the related objects.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
-IFTTTSetup=IFTTT module setup
-IFTTT_SERVICE_KEY=IFTTT Service key
-IFTTT_DOLIBARR_ENDPOINT_SECUREKEY=Security key to secure the endpoint URL used by IFTTT to send messages to your Dolibarr.
-IFTTTDesc=This module is designed to trigger events on IFTTT and/or to execute some action on external IFTTT triggers.
-UrlForIFTTT=URL endpoint for IFTTT
-YouWillFindItOnYourIFTTTAccount=You will find it on your IFTTT account
 EndPointFor=End point for %s : %s
 DeleteEmailCollector=Delete email collector
 ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
 RecipientEmailsWillBeReplacedWithThisValue=Recipient emails will be always replaced with this value
 AtLeastOneDefaultBankAccountMandatory=At least 1 default bank account must be defined
+RESTRICT_API_ON_IP=Allow available APIs to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can use the available APIs.
+RESTRICT_ON_IP=Allow access to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can access.
+BaseOnSabeDavVersion=Based on the library SabreDAV version
+NotAPublicIp=Not a public IP
+MakeAnonymousPing=Make an anonymous Ping '+1' to the Dolibarr foundation server (done 1 time only after installation) to allow the foundation to count the number of Dolibarr installation.
diff --git a/htdocs/langs/sw_SW/banks.lang b/htdocs/langs/sw_SW/banks.lang
index c77158e07b7..47295ec7e31 100644
--- a/htdocs/langs/sw_SW/banks.lang
+++ b/htdocs/langs/sw_SW/banks.lang
@@ -73,6 +73,7 @@ BankTransaction=Bank entry
 ListTransactions=List entries
 ListTransactionsByCategory=List entries/category
 TransactionsToConciliate=Entries to reconcile
+TransactionsToConciliateShort=To reconcile
 Conciliable=Can be reconciled
 Conciliate=Reconcile
 Conciliation=Reconciliation
@@ -116,6 +117,7 @@ DeleteCheckReceipt=Delete this check receipt?
 ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
 BankChecks=Bank checks
 BankChecksToReceipt=Checks awaiting deposit
+BankChecksToReceiptShort=Checks awaiting deposit
 ShowCheckReceipt=Show check deposit receipt
 NumberOfCheques=No. of check
 DeleteTransaction=Delete entry
diff --git a/htdocs/langs/sw_SW/cashdesk.lang b/htdocs/langs/sw_SW/cashdesk.lang
index ea0e660ed2d..33ea50dfb0f 100644
--- a/htdocs/langs/sw_SW/cashdesk.lang
+++ b/htdocs/langs/sw_SW/cashdesk.lang
@@ -62,6 +62,7 @@ TicketVatGrouped=Group VAT by rate in tickets
 AutoPrintTickets=Automatically print tickets
 EnableBarOrRestaurantFeatures=Enable features for Bar or Restaurant
 ConfirmDeletionOfThisPOSSale=Do your confirm the deletion of this current sale ?
+ConfirmDiscardOfThisPOSSale=Do you want to discard this current sale ?
 History=History
 ValidateAndClose=Validate and close
 Terminal=Terminal
@@ -69,3 +70,8 @@ NumberOfTerminals=Number of Terminals
 TerminalSelect=Select terminal you want to use:
 POSTicket=POS Ticket
 BasicPhoneLayout=Use basic layout for phones
+SetupOfTerminalNotComplete=Setup of terminal %s is not complete
+DirectPayment=Direct payment
+DirectPaymentButton=Direct cash payment button
+InvoiceIsAlreadyValidated=Invoice is already validated
+NoLinesToBill=No lines to bill
diff --git a/htdocs/langs/sw_SW/companies.lang b/htdocs/langs/sw_SW/companies.lang
index 578f5cb8920..8235c74ddda 100644
--- a/htdocs/langs/sw_SW/companies.lang
+++ b/htdocs/langs/sw_SW/companies.lang
@@ -54,6 +54,7 @@ Firstname=First name
 PostOrFunction=Job position
 UserTitle=Title
 NatureOfThirdParty=Nature of Third party
+NatureOfContact=Nature of Contact
 Address=Address
 State=State/Province
 StateShort=State
diff --git a/htdocs/langs/sw_SW/contracts.lang b/htdocs/langs/sw_SW/contracts.lang
index 51b73423fb0..47572c355ab 100644
--- a/htdocs/langs/sw_SW/contracts.lang
+++ b/htdocs/langs/sw_SW/contracts.lang
@@ -51,6 +51,7 @@ ListOfClosedServices=List of closed services
 ListOfRunningServices=List of running services
 NotActivatedServices=Inactive services (among validated contracts)
 BoardNotActivatedServices=Services to activate among validated contracts
+BoardNotActivatedServicesShort=Services to activate
 LastContracts=Latest %s contracts
 LastModifiedServices=Latest %s modified services
 ContractStartDate=Start date
@@ -64,7 +65,10 @@ DateStartRealShort=Real start date
 DateEndReal=Real end date
 DateEndRealShort=Real end date
 CloseService=Close service
-BoardRunningServices=Expired running services
+BoardRunningServices=Services running
+BoardRunningServicesShort=Services running
+BoardExpiredServices=Services expired
+BoardExpiredServicesShort=Services expired
 ServiceStatus=Status of service
 DraftContracts=Drafts contracts
 CloseRefusedBecauseOneServiceActive=Contract can't be closed as there is at least one open service on it
diff --git a/htdocs/langs/sw_SW/errors.lang b/htdocs/langs/sw_SW/errors.lang
index 1ee46fdbb92..0c07b2eafc4 100644
--- a/htdocs/langs/sw_SW/errors.lang
+++ b/htdocs/langs/sw_SW/errors.lang
@@ -218,6 +218,7 @@ ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text
 ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Error, delete payment linked to a closed invoice is not possible.
+ErrorSearchCriteriaTooSmall=Search criteria too small.
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 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/main.lang b/htdocs/langs/sw_SW/main.lang
index 1cadc32f4ab..8ac9025f57c 100644
--- a/htdocs/langs/sw_SW/main.lang
+++ b/htdocs/langs/sw_SW/main.lang
@@ -28,6 +28,7 @@ NoTemplateDefined=No template available for this email type
 AvailableVariables=Available substitution variables
 NoTranslation=No translation
 Translation=Translation
+EmptySearchString=Enter a non empty search string
 NoRecordFound=No record found
 NoRecordDeleted=No record deleted
 NotEnoughDataYet=Not enough data
@@ -704,6 +705,7 @@ DateOfSignature=Date of signature
 HidePassword=Show command with password hidden
 UnHidePassword=Show real command with clear password
 Root=Root
+RootOfMedias=Root of public medias (/medias)
 Informations=Information
 Page=Page
 Notes=Notes
@@ -981,3 +983,10 @@ PaymentInformation=Payment information
 ValidFrom=Valid from
 ValidUntil=Valid until
 NoRecordedUsers=No users
+ToClose=To close
+ToProcess=To process
+ToApprove=To approve
+GlobalOpenedElemView=Global view
+NoArticlesFoundForTheKeyword=No article found for the keyword '<strong>%s</strong>'
+NoArticlesFoundForTheCategory=No article found for the category
+ToAcceptRefuse=To accept | refuse
diff --git a/htdocs/langs/sw_SW/members.lang b/htdocs/langs/sw_SW/members.lang
index 9993e05428f..5886c598d52 100644
--- a/htdocs/langs/sw_SW/members.lang
+++ b/htdocs/langs/sw_SW/members.lang
@@ -29,6 +29,7 @@ MenuMembersUpToDate=Up to date members
 MenuMembersNotUpToDate=Out of date members
 MenuMembersResiliated=Terminated members
 MembersWithSubscriptionToReceive=Members with subscription to receive
+MembersWithSubscriptionToReceiveShort=Subscription to receive
 DateSubscription=Subscription date
 DateEndSubscription=Subscription end date
 EndSubscription=End subscription
diff --git a/htdocs/langs/sw_SW/projects.lang b/htdocs/langs/sw_SW/projects.lang
index 76bd0ce597d..d144fccd272 100644
--- a/htdocs/langs/sw_SW/projects.lang
+++ b/htdocs/langs/sw_SW/projects.lang
@@ -76,7 +76,13 @@ MyProjects=My projects
 MyProjectsArea=My projects Area
 DurationEffective=Effective duration
 ProgressDeclared=Declared progress
+TaskProgressSummary=Task progress
+CurentlyOpenedTasks=Curently opened tasks
+TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared progress is less %s than the calculated progression
+TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared progress is more %s than the calculated progression
 ProgressCalculated=Calculated progress
+WhichIamLinkedTo=which I'm linked to
+WhichIamLinkedToProject=which I'm linked to project
 Time=Time
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
diff --git a/htdocs/langs/th_TH/admin.lang b/htdocs/langs/th_TH/admin.lang
index 173ac63b62d..c2eae4759dc 100644
--- a/htdocs/langs/th_TH/admin.lang
+++ b/htdocs/langs/th_TH/admin.lang
@@ -400,6 +400,7 @@ OldVATRates=อัตราภาษีมูลค่าเพิ่มเก
 NewVATRates=ใหม่อัตราภาษีมูลค่าเพิ่ม
 PriceBaseTypeToChange=การปรับเปลี่ยนราคาค่าอ้างอิงกับฐานที่กำหนดไว้ใน
 MassConvert=Launch bulk conversion
+PriceFormatInCurrentLanguage=Price Format In Current Language
 String=เชือก
 TextLong=ข้อความยาว
 HtmlText=Html text
@@ -431,7 +432,7 @@ ExtrafieldParamHelpradio=List of values must be lines with format key,value (whe
 ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- idfilter is necessarly a primary int key<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=List of values 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>Examples:<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
-ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default)<br>Set this to 2 for a collapsing separator (collapsed by default)
+ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Library used for PDF generation
 LocalTaxDesc=Some countries may apply two or three taxes on each invoice line. If this is the case, choose the type for the 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)
 SMS=SMS
@@ -1695,7 +1696,7 @@ SuppliersInvoiceNumberingModel=Vendor invoices numbering models
 IfSetToYesDontForgetPermission=หากการตั้งค่าใช่ไม่ลืมที่จะให้สิทธิ์กับกลุ่มหรือผู้ใช้ที่ได้รับอนุญาตให้ได้รับการอนุมัติที่สอง
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=GeoIP Maxmind การติดตั้งโมดูล
-PathToGeoIPMaxmindCountryDataFile=เส้นทางไปยังแฟ้มที่มีไอพี Maxmind กับการแปลประเทศ <br> ตัวอย่าง: <br> /usr/local/share/GeoIP/GeoIP.dat <br> /usr/share/GeoIP/GeoIP.dat
+PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoLite2-Country.mmdb
 NoteOnPathLocation=โปรดทราบว่าทรัพย์สินทางปัญญาไปยังแฟ้มข้อมูลประเทศของคุณจะต้องอยู่ภายในไดเรกทอรี PHP คุณสามารถอ่าน (ตรวจสอบการติดตั้ง PHP open_basedir ของคุณและสิทธิ์ระบบแฟ้ม)
 YouCanDownloadFreeDatFileTo=<b>คุณสามารถดาวน์โหลดรุ่นสาธิตฟรีของแฟ้ม</b> Maxmind GeoIP ประเทศที่% s
 YouCanDownloadAdvancedDatFileTo=<b>นอกจากนี้คุณยังสามารถดาวน์โหลดรุ่นที่สมบูรณ์มากขึ้นมีการปรับปรุงของ</b> Maxmind GeoIP ประเทศที่ไฟล์% s
@@ -1926,14 +1927,13 @@ SmallerThan=Smaller than
 LargerThan=Larger than
 IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID is found into incoming email, the event will be automatically linked to the related objects.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
-IFTTTSetup=IFTTT module setup
-IFTTT_SERVICE_KEY=IFTTT Service key
-IFTTT_DOLIBARR_ENDPOINT_SECUREKEY=Security key to secure the endpoint URL used by IFTTT to send messages to your Dolibarr.
-IFTTTDesc=This module is designed to trigger events on IFTTT and/or to execute some action on external IFTTT triggers.
-UrlForIFTTT=URL endpoint for IFTTT
-YouWillFindItOnYourIFTTTAccount=You will find it on your IFTTT account
 EndPointFor=End point for %s : %s
 DeleteEmailCollector=Delete email collector
 ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
 RecipientEmailsWillBeReplacedWithThisValue=Recipient emails will be always replaced with this value
 AtLeastOneDefaultBankAccountMandatory=At least 1 default bank account must be defined
+RESTRICT_API_ON_IP=Allow available APIs to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can use the available APIs.
+RESTRICT_ON_IP=Allow access to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can access.
+BaseOnSabeDavVersion=Based on the library SabreDAV version
+NotAPublicIp=Not a public IP
+MakeAnonymousPing=Make an anonymous Ping '+1' to the Dolibarr foundation server (done 1 time only after installation) to allow the foundation to count the number of Dolibarr installation.
diff --git a/htdocs/langs/th_TH/banks.lang b/htdocs/langs/th_TH/banks.lang
index 0c53745fb4c..4894a49e623 100644
--- a/htdocs/langs/th_TH/banks.lang
+++ b/htdocs/langs/th_TH/banks.lang
@@ -73,6 +73,7 @@ BankTransaction=Bank entry
 ListTransactions=List entries
 ListTransactionsByCategory=List entries/category
 TransactionsToConciliate=Entries to reconcile
+TransactionsToConciliateShort=To reconcile
 Conciliable=สามารถคืนดี
 Conciliate=คืนดี
 Conciliation=การประนีประนอม
@@ -116,6 +117,7 @@ DeleteCheckReceipt=Delete this check receipt?
 ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
 BankChecks=เช็คธนาคาร
 BankChecksToReceipt=Checks awaiting deposit
+BankChecksToReceiptShort=Checks awaiting deposit
 ShowCheckReceipt=แสดงการตรวจสอบการรับเงินฝาก
 NumberOfCheques=No. of check
 DeleteTransaction=Delete entry
diff --git a/htdocs/langs/th_TH/cashdesk.lang b/htdocs/langs/th_TH/cashdesk.lang
index 5169a6d4e38..09438951ff5 100644
--- a/htdocs/langs/th_TH/cashdesk.lang
+++ b/htdocs/langs/th_TH/cashdesk.lang
@@ -62,6 +62,7 @@ TicketVatGrouped=Group VAT by rate in tickets
 AutoPrintTickets=Automatically print tickets
 EnableBarOrRestaurantFeatures=Enable features for Bar or Restaurant
 ConfirmDeletionOfThisPOSSale=Do your confirm the deletion of this current sale ?
+ConfirmDiscardOfThisPOSSale=Do you want to discard this current sale ?
 History=ประวัติศาสตร์
 ValidateAndClose=Validate and close
 Terminal=Terminal
@@ -69,3 +70,8 @@ NumberOfTerminals=Number of Terminals
 TerminalSelect=Select terminal you want to use:
 POSTicket=POS Ticket
 BasicPhoneLayout=Use basic layout for phones
+SetupOfTerminalNotComplete=Setup of terminal %s is not complete
+DirectPayment=Direct payment
+DirectPaymentButton=Direct cash payment button
+InvoiceIsAlreadyValidated=Invoice is already validated
+NoLinesToBill=No lines to bill
diff --git a/htdocs/langs/th_TH/companies.lang b/htdocs/langs/th_TH/companies.lang
index c51b7af54ee..c01a19562f2 100644
--- a/htdocs/langs/th_TH/companies.lang
+++ b/htdocs/langs/th_TH/companies.lang
@@ -54,6 +54,7 @@ Firstname=ชื่อแรก
 PostOrFunction=Job position
 UserTitle=ชื่อเรื่อง
 NatureOfThirdParty=Nature of Third party
+NatureOfContact=Nature of Contact
 Address=ที่อยู่
 State=รัฐ / จังหวัด
 StateShort=State
diff --git a/htdocs/langs/th_TH/contracts.lang b/htdocs/langs/th_TH/contracts.lang
index f0963980f27..33d5c7f0e4e 100644
--- a/htdocs/langs/th_TH/contracts.lang
+++ b/htdocs/langs/th_TH/contracts.lang
@@ -51,6 +51,7 @@ ListOfClosedServices=รายการของการบริการป
 ListOfRunningServices=รายการของการทำงาน
 NotActivatedServices=บริการไม่ได้ใช้งาน (ในสัญญาการตรวจสอบ)
 BoardNotActivatedServices=บริการเพื่อเปิดใช้งานในกลุ่มการตรวจสอบสัญญา
+BoardNotActivatedServicesShort=Services to activate
 LastContracts=Latest %s contracts
 LastModifiedServices=Latest %s modified services
 ContractStartDate=วันที่เริ่มต้น
@@ -64,7 +65,10 @@ DateStartRealShort=วันที่เริ่มต้นจริง
 DateEndReal=วันที่สิ้นสุดจริง
 DateEndRealShort=วันที่สิ้นสุดจริง
 CloseService=ปิดบริการ
-BoardRunningServices=บริการทำงานหมดอายุ
+BoardRunningServices=Services running
+BoardRunningServicesShort=Services running
+BoardExpiredServices=Services expired
+BoardExpiredServicesShort=Services expired
 ServiceStatus=สถานะของการบริการ
 DraftContracts=ร่างสัญญา
 CloseRefusedBecauseOneServiceActive=Contract can't be closed as there is at least one open service on it
diff --git a/htdocs/langs/th_TH/errors.lang b/htdocs/langs/th_TH/errors.lang
index ff3ae3c3447..1e383ea4bf6 100644
--- a/htdocs/langs/th_TH/errors.lang
+++ b/htdocs/langs/th_TH/errors.lang
@@ -218,6 +218,7 @@ ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text
 ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Error, delete payment linked to a closed invoice is not possible.
+ErrorSearchCriteriaTooSmall=Search criteria too small.
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 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/main.lang b/htdocs/langs/th_TH/main.lang
index 6bdb2dea072..fef7a1dda62 100644
--- a/htdocs/langs/th_TH/main.lang
+++ b/htdocs/langs/th_TH/main.lang
@@ -28,6 +28,7 @@ NoTemplateDefined=No template available for this email type
 AvailableVariables=Available substitution variables
 NoTranslation=แปลไม่มี
 Translation=การแปล
+EmptySearchString=Enter a non empty search string
 NoRecordFound=บันทึกไม่พบ
 NoRecordDeleted=No record deleted
 NotEnoughDataYet=Not enough data
@@ -704,6 +705,7 @@ DateOfSignature=Date of signature
 HidePassword=แสดงคำสั่งที่มีรหัสผ่านที่ซ่อน
 UnHidePassword=แสดงคำสั่งที่แท้จริงด้วยรหัสผ่านที่ชัดเจน
 Root=ราก
+RootOfMedias=Root of public medias (/medias)
 Informations=ข้อมูล
 Page=หน้า
 Notes=หมายเหตุ
@@ -981,3 +983,10 @@ PaymentInformation=Payment information
 ValidFrom=Valid from
 ValidUntil=Valid until
 NoRecordedUsers=No users
+ToClose=To close
+ToProcess=ในการประมวลผล
+ToApprove=To approve
+GlobalOpenedElemView=Global view
+NoArticlesFoundForTheKeyword=No article found for the keyword '<strong>%s</strong>'
+NoArticlesFoundForTheCategory=No article found for the category
+ToAcceptRefuse=To accept | refuse
diff --git a/htdocs/langs/th_TH/members.lang b/htdocs/langs/th_TH/members.lang
index af17c1e554c..c3ceb26c7e0 100644
--- a/htdocs/langs/th_TH/members.lang
+++ b/htdocs/langs/th_TH/members.lang
@@ -29,6 +29,7 @@ MenuMembersUpToDate=ขึ้นอยู่กับสมาชิกในว
 MenuMembersNotUpToDate=ออกจากสมาชิกวัน
 MenuMembersResiliated=Terminated members
 MembersWithSubscriptionToReceive=สมาชิกที่มีการสมัครสมาชิกจะได้รับ
+MembersWithSubscriptionToReceiveShort=Subscription to receive
 DateSubscription=วันที่สมัครสมาชิก
 DateEndSubscription=วันที่สิ้นสุดการสมัครสมาชิก
 EndSubscription=สมัครสมาชิก End
diff --git a/htdocs/langs/th_TH/projects.lang b/htdocs/langs/th_TH/projects.lang
index 29b2b33d0ed..cd2f76622ec 100644
--- a/htdocs/langs/th_TH/projects.lang
+++ b/htdocs/langs/th_TH/projects.lang
@@ -76,7 +76,13 @@ MyProjects=โครงการของฉัน
 MyProjectsArea=My projects Area
 DurationEffective=ระยะเวลาที่มีประสิทธิภาพ
 ProgressDeclared=ความคืบหน้าการประกาศ
+TaskProgressSummary=Task progress
+CurentlyOpenedTasks=Curently opened tasks
+TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared progress is less %s than the calculated progression
+TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared progress is more %s than the calculated progression
 ProgressCalculated=ความคืบหน้าของการคำนวณ
+WhichIamLinkedTo=which I'm linked to
+WhichIamLinkedToProject=which I'm linked to project
 Time=เวลา
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
diff --git a/htdocs/langs/th_TH/website.lang b/htdocs/langs/th_TH/website.lang
index 9b9de86aa07..5b2d48e7aaa 100644
--- a/htdocs/langs/th_TH/website.lang
+++ b/htdocs/langs/th_TH/website.lang
@@ -2,7 +2,7 @@
 Shortname=รหัส
 WebsiteSetupDesc=Create here the websites you wish to use. Then go into menu Websites to edit them.
 DeleteWebsite=Delete website
-ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed.
+ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed. The files uploaded (like into the medias directory, the ECM module, ...) will remain.
 WEBSITE_TYPE_CONTAINER=Type of page/container
 WEBSITE_PAGE_EXAMPLE=Web page to use as example
 WEBSITE_PAGENAME=Page name/alias
@@ -14,6 +14,9 @@ WEBSITE_JS_INLINE=Javascript file content (common to all pages)
 WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages)
 WEBSITE_ROBOT=Robot file (robots.txt)
 WEBSITE_HTACCESS=Website .htaccess file
+WEBSITE_MANIFEST_JSON=Website manifest.json file
+WEBSITE_README=README.md file
+EnterHereLicenseInformation=Enter here meta data or license information to fille a README.md file. if you distribute your website as a template, the file will be included into the temptate package.
 HtmlHeaderPage=HTML header (specific to this page only)
 PageNameAliasHelp=Name or alias of the page.<br>This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "<strong>%s</strong>" to edit this alias.
 EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container.
@@ -41,6 +44,7 @@ RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
 SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then set the name of the virtual host you have created in the properties of web site, so the preview can be done also using this dedicated web server access instead of the internal Dolibarr server.
 YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
 CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
 ReadPerm=อ่าน
 WritePerm=Write
@@ -75,7 +79,8 @@ AddWebsiteAccount=Create web site account
 BackToListOfThirdParty=Back to list for Third Party
 DisableSiteFirst=Disable website first
 MyContainerTitle=My web site title
-AnotherContainer=Another container
+AnotherContainer=This is how to include content of another page/container (you may have an error here if you enable dynamic code because the embedded subcontainer may not exists)
+SorryWebsiteIsCurrentlyOffLine=Sorry, this website is currently off line. Please comme back later...
 WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / third party
 YouMustDefineTheHomePage=You must first define the default Home page
@@ -89,7 +94,8 @@ AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
 CorporateHomePage=Corporate Home page
 EmptyPage=Empty page
 ExternalURLMustStartWithHttp=External URL must start with http:// or https://
-ZipOfWebsitePackageToImport=Zip file of website package
+ZipOfWebsitePackageToImport=Upload the Zip file of the website template package
+ZipOfWebsitePackageToLoad=or Choose an available embedded website template package
 ShowSubcontainers=Include dynamic content
 InternalURLOfPage=Internal URL of page
 ThisPageIsTranslationOf=This page/container is a translation of
@@ -101,5 +107,10 @@ NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynam
 ReplaceWebsiteContent=Search or Replace website content
 DeleteAlsoJs=Delete also all javascript files specific to this website?
 DeleteAlsoMedias=Delete also all medias files specific to this website?
-# Export
 MyWebsitePages=My website pages
+SearchReplaceInto=Search | Replace into
+ReplaceString=New string
+CSSContentTooltipHelp=Enter here CSS content. To avoid any conflict with the CSS of the application, be sure to prepend all declaration with the .bodywebsite class. For example:<br><br>#mycssselector, input.myclass:hover { ... }<br>must be<br>.bodywebsite #mycssselector, .bodywebsite input.myclass:hover { ... }<br><br>Note: If you have a large file without this prefix, you can use 'lessc' to convert it to append the .bodywebsite prefix everywhere.
+LinkAndScriptsHereAreNotLoadedInEditor=Warning: This content is output only when site is accessed from a server. It is not used in Edit mode so if you need to load javascript files also in edit mode, just add your tag 'script src=...' into the page.
+Dynamiccontent=Sample of a page with dynamic content
+ImportSite=Import website template
diff --git a/htdocs/langs/tr_TR/admin.lang b/htdocs/langs/tr_TR/admin.lang
index 7ff3a990796..c86ebe50eb0 100644
--- a/htdocs/langs/tr_TR/admin.lang
+++ b/htdocs/langs/tr_TR/admin.lang
@@ -400,6 +400,7 @@ OldVATRates=Eski KDV oranı
 NewVATRates=Yeni KDV oranı
 PriceBaseTypeToChange=Buna göre tanımlanan temel referans değerli fiyatları değiştir
 MassConvert=Toplu dönüştürmeyi başlat
+PriceFormatInCurrentLanguage=Price Format In Current Language
 String=Dizi
 TextLong=Uzun metin
 HtmlText=HTML metni
@@ -431,7 +432,7 @@ ExtrafieldParamHelpradio=List of values must be lines with format key,value (whe
 ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- idfilter is necessarly a primary int key<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=List of values 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>Examples:<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
-ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default)<br>Set this to 2 for a collapsing separator (collapsed by default)
+ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=PDF oluşturmada kullanılan kütüphane
 LocalTaxDesc=Some countries may apply two or three taxes on each invoice line. If this is the case, choose the type for the 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)
 SMS=SMS
@@ -615,7 +616,7 @@ Module2900Desc=GeoIP Maxmind dönüştürme becerileri
 Module3200Name=Değiştirilemez Arşivler
 Module3200Desc=Değiştirilemeyen bir iş etkinlikleri günlüğü etkinleştirin. Etkinlikler gerçek zamanlı olarak arşivlenir. Günlük, dışa aktarılabilen zincirlenmiş etkinliklerin salt okunur bir tablosudur. Bu modül bazı ülkeler için zorunlu olabilir.
 Module4000Name=IK
-Module4000Desc=Human resources management (management of department, employee contracts and feelings)
+Module4000Desc=İnsan kaynakları yönetimi (departman, çalışan sözleşmeleri ve duygu yönetimi)
 Module5000Name=Çoklu-firma
 Module5000Desc=Birden çok firmayı yönetmenizi sağlar
 Module6000Name=İş akışı
@@ -886,10 +887,10 @@ Permission2515=Belge dizinlerini kur
 Permission2801=Okuma modunda FTP istemcisi kullan (yalnızca tara ve indir)
 Permission2802=Yazma modunda FTP istemcisi kullan (sil ya da dosya yükle)
 Permission3200=Read archived events and fingerprints
-Permission4001=See employees
-Permission4002=Create employees
-Permission4003=Delete employees
-Permission4004=Export employees
+Permission4001=Çalışanları gör
+Permission4002=Çalışan oluştur
+Permission4003=Çalışan sil
+Permission4004=Çalışanları dışa aktar
 Permission10001=Read website content
 Permission10002=Create/modify website content (html and javascript content)
 Permission10003=Create/modify website content (dynamic php code). Dangerous, must be reserved to restricted developers.
@@ -1113,7 +1114,7 @@ AreaForAdminOnly=Kurulum parametreleri sadece <b>yönetici olan kullanıcılar</
 SystemInfoDesc=Sistem bilgileri sadece okuma modunda ve yöneticiler için görüntülenen çeşitli teknik bilgilerdir.
 SystemAreaForAdminOnly=Bu alan yalnızca yönetici kullanıcılar tarafından kullanılabilir. Dolibarr kullanıcı izinleri bu kısıtlamayı değiştiremez.
 CompanyFundationDesc=Şirketin/varlığın bilgilerini düzenleyin. Sayfanın sonunda yer alan "%s" veya "%s" butonuna tıklayın.
-AccountantDesc=If you have an external accountant/bookkeeper, you can edit here its information.
+AccountantDesc=Harici bir muhasebeciniz/saymanınız varsa, onun bilgilerini burada düzenleyebilirsiniz.
 AccountantFileNumber=Muhasebeci kodu
 DisplayDesc=Dolibarr'ın görünümünü ve davranışını etkileyen parametreler buradan özelleştirilebilir.
 AvailableModules=Mevcut uygulamalar/modüller
@@ -1695,7 +1696,7 @@ SuppliersInvoiceNumberingModel=Tedarikçi faturaları numaralandırma modelleri
 IfSetToYesDontForgetPermission=Evet olarak ayarlıysa, ikinci onayı sağlayacak grup ve kullanıcılara izin sağlamayı unutmayın
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=GeoIP MaxMind modülü kurulumu
-PathToGeoIPMaxmindCountryDataFile=Ülke çevirisi için Maxmind ip içeren dosya yolu. <br>Örnekler:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat/GeoIP.dat
+PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoLite2-Country.mmdb
 NoteOnPathLocation=Ülkenizin ip veri dosyasının PHP nizin okuyabileceği bir dizin içinde olmasına dikkat edin (PHP nizin ope_basdir kurulumunu ve filesystem izinlerini denetleyin)
 YouCanDownloadFreeDatFileTo=Maxmind GeoIP ülke dosyasının bir <b> ücretsiz demo sürümünü </ b> %s konumundan indirebilirsiniz.
 YouCanDownloadAdvancedDatFileTo=Ayrıca Maxmind GeoIP ülke dosyasına daha çok dosyayı %s konumundan  indirebilirsiniz, <b>güncellemeleri ile birlikte tam sürümünü,<b>
@@ -1926,14 +1927,13 @@ SmallerThan=Smaller than
 LargerThan=Larger than
 IfTrackingIDFoundEventWillBeLinked=Eğer gelen e-posta içerisinde bir takip numarası bulunuyorsa, etkinliğin otomatik olarak ilgili nesnelere bağlanacağını unutmayınız.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
-IFTTTSetup=IFTTT modül kurulumu
-IFTTT_SERVICE_KEY=IFTTT Hizmet anahtarı
-IFTTT_DOLIBARR_ENDPOINT_SECUREKEY=Security key to secure the endpoint URL used by IFTTT to send messages to your Dolibarr.
-IFTTTDesc=Bu modül IFTTT'deki etkinlikleri tetiklemek ve/veya harici IFTTT tetikleyicilerindeki bazı eylemleri yürütmek için tasarlanmıştır.
-UrlForIFTTT=IFTTT için URL bitiş noktası
-YouWillFindItOnYourIFTTTAccount=Onu IFTTT hesabınızda bulacaksınız
 EndPointFor=%s için bitiş noktası: %s
 DeleteEmailCollector=Delete email collector
 ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
 RecipientEmailsWillBeReplacedWithThisValue=Recipient emails will be always replaced with this value
 AtLeastOneDefaultBankAccountMandatory=At least 1 default bank account must be defined
+RESTRICT_API_ON_IP=Allow available APIs to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can use the available APIs.
+RESTRICT_ON_IP=Allow access to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can access.
+BaseOnSabeDavVersion=Based on the library SabreDAV version
+NotAPublicIp=Not a public IP
+MakeAnonymousPing=Make an anonymous Ping '+1' to the Dolibarr foundation server (done 1 time only after installation) to allow the foundation to count the number of Dolibarr installation.
diff --git a/htdocs/langs/tr_TR/banks.lang b/htdocs/langs/tr_TR/banks.lang
index b2bebf41130..935203c3ef4 100644
--- a/htdocs/langs/tr_TR/banks.lang
+++ b/htdocs/langs/tr_TR/banks.lang
@@ -73,6 +73,7 @@ BankTransaction=Banka kaydı
 ListTransactions=Kayıtları listele
 ListTransactionsByCategory=Kayıtları/Kategorileri listele
 TransactionsToConciliate=Uzlaştırılacak kayıtlar
+TransactionsToConciliateShort=To reconcile
 Conciliable=Uzlaştırılabilir
 Conciliate=Uzlaştır
 Conciliation=Uzlaştırma
@@ -116,6 +117,7 @@ DeleteCheckReceipt=Bu çek makbuzu silinsin mi?
 ConfirmDeleteCheckReceipt=Bu çek makbuzunu silmek istediğinizden emin misiniz?
 BankChecks=Banka çekleri
 BankChecksToReceipt=Ödeme için bekleyen çekler
+BankChecksToReceiptShort=Ödeme için bekleyen çekler
 ShowCheckReceipt=Çek tahsilat makbuzunu göster
 NumberOfCheques=Çek sayısı
 DeleteTransaction=Kaydı sil
diff --git a/htdocs/langs/tr_TR/bills.lang b/htdocs/langs/tr_TR/bills.lang
index 8aa7e20097c..94dd08bf74a 100644
--- a/htdocs/langs/tr_TR/bills.lang
+++ b/htdocs/langs/tr_TR/bills.lang
@@ -94,12 +94,12 @@ PaymentAmount=Ödeme tutarı
 PaymentHigherThanReminderToPay=Ödeme hatırlatmasından daha yüksek ödeme
 HelpPaymentHigherThanReminderToPay=Dikkat: bir veya daha fazla faturanın ödeme tutarı ödenecek kalan miktardan daha yüksek.<br> Girişinizi düzeltin, aksi takdirde onaylayın ve fazla ödeme alınan her fatura için alınan fazlalık tutarında bir alacak dekontu oluşturmayı düşünün.
 HelpPaymentHigherThanReminderToPaySupplier=Dikkat: bir veya daha fazla faturanın ödeme tutarı ödenecek kalan miktardan daha yüksek.<br>Girişinizi düzeltin, aksi takdirde onaylayın ve fazla ödeme yapılan her fatura için ödenen fazlalık tutarında bir alacak dekontu oluşturmayı düşünün.
-ClassifyPaid=Sınıflandırma ‘Ödendi’
-ClassifyUnPaid=Classify 'Unpaid'
-ClassifyPaidPartially=Sınıflandırma ‘Kısmen ödendi’
+ClassifyPaid=‘Ödendi’ olarak sınıflandır
+ClassifyUnPaid=‘Ödenmedi’ olarak sınıflandır
+ClassifyPaidPartially=‘Kısmen Ödendi’ olarak sınıflandır
 ClassifyCanceled=’Terkedildi’ olarak sınıflandır
 ClassifyClosed=‘Kapalı’ olarak sınıflandır
-ClassifyUnBilled=Sınıflandırma 'Faturalanmadı'
+ClassifyUnBilled='Faturalanmadı' olarak sınıflandır
 CreateBill=Fatura oluştur
 CreateCreditNote=İade faturası oluştur
 AddBill=Fatura ya da iade faturası oluştur
@@ -180,7 +180,7 @@ ConfirmValidateBill=<b>%s</b> referanslı bu faturayı doğrulamak istediğiniz
 ConfirmUnvalidateBill=<b>%s</b> faturasını taslak durumuna değiştirmek istediğinizden emin misiniz?
 ConfirmClassifyPaidBill=<b>%s</b> faturasının durumunu ödenmiş olarak değiştirmek istediğinizden emin misiniz?
 ConfirmCancelBill=<b>%s</b> faturasını iptal etmek istediğinizden emin misiniz?
-ConfirmCancelBillQuestion=Neden bu faturayı ‘vazgeçilmiş’ olarak sınıflandırmak istiyorsunuz?
+ConfirmCancelBillQuestion=Neden bu faturayı ‘terkedildi’ olarak sınıflandırmak istiyorsunuz?
 ConfirmClassifyPaidPartially=<b>%s</b> faturasının durumunu ödenmiş olarak değiştirmek istediğinizden emin misiniz?
 ConfirmClassifyPaidPartiallyQuestion=Bu fatura tamamen ödenmedi. Bu faturayı kapatmanın nedeni nedir?
 ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularize the VAT with a credit note.
@@ -262,7 +262,7 @@ DateMaxPayment=Ödeme vadesi
 DateInvoice=Fatura tarihi
 DatePointOfTax=Vergi noktası
 NoInvoice=Fatura yok
-ClassifyBill=Fatura sınıflandır
+ClassifyBill=Faturayı sınıflandır
 SupplierBillsToPay=Ödenmemiş tedarikçi faturaları
 CustomerBillsUnpaid=Ödenmemiş müşteri faturaları
 NonPercuRecuperable=Kurtarılamaz
@@ -496,9 +496,9 @@ CantRemovePaymentWithOneInvoicePaid=En az bir fatura ödenmiş olarak sınıflan
 ExpectedToPay=Beklenen ödeme
 CantRemoveConciliatedPayment=Uzlaştırılan ödeme kaldırılamıyor
 PayedByThisPayment=Bu ödeme ile ödenmiş
-ClosePaidInvoicesAutomatically=Classify "Paid" all standard, down-payment or replacement invoices paid entirely.
+ClosePaidInvoicesAutomatically=Tamamen ödenmiş tüm standart, peşinat veya değiştirme faturalarını "Ödendi" olarak sınıflandır.
 ClosePaidCreditNotesAutomatically=Tamamı ödenmiş iade faturalarını "Ödendi" olarak sınıflandır.
-ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions paid entirely.
+ClosePaidContributionsAutomatically=Tamamı ödenmiş tüm sosyal veya mali bağışları "Ödendi" olarak sınıflandır.
 AllCompletelyPayedInvoiceWillBeClosed=All invoices with no remainder to pay will be automatically closed with status "Paid".
 ToMakePayment=Öde
 ToMakePaymentBack=Geri öde
diff --git a/htdocs/langs/tr_TR/cashdesk.lang b/htdocs/langs/tr_TR/cashdesk.lang
index ab1dc51a7b7..35b73293d85 100644
--- a/htdocs/langs/tr_TR/cashdesk.lang
+++ b/htdocs/langs/tr_TR/cashdesk.lang
@@ -62,6 +62,7 @@ TicketVatGrouped=Group VAT by rate in tickets
 AutoPrintTickets=Destek bildirimlerini otomatik olarak yazdır
 EnableBarOrRestaurantFeatures=Enable features for Bar or Restaurant
 ConfirmDeletionOfThisPOSSale=Do your confirm the deletion of this current sale ?
+ConfirmDiscardOfThisPOSSale=Do you want to discard this current sale ?
 History=Geçmiş
 ValidateAndClose=Doğrula ve kapat
 Terminal=Terminal
@@ -69,3 +70,8 @@ NumberOfTerminals=Number of Terminals
 TerminalSelect=Select terminal you want to use:
 POSTicket=POS Ticket
 BasicPhoneLayout=Use basic layout for phones
+SetupOfTerminalNotComplete=Setup of terminal %s is not complete
+DirectPayment=Direct payment
+DirectPaymentButton=Direct cash payment button
+InvoiceIsAlreadyValidated=Invoice is already validated
+NoLinesToBill=No lines to bill
diff --git a/htdocs/langs/tr_TR/companies.lang b/htdocs/langs/tr_TR/companies.lang
index d86609361ce..1122376b396 100644
--- a/htdocs/langs/tr_TR/companies.lang
+++ b/htdocs/langs/tr_TR/companies.lang
@@ -54,6 +54,7 @@ Firstname=Adı
 PostOrFunction=İş pozisyonu
 UserTitle=Unvan
 NatureOfThirdParty=Üçüncü partinin yapısı
+NatureOfContact=Nature of Contact
 Address=Adresi
 State=Eyaleti/İli
 StateShort=Durum
diff --git a/htdocs/langs/tr_TR/contracts.lang b/htdocs/langs/tr_TR/contracts.lang
index 89a94bed22c..0b779b6e5a7 100644
--- a/htdocs/langs/tr_TR/contracts.lang
+++ b/htdocs/langs/tr_TR/contracts.lang
@@ -51,6 +51,7 @@ ListOfClosedServices=Kapalı hizmetler listesi
 ListOfRunningServices=Yürürlükteki hizmetler listesi
 NotActivatedServices=Etkin olmayan hizmetler (doğrulanmış sözleşmeler arasından)
 BoardNotActivatedServices=Doğrulanmış sözleşmelerden etkinleştirilecek hizmetler
+BoardNotActivatedServicesShort=Services to activate
 LastContracts=Son %s sözleşme
 LastModifiedServices=Değiştirilen son %s hizmet
 ContractStartDate=Başlama tarihi
@@ -65,7 +66,9 @@ DateEndReal=Gerçek bitiş tarihi
 DateEndRealShort=Gerçek bitiş tarihi
 CloseService=Hizmet kapat
 BoardRunningServices=Services running
+BoardRunningServicesShort=Services running
 BoardExpiredServices=Services expired
+BoardExpiredServicesShort=Services expired
 ServiceStatus=Hizmet durumu
 DraftContracts=Taslak sözleşmeler
 CloseRefusedBecauseOneServiceActive=Sözleşme üzerinde en az  bir hizmet bulunduğu için kapatılamıyor
diff --git a/htdocs/langs/tr_TR/ecm.lang b/htdocs/langs/tr_TR/ecm.lang
index 3a2d834581a..84becb607ac 100644
--- a/htdocs/langs/tr_TR/ecm.lang
+++ b/htdocs/langs/tr_TR/ecm.lang
@@ -47,6 +47,6 @@ ECMFileManager=Dosya yöneticisi
 ECMSelectASection=Soldaki ağaçtan bir dizin seçin...
 DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Resync" button first to synchronize disk and database to get content of this directory.
 ReSyncListOfDir=Resync list of directories
-HashOfFileContent=Hash of file content
+HashOfFileContent=Dosya içeriği için Hash
 NoDirectoriesFound=Dizin bulunamadı
 FileNotYetIndexedInDatabase=Dosya henüz veritabanında dizine eklenmedi (tekrar yüklemeyi deneyin)
diff --git a/htdocs/langs/tr_TR/errors.lang b/htdocs/langs/tr_TR/errors.lang
index 9a946adca70..e6955bac05c 100644
--- a/htdocs/langs/tr_TR/errors.lang
+++ b/htdocs/langs/tr_TR/errors.lang
@@ -218,8 +218,9 @@ ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text
 ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Error, delete payment linked to a closed invoice is not possible.
+ErrorSearchCriteriaTooSmall=Search criteria too small.
 # Warnings
-WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
+WarningParamUploadMaxFileSizeHigherThanPostMaxSize=PHP'nizdeki upload_max_filesize (%s) parametresi, post_max_size (%s) PHP parametresinden daha yüksek. Bu tutarlı bir kurulum değil.
 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 e-posta adresi de kullanılabilir.
 WarningMandatorySetupNotComplete=Zorunlu parametreleri ayarlamak için buraya tıklayın
 WarningEnableYourModulesApplications=Click here to enable your modules and applications
diff --git a/htdocs/langs/tr_TR/exports.lang b/htdocs/langs/tr_TR/exports.lang
index 8db0f3d90a3..cf9600f9c14 100644
--- a/htdocs/langs/tr_TR/exports.lang
+++ b/htdocs/langs/tr_TR/exports.lang
@@ -29,11 +29,11 @@ LibraryShort=Kitaplık
 Step=Adım
 FormatedImport=İçe Aktarma Yardımcısı
 FormatedImportDesc1=This module allows you to update existing data or add new objects into the database from a file without technical knowledge, using an assistant.
-FormatedImportDesc2=First step is to choose the kind of data you want to import, then the format of the source file, then the fields you want to import.
+FormatedImportDesc2=İlk adım olarak içe aktarmak istediğiniz veri türünü, daha sonra kaynak dosyanın formatını ve son olarak içe aktarmak istediğiniz alanları seçin.
 FormatedExport=Dışa Aktarma Yardımcısı
 FormatedExportDesc1=Bu araçlar, süreçte teknik bilgi gerek duymadan size yardımcı olmak için bir asistan kullanarak kişiselleştirilmiş verinin dışa aktarımına olanak sağlar.
-FormatedExportDesc2=First step is to choose a predefined dataset, then which fields you want to export, and in which order.
-FormatedExportDesc3=When data to export are selected, you can choose the format of the output file.
+FormatedExportDesc2=İlk adım olarak önceden tanımlanmış bir veri kümesi, daha sonra dışa aktarmak istediğiniz alanları ve hangi sırada dışa aktarılacağını seçin.
+FormatedExportDesc3=Dışa aktarılacak veriler seçildiğinde çıkış dosyasının formatını seçebilirsiniz.
 Sheet=Sayfa
 NoImportableData=İçeaktarılacak veri yok (veri içeaktarmaya izin veren tanımlara sahip bir modül yok)
 FileSuccessfullyBuilt=Dosya oluşturuldu
@@ -50,9 +50,9 @@ LineTotalVAT=Satırın KDV tutarı
 TypeOfLineServiceOrProduct=Satır türü (0 = ürün, 1 = hizmet)
 FileWithDataToImport=İçeaktarılacak verileri içeren dosya
 FileToImport=İçeaktarılacak kaynak dosya
-FileMustHaveOneOfFollowingFormat=File to import must have one of following formats
+FileMustHaveOneOfFollowingFormat=İçe aktarılacak dosya aşağıdaki formatlardan biri olmalıdır
 DownloadEmptyExample=Şablon dosyasını alan içeriği bilgisiyle indir (* olanlar zorunlu alanlardır)
-ChooseFormatOfFileToImport=Choose the file format to use as import file format by clicking on the %s icon to select it...
+ChooseFormatOfFileToImport=Kullanmak istediğiniz içe aktarma dosya biçimini, %s simgesine tıklayarak seçin...
 ChooseFileToImport=Upload file then click on the %s icon to select file as source import file...
 SourceFileFormat=Kaynak dosya biçimi
 FieldsInSourceFile=Kaynak dosyadaki alanlar
@@ -119,7 +119,7 @@ KeepEmptyToGoToEndOfFile=Keep this field empty to process all lines to the end o
 SelectPrimaryColumnsForUpdateAttempt=Select column(s) to use as primary key for an UPDATE import
 UpdateNotYetSupportedForThisImport=Bu tür bir içe aktarma için güncelleme desteklenmiyor (yalnızca ekleme)
 NoUpdateAttempt=Hiçbir güncelleme girişimi gerçekleşmedi, yalnızca ekleme
-ImportDataset_user_1=Kullanıcılar (çalışanlar veya değil) ve mülkler
+ImportDataset_user_1=Kullanıcılar (çalışan veya değil) ve mülkler
 ComputedField=Hesaplanmış alan
 ## filters
 SelectFilterFields=Süzmek istediğiniz değerleri buraya yazın.
diff --git a/htdocs/langs/tr_TR/interventions.lang b/htdocs/langs/tr_TR/interventions.lang
index 0a7ffb30836..e3fff435d06 100644
--- a/htdocs/langs/tr_TR/interventions.lang
+++ b/htdocs/langs/tr_TR/interventions.lang
@@ -24,9 +24,9 @@ NameAndSignatureOfInternalContact=Müdahalenin adı ve imzası:
 NameAndSignatureOfExternalContact=Müşterinin adı ve imzası:
 DocumentModelStandard=Müdahaleler için standart belge modeli
 InterventionCardsAndInterventionLines=Müdahalelere ait müdahaleler ve satırları
-InterventionClassifyBilled=Sınıflandırma "Faturalandı" 
-InterventionClassifyUnBilled=Sınıflandırma "Faturalanmadı"
-InterventionClassifyDone="Bitti" olarak sınıflandır
+InterventionClassifyBilled="Faturalandı" olarak sınıflandır
+InterventionClassifyUnBilled="Faturalanmadı" olarak sınıflandır
+InterventionClassifyDone="Tamamlandı" olarak sınıflandır
 StatusInterInvoiced=Faturalanmış
 SendInterventionRef=%s müdahalesinin sunulması
 SendInterventionByMail=Müdahaleyi e-posta ile gönder
diff --git a/htdocs/langs/tr_TR/main.lang b/htdocs/langs/tr_TR/main.lang
index a4acb9620a3..61c2647bc89 100644
--- a/htdocs/langs/tr_TR/main.lang
+++ b/htdocs/langs/tr_TR/main.lang
@@ -28,6 +28,7 @@ NoTemplateDefined=Bu e-posta türü için mevcut şablon yok
 AvailableVariables=Mevcut yedek değişkenler
 NoTranslation=Çeviri yok
 Translation=Çeviri
+EmptySearchString=Enter a non empty search string
 NoRecordFound=Kayıt bulunamadı
 NoRecordDeleted=Hiç kayıt silinmedi
 NotEnoughDataYet=Yeterli bilgi yok
@@ -323,7 +324,7 @@ GigaBytes=Gigabayt
 TeraBytes=Terabayt
 UserAuthor=User of creation
 UserModif=User of last update
-b=b.
+b=bayt
 Kb=Kb
 Mb=Mb
 Gb=Gb
@@ -445,7 +446,7 @@ ContactsAddressesForCompany=Bu üçüncü partinin kişleri/adresleri
 AddressesForCompany=Bu üçüncü partinin adresleri
 ActionsOnCompany=Bu üçüncü taraf için etkinlikler
 ActionsOnContact=Bu kişi/adres için etkinlikler
-ActionsOnContract=Events for this contract
+ActionsOnContract=Bu sözleşme için etkinlikler
 ActionsOnMember=Bu üye hakkındaki etkinlikler
 ActionsOnProduct=Bu ürünle ilgili etkinlikler
 NActionsLate=%s son
@@ -704,6 +705,7 @@ DateOfSignature=İmza tarihi
 HidePassword=Komutu gizli parola ile göster
 UnHidePassword=Gerçek komutu açık parola ile göster
 Root=Kök
+RootOfMedias=Root of public medias (/medias)
 Informations=Bilgi
 Page=Sayfa
 Notes=Notlar
@@ -833,7 +835,7 @@ ConfirmMassDeletion=Toplu Silme onayı
 ConfirmMassDeletionQuestion=Seçilen %s kaydı silmek istediğinizden emin misiniz?
 RelatedObjects=İlgili Nesneler
 ClassifyBilled=Faturalandı olarak sınıflandır
-ClassifyUnbilled=Faturalandırılmamış olarak sınıflandır
+ClassifyUnbilled=Faturalandırılmadı olarak sınıflandır
 Progress=İlerleme
 ProgressShort=Progr.
 FrontOffice=Ön ofis
@@ -878,7 +880,7 @@ ConfirmSetToDraft=Taslak durumuna geri dönmek istediğinizden emin misiniz?
 ImportId=İçe aktarma ID'si
 Events=Etkinlikler
 EMailTemplates=E-posta Şablonları
-FileNotShared=File not shared to external public
+FileNotShared=Dosya giriş yapmamış kullanıcılarla paylaşılmıyor
 Project=Proje
 Projects=Projeler
 LeadOrProject=Lead | Project
@@ -981,3 +983,10 @@ PaymentInformation=Ödeme bilgileri
 ValidFrom=Şu tarihten itibaren geçerli
 ValidUntil=Şu tarihe kadar geçerli
 NoRecordedUsers=Kullanıcı yok
+ToClose=To close
+ToProcess=İşlenecek
+ToApprove=To approve
+GlobalOpenedElemView=Global view
+NoArticlesFoundForTheKeyword=No article found for the keyword '<strong>%s</strong>'
+NoArticlesFoundForTheCategory=No article found for the category
+ToAcceptRefuse=To accept | refuse
diff --git a/htdocs/langs/tr_TR/members.lang b/htdocs/langs/tr_TR/members.lang
index 9258e778700..4c7b19b490b 100644
--- a/htdocs/langs/tr_TR/members.lang
+++ b/htdocs/langs/tr_TR/members.lang
@@ -29,6 +29,7 @@ MenuMembersUpToDate=Güncel üyeler
 MenuMembersNotUpToDate=Tarihi geçmiş üyeler
 MenuMembersResiliated=Sona ermiş üyeler
 MembersWithSubscriptionToReceive=Abonelik alacal üyeler
+MembersWithSubscriptionToReceiveShort=Subscription to receive
 DateSubscription=Abonelik tarihi
 DateEndSubscription=Abonelik bitiş tarihi
 EndSubscription=Abonelik bitir
diff --git a/htdocs/langs/tr_TR/orders.lang b/htdocs/langs/tr_TR/orders.lang
index eb87dc59bf9..60857a4e4c1 100644
--- a/htdocs/langs/tr_TR/orders.lang
+++ b/htdocs/langs/tr_TR/orders.lang
@@ -95,7 +95,7 @@ ConfirmUnvalidateOrder=<b>%s</b> siparişini taslak durumuna geri yüklemek iste
 ConfirmCancelOrder=Bu siparişi iptal etmek istediğinizden emin misiniz?
 ConfirmMakeOrder=Are you sure you want to confirm you made this order on <b>%s</b>?
 GenerateBill=Fatura oluştur
-ClassifyShipped=Teslim edildi sınıflandır
+ClassifyShipped=Teslim edildi olarak sınıflandır
 DraftOrders=Taslak siparişler
 DraftSuppliersOrders=Taslak tedarikçi siparişleri
 OnProcessOrders=İşlemdeki siparişler
diff --git a/htdocs/langs/tr_TR/other.lang b/htdocs/langs/tr_TR/other.lang
index 913cef5ab06..ecb2d6ad563 100644
--- a/htdocs/langs/tr_TR/other.lang
+++ b/htdocs/langs/tr_TR/other.lang
@@ -234,7 +234,7 @@ ResetPassword=Şifreyi sıfırla
 RequestToResetPasswordReceived=Şifreni değiştirmek için bir talep alındı.
 NewKeyIs=Oturum açmak için yeni anahtarınız
 NewKeyWillBe=Yazılımda oturum açmak için yeni anahtarınız bu olacaktır
-ClickHereToGoTo=%s e gitmek için buraya tıkla
+ClickHereToGoTo=%s bölümüne gitmek için buraya tıklayın
 YouMustClickToChange=Ancak önce bu şifre değiştirmeyi doğrulamak için aşağıdaki linke tıklamanız gerekir
 ForgetIfNothing=Bu değiştirmeyi istemediyseniz, bu e-postayı unutun. Kimlik bilgilerinizi güvenli tutulur.
 IfAmountHigherThan=Eğer tutar <strong>%s</strong> den büyükse
diff --git a/htdocs/langs/tr_TR/products.lang b/htdocs/langs/tr_TR/products.lang
index 65f9f9ac6d2..1f59cb8335d 100644
--- a/htdocs/langs/tr_TR/products.lang
+++ b/htdocs/langs/tr_TR/products.lang
@@ -2,7 +2,7 @@
 ProductRef=Ürün ref.
 ProductLabel=Ürün etiketi
 ProductLabelTranslated=Çevirilmiş ürün etiketi
-ProductDescription=Product description
+ProductDescription=Ürün açıklaması
 ProductDescriptionTranslated=Çevirilmiş ürün tanımı
 ProductNoteTranslated=Çevirilmiş ürün notu
 ProductServiceCard=Ürün/Hizmet kartı
diff --git a/htdocs/langs/tr_TR/projects.lang b/htdocs/langs/tr_TR/projects.lang
index 76bf661efa6..cb554a5d16d 100644
--- a/htdocs/langs/tr_TR/projects.lang
+++ b/htdocs/langs/tr_TR/projects.lang
@@ -76,7 +76,13 @@ MyProjects=Projelerim
 MyProjectsArea=Projelerim Alanı
 DurationEffective=Etken süre
 ProgressDeclared=Bildirilen ilerleme
+TaskProgressSummary=Task progress
+CurentlyOpenedTasks=Curently opened tasks
+TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared progress is less %s than the calculated progression
+TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared progress is more %s than the calculated progression
 ProgressCalculated=Hesaplanan ilerleme
+WhichIamLinkedTo=which I'm linked to
+WhichIamLinkedToProject=which I'm linked to project
 Time=Süre
 ListOfTasks=Görevler listesi
 GoToListOfTimeConsumed=Tüketilen süre listesine git
diff --git a/htdocs/langs/tr_TR/stripe.lang b/htdocs/langs/tr_TR/stripe.lang
index e386539b755..8349769fad3 100644
--- a/htdocs/langs/tr_TR/stripe.lang
+++ b/htdocs/langs/tr_TR/stripe.lang
@@ -65,5 +65,5 @@ StripeUserAccountForActions=User account to use for email notification of some S
 StripePayoutList=List of Stripe payouts
 ToOfferALinkForTestWebhook=Link to setup Stripe WebHook to call the IPN (test mode)
 ToOfferALinkForLiveWebhook=Link to setup Stripe WebHook to call the IPN (live mode)
-PaymentWillBeRecordedForNextPeriod=Payment will be recorded for the next period.
-ClickHereToTryAgain=<a href="%s">Click here to try again...</a>
+PaymentWillBeRecordedForNextPeriod=Ödeme gelecek dönem için kaydedilecektir.
+ClickHereToTryAgain=<a href="%s">Tekrar denemek için burayı tıklayın...</a>
diff --git a/htdocs/langs/tr_TR/ticket.lang b/htdocs/langs/tr_TR/ticket.lang
index 5d03c756d59..debc0503324 100644
--- a/htdocs/langs/tr_TR/ticket.lang
+++ b/htdocs/langs/tr_TR/ticket.lang
@@ -100,21 +100,21 @@ TicketPublicInterfaceTextHomeLabelAdmin=Genel arayüzün karşılama metni
 TicketPublicInterfaceTextHome=Bir destek bildirimi oluşturabilir veya daha önce oluşturulan bir destek bildirimini tanımlayıcı takip numarasından görüntüleyebilirsiniz.
 TicketPublicInterfaceTextHomeHelpAdmin=Burada tanımlanan metin genel arayüzün ana sayfasında görünecektir.
 TicketPublicInterfaceTopicLabelAdmin=Arayüz başlığı
-TicketPublicInterfaceTopicHelp=This text will appear as the title of the public interface.
+TicketPublicInterfaceTopicHelp=Bu metin, ortak arayüzün başlığı olarak görünecektir.
 TicketPublicInterfaceTextHelpMessageLabelAdmin=Mesaj girişine yardım metni
-TicketPublicInterfaceTextHelpMessageHelpAdmin=This text will appear above the message input area of the user.
+TicketPublicInterfaceTextHelpMessageHelpAdmin=Bu metin, kullanıcının mesaj giriş alanının üstünde görünecektir.
 ExtraFieldsTicket=Ekstra nitelikler
 TicketCkEditorEmailNotActivated=HTML editor is not activated. Please put FCKEDITOR_ENABLE_MAIL content to 1 to get it.
-TicketsDisableEmail=Do not send emails for ticket creation or message recording
+TicketsDisableEmail=Bilet oluşturma veya mesaj kaydı için e-posta gönderme
 TicketsDisableEmailHelp=Varsayılan olarak, yeni destek bildirimleri veya mesajlar oluşturulduğunda e-postalar gönderilir. *tüm* e-posta bildirimlerini devre dışı bırakmak için bu seçeneği etkinleştirin.
-TicketsLogEnableEmail=Enable log by email
-TicketsLogEnableEmailHelp=At each change, an email will be sent **to each contact** associated with the ticket.
+TicketsLogEnableEmail=Günlüğü e-postayla etkinleştir
+TicketsLogEnableEmailHelp=Her değişiklikte, destek bildirimi ile bağlantılı **tüm kişilere** bir e-posta gönderilecektir.
 TicketParams=Parametreler
 TicketsShowModuleLogo=Genel arayüzde modülün logosunu görüntüle
-TicketsShowModuleLogoHelp=Enable this option to hide the logo module in the pages of the public interface
+TicketsShowModuleLogoHelp=Genel arayüz sayfalarında logo modülünü gizlemek için bu seçeneği etkinleştirin
 TicketsShowCompanyLogo=Genel arayüzde şirketin logosunu göster 
-TicketsShowCompanyLogoHelp=Enable this option to hide the logo of the main company in the pages of the public interface
-TicketsEmailAlsoSendToMainAddress=Also send notification to main email address
+TicketsShowCompanyLogoHelp=Genel arayüz sayfalarında ana şirketin logosunu gizlemek için bu seçeneği etkinleştirin
+TicketsEmailAlsoSendToMainAddress=Ayrıca ana e-posta adresine de bildirim gönder
 TicketsEmailAlsoSendToMainAddressHelp=Enable this option to send an email to "Notification email from" address (see setup below)
 TicketsLimitViewAssignedOnly=Restrict the display to tickets assigned to the current user (not effective for external users, always be limited to the third party they depend on)
 TicketsLimitViewAssignedOnlyHelp=Only tickets assigned to the current user will be visible. Does not apply to a user with tickets management rights.
@@ -147,7 +147,7 @@ CreateTicket=Destek bildirimi oluştur
 EditTicket=Destek bildirimini düzenle
 TicketsManagement=Destek Bildirim Yönetimi
 CreatedBy=Oluşturan
-NewTicket=Yeni Destek Bildirimi
+NewTicket=Yeni destek bildirimi
 SubjectAnswerToTicket=Destek bildirimi cevabı
 TicketTypeRequest=İstek türü
 TicketCategory=Analitik kod
@@ -162,7 +162,7 @@ TicketAssigned=Destek bildirimi şimdi atandı
 TicketChangeType=Türü değiştir
 TicketChangeCategory=Analitik kodu değiştir
 TicketChangeSeverity=Önem seviyesini değiştir
-TicketAddMessage=Bir mesaj ekle
+TicketAddMessage=Bir mesaj ekleyin
 AddMessage=Bir mesaj ekle
 MessageSuccessfullyAdded=Destek bildirimi eklendi
 TicketMessageSuccessfullyAdded=Mesaj başarılı şekilde eklendi
@@ -189,8 +189,8 @@ ErrorMailRecipientIsEmptyForSendTicketMessage=Alıcı boş. E-posta gönderilmed
 TicketGoIntoContactTab=Onları seçmek için lütfen "Kişiler" sekmesine gidin
 TicketMessageMailIntro=Introduction
 TicketMessageMailIntroHelp=This text is added only at the beginning of the email and will not be saved.
-TicketMessageMailIntroLabelAdmin=Introduction to the message when sending email
-TicketMessageMailIntroText=Hello,<br>A new response was sent on a ticket that you contact. Here is the message:<br>
+TicketMessageMailIntroLabelAdmin=E-posta gönderirken mesaja giriş
+TicketMessageMailIntroText=Merhaba,<br>Bağlantılı olduğunuz bir destek bildirimine yeni bir yanıt gönderildi. Mesajınız şu şekilde:<br>
 TicketMessageMailIntroHelpAdmin=Bu metin bir destek bildirimine cevap metninden önce eklenecektir.
 TicketMessageMailSignature=İmza
 TicketMessageMailSignatureHelp=Bu metin sadece e-postanın sonuna eklenir ve saklanmayacaktır.
@@ -238,22 +238,22 @@ TicketLogReopen=Destek bildirimi %s yeniden açıldı
 #
 TicketSystem=Destek bildirimi sistemi
 ShowListTicketWithTrackId=Takip numarasından destek bildirim listesini görüntüle
-ShowTicketWithTrackId=Takip numarasından destek bildirim listesini görüntüle
+ShowTicketWithTrackId=Takip numarasından destek bildirimi görüntüle
 TicketPublicDesc=Bir destek bildirimi oluşturabilir veya daha önce oluşturulmuş olanı kontrol edebilirsiniz.
 YourTicketSuccessfullySaved=Destek bildirimi başarıyla kaydedildi!
 MesgInfosPublicTicketCreatedWithTrackId=%s kimlik numaralı yeni bir destek bildirimi oluşturuldu.
 PleaseRememberThisId=Daha sonra sorma ihtimalimize karşı lütfen takip numarasını saklayın.
 TicketNewEmailSubject=Destek bildirimi oluşturma onayı
-TicketNewEmailSubjectCustomer=Yeni destek bildirimini
+TicketNewEmailSubjectCustomer=Yeni destek bildirimi
 TicketNewEmailBody=Yeni bir destek bildirim kaydınızı onaylamak için bu e-posta otomatik olarak gönderilmiştir.
-TicketNewEmailBodyCustomer=This is an automatic email to confirm a new ticket has just been created into your account.
+TicketNewEmailBodyCustomer=Bu, hesabınızda yeni bir destek bildiriminin oluşturulduğunu onaylamak için otomatik olarak gönderilen bir e-postadır.
 TicketNewEmailBodyInfosTicket=Destek bildiriminin izlenmesi için bilgiler
 TicketNewEmailBodyInfosTrackId=Destek bildirim takip numarası: %s
 TicketNewEmailBodyInfosTrackUrl=You can view the progress of the ticket by clicking the link above.
 TicketNewEmailBodyInfosTrackUrlCustomer=Aşağıdaki bağlantıya tıklayarak destek bildiriminin ilerlemesini belirli bir arayüzde görebilirsiniz
-TicketEmailPleaseDoNotReplyToThisEmail=Please do not reply directly to this email! Use the link to reply into the interface.
+TicketEmailPleaseDoNotReplyToThisEmail=Lütfen doğrudan bu e-postayı yanıtlamayın! Arayüzde cevap vermek için bağlantıyı kullanın.
 TicketPublicInfoCreateTicket=Bu form yönetim sistemimizde bir destek bildirimi kaydetmenizi sağlar
-TicketPublicPleaseBeAccuratelyDescribe=Please accurately describe the problem. Provide the most information possible to allow us to correctly identify your request.
+TicketPublicPleaseBeAccuratelyDescribe=Lütfen sorunu açıklayıcı bir şekilde tanımlayın. Talebinizi tam olarak saptayabilmemiz için mümkün oldukça tüm bilgiyi girin.
 TicketPublicMsgViewLogIn=Lütfen destek bildirimi takip numarasını girin
 TicketTrackId=Genel Takip Numarası
 OneOfTicketTrackId=Takip numaralarınızdan biri
@@ -261,7 +261,7 @@ ErrorTicketNotFound=%s takip numaralı destek bildirimi bulunamadı!
 Subject=Konu
 ViewTicket=Destek bildirimini görüntüle
 ViewMyTicketList=Destek bildirimi listemi görüntüle
-ErrorEmailMustExistToCreateTicket=Error: email address not found in our database
+ErrorEmailMustExistToCreateTicket=Hata: e-posta adresi veritabanımızda bulunamadı
 TicketNewEmailSubjectAdmin=Yeni destek bildirimi oluşturuldu
 TicketNewEmailBodyAdmin=<p>Destek bildirimi #%s kimlik numarası ile oluşturuldu, detaylı bilgi:</p>
 SeeThisTicketIntomanagementInterface=Yönetim arayüzünde destek bildirimini gör
diff --git a/htdocs/langs/tr_TR/trips.lang b/htdocs/langs/tr_TR/trips.lang
index dfb2ee21b93..05b9e594597 100644
--- a/htdocs/langs/tr_TR/trips.lang
+++ b/htdocs/langs/tr_TR/trips.lang
@@ -19,7 +19,7 @@ ConfirmDeleteTrip=Bu gider raporunu silmek istediğinizden emin misiniz?
 ListTripsAndExpenses=Giderler raporları listesi
 ListToApprove=Onay bekliyor
 ExpensesArea=Gider raporları alanı
-ClassifyRefunded=Sınıflandırma 'İade edildi'
+ClassifyRefunded='İade Edildi' olarak sınıflandır
 ExpenseReportWaitingForApproval=Onay için yeni bir gider raporu sunulmuştur
 ExpenseReportWaitingForApprovalMessage=Bir gider raporu gönderildi ve onay bekleniyor. <br> - Kullanıcı: %s<br> - Dönem: %s<br>Doğrulamak için buraya tıklayın:%s
 ExpenseReportWaitingForReApproval=Yeniden onay için bir gider raporu gönderildi
diff --git a/htdocs/langs/tr_TR/website.lang b/htdocs/langs/tr_TR/website.lang
index 9914ef2475d..119662887ce 100644
--- a/htdocs/langs/tr_TR/website.lang
+++ b/htdocs/langs/tr_TR/website.lang
@@ -2,7 +2,7 @@
 Shortname=Kod
 WebsiteSetupDesc=Kullanmak istediğiniz web sitelerini burada oluşturun. Daha sonra bunları düzenlemek için "Web siteleri" menüsüne gidin.
 DeleteWebsite=Websitesi sil
-ConfirmDeleteWebsite=Bu web sitesini silmek istediğinizden emin misiniz? Tüm sayfalar ve içerik de kaldırılacak.
+ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed. The files uploaded (like into the medias directory, the ECM module, ...) will remain.
 WEBSITE_TYPE_CONTAINER=Sayfa/kapsayıcı türü
 WEBSITE_PAGE_EXAMPLE=Örnek olarak kullanılacak web sayfası
 WEBSITE_PAGENAME=Sayfa adı/rumuz
@@ -14,6 +14,9 @@ WEBSITE_JS_INLINE=Javascript dosya içeriği (tüm sayfalarda ortak)
 WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages)
 WEBSITE_ROBOT=Robot dosyası (robots.txt)
 WEBSITE_HTACCESS=Web sitesinin .htaccess dosyası
+WEBSITE_MANIFEST_JSON=Website manifest.json file
+WEBSITE_README=README.md file
+EnterHereLicenseInformation=Enter here meta data or license information to fille a README.md file. if you distribute your website as a template, the file will be included into the temptate package.
 HtmlHeaderPage=HTML başlığı (yalnızca bu sayfaya özgü)
 PageNameAliasHelp=Sayfanın adı veya takma adı.<br>Bu takma ad, web sitesi bir web sunucusunun (Apacke, Nginx gibi ...) Sanal host'undan çalıştırıldığında bir SEO URL'si oluşturmak için de kullanılır. Bu takma adı düzenlemek için "<strong>%s</strong>" düşmesini kullanın.
 EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container.
@@ -41,6 +44,7 @@ RealURL=Gerçek URL
 ViewWebsiteInProduction=Web sitesini giriş URL si kullanarak izle
 SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then set the name of the virtual host you have created in the properties of web site, so the preview can be done also using this dedicated web server access instead of the internal Dolibarr server.
 YouCanAlsoTestWithPHPS=<u>PHP gömülü sunucu ile kullanın</u><br>Geliştirme ortamında, siteyi PHP gömülü web sunucusu ile test etmeyi tercih edebilirsiniz (PHP 5.5 gerekli)<br><strong>php -S 0.0.0.0:8080 -t%s</strong>
+YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
 CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
 ReadPerm=Okundu
 WritePerm=Yaz
@@ -75,7 +79,8 @@ AddWebsiteAccount=Web sitesi hesabı oluştur
 BackToListOfThirdParty=Üçüncü Parti listesine geri dön
 DisableSiteFirst=Önce web sitesini devre dışı bırak
 MyContainerTitle=Web sitemin başlığı
-AnotherContainer=Diğer kapsayıcı
+AnotherContainer=This is how to include content of another page/container (you may have an error here if you enable dynamic code because the embedded subcontainer may not exists)
+SorryWebsiteIsCurrentlyOffLine=Sorry, this website is currently off line. Please comme back later...
 WEBSITE_USE_WEBSITE_ACCOUNTS=Web sitesi hesap tablosunu etkinleştir
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / third party
 YouMustDefineTheHomePage=Öncelikle varsayılan Giriş sayfasını tanımlamanız gerekir
@@ -89,7 +94,8 @@ AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
 CorporateHomePage=Kurumsal Giriş sayfası
 EmptyPage=Boş sayfa
 ExternalURLMustStartWithHttp=Harici URL http:// veya https:// ile başlamalıdır
-ZipOfWebsitePackageToImport=Web sitesi paketinin zip dosyası
+ZipOfWebsitePackageToImport=Upload the Zip file of the website template package
+ZipOfWebsitePackageToLoad=or Choose an available embedded website template package
 ShowSubcontainers=Dinamik içeriği dahil et
 InternalURLOfPage=Sayfanın iç URL'si
 ThisPageIsTranslationOf=This page/container is a translation of
@@ -101,5 +107,10 @@ NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynam
 ReplaceWebsiteContent=Search or Replace website content
 DeleteAlsoJs=Bu web sitesine özgü tüm javascript dosyaları da silinsin mi?
 DeleteAlsoMedias=Bu web sitesine özgü tüm medya dosyaları da silinsin mi?
-# Export
 MyWebsitePages=My website pages
+SearchReplaceInto=Search | Replace into
+ReplaceString=New string
+CSSContentTooltipHelp=Enter here CSS content. To avoid any conflict with the CSS of the application, be sure to prepend all declaration with the .bodywebsite class. For example:<br><br>#mycssselector, input.myclass:hover { ... }<br>must be<br>.bodywebsite #mycssselector, .bodywebsite input.myclass:hover { ... }<br><br>Note: If you have a large file without this prefix, you can use 'lessc' to convert it to append the .bodywebsite prefix everywhere.
+LinkAndScriptsHereAreNotLoadedInEditor=Warning: This content is output only when site is accessed from a server. It is not used in Edit mode so if you need to load javascript files also in edit mode, just add your tag 'script src=...' into the page.
+Dynamiccontent=Sample of a page with dynamic content
+ImportSite=Web sitesi şablonunu içe aktar
diff --git a/htdocs/langs/tr_TR/withdrawals.lang b/htdocs/langs/tr_TR/withdrawals.lang
index 68e1b28efe9..b03b62b92c0 100644
--- a/htdocs/langs/tr_TR/withdrawals.lang
+++ b/htdocs/langs/tr_TR/withdrawals.lang
@@ -74,10 +74,10 @@ IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one
 DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Direct Debit orders to manage the direct debit payment order. When payment order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
 WithdrawalFile=Para çekme dosyası
 SetToStatusSent="Dosya Gönderildi" durumuna ayarla
-ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and will classify them as "Paid" if remain to pay is null
+ThisWillAlsoAddPaymentOnInvoice=Bu ayrıca, faturalara yapılan ödemeleri kaydeder ve ilgili faturalar için tüm ödeme yapılmışsa onları "Ödendi" olarak sınıflandırır
 StatisticsByLineStatus=Durum satırlarına göre istatistkler
 RUM=Unique Mandate Reference (UMR)
-DateRUM=Mandate signature date
+DateRUM=Zorunlu imza tarihi
 RUMLong=Unique Mandate Reference
 RUMWillBeGenerated=If empty, a UMR (Unique Mandate Reference) will be generated once the bank account information is saved.
 WithdrawMode=Otomatik ödeme modu (FRST veya RECUR)
diff --git a/htdocs/langs/tr_TR/workflow.lang b/htdocs/langs/tr_TR/workflow.lang
index a4fb778786f..f43c46f51df 100644
--- a/htdocs/langs/tr_TR/workflow.lang
+++ b/htdocs/langs/tr_TR/workflow.lang
@@ -12,7 +12,7 @@ descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal as bil
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Müşteri faturası doğrulandığında (ve faturanın tutarı imzalanmış olan bağlantılı teklifin toplam tutarı ile aynı ise) bağlantılı kaynak teklifi "faturalandı" olarak sınıflandır
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked order)
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when customer invoice is set to paid (and if the amount of the invoice is the same as the total amount of the linked order)
-descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source sales order as shipped when a shipment is validated (and if the quantity shipped by all shipments is the same as in the order to update)
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Bir sevkiyat doğrulandığında (ve tüm sevkiyatlardan sonra sevk edilen miktar siparişteki miktar ile aynı ise) bağlantılı kaynak müşteri siparişini "sevk edildi" olarak sınıflandır
 # Autoclassify purchase order
 descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Tedarikçi faturası doğrulandığında (ve faturanın tutarı bağlantılı teklifin toplam tutarı ile aynı ise) bağlantılı kaynak tedarikçi teklifini "faturalandı" olarak sınıflandır
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Tedarikçi faturası doğrulandığında (ve faturanın tutarı bağlantılı siparişin toplam tutarı ile aynı ise) bağlantılı kaynak tedarikçi siparişini "faturalandı" olarak sınıflandır
diff --git a/htdocs/langs/uk_UA/admin.lang b/htdocs/langs/uk_UA/admin.lang
index 620e9f7db8c..53743575ab4 100644
--- a/htdocs/langs/uk_UA/admin.lang
+++ b/htdocs/langs/uk_UA/admin.lang
@@ -400,6 +400,7 @@ OldVATRates=Old VAT rate
 NewVATRates=New VAT rate
 PriceBaseTypeToChange=Modify on prices with base reference value defined on
 MassConvert=Launch bulk conversion
+PriceFormatInCurrentLanguage=Price Format In Current Language
 String=String
 TextLong=Long text
 HtmlText=Html text
@@ -431,7 +432,7 @@ ExtrafieldParamHelpradio=List of values must be lines with format key,value (whe
 ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- idfilter is necessarly a primary int key<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=List of values 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>Examples:<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
-ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default)<br>Set this to 2 for a collapsing separator (collapsed by default)
+ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Library used for PDF generation
 LocalTaxDesc=Some countries may apply two or three taxes on each invoice line. If this is the case, choose the type for the 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)
 SMS=SMS
@@ -1695,7 +1696,7 @@ SuppliersInvoiceNumberingModel=Vendor invoices numbering models
 IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=GeoIP Maxmind module setup
-PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat
+PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoLite2-Country.mmdb
 NoteOnPathLocation=Note that your ip to country data file must be inside a directory your PHP can read (Check your PHP open_basedir setup and filesystem permissions).
 YouCanDownloadFreeDatFileTo=You can download a <b>free demo version</b> of the Maxmind GeoIP country file at %s.
 YouCanDownloadAdvancedDatFileTo=You can also download a more <b>complete version, with updates,</b> of the Maxmind GeoIP country file at %s.
@@ -1926,14 +1927,13 @@ SmallerThan=Smaller than
 LargerThan=Larger than
 IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID is found into incoming email, the event will be automatically linked to the related objects.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
-IFTTTSetup=IFTTT module setup
-IFTTT_SERVICE_KEY=IFTTT Service key
-IFTTT_DOLIBARR_ENDPOINT_SECUREKEY=Security key to secure the endpoint URL used by IFTTT to send messages to your Dolibarr.
-IFTTTDesc=This module is designed to trigger events on IFTTT and/or to execute some action on external IFTTT triggers.
-UrlForIFTTT=URL endpoint for IFTTT
-YouWillFindItOnYourIFTTTAccount=You will find it on your IFTTT account
 EndPointFor=End point for %s : %s
 DeleteEmailCollector=Delete email collector
 ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
 RecipientEmailsWillBeReplacedWithThisValue=Recipient emails will be always replaced with this value
 AtLeastOneDefaultBankAccountMandatory=At least 1 default bank account must be defined
+RESTRICT_API_ON_IP=Allow available APIs to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can use the available APIs.
+RESTRICT_ON_IP=Allow access to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can access.
+BaseOnSabeDavVersion=Based on the library SabreDAV version
+NotAPublicIp=Not a public IP
+MakeAnonymousPing=Make an anonymous Ping '+1' to the Dolibarr foundation server (done 1 time only after installation) to allow the foundation to count the number of Dolibarr installation.
diff --git a/htdocs/langs/uk_UA/banks.lang b/htdocs/langs/uk_UA/banks.lang
index 092f572878d..2bbcbd57a85 100644
--- a/htdocs/langs/uk_UA/banks.lang
+++ b/htdocs/langs/uk_UA/banks.lang
@@ -73,6 +73,7 @@ BankTransaction=Bank entry
 ListTransactions=List entries
 ListTransactionsByCategory=List entries/category
 TransactionsToConciliate=Entries to reconcile
+TransactionsToConciliateShort=To reconcile
 Conciliable=Can be reconciled
 Conciliate=Reconcile
 Conciliation=Reconciliation
@@ -116,6 +117,7 @@ DeleteCheckReceipt=Delete this check receipt?
 ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
 BankChecks=Bank checks
 BankChecksToReceipt=Checks awaiting deposit
+BankChecksToReceiptShort=Checks awaiting deposit
 ShowCheckReceipt=Show check deposit receipt
 NumberOfCheques=No. of check
 DeleteTransaction=Delete entry
diff --git a/htdocs/langs/uk_UA/cashdesk.lang b/htdocs/langs/uk_UA/cashdesk.lang
index cde699f6e39..8f9f63899c7 100644
--- a/htdocs/langs/uk_UA/cashdesk.lang
+++ b/htdocs/langs/uk_UA/cashdesk.lang
@@ -62,6 +62,7 @@ TicketVatGrouped=Group VAT by rate in tickets
 AutoPrintTickets=Automatically print tickets
 EnableBarOrRestaurantFeatures=Enable features for Bar or Restaurant
 ConfirmDeletionOfThisPOSSale=Do your confirm the deletion of this current sale ?
+ConfirmDiscardOfThisPOSSale=Do you want to discard this current sale ?
 History=History
 ValidateAndClose=Validate and close
 Terminal=Terminal
@@ -69,3 +70,8 @@ NumberOfTerminals=Number of Terminals
 TerminalSelect=Select terminal you want to use:
 POSTicket=POS Ticket
 BasicPhoneLayout=Use basic layout for phones
+SetupOfTerminalNotComplete=Setup of terminal %s is not complete
+DirectPayment=Direct payment
+DirectPaymentButton=Direct cash payment button
+InvoiceIsAlreadyValidated=Invoice is already validated
+NoLinesToBill=No lines to bill
diff --git a/htdocs/langs/uk_UA/companies.lang b/htdocs/langs/uk_UA/companies.lang
index 96ef561910b..2bede973d0a 100644
--- a/htdocs/langs/uk_UA/companies.lang
+++ b/htdocs/langs/uk_UA/companies.lang
@@ -54,6 +54,7 @@ Firstname=First name
 PostOrFunction=Job position
 UserTitle=Title
 NatureOfThirdParty=Nature of Third party
+NatureOfContact=Nature of Contact
 Address=Address
 State=State/Province
 StateShort=State
diff --git a/htdocs/langs/uk_UA/contracts.lang b/htdocs/langs/uk_UA/contracts.lang
index 35a89f3fd88..3e7567dce5e 100644
--- a/htdocs/langs/uk_UA/contracts.lang
+++ b/htdocs/langs/uk_UA/contracts.lang
@@ -51,6 +51,7 @@ ListOfClosedServices=List of closed services
 ListOfRunningServices=List of running services
 NotActivatedServices=Inactive services (among validated contracts)
 BoardNotActivatedServices=Services to activate among validated contracts
+BoardNotActivatedServicesShort=Services to activate
 LastContracts=Latest %s contracts
 LastModifiedServices=Latest %s modified services
 ContractStartDate=Start date
@@ -64,7 +65,10 @@ DateStartRealShort=Real start date
 DateEndReal=Real end date
 DateEndRealShort=Real end date
 CloseService=Close service
-BoardRunningServices=Expired running services
+BoardRunningServices=Services running
+BoardRunningServicesShort=Services running
+BoardExpiredServices=Services expired
+BoardExpiredServicesShort=Services expired
 ServiceStatus=Status of service
 DraftContracts=Drafts contracts
 CloseRefusedBecauseOneServiceActive=Contract can't be closed as there is at least one open service on it
diff --git a/htdocs/langs/uk_UA/errors.lang b/htdocs/langs/uk_UA/errors.lang
index 1ee46fdbb92..0c07b2eafc4 100644
--- a/htdocs/langs/uk_UA/errors.lang
+++ b/htdocs/langs/uk_UA/errors.lang
@@ -218,6 +218,7 @@ ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text
 ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Error, delete payment linked to a closed invoice is not possible.
+ErrorSearchCriteriaTooSmall=Search criteria too small.
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 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/main.lang b/htdocs/langs/uk_UA/main.lang
index a0ffc3aa9c2..dad77cde39f 100644
--- a/htdocs/langs/uk_UA/main.lang
+++ b/htdocs/langs/uk_UA/main.lang
@@ -28,6 +28,7 @@ NoTemplateDefined=No template available for this email type
 AvailableVariables=Available substitution variables
 NoTranslation=Немає перекладу
 Translation=Translation
+EmptySearchString=Enter a non empty search string
 NoRecordFound=Записів не знайдено
 NoRecordDeleted=No record deleted
 NotEnoughDataYet=Not enough data
@@ -704,6 +705,7 @@ DateOfSignature=Date of signature
 HidePassword=Show command with password hidden
 UnHidePassword=Show real command with clear password
 Root=Root
+RootOfMedias=Root of public medias (/medias)
 Informations=Information
 Page=Page
 Notes=Notes
@@ -981,3 +983,10 @@ PaymentInformation=Payment information
 ValidFrom=Valid from
 ValidUntil=Valid until
 NoRecordedUsers=No users
+ToClose=To close
+ToProcess=To process
+ToApprove=To approve
+GlobalOpenedElemView=Global view
+NoArticlesFoundForTheKeyword=No article found for the keyword '<strong>%s</strong>'
+NoArticlesFoundForTheCategory=No article found for the category
+ToAcceptRefuse=To accept | refuse
diff --git a/htdocs/langs/uk_UA/members.lang b/htdocs/langs/uk_UA/members.lang
index 41ac4f38c21..65411506d6c 100644
--- a/htdocs/langs/uk_UA/members.lang
+++ b/htdocs/langs/uk_UA/members.lang
@@ -29,6 +29,7 @@ MenuMembersUpToDate=Up to date members
 MenuMembersNotUpToDate=Out of date members
 MenuMembersResiliated=Terminated members
 MembersWithSubscriptionToReceive=Members with subscription to receive
+MembersWithSubscriptionToReceiveShort=Subscription to receive
 DateSubscription=Subscription date
 DateEndSubscription=Subscription end date
 EndSubscription=End subscription
diff --git a/htdocs/langs/uk_UA/projects.lang b/htdocs/langs/uk_UA/projects.lang
index a4a4ae04de2..939e9443adb 100644
--- a/htdocs/langs/uk_UA/projects.lang
+++ b/htdocs/langs/uk_UA/projects.lang
@@ -76,7 +76,13 @@ MyProjects=My projects
 MyProjectsArea=My projects Area
 DurationEffective=Effective duration
 ProgressDeclared=Declared progress
+TaskProgressSummary=Task progress
+CurentlyOpenedTasks=Curently opened tasks
+TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared progress is less %s than the calculated progression
+TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared progress is more %s than the calculated progression
 ProgressCalculated=Calculated progress
+WhichIamLinkedTo=which I'm linked to
+WhichIamLinkedToProject=which I'm linked to project
 Time=Time
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
diff --git a/htdocs/langs/uk_UA/website.lang b/htdocs/langs/uk_UA/website.lang
index 55d7800c55c..0eacac7bc5b 100644
--- a/htdocs/langs/uk_UA/website.lang
+++ b/htdocs/langs/uk_UA/website.lang
@@ -2,7 +2,7 @@
 Shortname=Code
 WebsiteSetupDesc=Create here the websites you wish to use. Then go into menu Websites to edit them.
 DeleteWebsite=Delete website
-ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed.
+ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed. The files uploaded (like into the medias directory, the ECM module, ...) will remain.
 WEBSITE_TYPE_CONTAINER=Type of page/container
 WEBSITE_PAGE_EXAMPLE=Web page to use as example
 WEBSITE_PAGENAME=Page name/alias
@@ -14,6 +14,9 @@ WEBSITE_JS_INLINE=Javascript file content (common to all pages)
 WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages)
 WEBSITE_ROBOT=Robot file (robots.txt)
 WEBSITE_HTACCESS=Website .htaccess file
+WEBSITE_MANIFEST_JSON=Website manifest.json file
+WEBSITE_README=README.md file
+EnterHereLicenseInformation=Enter here meta data or license information to fille a README.md file. if you distribute your website as a template, the file will be included into the temptate package.
 HtmlHeaderPage=HTML header (specific to this page only)
 PageNameAliasHelp=Name or alias of the page.<br>This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "<strong>%s</strong>" to edit this alias.
 EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container.
@@ -41,6 +44,7 @@ RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
 SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then set the name of the virtual host you have created in the properties of web site, so the preview can be done also using this dedicated web server access instead of the internal Dolibarr server.
 YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
 CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
 ReadPerm=Читати
 WritePerm=Write
@@ -75,7 +79,8 @@ AddWebsiteAccount=Create web site account
 BackToListOfThirdParty=Back to list for Third Party
 DisableSiteFirst=Disable website first
 MyContainerTitle=My web site title
-AnotherContainer=Another container
+AnotherContainer=This is how to include content of another page/container (you may have an error here if you enable dynamic code because the embedded subcontainer may not exists)
+SorryWebsiteIsCurrentlyOffLine=Sorry, this website is currently off line. Please comme back later...
 WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / third party
 YouMustDefineTheHomePage=You must first define the default Home page
@@ -89,7 +94,8 @@ AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
 CorporateHomePage=Corporate Home page
 EmptyPage=Empty page
 ExternalURLMustStartWithHttp=External URL must start with http:// or https://
-ZipOfWebsitePackageToImport=Zip file of website package
+ZipOfWebsitePackageToImport=Upload the Zip file of the website template package
+ZipOfWebsitePackageToLoad=or Choose an available embedded website template package
 ShowSubcontainers=Include dynamic content
 InternalURLOfPage=Internal URL of page
 ThisPageIsTranslationOf=This page/container is a translation of
@@ -101,5 +107,10 @@ NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynam
 ReplaceWebsiteContent=Search or Replace website content
 DeleteAlsoJs=Delete also all javascript files specific to this website?
 DeleteAlsoMedias=Delete also all medias files specific to this website?
-# Export
 MyWebsitePages=My website pages
+SearchReplaceInto=Search | Replace into
+ReplaceString=New string
+CSSContentTooltipHelp=Enter here CSS content. To avoid any conflict with the CSS of the application, be sure to prepend all declaration with the .bodywebsite class. For example:<br><br>#mycssselector, input.myclass:hover { ... }<br>must be<br>.bodywebsite #mycssselector, .bodywebsite input.myclass:hover { ... }<br><br>Note: If you have a large file without this prefix, you can use 'lessc' to convert it to append the .bodywebsite prefix everywhere.
+LinkAndScriptsHereAreNotLoadedInEditor=Warning: This content is output only when site is accessed from a server. It is not used in Edit mode so if you need to load javascript files also in edit mode, just add your tag 'script src=...' into the page.
+Dynamiccontent=Sample of a page with dynamic content
+ImportSite=Import website template
diff --git a/htdocs/langs/uz_UZ/admin.lang b/htdocs/langs/uz_UZ/admin.lang
index 2e27c6fe81f..1a1891009cf 100644
--- a/htdocs/langs/uz_UZ/admin.lang
+++ b/htdocs/langs/uz_UZ/admin.lang
@@ -400,6 +400,7 @@ OldVATRates=Old VAT rate
 NewVATRates=New VAT rate
 PriceBaseTypeToChange=Modify on prices with base reference value defined on
 MassConvert=Launch bulk conversion
+PriceFormatInCurrentLanguage=Price Format In Current Language
 String=String
 TextLong=Long text
 HtmlText=Html text
@@ -431,7 +432,7 @@ ExtrafieldParamHelpradio=List of values must be lines with format key,value (whe
 ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- idfilter is necessarly a primary int key<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=List of values 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>Examples:<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
-ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default)<br>Set this to 2 for a collapsing separator (collapsed by default)
+ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Library used for PDF generation
 LocalTaxDesc=Some countries may apply two or three taxes on each invoice line. If this is the case, choose the type for the 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)
 SMS=SMS
@@ -1695,7 +1696,7 @@ SuppliersInvoiceNumberingModel=Vendor invoices numbering models
 IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=GeoIP Maxmind module setup
-PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat
+PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoLite2-Country.mmdb
 NoteOnPathLocation=Note that your ip to country data file must be inside a directory your PHP can read (Check your PHP open_basedir setup and filesystem permissions).
 YouCanDownloadFreeDatFileTo=You can download a <b>free demo version</b> of the Maxmind GeoIP country file at %s.
 YouCanDownloadAdvancedDatFileTo=You can also download a more <b>complete version, with updates,</b> of the Maxmind GeoIP country file at %s.
@@ -1926,14 +1927,13 @@ SmallerThan=Smaller than
 LargerThan=Larger than
 IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID is found into incoming email, the event will be automatically linked to the related objects.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
-IFTTTSetup=IFTTT module setup
-IFTTT_SERVICE_KEY=IFTTT Service key
-IFTTT_DOLIBARR_ENDPOINT_SECUREKEY=Security key to secure the endpoint URL used by IFTTT to send messages to your Dolibarr.
-IFTTTDesc=This module is designed to trigger events on IFTTT and/or to execute some action on external IFTTT triggers.
-UrlForIFTTT=URL endpoint for IFTTT
-YouWillFindItOnYourIFTTTAccount=You will find it on your IFTTT account
 EndPointFor=End point for %s : %s
 DeleteEmailCollector=Delete email collector
 ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
 RecipientEmailsWillBeReplacedWithThisValue=Recipient emails will be always replaced with this value
 AtLeastOneDefaultBankAccountMandatory=At least 1 default bank account must be defined
+RESTRICT_API_ON_IP=Allow available APIs to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can use the available APIs.
+RESTRICT_ON_IP=Allow access to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can access.
+BaseOnSabeDavVersion=Based on the library SabreDAV version
+NotAPublicIp=Not a public IP
+MakeAnonymousPing=Make an anonymous Ping '+1' to the Dolibarr foundation server (done 1 time only after installation) to allow the foundation to count the number of Dolibarr installation.
diff --git a/htdocs/langs/uz_UZ/banks.lang b/htdocs/langs/uz_UZ/banks.lang
index c77158e07b7..47295ec7e31 100644
--- a/htdocs/langs/uz_UZ/banks.lang
+++ b/htdocs/langs/uz_UZ/banks.lang
@@ -73,6 +73,7 @@ BankTransaction=Bank entry
 ListTransactions=List entries
 ListTransactionsByCategory=List entries/category
 TransactionsToConciliate=Entries to reconcile
+TransactionsToConciliateShort=To reconcile
 Conciliable=Can be reconciled
 Conciliate=Reconcile
 Conciliation=Reconciliation
@@ -116,6 +117,7 @@ DeleteCheckReceipt=Delete this check receipt?
 ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
 BankChecks=Bank checks
 BankChecksToReceipt=Checks awaiting deposit
+BankChecksToReceiptShort=Checks awaiting deposit
 ShowCheckReceipt=Show check deposit receipt
 NumberOfCheques=No. of check
 DeleteTransaction=Delete entry
diff --git a/htdocs/langs/uz_UZ/cashdesk.lang b/htdocs/langs/uz_UZ/cashdesk.lang
index ea0e660ed2d..33ea50dfb0f 100644
--- a/htdocs/langs/uz_UZ/cashdesk.lang
+++ b/htdocs/langs/uz_UZ/cashdesk.lang
@@ -62,6 +62,7 @@ TicketVatGrouped=Group VAT by rate in tickets
 AutoPrintTickets=Automatically print tickets
 EnableBarOrRestaurantFeatures=Enable features for Bar or Restaurant
 ConfirmDeletionOfThisPOSSale=Do your confirm the deletion of this current sale ?
+ConfirmDiscardOfThisPOSSale=Do you want to discard this current sale ?
 History=History
 ValidateAndClose=Validate and close
 Terminal=Terminal
@@ -69,3 +70,8 @@ NumberOfTerminals=Number of Terminals
 TerminalSelect=Select terminal you want to use:
 POSTicket=POS Ticket
 BasicPhoneLayout=Use basic layout for phones
+SetupOfTerminalNotComplete=Setup of terminal %s is not complete
+DirectPayment=Direct payment
+DirectPaymentButton=Direct cash payment button
+InvoiceIsAlreadyValidated=Invoice is already validated
+NoLinesToBill=No lines to bill
diff --git a/htdocs/langs/uz_UZ/companies.lang b/htdocs/langs/uz_UZ/companies.lang
index 578f5cb8920..8235c74ddda 100644
--- a/htdocs/langs/uz_UZ/companies.lang
+++ b/htdocs/langs/uz_UZ/companies.lang
@@ -54,6 +54,7 @@ Firstname=First name
 PostOrFunction=Job position
 UserTitle=Title
 NatureOfThirdParty=Nature of Third party
+NatureOfContact=Nature of Contact
 Address=Address
 State=State/Province
 StateShort=State
diff --git a/htdocs/langs/uz_UZ/contracts.lang b/htdocs/langs/uz_UZ/contracts.lang
index 51b73423fb0..47572c355ab 100644
--- a/htdocs/langs/uz_UZ/contracts.lang
+++ b/htdocs/langs/uz_UZ/contracts.lang
@@ -51,6 +51,7 @@ ListOfClosedServices=List of closed services
 ListOfRunningServices=List of running services
 NotActivatedServices=Inactive services (among validated contracts)
 BoardNotActivatedServices=Services to activate among validated contracts
+BoardNotActivatedServicesShort=Services to activate
 LastContracts=Latest %s contracts
 LastModifiedServices=Latest %s modified services
 ContractStartDate=Start date
@@ -64,7 +65,10 @@ DateStartRealShort=Real start date
 DateEndReal=Real end date
 DateEndRealShort=Real end date
 CloseService=Close service
-BoardRunningServices=Expired running services
+BoardRunningServices=Services running
+BoardRunningServicesShort=Services running
+BoardExpiredServices=Services expired
+BoardExpiredServicesShort=Services expired
 ServiceStatus=Status of service
 DraftContracts=Drafts contracts
 CloseRefusedBecauseOneServiceActive=Contract can't be closed as there is at least one open service on it
diff --git a/htdocs/langs/uz_UZ/errors.lang b/htdocs/langs/uz_UZ/errors.lang
index 1ee46fdbb92..0c07b2eafc4 100644
--- a/htdocs/langs/uz_UZ/errors.lang
+++ b/htdocs/langs/uz_UZ/errors.lang
@@ -218,6 +218,7 @@ ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text
 ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Error, delete payment linked to a closed invoice is not possible.
+ErrorSearchCriteriaTooSmall=Search criteria too small.
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 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/main.lang b/htdocs/langs/uz_UZ/main.lang
index d578c882ad5..48c6e04680a 100644
--- a/htdocs/langs/uz_UZ/main.lang
+++ b/htdocs/langs/uz_UZ/main.lang
@@ -28,6 +28,7 @@ NoTemplateDefined=No template available for this email type
 AvailableVariables=Available substitution variables
 NoTranslation=No translation
 Translation=Translation
+EmptySearchString=Enter a non empty search string
 NoRecordFound=No record found
 NoRecordDeleted=No record deleted
 NotEnoughDataYet=Not enough data
@@ -704,6 +705,7 @@ DateOfSignature=Date of signature
 HidePassword=Show command with password hidden
 UnHidePassword=Show real command with clear password
 Root=Root
+RootOfMedias=Root of public medias (/medias)
 Informations=Information
 Page=Page
 Notes=Notes
@@ -981,3 +983,10 @@ PaymentInformation=Payment information
 ValidFrom=Valid from
 ValidUntil=Valid until
 NoRecordedUsers=No users
+ToClose=To close
+ToProcess=To process
+ToApprove=To approve
+GlobalOpenedElemView=Global view
+NoArticlesFoundForTheKeyword=No article found for the keyword '<strong>%s</strong>'
+NoArticlesFoundForTheCategory=No article found for the category
+ToAcceptRefuse=To accept | refuse
diff --git a/htdocs/langs/uz_UZ/members.lang b/htdocs/langs/uz_UZ/members.lang
index 9993e05428f..5886c598d52 100644
--- a/htdocs/langs/uz_UZ/members.lang
+++ b/htdocs/langs/uz_UZ/members.lang
@@ -29,6 +29,7 @@ MenuMembersUpToDate=Up to date members
 MenuMembersNotUpToDate=Out of date members
 MenuMembersResiliated=Terminated members
 MembersWithSubscriptionToReceive=Members with subscription to receive
+MembersWithSubscriptionToReceiveShort=Subscription to receive
 DateSubscription=Subscription date
 DateEndSubscription=Subscription end date
 EndSubscription=End subscription
diff --git a/htdocs/langs/uz_UZ/projects.lang b/htdocs/langs/uz_UZ/projects.lang
index 76bd0ce597d..d144fccd272 100644
--- a/htdocs/langs/uz_UZ/projects.lang
+++ b/htdocs/langs/uz_UZ/projects.lang
@@ -76,7 +76,13 @@ MyProjects=My projects
 MyProjectsArea=My projects Area
 DurationEffective=Effective duration
 ProgressDeclared=Declared progress
+TaskProgressSummary=Task progress
+CurentlyOpenedTasks=Curently opened tasks
+TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared progress is less %s than the calculated progression
+TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared progress is more %s than the calculated progression
 ProgressCalculated=Calculated progress
+WhichIamLinkedTo=which I'm linked to
+WhichIamLinkedToProject=which I'm linked to project
 Time=Time
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
diff --git a/htdocs/langs/vi_VN/admin.lang b/htdocs/langs/vi_VN/admin.lang
index ecc0d998ca1..6eebaf8da36 100644
--- a/htdocs/langs/vi_VN/admin.lang
+++ b/htdocs/langs/vi_VN/admin.lang
@@ -400,6 +400,7 @@ OldVATRates=Thuế suất VAT cũ
 NewVATRates=Thuế suất VAT mới
 PriceBaseTypeToChange=Sửa đổi về giá với giá trị tham chiếu cơ sở được xác định trên
 MassConvert=Launch bulk conversion
+PriceFormatInCurrentLanguage=Price Format In Current Language
 String=String
 TextLong=Long text
 HtmlText=Html text
@@ -431,7 +432,7 @@ ExtrafieldParamHelpradio=List of values must be lines with format key,value (whe
 ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- idfilter is necessarly a primary int key<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=List of values 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>Examples:<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
-ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default)<br>Set this to 2 for a collapsing separator (collapsed by default)
+ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Library used for PDF generation
 LocalTaxDesc=Some countries may apply two or three taxes on each invoice line. If this is the case, choose the type for the 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)
 SMS=SMS
@@ -1695,7 +1696,7 @@ SuppliersInvoiceNumberingModel=Vendor invoices numbering models
 IfSetToYesDontForgetPermission=Nếu chỉnh là có, đừng quên cung cấp phân quyền cho nhóm hoặc người dùng được phép cho duyệt lần hai.
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=Cài đặt module GeoIP MaxMind
-PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat
+PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoLite2-Country.mmdb
 NoteOnPathLocation=Note that your ip to country data file must be inside a directory your PHP can read (Check your PHP open_basedir setup and filesystem permissions).
 YouCanDownloadFreeDatFileTo=You can download a <b>free demo version</b> of the Maxmind GeoIP country file at %s.
 YouCanDownloadAdvancedDatFileTo=You can also download a more <b>complete version, with updates,</b> of the Maxmind GeoIP country file at %s.
@@ -1926,14 +1927,13 @@ SmallerThan=Smaller than
 LargerThan=Larger than
 IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID is found into incoming email, the event will be automatically linked to the related objects.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
-IFTTTSetup=IFTTT module setup
-IFTTT_SERVICE_KEY=IFTTT Service key
-IFTTT_DOLIBARR_ENDPOINT_SECUREKEY=Security key to secure the endpoint URL used by IFTTT to send messages to your Dolibarr.
-IFTTTDesc=This module is designed to trigger events on IFTTT and/or to execute some action on external IFTTT triggers.
-UrlForIFTTT=URL endpoint for IFTTT
-YouWillFindItOnYourIFTTTAccount=You will find it on your IFTTT account
 EndPointFor=End point for %s : %s
 DeleteEmailCollector=Delete email collector
 ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
 RecipientEmailsWillBeReplacedWithThisValue=Recipient emails will be always replaced with this value
 AtLeastOneDefaultBankAccountMandatory=At least 1 default bank account must be defined
+RESTRICT_API_ON_IP=Allow available APIs to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can use the available APIs.
+RESTRICT_ON_IP=Allow access to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can access.
+BaseOnSabeDavVersion=Based on the library SabreDAV version
+NotAPublicIp=Not a public IP
+MakeAnonymousPing=Make an anonymous Ping '+1' to the Dolibarr foundation server (done 1 time only after installation) to allow the foundation to count the number of Dolibarr installation.
diff --git a/htdocs/langs/vi_VN/banks.lang b/htdocs/langs/vi_VN/banks.lang
index 8e0f391d5ad..65a5cf32295 100644
--- a/htdocs/langs/vi_VN/banks.lang
+++ b/htdocs/langs/vi_VN/banks.lang
@@ -73,6 +73,7 @@ BankTransaction=Kê khai 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
+TransactionsToConciliateShort=To reconcile
 Conciliable=Có thể được đối chiếu
 Conciliate=Đối chiếu
 Conciliation=Đối chiếu
@@ -116,6 +117,7 @@ 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=Séc đợi tiền gửi
+BankChecksToReceiptShort=Séc đợi tiền gửi
 ShowCheckReceipt=Hiện chứng từ séc ứng trước
 NumberOfCheques=No. of check
 DeleteTransaction=Xóa mục kê khai
diff --git a/htdocs/langs/vi_VN/cashdesk.lang b/htdocs/langs/vi_VN/cashdesk.lang
index db79631b281..2d40cae112f 100644
--- a/htdocs/langs/vi_VN/cashdesk.lang
+++ b/htdocs/langs/vi_VN/cashdesk.lang
@@ -62,6 +62,7 @@ TicketVatGrouped=Group VAT by rate in tickets
 AutoPrintTickets=Automatically print tickets
 EnableBarOrRestaurantFeatures=Enable features for Bar or Restaurant
 ConfirmDeletionOfThisPOSSale=Do your confirm the deletion of this current sale ?
+ConfirmDiscardOfThisPOSSale=Do you want to discard this current sale ?
 History=Lịch sử
 ValidateAndClose=Validate and close
 Terminal=Terminal
@@ -69,3 +70,8 @@ NumberOfTerminals=Number of Terminals
 TerminalSelect=Select terminal you want to use:
 POSTicket=POS Ticket
 BasicPhoneLayout=Use basic layout for phones
+SetupOfTerminalNotComplete=Setup of terminal %s is not complete
+DirectPayment=Direct payment
+DirectPaymentButton=Direct cash payment button
+InvoiceIsAlreadyValidated=Invoice is already validated
+NoLinesToBill=No lines to bill
diff --git a/htdocs/langs/vi_VN/companies.lang b/htdocs/langs/vi_VN/companies.lang
index 521bc7dd9a4..797406772ed 100644
--- a/htdocs/langs/vi_VN/companies.lang
+++ b/htdocs/langs/vi_VN/companies.lang
@@ -54,6 +54,7 @@ Firstname=Tên
 PostOrFunction=Vị trí công việc
 UserTitle=Tiêu đề
 NatureOfThirdParty=Nature của Third party
+NatureOfContact=Nature of Contact
 Address=Địa chỉ
 State=Bang/Tỉnh
 StateShort=Tỉnh/ thành
diff --git a/htdocs/langs/vi_VN/contracts.lang b/htdocs/langs/vi_VN/contracts.lang
index eb6dd2d9657..04f33c0a368 100644
--- a/htdocs/langs/vi_VN/contracts.lang
+++ b/htdocs/langs/vi_VN/contracts.lang
@@ -51,6 +51,7 @@ ListOfClosedServices=Danh sách các dịch vụ đã đóng
 ListOfRunningServices=Danh sách dịch vụ đang hoạt động
 NotActivatedServices=Dịch vụ chưa kích hoạt (trong hợp đồng đã xác nhận)
 BoardNotActivatedServices=Các dịch vụ để kích hoạt trong hợp đồng đã xác nhận
+BoardNotActivatedServicesShort=Services to activate
 LastContracts=%s hợp đồng mới nhất
 LastModifiedServices=%s dịch vụ mới được sửa
 ContractStartDate=Ngày bắt đầu
@@ -64,7 +65,10 @@ DateStartRealShort=Ngày thực tế bắt đầu
 DateEndReal=Ngày thực tế kết thúc
 DateEndRealShort=Ngày thực tế kết thúc
 CloseService=Đóng dịch vụ
-BoardRunningServices=Dịch vụ hoạt động đã hết hạn
+BoardRunningServices=Services running
+BoardRunningServicesShort=Services running
+BoardExpiredServices=Services expired
+BoardExpiredServicesShort=Services expired
 ServiceStatus=Trạng thái của dịch vụ
 DraftContracts=Dự thảo hợp đồng
 CloseRefusedBecauseOneServiceActive=Contract can't be closed as there is at least one open service on it
diff --git a/htdocs/langs/vi_VN/errors.lang b/htdocs/langs/vi_VN/errors.lang
index dcfe5118f12..912d8b4097a 100644
--- a/htdocs/langs/vi_VN/errors.lang
+++ b/htdocs/langs/vi_VN/errors.lang
@@ -218,6 +218,7 @@ ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text
 ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Error, delete payment linked to a closed invoice is not possible.
+ErrorSearchCriteriaTooSmall=Search criteria too small.
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 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/main.lang b/htdocs/langs/vi_VN/main.lang
index 825708ec534..4d312cc91ba 100644
--- a/htdocs/langs/vi_VN/main.lang
+++ b/htdocs/langs/vi_VN/main.lang
@@ -28,6 +28,7 @@ NoTemplateDefined=No template available for this email type
 AvailableVariables=Available substitution variables
 NoTranslation=Không dịch
 Translation=Dịch
+EmptySearchString=Enter a non empty search string
 NoRecordFound=Không tìm thấy bản ghi
 NoRecordDeleted=No record deleted
 NotEnoughDataYet=Not enough data
@@ -704,6 +705,7 @@ DateOfSignature=Date of signature
 HidePassword=Hiện lệnh với mật khẩu ẩn
 UnHidePassword=Hiển thị lệnh thực với mật khẩu rõ ràng
 Root=Gốc
+RootOfMedias=Root of public medias (/medias)
 Informations=Thông tin
 Page=Trang
 Notes=Ghi chú
@@ -981,3 +983,10 @@ PaymentInformation=Payment information
 ValidFrom=Valid from
 ValidUntil=Valid until
 NoRecordedUsers=No users
+ToClose=To close
+ToProcess=Để xử lý
+ToApprove=To approve
+GlobalOpenedElemView=Global view
+NoArticlesFoundForTheKeyword=No article found for the keyword '<strong>%s</strong>'
+NoArticlesFoundForTheCategory=No article found for the category
+ToAcceptRefuse=To accept | refuse
diff --git a/htdocs/langs/vi_VN/members.lang b/htdocs/langs/vi_VN/members.lang
index e01bf313a28..f0412ca701e 100644
--- a/htdocs/langs/vi_VN/members.lang
+++ b/htdocs/langs/vi_VN/members.lang
@@ -29,6 +29,7 @@ MenuMembersUpToDate=Lên đến các thành viên ngày
 MenuMembersNotUpToDate=Thành viên hết hạn
 MenuMembersResiliated=Terminated members
 MembersWithSubscriptionToReceive=Thành viên có đăng ký để nhận được
+MembersWithSubscriptionToReceiveShort=Subscription to receive
 DateSubscription=Ngày đăng ký
 DateEndSubscription=Ngày kết thúc đăng ký
 EndSubscription=Kết thúc đăng ký
diff --git a/htdocs/langs/vi_VN/projects.lang b/htdocs/langs/vi_VN/projects.lang
index c4a4bac8898..b971d574562 100644
--- a/htdocs/langs/vi_VN/projects.lang
+++ b/htdocs/langs/vi_VN/projects.lang
@@ -76,7 +76,13 @@ MyProjects=Dự án của tôi
 MyProjectsArea=My projects Area
 DurationEffective=Thời hạn hiệu lực
 ProgressDeclared=Tiến độ công bố
+TaskProgressSummary=Task progress
+CurentlyOpenedTasks=Curently opened tasks
+TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared progress is less %s than the calculated progression
+TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared progress is more %s than the calculated progression
 ProgressCalculated=Tiến độ được tính toán
+WhichIamLinkedTo=which I'm linked to
+WhichIamLinkedToProject=which I'm linked to project
 Time=Thời gian
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
diff --git a/htdocs/langs/vi_VN/website.lang b/htdocs/langs/vi_VN/website.lang
index becbd99d3ac..f6954805632 100644
--- a/htdocs/langs/vi_VN/website.lang
+++ b/htdocs/langs/vi_VN/website.lang
@@ -2,7 +2,7 @@
 Shortname=Mã
 WebsiteSetupDesc=Create here the websites you wish to use. Then go into menu Websites to edit them.
 DeleteWebsite=Delete website
-ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed.
+ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed. The files uploaded (like into the medias directory, the ECM module, ...) will remain.
 WEBSITE_TYPE_CONTAINER=Type of page/container
 WEBSITE_PAGE_EXAMPLE=Web page to use as example
 WEBSITE_PAGENAME=Page name/alias
@@ -14,6 +14,9 @@ WEBSITE_JS_INLINE=Javascript file content (common to all pages)
 WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages)
 WEBSITE_ROBOT=Robot file (robots.txt)
 WEBSITE_HTACCESS=Website .htaccess file
+WEBSITE_MANIFEST_JSON=Website manifest.json file
+WEBSITE_README=README.md file
+EnterHereLicenseInformation=Enter here meta data or license information to fille a README.md file. if you distribute your website as a template, the file will be included into the temptate package.
 HtmlHeaderPage=HTML header (specific to this page only)
 PageNameAliasHelp=Name or alias of the page.<br>This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "<strong>%s</strong>" to edit this alias.
 EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container.
@@ -41,6 +44,7 @@ RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
 SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then set the name of the virtual host you have created in the properties of web site, so the preview can be done also using this dedicated web server access instead of the internal Dolibarr server.
 YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
 CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
 ReadPerm=Đọc
 WritePerm=Write
@@ -75,7 +79,8 @@ AddWebsiteAccount=Create web site account
 BackToListOfThirdParty=Back to list for Third Party
 DisableSiteFirst=Disable website first
 MyContainerTitle=My web site title
-AnotherContainer=Another container
+AnotherContainer=This is how to include content of another page/container (you may have an error here if you enable dynamic code because the embedded subcontainer may not exists)
+SorryWebsiteIsCurrentlyOffLine=Sorry, this website is currently off line. Please comme back later...
 WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / third party
 YouMustDefineTheHomePage=You must first define the default Home page
@@ -89,7 +94,8 @@ AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
 CorporateHomePage=Corporate Home page
 EmptyPage=Empty page
 ExternalURLMustStartWithHttp=External URL must start with http:// or https://
-ZipOfWebsitePackageToImport=Zip file of website package
+ZipOfWebsitePackageToImport=Upload the Zip file of the website template package
+ZipOfWebsitePackageToLoad=or Choose an available embedded website template package
 ShowSubcontainers=Include dynamic content
 InternalURLOfPage=Internal URL of page
 ThisPageIsTranslationOf=This page/container is a translation of
@@ -101,5 +107,10 @@ NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynam
 ReplaceWebsiteContent=Search or Replace website content
 DeleteAlsoJs=Delete also all javascript files specific to this website?
 DeleteAlsoMedias=Delete also all medias files specific to this website?
-# Export
 MyWebsitePages=My website pages
+SearchReplaceInto=Search | Replace into
+ReplaceString=New string
+CSSContentTooltipHelp=Enter here CSS content. To avoid any conflict with the CSS of the application, be sure to prepend all declaration with the .bodywebsite class. For example:<br><br>#mycssselector, input.myclass:hover { ... }<br>must be<br>.bodywebsite #mycssselector, .bodywebsite input.myclass:hover { ... }<br><br>Note: If you have a large file without this prefix, you can use 'lessc' to convert it to append the .bodywebsite prefix everywhere.
+LinkAndScriptsHereAreNotLoadedInEditor=Warning: This content is output only when site is accessed from a server. It is not used in Edit mode so if you need to load javascript files also in edit mode, just add your tag 'script src=...' into the page.
+Dynamiccontent=Sample of a page with dynamic content
+ImportSite=Import website template
diff --git a/htdocs/langs/zh_CN/admin.lang b/htdocs/langs/zh_CN/admin.lang
index 01524a3067f..80d5cb4fc73 100644
--- a/htdocs/langs/zh_CN/admin.lang
+++ b/htdocs/langs/zh_CN/admin.lang
@@ -400,6 +400,7 @@ OldVATRates=以前的增值税率(VAT)
 NewVATRates=新建增值税率(VAT)
 PriceBaseTypeToChange=设置了基本参考价值的产品的价格
 MassConvert=Launch bulk conversion
+PriceFormatInCurrentLanguage=Price Format In Current Language
 String=字符串
 TextLong=长文本
 HtmlText=Html文字
@@ -431,7 +432,7 @@ ExtrafieldParamHelpradio=List of values must be lines with format key,value (whe
 ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- idfilter is necessarly a primary int key<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=List of values 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>Examples:<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
-ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default)<br>Set this to 2 for a collapsing separator (collapsed by default)
+ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=已使用资料库以支持生成PDF文件
 LocalTaxDesc=Some countries may apply two or three taxes on each invoice line. If this is the case, choose the type for the 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)
 SMS=短信
@@ -1695,7 +1696,7 @@ SuppliersInvoiceNumberingModel=Vendor invoices numbering models
 IfSetToYesDontForgetPermission=如果选择"是"，请不要忘记为用户和组设置二次审核的权限
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=Maxmind Geoip 模块设置
-PathToGeoIPMaxmindCountryDataFile=Maxmind网站的全球地址数据库文件的路径。<br>例如: <br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat
+PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoLite2-Country.mmdb
 NoteOnPathLocation=注意此数据文件所处目录您的PHP必需能读取(检查您 PHP 的 open_basedir 设置和文件系统权限)。
 YouCanDownloadFreeDatFileTo=您可以下载 Maxmind网站的GeoIP全球IP地址数据库 <b>免费演示版</b> 的国家地理位置数据文件，地址是 %s。
 YouCanDownloadAdvancedDatFileTo=您也可以下载<b>更加完整更新更快的</b> Maxmind GeoIP 国家文件版本，地址是 %s。
@@ -1926,14 +1927,13 @@ SmallerThan=Smaller than
 LargerThan=Larger than
 IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID is found into incoming email, the event will be automatically linked to the related objects.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
-IFTTTSetup=IFTTT module setup
-IFTTT_SERVICE_KEY=IFTTT Service key
-IFTTT_DOLIBARR_ENDPOINT_SECUREKEY=Security key to secure the endpoint URL used by IFTTT to send messages to your Dolibarr.
-IFTTTDesc=This module is designed to trigger events on IFTTT and/or to execute some action on external IFTTT triggers.
-UrlForIFTTT=URL endpoint for IFTTT
-YouWillFindItOnYourIFTTTAccount=You will find it on your IFTTT account
 EndPointFor=End point for %s : %s
 DeleteEmailCollector=Delete email collector
 ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
 RecipientEmailsWillBeReplacedWithThisValue=Recipient emails will be always replaced with this value
 AtLeastOneDefaultBankAccountMandatory=At least 1 default bank account must be defined
+RESTRICT_API_ON_IP=Allow available APIs to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can use the available APIs.
+RESTRICT_ON_IP=Allow access to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can access.
+BaseOnSabeDavVersion=Based on the library SabreDAV version
+NotAPublicIp=Not a public IP
+MakeAnonymousPing=Make an anonymous Ping '+1' to the Dolibarr foundation server (done 1 time only after installation) to allow the foundation to count the number of Dolibarr installation.
diff --git a/htdocs/langs/zh_CN/banks.lang b/htdocs/langs/zh_CN/banks.lang
index a45404d90fc..d865edca66d 100644
--- a/htdocs/langs/zh_CN/banks.lang
+++ b/htdocs/langs/zh_CN/banks.lang
@@ -73,6 +73,7 @@ BankTransaction=银行条目
 ListTransactions=列表条目
 ListTransactionsByCategory=列表条目/类别
 TransactionsToConciliate=调节的条目
+TransactionsToConciliateShort=To reconcile
 Conciliable=可以两全
 Conciliate=调节
 Conciliation=和解
@@ -116,6 +117,7 @@ DeleteCheckReceipt=删除此支票收据？
 ConfirmDeleteCheckReceipt=您确定要删除此支票收据吗？
 BankChecks=银行支票
 BankChecksToReceipt=等待支票存款
+BankChecksToReceiptShort=等待支票存款
 ShowCheckReceipt=显示检查存单
 NumberOfCheques=支票数
 DeleteTransaction=删除条目
diff --git a/htdocs/langs/zh_CN/cashdesk.lang b/htdocs/langs/zh_CN/cashdesk.lang
index 5e70a79f888..f8bd143eb12 100644
--- a/htdocs/langs/zh_CN/cashdesk.lang
+++ b/htdocs/langs/zh_CN/cashdesk.lang
@@ -62,6 +62,7 @@ TicketVatGrouped=Group VAT by rate in tickets
 AutoPrintTickets=Automatically print tickets
 EnableBarOrRestaurantFeatures=Enable features for Bar or Restaurant
 ConfirmDeletionOfThisPOSSale=Do your confirm the deletion of this current sale ?
+ConfirmDiscardOfThisPOSSale=Do you want to discard this current sale ?
 History=历史
 ValidateAndClose=Validate and close
 Terminal=Terminal
@@ -69,3 +70,8 @@ NumberOfTerminals=Number of Terminals
 TerminalSelect=Select terminal you want to use:
 POSTicket=POS Ticket
 BasicPhoneLayout=Use basic layout for phones
+SetupOfTerminalNotComplete=Setup of terminal %s is not complete
+DirectPayment=Direct payment
+DirectPaymentButton=Direct cash payment button
+InvoiceIsAlreadyValidated=Invoice is already validated
+NoLinesToBill=No lines to bill
diff --git a/htdocs/langs/zh_CN/companies.lang b/htdocs/langs/zh_CN/companies.lang
index 75d57bf28d8..323b8d56611 100644
--- a/htdocs/langs/zh_CN/companies.lang
+++ b/htdocs/langs/zh_CN/companies.lang
@@ -54,6 +54,7 @@ Firstname=名字
 PostOrFunction=工作岗位
 UserTitle=称谓
 NatureOfThirdParty=合伙人的性质
+NatureOfContact=Nature of Contact
 Address=地址
 State=州/省
 StateShort=国家
diff --git a/htdocs/langs/zh_CN/contracts.lang b/htdocs/langs/zh_CN/contracts.lang
index bb1142c02f1..7c496272130 100644
--- a/htdocs/langs/zh_CN/contracts.lang
+++ b/htdocs/langs/zh_CN/contracts.lang
@@ -51,6 +51,7 @@ ListOfClosedServices=禁用服务列表
 ListOfRunningServices=运行服务的列表
 NotActivatedServices=不活跃的服务（除验证合同）
 BoardNotActivatedServices=在已确认的合同间激活服务
+BoardNotActivatedServicesShort=Services to activate
 LastContracts=最近的 %s 份合同
 LastModifiedServices=最近变更的 %s 个服务
 ContractStartDate=开始日期
@@ -64,7 +65,10 @@ DateStartRealShort=实际开始日期
 DateEndReal=实际结束日期
 DateEndRealShort=实际结束日期
 CloseService=禁用服务
-BoardRunningServices=过期的运行服务
+BoardRunningServices=Services running
+BoardRunningServicesShort=Services running
+BoardExpiredServices=Services expired
+BoardExpiredServicesShort=Services expired
 ServiceStatus=服务现状
 DraftContracts=合同草稿
 CloseRefusedBecauseOneServiceActive=Contract can't be closed as there is at least one open service on it
diff --git a/htdocs/langs/zh_CN/errors.lang b/htdocs/langs/zh_CN/errors.lang
index d2c54579d93..806891257bb 100644
--- a/htdocs/langs/zh_CN/errors.lang
+++ b/htdocs/langs/zh_CN/errors.lang
@@ -218,6 +218,7 @@ ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text
 ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Error, delete payment linked to a closed invoice is not possible.
+ErrorSearchCriteriaTooSmall=Search criteria too small.
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 WarningPasswordSetWithNoAccount=为此成员设置了密码。但是，未创建任何用户帐户。因此，此密码已存储，但无法用于登录Dolibarr。它可以由外部模块/接口使用，但如果您不需要为成员定义任何登录名或密码，则可以从成员模块设置中禁用“管理每个成员的登录名”选项。如果您需要管理登录但不需要任何密码，则可以将此字段保留为空以避免此警告。注意：如果成员链接到用户，则电子邮件也可用作登录。
diff --git a/htdocs/langs/zh_CN/main.lang b/htdocs/langs/zh_CN/main.lang
index 3197d345e98..e4b6ca6b2fa 100644
--- a/htdocs/langs/zh_CN/main.lang
+++ b/htdocs/langs/zh_CN/main.lang
@@ -28,6 +28,7 @@ NoTemplateDefined=此电子邮件类型没有可用的模板
 AvailableVariables=可用的替代变量
 NoTranslation=没有翻译
 Translation=翻译
+EmptySearchString=Enter a non empty search string
 NoRecordFound=空空如也——没有找到记录
 NoRecordDeleted=未删除记录
 NotEnoughDataYet=数据不足
@@ -704,6 +705,7 @@ DateOfSignature=签字日期
 HidePassword=显示命令的隐藏密码
 UnHidePassword=真正拿出明确的密码命令
 Root=根
+RootOfMedias=Root of public medias (/medias)
 Informations=信息
 Page=页面
 Notes=备注
@@ -981,3 +983,10 @@ PaymentInformation=Payment information
 ValidFrom=Valid from
 ValidUntil=Valid until
 NoRecordedUsers=No users
+ToClose=To close
+ToProcess=待处理
+ToApprove=To approve
+GlobalOpenedElemView=Global view
+NoArticlesFoundForTheKeyword=No article found for the keyword '<strong>%s</strong>'
+NoArticlesFoundForTheCategory=No article found for the category
+ToAcceptRefuse=To accept | refuse
diff --git a/htdocs/langs/zh_CN/members.lang b/htdocs/langs/zh_CN/members.lang
index bc5a1a95e80..76512b6db6f 100644
--- a/htdocs/langs/zh_CN/members.lang
+++ b/htdocs/langs/zh_CN/members.lang
@@ -29,6 +29,7 @@ MenuMembersUpToDate=新进人员
 MenuMembersNotUpToDate=过期会员
 MenuMembersResiliated=解雇会员
 MembersWithSubscriptionToReceive=接受订阅会员
+MembersWithSubscriptionToReceiveShort=Subscription to receive
 DateSubscription=认购日期
 DateEndSubscription=认购结束日期
 EndSubscription=最终订阅
diff --git a/htdocs/langs/zh_CN/projects.lang b/htdocs/langs/zh_CN/projects.lang
index 09d38d11c10..b6b1dc0973b 100644
--- a/htdocs/langs/zh_CN/projects.lang
+++ b/htdocs/langs/zh_CN/projects.lang
@@ -76,7 +76,13 @@ MyProjects=我的项目
 MyProjectsArea=我的项目区
 DurationEffective=有效时间
 ProgressDeclared=进度
+TaskProgressSummary=Task progress
+CurentlyOpenedTasks=Curently opened tasks
+TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared progress is less %s than the calculated progression
+TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared progress is more %s than the calculated progression
 ProgressCalculated=计算进展
+WhichIamLinkedTo=which I'm linked to
+WhichIamLinkedToProject=which I'm linked to project
 Time=时间
 ListOfTasks=任务列表
 GoToListOfTimeConsumed=转到消耗的时间列表
diff --git a/htdocs/langs/zh_CN/website.lang b/htdocs/langs/zh_CN/website.lang
index 377f56e059b..122dada7aaf 100644
--- a/htdocs/langs/zh_CN/website.lang
+++ b/htdocs/langs/zh_CN/website.lang
@@ -2,7 +2,7 @@
 Shortname=代码
 WebsiteSetupDesc=Create here the websites you wish to use. Then go into menu Websites to edit them.
 DeleteWebsite=删除网址
-ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed.
+ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed. The files uploaded (like into the medias directory, the ECM module, ...) will remain.
 WEBSITE_TYPE_CONTAINER=页面/容器的类型
 WEBSITE_PAGE_EXAMPLE=以网页为例
 WEBSITE_PAGENAME=页面名字/别名
@@ -14,6 +14,9 @@ WEBSITE_JS_INLINE=Javascript文件内容（所有页面共有）
 WEBSITE_HTML_HEADER=在HTML标题的底部添加（对所有页面通用）
 WEBSITE_ROBOT=机器人文件（robots.txt）
 WEBSITE_HTACCESS=Website .htaccess file
+WEBSITE_MANIFEST_JSON=Website manifest.json file
+WEBSITE_README=README.md file
+EnterHereLicenseInformation=Enter here meta data or license information to fille a README.md file. if you distribute your website as a template, the file will be included into the temptate package.
 HtmlHeaderPage=HTML标头（仅限此页面）
 PageNameAliasHelp=页面的名称或别名。<br>当从Web服务器的虚拟主机（如Apacke，Nginx，...）运行网站时，此别名也用于伪造SEO URL。使用“<strong> %s </strong>”按钮编辑此别名。
 EditTheWebSiteForACommonHeader=注意：如果要为所有页面定义个性化标题，请在站点级别而不是页面/容器上编辑标题。
@@ -41,6 +44,7 @@ RealURL=真实URL地址
 ViewWebsiteInProduction=使用主页URL网址查看网页
 SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then set the name of the virtual host you have created in the properties of web site, so the preview can be done also using this dedicated web server access instead of the internal Dolibarr server.
 YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
 CheckVirtualHostPerms=还要检查虚拟主机是否有权限<strong> %s </strong>将文件转换为<br> <strong> %s </strong>
 ReadPerm=阅读
 WritePerm=写
@@ -75,7 +79,8 @@ AddWebsiteAccount=创建网站帐户
 BackToListOfThirdParty=返回合伙人列表
 DisableSiteFirst=首先停用网站
 MyContainerTitle=我的网站标题
-AnotherContainer=另一个容器
+AnotherContainer=This is how to include content of another page/container (you may have an error here if you enable dynamic code because the embedded subcontainer may not exists)
+SorryWebsiteIsCurrentlyOffLine=Sorry, this website is currently off line. Please comme back later...
 WEBSITE_USE_WEBSITE_ACCOUNTS=启用网站帐户表
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / third party
 YouMustDefineTheHomePage=您必须先定义默认主页
@@ -89,7 +94,8 @@ AliasPageAlreadyExists=别名页面<strong> %s </strong>已存在
 CorporateHomePage=企业主页
 EmptyPage=空页面
 ExternalURLMustStartWithHttp=外部URL必须以http：//或https：//开头
-ZipOfWebsitePackageToImport=Zip file of website package
+ZipOfWebsitePackageToImport=Upload the Zip file of the website template package
+ZipOfWebsitePackageToLoad=or Choose an available embedded website template package
 ShowSubcontainers=Include dynamic content
 InternalURLOfPage=Internal URL of page
 ThisPageIsTranslationOf=This page/container is a translation of
@@ -101,5 +107,10 @@ NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynam
 ReplaceWebsiteContent=Search or Replace website content
 DeleteAlsoJs=Delete also all javascript files specific to this website?
 DeleteAlsoMedias=Delete also all medias files specific to this website?
-# Export
 MyWebsitePages=My website pages
+SearchReplaceInto=Search | Replace into
+ReplaceString=New string
+CSSContentTooltipHelp=Enter here CSS content. To avoid any conflict with the CSS of the application, be sure to prepend all declaration with the .bodywebsite class. For example:<br><br>#mycssselector, input.myclass:hover { ... }<br>must be<br>.bodywebsite #mycssselector, .bodywebsite input.myclass:hover { ... }<br><br>Note: If you have a large file without this prefix, you can use 'lessc' to convert it to append the .bodywebsite prefix everywhere.
+LinkAndScriptsHereAreNotLoadedInEditor=Warning: This content is output only when site is accessed from a server. It is not used in Edit mode so if you need to load javascript files also in edit mode, just add your tag 'script src=...' into the page.
+Dynamiccontent=Sample of a page with dynamic content
+ImportSite=Import website template
diff --git a/htdocs/langs/zh_TW/admin.lang b/htdocs/langs/zh_TW/admin.lang
index 765fa63ea45..26ac35540cc 100644
--- a/htdocs/langs/zh_TW/admin.lang
+++ b/htdocs/langs/zh_TW/admin.lang
@@ -400,6 +400,7 @@ OldVATRates=舊營業稅率
 NewVATRates=新營業稅率
 PriceBaseTypeToChange=根據已定義的基礎參考價參修改價格
 MassConvert=Launch bulk conversion
+PriceFormatInCurrentLanguage=Price Format In Current Language
 String=字串
 TextLong=長字串
 HtmlText=Html 文字
@@ -431,7 +432,7 @@ ExtrafieldParamHelpradio=List of values must be lines with format key,value (whe
 ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- idfilter is necessarly a primary int key<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=List of values 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>Examples:<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
-ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default)<br>Set this to 2 for a collapsing separator (collapsed by default)
+ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=PDF產生器使用程式庫
 LocalTaxDesc=Some countries may apply two or three taxes on each invoice line. If this is the case, choose the type for the 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)
 SMS=簡訊
@@ -1695,7 +1696,7 @@ SuppliersInvoiceNumberingModel=Vendor invoices numbering models
 IfSetToYesDontForgetPermission=若設定為「是的」，則別忘了提供群組或用戶允許第二次批准的權限
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=GeoIP Maxmind 模組設定
-PathToGeoIPMaxmindCountryDataFile=包含 Maxmind ip 位置的檔案路徑。<br>例如：<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat
+PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoLite2-Country.mmdb
 NoteOnPathLocation=請注意您的 IP 到國家資料檔案必須在您 PHP 資料夾中且可以讀取（檢查您 PHP 中 open_basedir 設定和檔案系統權限）。
 YouCanDownloadFreeDatFileTo=你可以下載一個在%s Maxmind GeoIP 國家 檔案的<b>免費展示版本</b> 
 YouCanDownloadAdvancedDatFileTo=您也可以在%s下載更<b>新的完整版本</b>的 Maxmind GeoIP 國家檔案
@@ -1926,14 +1927,13 @@ SmallerThan=Smaller than
 LargerThan=Larger than
 IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID is found into incoming email, the event will be automatically linked to the related objects.
 WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
-IFTTTSetup=IFTTT module setup
-IFTTT_SERVICE_KEY=IFTTT Service key
-IFTTT_DOLIBARR_ENDPOINT_SECUREKEY=Security key to secure the endpoint URL used by IFTTT to send messages to your Dolibarr.
-IFTTTDesc=This module is designed to trigger events on IFTTT and/or to execute some action on external IFTTT triggers.
-UrlForIFTTT=URL endpoint for IFTTT
-YouWillFindItOnYourIFTTTAccount=You will find it on your IFTTT account
 EndPointFor=End point for %s : %s
 DeleteEmailCollector=Delete email collector
 ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
 RecipientEmailsWillBeReplacedWithThisValue=Recipient emails will be always replaced with this value
 AtLeastOneDefaultBankAccountMandatory=At least 1 default bank account must be defined
+RESTRICT_API_ON_IP=Allow available APIs to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can use the available APIs.
+RESTRICT_ON_IP=Allow access to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can access.
+BaseOnSabeDavVersion=Based on the library SabreDAV version
+NotAPublicIp=Not a public IP
+MakeAnonymousPing=Make an anonymous Ping '+1' to the Dolibarr foundation server (done 1 time only after installation) to allow the foundation to count the number of Dolibarr installation.
diff --git a/htdocs/langs/zh_TW/banks.lang b/htdocs/langs/zh_TW/banks.lang
index 1d49810c518..282e37091bb 100644
--- a/htdocs/langs/zh_TW/banks.lang
+++ b/htdocs/langs/zh_TW/banks.lang
@@ -73,6 +73,7 @@ BankTransaction=銀行項目
 ListTransactions=分錄明細表
 ListTransactionsByCategory=分錄/類別明細表
 TransactionsToConciliate=要調節的分錄
+TransactionsToConciliateShort=To reconcile
 Conciliable=可以調節的
 Conciliate=要調節
 Conciliation=調節
@@ -116,6 +117,7 @@ DeleteCheckReceipt=刪除支票收據？
 ConfirmDeleteCheckReceipt=您確認定您要刪除此張支票收據？
 BankChecks=銀行支票
 BankChecksToReceipt=託收票據
+BankChecksToReceiptShort=託收票據
 ShowCheckReceipt=顯示支票入存收據
 NumberOfCheques=票據號碼
 DeleteTransaction=刪除項目
diff --git a/htdocs/langs/zh_TW/cashdesk.lang b/htdocs/langs/zh_TW/cashdesk.lang
index a642aa68f6c..0b46fb17dbe 100644
--- a/htdocs/langs/zh_TW/cashdesk.lang
+++ b/htdocs/langs/zh_TW/cashdesk.lang
@@ -62,6 +62,7 @@ TicketVatGrouped=Group VAT by rate in tickets
 AutoPrintTickets=Automatically print tickets
 EnableBarOrRestaurantFeatures=Enable features for Bar or Restaurant
 ConfirmDeletionOfThisPOSSale=Do your confirm the deletion of this current sale ?
+ConfirmDiscardOfThisPOSSale=Do you want to discard this current sale ?
 History=歷史紀錄
 ValidateAndClose=Validate and close
 Terminal=Terminal
@@ -69,3 +70,8 @@ NumberOfTerminals=Number of Terminals
 TerminalSelect=Select terminal you want to use:
 POSTicket=POS Ticket
 BasicPhoneLayout=Use basic layout for phones
+SetupOfTerminalNotComplete=Setup of terminal %s is not complete
+DirectPayment=Direct payment
+DirectPaymentButton=Direct cash payment button
+InvoiceIsAlreadyValidated=Invoice is already validated
+NoLinesToBill=No lines to bill
diff --git a/htdocs/langs/zh_TW/companies.lang b/htdocs/langs/zh_TW/companies.lang
index af9bea70e1e..08192b73be3 100644
--- a/htdocs/langs/zh_TW/companies.lang
+++ b/htdocs/langs/zh_TW/companies.lang
@@ -54,6 +54,7 @@ Firstname=名字
 PostOrFunction=職稱
 UserTitle=稱呼
 NatureOfThirdParty=合作方的本質
+NatureOfContact=Nature of Contact
 Address=地址
 State=州/省
 StateShort=州
diff --git a/htdocs/langs/zh_TW/contracts.lang b/htdocs/langs/zh_TW/contracts.lang
index 246a2304dc9..18d1a8c318b 100644
--- a/htdocs/langs/zh_TW/contracts.lang
+++ b/htdocs/langs/zh_TW/contracts.lang
@@ -51,6 +51,7 @@ ListOfClosedServices=關閉服務清單
 ListOfRunningServices=運行服務的列表
 NotActivatedServices=不活躍的服務（除驗證合同）
 BoardNotActivatedServices=服務激活驗證合同之間
+BoardNotActivatedServicesShort=Services to activate
 LastContracts=Latest %s contracts
 LastModifiedServices=Latest %s modified services
 ContractStartDate=開始日期
@@ -64,7 +65,10 @@ DateStartRealShort=真正的開始日期
 DateEndReal=真正的結束日期
 DateEndRealShort=真正的結束日期
 CloseService=關閉服務
-BoardRunningServices=過期的運行服務
+BoardRunningServices=Services running
+BoardRunningServicesShort=Services running
+BoardExpiredServices=Services expired
+BoardExpiredServicesShort=Services expired
 ServiceStatus=服務現狀
 DraftContracts=草稿合同
 CloseRefusedBecauseOneServiceActive=Contract can't be closed as there is at least one open service on it
diff --git a/htdocs/langs/zh_TW/errors.lang b/htdocs/langs/zh_TW/errors.lang
index f2d908bd98f..75ab659d145 100644
--- a/htdocs/langs/zh_TW/errors.lang
+++ b/htdocs/langs/zh_TW/errors.lang
@@ -218,6 +218,7 @@ ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text
 ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
 ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Error, delete payment linked to a closed invoice is not possible.
+ErrorSearchCriteriaTooSmall=Search criteria too small.
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 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/main.lang b/htdocs/langs/zh_TW/main.lang
index 6a3d99b8b94..9bb0c31703b 100644
--- a/htdocs/langs/zh_TW/main.lang
+++ b/htdocs/langs/zh_TW/main.lang
@@ -28,6 +28,7 @@ NoTemplateDefined=此電子郵件類別沒有可用的範本
 AvailableVariables=可用的替代變數
 NoTranslation=無交易
 Translation=自助翻譯
+EmptySearchString=Enter a non empty search string
 NoRecordFound=沒有找到任何紀錄
 NoRecordDeleted=沒有刪除記錄
 NotEnoughDataYet=沒有足夠資料
@@ -704,6 +705,7 @@ DateOfSignature=簽名日期
 HidePassword=顯示命令時隱藏密碼
 UnHidePassword=顯示實際命令時顯示密碼
 Root=根目錄
+RootOfMedias=Root of public medias (/medias)
 Informations=Information
 Page=頁面
 Notes=備註
@@ -981,3 +983,10 @@ PaymentInformation=Payment information
 ValidFrom=Valid from
 ValidUntil=Valid until
 NoRecordedUsers=No users
+ToClose=To close
+ToProcess=要處理
+ToApprove=To approve
+GlobalOpenedElemView=Global view
+NoArticlesFoundForTheKeyword=No article found for the keyword '<strong>%s</strong>'
+NoArticlesFoundForTheCategory=No article found for the category
+ToAcceptRefuse=To accept | refuse
diff --git a/htdocs/langs/zh_TW/members.lang b/htdocs/langs/zh_TW/members.lang
index b48f717a1ad..a57f30cb5e3 100644
--- a/htdocs/langs/zh_TW/members.lang
+++ b/htdocs/langs/zh_TW/members.lang
@@ -29,6 +29,7 @@ MenuMembersUpToDate=到今天為止成員
 MenuMembersNotUpToDate=過時成員
 MenuMembersResiliated=Terminated members
 MembersWithSubscriptionToReceive=接收與認購成員
+MembersWithSubscriptionToReceiveShort=Subscription to receive
 DateSubscription=認購日期
 DateEndSubscription=認購結束日期
 EndSubscription=認購完
diff --git a/htdocs/langs/zh_TW/projects.lang b/htdocs/langs/zh_TW/projects.lang
index c36a6b044f6..382f0f8c449 100644
--- a/htdocs/langs/zh_TW/projects.lang
+++ b/htdocs/langs/zh_TW/projects.lang
@@ -76,7 +76,13 @@ MyProjects=我的專案
 MyProjectsArea=My projects Area
 DurationEffective=有效時間
 ProgressDeclared=Declared progress
+TaskProgressSummary=Task progress
+CurentlyOpenedTasks=Curently opened tasks
+TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared progress is less %s than the calculated progression
+TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared progress is more %s than the calculated progression
 ProgressCalculated=Calculated progress
+WhichIamLinkedTo=which I'm linked to
+WhichIamLinkedToProject=which I'm linked to project
 Time=時間
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
diff --git a/htdocs/langs/zh_TW/website.lang b/htdocs/langs/zh_TW/website.lang
index 5b9f2881147..7f1d8d4246e 100644
--- a/htdocs/langs/zh_TW/website.lang
+++ b/htdocs/langs/zh_TW/website.lang
@@ -2,7 +2,7 @@
 Shortname=碼
 WebsiteSetupDesc=Create here the websites you wish to use. Then go into menu Websites to edit them.
 DeleteWebsite=Delete website
-ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed.
+ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed. The files uploaded (like into the medias directory, the ECM module, ...) will remain.
 WEBSITE_TYPE_CONTAINER=Type of page/container
 WEBSITE_PAGE_EXAMPLE=Web page to use as example
 WEBSITE_PAGENAME=Page name/alias
@@ -14,6 +14,9 @@ WEBSITE_JS_INLINE=Javascript file content (common to all pages)
 WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages)
 WEBSITE_ROBOT=Robot file (robots.txt)
 WEBSITE_HTACCESS=Website .htaccess file
+WEBSITE_MANIFEST_JSON=Website manifest.json file
+WEBSITE_README=README.md file
+EnterHereLicenseInformation=Enter here meta data or license information to fille a README.md file. if you distribute your website as a template, the file will be included into the temptate package.
 HtmlHeaderPage=HTML header (specific to this page only)
 PageNameAliasHelp=Name or alias of the page.<br>This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "<strong>%s</strong>" to edit this alias.
 EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container.
@@ -41,6 +44,7 @@ RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
 SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then set the name of the virtual host you have created in the properties of web site, so the preview can be done also using this dedicated web server access instead of the internal Dolibarr server.
 YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
+YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
 CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
 ReadPerm=閱讀
 WritePerm=Write
@@ -75,7 +79,8 @@ AddWebsiteAccount=Create web site account
 BackToListOfThirdParty=Back to list for Third Party
 DisableSiteFirst=Disable website first
 MyContainerTitle=My web site title
-AnotherContainer=Another container
+AnotherContainer=This is how to include content of another page/container (you may have an error here if you enable dynamic code because the embedded subcontainer may not exists)
+SorryWebsiteIsCurrentlyOffLine=Sorry, this website is currently off line. Please comme back later...
 WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / third party
 YouMustDefineTheHomePage=You must first define the default Home page
@@ -89,7 +94,8 @@ AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
 CorporateHomePage=Corporate Home page
 EmptyPage=Empty page
 ExternalURLMustStartWithHttp=External URL must start with http:// or https://
-ZipOfWebsitePackageToImport=Zip file of website package
+ZipOfWebsitePackageToImport=Upload the Zip file of the website template package
+ZipOfWebsitePackageToLoad=or Choose an available embedded website template package
 ShowSubcontainers=Include dynamic content
 InternalURLOfPage=Internal URL of page
 ThisPageIsTranslationOf=This page/container is a translation of
@@ -101,5 +107,10 @@ NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynam
 ReplaceWebsiteContent=Search or Replace website content
 DeleteAlsoJs=Delete also all javascript files specific to this website?
 DeleteAlsoMedias=Delete also all medias files specific to this website?
-# Export
 MyWebsitePages=My website pages
+SearchReplaceInto=Search | Replace into
+ReplaceString=New string
+CSSContentTooltipHelp=Enter here CSS content. To avoid any conflict with the CSS of the application, be sure to prepend all declaration with the .bodywebsite class. For example:<br><br>#mycssselector, input.myclass:hover { ... }<br>must be<br>.bodywebsite #mycssselector, .bodywebsite input.myclass:hover { ... }<br><br>Note: If you have a large file without this prefix, you can use 'lessc' to convert it to append the .bodywebsite prefix everywhere.
+LinkAndScriptsHereAreNotLoadedInEditor=Warning: This content is output only when site is accessed from a server. It is not used in Edit mode so if you need to load javascript files also in edit mode, just add your tag 'script src=...' into the page.
+Dynamiccontent=Sample of a page with dynamic content
+ImportSite=Import website template
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 65464d724b1..4738aa90419 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -111,13 +111,15 @@ function testSqlAndScriptInject($val, $type)
 	$inj += preg_match('/Set\.constructor/i', $val);	// ECMA script 6
 	if (! defined('NOSTYLECHECK')) $inj += preg_match('/<style/i', $val);
 	$inj += preg_match('/base[\s]+href/si', $val);
-	$inj += preg_match('/<.*onmouse/si', $val);       // onmousexxx can be set on img or any html tag like <img title='...' onmouseover=alert(1)>
-	$inj += preg_match('/onerror\s*=/i', $val);       // onerror can be set on img or any html tag like <img title='...' onerror = alert(1)>
-	$inj += preg_match('/onfocus\s*=/i', $val);       // onfocus can be set on input text html tag like <input type='text' value='...' onfocus = alert(1)>
-	$inj += preg_match('/onload\s*=/i', $val);        // onload can be set on svg tag <svg/onload=alert(1)> or other tag like body <body onload=alert(1)>
-	$inj += preg_match('/onloadstart\s*=/i', $val);   // onload can be set on audio tag <audio onloadstart=alert(1)>
-	$inj += preg_match('/onclick\s*=/i', $val);       // onclick can be set on img text html tag like <img onclick = alert(1)>
-	$inj += preg_match('/onscroll\s*=/i', $val);      // onscroll can be on textarea
+	// List of dom events is on https://www.w3schools.com/jsref/dom_obj_event.asp
+	$inj += preg_match('/onmouse([a-z]*)\s*=/i', $val);       // onmousexxx can be set on img or any html tag like <img title='...' onmouseover=alert(1)>
+	$inj += preg_match('/ondrag([a-z]*)\s*=/i', $val);        //
+	$inj += preg_match('/ontouch([a-z]*)\s*=/i', $val);        //
+	$inj += preg_match('/on(abort|afterprint|beforeprint|beforeunload|blur|canplay|canplaythrough|change|click|contextmenu|copy|cut)\s*=/i', $val);
+	$inj += preg_match('/on(dblclick|drop|durationchange|ended|error|focus|focusin|focusout|hashchange|input|invalid)\s*=/i', $val);
+	$inj += preg_match('/on(keydown|keypress|keyup|load|loadeddata|loadedmetadata|loadstart|offline|online|pagehide|pageshow)\s*=/i', $val);
+	$inj += preg_match('/on(paste|pause|play|playing|progress|ratechange|resize|reset|scroll|search|seeking|select|show|stalled|start|submit|suspend)\s*=/i', $val);
+	$inj += preg_match('/on(timeupdate|toggle|unload|volumechange|waiting)\s*=/i', $val);
 	//$inj += preg_match('/on[A-Z][a-z]+\*=/', $val);   // To lock event handlers onAbort(), ...
 	$inj += preg_match('/&#58;|&#0000058|&#x3A/i', $val);		// refused string ':' encoded (no reason to have it encoded) to lock 'javascript:...'
 	//if ($type == 1)
@@ -1773,7 +1775,7 @@ function top_menu_user(User $user, Translate $langs)
     $dropdownBody.= '<br>';
 
     $dropdownBody.= '<br><u>'.$langs->trans("Session").'</u>';
-    $dropdownBody.= '<br><b>'.$langs->trans("IPAddress").'</b>: '.$_SERVER["REMOTE_ADDR"];
+    $dropdownBody.= '<br><b>'.$langs->trans("IPAddress").'</b>: '.dol_escape_htmltag($_SERVER["REMOTE_ADDR"]);
     if (! empty($conf->global->MAIN_MODULE_MULTICOMPANY)) $dropdownBody.= '<br><b>'.$langs->trans("ConnectedOnMultiCompany").':</b> '.$conf->entity.' (user entity '.$user->entity.')';
     $dropdownBody.= '<br><b>'.$langs->trans("AuthenticationMode").':</b> '.$_SESSION["dol_authmode"].(empty($dolibarr_main_demo)?'':' (demo)');
     $dropdownBody.= '<br><b>'.$langs->trans("ConnectedSince").':</b> '.dol_print_date($user->datelastlogin, "dayhour", 'tzuser');
@@ -1782,7 +1784,7 @@ function top_menu_user(User $user, Translate $langs)
     $dropdownBody.= '<br><b>'.$langs->trans("CurrentMenuManager").':</b> '.$menumanager->name;
     $langFlag=picto_from_langcode($langs->getDefaultLang());
     $dropdownBody.= '<br><b>'.$langs->trans("CurrentUserLanguage").':</b> '.($langFlag?$langFlag.' ':'').$langs->getDefaultLang();
-    $dropdownBody.= '<br><b>'.$langs->trans("Browser").':</b> '.$conf->browser->name.($conf->browser->version?' '.$conf->browser->version:'').' ('.$_SERVER['HTTP_USER_AGENT'].')';
+    $dropdownBody.= '<br><b>'.$langs->trans("Browser").':</b> '.$conf->browser->name.($conf->browser->version?' '.$conf->browser->version:'').' ('.dol_escape_htmltag($_SERVER['HTTP_USER_AGENT']).')';
     $dropdownBody.= '<br><b>'.$langs->trans("Layout").':</b> '.$conf->browser->layout;
     $dropdownBody.= '<br><b>'.$langs->trans("Screen").':</b> '.$_SESSION['dol_screenwidth'].' x '.$_SESSION['dol_screenheight'];
     if ($conf->browser->layout == 'phone') $dropdownBody.= '<br><b>'.$langs->trans("Phone").':</b> '.$langs->trans("Yes");
diff --git a/htdocs/modulebuilder/template/core/modules/mailings/mailinglist_mymodule_myobject.modules.php b/htdocs/modulebuilder/template/core/modules/mailings/mailinglist_mymodule_myobject.modules.php
index 07419af532d..854e7f37bd5 100644
--- a/htdocs/modulebuilder/template/core/modules/mailings/mailinglist_mymodule_myobject.modules.php
+++ b/htdocs/modulebuilder/template/core/modules/mailings/mailinglist_mymodule_myobject.modules.php
@@ -97,16 +97,14 @@ class mailing_mailinglist_mymodule_myobject extends MailingTargets
      *  This is the main function that returns the array of emails
      *
      *  @param  int     $mailing_id     Id of emailing
-     *  @param  array   $cibles         Array with targets
      *  @return int                     <0 if error, number of emails added if ok
      */
-    public function add_to_target($mailing_id, $cibles)
+    public function add_to_target($mailing_id)
     {
         // phpcs:enable
         $target = array();
         $j = 0;
 
-
         $sql = " select rowid as id, email, firstname, lastname, plan, partner";
         $sql.= " from ".MAIN_DB_PREFIX."myobject";
         $sql.= " where email IS NOT NULL AND email != ''";
@@ -161,7 +159,7 @@ class mailing_mailinglist_mymodule_myobject extends MailingTargets
 
         // ----- Your code end here -----
 
-        return parent::add_to_target($mailing_id, $target);
+        return parent::addTargetsToDatabase($mailing_id, $target);
     }
 
 
diff --git a/htdocs/modulebuilder/template/lib/mymodule.lib.php b/htdocs/modulebuilder/template/lib/mymodule.lib.php
index cec23bd3c11..362b505e070 100644
--- a/htdocs/modulebuilder/template/lib/mymodule.lib.php
+++ b/htdocs/modulebuilder/template/lib/mymodule.lib.php
@@ -52,7 +52,7 @@ function mymoduleAdminPrepareHead()
 	//$this->tabs = array(
 	//	'entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'
 	//); // to remove a tab
-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'mymodule');
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'mymodule');
 
 	return $head;
 }
diff --git a/htdocs/modulebuilder/template/myobject_card.php b/htdocs/modulebuilder/template/myobject_card.php
index 28c817658f6..72bc424c53c 100644
--- a/htdocs/modulebuilder/template/myobject_card.php
+++ b/htdocs/modulebuilder/template/myobject_card.php
@@ -256,7 +256,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	// Confirmation to delete
 	if ($action == 'delete')
 	{
-	    $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('DeleteMyObject'), $langs->trans('ConfirmDeleteMyObject'), 'confirm_delete', '', 0, 1);
+	    $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('DeleteMyObject'), $langs->trans('ConfirmDeleteObject'), 'confirm_delete', '', 0, 1);
 	}
 	// Confirmation to delete line
 	if ($action == 'deleteline')
diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php
index 555e01d7896..497f46919fd 100644
--- a/htdocs/modulebuilder/template/myobject_list.php
+++ b/htdocs/modulebuilder/template/myobject_list.php
@@ -221,8 +221,8 @@ if (! empty($extrafields->attributes[$object->table_element]['label']))
 // Add fields from hooks
 $parameters=array();
 $reshook=$hookmanager->executeHooks('printFieldListSelect', $parameters, $object);    // Note that $action and $object may have been modified by hook
-$sql.=$hookmanager->resPrint;
-$sql=preg_replace('/, $/', '', $sql);
+$sql.=preg_replace('/^,/', '', $hookmanager->resPrint);
+$sql =preg_replace('/,\s*$/', '', $sql);
 $sql.= " FROM ".MAIN_DB_PREFIX.$object->table_element." as t";
 if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX.$object->table_element."_extrafields as ef on (t.rowid = ef.fk_object)";
 if ($object->ismultientitymanaged == 1) $sql.= " WHERE t.entity IN (".getEntity($object->element).")";
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 9c515d619c6..9866df3d736 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -284,14 +284,14 @@ class Product extends CommonObject
      * @var int
      */
     public $barcode_type;
-    
+
     /**
      * Main Barcode type code
      *
      * @var string
      */
     public $barcode_type_code;
-    
+
     /**
      * Additional barcodes (Some products have different barcodes according to the country of origin of manufacture)
      *
@@ -447,7 +447,7 @@ class Product extends CommonObject
             $error=0;
 
         // Clean parameters
-        $this->ref = dol_string_nospecial(trim($this->ref));
+        $this->ref = dol_sanitizeFileName(dol_string_nospecial(trim($this->ref)));
         $this->label = trim($this->label);
         $this->price_ttc=price2num($this->price_ttc);
         $this->price=price2num($this->price);
@@ -2052,7 +2052,7 @@ class Product extends CommonObject
         $sql.= " fk_price_expression, price_autogen";
         $sql.= " FROM ".MAIN_DB_PREFIX."product";
         if ($id) {
-            $sql.= " WHERE rowid = ".$this->db->escape($id);
+            $sql.= " WHERE rowid = ".(int) $id;
         } else {
             $sql.= " WHERE entity IN (".getEntity($this->element).")";
             if ($ref) {
diff --git a/htdocs/product/inventory/class/inventory.class.php b/htdocs/product/inventory/class/inventory.class.php
index 62cfc476ba8..85b174ea725 100644
--- a/htdocs/product/inventory/class/inventory.class.php
+++ b/htdocs/product/inventory/class/inventory.class.php
@@ -59,7 +59,7 @@ class Inventory extends CommonObject
 	 *  'type' if the field format.
 	 *  'label' the translation key.
 	 *  'enabled' is a condition when the field must be managed.
-	 *  'visible' says if field is visible in list (Examples: 0=Not visible, 1=Visible on list and create/update/view forms, 2=Visible on list only. Using a negative value means field is not shown by default on list but can be selected for viewing)
+	 *  'visible' says if field is visible in list (Examples: 0=Not visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create). Using a negative value means field is not shown by default on list but can be selected for viewing)
 	 *  'notnull' is set to 1 if not null in database. Set to -1 if we must set data to null if empty ('' or 0).
 	 *  'index' if we want an index in database.
 	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
@@ -96,7 +96,7 @@ class Inventory extends CommonObject
 		//'fk_user_valid' =>array('type'=>'integer',      'label'=>'UserValidation',        'enabled'=>1, 'visible'=>-1, 'position'=>512),
 		'import_key'    =>array('type'=>'varchar(14)',  'label'=>'ImportId',         'enabled'=>1, 'visible'=>-2, 'notnull'=>-1, 'index'=>0,  'position'=>1000),
 
-		'status' => array('type'=>'integer', 'label'=>'Status', 'visible'=>1, 'enabled'=>1, 'position'=>1000, 'default'=>0, 'arrayofkeyval'=>array(0=>'Todo', 1=>'Done', -1=>'Cancel')),
+		'status' => array('type'=>'integer', 'label'=>'Status', 'visible'=>4, 'enabled'=>1, 'position'=>1000, 'default'=>0, 'arrayofkeyval'=>array(0=>'ToDo', 1=>'Done', -1=>'Cancel')),
 	);
 
 	/**
diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index 7677e82e1b4..43188c5fe7c 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -450,6 +450,10 @@ if ($resql)
 	if($type == Product::TYPE_SERVICE) $rightskey='service';
 	if($user->rights->{$rightskey}->creer)
 	{
+		if ($type === "") {
+			$newcardbutton.= dolGetButtonTitle($langs->trans('NewProduct'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/product/card.php?action=create&amp;type=0');
+			$type = Product::TYPE_SERVICE;
+		}
 		$label='NewProduct';
 		if($type == Product::TYPE_SERVICE) $label='NewService';
         $newcardbutton.= dolGetButtonTitle($langs->trans($label), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/product/card.php?action=create&amp;type='.$type);
diff --git a/htdocs/projet/activity/perday.php b/htdocs/projet/activity/perday.php
index 52028ac7160..d06d38ad390 100644
--- a/htdocs/projet/activity/perday.php
+++ b/htdocs/projet/activity/perday.php
@@ -515,7 +515,7 @@ $moreforfilter='';
 // If the user can view user other than himself
 $moreforfilter.='<div class="divsearchfield">';
 $moreforfilter.='<div class="inline-block hideonsmartphone">'.$langs->trans('User'). ' </div>';
-$includeonly='hierachyme';
+$includeonly='hierarchyme';
 if (empty($user->rights->user->user->lire)) $includeonly=array($user->id);
 $moreforfilter.=$form->select_dolusers($search_usertoprocessid?$search_usertoprocessid:$usertoprocess->id, 'search_usertoprocessid', $user->rights->user->user->lire?0:0, null, 0, $includeonly, null, 0, 0, 0, '', 0, '', 'maxwidth200 marginleftonly');
 $moreforfilter.='</div>';
diff --git a/htdocs/projet/activity/perweek.php b/htdocs/projet/activity/perweek.php
index 80745b5d352..4c4f1844be3 100644
--- a/htdocs/projet/activity/perweek.php
+++ b/htdocs/projet/activity/perweek.php
@@ -564,7 +564,7 @@ if (! empty($conf->categorie->enabled))
 // If the user can view user other than himself
 $moreforfilter.='<div class="divsearchfield">';
 $moreforfilter.='<div class="inline-block hideonsmartphone">'.$langs->trans('User'). ' </div>';
-$includeonly='hierachyme';
+$includeonly='hierarchyme';
 if (empty($user->rights->user->user->lire)) $includeonly=array($user->id);
 $moreforfilter.=$form->select_dolusers($search_usertoprocessid?$search_usertoprocessid:$usertoprocess->id, 'search_usertoprocessid', $user->rights->user->user->lire?0:0, null, 0, $includeonly, null, 0, 0, 0, '', 0, '', 'maxwidth200');
 $moreforfilter.='</div>';
diff --git a/htdocs/projet/index.php b/htdocs/projet/index.php
index fa908de8b6d..c025fe91ab5 100644
--- a/htdocs/projet/index.php
+++ b/htdocs/projet/index.php
@@ -248,6 +248,9 @@ if ($resql)
 else dol_print_error($db);
 
 
+$companystatic=new Societe($db);    // We need a clean new object for next loop because current one has some properties set.
+
+
 // Open project per thirdparty
 print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder" width="100%">';
diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index 34dd5547f7b..e355cdcbf34 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -504,7 +504,7 @@ if (! empty($conf->categorie->enabled))
 // If the user can view user other than himself
 $moreforfilter.='<div class="divsearchfield">';
 $moreforfilter.=$langs->trans('ProjectsWithThisUserAsContact'). ': ';
-$includeonly='hierachyme';
+$includeonly='hierarchyme';
 if (empty($user->rights->user->user->lire)) $includeonly=array($user->id);
 $moreforfilter.=$form->select_dolusers($search_project_user?$search_project_user:'', 'search_project_user', 1, '', 0, $includeonly, '', 0, 0, 0, '', 0, '', 'maxwidth200');
 $moreforfilter.='</div>';
diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index a9e712c92db..dbceb483f97 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -2109,13 +2109,13 @@ if (preg_match('/^dopayment/', $action))			// If we choosed/click on the payment
                     	payment_method_data: {
         			        billing_details: {
         			        	name: cardholderName.value
-        			        	<?php if (GETPOST('email', 'alpha')) { ?>, email: '<?php echo GETPOST('email', 'alpha'); ?>'<?php } ?>
-        			        	<?php if (is_object($object) && is_object($object->thirdparty) && is_object($object->thirdparty->phone)) { ?>, phone: '<?php echo $object->thirdparty->phone; ?>'<?php } ?>
+        			        	<?php if (GETPOST('email', 'alpha')) { ?>, email: '<?php echo dol_escape_js(GETPOST('email', 'alpha')); ?>'<?php } ?>
+        			        	<?php if (is_object($object) && is_object($object->thirdparty) && is_object($object->thirdparty->phone)) { ?>, phone: '<?php echo dol_escape_js($object->thirdparty->phone); ?>'<?php } ?>
         			        	<?php if (is_object($object) && is_object($object->thirdparty)) { ?>, address: {
-        			        	    city: '<?php echo $object->thirdparty->town; ?>',
-        			        	    country: '<?php echo $object->thirdparty->country_code; ?>',
-        			        	    line1: '<?php echo $object->thirdparty->address; ?>',
-        			        	    postal_code: '<?php echo $object->thirdparty->zip; ?>'}<?php } ?>
+        			        	    city: '<?php echo dol_escape_js($object->thirdparty->town); ?>',
+        			        	    country: '<?php echo dol_escape_js($object->thirdparty->country_code); ?>',
+        			        	    line1: '<?php echo dol_escape_js(preg_replace('/\s\s+/', ' ', $object->thirdparty->address)); ?>',
+        			        	    postal_code: '<?php echo dol_escape_js($object->thirdparty->zip); ?>'}<?php } ?>
         			        }	/* TODO Add all other known data like emails, ... to be SCA compliant */
               			},
               			save_payment_method: <?php if ($stripecu) { print 'true'; } else { print 'false'; } ?>	/* true when a customer was provided when creating payment intent. true ask to save the card */
diff --git a/htdocs/reception/card.php b/htdocs/reception/card.php
index 7cbd77dd4da..b9156b1837b 100644
--- a/htdocs/reception/card.php
+++ b/htdocs/reception/card.php
@@ -11,7 +11,7 @@
  * Copyright (C) 2015		Claudio Aschieri		<c.aschieri@19.coop>
  * Copyright (C) 2016		Ferran Marcet			<fmarcet@2byte.es>
  * Copyright (C) 2016		Yasser Carreón			<yacasia@gmail.com>
- * Copyright (C) 2018	   Quentin Vial-Gouteyron    <quentin.vial-gouteyron@atm-consulting.fr>
+ * Copyright (C) 2018	    Quentin Vial-Gouteyron  <quentin.vial-gouteyron@atm-consulting.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
@@ -56,7 +56,7 @@ if (! empty($conf->projet->enabled)) {
     require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 }
 
-$langs->loadLangs(array("receptions","companies","bills",'deliveries','orders','stocks','other','propal'));
+$langs->loadLangs(array("receptions","companies","bills",'deliveries','orders','stocks','other','propal','sendings'));
 
 if (!empty($conf->incoterm->enabled)) $langs->load('incoterm');
 if (! empty($conf->productbatch->enabled)) $langs->load('productbatch');
diff --git a/htdocs/reception/tpl/linkedobjectblock.tpl.php b/htdocs/reception/tpl/linkedobjectblock.tpl.php
index 9601c661c70..2b66b76e9dd 100644
--- a/htdocs/reception/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/reception/tpl/linkedobjectblock.tpl.php
@@ -1,6 +1,7 @@
 <?php
-/* Copyright (C) 2012 Regis Houssin <regis.houssin@capnetworks.com>
- * Copyright (C) 2014 Marcos García <marcosgdf@gmail.com>
+/* Copyright (C) 2012 Regis Houssin       <regis.houssin@inodbox.com>
+ * Copyright (C) 2014 Marcos García       <marcosgdf@gmail.com>
+ * Copyright (C) 2019 Laurent Destailleur <eldy@users.sourceforge.net>
  *
  * 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
@@ -15,6 +16,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
+
+// Protection to avoid direct call of template
+if (empty($conf) || ! is_object($conf))
+{
+	print "Error, template page can't be called as URL";
+	exit;
+}
+
 ?>
 
 <!-- BEGIN PHP TEMPLATE -->
@@ -22,41 +31,47 @@
 <?php
 
 global $user;
+global $noMoreLinkedObjectBlockAfter;
 
 $langs = $GLOBALS['langs'];
 $linkedObjectBlock = $GLOBALS['linkedObjectBlock'];
 
+// Load translation files required by the page
 $langs->load("receptions");
 
+$linkedObjectBlock = dol_sort_array($linkedObjectBlock, 'date', 'desc', 0, 0, 1);
+
 $total=0; $ilink=0;
-$var=true;
 foreach($linkedObjectBlock as $key => $objectlink)
 {
     $ilink++;
 
-    $trclass=($var?'pair':'impair');
+    $trclass='oddeven';
     if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass.=' liste_sub_total';
 ?>
     <tr class="<?php echo $trclass; ?>">
-        <td><?php echo $langs->trans("Reception"); ?></td>
-        <td><?php echo $objectlink->getNomUrl(1); ?></td>
-        <td></td>
-    	<td class="center"><?php echo dol_print_date($objectlink->date_delivery, 'day'); ?></td>
-    	<td class="right"><?php
+        <td class="linkedcol-element"><?php echo $langs->trans("Reception"); ?>
+        <?php if(!empty($showImportButton) && $conf->global->MAIN_ENABLE_IMPORT_LINKED_OBJECT_LINES) print '<a class="objectlinked_importbtn" href="'.$objectlink->getNomUrl(0, '', 0, 1).'&amp;action=selectlines"  data-element="'.$objectlink->element.'"  data-id="'.$objectlink->id.'"  > <i class="fa fa-indent"></i> </a';  ?>
+        </td>
+        <td class="linkedcol-name" ><?php echo $objectlink->getNomUrl(1); ?></td>
+        <td class="linkedcol-ref" align="center"></td>
+    	<td class="linkedcol-date" align="center"><?php echo dol_print_date($objectlink->date_delivery, 'day'); ?></td>
+    	<td class="linkedcol-amount right"><?php
     		if ($user->rights->reception->lire) {
     			$total = $total + $objectlink->total_ht;
     			echo price($objectlink->total_ht);
     		} ?></td>
-    	<td class="right"><?php echo $objectlink->getLibStatut(3); ?></td>
-    	<td class="right">
+    	<td class="linkedcol-statut right"><?php echo $objectlink->getLibStatut(3); ?></td>
+    	<td class="linkedcol-action right">
     		<?php
     		// For now, receptions must stay linked to order, so link is not deletable
     		if($object->element != 'order_supplier') {
     			?>
-    			<a href="<?php echo $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&dellinkid='.$key; ?>"><?php echo img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink'); ?></a></td>
+    			<a href="<?php echo $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&dellinkid='.$key; ?>"><?php echo img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink'); ?></a>
     			<?php
     		}
     		?>
+   		</td>
     </tr>
 <?php
 }
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 2086c248bb1..1ef4de8ae64 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -1159,6 +1159,7 @@ class Societe extends CommonObject
 							if ($result < 0)
 							{
 								$this->error=$lmember->error;
+								$this->errors = array_merge($this->errors, $lmember->errors);
 								dol_syslog(get_class($this)."::update ".$this->error, LOG_ERR);
 								$error++;
 							}
diff --git a/htdocs/stripe/class/stripe.class.php b/htdocs/stripe/class/stripe.class.php
index d0459e1e288..abc875c370f 100644
--- a/htdocs/stripe/class/stripe.class.php
+++ b/htdocs/stripe/class/stripe.class.php
@@ -383,6 +383,7 @@ class Stripe extends CommonObject
             {
                 $metadata['dol_type'] = $object->element;
                 $metadata['dol_id'] = $object->id;
+				if (is_object($object->thirdparty) && $object->thirdparty->id > 0) $metadata['dol_thirdparty_id'] = $object->thirdparty->id;
             }
 
     		$dataforintent = array(
diff --git a/htdocs/supplier_proposal/admin/supplier_proposal_extrafields.php b/htdocs/supplier_proposal/admin/supplier_proposal_extrafields.php
index c97ea508448..49b581617bc 100644
--- a/htdocs/supplier_proposal/admin/supplier_proposal_extrafields.php
+++ b/htdocs/supplier_proposal/admin/supplier_proposal_extrafields.php
@@ -66,43 +66,7 @@ $head = supplier_proposal_admin_prepare_head();
 
 dol_fiche_head($head, 'attributes', $langs->trans("CommRequests"), -1, 'supplier_proposal');
 
-
-print $langs->trans("DefineHereComplementaryAttributes", $textobject).'<br>'."\n";
-print '<br>';
-
-// Load attribute_label
-$extrafields->fetch_name_optionals_label($elementtype);
-
-print "<table summary=\"listofattributes\" class=\"noborder\" width=\"100%\">";
-
-print '<tr class="liste_titre">';
-print '<td class="center">'.$langs->trans("Position").'</td>';
-print '<td>'.$langs->trans("Label").'</td>';
-print '<td>'.$langs->trans("AttributeCode").'</td>';
-print '<td>'.$langs->trans("Type").'</td>';
-print '<td class="right">'.$langs->trans("Size").'</td>';
-print '<td class="center">'.$langs->trans("Unique").'</td>';
-print '<td class="center">'.$langs->trans("Required").'</td>';
-print '<td width="80">&nbsp;</td>';
-print "</tr>\n";
-
-foreach($extrafields->attribute_type as $key => $value)
-{
-    print '<tr class="oddeven">';
-    print "<td>".$extrafields->attribute_pos[$key]."</td>\n";
-    print "<td>".$extrafields->attribute_label[$key]."</td>\n";
-    print "<td>".$key."</td>\n";
-    print "<td>".$type2label[$extrafields->attribute_type[$key]]."</td>\n";
-    print '<td class="right">'.$extrafields->attribute_size[$key]."</td>\n";
-    print '<td class="center">'.yn($extrafields->attribute_unique[$key])."</td>\n";
-    print '<td class="center">'.yn($extrafields->attribute_required[$key])."</td>\n";
-    print '<td class="right"><a href="'.$_SERVER["PHP_SELF"].'?action=edit&attrname='.$key.'">'.img_edit().'</a>';
-    print "&nbsp; <a href=\"".$_SERVER["PHP_SELF"]."?action=delete&attrname=$key\">".img_delete()."</a></td>\n";
-    print "</tr>";
-    //      $i++;
-}
-
-print "</table>";
+require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
 dol_fiche_end();
 
diff --git a/htdocs/supplier_proposal/admin/supplier_proposaldet_extrafields.php b/htdocs/supplier_proposal/admin/supplier_proposaldet_extrafields.php
index c54e65ad825..81d1e39791c 100644
--- a/htdocs/supplier_proposal/admin/supplier_proposaldet_extrafields.php
+++ b/htdocs/supplier_proposal/admin/supplier_proposaldet_extrafields.php
@@ -71,40 +71,7 @@ $head = supplier_proposal_admin_prepare_head();
 
 dol_fiche_head($head, 'attributeslines', $langs->trans("CommRequests"), -1, 'supplier_proposal');
 
-
-print $langs->trans("DefineHereComplementaryAttributes", $textobject).'<br>'."\n";
-print '<br>';
-
-// Load attribute_label
-$extrafields->fetch_name_optionals_label($elementtype);
-
-print "<table summary=\"listofattributes\" class=\"noborder\" width=\"100%\">";
-
-print '<tr class="liste_titre">';
-print '<td>'.$langs->trans("Label").'</td>';
-print '<td>'.$langs->trans("AttributeCode").'</td>';
-print '<td>'.$langs->trans("Type").'</td>';
-print '<td class="right">'.$langs->trans("Size").'</td>';
-print '<td class="center">'.$langs->trans("Unique").'</td>';
-print '<td class="center">'.$langs->trans("Required").'</td>';
-print '<td width="80">&nbsp;</td>';
-print "</tr>\n";
-
-foreach($extrafields->attribute_type as $key => $value)
-{
-    print '<tr class="oddeven">';
-    print "<td>".$extrafields->attribute_label[$key]."</td>\n";
-    print "<td>".$key."</td>\n";
-    print "<td>".$type2label[$extrafields->attribute_type[$key]]."</td>\n";
-    print '<td class="right">'.$extrafields->attribute_size[$key]."</td>\n";
-    print '<td class="center">'.yn($extrafields->attribute_unique[$key])."</td>\n";
-    print '<td class="center">'.yn($extrafields->attribute_required[$key])."</td>\n";
-    print '<td class="right"><a href="'.$_SERVER["PHP_SELF"].'?action=edit&attrname='.$key.'">'.img_edit().'</a>';
-    print "&nbsp; <a href=\"".$_SERVER["PHP_SELF"]."?action=delete&attrname=$key\">".img_delete()."</a></td>\n";
-    print "</tr>";
-}
-
-print "</table>";
+require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
 dol_fiche_end();
 
diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index 56473959a39..551a5f0616e 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -1711,7 +1711,7 @@ if ($action == 'create')
 	if (! empty($conf->global->SUPPLIER_PROPOSAL_WITH_PREDEFINED_PRICES_ONLY)) $senderissupplier=1;
 
 	if (! empty($object->lines))
-		$ret = $object->printObjectLines($action, $soc, $mysoc, $lineid, 1);
+		$ret = $object->printObjectLines($action, $soc, $mysoc, $lineid, $dateSelector);
 
 	// Form to add new line
 	if ($object->statut == SupplierProposal::STATUS_DRAFT && $user->rights->supplier_proposal->creer)
@@ -1719,7 +1719,7 @@ if ($action == 'create')
 		if ($action != 'editline')
 		{
 			// Add products/services form
-			$object->formAddObjectLine(1, $soc, $mysoc);
+			$object->formAddObjectLine($dateSelector, $soc, $mysoc);
 
 			$parameters = array();
 			$reshook = $hookmanager->executeHooks('formAddObjectLine', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
diff --git a/htdocs/takepos/invoice.php b/htdocs/takepos/invoice.php
index 1729e22427c..6ae5429d062 100644
--- a/htdocs/takepos/invoice.php
+++ b/htdocs/takepos/invoice.php
@@ -37,7 +37,7 @@ require_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php';
 require_once DOL_DOCUMENT_ROOT . '/compta/paiement/class/paiement.class.php';
 require_once DOL_DOCUMENT_ROOT . '/core/class/html.form.class.php';
 
-$langs->loadLangs(array("companies","commercial","bills", "cashdesk"));
+$langs->loadLangs(array("companies", "commercial", "bills", "cashdesk", "stocks"));
 
 $id = GETPOST('id', 'int');
 $action = GETPOST('action', 'alpha');
diff --git a/htdocs/takepos/takepos.php b/htdocs/takepos/takepos.php
index b7061c0e135..d049e46c63d 100644
--- a/htdocs/takepos/takepos.php
+++ b/htdocs/takepos/takepos.php
@@ -47,6 +47,8 @@ if ($setterminal>0)
 	$_SESSION["takeposterminal"]=$setterminal;
 }
 
+$_SESSION["urlfrom"]='/takepos/takepos.php';
+
 $langs->loadLangs(array("bills","orders","commercial","cashdesk","receiptprinter"));
 
 $categorie = new Categorie($db);
@@ -149,7 +151,7 @@ if(localStorage.hasKeyboard) {
 function ClearSearch() {
 	console.log("ClearSearch");
 	$("#search").val('');
-	<?php if ($conf->browser->layer == 'classic') { ?>
+	<?php if ($conf->browser->layout == 'classic') { ?>
 	setFocusOnSearchField();
 	<?php } ?>
 }
@@ -349,6 +351,7 @@ function deleteline() {
 	$("#poslines").load("invoice.php?action=deleteline&place="+place+"&idline="+selectedline, function() {
 		//$('#poslines').scrollTop($('#poslines')[0].scrollHeight);
 	});
+	ClearSearch();
 }
 
 function Customer() {
@@ -398,6 +401,7 @@ function New() {
     	$("#poslines").load("invoice.php?action=delete&place="+place, function() {
     		//$('#poslines').scrollTop($('#poslines')[0].scrollHeight);
     	});
+		ClearSearch();
 	}
 }
 
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index f1faa731f78..82001a31a41 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -742,7 +742,7 @@ select.selectarrowonleft option {
 .hideobject { display: none; }
 .minwidth50  { min-width: 50px; }
 /* rule for not too small screen only */
-@media only screen and (min-width: <?php echo round($nbtopmenuentries * 45, 0) + 7; ?>px)
+@media only screen and (min-width: <?php echo empty($conf->global->THEME_ELDY_WITDHOFFSET_FOR_REDUC3) ? round($nbtopmenuentries * 47, 0) + 40 : $conf->global->THEME_ELDY_WITDHOFFSET_FOR_REDUC3; ?>px)
 {
 	.width25  { width: 25px; }
     .width50  { width: 50px; }
@@ -1058,7 +1058,7 @@ div.vmenu, td.vmenu {
 .menuhider { display: none !important; }
 
 /* rule to reduce top menu - 3rd reduction: The menu for user is on left */
-@media only screen and (max-width: <?php echo round($nbtopmenuentries * 50, 0) + 12; ?>px)	/* reduction 3 */
+@media only screen and (max-width: <?php echo empty($conf->global->THEME_ELDY_WITDHOFFSET_FOR_REDUC3) ? round($nbtopmenuentries * 47, 0) + 40 : $conf->global->THEME_ELDY_WITDHOFFSET_FOR_REDUC3; ?>px)	/* reduction 3 */
 {
 body.sidebar-collapse .side-nav {
 	display: none;
@@ -1069,6 +1069,8 @@ body.sidebar-collapse .login_block {
 }
 
 .menuhider { display: block !important; }
+.dropdown-user-image { display: none; }
+.user-header { height: auto !important; color: rgb(<?php echo $colorbackbody; ?>); }
 
 #id-container {
 	width: 100%;
@@ -2205,6 +2207,9 @@ img.toolbarbutton {
     height: 30px;
 }
 
+li.expanded > a.fmdirlia.jqft.ecmjqft {
+    font-weight: bold !important;
+}
 
 
 
@@ -5729,10 +5734,13 @@ div.tabsElem a.tab {
     }
 
 	.titlefield {
-	    width: auto !important;		/* We want to ignor the 30%, try to use more if you can */
+	    width: auto !important;		/* We want to ignore the 30%, try to use more if you can */
 	}
-	.tableforfield>tr>td:first-child {
-	    max-width: 100px;			/* but no more than 100px */
+	.tableforfield>tr>td:first-child, .tableforfield>tbody>tr>td:first-child, div.tableforfield div.tagtr>div.tagtd:first-of-type {
+	    /* max-width: 100px; */			/* but no more than 100px */
+	}
+	.tableforfield>tr>td:nth-child(2), .tableforfield>tbody>tr>td:nth-child(2), div.tableforfield div.tagtr>div.tagtd:nth-child(2) {
+	    word-break: break-word;
 	}
 	.badge {
 		line-height: 1.2em;
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index dfb180f0dad..3b8e1fc7329 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -192,6 +192,7 @@ $colortext=join(',', colorStringToArray($colortext));
 $colortextlink=join(',', colorStringToArray($colortextlink));
 
 $nbtopmenuentries=$menumanager->showmenu('topnb');
+if ($conf->browser->layout == 'phone') $nbtopmenuentries = max($nbtopmenuentries, 10);
 
 
 $minwidthtmenu=66;		/* minimum width for one top menu entry */
diff --git a/htdocs/theme/md/img/title_ticket.png b/htdocs/theme/md/img/title_ticket.png
new file mode 100644
index 00000000000..b1cf5df0e75
Binary files /dev/null and b/htdocs/theme/md/img/title_ticket.png differ
diff --git a/htdocs/theme/md/img/title_ticketsup.png b/htdocs/theme/md/img/title_ticketsup.png
deleted file mode 100644
index 3ec332075e6..00000000000
Binary files a/htdocs/theme/md/img/title_ticketsup.png and /dev/null differ
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 86beb45dce2..3b9064e51a1 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -195,6 +195,7 @@ $colortext=join(',', colorStringToArray($colortext));
 $colortextlink=join(',', colorStringToArray($colortextlink));
 
 $nbtopmenuentries=$menumanager->showmenu('topnb');
+if ($conf->browser->layout == 'phone') $nbtopmenuentries = max($nbtopmenuentries, 10);
 
 print '/*'."\n";
 print 'colorbackbody='.$colorbackbody."\n";
@@ -1132,11 +1133,17 @@ select.selectarrowonleft option {
    	}
 }
 .linkobject { cursor: pointer; }
+
+table.tableforfield tr>td:first-of-type, div.tableforfield div.tagtr>div.tagtd:first-of-type {
+	color: #666;
+}
+
 <?php if (GETPOST('optioncss', 'aZ09') == 'print') { ?>
 .hideonprint { display: none; }
 <?php } ?>
 
 
+
 /* ============================================================================== */
 /* Styles for dragging lines                                                      */
 /* ============================================================================== */
@@ -2350,6 +2357,9 @@ img.toolbarbutton {
     height: 30px;
 }
 
+li.expanded > a.fmdirlia.jqft.ecmjqft {
+    font-weight: bold !important;
+}
 
 
 /* ============================================================================== */
@@ -5831,8 +5841,11 @@ border-top-right-radius: 6px;
 	.titlefield {
 		width: auto !important;		/* We want to ignor the 30%, try to use more if you can */
 	}
-	.tableforfield>tr>td:first-child, div.tableforfield div.tagtr>div.tagtd:first-of-type {
-		max-width: 100px;			/* but no more than 100px */
+	.tableforfield>tr>td:first-child, .tableforfield>tbody>tr>td:first-child, div.tableforfield div.tagtr>div.tagtd:first-of-type {
+	    /* max-width: 100px; */			/* but no more than 100px */
+	}
+	.tableforfield>tr>td:nth-child(2), .tableforfield>tbody>tr>td:nth-child(2), div.tableforfield div.tagtr>div.tagtd:nth-child(2) {
+	    word-break: break-word;
 	}
 }
 
diff --git a/htdocs/ticket/list.php b/htdocs/ticket/list.php
index 2a4195cb07b..26b9756006c 100644
--- a/htdocs/ticket/list.php
+++ b/htdocs/ticket/list.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2013-2018	Jean-François FERRY	<hello@librethic.io>
  * Copyright (C) 2016		Christophe Battarel	<christophe@altairis.fr>
  * Copyright (C) 2018		Regis Houssin		<regis.houssin@inodbox.com>
+ * Copyright (C) 2019		Juanjo Menent		<jmenent@2byte.es>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -210,6 +211,11 @@ $sql.= " FROM ".MAIN_DB_PREFIX.$object->table_element." as t";
 if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX.$object->table_element."_extrafields as ef on (t.rowid = ef.fk_object)";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON (t.fk_soc = s.rowid)";
 $sql.= " WHERE t.entity IN (".getEntity($object->element).")";
+if ($socid > 0)
+{
+	$sql.= " AND t.fk_soc = ".$socid;
+}
+
 foreach($search as $key => $val)
 {
     if ($key == 'fk_statut')
diff --git a/htdocs/user/group/card.php b/htdocs/user/group/card.php
index 25ee449b889..1610210e473 100644
--- a/htdocs/user/group/card.php
+++ b/htdocs/user/group/card.php
@@ -135,7 +135,7 @@ if (empty($reshook)) {
 			} else {
 				$object->name	= trim(GETPOST("nom", 'nohtml'));
 				$object->nom	= $object->name;	// For backward compatibility
-				$object->note	= trim(GETPOST("note", 'none'));
+				$object->note	= dol_htmlcleanlastbr(trim(GETPOST("note", 'none')));
 
 				// Fill array 'array_options' with data from add form
 				$ret = $extrafields->setOptionalsFromPost($extralabels, $object);
@@ -218,7 +218,7 @@ if (empty($reshook)) {
 
 			$object->name	= trim(GETPOST("group", 'nohtml'));
 			$object->nom	= $object->name;			// For backward compatibility
-			$object->note	= dol_htmlcleanlastbr(GETPOST("note", 'none'));
+			$object->note	= dol_htmlcleanlastbr(trim(GETPOST("note", 'none')));
 
 			// Fill array 'array_options' with data from add form
 			$ret = $extrafields->setOptionalsFromPost($extralabels, $object);
diff --git a/htdocs/user/group/ldap.php b/htdocs/user/group/ldap.php
index c5110c052ef..2fd4ef7e14c 100644
--- a/htdocs/user/group/ldap.php
+++ b/htdocs/user/group/ldap.php
@@ -95,10 +95,9 @@ if ($action == 'dolibarr2ldap')
  *	View
  */
 
-llxHeader();
-
 $form = new Form($db);
 
+llxHeader();
 
 $head = group_prepare_head($object);
 
@@ -106,7 +105,7 @@ dol_fiche_head($head, 'ldap', $langs->trans("Group"), -1, 'group');
 
 $linkback = '<a href="'.DOL_URL_ROOT.'/user/group/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-dol_banner_tab($object, 'id', $linback, $user->rights->user->user->lire || $user->admin);
+dol_banner_tab($object, 'id', $linkback, $user->rights->user->user->lire || $user->admin);
 
 print '<div class="fichecenter">';
 print '<div class="underbanner clearboth"></div>';
diff --git a/htdocs/user/ldap.php b/htdocs/user/ldap.php
index decfbc1e0f7..7003a9429a1 100644
--- a/htdocs/user/ldap.php
+++ b/htdocs/user/ldap.php
@@ -86,10 +86,10 @@ if (empty($reshook))
  * View
  */
 
-llxHeader();
-
 $form = new Form($db);
 
+llxHeader();
+
 $head = user_prepare_head($object);
 
 $title = $langs->trans("User");
diff --git a/htdocs/user/logout.php b/htdocs/user/logout.php
index ae3fbfcbf8f..7c1a81b594c 100644
--- a/htdocs/user/logout.php
+++ b/htdocs/user/logout.php
@@ -80,6 +80,7 @@ if (session_status() === PHP_SESSION_ACTIVE)
 // Not sure this is required
 unset($_SESSION['dol_login']);
 unset($_SESSION['dol_entity']);
+unset($_SESSION['urlfrom']);
 
 if (GETPOST('noredirect')) return;
 header("Location: ".$url);		// Default behaviour is redirect to index.php page
diff --git a/test/phpunit/ActionCommTest.php b/test/phpunit/ActionCommTest.php
index f9c0928bad2..921d0e6d70d 100644
--- a/test/phpunit/ActionCommTest.php
+++ b/test/phpunit/ActionCommTest.php
@@ -44,7 +44,7 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class ActionCommTest extends PHPUnit_Framework_TestCase
+class ActionCommTest extends PHPUnit\Framework\TestCase
 {
     protected $savconf;
     protected $savuser;
diff --git a/test/phpunit/AdherentTest.php b/test/phpunit/AdherentTest.php
index bd5ae5571cc..c83df4da0d2 100644
--- a/test/phpunit/AdherentTest.php
+++ b/test/phpunit/AdherentTest.php
@@ -46,7 +46,7 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class AdherentTest extends PHPUnit_Framework_TestCase
+class AdherentTest extends PHPUnit\Framework\TestCase
 {
     protected $savconf;
     protected $savuser;
diff --git a/test/phpunit/AdminLibTest.php b/test/phpunit/AdminLibTest.php
index bbf5ae2da00..21133d21072 100644
--- a/test/phpunit/AdminLibTest.php
+++ b/test/phpunit/AdminLibTest.php
@@ -44,7 +44,7 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  * @backupStaticAttributes enabled
  * @remarks backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class AdminLibTest extends PHPUnit_Framework_TestCase
+class AdminLibTest extends PHPUnit\Framework\TestCase
 {
     protected $savconf;
     protected $savuser;
diff --git a/test/phpunit/AllTests.php b/test/phpunit/AllTests.php
index ee7ec9375d6..0f270ad032b 100644
--- a/test/phpunit/AllTests.php
+++ b/test/phpunit/AllTests.php
@@ -75,7 +75,7 @@ class AllTests
     public static function suite()
     {
 
-        $suite = new PHPUnit_Framework_TestSuite('PHPUnit Framework');
+        $suite = new PHPUnit\Framework\TestSuite('PHPUnit Framework');
 
         //require_once dirname(__FILE__).'/CoreTest.php';
         //$suite->addTestSuite('CoreTest');
diff --git a/test/phpunit/BOMTest.php b/test/phpunit/BOMTest.php
index ace04f7ba71..1179b35e6e1 100644
--- a/test/phpunit/BOMTest.php
+++ b/test/phpunit/BOMTest.php
@@ -28,7 +28,7 @@ namespace test\unit;
  * Class BillOfMaterialsTest
  * @package Testbillofmaterials
  */
-class BOMTest extends \PHPUnit_Framework_TestCase
+class BOMTest extends \PHPUnit\Framework\TestCase
 {
 	/**
 	 * Global test setup
diff --git a/test/phpunit/BankAccountTest.php b/test/phpunit/BankAccountTest.php
index fa150742c4b..94149bd0ad5 100644
--- a/test/phpunit/BankAccountTest.php
+++ b/test/phpunit/BankAccountTest.php
@@ -46,7 +46,7 @@ $langs->load("main");
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class BankAccountTest extends PHPUnit_Framework_TestCase
+class BankAccountTest extends PHPUnit\Framework\TestCase
 {
     protected $savconf;
     protected $savuser;
diff --git a/test/phpunit/BonPrelevementTest.php b/test/phpunit/BonPrelevementTest.php
index 4ba05b2c0b6..d65d2066c2a 100644
--- a/test/phpunit/BonPrelevementTest.php
+++ b/test/phpunit/BonPrelevementTest.php
@@ -47,7 +47,7 @@ $langs->load("main");
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class BonPrelevementTest extends PHPUnit_Framework_TestCase
+class BonPrelevementTest extends PHPUnit\Framework\TestCase
 {
 	protected $savconf;
 	protected $savuser;
diff --git a/test/phpunit/BuildDocTest.php b/test/phpunit/BuildDocTest.php
index e8fa72a8f40..442b76091ff 100644
--- a/test/phpunit/BuildDocTest.php
+++ b/test/phpunit/BuildDocTest.php
@@ -74,7 +74,7 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class BuildDocTest extends PHPUnit_Framework_TestCase
+class BuildDocTest extends PHPUnit\Framework\TestCase
 {
     protected $savconf;
     protected $savuser;
diff --git a/test/phpunit/CMailFileTest.php b/test/phpunit/CMailFileTest.php
index b664b345c26..9941eaa67da 100755
--- a/test/phpunit/CMailFileTest.php
+++ b/test/phpunit/CMailFileTest.php
@@ -44,7 +44,7 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class CMailFileTest extends PHPUnit_Framework_TestCase
+class CMailFileTest extends PHPUnit\Framework\TestCase
 {
     protected $savconf;
     protected $savuser;
diff --git a/test/phpunit/CategorieTest.php b/test/phpunit/CategorieTest.php
index 80761a6e594..46d8dbe875b 100644
--- a/test/phpunit/CategorieTest.php
+++ b/test/phpunit/CategorieTest.php
@@ -45,7 +45,7 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class CategorieTest extends PHPUnit_Framework_TestCase
+class CategorieTest extends PHPUnit\Framework\TestCase
 {
     protected $savconf;
     protected $savuser;
diff --git a/test/phpunit/ChargeSocialesTest.php b/test/phpunit/ChargeSocialesTest.php
index b037e50752d..9eabbf20fa0 100644
--- a/test/phpunit/ChargeSocialesTest.php
+++ b/test/phpunit/ChargeSocialesTest.php
@@ -45,7 +45,7 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class ChargeSocialesTest extends PHPUnit_Framework_TestCase
+class ChargeSocialesTest extends PHPUnit\Framework\TestCase
 {
     protected $savconf;
     protected $savuser;
diff --git a/test/phpunit/CodingPhpTest.php b/test/phpunit/CodingPhpTest.php
index db6b3299bd5..b7636a5c934 100644
--- a/test/phpunit/CodingPhpTest.php
+++ b/test/phpunit/CodingPhpTest.php
@@ -57,7 +57,7 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class CodingPhpTest extends PHPUnit_Framework_TestCase
+class CodingPhpTest extends PHPUnit\Framework\TestCase
 {
     protected $savconf;
     protected $savuser;
diff --git a/test/phpunit/CommandeFournisseurTest.php b/test/phpunit/CommandeFournisseurTest.php
index 277328339ee..c249c47bd91 100644
--- a/test/phpunit/CommandeFournisseurTest.php
+++ b/test/phpunit/CommandeFournisseurTest.php
@@ -46,7 +46,7 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class CommandeFournisseurTest extends PHPUnit_Framework_TestCase
+class CommandeFournisseurTest extends PHPUnit\Framework\TestCase
 {
     protected $savconf;
     protected $savuser;
diff --git a/test/phpunit/CommandeTest.php b/test/phpunit/CommandeTest.php
index 00a0a4983c9..570165f3382 100644
--- a/test/phpunit/CommandeTest.php
+++ b/test/phpunit/CommandeTest.php
@@ -44,7 +44,7 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class CommandeTest extends PHPUnit_Framework_TestCase
+class CommandeTest extends PHPUnit\Framework\TestCase
 {
     protected $savconf;
     protected $savuser;
diff --git a/test/phpunit/CommonObjectTest.php b/test/phpunit/CommonObjectTest.php
index 549540bb0d0..e4bd0f73518 100644
--- a/test/phpunit/CommonObjectTest.php
+++ b/test/phpunit/CommonObjectTest.php
@@ -45,7 +45,7 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class CommonObjectTest extends PHPUnit_Framework_TestCase
+class CommonObjectTest extends PHPUnit\Framework\TestCase
 {
     protected $savconf;
     protected $savuser;
diff --git a/test/phpunit/CompanyBankAccountTest.php b/test/phpunit/CompanyBankAccountTest.php
index 58eebfd0207..08749d12619 100644
--- a/test/phpunit/CompanyBankAccountTest.php
+++ b/test/phpunit/CompanyBankAccountTest.php
@@ -45,7 +45,7 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class CompanyBankAccountTest extends PHPUnit_Framework_TestCase
+class CompanyBankAccountTest extends PHPUnit\Framework\TestCase
 {
 	protected $savconf;
 	protected $savuser;
diff --git a/test/phpunit/CompanyLibTest.php b/test/phpunit/CompanyLibTest.php
index 0fb1722aee9..9e211441103 100644
--- a/test/phpunit/CompanyLibTest.php
+++ b/test/phpunit/CompanyLibTest.php
@@ -44,7 +44,7 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  * @backupStaticAttributes enabled
  * @remarks backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class CompanyLibTest extends PHPUnit_Framework_TestCase
+class CompanyLibTest extends PHPUnit\Framework\TestCase
 {
     protected $savconf;
     protected $savuser;
diff --git a/test/phpunit/ContactTest.php b/test/phpunit/ContactTest.php
index ef43bd06311..c0ed8d7843f 100755
--- a/test/phpunit/ContactTest.php
+++ b/test/phpunit/ContactTest.php
@@ -53,7 +53,7 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class ContactTest extends PHPUnit_Framework_TestCase
+class ContactTest extends PHPUnit\Framework\TestCase
 {
 	protected $savconf;
 	protected $savuser;
diff --git a/test/phpunit/ContratTest.php b/test/phpunit/ContratTest.php
index c5342865979..c763a976172 100644
--- a/test/phpunit/ContratTest.php
+++ b/test/phpunit/ContratTest.php
@@ -45,7 +45,7 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class ContratTest extends PHPUnit_Framework_TestCase
+class ContratTest extends PHPUnit\Framework\TestCase
 {
     protected $savconf;
     protected $savuser;
diff --git a/test/phpunit/CoreTest.php b/test/phpunit/CoreTest.php
index 51a0f54698f..4720df9014c 100644
--- a/test/phpunit/CoreTest.php
+++ b/test/phpunit/CoreTest.php
@@ -47,7 +47,7 @@ if (! defined("NOLOGIN"))        define("NOLOGIN", '1');       // If this page i
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class CoreTest extends PHPUnit_Framework_TestCase
+class CoreTest extends PHPUnit\Framework\TestCase
 {
     protected $savconf;
     protected $savuser;
diff --git a/test/phpunit/DateLibTest.php b/test/phpunit/DateLibTest.php
index 6424cb4d8df..cc4f50705e0 100644
--- a/test/phpunit/DateLibTest.php
+++ b/test/phpunit/DateLibTest.php
@@ -45,7 +45,7 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class DateLibTest extends PHPUnit_Framework_TestCase
+class DateLibTest extends PHPUnit\Framework\TestCase
 {
 	protected $savconf;
 	protected $savuser;
diff --git a/test/phpunit/DateLibTzFranceTest.php b/test/phpunit/DateLibTzFranceTest.php
index fa7aef2bed8..8913c56a77d 100644
--- a/test/phpunit/DateLibTzFranceTest.php
+++ b/test/phpunit/DateLibTzFranceTest.php
@@ -45,7 +45,7 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class DateLibTzFranceTest extends PHPUnit_Framework_TestCase
+class DateLibTzFranceTest extends PHPUnit\Framework\TestCase
 {
 	protected $savconf;
 	protected $savuser;
diff --git a/test/phpunit/DiscountTest.php b/test/phpunit/DiscountTest.php
index cd73a7ad173..8c461aba88a 100644
--- a/test/phpunit/DiscountTest.php
+++ b/test/phpunit/DiscountTest.php
@@ -45,7 +45,7 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class DiscountTest extends PHPUnit_Framework_TestCase
+class DiscountTest extends PHPUnit\Framework\TestCase
 {
 	protected $savconf;
 	protected $savuser;
diff --git a/test/phpunit/EntrepotTest.php b/test/phpunit/EntrepotTest.php
index 16555d88e39..44f4d086a1c 100644
--- a/test/phpunit/EntrepotTest.php
+++ b/test/phpunit/EntrepotTest.php
@@ -45,7 +45,7 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class EntrepotTest extends PHPUnit_Framework_TestCase
+class EntrepotTest extends PHPUnit\Framework\TestCase
 {
 	protected $savconf;
 	protected $savuser;
diff --git a/test/phpunit/ExpenseReportTest.php b/test/phpunit/ExpenseReportTest.php
index c4b3e2a707a..570afd8bb18 100644
--- a/test/phpunit/ExpenseReportTest.php
+++ b/test/phpunit/ExpenseReportTest.php
@@ -45,7 +45,7 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class ExpenseReportTest extends PHPUnit_Framework_TestCase
+class ExpenseReportTest extends PHPUnit\Framework\TestCase
 {
     protected $savconf;
     protected $savuser;
diff --git a/test/phpunit/ExportTest.php b/test/phpunit/ExportTest.php
index 7403cba3ddf..5497f88cd67 100644
--- a/test/phpunit/ExportTest.php
+++ b/test/phpunit/ExportTest.php
@@ -49,7 +49,7 @@ if (! defined("NOLOGIN"))        define("NOLOGIN", '1');       // If this page i
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class ExportTest extends PHPUnit_Framework_TestCase
+class ExportTest extends PHPUnit\Framework\TestCase
 {
 	protected $savconf;
 	protected $savuser;
diff --git a/test/phpunit/FactureFournisseurTest.php b/test/phpunit/FactureFournisseurTest.php
index 33d503825ac..4d7df1f0ed7 100644
--- a/test/phpunit/FactureFournisseurTest.php
+++ b/test/phpunit/FactureFournisseurTest.php
@@ -46,7 +46,7 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class FactureFournisseurTest extends PHPUnit_Framework_TestCase
+class FactureFournisseurTest extends PHPUnit\Framework\TestCase
 {
 	protected $savconf;
 	protected $savuser;
diff --git a/test/phpunit/FactureRecTest.php b/test/phpunit/FactureRecTest.php
index de1bb164451..5d9021032a2 100644
--- a/test/phpunit/FactureRecTest.php
+++ b/test/phpunit/FactureRecTest.php
@@ -46,7 +46,7 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class FactureRecTest extends PHPUnit_Framework_TestCase
+class FactureRecTest extends PHPUnit\Framework\TestCase
 {
 	protected $savconf;
 	protected $savuser;
diff --git a/test/phpunit/FactureTest.php b/test/phpunit/FactureTest.php
index 4f680ba32db..3c066380b09 100644
--- a/test/phpunit/FactureTest.php
+++ b/test/phpunit/FactureTest.php
@@ -45,7 +45,7 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class FactureTest extends PHPUnit_Framework_TestCase
+class FactureTest extends PHPUnit\Framework\TestCase
 {
     protected $savconf;
     protected $savuser;
diff --git a/test/phpunit/FactureTestRounding.php b/test/phpunit/FactureTestRounding.php
index a0df47cd97f..1716bd51153 100644
--- a/test/phpunit/FactureTestRounding.php
+++ b/test/phpunit/FactureTestRounding.php
@@ -45,7 +45,7 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class FactureTestRounding extends PHPUnit_Framework_TestCase
+class FactureTestRounding extends PHPUnit\Framework\TestCase
 {
 	protected $savconf;
 	protected $savuser;
diff --git a/test/phpunit/FichinterTest.php b/test/phpunit/FichinterTest.php
index 35680559581..c81e1c99e1a 100644
--- a/test/phpunit/FichinterTest.php
+++ b/test/phpunit/FichinterTest.php
@@ -45,7 +45,7 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class FichinterTest extends PHPUnit_Framework_TestCase
+class FichinterTest extends PHPUnit\Framework\TestCase
 {
 	protected $savconf;
 	protected $savuser;
diff --git a/test/phpunit/FilesLibTest.php b/test/phpunit/FilesLibTest.php
index 2411c5c9cf3..cbe6ad948d8 100644
--- a/test/phpunit/FilesLibTest.php
+++ b/test/phpunit/FilesLibTest.php
@@ -46,7 +46,7 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class FilesLibTest extends PHPUnit_Framework_TestCase
+class FilesLibTest extends PHPUnit\Framework\TestCase
 {
 	protected $savconf;
 	protected $savuser;
diff --git a/test/phpunit/FormAdminTest.php b/test/phpunit/FormAdminTest.php
index 844be2e4f32..b58b43b368b 100644
--- a/test/phpunit/FormAdminTest.php
+++ b/test/phpunit/FormAdminTest.php
@@ -45,7 +45,7 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class FormAdminTest extends PHPUnit_Framework_TestCase
+class FormAdminTest extends PHPUnit\Framework\TestCase
 {
 	protected $savconf;
 	protected $savuser;
diff --git a/test/phpunit/Functions2LibTest.php b/test/phpunit/Functions2LibTest.php
index 50efabf9403..a83ba0f4859 100644
--- a/test/phpunit/Functions2LibTest.php
+++ b/test/phpunit/Functions2LibTest.php
@@ -48,7 +48,7 @@ if (! defined("NOLOGIN"))        define("NOLOGIN", '1');       // If this page i
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class Functions2LibTest extends PHPUnit_Framework_TestCase
+class Functions2LibTest extends PHPUnit\Framework\TestCase
 {
     protected $savconf;
     protected $savuser;
diff --git a/test/phpunit/ImagesLibTest.php b/test/phpunit/ImagesLibTest.php
index 4ecaab49d39..445fe572b61 100644
--- a/test/phpunit/ImagesLibTest.php
+++ b/test/phpunit/ImagesLibTest.php
@@ -46,7 +46,7 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class ImagesLibTest extends PHPUnit_Framework_TestCase
+class ImagesLibTest extends PHPUnit\Framework\TestCase
 {
 	protected $savconf;
 	protected $savuser;
diff --git a/test/phpunit/ImportTest.php b/test/phpunit/ImportTest.php
index 10d906f2ede..5a11a770842 100644
--- a/test/phpunit/ImportTest.php
+++ b/test/phpunit/ImportTest.php
@@ -47,7 +47,7 @@ if (! defined("NOLOGIN"))        define("NOLOGIN", '1');       // If this page i
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class ImportTest extends PHPUnit_Framework_TestCase
+class ImportTest extends PHPUnit\Framework\TestCase
 {
 	protected $savconf;
 	protected $savuser;
diff --git a/test/phpunit/JsonLibTest.php b/test/phpunit/JsonLibTest.php
index a84a78a7c75..c123f2e6ff6 100644
--- a/test/phpunit/JsonLibTest.php
+++ b/test/phpunit/JsonLibTest.php
@@ -47,7 +47,7 @@ if (! defined("NOLOGIN"))        define("NOLOGIN", '1');       // If this page i
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class JsonLibTest extends PHPUnit_Framework_TestCase
+class JsonLibTest extends PHPUnit\Framework\TestCase
 {
     protected $savconf;
     protected $savuser;
diff --git a/test/phpunit/LangTest.php b/test/phpunit/LangTest.php
index 228cde51901..71d467b78d3 100644
--- a/test/phpunit/LangTest.php
+++ b/test/phpunit/LangTest.php
@@ -57,7 +57,7 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class LangTest extends PHPUnit_Framework_TestCase
+class LangTest extends PHPUnit\Framework\TestCase
 {
 	protected $savconf;
 	protected $savuser;
diff --git a/test/phpunit/LoanTest.php b/test/phpunit/LoanTest.php
index b0ecd583514..e0cc1f5b5ff 100644
--- a/test/phpunit/LoanTest.php
+++ b/test/phpunit/LoanTest.php
@@ -45,7 +45,7 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class LoanTest extends PHPUnit_Framework_TestCase
+class LoanTest extends PHPUnit\Framework\TestCase
 {
 	protected $savconf;
 	protected $savuser;
diff --git a/test/phpunit/MarginsLibTest.php b/test/phpunit/MarginsLibTest.php
index 81f4a512e4f..84fb59c81ec 100644
--- a/test/phpunit/MarginsLibTest.php
+++ b/test/phpunit/MarginsLibTest.php
@@ -45,7 +45,7 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class MarginsLibTest extends PHPUnit_Framework_TestCase
+class MarginsLibTest extends PHPUnit\Framework\TestCase
 {
 	protected $savconf;
 	protected $savuser;
diff --git a/test/phpunit/ModulesTest.php b/test/phpunit/ModulesTest.php
index ea16813d873..38a630b46e0 100755
--- a/test/phpunit/ModulesTest.php
+++ b/test/phpunit/ModulesTest.php
@@ -44,7 +44,7 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class ModulesTest extends PHPUnit_Framework_TestCase
+class ModulesTest extends PHPUnit\Framework\TestCase
 {
 	protected $savconf;
 	protected $savuser;
diff --git a/test/phpunit/MouvementStockTest.php b/test/phpunit/MouvementStockTest.php
index cac49f34a7a..ba7b093596f 100644
--- a/test/phpunit/MouvementStockTest.php
+++ b/test/phpunit/MouvementStockTest.php
@@ -47,7 +47,7 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class MouvementStockTest extends PHPUnit_Framework_TestCase
+class MouvementStockTest extends PHPUnit\Framework\TestCase
 {
 	protected $savconf;
 	protected $savuser;
diff --git a/test/phpunit/NumberingModulesTest.php b/test/phpunit/NumberingModulesTest.php
index 66c4c670128..57c376b702b 100644
--- a/test/phpunit/NumberingModulesTest.php
+++ b/test/phpunit/NumberingModulesTest.php
@@ -44,7 +44,7 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class NumberingModulesTest extends PHPUnit_Framework_TestCase
+class NumberingModulesTest extends PHPUnit\Framework\TestCase
 {
 	protected $savconf;
 	protected $savuser;
diff --git a/test/phpunit/PaypalTest.php b/test/phpunit/PaypalTest.php
index 98300a6a86a..54913b1e5f9 100644
--- a/test/phpunit/PaypalTest.php
+++ b/test/phpunit/PaypalTest.php
@@ -46,7 +46,7 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class PaypalTest extends PHPUnit_Framework_TestCase
+class PaypalTest extends PHPUnit\Framework\TestCase
 {
 	protected $savconf;
 	protected $savuser;
diff --git a/test/phpunit/PdfDocTest.php b/test/phpunit/PdfDocTest.php
index 634a931da56..bece387b93f 100644
--- a/test/phpunit/PdfDocTest.php
+++ b/test/phpunit/PdfDocTest.php
@@ -48,7 +48,7 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class PdfDocTest extends PHPUnit_Framework_TestCase
+class PdfDocTest extends PHPUnit\Framework\TestCase
 {
 	protected $savconf;
 	protected $savuser;
diff --git a/test/phpunit/PgsqlTest.php b/test/phpunit/PgsqlTest.php
index a1fcc180528..743328abb71 100644
--- a/test/phpunit/PgsqlTest.php
+++ b/test/phpunit/PgsqlTest.php
@@ -47,7 +47,7 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class PgsqlTest extends PHPUnit_Framework_TestCase
+class PgsqlTest extends PHPUnit\Framework\TestCase
 {
 	protected $savconf;
 	protected $savuser;
diff --git a/test/phpunit/PricesTest.php b/test/phpunit/PricesTest.php
index 0203a1d4275..32babae209c 100755
--- a/test/phpunit/PricesTest.php
+++ b/test/phpunit/PricesTest.php
@@ -52,7 +52,7 @@ if (! empty($conf->global->MAIN_ROUNDING_RULE_TOT))
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class PricesTest extends PHPUnit_Framework_TestCase
+class PricesTest extends PHPUnit\Framework\TestCase
 {
     protected $savconf;
     protected $savuser;
diff --git a/test/phpunit/ProductTest.php b/test/phpunit/ProductTest.php
index c57ef426d0b..4a4d108f02f 100644
--- a/test/phpunit/ProductTest.php
+++ b/test/phpunit/ProductTest.php
@@ -45,7 +45,7 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  * @backupStaticAttributes enabled
  * @remarks backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class ProductTest extends PHPUnit_Framework_TestCase
+class ProductTest extends PHPUnit\Framework\TestCase
 {
     protected $savconf;
     protected $savuser;
diff --git a/test/phpunit/ProjectTest.php b/test/phpunit/ProjectTest.php
index faa533e2c00..886463be104 100644
--- a/test/phpunit/ProjectTest.php
+++ b/test/phpunit/ProjectTest.php
@@ -46,7 +46,7 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class ProjectTest extends PHPUnit_Framework_TestCase
+class ProjectTest extends PHPUnit\Framework\TestCase
 {
 	protected $savconf;
 	protected $savuser;
diff --git a/test/phpunit/PropalTest.php b/test/phpunit/PropalTest.php
index 6a3d17d7806..b0331a5575f 100644
--- a/test/phpunit/PropalTest.php
+++ b/test/phpunit/PropalTest.php
@@ -45,7 +45,7 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class PropalTest extends PHPUnit_Framework_TestCase
+class PropalTest extends PHPUnit\Framework\TestCase
 {
 	protected $savconf;
 	protected $savuser;
diff --git a/test/phpunit/RestAPIDocumentTest.php b/test/phpunit/RestAPIDocumentTest.php
index f0d3efe34e6..08ea79352d3 100644
--- a/test/phpunit/RestAPIDocumentTest.php
+++ b/test/phpunit/RestAPIDocumentTest.php
@@ -45,7 +45,7 @@ $conf->global->MAIN_UMASK = '0666';
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class RestAPIDocumentTest extends PHPUnit_Framework_TestCase
+class RestAPIDocumentTest extends PHPUnit\Framework\TestCase
 {
     protected $savconf;
     protected $savuser;
diff --git a/test/phpunit/RestAPIUserTest.php b/test/phpunit/RestAPIUserTest.php
index 39f924e7e04..b44fb7aaccc 100644
--- a/test/phpunit/RestAPIUserTest.php
+++ b/test/phpunit/RestAPIUserTest.php
@@ -47,7 +47,7 @@ $conf->global->MAIN_UMASK='0666';
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class RestAPIUserTest extends PHPUnit_Framework_TestCase
+class RestAPIUserTest extends PHPUnit\Framework\TestCase
 {
     protected $savconf;
     protected $savuser;
diff --git a/test/phpunit/ScriptsTest.php b/test/phpunit/ScriptsTest.php
index 4e43a036c7e..e4a2263e849 100644
--- a/test/phpunit/ScriptsTest.php
+++ b/test/phpunit/ScriptsTest.php
@@ -57,7 +57,7 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class ScriptsTest extends PHPUnit_Framework_TestCase
+class ScriptsTest extends PHPUnit\Framework\TestCase
 {
 	protected $savconf;
 	protected $savuser;
diff --git a/test/phpunit/SecurityTest.php b/test/phpunit/SecurityTest.php
index 636fa923bc0..b457c4c0fa7 100644
--- a/test/phpunit/SecurityTest.php
+++ b/test/phpunit/SecurityTest.php
@@ -57,7 +57,7 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class SecurityTest extends PHPUnit_Framework_TestCase
+class SecurityTest extends PHPUnit\Framework\TestCase
 {
 	protected $savconf;
 	protected $savuser;
diff --git a/test/phpunit/SocieteTest.php b/test/phpunit/SocieteTest.php
index 11eb6711862..f823d8a4803 100755
--- a/test/phpunit/SocieteTest.php
+++ b/test/phpunit/SocieteTest.php
@@ -45,7 +45,7 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class SocieteTest extends PHPUnit_Framework_TestCase
+class SocieteTest extends PHPUnit\Framework\TestCase
 {
     protected $savconf;
     protected $savuser;
diff --git a/test/phpunit/SupplierProposalTest.php b/test/phpunit/SupplierProposalTest.php
index 14a63776444..ee95e882572 100644
--- a/test/phpunit/SupplierProposalTest.php
+++ b/test/phpunit/SupplierProposalTest.php
@@ -48,7 +48,7 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class SupplierProposalTest extends PHPUnit_Framework_TestCase
+class SupplierProposalTest extends PHPUnit\Framework\TestCase
 {
 	protected $savconf;
 	protected $savuser;
diff --git a/test/phpunit/TicketTest.php b/test/phpunit/TicketTest.php
index e5367d03fbe..4d7ce3363ed 100644
--- a/test/phpunit/TicketTest.php
+++ b/test/phpunit/TicketTest.php
@@ -45,7 +45,7 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class TicketTest extends PHPUnit_Framework_TestCase
+class TicketTest extends PHPUnit\Framework\TestCase
 {
 	protected $savconf;
 	protected $savuser;
diff --git a/test/phpunit/UserGroupTest.php b/test/phpunit/UserGroupTest.php
index e524b989172..be230655fe1 100644
--- a/test/phpunit/UserGroupTest.php
+++ b/test/phpunit/UserGroupTest.php
@@ -44,7 +44,7 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class UserGroupTest extends PHPUnit_Framework_TestCase
+class UserGroupTest extends PHPUnit\Framework\TestCase
 {
     protected $savconf;
     protected $savuser;
diff --git a/test/phpunit/UserTest.php b/test/phpunit/UserTest.php
index b87dfd84494..e993ed981a6 100644
--- a/test/phpunit/UserTest.php
+++ b/test/phpunit/UserTest.php
@@ -44,7 +44,7 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class UserTest extends PHPUnit_Framework_TestCase
+class UserTest extends PHPUnit\Framework\TestCase
 {
     protected $savconf;
     protected $savuser;
diff --git a/test/phpunit/UtilsTest.php b/test/phpunit/UtilsTest.php
index 58074af1c1f..5a913977ccc 100644
--- a/test/phpunit/UtilsTest.php
+++ b/test/phpunit/UtilsTest.php
@@ -44,7 +44,7 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class UtilsTest extends PHPUnit_Framework_TestCase
+class UtilsTest extends PHPUnit\Framework\TestCase
 {
     protected $savconf;
     protected $savuser;
diff --git a/test/phpunit/WebservicesInvoicesTest.php b/test/phpunit/WebservicesInvoicesTest.php
index fb8e36af6a1..77ad0902ec2 100644
--- a/test/phpunit/WebservicesInvoicesTest.php
+++ b/test/phpunit/WebservicesInvoicesTest.php
@@ -49,7 +49,7 @@ $conf->global->MAIN_UMASK='0666';
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class WebservicesInvoicesTest extends PHPUnit_Framework_TestCase
+class WebservicesInvoicesTest extends PHPUnit\Framework\TestCase
 {
 	protected $savconf;
 	protected $savuser;
diff --git a/test/phpunit/WebservicesOrdersTest.php b/test/phpunit/WebservicesOrdersTest.php
index 8b989df273f..8e6312ac039 100644
--- a/test/phpunit/WebservicesOrdersTest.php
+++ b/test/phpunit/WebservicesOrdersTest.php
@@ -48,7 +48,7 @@ $conf->global->MAIN_UMASK='0666';
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class WebservicesOrdersTest extends PHPUnit_Framework_TestCase
+class WebservicesOrdersTest extends PHPUnit\Framework\TestCase
 {
     protected $savconf;
     protected $savuser;
diff --git a/test/phpunit/WebservicesOtherTest.php b/test/phpunit/WebservicesOtherTest.php
index bdc3a15b2b9..5c19414966b 100644
--- a/test/phpunit/WebservicesOtherTest.php
+++ b/test/phpunit/WebservicesOtherTest.php
@@ -48,7 +48,7 @@ $conf->global->MAIN_UMASK='0666';
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class WebservicesOtherTest extends PHPUnit_Framework_TestCase
+class WebservicesOtherTest extends PHPUnit\Framework\TestCase
 {
     protected $savconf;
     protected $savuser;
diff --git a/test/phpunit/WebservicesProductsTest.php b/test/phpunit/WebservicesProductsTest.php
index 90147a429a4..ff78d9d91bb 100644
--- a/test/phpunit/WebservicesProductsTest.php
+++ b/test/phpunit/WebservicesProductsTest.php
@@ -55,7 +55,7 @@ if (empty($conf->service->enabled))
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class WebservicesProductsTest extends PHPUnit_Framework_TestCase
+class WebservicesProductsTest extends PHPUnit\Framework\TestCase
 {
     protected $savconf;
     protected $savuser;
diff --git a/test/phpunit/WebservicesThirdpartyTest.php b/test/phpunit/WebservicesThirdpartyTest.php
index cb1f26d1980..4effe555d2f 100644
--- a/test/phpunit/WebservicesThirdpartyTest.php
+++ b/test/phpunit/WebservicesThirdpartyTest.php
@@ -48,7 +48,7 @@ $conf->global->MAIN_UMASK='0666';
  * @backupStaticAttributes enabled
  * @remarks backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class WebservicesThirdpartyTest extends PHPUnit_Framework_TestCase
+class WebservicesThirdpartyTest extends PHPUnit\Framework\TestCase
 {
     protected $savconf;
     protected $savuser;
diff --git a/test/phpunit/WebservicesUserTest.php b/test/phpunit/WebservicesUserTest.php
index 7ca0d9e8ee8..d7df632e413 100644
--- a/test/phpunit/WebservicesUserTest.php
+++ b/test/phpunit/WebservicesUserTest.php
@@ -48,7 +48,7 @@ $conf->global->MAIN_UMASK='0666';
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class WebservicesUserTest extends PHPUnit_Framework_TestCase
+class WebservicesUserTest extends PHPUnit\Framework\TestCase
 {
     protected $savconf;
     protected $savuser;
diff --git a/test/phpunit/XCalLibTest.php b/test/phpunit/XCalLibTest.php
index 4783bf4bc8f..602ec11e46d 100644
--- a/test/phpunit/XCalLibTest.php
+++ b/test/phpunit/XCalLibTest.php
@@ -44,7 +44,7 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  * @backupStaticAttributes enabled
  * @remarks backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class XCalLibTest extends PHPUnit_Framework_TestCase
+class XCalLibTest extends PHPUnit\Framework\TestCase
 {
     protected $savconf;
     protected $savuser;