diff --git a/COPYRIGHT b/COPYRIGHT
index ea0c6453486..f58095e1558 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -32,7 +32,7 @@ PSR/simple-cache	   ?										                 Library for cache (used by PHPSp
 Restler                3.0.0RC6      LGPL-3+                     Yes             Library to develop REST Web services (+ swagger-ui js lib into dir explorer)
 Sabre                  3.2.2         BSD                         Yes             DAV support
 Swift Mailer           5.4.2-DEV     MIT license                 Yes             Comprehensive mailing tools for PHP
-Stripe                 6.35          MIT licence                 Yes             Library for Stripe module
+Stripe                 6.41          MIT licence                 Yes             Library for Stripe module
 TCPDF                  6.2.25        LGPL-3+                     Yes             PDF generation
 TCPDI                  1.0.0         LGPL-3+ / Apache 2.0        Yes             FPDI replacement
 
diff --git a/ChangeLog b/ChangeLog
index c425872e9c2..0839fd77e95 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,8 +15,117 @@ WARNING:
 Following changes may create regressions for some external modules, but were necessary to make Dolibarr better:
 * Properties ->libelle_incoterms were renamed into ->label_incoterms
 * Removed the method liste_array() of project class. It was not used by core code.
+* The function show_theme() hase been renamed into showSkins()
 
 
+***** ChangeLog for 10.0.1 compared to 10.0.0 *****
+FIX: #10930
+FIX: #10984 
+FIX: reposition on "Build backup" button
+FIX: #11400
+FIX: #11412
+FIX: #11460 
+FIX: #11463
+FIX: #11466
+FIX: #11492 
+FIX: #11498
+FIX: #11505
+FIX: #11506
+FIX: #11507
+FIX: #11509
+FIX: #11537
+FIX: #11543
+FIX: #11553
+FIX: #11576 
+FIX: #11584
+FIX: #11590
+FIX: accounting mode must be taken from global conf, because there's no way to choose a mode with interface
+FIX: Add message from public interface
+FIX: add missing hook calls
+FIX: Add warning when setup is strange
+FIX: ajax call for line positioning when CSRFCHECK_WITH_TOKEN is on
+FIX: API return 404 sometimes even if API exists
+FIX: Attachment was lost when we validate an expense report
+FIX: avoid conflict with "$classname" in card.php
+FIX: Bad sql request
+FIX: better compatibility with multicompany transverse mode
+FIX: Better PHP compatibility
+FIX: Block to link with tickets
+FIX: Can't submit a ticket from public interface
+FIX: categories import: prevent mismatch between category type and object type
+FIX: Closing ticket from public interface
+FIX: Column 'paid' missing in expense report
+FIX: compatibility mysql 8. rank is reserved
+FIX: Computed field were not calculated into lists.
+FIX: Content of email for subscription
+FIX: correct error in files with multiple spaces
+FIX: CVE-2019-11199
+FIX: delete of links between objects
+FIX: div not balanced
+FIX: do not return formatted prices in json string
+FIX: duplicate on the check (TODO field $onetrtd not used ?)
+FIX: element name in update_price
+FIX: empty product_use_units in product configuration
+FIX: expedition card: infinite loop for printObjectLine hook if return > 0
+FIX: extrafield loading bug due to assumption that an object is a third party while it may be a contact if MAIN_USE_COMPANY_NAME_OF_CONTACT is set.
+FIX: Fatal error on dol_htmloutput_mesg with corrupted array
+FIX: Fatal situation if payment removed on expense report. Action
+FIX: FEC Format - Missing date_creation in general ledger when you add a new transaction
+FIX: FEC Format - Save translation of the journal label in database & nowrap on amount
+FIX: floating point precision errors in the triggers of the workflow module
+FIX: for #11232
+FIX: format of field with type timestamp
+FIX: fournrprice log for insert
+FIX: help text
+FIX: import filter error
+FIX: __INFOS__ tag not exists
+FIX: issue #9300: install error with PostgreSQL when using custom table prefix
+FIX: Language key
+FIX: Limit of uploaded files (max_post_size was not used)
+FIX: list of balance of leaves
+FIX: minor spelling issues
+FIX: missing "dropdown-icon" replacement
+FIX: Missing field "Conciliated" into bank transaction export
+FIX: missing filter by current contact
+FIX: missing token
+FIX: Missing where on entity
+FIX: move sql request in INNER JOIN
+FIX: name was able to be in field but went back to new line
+FIX: Nowrap on amount
+FIX: Online payment
+FIX: on shipment delete confirm dialog, a new checkbox allows the user to choose if they want their stock re-incremented after the deletion.
+FIX: option EXPORT_LABEL_FOR_SELECT to restore compatibility in export
+FIX: Option THIRDPARTY_SUGGEST_ALSO_ADDRESS_CREATION
+FIX: outdated phpdoc
+FIX: Permission for BOM menu
+FIX: permission to delete a draft purchase order
+FIX: phpcs
+FIX: Position was lost when we edit the line of template invoice
+FIX: product_use_units was set to 0 each time a conf in block other was set
+FIX: propal createFrom hook: undefined parameter attached
+FIX: Responsive of public interface of ticket
+FIX: search by phone pro
+FIX: Setup of TakePos was not possible after a clean install
+FIX: Show list of events on tickets
+FIX: socpeople assigned list in action com list
+FIX: SQL problem on donation & nowrap on amount
+FIX: stock increase on shipment deletion if STOCK_CALCULATE_ON_SHIPMENT_NEW: is set
+FIX: stripe webhook ID constant set
+FIX: summary of time spent in preview tab of projects
+FIX: the feature to bill time spent was not enabled.
+FIX: The new feature to attach document on lines was not correclty
+FIX: The proposed new supplier code does not work
+FIX: this function can not be private
+FIX: tk9877 - PDF rouget requires product.lib.php (otherwise measuring_units_string() is not defined)
+FIX: Update the file index table when we validate/rename a ref.
+FIX: use rounding to compare the amounts
+FIX: We must save code instead of value in database for template invoice modelpdf
+FIX: we need to be able to add freeline with qty between 0 & 1 in supplierorder line
+FIX: We should remove property comments only for project and task api.
+FIX: When saving an action it didn't save the label based on the type of event if the label is empty and the type is customized
+FIX: when STOCK_CALCULATE_ON_SHIPMENT_NEW: is set, deleting a "closed" shipment now increases stock as expected
+FIX: wrong path sociales/index.php doesnt exist anymore
+
 ***** ChangeLog for 10.0.0 compared to 9.0.0 *****
 For Users:
 NEW: Module "Ticket" is available as a stable module.
diff --git a/doc/images/dolibarr_512x512.png b/doc/images/dolibarr_512x512.png
new file mode 100644
index 00000000000..bd8d7ac3bfd
Binary files /dev/null and b/doc/images/dolibarr_512x512.png differ
diff --git a/htdocs/accountancy/admin/accountmodel.php b/htdocs/accountancy/admin/accountmodel.php
index 527cb13fcfd..87a7464dda6 100644
--- a/htdocs/accountancy/admin/accountmodel.php
+++ b/htdocs/accountancy/admin/accountmodel.php
@@ -156,17 +156,8 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha'))
 	$ok=1;
 	foreach ($listfield as $f => $value)
 	{
-		if ($value == 'country_id' && in_array($tablib[$id], array('DictionaryVAT','DictionaryRegion','DictionaryCompanyType','DictionaryHolidayTypes','DictionaryRevenueStamp','DictionaryAccountancyCategory','Pcg_version'))) continue;		// For some pages, country is not mandatory
-		if ($value == 'country' && in_array($tablib[$id], array('DictionaryCanton','DictionaryCompanyType','DictionaryRevenueStamp'))) continue;		// For some pages, country is not mandatory
-		if ($value == 'localtax1' && empty($_POST['localtax1_type'])) continue;
-		if ($value == 'localtax2' && empty($_POST['localtax2_type'])) continue;
-		if ($value == 'color' && empty($_POST['color'])) continue;
-		if ($value == 'formula' && empty($_POST['formula'])) continue;
-		if ((! isset($_POST[$value]) || $_POST[$value]=='')
-			&& (! in_array($listfield[$f], array('decalage','module','accountancy_code','accountancy_code_sell','accountancy_code_buy'))  // Fields that are not mandatory
-			&& (! ($id == 10 && $listfield[$f] == 'code')) // Code is mandatory fir table 10
-			)
-		)
+		if ($value == 'country_id' && in_array($tablib[$id], array('Pcg_version'))) continue;		// For some pages, country is not mandatory
+		if ((! isset($_POST[$value]) || $_POST[$value]==''))
 		{
 			$ok=0;
 			$fieldnamekey=$listfield[$f];
@@ -174,19 +165,6 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha'))
 
 			if ($fieldnamekey == 'pcg_version')  $fieldnamekey='Pcg_version';
 			if ($fieldnamekey == 'libelle' || ($fieldnamekey == 'label'))  $fieldnamekey='Label';
-			if ($fieldnamekey == 'libelle_facture') $fieldnamekey = 'LabelOnDocuments';
-			if ($fieldnamekey == 'nbjour')   $fieldnamekey='NbOfDays';
-			if ($fieldnamekey == 'decalage') $fieldnamekey='Offset';
-			if ($fieldnamekey == 'module')   $fieldnamekey='Module';
-			if ($fieldnamekey == 'code') $fieldnamekey = 'Code';
-			if ($fieldnamekey == 'note') $fieldnamekey = 'Note';
-			if ($fieldnamekey == 'taux') $fieldnamekey = 'Rate';
-			if ($fieldnamekey == 'type') $fieldnamekey = 'Type';
-			if ($fieldnamekey == 'position') $fieldnamekey = 'Position';
-			if ($fieldnamekey == 'unicode') $fieldnamekey = 'Unicode';
-			if ($fieldnamekey == 'deductible') $fieldnamekey = 'Deductible';
-			if ($fieldnamekey == 'sortorder') $fieldnamekey = 'SortOrder';
-			if ($fieldnamekey == 'category_type') $fieldnamekey = 'Calculated';
 
 			setEventMessages($langs->transnoentities("ErrorFieldRequired", $langs->transnoentities($fieldnamekey)), null, 'errors');
 		}
@@ -196,9 +174,9 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha'))
 		$ok=0;
 		setEventMessages($langs->transnoentities('ErrorReservedTypeSystemSystemAuto'), null, 'errors');
 	}
-	if (isset($_POST["code"]))
+	if (isset($_POST["pcg_version"]))
 	{
-		if ($_POST["code"]=='0')
+		if ($_POST["pcg_version"]=='0')
 		{
 			$ok=0;
 			setEventMessages($langs->transnoentities('ErrorCodeCantContainZero'), null, 'errors');
@@ -211,28 +189,9 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha'))
 	}
 	if (isset($_POST["country"]) && ($_POST["country"]=='0') && ($id != 2))
 	{
-		if (in_array($tablib[$id], array('DictionaryCompanyType','DictionaryHolidayTypes')))	// Field country is no mandatory for such dictionaries
-		{
-			$_POST["country"]='';
-		}
-		else
-		{
-			$ok=0;
-			setEventMessages($langs->transnoentities("ErrorFieldRequired", $langs->transnoentities("Country")), null, 'errors');
-		}
+		$ok=0;
+		setEventMessages($langs->transnoentities("ErrorFieldRequired", $langs->transnoentities("Country")), null, 'errors');
 	}
-	if (! is_numeric($_POST["code"]))
-	{
-	   	$ok=0;
-	   	setEventMessages($langs->transnoentities("ErrorFieldMustBeANumeric", $langs->transnoentities("Code")), null, 'errors');
-	}
-
-	// Clean some parameters
-	if (isset($_POST["localtax1"]) && empty($_POST["localtax1"])) $_POST["localtax1"]='0';	// If empty, we force to 0
-	if (isset($_POST["localtax2"]) && empty($_POST["localtax2"])) $_POST["localtax2"]='0';	// If empty, we force to 0
-	if ($_POST["accountancy_code"] <= 0) $_POST["accountancy_code"]='';	// If empty, we force to null
-	if ($_POST["accountancy_code_sell"] <= 0) $_POST["accountancy_code_sell"]='';	// If empty, we force to null
-	if ($_POST["accountancy_code_buy"] <= 0) $_POST["accountancy_code_buy"]='';	// If empty, we force to null
 
 	// Si verif ok et action add, on ajoute la ligne
 	if ($ok && GETPOST('actionadd', 'alpha'))
diff --git a/htdocs/accountancy/bookkeeping/card.php b/htdocs/accountancy/bookkeeping/card.php
index 1f38171f199..0328eba010c 100644
--- a/htdocs/accountancy/bookkeeping/card.php
+++ b/htdocs/accountancy/bookkeeping/card.php
@@ -38,6 +38,7 @@ require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingaccount.class.php
 $langs->loadLangs(array("accountancy", "bills", "compta"));
 
 $action = GETPOST('action', 'aZ09');
+$optioncss  = GETPOST('optioncss', 'aZ');												// Option for the css output (always '' except when 'print')
 
 $id = GETPOST('id', 'int');					// id of record
 $mode = GETPOST('mode', 'aZ09');		 		// '' or 'tmp'
@@ -346,6 +347,8 @@ if ($action == 'create')
 	}
 
 	print '<form action="' . $_SERVER["PHP_SELF"] . '" name="create_mvt" 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="action" value="confirm_create">' . "\n";
 	print '<input type="hidden" name="next_num_mvt" value="' . $next_num_mvt . '">' . "\n";
 	print '<input type="hidden" name="mode" value="_tmp">' . "\n";
@@ -441,7 +444,8 @@ if ($action == 'create')
 		print '</td><td colspan="3">';
 		if ($action == 'editdate') {
 			print '<form name="setdate" action="' . $_SERVER["PHP_SELF"] . '?piece_num=' . $object->piece_num . '" method="post">';
-			print '<input type="hidden" name="token" value="' . $_SESSION ['newtoken'] . '">';
+			if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+			print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 			print '<input type="hidden" name="action" value="setdate">';
 			print '<input type="hidden" name="mode" value="'.$mode.'">';
 			print $form->selectDate($object->doc_date ? $object->doc_date : - 1, 'doc_date', '', '', '', "setdate");
@@ -464,7 +468,8 @@ if ($action == 'create')
 		print '</td><td>';
 		if ($action == 'editjournal') {
 			print '<form name="setjournal" action="' . $_SERVER["PHP_SELF"] . '?piece_num=' . $object->piece_num . '" method="post">';
-			print '<input type="hidden" name="token" value="' . $_SESSION ['newtoken'] . '">';
+			if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+			print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 			print '<input type="hidden" name="action" value="setjournal">';
 			print '<input type="hidden" name="mode" value="'.$mode.'">';
 			print $formaccounting->select_journal($object->code_journal, 'code_journal', 0, 0, array(), 1, 1);
@@ -487,7 +492,8 @@ if ($action == 'create')
 		print '</td><td>';
 		if ($action == 'editdocref') {
 			print '<form name="setdocref" action="' . $_SERVER["PHP_SELF"] . '?piece_num=' . $object->piece_num . '" method="post">';
-			print '<input type="hidden" name="token" value="' . $_SESSION ['newtoken'] . '">';
+			if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+			print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 			print '<input type="hidden" name="action" value="setdocref">';
 			print '<input type="hidden" name="mode" value="'.$mode.'">';
 			print '<input type="text" size="20" name="doc_ref" value="'.dol_escape_htmltag($object->doc_ref).'">';
@@ -583,6 +589,8 @@ if ($action == 'create')
 			print load_fiche_titre($langs->trans("ListeMvts"), '', '');
 
 			print '<form action="' . $_SERVER["PHP_SELF"] . '?piece_num=' . $object->piece_num . '" 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="doc_date" value="' . $object->doc_date . '">' . "\n";
 			print '<input type="hidden" name="doc_type" value="' . $object->doc_type . '">' . "\n";
 			print '<input type="hidden" name="doc_ref" value="' . $object->doc_ref . '">' . "\n";
diff --git a/htdocs/accountancy/class/accountancyexport.class.php b/htdocs/accountancy/class/accountancyexport.class.php
index 10ebabc4f8a..9845502321a 100644
--- a/htdocs/accountancy/class/accountancyexport.class.php
+++ b/htdocs/accountancy/class/accountancyexport.class.php
@@ -48,6 +48,7 @@ class AccountancyExport
 	public static $EXPORT_TYPE_BOB50 = 35;
 	public static $EXPORT_TYPE_CIEL = 40;
 	public static $EXPORT_TYPE_SAGE50_SWISS = 45;
+	public static $EXPORT_TYPE_CHARLEMAGNE = 50;
 	public static $EXPORT_TYPE_QUADRATUS = 60;
 	public static $EXPORT_TYPE_OPENCONCERTO = 100;
     public static $EXPORT_TYPE_LDCOMPTA = 110;
@@ -108,6 +109,7 @@ class AccountancyExport
 			self::$EXPORT_TYPE_SAGE50_SWISS => $langs->trans('Modelcsv_Sage50_Swiss'),
 			self::$EXPORT_TYPE_LDCOMPTA => $langs->trans('Modelcsv_LDCompta'),
 			self::$EXPORT_TYPE_FEC => $langs->trans('Modelcsv_FEC'),
+				self::$EXPORT_TYPE_CHARLEMAGNE => $langs->trans('Modelcsv_charlemagne'),
 		);
 
 		ksort($listofexporttypes, SORT_NUMERIC);
@@ -202,6 +204,10 @@ class AccountancyExport
 					'label' => $langs->trans('Modelcsv_FEC'),
 					'ACCOUNTING_EXPORT_FORMAT' => 'txt',
 				),
+				self::$EXPORT_TYPE_CHARLEMAGNE => array(
+					'label' => $langs->trans('Modelcsv_charlemagne'),
+					'ACCOUNTING_EXPORT_FORMAT' => 'txt',
+				),
 			),
 			'cr'=> array (
 				'1' => $langs->trans("Unix"),
@@ -273,6 +279,9 @@ class AccountancyExport
             case self::$EXPORT_TYPE_FEC :
                 $this->exportFEC($TData);
                 break;
+			case self::$EXPORT_TYPE_CHARLEMAGNE :
+				$this->exportCharlemagne($TData);
+				break;
 			default:
 				$this->errors[] = $langs->trans('accountancy_error_modelnotfound');
 				break;
@@ -284,7 +293,6 @@ class AccountancyExport
 	 * Export format : CEGID
 	 *
 	 * @param array $objectLines data
-	 *
 	 * @return void
 	 */
 	public function exportCegid($objectLines)
@@ -310,7 +318,6 @@ class AccountancyExport
 	 * Export format : COGILOG
 	 *
 	 * @param array $objectLines data
-	 *
 	 * @return void
 	 */
 	public function exportCogilog($objectLines)
@@ -344,7 +351,6 @@ class AccountancyExport
 	 * Export format : COALA
 	 *
 	 * @param array $objectLines data
-	 *
 	 * @return void
 	 */
 	public function exportCoala($objectLines)
@@ -372,7 +378,6 @@ class AccountancyExport
 	 * Export format : BOB50
 	 *
 	 * @param array $objectLines data
-	 *
 	 * @return void
 	 */
 	public function exportBob50($objectLines)
@@ -411,7 +416,6 @@ class AccountancyExport
 	 * Export format : CIEL
 	 *
 	 * @param array $TData data
-	 *
 	 * @return void
 	 */
 	public function exportCiel(&$TData)
@@ -452,7 +456,6 @@ class AccountancyExport
 	 * Export format : Quadratus
 	 *
 	 * @param array $TData data
-	 *
 	 * @return void
 	 */
 	public function exportQuadratus(&$TData)
@@ -536,7 +539,6 @@ class AccountancyExport
 	 * Export format : EBP
 	 *
 	 * @param array $objectLines data
-	 *
 	 * @return void
 	 */
 	public function exportEbp($objectLines)
@@ -573,7 +575,6 @@ class AccountancyExport
 	 * Export format : Agiris Isacompta
 	 *
 	 * @param array $objectLines data
-	 *
 	 * @return void
 	 */
 	public function exportAgiris($objectLines)
@@ -614,7 +615,6 @@ class AccountancyExport
      * Export format : OpenConcerto
      *
      * @param array $objectLines data
-     *
      * @return void
      */
     public function exportOpenConcerto($objectLines)
@@ -644,16 +644,17 @@ class AccountancyExport
     }
 
 	/**
-	 * Export format : Configurable
+	 * Export format : Configurable CSV
 	 *
 	 * @param array $objectLines data
-	 *
 	 * @return void
 	 */
 	public function exportConfigurable($objectLines)
 	{
 		global $conf;
 
+		$separator = $this->separator;
+
 		foreach ($objectLines as $line) {
 			$tab = array();
 			// export configurable
@@ -661,15 +662,14 @@ class AccountancyExport
 			$tab[] = $line->piece_num;
 			$tab[] = $date;
 			$tab[] = $line->doc_ref;
-			$tab[] = $line->label_operation;
+			$tab[] = preg_match('/'.$separator.'/', $line->label_operation) ? "'".$line->label_operation."'" : $line->label_operation;
 			$tab[] = length_accountg($line->numero_compte);
 			$tab[] = length_accounta($line->subledger_account);
-			$tab[] = price($line->debit);
-			$tab[] = price($line->credit);
-			$tab[] = price($line->montant);
+			$tab[] = price2num($line->debit);
+			$tab[] = price2num($line->credit);
+			$tab[] = price2num($line->montant);
 			$tab[] = $line->code_journal;
 
-			$separator = $this->separator;
 			print implode($separator, $tab) . $this->end_line;
 		}
 	}
@@ -678,7 +678,6 @@ class AccountancyExport
 	 * Export format : FEC
 	 *
 	 * @param array $objectLines data
-	 *
 	 * @return void
 	 */
 	public function exportFEC($objectLines)
@@ -1013,6 +1012,66 @@ class AccountancyExport
         }
     }
 
+	/**
+	 * Export format : Charlemagne
+	 *
+	 * @param array $objectLines data
+	 * @return void
+	 */
+	public function exportCharlemagne($objectLines)
+	{
+		global $langs;
+		$langs->load('compta');
+
+		$separator = "\t";
+		$end_line = "\n";
+
+		/*
+		 * Charlemagne export need header
+		 */
+		print $langs->transnoentitiesnoconv('Date') . $separator;
+		print self::trunc($langs->transnoentitiesnoconv('Journal'), 6) . $separator;
+		print self::trunc($langs->transnoentitiesnoconv('Account'), 15) . $separator;
+		print self::trunc($langs->transnoentitiesnoconv('LabelAccount'), 60) . $separator;
+		print self::trunc($langs->transnoentitiesnoconv('Piece'), 20) . $separator;
+		print self::trunc($langs->transnoentitiesnoconv('LabelOperation'), 60) . $separator;
+		print $langs->transnoentitiesnoconv('Amount') . $separator;
+		print 'S' . $separator;
+		print self::trunc($langs->transnoentitiesnoconv('Analytic') . ' 1', 15) . $separator;
+		print self::trunc($langs->transnoentitiesnoconv('AnalyticLabel') . ' 1', 60) . $separator;
+		print self::trunc($langs->transnoentitiesnoconv('Analytic') . ' 2', 15) . $separator;
+		print self::trunc($langs->transnoentitiesnoconv('AnalyticLabel') . ' 2', 60) . $separator;
+		print self::trunc($langs->transnoentitiesnoconv('Analytic') . ' 3', 15) . $separator;
+		print self::trunc($langs->transnoentitiesnoconv('AnalyticLabel') . ' 3', 60) . $separator;
+		print $end_line;
+
+		foreach($objectLines as $line) {
+
+			$date = dol_print_date($line->doc_date, '%Y%m%d');
+			print $date . $separator; //Date
+
+			print self::trunc($line->code_journal, 6) . $separator; //Journal code
+
+			if(!empty($line->subledger_account)) $account = $line->subledger_account;
+			else  $account = $line->numero_compte;
+			print self::trunc($account, 15) . $separator;//Account number
+
+			print self::trunc($line->label_compte, 60) . $separator;//Account label
+			print self::trunc($line->doc_ref, 20) . $separator;//Piece
+			print self::trunc($line->label_operation, 60) . $separator;//Operation label
+			print price(abs($line->montant)) . $separator;//Amount
+			print $line->sens . $separator;//Direction
+			print $separator;//Analytic
+			print $separator;//Analytic
+			print $separator;//Analytic
+			print $separator;//Analytic
+			print $separator;//Analytic
+			print $separator;//Analytic
+			print $end_line;
+		}
+	}
+
+
 	/**
 	 * trunc
 	 *
diff --git a/htdocs/adherents/class/subscription.class.php b/htdocs/adherents/class/subscription.class.php
index 71660c0cd8c..571879788ee 100644
--- a/htdocs/adherents/class/subscription.class.php
+++ b/htdocs/adherents/class/subscription.class.php
@@ -53,21 +53,21 @@ class Subscription extends CommonObject
      * @var integer
      */
     public $datec;
-    
+
     /**
      * Date modification record (tms)
      *
      * @var integer
      */
     public $datem;
-    
+
     /**
      * Subscription start date (date subscription)
      *
      * @var integer
      */
     public $dateh;
-    
+
     /**
      * Subscription end date
      *
@@ -128,10 +128,11 @@ class Subscription extends CommonObject
 
         $sql = "INSERT INTO ".MAIN_DB_PREFIX."subscription (fk_adherent, fk_type, datec, dateadh, datef, subscription, note)";
 
-        if ($this->fk_type == null) {
-            require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php';
-            $member=new Adherent($this->db);
-            $result=$member->fetch($this->fk_adherent);
+        require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
+        $member=new Adherent($this->db);
+        $result=$member->fetch($this->fk_adherent);
+
+        if ($this->fk_type == null) {	// If type not defined, we use the type of member
             $type=$member->typeid;
         } else {
             $type=$this->fk_type;
@@ -151,11 +152,13 @@ class Subscription extends CommonObject
         if (! $error)
         {
             $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX . $this->table_element);
+            $this->fk_type = $type;
         }
 
         if (! $error && ! $notrigger)
         {
-            // Call triggers
+        	$this->context = array('member'=>$member);
+        	// Call triggers
             $result=$this->call_trigger('MEMBER_SUBSCRIPTION_CREATE', $user);
             if ($result < 0) { $error++; }
             // End call triggers
@@ -257,7 +260,8 @@ class Subscription extends CommonObject
             $result=$member->update_end_date($user);
 
             if (! $error && ! $notrigger) {
-                // Call triggers
+            	$this->context = array('member'=>$member);
+            	// Call triggers
                 $result=$this->call_trigger('MEMBER_SUBSCRIPTION_MODIFY', $user);
                 if ($result < 0) { $error++; } //Do also here what you must do to rollback action if trigger fail
                 // End call triggers
diff --git a/htdocs/adherents/ldap.php b/htdocs/adherents/ldap.php
index f17638a9966..1d890ab580f 100644
--- a/htdocs/adherents/ldap.php
+++ b/htdocs/adherents/ldap.php
@@ -182,7 +182,7 @@ if ($result > 0)
 	if (empty($dn))
 	{
 	    $langs->load("errors");
-	    print '<tr '.$bc[false].'><td colspan="2"><font class="error">'.$langs->trans("ErrorModuleSetupNotComplete").'</font></td></tr>';
+	    print '<tr '.$bc[false].'><td colspan="2"><font class="error">'.$langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("Member")).'</font></td></tr>';
 	}
     else
     {
diff --git a/htdocs/adherents/subscription/card.php b/htdocs/adherents/subscription/card.php
index a8478f35e88..e44995b263f 100644
--- a/htdocs/adherents/subscription/card.php
+++ b/htdocs/adherents/subscription/card.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2007-2012  Laurent Destailleur     <eldy@users.sourceforge.net>
+/* Copyright (C) 2007-2019  Laurent Destailleur     <eldy@users.sourceforge.net>
  * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -205,18 +205,18 @@ if ($user->rights->adherent->cotisation->creer && $action == 'edit')
 	print $form->showrefnav($object, 'rowid', $linkback, 1);
 	print '</td></tr>';
 
-    // Type
+	// Member
+	$adh->ref=$adh->getFullName($langs);
+	print '<tr>';
+	print '<td>'.$langs->trans("Member").'</td><td class="valeur" colspan="3">'.$adh->getNomUrl(1, 0, 'subscription').'</td>';
+	print '</tr>';
+
+	// Type
 	print '<tr>';
 	print '<td>'.$langs->trans("Type").'</td><td class="valeur" colspan="3">';
 	print $form->selectarray("typeid", $adht->liste_array(), (isset($_POST["typeid"])?$_POST["typeid"]:$object->fk_type));
 	print'</td></tr>';
 
-    // Member
-	$adh->ref=$adh->getFullName($langs);
-    print '<tr>';
-	print '<td>'.$langs->trans("Member").'</td><td class="valeur" colspan="3">'.$adh->getNomUrl(1, 0, 'subscription').'</td>';
-    print '</tr>';
-
     // Date start subscription
     print '<tr><td>'.$langs->trans("DateSubscription").'</td><td class="valeur" colspan="2">';
 	print $form->selectDate($object->dateh, 'datesub', 1, 1, 0, 'update', 1);
@@ -309,6 +309,12 @@ if ($rowid && $action != 'edit')
 
     print '<table class="border" width="100%">';
 
+    // Member
+    $adh->ref=$adh->getFullName($langs);
+    print '<tr>';
+    print '<td class="titlefield">'.$langs->trans("Member").'</td><td class="valeur">'.$adh->getNomUrl(1, 0, 'subscription').'</td>';
+    print '</tr>';
+
     // Type
     print '<tr>';
     print '<td class="titlefield">'.$langs->trans("Type").'</td>';
@@ -322,17 +328,6 @@ if ($rowid && $action != 'edit')
     }
     print '</td></tr>';
 
-    // Member
-	$adh->ref=$adh->getFullName($langs);
-    print '<tr>';
-	print '<td class="titlefield">'.$langs->trans("Member").'</td><td class="valeur">'.$adh->getNomUrl(1, 0, 'subscription').'</td>';
-    print '</tr>';
-
-    // Date record
-    /*print '<tr>';
-	print '<td>'.$langs->trans("DateSubscription").'</td><td class="valeur">'.dol_print_date($object->datec,'dayhour').'</td>';
-    print '</tr>';*/
-
     // Date subscription
     print '<tr>';
 	print '<td>'.$langs->trans("DateSubscription").'</td><td class="valeur">'.dol_print_date($object->dateh, 'day').'</td>';
diff --git a/htdocs/admin/clicktodial.php b/htdocs/admin/clicktodial.php
index 7f4a167edd9..99c6cea7b39 100644
--- a/htdocs/admin/clicktodial.php
+++ b/htdocs/admin/clicktodial.php
@@ -37,12 +37,12 @@ $action = GETPOST('action', 'aZ09');
 /*
  *	Actions
  */
- 
+
 if ($action == 'setvalue' && $user->admin)
 {
-    $result=dolibarr_set_const($db, "CLICKTODIAL_USE_TEL_LINK_ON_PHONE_NUMBERS", GETPOST("CLICKTODIAL_USE_TEL_LINK_ON_PHONE_NUMBERS"), 'chaine', 0, '', $conf->entity);
-    $result=dolibarr_set_const($db, "CLICKTODIAL_URL", GETPOST("CLICKTODIAL_URL"), 'chaine', 0, '', $conf->entity);
-    
+    $result1=dolibarr_set_const($db, "CLICKTODIAL_USE_TEL_LINK_ON_PHONE_NUMBERS", GETPOST("CLICKTODIAL_USE_TEL_LINK_ON_PHONE_NUMBERS"), 'chaine', 0, '', $conf->entity);
+    $result2=dolibarr_set_const($db, "CLICKTODIAL_URL", GETPOST("CLICKTODIAL_URL"), 'chaine', 0, '', $conf->entity);
+
     if ($result1 >= 0 && $result2 >= 0)
     {
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index 87e072b8d7e..f68864fcc3d 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -1058,7 +1058,7 @@ if ($id)
             $valuetoshow=$langs->trans($valuetoshow);   // try to translate
             $class='';
 
-            if ($fieldlist[$field]=='pos')             { $valuetoshow=$langs->trans("Position"); $class='width100'; }
+            if ($fieldlist[$field]=='pos')             { $valuetoshow=$langs->trans("Position"); $class='maxwidth100'; }
             if ($fieldlist[$field]=='source')          { $valuetoshow=$langs->trans("Contact"); }
             if ($fieldlist[$field]=='price')           { $valuetoshow=$langs->trans("PriceUHT"); }
             if ($fieldlist[$field]=='taux')            {
@@ -1076,7 +1076,7 @@ if ($id)
 				if ($tabname[$id] == MAIN_DB_PREFIX."c_paiement") $valuetoshow=$form->textwithtooltip($langs->trans("Type"), $langs->trans("TypePaymentDesc"), 2, 1, img_help(1, ''));
 				else $valuetoshow=$langs->trans("Type");
             }
-            if ($fieldlist[$field]=='code')            { $valuetoshow=$langs->trans("Code"); $class='width100'; }
+            if ($fieldlist[$field]=='code')            { $valuetoshow=$langs->trans("Code"); $class='maxwidth100'; }
             if ($fieldlist[$field]=='libelle' || $fieldlist[$field]=='label')
             {
             	$valuetoshow=$form->textwithtooltip($langs->trans("Label"), $langs->trans("LabelUsedByDefault"), 2, 1, img_help(1, ''));
@@ -1602,7 +1602,6 @@ if ($id)
                             $class='tddict';
                             if ($fieldlist[$field] == 'note' && $id == 10) $class.=' tdoverflowmax200';
                             if ($fieldlist[$field] == 'tracking') $class.=' tdoverflowauto';
-                            if ($fieldlist[$field] == 'code') $class.=' width100';
                             if ($fieldlist[$field] == 'position') $class.=' right';
                             if ($fieldlist[$field] == 'localtax1_type') $class.=' nowrap';
                             if ($fieldlist[$field] == 'localtax2_type') $class.=' nowrap';
@@ -1780,7 +1779,6 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
 	global $form;
 	global $region_id;
 	global $elementList,$sourceList,$localtax_typeList;
-	global $bc;
 
 	$formadmin = new FormAdmin($db);
 	$formcompany = new FormCompany($db);
@@ -1981,7 +1979,7 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
             }
 
 			$classtd=''; $class='';
-			if ($fieldlist[$field]=='code') $classtd='width100';
+			if ($fieldlist[$field]=='code') $class='maxwidth100';
 			if (in_array($fieldlist[$field], array('pos', 'use_default', 'affect', 'delay', 'position', 'sortorder', 'sens', 'category_type'))) $class='maxwidth50';
 			if (in_array($fieldlist[$field], array('libelle', 'label', 'tracking'))) $class='quatrevingtpercent';
 			print '<td class="'.$classtd.'">';
diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php
index 509a04494d2..37c997ee306 100644
--- a/htdocs/admin/ihm.php
+++ b/htdocs/admin/ihm.php
@@ -259,7 +259,7 @@ if ($action == 'edit')	// Edit
 	print '</table><br>'."\n";
 
 	// Themes and themes options
-	show_theme(null, 1);
+	showSkins(null, 1);
 	print '<br>';
 
 	// Other
@@ -464,7 +464,7 @@ else	// Show
 
 
 	// Themes
-	show_theme(null, 0);
+	showSkins(null, 0);
 	print '<br>';
 
 
diff --git a/htdocs/admin/tools/dolibarr_export.php b/htdocs/admin/tools/dolibarr_export.php
index e63aec50dca..c06314daa9a 100644
--- a/htdocs/admin/tools/dolibarr_export.php
+++ b/htdocs/admin/tools/dolibarr_export.php
@@ -446,8 +446,10 @@ print "\n";
 
 
 <br>
-<div class="center"><input type="submit" class="button"
-	value="<?php echo $langs->trans("GenerateBackup") ?>" id="buttonGo" /><br>
+<div class="center">
+	<input type="submit" class="button reposition" value="<?php echo $langs->trans("GenerateBackup") ?>" id="buttonGo">
+	<input type="hidden" name="page_y" value="<?php echo GETPOST('page_y', 'int'); ?>">
+	<br>
 <br>
 
 <?php
@@ -459,7 +461,7 @@ if (! empty($_SESSION["commandbackuplastdone"]))
 
     //print $paramclear;
 
-    // Now run command and show result
+    // Now show result
     print '<b>'.$langs->trans("BackupResult").':</b> ';
 	print $_SESSION["commandbackupresult"];
 
@@ -598,9 +600,6 @@ print '<br>';
 </fieldset>
 </form>
 
-
-
-
 <?php
 
 // End of page
diff --git a/htdocs/admin/tools/export.php b/htdocs/admin/tools/export.php
index acfa29f2c74..16f9c38602a 100644
--- a/htdocs/admin/tools/export.php
+++ b/htdocs/admin/tools/export.php
@@ -50,7 +50,7 @@ if (! $user->admin) accessforbidden();
 if ($file && ! $what)
 {
     //print DOL_URL_ROOT.'/dolibarr_export.php';
-    header("Location: ".DOL_URL_ROOT.'/admin/tools/dolibarr_export.php?msg='.urlencode($langs->trans("ErrorFieldRequired", $langs->transnoentities("ExportMethod"))));
+	header("Location: ".DOL_URL_ROOT.'/admin/tools/dolibarr_export.php?msg='.urlencode($langs->trans("ErrorFieldRequired", $langs->transnoentities("ExportMethod"))).(GETPOST('page_y', 'int')?'&page_y='.GETPOST('page_y', 'int'):''));
     exit;
 }
 
@@ -122,25 +122,15 @@ $utils = new Utils($db);
 // MYSQL
 if ($what == 'mysql')
 {
-
     $cmddump=GETPOST("mysqldump");	// Do not sanitize here with 'alpha', will be sanitize later by dol_sanitizePathName and escapeshellarg
     $cmddump=dol_sanitizePathName($cmddump);
 
     if (! empty($dolibarr_main_restrict_os_commands))
     {
         $arrayofallowedcommand=explode(',', $dolibarr_main_restrict_os_commands);
-        $ok=0;
         dol_syslog("Command are restricted to ".$dolibarr_main_restrict_os_commands.". We check that one of this command is inside ".$cmddump);
-        foreach($arrayofallowedcommand as $allowedcommand)
-        {
-            $basenamecmddump=basename($cmddump);
-            if (preg_match('/^'.preg_quote($allowedcommand, '/').'$/', $basenamecmddump)) // the provided command $cmddump must be an allowed command
-            {
-                $ok=1;
-                break;
-            }
-        }
-        if (! $ok)
+        $basenamecmddump=basename($cmddump);
+        if (! in_array($basenamecmddump, $arrayofallowedcommand))	// the provided command $cmddump must be an allowed command
         {
             $errormsg=$langs->trans('CommandIsNotInsideAllowedCommands');
         }
@@ -176,6 +166,18 @@ if ($what == 'postgresql')
     $cmddump=GETPOST("postgresqldump");	// Do not sanitize here with 'alpha', will be sanitize later by dol_sanitizePathName and escapeshellarg
     $cmddump=dol_sanitizePathName($cmddump);
 
+    /* Not required, the command is output on screen but not ran for pgsql
+    if (! empty($dolibarr_main_restrict_os_commands))
+    {
+    	$arrayofallowedcommand=explode(',', $dolibarr_main_restrict_os_commands);
+    	dol_syslog("Command are restricted to ".$dolibarr_main_restrict_os_commands.". We check that one of this command is inside ".$cmddump);
+    	$basenamecmddump=basename($cmddump);
+    	if (! in_array($basenamecmddump, $arrayofallowedcommand))	// the provided command $cmddump must be an allowed command
+    	{
+    		$errormsg=$langs->trans('CommandIsNotInsideAllowedCommands');
+    	}
+    } */
+
     if (! $errormsg && $cmddump)
     {
         dolibarr_set_const($db, 'SYSTEMTOOLS_POSTGRESQLDUMP', $cmddump, 'chaine', 0, '', $conf->entity);
@@ -193,7 +195,6 @@ if ($what == 'postgresql')
 }
 
 
-
 if ($errormsg)
 {
 	setEventMessages($langs->trans("Error")." : ".$errormsg, null, 'errors');
@@ -230,8 +231,8 @@ $result=$formfile->list_of_documents($filearray,null,'systemtools','',1,'backup/
 print '<br>';
 */
 
-// Redirect t backup page
-header("Location: dolibarr_export.php");
+// Redirect to backup page
+header("Location: dolibarr_export.php".(GETPOST('page_y', 'int')?'?page_y='.GETPOST('page_y', 'int'):''));
 
 $time_end = time();
 
diff --git a/htdocs/admin/website.php b/htdocs/admin/website.php
index 2b7e4fbf1f8..5096563ad76 100644
--- a/htdocs/admin/website.php
+++ b/htdocs/admin/website.php
@@ -618,7 +618,7 @@ if ($id)
 
                     // Active
                     print '<td align="center" class="nowrap">';
-                    print '<a href="'.$url.'action='.$acts[$obj->status].'">'.$actl[$obj->status].'</a>';
+                    print '<a href="'.$url.'action='.$acts[($obj->status?1:0)].'">'.$actl[($obj->status?1:0)].'</a>';
                     print "</td>";
 
                     // Modify link
diff --git a/htdocs/api/class/api_documents.class.php b/htdocs/api/class/api_documents.class.php
index f4a7084b336..48d6bf5b903 100644
--- a/htdocs/api/class/api_documents.class.php
+++ b/htdocs/api/class/api_documents.class.php
@@ -368,7 +368,7 @@ class Documents extends DolibarrApi
 				throw new RestException(404, 'Product not found');
 			}
 
-			$upload_dir = $conf->product->dir_output . "/" . get_exdir(0, 0, 0, 1, $object, 'product');
+			$upload_dir = $conf->product->multidir_output[$object->entity].'/'.get_exdir(0, 0, 0, 0, $object, 'product').dol_sanitizeFileName($object->ref);
 		}
 		elseif ($modulepart == 'agenda' || $modulepart == 'action' || $modulepart == 'event')
 		{
diff --git a/htdocs/cashdesk/index_verif.php b/htdocs/cashdesk/index_verif.php
index 05117f5e7cb..bb0e037bf7d 100644
--- a/htdocs/cashdesk/index_verif.php
+++ b/htdocs/cashdesk/index_verif.php
@@ -79,16 +79,6 @@ if (! empty($conf->stock->enabled) && empty($conf->global->CASHDESK_NO_DECREASE_
 }
 
 
-/*
-if (! empty($_POST['txtUsername']) && ! empty($conf->banque->enabled) && (empty($conf_fkaccount_cash) && empty($conf_fkaccount_cheque) && empty($conf_fkaccount_cb)))
-{
-	$langs->load("errors");
-	$retour=$langs->trans("ErrorModuleSetupNotComplete");
-    header('Location: '.DOL_URL_ROOT.'/cashdesk/index.php?err='.urlencode($retour).'&user='.$username.'&socid='.$thirdpartyid.'&warehouseid='.$warehouseid);
-    exit;
-}
-*/
-
 // Check password
 $auth = new Auth($db);
 $retour = $auth->verif($username, $password);
diff --git a/htdocs/cashdesk/tpl/facturation1.tpl.php b/htdocs/cashdesk/tpl/facturation1.tpl.php
index 8da535f20f3..4230227717e 100644
--- a/htdocs/cashdesk/tpl/facturation1.tpl.php
+++ b/htdocs/cashdesk/tpl/facturation1.tpl.php
@@ -165,7 +165,7 @@ $langs->loadLangs(array("main","bills","cashdesk"));
 			if (empty($_SESSION['CASHDESK_ID_BANKACCOUNT_CASH']) || $_SESSION['CASHDESK_ID_BANKACCOUNT_CASH'] < 0)
 			{
 				$langs->load("errors");
-				print '<input class="bouton_mode_reglement_disabled" type="button" name="btnModeReglement" value="'.$langs->trans("Cash").'" title="'.dol_escape_htmltag($langs->trans("ErrorModuleSetupNotComplete")).'" />';
+				print '<input class="bouton_mode_reglement_disabled" type="button" name="btnModeReglement" value="'.$langs->trans("Cash").'" title="'.dol_escape_htmltag($langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("CashDesk"))).'" />';
 			}
 			else print '<input class="button bouton_mode_reglement" type="submit" name="btnModeReglement" value="'.$langs->trans("Cash").'" onclick="javascript: verifClic(\'ESP\');" />';
 			print '</div>';
@@ -173,7 +173,7 @@ $langs->loadLangs(array("main","bills","cashdesk"));
 			if (empty($_SESSION['CASHDESK_ID_BANKACCOUNT_CB']) || $_SESSION['CASHDESK_ID_BANKACCOUNT_CB'] < 0)
 			{
 				$langs->load("errors");
-				print '<input class="bouton_mode_reglement_disabled" type="button" name="btnModeReglement" value="'.$langs->trans("CreditCard").'" title="'.dol_escape_htmltag($langs->trans("ErrorModuleSetupNotComplete")).'" />';
+				print '<input class="bouton_mode_reglement_disabled" type="button" name="btnModeReglement" value="'.$langs->trans("CreditCard").'" title="'.dol_escape_htmltag($langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("CashDesk"))).'" />';
 			}
 			else print '<input class="button bouton_mode_reglement" type="submit" name="btnModeReglement" value="'.$langs->trans("CreditCard").'" onclick="javascript: verifClic(\'CB\');" />';
 			print '</div>';
@@ -181,7 +181,7 @@ $langs->loadLangs(array("main","bills","cashdesk"));
 			if (empty($_SESSION['CASHDESK_ID_BANKACCOUNT_CHEQUE']) || $_SESSION['CASHDESK_ID_BANKACCOUNT_CHEQUE'] < 0)
 			{
 				$langs->load("errors");
-				print '<input class="bouton_mode_reglement_disabled" type="button" name="btnModeReglement" value="'.$langs->trans("CheckBank").'" title="'.dol_escape_htmltag($langs->trans("ErrorModuleSetupNotComplete")).'" />';
+				print '<input class="bouton_mode_reglement_disabled" type="button" name="btnModeReglement" value="'.$langs->trans("CheckBank").'" title="'.dol_escape_htmltag($langs->trans("ErrorModuleSetupNotComplete"), $langs->transnoentitiesnoconv("CashDesk")).'" />';
 			}
 			else print '<input class="button bouton_mode_reglement" type="submit" name="btnModeReglement" value="'.$langs->trans("CheckBank").'" onclick="javascript: verifClic(\'CHQ\');" />';
 			print '</div>';
diff --git a/htdocs/collab/index.php b/htdocs/collab/index.php
index b0f1f5253c2..429e5398c5a 100644
--- a/htdocs/collab/index.php
+++ b/htdocs/collab/index.php
@@ -168,287 +168,8 @@ if ($action != 'preview' && $action != 'editcontent') $style=' margin-bottom: 5p
 //var_dump($objectpage);exit;
 print '<div class="centpercent websitebar">';
 
-if (count($object->records) > 0)
-{
-	// ***** Part for web sites
-
-	print '<div class="websiteselection hideonsmartphoneimp">';
-	print $langs->trans("WebSite").': ';
-	print '</div>';
-
-	// List of websites
-	print '<div class="websiteselection">';
-	$out='';
-	$out.='<select name="website" class="minwidth100" id="website">';
-	if (empty($object->records)) $out.='<option value="-1">&nbsp;</option>';
-	// Loop on each sites
-	$i=0;
-	foreach($object->records as $key => $valwebsite)
-	{
-		if (empty($website)) $website=$valwebsite->ref;
-
-		$out.='<option value="'.$valwebsite->ref.'"';
-		if ($website == $valwebsite->ref) $out.=' selected';		// To preselect a value
-		$out.='>';
-		$out.=$valwebsite->ref;
-		$out.='</option>';
-		$i++;
-	}
-	$out.='</select>';
-	$out.=ajax_combobox('website');
-	print $out;
-	print '<input type="submit" class="button" name="refreshsite" value="'.$langs->trans("Load").'">';
-
-	if ($website)
-	{
-		$virtualurl='';
-		$dataroot=DOL_DATA_ROOT.'/collab/'.$website;
-		if (! empty($object->virtualhost)) $virtualurl=$object->virtualhost;
-	}
-
-	if ($website && $action == 'preview')
-	{
-		$disabled='';
-		if (empty($user->rights->websites->write)) $disabled=' disabled="disabled"';
-
-		print ' &nbsp; ';
-
-		//print '<input type="submit" class="button"'.$disabled.' value="'.dol_escape_htmltag($langs->trans("MediaFiles")).'" name="editmedia">';
-		print '<input type="submit" class="button"'.$disabled.' value="'.dol_escape_htmltag($langs->trans("EditCss")).'" name="editcss">';
-		print '<input type="submit" class="button"'.$disabled.' value="'.dol_escape_htmltag($langs->trans("EditMenu")).'" name="editmenu">';
-		print '<input type="submit"'.$disabled.' class="button" value="'.dol_escape_htmltag($langs->trans("AddPage")).'" name="create">';
-	}
-
-	print '</div>';
-
-	// Button for websites
-	print '<div class="websitetools">';
-
-	if ($action == 'preview')
-	{
-		print '<div class="websiteinputurl">';
-		print '<input type="text" id="previewsiteurl" class="minwidth200imp" name="previewsite" placeholder="'.$langs->trans("http://myvirtualhost").'" value="'.$virtualurl.'">';
-		//print '<input type="submit" class="button" name="previewwebsite" target="tab'.$website.'" value="'.$langs->trans("ViewSiteInNewTab").'">';
-		$htmltext=$langs->trans("SetHereVirtualHost", $dataroot);
-		print $form->textwithpicto('', $htmltext);
-		print '</div>';
-
-		$urlext=$virtualurl;
-		$urlint=$urlwithroot.'/public/collab/index.php?website='.$website;
-		//if (! empty($object->virtualhost))
-		//{
-			print '<a class="websitebuttonsitepreview" id="previewsiteext" href="'.$urlext.'" target="tab'.$website.'" alt="'.dol_escape_htmltag($langs->trans("PreviewSiteServedByWebServer", $langs->transnoentitiesnoconv("Site"), $langs->transnoentitiesnoconv("Site"), $dataroot, $urlext)).'">';
-			print $form->textwithpicto('', $langs->trans("PreviewSiteServedByWebServer", $langs->transnoentitiesnoconv("Site"), $langs->transnoentitiesnoconv("Site"), $dataroot, $urlext?$urlext:$langs->trans("VirtualHostUrlNotDefined")), 1, 'preview_ext');
-			print '</a>';
-		//}
-
-		print '<a class="websitebuttonsitepreview" id="previewsite" href="'.$urlwithroot.'/public/collab/index.php?website='.$website.'" target="tab'.$website.'" alt="'.dol_escape_htmltag($langs->trans("PreviewSiteServedByDolibarr", $langs->transnoentitiesnoconv("Site"), $langs->transnoentitiesnoconv("Site"), $urlint)).'">';
-		print $form->textwithpicto('', $langs->trans("PreviewSiteServedByDolibarr", $langs->transnoentitiesnoconv("Site"), $langs->transnoentitiesnoconv("Site"), $urlint, $dataroot), 1, 'preview');
-		print '</a>';
-	}
-
-	if (in_array($action, array('editcss','editmenu','create')))
-	{
-		if ($action != 'preview') print '<input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Cancel")).'" name="preview">';
-		if (preg_match('/^create/', $action)) print '<input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Save")).'" name="update">';
-		if (preg_match('/^edit/', $action)) print '<input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Save")).'" name="update">';
-	}
-
-	print '</div>';
 
 
-	// ***** Part for pages
-
-	if ($website)
-	{
-		print '</div>';
-
-		$array=$objectpage->fetchAll($object->id);
-		if (! is_array($array) && $array < 0) dol_print_error('', $objectpage->error, $objectpage->errors);
-		$atleastonepage=(is_array($array) && count($array) > 0);
-
-		print '<div class="centpercent websitebar"'.($style?' style="'.$style.'"':'').'">';
-		print '<div class="websiteselection hideonsmartphoneimp">';
-		print $langs->trans("Page").': ';
-		print '</div>';
-		print '<div class="websiteselection">';
-
-		if ($action != 'add')
-		{
-			$out='';
-			$out.='<select name="pageid" id="pageid" class="minwidth200">';
-			if ($atleastonepage)
-			{
-				if (empty($pageid) && $action != 'create')      // Page id is not defined, we try to take one
-				{
-					$firstpageid=0;$homepageid=0;
-					foreach($array as $key => $valpage)
-					{
-						if (empty($firstpageid)) $firstpageid=$valpage->id;
-						if ($object->fk_default_home && $key == $object->fk_default_home) $homepageid=$valpage->id;
-					}
-					$pageid=$homepageid?$homepageid:$firstpageid;   // We choose home page and if not defined yet, we take first page
-				}
-
-				foreach($array as $key => $valpage)
-				{
-					$out.='<option value="'.$key.'"';
-					if ($pageid > 0 && $pageid == $key) $out.=' selected';		// To preselect a value
-					$out.='>';
-					$out.=$valpage->title;
-					if ($object->fk_default_home && $key == $object->fk_default_home) $out.=' ('.$langs->trans("HomePage").')';
-					$out.='</option>';
-				}
-			}
-			else $out.='<option value="-1">&nbsp;</option>';
-			$out.='</select>';
-			$out.=ajax_combobox('pageid');
-			print $out;
-		}
-		else
-		{
-			print $langs->trans("New");
-		}
-
-		print '<input type="submit" class="button" name="refreshpage" value="'.$langs->trans("Load").'"'.($atleastonepage?'':' disabled="disabled"').'>';
-		//print $form->selectarray('page', $array);
-
-		if ($action == 'preview')
-		{
-			$disabled='';
-			if (empty($user->rights->websites->write)) $disabled=' disabled="disabled"';
-
-			if ($pageid > 0)
-			{
-				print ' &nbsp; ';
-
-				if ($object->fk_default_home > 0 && $pageid == $object->fk_default_home) print '<input type="submit" class="button" disabled="disabled" value="'.dol_escape_htmltag($langs->trans("SetAsHomePage")).'" name="setashome">';
-				else print '<input type="submit" class="button"'.$disabled.' value="'.dol_escape_htmltag($langs->trans("SetAsHomePage")).'" name="setashome">';
-				print '<input type="submit" class="button"'.$disabled.'  value="'.dol_escape_htmltag($langs->trans("EditPageMeta")).'" name="editmeta">';
-				print '<input type="submit" class="button"'.$disabled.'  value="'.dol_escape_htmltag($langs->trans("EditPageContent")).'" name="editcontent">';
-				//print '<a href="'.$_SERVER["PHP_SELF"].'?action=editmeta&website='.urlencode($website).'&pageid='.urlencode($pageid).'" class="button">'.dol_escape_htmltag($langs->trans("EditPageMeta")).'</a>';
-				//print '<a href="'.$_SERVER["PHP_SELF"].'?action=editcontent&website='.urlencode($website).'&pageid='.urlencode($pageid).'" class="button">'.dol_escape_htmltag($langs->trans("EditPageContent")).'</a>';
-				print '<input type="submit" class="buttonDelete" name="delete" value="'.$langs->trans("Delete").'"'.($atleastonepage?'':' disabled="disabled"').'>';
-			}
-		}
-
-		print '</div>';
-		print '<div class="websiteselection">';
-		print '</div>';
-
-		print '<div class="websitetools">';
-
-		if ($website && $pageid > 0 && $action == 'preview')
-		{
-			$websitepage = new WebSitePage($db);
-			$websitepage->fetch($pageid);
-
-			$realpage=$urlwithroot.'/public/collab/index.php?website='.$website.'&page='.$pageid;
-			$pagealias = $websitepage->pageurl;
-
-			print '<div class="websiteinputurl">';
-			print '<input type="text" id="previewpageurl" class="minwidth200imp" name="previewsite" value="'.$pagealias.'" disabled="disabled">';
-			//print '<input type="submit" class="button" name="previewwebsite" target="tab'.$website.'" value="'.$langs->trans("ViewSiteInNewTab").'">';
-			$htmltext=$langs->trans("WEBSITE_PAGENAME", $pagealias);
-			print $form->textwithpicto('', $htmltext);
-			print '</div>';
-
-			if (! empty($object->virtualhost))
-			{
-				$urlext=$virtualurl.'/'.$pagealias.'.php';
-				print '<a class="websitebuttonsitepreview" id="previewpageext" href="'.$urlext.'" target="tab'.$website.'" alt="'.dol_escape_htmltag($langs->trans("PreviewSiteServedByWebServer", $langs->transnoentitiesnoconv("Page"), $langs->transnoentitiesnoconv("Page"), $dataroot, $urlext)).'">';
-				print $form->textwithpicto('', $langs->trans("PreviewSiteServedByWebServer", $langs->transnoentitiesnoconv("Page"), $langs->transnoentitiesnoconv("Page"), $dataroot, $urlext?$urlext:$langs->trans("VirtualHostUrlNotDefined")), 1, 'preview_ext');
-				print '</a>';
-			}
-			else
-			{
-				print '<a class="websitebuttonsitepreview" id="previewpageextnoclick" href="#">';
-				print $form->textwithpicto('', $langs->trans("PreviewSiteServedByWebServer", $langs->transnoentitiesnoconv("Page"), $langs->transnoentitiesnoconv("Page"), $dataroot, $urlext?$urlext:$langs->trans("VirtualHostUrlNotDefined")), 1, 'preview_ext');
-				print '</a>';
-			}
-
-			print '<a class="websitebuttonsitepreview" id="previewpage" href="'.$realpage.'&nocache='.dol_now().'" class="button" target="tab'.$website.'" alt="'.dol_escape_htmltag($langs->trans("PreviewSiteServedByDolibarr", $langs->transnoentitiesnoconv("Page"), $langs->transnoentitiesnoconv("Page"), $realpage)).'">';
-			print $form->textwithpicto('', $langs->trans("PreviewSiteServedByDolibarr", $langs->transnoentitiesnoconv("Page"), $langs->transnoentitiesnoconv("Page"), $realpage, $dataroot), 1, 'preview');
-			print '</a>';       // View page in new Tab
-			//print '<input type="submit" class="button" name="previewpage" target="tab'.$website.'"value="'.$langs->trans("ViewPageInNewTab").'">';
-
-			// TODO Add js to save alias like we save virtual host name and use dynamic virtual host for url of id=previewpageext
-		}
-		if (! in_array($action, array('editcss','editmenu','create')))
-		{
-			if ($action != 'preview') print '<input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Cancel")).'" name="preview">';
-			if (preg_match('/^create/', $action)) print '<input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Save")).'" name="update">';
-			if (preg_match('/^edit/', $action)) print '<input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Save")).'" name="update">';
-		}
-
-		print '</div>';
-
-		if ($action == 'preview')
-		{
-			// Adding jquery code to change on the fly url of preview ext
-			if (! empty($conf->use_javascript_ajax))
-			{
-				print '<script type="text/javascript" language="javascript">
-                    jQuery(document).ready(function() {
-                    	jQuery("#previewsiteext,#previewpageext").click(function() {
-                            newurl=jQuery("#previewsiteurl").val();
-                            newpage=jQuery("#previewsiteurl").val() + "/" + jQuery("#previewpageurl").val() + ".php";
-                            console.log("Open url "+newurl);
-                            /* Save url */
-                            jQuery.ajax({
-                                method: "POST",
-                                url: "'.DOL_URL_ROOT.'/core/ajax/saveinplace.php",
-                                data: {
-                                    field: \'editval_virtualhost\',
-                                    element: \'websites\',
-                                    table_element: \'website\',
-                                    fk_element: '.$object->id.',
-                                    value: newurl,
-                                },
-                                context: document.body
-                            });
-
-                            jQuery("#previewsiteext").attr("href",newurl);
-                            jQuery("#previewpageext").attr("href",newpage);
-                        });
-                    });
-                    </script>';
-			}
-		}
-	}
-}
-else
-{
-	print '<div class="websiteselection">';
-	$langs->load("errors");
-	print $langs->trans("ErrorModuleSetupNotComplete");
-	print '<div>';
-	$action='';
-}
-
-
-print '</div>';
-
-$head = array();
-
-if ($action == 'editcontent')
-{
-	/*
-     * Editing global variables not related to a specific theme
-     */
-
-	$csscontent = @file_get_contents($filecss);
-
-	$contentforedit = '';
-	/*$contentforedit.='<style scoped>'."\n";        // "scoped" means "apply to parent element only". Not yet supported by browsers
-    $contentforedit.=$csscontent;
-    $contentforedit.='</style>'."\n";*/
-	$contentforedit .= $objectpage->content;
-
-	require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-	$doleditor=new DolEditor('PAGE_CONTENT', $contentforedit, '', 500, 'Full', '', true, true, true, ROWS_5, '90%');
-	$doleditor->Create(0, '', false);
-}
 
 print "</div>\n</form>\n";
 
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index f439b7aaf99..f030a9c7450 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -530,11 +530,11 @@ class Propal extends CommonObject
 			$pu_ht_devise = $tabprice[19];
 
 			// Rang to use
-			$rangtouse = $rang;
-			if ($rangtouse == -1)
+			$ranktouse = $rang;
+			if ($ranktouse == -1)
 			{
 				$rangmax = $this->line_max($fk_parent_line);
-				$rangtouse = $rangmax + 1;
+				$ranktouse = $rangmax + 1;
 			}
 
 			// TODO A virer
@@ -568,7 +568,7 @@ class Propal extends CommonObject
 			$this->line->fk_remise_except=$fk_remise_except;
 			$this->line->remise_percent=$remise_percent;
 			$this->line->subprice=$pu_ht;
-			$this->line->rang=$rangtouse;
+			$this->line->rang=$ranktouse;
 			$this->line->info_bits=$info_bits;
 			$this->line->total_ht=$total_ht;
 			$this->line->total_tva=$total_tva;
@@ -3515,7 +3515,7 @@ class Propal extends CommonObject
 		else
 		{
 			$langs->load("errors");
-			print $langs->trans("Error")." ".$langs->trans("ErrorModuleSetupNotComplete");
+			print $langs->trans("Error")." ".$langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("Proposal"));
 			return "";
 		}
 	}
diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index c157979e817..2964ff98690 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -168,6 +168,7 @@ $arrayfields=array(
 	'sale_representative'=>array('label'=>"SaleRepresentativesOfThirdParty", 'checked'=>1),
 	'p.datec'=>array('label'=>"DateCreation", 'checked'=>0, 'position'=>500),
 	'p.tms'=>array('label'=>"DateModificationShort", 'checked'=>0, 'position'=>500),
+  'p.date_cloture'=>array('label'=>"DateClosing", 'checked'=>0, 'position'=>500),
 	'p.fk_statut'=>array('label'=>"Status", 'checked'=>1, 'position'=>1000),
 );
 // Extra fields
@@ -269,10 +270,10 @@ $sql.= " typent.code as typent_code,";
 $sql.= " ava.rowid as availability,";
 $sql.= " state.code_departement as state_code, state.nom as state_name,";
 $sql.= ' p.rowid, p.entity, p.note_private, p.total_ht, p.tva as total_vat, p.total as total_ttc, p.localtax1, p.localtax2, p.ref, p.ref_client, p.fk_statut, p.fk_user_author, p.datep as dp, p.fin_validite as dfv,p.date_livraison as ddelivery,';
-$sql.= ' p.datec as date_creation, p.tms as date_update,';
+$sql.= ' p.datec as date_creation, p.tms as date_update, p.date_cloture as date_cloture,';
 $sql.= " pr.rowid as project_id, pr.ref as project_ref, pr.title as project_label,";
 $sql.= ' u.login';
-if (! $user->rights->societe->client->voir && ! $socid) $sql .= ", sc.fk_soc, sc.fk_user,";
+if (! $user->rights->societe->client->voir && ! $socid) $sql .= ", sc.fk_soc, sc.fk_user";
 if ($search_categ_cus) $sql .= ", cc.fk_categorie, cc.fk_soc";
 // Add fields from extrafields
 foreach ($extrafields->attribute_label as $key => $val) $sql.=($extrafields->attribute_type[$key] != 'separate' ? ", ef.".$key.' as options_'.$key : '');
@@ -688,6 +689,12 @@ if ($resql)
 		print '<td class="liste_titre">';
 		print '</td>';
 	}
+  // Date cloture
+	if (! empty($arrayfields['p.date_cloture']['checked']))
+	{
+		print '<td class="liste_titre">';
+		print '</td>';
+	}
 	// Status
 	if (! empty($arrayfields['p.fk_statut']['checked']))
 	{
@@ -735,6 +742,7 @@ if ($resql)
 	print $hookmanager->resPrint;
 	if (! empty($arrayfields['p.datec']['checked']))     print_liste_field_titre($arrayfields['p.datec']['label'], $_SERVER["PHP_SELF"], "p.datec", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder);
 	if (! empty($arrayfields['p.tms']['checked']))       print_liste_field_titre($arrayfields['p.tms']['label'], $_SERVER["PHP_SELF"], "p.tms", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder);
+	if (! empty($arrayfields['p.date_cloture']['checked']))       print_liste_field_titre($arrayfields['p.date_cloture']['label'], $_SERVER["PHP_SELF"], "p.date_cloture", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder);
 	if (! empty($arrayfields['p.fk_statut']['checked'])) print_liste_field_titre($arrayfields['p.fk_statut']['label'], $_SERVER["PHP_SELF"], "p.fk_statut", "", $param, 'class="right"', $sortfield, $sortorder);
 	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ');
 	print '</tr>'."\n";
@@ -1073,6 +1081,14 @@ if ($resql)
 			print '</td>';
 			if (! $i) $totalarray['nbfield']++;
 		}
+    // Date cloture
+		if (! empty($arrayfields['p.date_cloture']['checked']))
+		{
+			print '<td align="center" class="nowrap">';
+			print dol_print_date($db->jdate($obj->date_cloture), 'dayhour', 'tzuser');
+			print '</td>';
+			if (! $i) $totalarray['nbfield']++;
+		}
 		// Status
 		if (! empty($arrayfields['p.fk_statut']['checked']))
 		{
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 4a91dd1304e..a44054cdfd0 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -2590,7 +2590,7 @@ if ($action == 'create' && $usercancreate)
 							}
 						} else {
 							$langs->load("errors");
-							print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="' . dol_escape_htmltag($langs->trans("ErrorModuleSetupNotComplete")) . '">' . $langs->trans('CreateShipment') . '</a></div>';
+							print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="' . dol_escape_htmltag($langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("Shipment"))) . '">' . $langs->trans('CreateShipment') . '</a></div>';
 						}
 					}
 				}
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 49b2e08457f..01f41b7cdbc 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -1458,11 +1458,11 @@ class Commande extends CommonOrder
 			$pu_ht_devise = $tabprice[19];
 
 			// Rang to use
-			$rangtouse = $rang;
-			if ($rangtouse == -1)
+			$ranktouse = $rang;
+			if ($ranktouse == -1)
 			{
 				$rangmax = $this->line_max($fk_parent_line);
-				$rangtouse = $rangmax + 1;
+				$ranktouse = $rangmax + 1;
 			}
 
 			// TODO A virer
@@ -1496,7 +1496,7 @@ class Commande extends CommonOrder
 			$this->line->fk_remise_except=$fk_remise_except;
 			$this->line->remise_percent=$remise_percent;
 			$this->line->subprice=$pu_ht;
-			$this->line->rang=$rangtouse;
+			$this->line->rang=$ranktouse;
 			$this->line->info_bits=$info_bits;
 			$this->line->total_ht=$total_ht;
 			$this->line->total_tva=$total_tva;
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index ecb28a322f4..66a3862bd2c 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -143,6 +143,7 @@ $arrayfields=array(
 	'c.total_ttc'=>array('label'=>"AmountTTC", 'checked'=>0),
 	'c.datec'=>array('label'=>"DateCreation", 'checked'=>0, 'position'=>500),
 	'c.tms'=>array('label'=>"DateModificationShort", 'checked'=>0, 'position'=>500),
+  'c.date_cloture'=>array('label'=>"DateClosing", 'checked'=>0, 'position'=>500),
 	'c.fk_statut'=>array('label'=>"Status", 'checked'=>1, 'position'=>1000),
 	'c.facture'=>array('label'=>"Billed", 'checked'=>1, 'position'=>1000, 'enabled'=>(empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT)))
 );
@@ -247,7 +248,7 @@ $sql.= " typent.code as typent_code,";
 $sql.= " state.code_departement as state_code, state.nom as state_name,";
 $sql.= ' c.rowid, c.ref, c.total_ht, c.tva as total_tva, c.total_ttc, c.ref_client,';
 $sql.= ' c.date_valid, c.date_commande, c.note_private, c.date_livraison as date_delivery, c.fk_statut, c.facture as billed,';
-$sql.= ' c.date_creation as date_creation, c.tms as date_update,';
+$sql.= ' c.date_creation as date_creation, c.tms as date_update, c.date_cloture as date_cloture,';
 $sql.= " p.rowid as project_id, p.ref as project_ref, p.title as project_label";
 if ($search_categ_cus) $sql .= ", cc.fk_categorie, cc.fk_soc";
 // Add fields from extrafields
@@ -693,6 +694,12 @@ if ($resql)
 		print '<td class="liste_titre">';
 		print '</td>';
 	}
+	// Date cloture
+	if (! empty($arrayfields['c.date_cloture']['checked']))
+	{
+		print '<td class="liste_titre">';
+		print '</td>';
+	}
 	// Status
 	if (! empty($arrayfields['c.fk_statut']['checked']))
 	{
@@ -748,7 +755,8 @@ if ($resql)
 	print $hookmanager->resPrint;
 	if (! empty($arrayfields['c.datec']['checked']))     print_liste_field_titre($arrayfields['c.datec']['label'], $_SERVER["PHP_SELF"], "c.date_creation", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
 	if (! empty($arrayfields['c.tms']['checked']))       print_liste_field_titre($arrayfields['c.tms']['label'], $_SERVER["PHP_SELF"], "c.tms", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
-	if (! empty($arrayfields['c.fk_statut']['checked'])) print_liste_field_titre($arrayfields['c.fk_statut']['label'], $_SERVER["PHP_SELF"], "c.fk_statut", "", $param, '', $sortfield, $sortorder, 'right ');
+	if (! empty($arrayfields['c.date_cloture']['checked']))       print_liste_field_titre($arrayfields['c.date_cloture']['label'], $_SERVER["PHP_SELF"], "c.date_cloture", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+  if (! empty($arrayfields['c.fk_statut']['checked'])) print_liste_field_titre($arrayfields['c.fk_statut']['label'], $_SERVER["PHP_SELF"], "c.fk_statut", "", $param, '', $sortfield, $sortorder, 'right ');
 	if (! empty($arrayfields['c.facture']['checked']))   print_liste_field_titre($arrayfields['c.facture']['label'], $_SERVER["PHP_SELF"], 'c.facture', '', $param, '', $sortfield, $sortorder, 'center ');
 	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder, 'maxwidthsearch center ');
 	print '</tr>'."\n";
@@ -1092,6 +1100,14 @@ if ($resql)
 			print '</td>';
 			if (! $i) $totalarray['nbfield']++;
 		}
+		// Date cloture
+		if (! empty($arrayfields['c.date_cloture']['checked']))
+		{
+			print '<td align="center" class="nowrap">';
+			print dol_print_date($db->jdate($obj->date_cloture), 'dayhour', 'tzuser');
+			print '</td>';
+			if (! $i) $totalarray['nbfield']++;
+		}
 		// Status
 		if (! empty($arrayfields['c.fk_statut']['checked']))
 		{
diff --git a/htdocs/compta/bank/index.html b/htdocs/compta/bank/index.html
new file mode 100644
index 00000000000..8b137891791
--- /dev/null
+++ b/htdocs/compta/bank/index.html
@@ -0,0 +1 @@
+
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index d89929e201a..1b9cc3db566 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -2828,11 +2828,11 @@ class Facture extends CommonInvoice
 			$pu_ht_devise = $tabprice[19];
 
 			// Rank to use
-			$rangtouse = $rang;
-			if ($rangtouse == -1)
+			$ranktouse = $rang;
+			if ($ranktouse == -1)
 			{
 				$rangmax = $this->line_max($fk_parent_line);
-				$rangtouse = $rangmax + 1;
+				$ranktouse = $rangmax + 1;
 			}
 
 			// Insert line
@@ -2866,7 +2866,7 @@ class Facture extends CommonInvoice
 			$this->line->date_start=$date_start;
 			$this->line->date_end=$date_end;
 			$this->line->ventil=$ventil;
-			$this->line->rang=$rangtouse;
+			$this->line->rang=$ranktouse;
 			$this->line->info_bits=$info_bits;
 			$this->line->fk_remise_except=$fk_remise_except;
 
@@ -3498,7 +3498,7 @@ class Facture extends CommonInvoice
 		else
 		{
 			$langs->load("errors");
-			print $langs->trans("Error")." ".$langs->trans("ErrorModuleSetupNotComplete");
+			print $langs->trans("Error")." ".$langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("Invoice"));
 			return "";
 		}
 	}
diff --git a/htdocs/compta/paiement/cheque/class/remisecheque.class.php b/htdocs/compta/paiement/cheque/class/remisecheque.class.php
index d9a912ea50b..26e3f2792d6 100644
--- a/htdocs/compta/paiement/cheque/class/remisecheque.class.php
+++ b/htdocs/compta/paiement/cheque/class/remisecheque.class.php
@@ -489,7 +489,7 @@ class RemiseCheque extends CommonObject
 		else
 		{
 			$langs->load("errors");
-			print $langs->trans("Error")." ".$langs->trans("ErrorModuleSetupNotComplete");
+			print $langs->trans("Error")." ".$langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("Bank"));
 			return "";
 		}
     }
diff --git a/htdocs/compta/paiement/class/paiement.class.php b/htdocs/compta/paiement/class/paiement.class.php
index a3c79d23602..614782c519b 100644
--- a/htdocs/compta/paiement/class/paiement.class.php
+++ b/htdocs/compta/paiement/class/paiement.class.php
@@ -1141,7 +1141,7 @@ class Paiement extends CommonObject
 		else
 		{
 			$langs->load("errors");
-			print $langs->trans("Error")." ".$langs->trans("ErrorModuleSetupNotComplete");
+			print $langs->trans("Error")." ".$langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("Invoice"));
 			return "";
 		}
 	}
diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php
index 2dfbb5adf9d..eaef92a1abc 100644
--- a/htdocs/compta/prelevement/create.php
+++ b/htdocs/compta/prelevement/create.php
@@ -78,7 +78,7 @@ if (empty($reshook))
 		// $conf->global->PRELEVEMENT_CODE_BANQUE and $conf->global->PRELEVEMENT_CODE_GUICHET should be empty
 		$bprev = new BonPrelevement($db);
 	    $executiondate = dol_mktime(0, 0, 0, GETPOST('remonth'), (GETPOST('reday')+$conf->global->PRELEVEMENT_ADDDAYS), GETPOST('reyear'));
-	
+
 	    $result = $bprev->create($conf->global->PRELEVEMENT_CODE_BANQUE, $conf->global->PRELEVEMENT_CODE_GUICHET, $mode, $format, $executiondate);
 		if ($result < 0)
 		{
@@ -116,7 +116,7 @@ llxHeader('', $langs->trans("NewStandingOrder"));
 if (prelevement_check_config() < 0)
 {
 	$langs->load("errors");
-	setEventMessages($langs->trans("ErrorModuleSetupNotComplete"), null, 'errors');
+	setEventMessages($langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("Withdraw")), null, 'errors');
 }
 
 /*$h=0;
diff --git a/htdocs/compta/prelevement/index.php b/htdocs/compta/prelevement/index.php
index 4e2c4e2d3a5..1be716f8f61 100644
--- a/htdocs/compta/prelevement/index.php
+++ b/htdocs/compta/prelevement/index.php
@@ -58,7 +58,7 @@ llxHeader('', $langs->trans("CustomersStandingOrdersArea"));
 if (prelevement_check_config() < 0)
 {
 	$langs->load("errors");
-	setEventMessages($langs->trans("ErrorModuleSetupNotComplete"), null, 'errors');
+	setEventMessages($langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("Withdraw")), null, 'errors');
 }
 
 print load_fiche_titre($langs->trans("CustomersStandingOrdersArea"));
diff --git a/htdocs/compta/sociales/list.php b/htdocs/compta/sociales/list.php
index baa1f57a307..5f7f7d0fc0a 100644
--- a/htdocs/compta/sociales/list.php
+++ b/htdocs/compta/sociales/list.php
@@ -281,7 +281,7 @@ if ($resql)
 			print '<td align="center">';
 			if ($obj->periode)
 			{
-				print '<a href="list.php?year='.strftime("%Y",$db->jdate($obj->periode)).'">'.dol_print_date($db->jdate($obj->periode),'day').'</a>';
+				print '<a href="list.php?year='.strftime("%Y", $db->jdate($obj->periode)).'">'.dol_print_date($db->jdate($obj->periode), 'day').'</a>';
 			}
 			else
 			{
diff --git a/htdocs/contact/consumption.php b/htdocs/contact/consumption.php
index 3f0d0313ee0..9cde6e2df4e 100644
--- a/htdocs/contact/consumption.php
+++ b/htdocs/contact/consumption.php
@@ -38,7 +38,7 @@ $id = GETPOST('id', 'int');
 $result = restrictedArea($user, 'contact', $id, 'socpeople&societe');
 $object = new Contact($db);
 if ($id > 0) $object->fetch($id);
-if(empty($object->thirdparty)) $object->fetch_thirdparty();
+if (empty($object->thirdparty)) $object->fetch_thirdparty();
 $socid = $object->thirdparty->id;
 
 // Sort & Order fields
@@ -69,7 +69,7 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
 }
 // Customer or supplier selected in drop box
 $thirdTypeSelect = GETPOST("third_select_id");
-$type_element = GETPOST('type_element')?GETPOST('type_element'):'';
+$type_element = GETPOSTISSET('type_element')?GETPOST('type_element'):'';
 
 // Load translation files required by the page
 $langs->loadLangs(array("companies", "bills", "orders", "suppliers", "propal", "interventions", "contracts", "products"));
@@ -173,13 +173,13 @@ if ($type_element == 'fichinter')
 	$sql_select = 'SELECT f.rowid as doc_id, f.ref as doc_number, \'1\' as doc_type, f.datec as dateprint, f.fk_statut as status, tc.libelle, ';
 	$tables_from = MAIN_DB_PREFIX.'fichinterdet d';
     $tables_from.= ' LEFT JOIN '.MAIN_DB_PREFIX.'fichinter as f ON d.fk_fichinter=f.rowid';
-    $tables_from.= ' INNER JOIN '.MAIN_DB_PREFIX.'element_contact ec ON ec.element_id=f.rowid';
+    $tables_from.= ' INNER JOIN '.MAIN_DB_PREFIX.'element_contact ec ON ec.element_id=f.rowid AND ec.fk_socpeople='.$object->id;
     $tables_from.= ' INNER JOIN '.MAIN_DB_PREFIX."c_type_contact tc ON (ec.fk_c_type_contact=tc.rowid and tc.element='fichinter' and tc.source='external' and tc.active=1)";
 	$where = ' WHERE f.entity IN ('.getEntity('ficheinter').')';
 	$dateprint = 'f.datec';
 	$doc_number='f.ref';
 }
-if ($type_element == 'invoice')
+elseif ($type_element == 'invoice')
 { 	// Customer : show products from invoices
 	require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 	$documentstatic=new Facture($db);
@@ -187,14 +187,14 @@ if ($type_element == 'invoice')
 	$tables_from = MAIN_DB_PREFIX.'facturedet d';
     $tables_from.= ' LEFT JOIN '.MAIN_DB_PREFIX.'facture as f ON d.fk_facture=f.rowid';
     $tables_from.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product p ON d.fk_product=p.rowid';
-    $tables_from.= ' INNER JOIN '.MAIN_DB_PREFIX.'element_contact ec ON ec.element_id=f.rowid';
+    $tables_from.= ' INNER JOIN '.MAIN_DB_PREFIX.'element_contact ec ON ec.element_id=f.rowid AND ec.fk_socpeople='.$object->id;
     $tables_from.= ' INNER JOIN '.MAIN_DB_PREFIX."c_type_contact tc ON (ec.fk_c_type_contact=tc.rowid and tc.element='facture' and tc.source='external' and tc.active=1)";
 	$where = " WHERE f.entity IN (".getEntity('invoice').")";
 	$dateprint = 'f.datef';
 	$doc_number='f.ref';
 	$thirdTypeSelect='customer';
 }
-if ($type_element == 'propal')
+elseif ($type_element == 'propal')
 {
 	require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
 	$documentstatic=new Propal($db);
@@ -202,14 +202,14 @@ if ($type_element == 'propal')
 	$tables_from = MAIN_DB_PREFIX.'propaldet d';
     $tables_from.= ' LEFT JOIN '.MAIN_DB_PREFIX.'propal as c ON d.fk_propal=c.rowid';
     $tables_from.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product p ON d.fk_product=p.rowid';
-    $tables_from.= ' INNER JOIN '.MAIN_DB_PREFIX.'element_contact ec ON ec.element_id=c.rowid';
+    $tables_from.= ' INNER JOIN '.MAIN_DB_PREFIX.'element_contact ec ON ec.element_id=c.rowid AND ec.fk_socpeople='.$object->id;
     $tables_from.= ' INNER JOIN '.MAIN_DB_PREFIX."c_type_contact tc ON (ec.fk_c_type_contact=tc.rowid and tc.element='propal' and tc.source='external' and tc.active=1)";
 	$where = ' WHERE c.entity IN ('.getEntity('propal').')';
 	$datePrint = 'c.datep';
 	$doc_number='c.ref';
 	$thirdTypeSelect='customer';
 }
-if ($type_element == 'order')
+elseif ($type_element == 'order')
 {
 	require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 	$documentstatic=new Commande($db);
@@ -217,14 +217,14 @@ if ($type_element == 'order')
 	$tables_from = MAIN_DB_PREFIX.'commandedet d';
     $tables_from.= ' LEFT JOIN '.MAIN_DB_PREFIX.'commande as c ON d.fk_commande=c.rowid';
     $tables_from.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product p ON d.fk_product=p.rowid';
-    $tables_from.= ' INNER JOIN '.MAIN_DB_PREFIX.'element_contact ec ON ec.element_id=c.rowid';
+    $tables_from.= ' INNER JOIN '.MAIN_DB_PREFIX.'element_contact ec ON ec.element_id=c.rowid AND ec.fk_socpeople='.$object->id;
     $tables_from.= ' INNER JOIN '.MAIN_DB_PREFIX."c_type_contact tc ON (ec.fk_c_type_contact=tc.rowid and tc.element='commande' and tc.source='external' and tc.active=1)";
 	$where = ' WHERE c.entity IN ('.getEntity('order').')';
 	$dateprint = 'c.date_commande';
 	$doc_number='c.ref';
 	$thirdTypeSelect='customer';
 }
-if ($type_element == 'supplier_invoice')
+elseif ($type_element == 'supplier_invoice')
 { 	// Supplier : Show products from invoices.
 	require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
 	$documentstatic=new FactureFournisseur($db);
@@ -232,14 +232,14 @@ if ($type_element == 'supplier_invoice')
 	$tables_from = MAIN_DB_PREFIX.'facture_fourn_det d';
     $tables_from.= ' LEFT JOIN '.MAIN_DB_PREFIX.'facture_fourn as f ON d.fk_facture_fourn=f.rowid';
     $tables_from.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product p ON d.fk_product=p.rowid';
-    $tables_from.= ' INNER JOIN '.MAIN_DB_PREFIX.'element_contact ec ON ec.element_id=f.rowid';
+    $tables_from.= ' INNER JOIN '.MAIN_DB_PREFIX.'element_contact ec ON ec.element_id=f.rowid AND ec.fk_socpeople='.$object->id;
     $tables_from.= ' INNER JOIN '.MAIN_DB_PREFIX."c_type_contact tc ON (ec.fk_c_type_contact=tc.rowid and tc.element='invoice_supplier' and tc.source='external' and tc.active=1)";
 	$where = ' WHERE f.entity IN ('.getEntity($documentstatic->element).')';
 	$dateprint = 'f.datef';
 	$doc_number='f.ref';
 	$thirdTypeSelect='supplier';
 }
-//if ($type_element == 'supplier_proposal')
+//elseif ($type_element == 'supplier_proposal')
 //{
 //    require_once DOL_DOCUMENT_ROOT.'/supplier_proposal/class/supplier_proposal.class.php';
 //    $documentstatic=new SupplierProposal($db);
@@ -252,7 +252,7 @@ if ($type_element == 'supplier_invoice')
 //    $doc_number='c.ref';
 //    $thirdTypeSelect='supplier';
 //}
-if ($type_element == 'supplier_order')
+elseif ($type_element == 'supplier_order')
 { 	// Supplier : Show products from orders.
 	require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
 	$documentstatic=new CommandeFournisseur($db);
@@ -260,14 +260,14 @@ if ($type_element == 'supplier_order')
 	$tables_from = MAIN_DB_PREFIX.'commande_fournisseurdet d';
     $tables_from.= ' LEFT JOIN '.MAIN_DB_PREFIX.'commande_fournisseur as c ON d.fk_commande=c.rowid';
     $tables_from.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product p ON d.fk_product=p.rowid';
-    $tables_from.= ' INNER JOIN '.MAIN_DB_PREFIX.'element_contact ec ON ec.element_id=c.rowid';
+    $tables_from.= ' INNER JOIN '.MAIN_DB_PREFIX.'element_contact ec ON ec.element_id=c.rowid AND ec.fk_socpeople='.$object->id;
     $tables_from.= ' INNER JOIN '.MAIN_DB_PREFIX."c_type_contact tc ON (ec.fk_c_type_contact=tc.rowid and tc.element='order_supplier' and tc.source='external' and tc.active=1)";
 	$where = ' WHERE c.entity IN ('.getEntity($documentstatic->element).')';
 	$dateprint = 'c.date_valid';
 	$doc_number='c.ref';
 	$thirdTypeSelect='supplier';
 }
-if ($type_element == 'contract')
+elseif ($type_element == 'contract')
 { 	// Order
 	require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
 	$documentstatic=new Contrat($db);
@@ -276,7 +276,7 @@ if ($type_element == 'contract')
 	$tables_from = MAIN_DB_PREFIX.'contratdet d';
     $tables_from.= ' LEFT JOIN '.MAIN_DB_PREFIX.'contrat as c ON d.fk_contrat=c.rowid';
     $tables_from.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product p ON d.fk_product=p.rowid';
-    $tables_from.= ' INNER JOIN '.MAIN_DB_PREFIX.'element_contact ec ON ec.element_id=c.rowid';
+    $tables_from.= ' INNER JOIN '.MAIN_DB_PREFIX.'element_contact ec ON ec.element_id=c.rowid AND ec.fk_socpeople='.$object->id;
     $tables_from.= ' INNER JOIN '.MAIN_DB_PREFIX."c_type_contact tc ON (ec.fk_c_type_contact=tc.rowid and tc.element='contrat' and tc.source='external' and tc.active=1)";
 	$where = ' WHERE c.entity IN ('.getEntity('contrat').')';
 	$dateprint = 'c.date_valid';
diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index 0fb460466ef..e6e9b7f2e4d 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -245,7 +245,7 @@ class Contrat extends CommonObject
 		else
 		{
 			$langs->load("errors");
-			print $langs->trans("Error")." ".$langs->trans("ErrorModuleSetupNotComplete");
+			print $langs->trans("Error")." ".$langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("Contract"));
 			return "";
 		}
 	}
diff --git a/htdocs/core/ajax/extraparams.php b/htdocs/core/ajax/extraparams.php
index 7ef25e62b8b..e039529eef7 100644
--- a/htdocs/core/ajax/extraparams.php
+++ b/htdocs/core/ajax/extraparams.php
@@ -17,7 +17,7 @@
 
 /**
  *	\file       /htdocs/core/ajax/extraparams.php
- *	\brief      File to return Ajax response on set extra parameters of elements
+ *	\brief      File to make Ajax action on setting extra parameters of elements
  */
 
 if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1'); // Disables token renewal
diff --git a/htdocs/core/ajax/objectonoff.php b/htdocs/core/ajax/objectonoff.php
index 6b06cccd50c..987a59ec3fb 100644
--- a/htdocs/core/ajax/objectonoff.php
+++ b/htdocs/core/ajax/objectonoff.php
@@ -15,8 +15,9 @@
  */
 
 /**
- *       \file       htdocs/core/ajax/productonoff.php
- *       \brief      File to set tosell and tobuy for product
+ *       \file       htdocs/core/ajax/objectonoff.php
+ *       \brief      File to set status for an object
+ *       			 This Ajax service is called when option MAIN_DIRECT_STATUS_UPDATE is set.
  */
 
 if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1'); // Disables token renewal
@@ -36,6 +37,13 @@ $field=GETPOST('field', 'alpha');
 $element=GETPOST('element', 'alpha');
 
 $object = new GenericObject($db);
+
+// Security check
+if (! empty($user->societe_id))
+	$socid = $user->societe_id;
+
+
+
 /*
  * View
  */
@@ -44,6 +52,20 @@ top_httphead();
 
 print '<!-- Ajax page called with url '.dol_escape_htmltag($_SERVER["PHP_SELF"]).'?'.dol_escape_htmltag($_SERVER["QUERY_STRING"]).' -->'."\n";
 
+if ($element == 'societe' && in_array($field, array('status')))
+{
+	$result = restrictedArea($user, 'societe', $id);
+}
+elseif ($element == 'product' && in_array($field, array('tosell', 'tobuy', 'tobatch')))
+{
+	$result = restrictedArea($user, 'produit|service', $id, 'product&product', '', '', 'rowid');
+}
+else
+{
+	accessforbidden("Bad value for combination of parameters element/field.", 0, 0, 1);
+	exit;
+}
+
 // Registering new values
 if (($action == 'set') && ! empty($id))
     $object->setValueFrom($field, $value, $element, $id);
diff --git a/htdocs/core/ajax/pingresult.php b/htdocs/core/ajax/pingresult.php
new file mode 100644
index 00000000000..3055942f89a
--- /dev/null
+++ b/htdocs/core/ajax/pingresult.php
@@ -0,0 +1,71 @@
+<?php
+/* 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *       \file       htdocs/core/ajax/pingresult.php
+ *       \brief      File to save result of an anonymous ping into database (1 ping is done per installation)
+ */
+
+if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1'); // Disables token renewal
+if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU', '1');
+if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML', '1');
+if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX', '1');
+if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC', '1');
+if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN', '1');
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+
+$action=GETPOST('action', 'alpha');
+$hash_unique_id=GETPOST('hash_unique_id', 'alpha');
+$hash_algo=GETPOST('hash', 'alpha');
+
+
+// Security check
+if (! empty($user->societe_id))
+	$socid = $user->societe_id;
+
+$now = dol_now();
+
+
+/*
+ * View
+ */
+
+top_httphead();
+
+print '<!-- Ajax page called with url '.dol_escape_htmltag($_SERVER["PHP_SELF"]).'?'.dol_escape_htmltag($_SERVER["QUERY_STRING"]).' -->'."\n";
+
+// If ok
+if ($action == 'firstpingok')
+{
+	// Note: pings are by entities
+	dolibarr_set_const($db, 'MAIN_FIRST_PING_OK_DATE', dol_print_date($now, 'dayhourlog', 'gmt'));
+	dolibarr_set_const($db, 'MAIN_FIRST_PING_OK_ID', $hash_unique_id);
+
+	print 'First ping OK saved for entity '.$conf->entity;
+}
+// If ko
+elseif ($action == 'firstpingko')
+{
+	// Note: pings are by entities
+	dolibarr_set_const($db, 'MAIN_LAST_PING_KO_DATE', dol_print_date($now, 'dayhourlog'), 'gmt');
+	print 'First ping KO saved for entity '.$conf->entity;
+}
+else {
+	print 'Error action='.$action.' not supported';
+}
diff --git a/htdocs/core/ajax/security.php b/htdocs/core/ajax/security.php
index 9e7dea2ef95..faaddd31b23 100644
--- a/htdocs/core/ajax/security.php
+++ b/htdocs/core/ajax/security.php
@@ -17,7 +17,7 @@
 
 /**
  *       \file       htdocs/core/ajax/security.php
- *       \brief      This ajax component is used to generated has keys for security purposes
+ *       \brief      This ajax component is used to generated hash keys for security purposes
  *                   like key to use into URL to protect them.
  */
 
diff --git a/htdocs/core/boxes/box_graph_invoices_permonth.php b/htdocs/core/boxes/box_graph_invoices_permonth.php
index 5c747065138..6e5afe5df99 100644
--- a/htdocs/core/boxes/box_graph_invoices_permonth.php
+++ b/htdocs/core/boxes/box_graph_invoices_permonth.php
@@ -74,6 +74,9 @@ class box_graph_invoices_permonth extends ModeleBoxes
 		//include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 		//$facturestatic=new Facture($db);
 
+		$startmonth = $conf->global->SOCIETE_FISCAL_MONTH_START?($conf->global->SOCIETE_FISCAL_MONTH_START) : 1;
+		if (empty($conf->global->GRAPH_USE_FISCAL_YEAR)) $startmonth = 1;
+
 		$text = $langs->trans("BoxCustomersInvoicesPerMonth", $max);
 		$this->info_box_head = array(
 			'text' => $text,
@@ -129,7 +132,7 @@ class box_graph_invoices_permonth extends ModeleBoxes
 			// Build graphic number of object. $data = array(array('Lib',val1,val2,val3),...)
 			if ($shownb)
 			{
-				$data1 = $stats->getNbByMonthWithPrevYear($endyear, $startyear, (GETPOST('action', 'aZ09')==$refreshaction?-1:(3600*24)), ($WIDTH<300?2:0));
+				$data1 = $stats->getNbByMonthWithPrevYear($endyear, $startyear, (GETPOST('action', 'aZ09')==$refreshaction?-1:(3600*24)), ($WIDTH<300?2:0), $startmonth);
 
 				$filenamenb = $dir."/".$prefix."invoicesnbinyear-".$endyear.".png";
 				if ($mode == 'customer') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstats&amp;file=invoicesnbinyear-'.$endyear.'.png';
@@ -146,7 +149,14 @@ class box_graph_invoices_permonth extends ModeleBoxes
 					$i=$startyear;$legend=array();
 					while ($i <= $endyear)
 					{
-						$legend[]=$i;
+						if ($startmonth != 1)
+						{
+							$legend[]=sprintf("%d/%d", $i-2001, $i-2000);
+						}
+						else
+						{
+							$legend[]=$i;
+						}
 						$i++;
 					}
 					$px1->SetLegend($legend);
@@ -167,7 +177,7 @@ class box_graph_invoices_permonth extends ModeleBoxes
 			// Build graphic number of object. $data = array(array('Lib',val1,val2,val3),...)
 			if ($showtot)
 			{
-				$data2 = $stats->getAmountByMonthWithPrevYear($endyear, $startyear, (GETPOST('action', 'aZ09')==$refreshaction?-1:(3600*24)), ($WIDTH<300?2:0));
+				$data2 = $stats->getAmountByMonthWithPrevYear($endyear, $startyear, (GETPOST('action', 'aZ09')==$refreshaction?-1:(3600*24)), ($WIDTH<300?2:0), $startmonth);
 
 				$filenamenb = $dir."/".$prefix."invoicesamountinyear-".$endyear.".png";
 				if ($mode == 'customer') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstats&amp;file=invoicesamountinyear-'.$endyear.'.png';
@@ -184,7 +194,14 @@ class box_graph_invoices_permonth extends ModeleBoxes
 					$i=$startyear;$legend=array();
 					while ($i <= $endyear)
 					{
-						$legend[]=$i;
+						if ($startmonth != 1)
+						{
+							$legend[]=sprintf("%d/%d", $i-2001, $i-2000);
+						}
+						else
+						{
+							$legend[]=$i;
+						}
 						$i++;
 					}
 					$px2->SetLegend($legend);
diff --git a/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php b/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php
index d06098daa3b..df4f4afc146 100644
--- a/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php
+++ b/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php
@@ -73,6 +73,9 @@ class box_graph_invoices_supplier_permonth extends ModeleBoxes
 
 		include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
 
+		$startmonth = $conf->global->SOCIETE_FISCAL_MONTH_START?($conf->global->SOCIETE_FISCAL_MONTH_START) : 1;
+		if (empty($conf->global->GRAPH_USE_FISCAL_YEAR)) $startmonth = 1;
+
 		$text = $langs->trans("BoxSuppliersInvoicesPerMonth", $max);
 		$this->info_box_head = array(
 				'text' => $text,
@@ -126,7 +129,7 @@ class box_graph_invoices_supplier_permonth extends ModeleBoxes
 			// Build graphic number of object. $data = array(array('Lib',val1,val2,val3),...)
 			if ($shownb)
 			{
-				$data1 = $stats->getNbByMonthWithPrevYear($endyear, $startyear, (GETPOST('action', 'aZ09')==$refreshaction?-1:(3600*24)), ($WIDTH<300?2:0));
+				$data1 = $stats->getNbByMonthWithPrevYear($endyear, $startyear, (GETPOST('action', 'aZ09')==$refreshaction?-1:(3600*24)), ($WIDTH<300?2:0), $startmonth);
 
 				$filenamenb = $dir."/".$prefix."invoicessuppliernbinyear-".$year.".png";
 				if ($mode == 'customer') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstats&amp;file=invoicesnbinyear-'.$year.'.png';
@@ -143,7 +146,14 @@ class box_graph_invoices_supplier_permonth extends ModeleBoxes
 					$i=$startyear;$legend=array();
 					while ($i <= $endyear)
 					{
-						$legend[]=$i;
+						if ($startmonth != 1)
+						{
+							$legend[]=sprintf("%d/%d", $i-2001, $i-2000);
+						}
+						else
+						{
+							$legend[]=$i;
+						}
 						$i++;
 					}
 					$px1->SetLegend($legend);
@@ -164,7 +174,7 @@ class box_graph_invoices_supplier_permonth extends ModeleBoxes
 			// Build graphic number of object. $data = array(array('Lib',val1,val2,val3),...)
 			if ($showtot)
 			{
-				$data2 = $stats->getAmountByMonthWithPrevYear($endyear, $startyear, (GETPOST('action', 'aZ09')==$refreshaction?-1:(3600*24)), ($WIDTH<300?2:0));
+				$data2 = $stats->getAmountByMonthWithPrevYear($endyear, $startyear, (GETPOST('action', 'aZ09')==$refreshaction?-1:(3600*24)), ($WIDTH<300?2:0), $startmonth);
 
 				$filenamenb = $dir."/".$prefix."invoicessupplieramountinyear-".$year.".png";
 				if ($mode == 'customer') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstats&amp;file=invoicesamountinyear-'.$year.'.png';
@@ -181,7 +191,14 @@ class box_graph_invoices_supplier_permonth extends ModeleBoxes
 					$i=$startyear;$legend=array();
 					while ($i <= $endyear)
 					{
-						$legend[]=$i;
+						if ($startmonth != 1)
+						{
+							$legend[]=sprintf("%d/%d", $i-2001, $i-2000);
+						}
+						else
+						{
+							$legend[]=$i;
+						}
 						$i++;
 					}
 					$px2->SetLegend($legend);
diff --git a/htdocs/core/boxes/box_graph_orders_permonth.php b/htdocs/core/boxes/box_graph_orders_permonth.php
index 8c4cb250376..b530b4ea268 100644
--- a/htdocs/core/boxes/box_graph_orders_permonth.php
+++ b/htdocs/core/boxes/box_graph_orders_permonth.php
@@ -74,6 +74,9 @@ class box_graph_orders_permonth extends ModeleBoxes
 		//include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 		//$commandestatic=new Commande($db);
 
+		$startmonth = $conf->global->SOCIETE_FISCAL_MONTH_START?($conf->global->SOCIETE_FISCAL_MONTH_START) : 1;
+		if (empty($conf->global->GRAPH_USE_FISCAL_YEAR)) $startmonth = 1;
+
 		$text = $langs->trans("BoxCustomersOrdersPerMonth", $max);
 		$this->info_box_head = array(
 				'text' => $text,
@@ -129,7 +132,7 @@ class box_graph_orders_permonth extends ModeleBoxes
 			// Build graphic number of object. $data = array(array('Lib',val1,val2,val3),...)
 			if ($shownb)
 			{
-				$data1 = $stats->getNbByMonthWithPrevYear($endyear, $startyear, (GETPOST('action', 'aZ09')==$refreshaction?-1:(3600*24)), ($WIDTH<300?2:0));
+				$data1 = $stats->getNbByMonthWithPrevYear($endyear, $startyear, (GETPOST('action', 'aZ09')==$refreshaction?-1:(3600*24)), ($WIDTH<300?2:0), $startmonth);
 
 				$filenamenb = $dir."/".$prefix."ordersnbinyear-".$endyear.".png";
 				if ($mode == 'customer') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&amp;file=ordersnbinyear-'.$endyear.'.png';
@@ -144,7 +147,14 @@ class box_graph_orders_permonth extends ModeleBoxes
 					$i=$startyear;$legend=array();
 					while ($i <= $endyear)
 					{
-						$legend[]=$i;
+						if ($startmonth != 1)
+						{
+							$legend[]=sprintf("%d/%d", $i-2001, $i-2000);
+						}
+						else
+						{
+							$legend[]=$i;
+						}
 						$i++;
 					}
 					$px1->SetLegend($legend);
@@ -165,7 +175,7 @@ class box_graph_orders_permonth extends ModeleBoxes
 			// Build graphic number of object. $data = array(array('Lib',val1,val2,val3),...)
 			if ($showtot)
 			{
-				$data2 = $stats->getAmountByMonthWithPrevYear($endyear, $startyear, (GETPOST('action', 'aZ09')==$refreshaction?-1:(3600*24)), ($WIDTH<300?2:0));
+				$data2 = $stats->getAmountByMonthWithPrevYear($endyear, $startyear, (GETPOST('action', 'aZ09')==$refreshaction?-1:(3600*24)), ($WIDTH<300?2:0), $startmonth);
 
 				$filenamenb = $dir."/".$prefix."ordersamountinyear-".$endyear.".png";
 				if ($mode == 'customer') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&amp;file=ordersamountinyear-'.$endyear.'.png';
@@ -180,7 +190,14 @@ class box_graph_orders_permonth extends ModeleBoxes
 					$i=$startyear;$legend=array();
 					while ($i <= $endyear)
 					{
-						$legend[]=$i;
+						if ($startmonth != 1)
+						{
+							$legend[]=sprintf("%d/%d", $i-2001, $i-2000);
+						}
+						else
+						{
+							$legend[]=$i;
+						}
 						$i++;
 					}
 					$px2->SetLegend($legend);
diff --git a/htdocs/core/boxes/box_graph_orders_supplier_permonth.php b/htdocs/core/boxes/box_graph_orders_supplier_permonth.php
index a584c7288ca..8359ddbe070 100644
--- a/htdocs/core/boxes/box_graph_orders_supplier_permonth.php
+++ b/htdocs/core/boxes/box_graph_orders_supplier_permonth.php
@@ -73,6 +73,9 @@ class box_graph_orders_supplier_permonth extends ModeleBoxes
 
 		include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
 
+		$startmonth = $conf->global->SOCIETE_FISCAL_MONTH_START?($conf->global->SOCIETE_FISCAL_MONTH_START) : 1;
+		if (empty($conf->global->GRAPH_USE_FISCAL_YEAR)) $startmonth = 1;
+
 		$text = $langs->trans("BoxSuppliersOrdersPerMonth", $max);
 		$this->info_box_head = array(
 				'text' => $text,
@@ -128,7 +131,7 @@ class box_graph_orders_supplier_permonth extends ModeleBoxes
 			// Build graphic number of object. $data = array(array('Lib',val1,val2,val3),...)
 			if ($shownb)
 			{
-				$data1 = $stats->getNbByMonthWithPrevYear($endyear, $startyear, (GETPOST('action', 'aZ09')==$refreshaction?-1:(3600*24)), ($WIDTH<300?2:0));
+				$data1 = $stats->getNbByMonthWithPrevYear($endyear, $startyear, (GETPOST('action', 'aZ09')==$refreshaction?-1:(3600*24)), ($WIDTH<300?2:0), $startmonth);
 
 				$filenamenb = $dir."/".$prefix."orderssuppliernbinyear-".$endyear.".png";
 				if ($mode == 'customer') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&amp;file=ordersnbinyear-'.$endyear.'.png';
@@ -143,7 +146,14 @@ class box_graph_orders_supplier_permonth extends ModeleBoxes
 					$i=$startyear;$legend=array();
 					while ($i <= $endyear)
 					{
-						$legend[]=$i;
+						if ($startmonth != 1)
+						{
+							$legend[]=sprintf("%d/%d", $i-2001, $i-2000);
+						}
+						else
+						{
+							$legend[]=$i;
+						}
 						$i++;
 					}
 					$px1->SetLegend($legend);
@@ -164,7 +174,7 @@ class box_graph_orders_supplier_permonth extends ModeleBoxes
 			// Build graphic number of object. $data = array(array('Lib',val1,val2,val3),...)
 			if ($showtot)
 			{
-				$data2 = $stats->getAmountByMonthWithPrevYear($endyear, $startyear, (GETPOST('action', 'aZ09')==$refreshaction?-1:(3600*24)), ($WIDTH<300?2:0));
+				$data2 = $stats->getAmountByMonthWithPrevYear($endyear, $startyear, (GETPOST('action', 'aZ09')==$refreshaction?-1:(3600*24)), ($WIDTH<300?2:0), $startmonth);
 
 				$filenamenb = $dir."/".$prefix."orderssupplieramountinyear-".$endyear.".png";
 				if ($mode == 'customer') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&amp;file=ordersamountinyear-'.$endyear.'.png';
@@ -179,7 +189,14 @@ class box_graph_orders_supplier_permonth extends ModeleBoxes
 					$i=$startyear;$legend=array();
 					while ($i <= $endyear)
 					{
-						$legend[]=$i;
+						if ($startmonth != 1)
+						{
+							$legend[]=sprintf("%d/%d", $i-2001, $i-2000);
+						}
+						else
+						{
+							$legend[]=$i;
+						}
 						$i++;
 					}
 					$px2->SetLegend($legend);
diff --git a/htdocs/core/boxes/box_graph_propales_permonth.php b/htdocs/core/boxes/box_graph_propales_permonth.php
index 861c5086704..75673ee3fce 100644
--- a/htdocs/core/boxes/box_graph_propales_permonth.php
+++ b/htdocs/core/boxes/box_graph_propales_permonth.php
@@ -74,6 +74,9 @@ class box_graph_propales_permonth extends ModeleBoxes
 		//include_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
 		//$propalstatic=new Propal($db);
 
+		$startmonth = $conf->global->SOCIETE_FISCAL_MONTH_START?($conf->global->SOCIETE_FISCAL_MONTH_START) : 1;
+		if (empty($conf->global->GRAPH_USE_FISCAL_YEAR)) $startmonth = 1;
+
 		$langs->load("propal");
 
 		$text = $langs->trans("BoxProposalsPerMonth", $max);
@@ -128,7 +131,7 @@ class box_graph_propales_permonth extends ModeleBoxes
 			// Build graphic number of object. $data = array(array('Lib',val1,val2,val3),...)
 			if ($shownb)
 			{
-				$data1 = $stats->getNbByMonthWithPrevYear($endyear, $startyear, (GETPOST('action', 'aZ09')==$refreshaction?-1:(3600*24)), ($WIDTH<300?2:0));
+				$data1 = $stats->getNbByMonthWithPrevYear($endyear, $startyear, (GETPOST('action', 'aZ09')==$refreshaction?-1:(3600*24)), ($WIDTH<300?2:0), $startmonth);
 				$datatype1 = array_pad(array(), ($endyear-$startyear+1), 'bars');
 
 				$filenamenb = $dir."/".$prefix."propalsnbinyear-".$endyear.".png";
@@ -144,7 +147,14 @@ class box_graph_propales_permonth extends ModeleBoxes
 					$i=$startyear;$legend=array();
 					while ($i <= $endyear)
 					{
-						$legend[]=$i;
+						if ($startmonth != 1)
+						{
+							$legend[]=sprintf("%d/%d", $i-2001, $i-2000);
+						}
+						else
+						{
+							$legend[]=$i;
+						}
 						$i++;
 					}
 					$px1->SetLegend($legend);
@@ -165,7 +175,7 @@ class box_graph_propales_permonth extends ModeleBoxes
 			// Build graphic number of object. $data = array(array('Lib',val1,val2,val3),...)
 			if ($showtot)
 			{
-				$data2 = $stats->getAmountByMonthWithPrevYear($endyear, $startyear, (GETPOST('action', 'aZ09')==$refreshaction?-1:(3600*24)), ($WIDTH<300?2:0));
+				$data2 = $stats->getAmountByMonthWithPrevYear($endyear, $startyear, (GETPOST('action', 'aZ09')==$refreshaction?-1:(3600*24)), ($WIDTH<300?2:0), $startmonth);
 				$datatype2 = array_pad(array(), ($endyear-$startyear+1), 'bars');
 				//$datatype2 = array('lines','bars');
 
@@ -183,7 +193,14 @@ class box_graph_propales_permonth extends ModeleBoxes
 					$i=$startyear;$legend=array();
 					while ($i <= $endyear)
 					{
-						$legend[]=$i;
+						if ($startmonth != 1)
+						{
+                            $legend[]=sprintf("%d/%d", $i-2001, $i-2000);
+						}
+						else
+						{
+							$legend[]=$i;
+						}
 						$i++;
 					}
 					$px2->SetLegend($legend);
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 28ea7f44f10..e6d47c53d5f 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -2053,7 +2053,8 @@ abstract class CommonObject
 			return -2;
 		}
 	}
-	
+
+
 	/**
 	 *  Change the retained warranty payments terms
 	 *
@@ -2066,11 +2067,11 @@ abstract class CommonObject
 	    if ($this->statut >= 0 || $this->element == 'societe')
 	    {
 	        $fieldname = 'retained_warranty_fk_cond_reglement';
-	        
+
 	        $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
 	        $sql .= ' SET '.$fieldname.' = '.$id;
 	        $sql .= ' WHERE rowid='.$this->id;
-	        
+
 	        if ($this->db->query($sql))
 	        {
 	            $this->retained_warranty_fk_cond_reglement = $id;
@@ -5064,7 +5065,7 @@ abstract class CommonObject
 
 				//dol_syslog("attributeLabel=".$attributeLabel, LOG_DEBUG);
 				//dol_syslog("attributeType=".$attributeType, LOG_DEBUG);
-				
+
 				if (!empty($attrfieldcomputed))
 				{
 					if (!empty($conf->global->MAIN_STORE_COMPUTED_EXTRAFIELDS))
@@ -6084,6 +6085,12 @@ abstract class CommonObject
 			$type='link';
 			$param['options']=array($reg[1].':'.$reg[2]=>$reg[1].':'.$reg[2]);
 		}
+        elseif(preg_match('/^sellist:(.*):(.*):(.*):(.*)/i', $val['type'], $reg)) {
+            $param['options'] = array($reg[1] . ':' . $reg[2] . ':' . $reg[3] . ':' . $reg[4] => 'N');
+            $type = 'sellist';
+        }
+
+
 		$langfile=$val['langfile'];
 		$list=$val['list'];
 		$help=$val['help'];
@@ -6105,7 +6112,7 @@ abstract class CommonObject
 			{
 				$morecss = 'minwidth100imp';
 			}
-			elseif ($type == 'datetime')
+			elseif ($type == 'datetime' || $type == 'timestamp')
 			{
 				$morecss = 'minwidth200imp';
 			}
@@ -6149,7 +6156,7 @@ abstract class CommonObject
 				$value='';
 			}
 		}
-		elseif ($type == 'datetime')
+		elseif ($type == 'datetime' || $type == 'timestamp')
 		{
 			if(! empty($value)) {
 				$value=dol_print_date($value, 'dayhour');
@@ -7384,6 +7391,7 @@ abstract class CommonObject
 		if (!empty($id))  $sql.= ' WHERE rowid = '.$id;
 		elseif (!empty($ref)) $sql.= " WHERE ref = ".$this->quote($ref, $this->fields['ref']);
 		else $sql.=' WHERE 1 = 1';	// usage with empty id and empty ref is very rare
+		if (empty($id) && isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) $sql.=' AND entity IN ('.getEntity($this->table_element).')';
 		if ($morewhere)   $sql.= $morewhere;
 		$sql.=' LIMIT 1';	// This is a fetch, to be sure to get only one record
 
diff --git a/htdocs/core/class/dolgraph.class.php b/htdocs/core/class/dolgraph.class.php
index 458f0bd4fad..5c45eb5836d 100644
--- a/htdocs/core/class/dolgraph.class.php
+++ b/htdocs/core/class/dolgraph.class.php
@@ -1094,7 +1094,7 @@ class DolGraph
 				$i++;
 			}
 			// shadowSize: 0 -> Drawing is faster without shadows
-			$this->stringtoshow.="\n".' ], { series: { shadowSize: 0, stack: stack, lines: { fill: false, steps: steps }, bars: { barWidth: 0.6 } }'."\n";
+			$this->stringtoshow.="\n".' ], { series: { shadowSize: 0, stack: stack, lines: { fill: false, steps: steps }, bars: { barWidth: 0.6,  fillColor: { colors: [{opacity: 0.9 }, {opacity: 0.85}] }} }'."\n";
 
 			// Xaxis
 			$this->stringtoshow.=', xaxis: { ticks: ['."\n";
diff --git a/htdocs/core/class/fileupload.class.php b/htdocs/core/class/fileupload.class.php
index ee090fed65d..2f0ae34b529 100644
--- a/htdocs/core/class/fileupload.class.php
+++ b/htdocs/core/class/fileupload.class.php
@@ -17,7 +17,7 @@
  */
 
 /**
- *       \file       htdocs/core/ajax/fileupload.php
+ *       \file       htdocs/core/ajax/fileupload.class.php
  *       \brief      File to return Ajax response on file upload
  */
 
diff --git a/htdocs/core/class/html.formmargin.class.php b/htdocs/core/class/html.formmargin.class.php
index f9b0a59280f..ea038fa8131 100644
--- a/htdocs/core/class/html.formmargin.class.php
+++ b/htdocs/core/class/html.formmargin.class.php
@@ -199,8 +199,6 @@ class FormMargin
 
     	if (! $user->rights->margins->liretous) return;
 
-        $rounding = min($conf->global->MAIN_MAX_DECIMALS_UNIT, $conf->global->MAIN_MAX_DECIMALS_TOT);
-
 		$marginInfo = $this->getMarginInfosArray($object, $force_price);
 
 		if (! empty($conf->global->MARGIN_ADD_SHOWHIDE_BUTTON))	// TODO Warning this feature rely on an external js file that may be removed. Using native js function document.cookie should be better
@@ -240,13 +238,13 @@ class FormMargin
 			//if ($marginInfo['margin_on_products'] != 0 && $marginInfo['margin_on_services'] != 0) {
 			print '<tr class="oddeven">';
 			print '<td>'.$langs->trans('MarginOnProducts').'</td>';
-			print '<td class="right">'.price($marginInfo['pv_products'], null, null, null, null, $rounding).'</td>';
-			print '<td class="right">'.price($marginInfo['pa_products'], null, null, null, null, $rounding).'</td>';
-			print '<td class="right">'.price($marginInfo['margin_on_products'], null, null, null, null, $rounding).'</td>';
+			print '<td class="right">'.price($marginInfo['pv_products']).'</td>';
+			print '<td class="right">'.price($marginInfo['pa_products']).'</td>';
+			print '<td class="right">'.price($marginInfo['margin_on_products']).'</td>';
 			if (! empty($conf->global->DISPLAY_MARGIN_RATES))
-				print '<td class="right">'.(($marginInfo['margin_rate_products'] == '')?'':price($marginInfo['margin_rate_products'], null, null, null, null, $rounding).'%').'</td>';
+				print '<td class="right">'.(($marginInfo['margin_rate_products'] == '')?'':price($marginInfo['margin_rate_products'], null, null, null, null, 2).'%').'</td>';
 			if (! empty($conf->global->DISPLAY_MARK_RATES))
-				print '<td class="right">'.(($marginInfo['mark_rate_products'] == '')?'':price($marginInfo['mark_rate_products'], null, null, null, null, $rounding).'%').'</td>';
+				print '<td class="right">'.(($marginInfo['mark_rate_products'] == '')?'':price($marginInfo['mark_rate_products'], null, null, null, null, 2).'%').'</td>';
 			print '</tr>';
 		}
 
@@ -254,13 +252,13 @@ class FormMargin
 		{
 			print '<tr class="oddeven">';
 			print '<td>'.$langs->trans('MarginOnServices').'</td>';
-			print '<td class="right">'.price($marginInfo['pv_services'], null, null, null, null, $rounding).'</td>';
-			print '<td class="right">'.price($marginInfo['pa_services'], null, null, null, null, $rounding).'</td>';
-			print '<td class="right">'.price($marginInfo['margin_on_services'], null, null, null, null, $rounding).'</td>';
+			print '<td class="right">'.price($marginInfo['pv_services']).'</td>';
+			print '<td class="right">'.price($marginInfo['pa_services']).'</td>';
+			print '<td class="right">'.price($marginInfo['margin_on_services']).'</td>';
 			if (! empty($conf->global->DISPLAY_MARGIN_RATES))
-				print '<td class="right">'.(($marginInfo['margin_rate_services'] == '')?'':price($marginInfo['margin_rate_services'], null, null, null, null, $rounding).'%').'</td>';
+				print '<td class="right">'.(($marginInfo['margin_rate_services'] == '')?'':price($marginInfo['margin_rate_services'], null, null, null, null, 2).'%').'</td>';
 			if (! empty($conf->global->DISPLAY_MARK_RATES))
-				print '<td class="right">'.(($marginInfo['mark_rate_services'] == '')?'':price($marginInfo['mark_rate_services'], null, null, null, null, $rounding).'%').'</td>';
+				print '<td class="right">'.(($marginInfo['mark_rate_services'] == '')?'':price($marginInfo['mark_rate_services'], null, null, null, null, 2).'%').'</td>';
 			print '</tr>';
 		}
 
@@ -268,13 +266,13 @@ class FormMargin
 		{
 			print '<tr class="liste_total">';
 			print '<td>'.$langs->trans('TotalMargin').'</td>';
-			print '<td class="right">'.price($marginInfo['pv_total'], null, null, null, null, $rounding).'</td>';
-			print '<td class="right">'.price($marginInfo['pa_total'], null, null, null, null, $rounding).'</td>';
-			print '<td class="right">'.price($marginInfo['total_margin'], null, null, null, null, $rounding).'</td>';
+			print '<td class="right">'.price($marginInfo['pv_total']).'</td>';
+			print '<td class="right">'.price($marginInfo['pa_total']).'</td>';
+			print '<td class="right">'.price($marginInfo['total_margin']).'</td>';
 			if (! empty($conf->global->DISPLAY_MARGIN_RATES))
-				print '<td class="right">'.(($marginInfo['total_margin_rate'] == '')?'':price($marginInfo['total_margin_rate'], null, null, null, null, $rounding).'%').'</td>';
+				print '<td class="right">'.(($marginInfo['total_margin_rate'] == '')?'':price($marginInfo['total_margin_rate'], null, null, null, null, 2).'%').'</td>';
 			if (! empty($conf->global->DISPLAY_MARK_RATES))
-				print '<td class="right">'.(($marginInfo['total_mark_rate'] == '')?'':price($marginInfo['total_mark_rate'], null, null, null, null, $rounding).'%').'</td>';
+				print '<td class="right">'.(($marginInfo['total_mark_rate'] == '')?'':price($marginInfo['total_mark_rate'], null, null, null, null, 2).'%').'</td>';
 			print '</tr>';
 		}
 		print '</table>';
diff --git a/htdocs/core/class/stats.class.php b/htdocs/core/class/stats.class.php
index 08025161a0d..8df81bd4495 100644
--- a/htdocs/core/class/stats.class.php
+++ b/htdocs/core/class/stats.class.php
@@ -39,10 +39,12 @@ abstract class Stats
 	 * @param 	int		$endyear		Start year
 	 * @param 	int		$startyear		End year
 	 * @param	int		$cachedelay		Delay we accept for cache file (0=No read, no save of cache, -1=No read but save)
-     *	@param	int		$format			0=Label of absiss is a translated text, 1=Label of absiss is month number, 2=Label of absiss is first letter of month
-	 * @return 	array					Array of values
+     * @param	int		$format			0=Label of absiss is a translated text, 1=Label of absiss is month number, 2=Label of absiss is first letter of month
+	 * @param   int 	$startmonth		month of the fiscal year start min 1 max 12 ; if 1 = january
+     * @return 	array					Array of values
+
 	 */
-	public function getNbByMonthWithPrevYear($endyear, $startyear, $cachedelay = 0, $format = 0)
+	public function getNbByMonthWithPrevYear($endyear, $startyear, $cachedelay = 0, $format = 0, $startmonth = 1)
 	{
 		global $conf,$user,$langs;
 
@@ -86,6 +88,8 @@ abstract class Stats
 		else
 		{
 			$year=$startyear;
+			$sm = $startmonth - 1;
+			if ($sm != 0) $year = $year - 1;
 			while ($year <= $endyear)
 			{
 				$datay[$year] = $this->getNbByMonth($year, $format);
@@ -96,11 +100,11 @@ abstract class Stats
 
 			for ($i = 0 ; $i < 12 ; $i++)
 			{
-				$data[$i][]=$datay[$endyear][$i][0];
+				$data[$i][]=$datay[$endyear][($i+$sm)%12][0];
 				$year=$startyear;
 				while($year <= $endyear)
 				{
-					$data[$i][]=$datay[$year][$i][1];
+					$data[$i][]=$datay[$year - (1 - ((int) ($i+$sm)/12)) + ($sm == 0 ? 1 : 0)][($i+$sm)%12][1];
 					$year++;
 				}
 			}
@@ -134,9 +138,10 @@ abstract class Stats
 	 * @param	int		$startyear		End year
 	 * @param	int		$cachedelay		Delay we accept for cache file (0=No read, no save of cache, -1=No read but save)
      * @param	int		$format			0=Label of absiss is a translated text, 1=Label of absiss is month number, 2=Label of absiss is first letter of month
+	 * @param   int 	$startmonth		month of the fiscal year start min 1 max 12 ; if 1 = january
 	 * @return 	array					Array of values
 	 */
-	public function getAmountByMonthWithPrevYear($endyear, $startyear, $cachedelay = 0, $format = 0)
+	public function getAmountByMonthWithPrevYear($endyear, $startyear, $cachedelay = 0, $format = 0, $startmonth = 1)
 	{
 		global $conf,$user,$langs;
 
@@ -181,6 +186,8 @@ abstract class Stats
         else
 		{
 			$year=$startyear;
+			$sm = $startmonth - 1;
+			if ($sm != 0) $year = $year - 1;
 			while($year <= $endyear)
 			{
 				$datay[$year] = $this->getAmountByMonth($year, $format);
@@ -191,11 +198,11 @@ abstract class Stats
 			// $data = array('xval'=>array(0=>xlabel,1=>yval1,2=>yval2...),...)
 			for ($i = 0 ; $i < 12 ; $i++)
 			{
-				$data[$i][]=$datay[$endyear][$i][0];	// set label
+				$data[$i][]=$datay[$endyear][($i+$sm)%12][0];	// set label
 				$year=$startyear;
 				while($year <= $endyear)
 				{
-					$data[$i][]=$datay[$year][$i][1];	// set yval for x=i
+					$data[$i][]=$datay[$year - (1 - ((int) ($i+$sm)/12)) + ($sm == 0 ? 1 : 0)][($i+$sm)%12][1];	// set yval for x=i
 					$year++;
 				}
 			}
@@ -411,7 +418,8 @@ abstract class Stats
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
-	 *     Renvoie le nombre de proposition par mois pour une annee donnee
+	 *     Renvoie le nombre de documents par mois pour une annee donnee
+	 *     Return number of documents per month for a given year
 	 *
      *     @param   int		$year       Year
      *     @param   string	$sql        SQL
@@ -470,7 +478,8 @@ abstract class Stats
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
-	 *     Renvoie le nombre d'element par mois pour une annee donnee
+	 *     Renvoie le montant totalise par mois pour une annee donnee
+     *     Return the amount per month for a given year
 	 *
 	 *     @param	int		$year       Year
 	 *     @param   string	$sql		SQL
@@ -527,6 +536,7 @@ abstract class Stats
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
     /**
      *  Renvoie le montant moyen par mois pour une annee donnee
+     *  Return the amount average par month for a given year
      *
      *  @param  int     $year       Year
      *  @param  string  $sql        SQL
diff --git a/htdocs/core/js/lib_foot.js.php b/htdocs/core/js/lib_foot.js.php
index 14c69259b98..79ad6d19115 100644
--- a/htdocs/core/js/lib_foot.js.php
+++ b/htdocs/core/js/lib_foot.js.php
@@ -148,6 +148,7 @@ print '
 				/* Set handler to add page_y param on output (click on href links or submit button) */
 				jQuery(".reposition").click(function() {
 					var page_y = $(document).scrollTop();
+
 					if (page_y > 0)
 					{
 						if (this.href)
@@ -157,7 +158,7 @@ print '
 						}
 						else
 						{
-							console.log("We click on tag with .reposition class but element is not an <a> html tag, so we try to update form field page_y with value "+page_y);
+							console.log("We click on tag with .reposition class but element is not an <a> html tag, so we try to update input form field page_y with value "+page_y);
 							jQuery("input[type=hidden][name=page_y]").val(page_y);
 						}
 					}
diff --git a/htdocs/core/lib/ajax.lib.php b/htdocs/core/lib/ajax.lib.php
index a96e63a4f43..43f4723d695 100644
--- a/htdocs/core/lib/ajax.lib.php
+++ b/htdocs/core/lib/ajax.lib.php
@@ -538,11 +538,12 @@ function ajax_constantonoff($code, $input = array(), $entity = null, $revertonof
 }
 
 /**
- *  On/off button for object
+ *  On/off button to change status of an object
+ *  This is called when MAIN_DIRECT_STATUS_UPDATE is set and it use tha ajax service objectonoff.php
  *
  *  @param  Object  $object     Object to set
  *  @param  string  $code       Name of constant : status or status_buy for product by example
- *  @param  string  $field      Name of database field : tosell or tobuy for product by example
+ *  @param  string  $field      Name of database field : 'tosell' or 'tobuy' for product by example
  *  @param  string  $text_on    Text if on
  *  @param  string  $text_off   Text if off
  *  @param  array   $input      Array of type->list of CSS element to switch. Example: array('disabled'=>array(0=>'cssid'))
diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index eddce97ae3a..330ff349361 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -555,6 +555,7 @@ function dol_count_nb_of_line($file)
  *
  * @param 	string		$pathoffile		Path of file
  * @return 	integer						File size
+ * @see dol_print_size()
  */
 function dol_filesize($pathoffile)
 {
@@ -2164,6 +2165,12 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 		$accessallowed=($user->admin && basename($original_file) == $original_file && preg_match('/^dolibarr.*\.log$/', basename($original_file)));
 		$original_file=$dolibarr_main_data_root.'/'.$original_file;
 	}
+	// Wrapping for *.log files, like when used with url http://.../document.php?modulepart=logs&file=dolibarr.log
+	elseif ($modulepart == 'doctemplateswebsite' && !empty($dolibarr_main_data_root))
+	{
+		$accessallowed=($fuser->rights->website->write && preg_match('/\.jpg$/i', basename($original_file)));
+		$original_file=$dolibarr_main_data_root.'/doctemplates/websites/'.$original_file;
+	}
 	// Wrapping for *.zip files, like when used with url http://.../document.php?modulepart=packages&file=module_myfile.zip
 	elseif ($modulepart == 'packages' && !empty($dolibarr_main_data_root))
 	{
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 162674a814c..6c8c1797f7d 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -2467,6 +2467,13 @@ function dol_print_phone($phone, $countrycode = '', $cid = 0, $socid = 0, $addli
 			$newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 1).$separ.substr($newphone, 5, 3).$separ.substr($newphone, 7, 2).$separ.substr($newphone, 9, 2);
 		}
 	}
+	elseif (strtoupper($countrycode) == "JM")
+	{//Jamaïque
+		if(dol_strlen($newphone) == 12)
+		{//ex: +1867_ABC_DEFG
+			$newphone = substr($newphone, 0, 5).$separ.substr($newphone, 5, 3).$separ.substr($newphone, 8, 4);
+		}
+	}
 	elseif (strtoupper($countrycode) == "MG")
 	{//Madagascar
 		if(dol_strlen($phone) == 13)
@@ -4420,7 +4427,7 @@ function price($amount, $form = 0, $outlangs = '', $trunc = 1, $rounding = -1, $
 	{
 		if ($currency_code == 'auto') $currency_code=$conf->currency;
 
-		$listofcurrenciesbefore=array('USD','GBP','AUD','HKD','MXN','PEN','CNY');
+		$listofcurrenciesbefore=array('USD','GBP','AUD','HKD','MXN','PEN','CNY','CAD');
 		$listoflanguagesbefore=array('nl_NL');
 		if (in_array($currency_code, $listofcurrenciesbefore) || in_array($outlangs->defaultlang, $listoflanguagesbefore))
 		{
@@ -6574,10 +6581,17 @@ function dol_htmloutput_mesg($mesgstring = '', $mesgarray = array(), $style = 'o
 			$newmesgarray=array();
 			foreach($mesgarray as $val)
 			{
-				$tmpmesgstring=preg_replace('/<\/div><div class="(error|warning)">/', '<br>', $val);
-				$tmpmesgstring=preg_replace('/<div class="(error|warning)">/', '', $tmpmesgstring);
-				$tmpmesgstring=preg_replace('/<\/div>/', '', $tmpmesgstring);
-				$newmesgarray[]=$tmpmesgstring;
+				if (is_string($val))
+				{
+					$tmpmesgstring=preg_replace('/<\/div><div class="(error|warning)">/', '<br>', $val);
+					$tmpmesgstring=preg_replace('/<div class="(error|warning)">/', '', $tmpmesgstring);
+					$tmpmesgstring=preg_replace('/<\/div>/', '', $tmpmesgstring);
+					$newmesgarray[]=$tmpmesgstring;
+				}
+				else
+				{
+					dol_syslog("Error call of dol_htmloutput_mesg with an array with a value that is not a string", LOG_WARNING);
+				}
 			}
 			$mesgarray=$newmesgarray;
 		}
diff --git a/htdocs/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php
index 2f01cf441db..b4c8f6bf011 100644
--- a/htdocs/core/lib/functions2.lib.php
+++ b/htdocs/core/lib/functions2.lib.php
@@ -576,6 +576,7 @@ function isValidVATID($company)
     {
         $vatprefix = $company->country_code;
         if ($vatprefix == 'GR') $vatprefix = '(EL|GR)';
+        elseif ($vatprefix == 'MC') $vatprefix = 'FR';	// Monaco is using french VAT numbers
         else $vatprefix = preg_quote($vatprefix, '/');
         if (! preg_match('/^'.$vatprefix.'[a-zA-Z0-9\-\.]{5,14}$/i', str_replace(' ', '', $company->tva_intra)))
         {
diff --git a/htdocs/core/lib/security.lib.php b/htdocs/core/lib/security.lib.php
index 051f3a5392a..2ee5a45c010 100644
--- a/htdocs/core/lib/security.lib.php
+++ b/htdocs/core/lib/security.lib.php
@@ -279,7 +279,7 @@ function restrictedArea($user, $features, $objectid = 0, $tableandshare = '', $f
 
 	// Check write permission from module (we need to know write permission to create but also to delete drafts record)
 	$createok=1; $nbko=0;
-	if (GETPOST('action', 'aZ09')  == 'create' || ((GETPOST("action", "aZ09")  == 'confirm_delete' && GETPOST("confirm", "aZ09") == 'yes') || GETPOST("action", "aZ09")  == 'delete'))
+	if (GETPOST('action', 'aZ09')  == 'create' || GETPOST('action', 'aZ09')  == 'update' || ((GETPOST("action", "aZ09")  == 'confirm_delete' && GETPOST("confirm", "aZ09") == 'yes') || GETPOST("action", "aZ09")  == 'delete'))
 	{
 		foreach ($featuresarray as $feature)
 		{
@@ -329,7 +329,7 @@ function restrictedArea($user, $features, $objectid = 0, $tableandshare = '', $f
 		// If a or and at least one ok
 		if (preg_match('/\|/', $features) && $nbko < count($featuresarray)) $createok=1;
 
-		if (GETPOST('action', 'aZ09') == 'create' && ! $createok) accessforbidden();
+		if ((GETPOST('action', 'aZ09') == 'create' || GETPOST('action', 'aZ09') == 'update') && ! $createok) accessforbidden();
 		//print "Write access is ok";
 	}
 
diff --git a/htdocs/core/lib/takepos.lib.php b/htdocs/core/lib/takepos.lib.php
index d5e2d3be854..07573db1a11 100644
--- a/htdocs/core/lib/takepos.lib.php
+++ b/htdocs/core/lib/takepos.lib.php
@@ -38,7 +38,8 @@ function takepos_prepare_head()
 	$head[$h][2] = 'setup';
 	$h++;
 
-	for ($i = 1; $i <= $conf->global->TAKEPOS_NUM_TERMINALS; $i++)
+	$numterminals = max(1, $conf->global->TAKEPOS_NUM_TERMINALS);
+	for ($i = 1; $i <= $numterminals; $i++)
 	{
 		$head[$h][0] = DOL_URL_ROOT.'/takepos/admin/terminal.php?terminal='.$i;
 		$head[$h][1] = $langs->trans("Terminal"). " ".$i;
diff --git a/htdocs/core/lib/usergroups.lib.php b/htdocs/core/lib/usergroups.lib.php
index 7da112fa255..81e9c8dea73 100644
--- a/htdocs/core/lib/usergroups.lib.php
+++ b/htdocs/core/lib/usergroups.lib.php
@@ -295,10 +295,9 @@ function user_admin_prepare_head()
  * 	@param	boolean		$foruserprofile		Show for user profile view
  * 	@return	void
  */
-function show_theme($fuser, $edit = 0, $foruserprofile = false)
+function showSkins($fuser, $edit = 0, $foruserprofile = false)
 {
 	global $conf,$langs,$db,$form;
-	global $bc;
 
 	require_once DOL_DOCUMENT_ROOT . '/core/class/html.formother.class.php';
 
@@ -351,9 +350,7 @@ function show_theme($fuser, $edit = 0, $foruserprofile = false)
 	{
 		print '<tr class="liste_titre"><th class="titlefield">'.$langs->trans("DefaultSkin").'</th>';
 		print '<th class="right">';
-		$url='https://www.dolistore.com/lang-en/4-skins';
-		if (preg_match('/fr/i', $langs->defaultlang)) $url='https://www.dolistore.com/fr/4-themes';
-		//if (preg_match('/es/i',$langs->defaultlang)) $url='http://www.dolistore.com/lang-es/4-themes';
+		$url='https://www.dolistore.com/4-skins';
 		print '<a href="'.$url.'" target="_blank">';
 		print $langs->trans('DownloadMoreSkins');
 		print '</a>';
@@ -432,7 +429,7 @@ function show_theme($fuser, $edit = 0, $foruserprofile = false)
          print '<tr class="oddeven">';
          print '<td>'.$langs->trans("TopMenuDisableImages").'</td>';
          print '<td>'.($conf->global->THEME_TOPMENU_DISABLE_IMAGE?$conf->global->THEME_TOPMENU_DISABLE_IMAGE:$langs->trans("Default")).'</td>';
-         print '<td class="left" class="nowrap" width="20%"><input '.$bc[$var].' name="check_THEME_TOPMENU_DISABLE_IMAGE" id="check_THEME_TOPMENU_DISABLE_IMAGE" type="checkbox" '.(! empty($object->conf->THEME_ELDY_TEXTLINK)?" checked":"");
+         print '<td class="left" class="nowrap" width="20%"><input name="check_THEME_TOPMENU_DISABLE_IMAGE" id="check_THEME_TOPMENU_DISABLE_IMAGE" type="checkbox" '.(! empty($object->conf->THEME_ELDY_TEXTLINK)?" checked":"");
          print (empty($dolibarr_main_demo) && $edit)?'':' disabled="disabled"';	// Disabled for demo
          print '> '.$langs->trans("UsePersonalValue").'</td>';
          print '<td>';
@@ -477,7 +474,7 @@ function show_theme($fuser, $edit = 0, $foruserprofile = false)
 	    print '<tr class="oddeven">';
 	    print '<td>'.$langs->trans("TopMenuBackgroundColor").'</td>';
         print '<td>'.($conf->global->THEME_ELDY_TOPMENU_BACK1?$conf->global->THEME_ELDY_TOPMENU_BACK1:$langs->trans("Default")).'</td>';
-        print '<td class="nowrap left" width="20%"><input '.$bc[$var].' name="check_THEME_ELDY_TOPMENU_BACK1" id="check_THEME_ELDY_TOPMENU_BACK1" type="checkbox" '.(! empty($object->conf->THEME_ELDY_TOPMENU_BACK1)?" checked":"");
+        print '<td class="nowrap left" width="20%"><input name="check_THEME_ELDY_TOPMENU_BACK1" id="check_THEME_ELDY_TOPMENU_BACK1" type="checkbox" '.(! empty($object->conf->THEME_ELDY_TOPMENU_BACK1)?" checked":"");
         print (empty($dolibarr_main_demo) && $edit)?'':' disabled="disabled"';	// Disabled for demo
         print '> '.$langs->trans("UsePersonalValue").'</td>';
         print '<td>';
@@ -524,7 +521,7 @@ function show_theme($fuser, $edit = 0, $foruserprofile = false)
 	    print '<tr class="oddeven">';
 	    print '<td>'.$langs->trans("TopMenuBackgroundColor").'</td>';
         print '<td>'.($conf->global->THEME_ELDY_TOPMENU_BACK1?$conf->global->THEME_ELDY_TOPMENU_BACK1:$langs->trans("Default")).'</td>';
-        print '<td class="nowrap left" width="20%"><input '.$bc[$var].' name="check_THEME_ELDY_TOPMENU_BACK1" id="check_THEME_ELDY_TOPMENU_BACK1" type="checkbox" '.(! empty($object->conf->THEME_ELDY_TOPMENU_BACK1)?" checked":"");
+        print '<td class="nowrap left" width="20%"><input name="check_THEME_ELDY_TOPMENU_BACK1" id="check_THEME_ELDY_TOPMENU_BACK1" type="checkbox" '.(! empty($object->conf->THEME_ELDY_TOPMENU_BACK1)?" checked":"");
         print (empty($dolibarr_main_demo) && $edit)?'':' disabled="disabled"';	// Disabled for demo
         print '> '.$langs->trans("UsePersonalValue").'</td>';
         print '<td>';
@@ -573,7 +570,7 @@ function show_theme($fuser, $edit = 0, $foruserprofile = false)
 		 print '<tr class="oddeven">';
 		 print '<td>'.$langs->trans("TopMenuBackgroundColor").'</td>';
 		 print '<td>'.($conf->global->THEME_ELDY_TOPMENU_BACK1?$conf->global->THEME_ELDY_VERMENU_BACK1:$langs->trans("Default")).'</td>';
-		 print '<td class="nowrap left" width="20%"><input '.$bc[$var].' name="check_THEME_ELDY_VERMENU_BACK1" id="check_THEME_ELDY_VERMENU_BACK1" type="checkbox" '.(! empty($object->conf->THEME_ELDY_TOPMENU_BACK1)?" checked":"");
+		 print '<td class="nowrap left" width="20%"><input name="check_THEME_ELDY_VERMENU_BACK1" id="check_THEME_ELDY_VERMENU_BACK1" type="checkbox" '.(! empty($object->conf->THEME_ELDY_TOPMENU_BACK1)?" checked":"");
 		 print (empty($dolibarr_main_demo) && $edit)?'':' disabled="disabled"';	// Disabled for demo
 		 print '> '.$langs->trans("UsePersonalValue").'</td>';
 		 print '<td>';
@@ -763,7 +760,7 @@ function show_theme($fuser, $edit = 0, $foruserprofile = false)
 	     print '<tr class="oddeven">';
 	     print '<td>'.$langs->trans("TopMenuBackgroundColor").'</td>';
 	     print '<td>'.($conf->global->THEME_ELDY_TOPMENU_BACK1?$conf->global->THEME_ELDY_TEXTLINK:$langs->trans("Default")).'</td>';
-	     print '<td class="nowrap left" width="20%"><input '.$bc[$var].' name="check_THEME_ELDY_TEXTLINK" id="check_THEME_ELDY_TEXTLINK" type="checkbox" '.(! empty($object->conf->THEME_ELDY_TEXTLINK)?" checked":"");
+	     print '<td class="nowrap left" width="20%"><input name="check_THEME_ELDY_TEXTLINK" id="check_THEME_ELDY_TEXTLINK" type="checkbox" '.(! empty($object->conf->THEME_ELDY_TEXTLINK)?" checked":"");
 	     print (empty($dolibarr_main_demo) && $edit)?'':' disabled="disabled"';	// Disabled for demo
 	     print '> '.$langs->trans("UsePersonalValue").'</td>';
 	     print '<td>';
@@ -813,9 +810,9 @@ function show_theme($fuser, $edit = 0, $foruserprofile = false)
 		/* Must first change option to choose color of highlight instead of yes or no.
 	     print '<tr class="oddeven">';
 	     print '<td>'.$langs->trans("HighlightLinesOnMouseHover").'</td>';
-	     print '<td><input '.$bc[$var].' name="check_THEME_ELDY_USE_HOVER" disabled="disabled" type="checkbox" '.($conf->global->THEME_ELDY_USE_HOVER?" checked":"").'></td>';
-	     print '<td class="nowrap left" width="20%"><input '.$bc[$var].' name="check_MAIN_THEME"'.($edit?'':' disabled').' type="checkbox" '.($selected_theme?" checked":"").'> '.$langs->trans("UsePersonalValue").'</td>';
-	     print '<td><input '.$bc[$var].' name="check_THEME_ELDY_USE_HOVER"'.($edit?'':' disabled="disabled"').' type="checkbox" '.($hoverdisabled?"":" checked").'>';
+	     print '<td><input name="check_THEME_ELDY_USE_HOVER" disabled="disabled" type="checkbox" '.($conf->global->THEME_ELDY_USE_HOVER?" checked":"").'></td>';
+	     print '<td class="nowrap left" width="20%"><input name="check_MAIN_THEME"'.($edit?'':' disabled').' type="checkbox" '.($selected_theme?" checked":"").'> '.$langs->trans("UsePersonalValue").'</td>';
+	     print '<td><input name="check_THEME_ELDY_USE_HOVER"'.($edit?'':' disabled="disabled"').' type="checkbox" '.($hoverdisabled?"":" checked").'>';
 	     print ' &nbsp; ('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
 	     print '</td>';
 	     print '</tr>';
@@ -825,7 +822,7 @@ function show_theme($fuser, $edit = 0, $foruserprofile = false)
 		print '<tr class="oddeven">';
 		print '<td>'.$langs->trans("HighlightLinesColor").'</td>';
 		print '<td colspan="'.($colspan-1).'">';
-		//print '<input '.$bc[$var].' name="check_THEME_ELDY_USE_HOVER"'.($edit?'':' disabled').' type="checkbox" '.($hoverdisabled?"":" checked").'>';
+		//print '<input name="check_THEME_ELDY_USE_HOVER"'.($edit?'':' disabled').' type="checkbox" '.($hoverdisabled?"":" checked").'>';
 		//print ' &nbsp; ('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
 		if ($edit)
 		{
@@ -856,9 +853,9 @@ function show_theme($fuser, $edit = 0, $foruserprofile = false)
 		/* Must first change option to choose color of highlight instead of yes or no.
 	     print '<tr class="oddeven">';
 	     print '<td>'.$langs->trans("HighlightLinesOnMouseHover").'</td>';
-	     print '<td><input '.$bc[$var].' name="check_THEME_ELDY_USE_HOVER" disabled="disabled" type="checkbox" '.($conf->global->THEME_ELDY_USE_HOVER?" checked":"").'></td>';
-	     print '<td class="nowrap left" width="20%"><input '.$bc[$var].' name="check_MAIN_THEME"'.($edit?'':' disabled').' type="checkbox" '.($selected_theme?" checked":"").'> '.$langs->trans("UsePersonalValue").'</td>';
-	     print '<td><input '.$bc[$var].' name="check_THEME_ELDY_USE_HOVER"'.($edit?'':' disabled="disabled"').' type="checkbox" '.($hoverdisabled?"":" checked").'>';
+	     print '<td><input name="check_THEME_ELDY_USE_HOVER" disabled="disabled" type="checkbox" '.($conf->global->THEME_ELDY_USE_HOVER?" checked":"").'></td>';
+	     print '<td class="nowrap left" width="20%"><input name="check_MAIN_THEME"'.($edit?'':' disabled').' type="checkbox" '.($selected_theme?" checked":"").'> '.$langs->trans("UsePersonalValue").'</td>';
+	     print '<td><input name="check_THEME_ELDY_USE_HOVER"'.($edit?'':' disabled="disabled"').' type="checkbox" '.($hoverdisabled?"":" checked").'>';
 	     print ' &nbsp; ('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
 	     print '</td>';
 	     print '</tr>';
@@ -869,7 +866,7 @@ function show_theme($fuser, $edit = 0, $foruserprofile = false)
 		print '<tr class="oddeven">';
 		print '<td>'.$langs->trans("HighlightLinesChecked").'</td>';
 		print '<td colspan="'.($colspan-1).'">';
-		//print '<input '.$bc[$var].' name="check_THEME_ELDY_USE_HOVER"'.($edit?'':' disabled').' type="checkbox" '.($hoverdisabled?"":" checked").'>';
+		//print '<input name="check_THEME_ELDY_USE_HOVER"'.($edit?'':' disabled').' type="checkbox" '.($hoverdisabled?"":" checked").'>';
 		//print ' &nbsp; ('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
 		if ($edit)
 		{
@@ -947,5 +944,44 @@ function show_theme($fuser, $edit = 0, $foruserprofile = false)
 	    */
 	}
 
+
+	// Use MAIN_OPTIMIZEFORTEXTBROWSER
+	if ($foruserprofile)
+	{
+		//$default=yn($conf->global->MAIN_OPTIMIZEFORCOLORBLIND);
+		$default=$langs->trans('No');
+		print '<tr class="oddeven">';
+		print '<td>'.$langs->trans("MAIN_OPTIMIZEFORCOLORBLIND").'</td>';
+		print '<td colspan="'.($colspan-1).'">';
+
+		$colorBlindOptions = array(
+			0 => $langs->trans('No'),
+			'protanopia' => $langs->trans('Protanopia'),
+			'deuteranopes' => $langs->trans('Deuteranopes'),
+			'tritanopes' => $langs->trans('Tritanopes'),
+		);
+
+		if ($edit)
+		{
+			print $form->selectArray('MAIN_OPTIMIZEFORCOLORBLIND', $colorBlindOptions, $fuser->conf->MAIN_OPTIMIZEFORCOLORBLIND, 0);
+		}
+		else
+		{
+			if (!empty($fuser->conf->MAIN_OPTIMIZEFORCOLORBLIND) && isset($colorBlindOptions[$fuser->conf->MAIN_OPTIMIZEFORCOLORBLIND])){
+				print $colorBlindOptions[$fuser->conf->MAIN_OPTIMIZEFORCOLORBLIND];
+			}
+			else{
+				print yn(0);
+			}
+		}
+		print ' &nbsp; ('.$langs->trans("Default").': <strong>'.$default.'</strong>) ';
+		print $form->textwithpicto('', $langs->trans("MAIN_OPTIMIZEFORCOLORBLINDDesc"));
+		print '</td>';
+		print '</tr>';
+	}
+	else
+	{
+
+	}
 	print '</table>';
 }
diff --git a/htdocs/core/lib/website.lib.php b/htdocs/core/lib/website.lib.php
index 00716f6a3ab..4d89210cd44 100644
--- a/htdocs/core/lib/website.lib.php
+++ b/htdocs/core/lib/website.lib.php
@@ -29,13 +29,16 @@
  * @param	Website		$website			Web site object
  * @param	string		$content			Content to replace
  * @param	int			$removephppart		0=Replace PHP sections with a PHP badge. 1=Remove completely PHP sections.
+ * @param	string		$contenttype		Content type
  * @return	boolean							True if OK
  * @see dolWebsiteOutput() for function used to replace content in a web server context
  */
-function dolWebsiteReplacementOfLinks($website, $content, $removephppart = 0)
+function dolWebsiteReplacementOfLinks($website, $content, $removephppart = 0, $contenttype='html')
 {
 	$nbrep = 0;
 
+	dol_syslog('dolWebsiteReplacementOfLinks start (contenttype='.$contenttype." USEDOLIBARRSERVER=".(defined('USEDOLIBARRSERVER')?'1':'')." USEDOLIBARREDITOR=".(defined('USEDOLIBARREDITOR')?'1':'').')', LOG_DEBUG);
+
 	// Replace php code. Note $content may come from database and does not contains body tags.
 	$replacewith='...php...';
 	if ($removephppart) $replacewith='';
@@ -90,6 +93,8 @@ function dolWebsiteReplacementOfLinks($website, $content, $removephppart = 0)
 	$content=preg_replace('/(href=")(\/?document\.php\?[^\"]*modulepart=[^\"]*)(\")/', '\1'.DOL_URL_ROOT.'\2\3', $content, -1, $nbrep);
 	$content=preg_replace('/(src=")(\/?document\.php\?[^\"]*modulepart=[^\"]*)(\")/', '\1'.DOL_URL_ROOT.'\2\3', $content, -1, $nbrep);
 
+	dol_syslog('dolWebsiteReplacementOfLinks end', LOG_DEBUG);
+
 	return $content;
 }
 
@@ -176,16 +181,18 @@ function dolKeepOnlyPhpCode($str)
  * Render a string of an HTML content and output it.
  * Used to ouput the page when viewed from server (Dolibarr or Apache).
  *
- * @param   string  $content    Content string
+ * @param   string  $content    	Content string
+ * @param	string	$contenttype	Content type
+ * @param	int		$containerid 	Contenair id
  * @return  void
  * @see	dolWebsiteReplacementOfLinks()  for function used to replace content in the backoffice context when USEDOLIBARREDITOR is not on
  */
-function dolWebsiteOutput($content)
+function dolWebsiteOutput($content, $contenttype='html', $containerid='')
 {
 	global $db, $langs, $conf, $user;
 	global $dolibarr_main_url_root, $dolibarr_main_data_root;
 
-	dol_syslog("dolWebsiteOutput start (USEDOLIBARRSERVER=".(defined('USEDOLIBARRSERVER')?'1':'')." USEDOLIBARREDITOR=".(defined('USEDOLIBARREDITOR')?'1':'').')');
+	dol_syslog("dolWebsiteOutput start (contenttype=".$contenttype." containerid=".$containerid." USEDOLIBARRSERVER=".(defined('USEDOLIBARRSERVER')?'1':'')." USEDOLIBARREDITOR=".(defined('USEDOLIBARREDITOR')?'1':'').')');
 
 	// Define $urlwithroot
 	$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
@@ -195,9 +202,12 @@ function dolWebsiteOutput($content)
 	if (defined('USEDOLIBARREDITOR'))		// REPLACEMENT OF LINKS When page called from Dolibarr editor
 	{
 		// We remove the <head> part of content
-		$content = preg_replace('/<head>.*<\/head>/ims', '', $content);
-		$content = preg_replace('/^.*<body(\s[^>]*)*>/ims', '', $content);
-		$content = preg_replace('/<\/body(\s[^>]*)*>.*$/ims', '', $content);
+		if ($contenttype == 'html')
+		{
+			$content = preg_replace('/<head>.*<\/head>/ims', '', $content);
+			$content = preg_replace('/^.*<body(\s[^>]*)*>/ims', '', $content);
+			$content = preg_replace('/<\/body(\s[^>]*)*>.*$/ims', '', $content);
+		}
 	}
 	elseif (defined('USEDOLIBARRSERVER'))	// REPLACEMENT OF LINKS When page called from Dolibarr server
 	{
@@ -285,7 +295,7 @@ function dolWebsiteOutput($content)
  *
  * @param   string  $content    Content string
  * @return  void
- * @see	dolWebsiteOutput
+ * @see	dolWebsiteOutput()
  */
 /*
 function dolWebsiteSaveContent($content)
@@ -342,9 +352,9 @@ function redirectToContainer($containerref, $containeraliasalt = '', $containeri
 	if (defined('USEDOLIBARREDITOR'))
 	{
 		print '<div class="margintoponly marginleftonly">';
-		print "This page contains dynamic code that make a redirect to '".$containerref."' in your current context. There is no preview for this page.";
+		print "This page contains dynamic code that make a redirect to '".$containerref."' in your current context. Redirect has been canceled as it is not supported in edition mode.";
 		print '</div>';
-		exit;
+		return;
 	}
 
 	if (defined('USEDOLIBARRSERVER'))	// When page called from Dolibarr server
@@ -452,8 +462,6 @@ function includeContainer($containerref)
 function getStructuredData($type, $data = array())
 {
 	global $conf, $db, $hookmanager, $langs, $mysoc, $user, $website, $websitepage, $weblangs;	// Very important. Required to have var available when running inluded containers.
-	global $includehtmlcontentopened;
-	global $websitekey, $websitepagefile;
 
 	if ($type == 'software')
 	{
@@ -561,6 +569,108 @@ function getStructuredData($type, $data = array())
 	return $ret;
 }
 
+/**
+ * Return list of containers object that match a criteria
+ *
+ * @param 	string		$type				Type of container to search into (Example: 'page')
+ * @param 	string		$algo				Algorithm used for search (Example: 'meta' is searching into meta information like title and description, 'metacontent')
+ * @param	string		$searchstring		Search string
+ * @param	int			$max				Max number of answers
+ * @return  string							HTML content
+ */
+function getPagesFromSearchCriterias($type, $algo, $searchstring, $max = 25)
+{
+	global $conf, $db, $hookmanager, $langs, $mysoc, $user, $website, $websitepage, $weblangs;	// Very important. Required to have var available when running inluded containers.
+
+	$error = 0;
+	$arrayresult = array('code'=>'', 'list'=>array());
+
+	if (! is_object($weblangs)) $weblangs = $langs;
+
+	if (empty($searchstring))
+	{
+		$error++;
+		$arrayresult['code']='KO';
+		$arrayresult['message']=$weblangs->trans("EmptySearchString");
+	}
+	elseif (dol_strlen($searchstring) < 2)
+	{
+		$weblangs->load("errors");
+		$error++;
+		$arrayresult['code']='KO';
+		$arrayresult['message']=$weblangs->trans("ErrorSearchCriteriaTooSmall");
+	}
+	elseif (! in_array($type, array('', 'page')))
+	{
+		$error++;
+		$arrayresult['code']='KO';
+		$arrayresult['message']='Bad value for parameter $type';
+	}
+
+	$searchdone = 0;
+
+	if (! $error && in_array($algo, array('meta', 'metacontent', 'content')))
+	{
+		$sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.'website_page';
+		$sql.= " WHERE fk_website = ".$website->id;
+		if ($type) $sql.= " AND type_container = '".$db->escape($type)."'";
+		$sql.= " AND (";
+		$searchalgo = '';
+		if ($algo == 'meta' || $algo == 'metacontent')
+		{
+			$searchalgo.= ($searchalgo?' OR ':'')."title LIKE '%".$db->escape($searchstring)."%' OR description LIKE '%".$db->escape($searchstring)."%'";
+			$searchalgo.= ($searchalgo?' OR ':'')."keywords LIKE '".$db->escape($searchstring).",%' OR keywords LIKE '% ".$db->escape($searchstring)."%'";		// TODO Use a better way to scan keywords
+		}
+		if ($algo == 'metacontent' || $algo == 'content')
+		{
+			$searchalgo.= ($searchalgo?' OR ':'')."content LIKE '%".$db->escape($searchstring)."%'";
+		}
+		$sql.=$searchalgo;
+		$sql.= ")";
+		$sql.= $db->plimit($max);
+
+		$resql = $db->query($sql);
+		if ($resql)
+		{
+			$i = 0;
+			while (($obj = $db->fetch_object($resql)) && ($i < $max || $max == 0))
+			{
+				if ($obj->rowid > 0)
+				{
+					$tmpwebsitepage = new WebsitePage($db);
+					$tmpwebsitepage->fetch($obj->rowid);
+					if ($tmpwebsitepage->id > 0) $arrayresult['list'][]=$tmpwebsitepage;
+				}
+				$i++;
+			}
+
+			$arrayresult['code']='OK';
+			if (empty($arrayresult['list']))
+			{
+				$arrayresult['code']='KO';
+				$arrayresult['message']=$weblangs->trans("NoRecordFound");
+			}
+		}
+		else
+		{
+			$error++;
+			$arrayresult['code']=$db->lasterrno();
+			$arrayresult['message']=$db->lasterror();
+		}
+
+		$searchdone = 1;
+	}
+
+	if (! $searchdone)
+	{
+		$error++;
+		$arrayresult['code']='KO';
+		$arrayresult['message']='No supported algorithm found';
+	}
+
+	return $arrayresult;
+}
+
 /**
  * Download all images found into page content $tmp.
  * If $modifylinks is set, links to images will be replace with a link to viewimage wrapper.
@@ -744,313 +854,3 @@ function getAllImages($object, $objectpage, $urltograb, &$tmp, &$action, $modify
 		}
 	}
 }
-
-
-
-/**
- * Save content of a page on disk
- *
- * @param	string		$filemaster			Full path of filename master.inc.php for website to generate
- * @return	boolean							True if OK
- */
-function dolSaveMasterFile($filemaster)
-{
-	global $conf;
-
-	// Now generate the master.inc.php page
-	dol_syslog("We regenerate the master file");
-	dol_delete_file($filemaster);
-
-	$mastercontent = '<?php'."\n";
-	$mastercontent.= '// File generated to link to the master file - DO NOT MODIFY - It is just an include'."\n";
-	$mastercontent.= "if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) require_once '".DOL_DOCUMENT_ROOT."/master.inc.php';\n";
-	$mastercontent.= '?>'."\n";
-	$result = file_put_contents($filemaster, $mastercontent);
-	if (! empty($conf->global->MAIN_UMASK))
-		@chmod($filemaster, octdec($conf->global->MAIN_UMASK));
-
-	return $result;
-}
-
-/**
- * Save content of a page on disk
- *
- * @param	string		$filealias			Full path of filename to generate
- * @param	Website		$object				Object website
- * @param	WebsitePage	$objectpage			Object websitepage
- * @return	boolean							True if OK
- */
-function dolSavePageAlias($filealias, $object, $objectpage)
-{
-	global $conf;
-
-	// Now create the .tpl file (duplicate code with actions updatesource or updatecontent but we need this to save new header)
-	dol_syslog("We regenerate the alias page filealias=".$filealias);
-
-	$aliascontent = '<?php'."\n";
-	$aliascontent.= "// File generated to wrap the alias page - DO NOT MODIFY - It is just a wrapper to real page\n";
-	$aliascontent.= 'global $dolibarr_main_data_root;'."\n";
-	$aliascontent.= 'if (empty($dolibarr_main_data_root)) require \'./page'.$objectpage->id.'.tpl.php\'; ';
-	$aliascontent.= 'else require $dolibarr_main_data_root.\'/website/\'.$website->ref.\'/page'.$objectpage->id.'.tpl.php\';'."\n";
-	$aliascontent.= '?>'."\n";
-	$result = file_put_contents($filealias, $aliascontent);
-	if (! empty($conf->global->MAIN_UMASK)) {
-        @chmod($filealias, octdec($conf->global->MAIN_UMASK));
-    }
-
-	return ($result?true:false);
-}
-
-
-/**
- * Save content of a page on disk
- *
- * @param	string		$filetpl			Full path of filename to generate
- * @param	Website		$object				Object website
- * @param	WebsitePage	$objectpage			Object websitepage
- * @return	boolean							True if OK
- */
-function dolSavePageContent($filetpl, $object, $objectpage)
-{
-	global $conf;
-
-	// Now create the .tpl file (duplicate code with actions updatesource or updatecontent but we need this to save new header)
-	dol_syslog("We regenerate the tpl page filetpl=".$filetpl);
-
-	dol_delete_file($filetpl);
-
-	$shortlangcode = '';
-	if ($objectpage->lang) $shortlangcode=preg_replace('/[_-].*$/', '', $objectpage->lang);		// en_US or en-US -> en
-
-	$tplcontent ='';
-	$tplcontent.= "<?php // BEGIN PHP\n";
-	$tplcontent.= '$websitekey=basename(__DIR__); if (empty($websitepagefile)) $websitepagefile=__FILE__;'."\n";
-	$tplcontent.= "if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once './master.inc.php'; } // Not already loaded"."\n";
-	$tplcontent.= "require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';\n";
-	$tplcontent.= "require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';\n";
-	$tplcontent.= "ob_start();\n";
-	$tplcontent.= "// END PHP ?>\n";
-	if (! empty($conf->global->WEBSITE_FORCE_DOCTYPE_HTML5))
-	{
-	   $tplcontent.= "<!DOCTYPE html>\n";
-	}
-	$tplcontent.= '<html'.($shortlangcode ? ' lang="'.$shortlangcode.'"':'').'>'."\n";
-	$tplcontent.= '<head>'."\n";
-	$tplcontent.= '<title>'.dol_string_nohtmltag($objectpage->title, 0, 'UTF-8').'</title>'."\n";
-	$tplcontent.= '<meta charset="UTF-8">'."\n";
-	$tplcontent.= '<meta http-equiv="content-type" content="text/html; charset=utf-8" />'."\n";
-	$tplcontent.= '<meta name="robots" content="index, follow" />'."\n";
-	$tplcontent.= '<meta name="viewport" content="width=device-width, initial-scale=1.0">'."\n";
-	$tplcontent.= '<meta name="keywords" content="'.dol_string_nohtmltag($objectpage->keywords).'" />'."\n";
-	$tplcontent.= '<meta name="title" content="'.dol_string_nohtmltag($objectpage->title, 0, 'UTF-8').'" />'."\n";
-	$tplcontent.= '<meta name="description" content="'.dol_string_nohtmltag($objectpage->description, 0, 'UTF-8').'" />'."\n";
-	$tplcontent.= '<meta name="generator" content="'.DOL_APPLICATION_TITLE.' '.DOL_VERSION.' (https://www.dolibarr.org)" />'."\n";
-	$tplcontent.= '<meta name="dolibarr:pageid" content="'.dol_string_nohtmltag($objectpage->id).'" />'."\n";
-	$tplcontent.= '<link href="/'.(($objectpage->id == $object->fk_default_home) ? '' : ($objectpage->pageurl.'.php')).'" rel="canonical" />'."\n";
-	$tplcontent.= '<!-- Include link to CSS file -->'."\n";
-	$tplcontent.= '<link rel="stylesheet" href="styles.css.php?website=<?php echo $websitekey; ?>" type="text/css" />'."\n";
-	$tplcontent.= '<!-- Include HTML header from common file -->'."\n";
-	$tplcontent.= '<?php print preg_replace(\'/<\/?html>/ims\', \'\', file_get_contents(DOL_DATA_ROOT."/website/".$websitekey."/htmlheader.html")); ?>'."\n";
-	$tplcontent.= '<!-- Include HTML header from page header block -->'."\n";
-	$tplcontent.= preg_replace('/<\/?html>/ims', '', $objectpage->htmlheader)."\n";
-	$tplcontent.= '</head>'."\n";
-
-	$tplcontent.= '<!-- File generated by Dolibarr website module editor -->'."\n";
-	$tplcontent.= '<body id="bodywebsite" class="bodywebsite">'."\n";
-	$tplcontent.= $objectpage->content."\n";
-	$tplcontent.= '</body>'."\n";
-	$tplcontent.= '</html>'."\n";
-
-	$tplcontent.= '<?php // BEGIN PHP'."\n";
-	$tplcontent.= '$tmp = ob_get_contents(); ob_end_clean(); dolWebsiteOutput($tmp);'."\n";
-	$tplcontent.= "// END PHP ?>"."\n";
-
-	//var_dump($filetpl);exit;
-	$result = file_put_contents($filetpl, $tplcontent);
-	if (! empty($conf->global->MAIN_UMASK))
-		@chmod($filetpl, octdec($conf->global->MAIN_UMASK));
-
-		return $result;
-}
-
-
-/**
- * Save content of the index.php and wrapper.php page
- *
- * @param	string		$pathofwebsite			Path of website root
- * @param	string		$fileindex				Full path of file index.php
- * @param	string		$filetpl				File tpl to index.php page redirect to
- * @param	string		$filewrapper			Full path of file wrapper.php
- * @return	boolean								True if OK
- */
-function dolSaveIndexPage($pathofwebsite, $fileindex, $filetpl, $filewrapper)
-{
-	global $conf;
-
-	$result1=false;
-	$result2=false;
-
-	dol_mkdir($pathofwebsite);
-
-	dol_delete_file($fileindex);
-	$indexcontent = '<?php'."\n";
-	$indexcontent.= "// BEGIN PHP File generated to provide an index.php as Home Page or alias redirector - DO NOT MODIFY - It is just a generated wrapper.\n";
-	$indexcontent.= '$websitekey=basename(__DIR__); if (empty($websitepagefile)) $websitepagefile=__FILE__;'."\n";
-	$indexcontent.= "if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once './master.inc.php'; } // Load master if not already loaded\n";
-	$indexcontent.= 'if (! empty($_GET[\'pageref\']) || ! empty($_GET[\'pagealiasalt\']) || ! empty($_GET[\'pageid\'])) {'."\n";
-	$indexcontent.= "	require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';\n";
-	$indexcontent.= "	require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';\n";
-	$indexcontent.= '	redirectToContainer($_GET[\'pageref\'], $_GET[\'pagealiasalt\'], $_GET[\'pageid\']);'."\n";
-	$indexcontent.= "}\n";
-	$indexcontent.= "include_once './".basename($filetpl)."'\n";
-	$indexcontent.= '// END PHP ?>'."\n";
-	$result1 = file_put_contents($fileindex, $indexcontent);
-	if (! empty($conf->global->MAIN_UMASK))
-		@chmod($fileindex, octdec($conf->global->MAIN_UMASK));
-
-	dol_delete_file($filewrapper);
-
-	$wrappercontent=file_get_contents(DOL_DOCUMENT_ROOT.'/website/samples/wrapper.html');
-
-	$result2 = file_put_contents($filewrapper, $wrappercontent);
-	if (! empty($conf->global->MAIN_UMASK))
-		@chmod($filewrapper, octdec($conf->global->MAIN_UMASK));
-
-	return ($result1 && $result2);
-}
-
-
-/**
- * Save content of a page on disk
- *
- * @param	string		$filehtmlheader		Full path of filename to generate
- * @param	string		$htmlheadercontent	Content of file
- * @return	boolean							True if OK
- */
-function dolSaveHtmlHeader($filehtmlheader, $htmlheadercontent)
-{
-	global $conf, $pathofwebsite;
-
-	dol_syslog("Save html header into ".$filehtmlheader);
-
-	dol_mkdir($pathofwebsite);
-	$result = file_put_contents($filehtmlheader, $htmlheadercontent);
-	if (! empty($conf->global->MAIN_UMASK))
-		@chmod($filehtmlheader, octdec($conf->global->MAIN_UMASK));
-
-		if (! $result)
-		{
-			setEventMessages('Failed to write file '.$filehtmlheader, null, 'errors');
-			return false;
-		}
-
-		return true;
-}
-
-/**
- * Save content of a page on disk
- *
- * @param	string		$filecss			Full path of filename to generate
- * @param	string		$csscontent			Content of file
- * @return	boolean							True if OK
- */
-function dolSaveCssFile($filecss, $csscontent)
-{
-	global $conf, $pathofwebsite;
-
-	dol_syslog("Save css file into ".$filecss);
-
-	dol_mkdir($pathofwebsite);
-	$result = file_put_contents($filecss, $csscontent);
-	if (! empty($conf->global->MAIN_UMASK))
-		@chmod($filecss, octdec($conf->global->MAIN_UMASK));
-
-		if (! $result)
-		{
-			setEventMessages('Failed to write file '.$filecss, null, 'errors');
-			return false;
-		}
-
-		return true;
-}
-
-/**
- * Save content of a page on disk
- *
- * @param	string		$filejs				Full path of filename to generate
- * @param	string		$jscontent			Content of file
- * @return	boolean							True if OK
- */
-function dolSaveJsFile($filejs, $jscontent)
-{
-	global $conf, $pathofwebsite;
-
-	dol_syslog("Save js file into ".$filejs);
-
-	dol_mkdir($pathofwebsite);
-	$result = file_put_contents($filejs, $jscontent);
-	if (! empty($conf->global->MAIN_UMASK))
-		@chmod($filejs, octdec($conf->global->MAIN_UMASK));
-
-		if (! $result)
-		{
-			setEventMessages('Failed to write file '.$filejs, null, 'errors');
-			return false;
-		}
-
-		return true;
-}
-
-/**
- * Save content of a page on disk
- *
- * @param	string		$filerobot			Full path of filename to generate
- * @param	string		$robotcontent		Content of file
- * @return	boolean							True if OK
- */
-function dolSaveRobotFile($filerobot, $robotcontent)
-{
-	global $conf, $pathofwebsite;
-
-	dol_syslog("Save robot file into ".$filerobot);
-
-	dol_mkdir($pathofwebsite);
-	$result = file_put_contents($filerobot, $robotcontent);
-	if (! empty($conf->global->MAIN_UMASK))
-		@chmod($filerobot, octdec($conf->global->MAIN_UMASK));
-
-		if (! $result)
-		{
-			setEventMessages('Failed to write file '.$filerobot, null, 'errors');
-			return false;
-		}
-
-		return true;
-}
-
-/**
- * Save content of a page on disk
- *
- * @param	string		$filehtaccess		Full path of filename to generate
- * @param	string		$htaccess			Content of file
- * @return	boolean							True if OK
- */
-function dolSaveHtaccessFile($filehtaccess, $htaccess)
-{
-	global $conf, $pathofwebsite;
-
-	dol_syslog("Save htaccess file into ".$filehtaccess);
-
-	dol_mkdir($pathofwebsite);
-	$result = file_put_contents($filehtaccess, $htaccess);
-	if (! empty($conf->global->MAIN_UMASK))
-		@chmod($filehtaccess, octdec($conf->global->MAIN_UMASK));
-
-		if (! $result)
-		{
-			setEventMessages('Failed to write file '.$filehtaccess, null, 'errors');
-			return false;
-		}
-
-		return true;
-}
diff --git a/htdocs/core/lib/website2.lib.php b/htdocs/core/lib/website2.lib.php
new file mode 100644
index 00000000000..53f9e5f11c9
--- /dev/null
+++ b/htdocs/core/lib/website2.lib.php
@@ -0,0 +1,457 @@
+<?php
+/* Copyright (C) 2017 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *      \file       htdocs/core/lib/website2.lib.php
+ *      \ingroup    website
+ *      \brief      Library for website module (rare functions not required for execution of website)
+ */
+
+
+
+/**
+ * Save content of a page on disk
+ *
+ * @param	string		$filemaster			Full path of filename master.inc.php for website to generate
+ * @return	boolean							True if OK
+ */
+function dolSaveMasterFile($filemaster)
+{
+	global $conf;
+
+	// Now generate the master.inc.php page
+	dol_syslog("We regenerate the master file");
+	dol_delete_file($filemaster);
+
+	$mastercontent = '<?php'."\n";
+	$mastercontent.= '// File generated to link to the master file - DO NOT MODIFY - It is just an include'."\n";
+	$mastercontent.= "if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) require_once '".DOL_DOCUMENT_ROOT."/master.inc.php';\n";
+	$mastercontent.= '?>'."\n";
+	$result = file_put_contents($filemaster, $mastercontent);
+	if (! empty($conf->global->MAIN_UMASK))
+		@chmod($filemaster, octdec($conf->global->MAIN_UMASK));
+
+		return $result;
+}
+
+/**
+ * Save content of a page on disk
+ *
+ * @param	string		$filealias			Full path of filename to generate
+ * @param	Website		$object				Object website
+ * @param	WebsitePage	$objectpage			Object websitepage
+ * @return	boolean							True if OK
+ */
+function dolSavePageAlias($filealias, $object, $objectpage)
+{
+	global $conf;
+
+	// Now create the .tpl file (duplicate code with actions updatesource or updatecontent but we need this to save new header)
+	dol_syslog("We regenerate the alias page filealias=".$filealias);
+
+	$aliascontent = '<?php'."\n";
+	$aliascontent.= "// File generated to wrap the alias page - DO NOT MODIFY - It is just a wrapper to real page\n";
+	$aliascontent.= 'global $dolibarr_main_data_root;'."\n";
+	$aliascontent.= 'if (empty($dolibarr_main_data_root)) require \'./page'.$objectpage->id.'.tpl.php\'; ';
+	$aliascontent.= 'else require $dolibarr_main_data_root.\'/website/\'.$website->ref.\'/page'.$objectpage->id.'.tpl.php\';'."\n";
+	$aliascontent.= '?>'."\n";
+	$result = file_put_contents($filealias, $aliascontent);
+	if (! empty($conf->global->MAIN_UMASK)) {
+		@chmod($filealias, octdec($conf->global->MAIN_UMASK));
+	}
+
+	return ($result?true:false);
+}
+
+
+/**
+ * Save content of a page on disk
+ *
+ * @param	string		$filetpl			Full path of filename to generate
+ * @param	Website		$object				Object website
+ * @param	WebsitePage	$objectpage			Object websitepage
+ * @return	boolean							True if OK
+ */
+function dolSavePageContent($filetpl, $object, $objectpage)
+{
+	global $conf;
+
+	// Now create the .tpl file (duplicate code with actions updatesource or updatecontent but we need this to save new header)
+	dol_syslog("We regenerate the tpl page filetpl=".$filetpl);
+
+	dol_delete_file($filetpl);
+
+	$shortlangcode = '';
+	if ($objectpage->lang) $shortlangcode=preg_replace('/[_-].*$/', '', $objectpage->lang);		// en_US or en-US -> en
+
+	$tplcontent ='';
+	$tplcontent.= "<?php // BEGIN PHP\n";
+	$tplcontent.= '$websitekey=basename(__DIR__); if (empty($websitepagefile)) $websitepagefile=__FILE__;'."\n";
+	$tplcontent.= "if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once './master.inc.php'; } // Not already loaded"."\n";
+	$tplcontent.= "require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';\n";
+	$tplcontent.= "require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';\n";
+	$tplcontent.= "ob_start();\n";
+	$tplcontent.= "// END PHP ?>\n";
+	if (! empty($conf->global->WEBSITE_FORCE_DOCTYPE_HTML5))
+	{
+		$tplcontent.= "<!DOCTYPE html>\n";
+	}
+	$tplcontent.= '<html'.($shortlangcode ? ' lang="'.$shortlangcode.'"':'').'>'."\n";
+	$tplcontent.= '<head>'."\n";
+	$tplcontent.= '<title>'.dol_string_nohtmltag($objectpage->title, 0, 'UTF-8').'</title>'."\n";
+	$tplcontent.= '<meta charset="UTF-8">'."\n";
+	$tplcontent.= '<meta http-equiv="content-type" content="text/html; charset=utf-8" />'."\n";
+	$tplcontent.= '<meta name="robots" content="index, follow" />'."\n";
+	$tplcontent.= '<meta name="viewport" content="width=device-width, initial-scale=1.0">'."\n";
+	$tplcontent.= '<meta name="keywords" content="'.dol_string_nohtmltag($objectpage->keywords).'" />'."\n";
+	$tplcontent.= '<meta name="title" content="'.dol_string_nohtmltag($objectpage->title, 0, 'UTF-8').'" />'."\n";
+	$tplcontent.= '<meta name="description" content="'.dol_string_nohtmltag($objectpage->description, 0, 'UTF-8').'" />'."\n";
+	$tplcontent.= '<meta name="generator" content="'.DOL_APPLICATION_TITLE.' '.DOL_VERSION.' (https://www.dolibarr.org)" />'."\n";
+	$tplcontent.= '<meta name="dolibarr:pageid" content="'.dol_string_nohtmltag($objectpage->id).'" />'."\n";
+	$tplcontent.= '<link href="/'.(($objectpage->id == $object->fk_default_home) ? '' : ($objectpage->pageurl.'.php')).'" rel="canonical" />'."\n";
+	$tplcontent.= '<!-- Include link to CSS file -->'."\n";
+	$tplcontent.= '<link rel="stylesheet" href="styles.css.php?website=<?php echo $websitekey; ?>" type="text/css" />'."\n";
+	$tplcontent.= '<!-- Include HTML header from common file -->'."\n";
+	$tplcontent.= '<?php print preg_replace(\'/<\/?html>/ims\', \'\', file_get_contents(DOL_DATA_ROOT."/website/".$websitekey."/htmlheader.html")); ?>'."\n";
+	$tplcontent.= '<!-- Include HTML header from page header block -->'."\n";
+	$tplcontent.= preg_replace('/<\/?html>/ims', '', $objectpage->htmlheader)."\n";
+	$tplcontent.= '</head>'."\n";
+
+	$tplcontent.= '<!-- File generated by Dolibarr website module editor -->'."\n";
+	$tplcontent.= '<body id="bodywebsite" class="bodywebsite">'."\n";
+	$tplcontent.= $objectpage->content."\n";
+	$tplcontent.= '</body>'."\n";
+	$tplcontent.= '</html>'."\n";
+
+	$tplcontent.= '<?php // BEGIN PHP'."\n";
+	$tplcontent.= '$tmp = ob_get_contents(); ob_end_clean(); dolWebsiteOutput($tmp, "html", '.$objectpage->id.');'."\n";
+	$tplcontent.= "// END PHP ?>"."\n";
+
+	//var_dump($filetpl);exit;
+	$result = file_put_contents($filetpl, $tplcontent);
+	if (! empty($conf->global->MAIN_UMASK))
+		@chmod($filetpl, octdec($conf->global->MAIN_UMASK));
+
+		return $result;
+}
+
+
+/**
+ * Save content of the index.php and wrapper.php page
+ *
+ * @param	string		$pathofwebsite			Path of website root
+ * @param	string		$fileindex				Full path of file index.php
+ * @param	string		$filetpl				File tpl to index.php page redirect to
+ * @param	string		$filewrapper			Full path of file wrapper.php
+ * @return	boolean								True if OK
+ */
+function dolSaveIndexPage($pathofwebsite, $fileindex, $filetpl, $filewrapper)
+{
+	global $conf;
+
+	$result1=false;
+	$result2=false;
+
+	dol_mkdir($pathofwebsite);
+
+	dol_delete_file($fileindex);
+	$indexcontent = '<?php'."\n";
+	$indexcontent.= "// BEGIN PHP File generated to provide an index.php as Home Page or alias redirector - DO NOT MODIFY - It is just a generated wrapper.\n";
+	$indexcontent.= '$websitekey=basename(__DIR__); if (empty($websitepagefile)) $websitepagefile=__FILE__;'."\n";
+	$indexcontent.= "if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once './master.inc.php'; } // Load master if not already loaded\n";
+	$indexcontent.= 'if (! empty($_GET[\'pageref\']) || ! empty($_GET[\'pagealiasalt\']) || ! empty($_GET[\'pageid\'])) {'."\n";
+	$indexcontent.= "	require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';\n";
+	$indexcontent.= "	require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';\n";
+	$indexcontent.= '	redirectToContainer($_GET[\'pageref\'], $_GET[\'pagealiasalt\'], $_GET[\'pageid\']);'."\n";
+	$indexcontent.= "}\n";
+	$indexcontent.= "include_once './".basename($filetpl)."'\n";
+	$indexcontent.= '// END PHP ?>'."\n";
+	$result1 = file_put_contents($fileindex, $indexcontent);
+	if (! empty($conf->global->MAIN_UMASK))
+		@chmod($fileindex, octdec($conf->global->MAIN_UMASK));
+
+		dol_delete_file($filewrapper);
+
+		$wrappercontent=file_get_contents(DOL_DOCUMENT_ROOT.'/website/samples/wrapper.html');
+
+		$result2 = file_put_contents($filewrapper, $wrappercontent);
+		if (! empty($conf->global->MAIN_UMASK))
+			@chmod($filewrapper, octdec($conf->global->MAIN_UMASK));
+
+			return ($result1 && $result2);
+}
+
+
+/**
+ * Save content of a page on disk
+ *
+ * @param	string		$filehtmlheader		Full path of filename to generate
+ * @param	string		$htmlheadercontent	Content of file
+ * @return	boolean							True if OK
+ */
+function dolSaveHtmlHeader($filehtmlheader, $htmlheadercontent)
+{
+	global $conf, $pathofwebsite;
+
+	dol_syslog("Save html header into ".$filehtmlheader);
+
+	dol_mkdir($pathofwebsite);
+	$result = file_put_contents($filehtmlheader, $htmlheadercontent);
+	if (! empty($conf->global->MAIN_UMASK))
+		@chmod($filehtmlheader, octdec($conf->global->MAIN_UMASK));
+
+		if (! $result)
+		{
+			setEventMessages('Failed to write file '.$filehtmlheader, null, 'errors');
+			return false;
+		}
+
+		return true;
+}
+
+/**
+ * Save content of a page on disk
+ *
+ * @param	string		$filecss			Full path of filename to generate
+ * @param	string		$csscontent			Content of file
+ * @return	boolean							True if OK
+ */
+function dolSaveCssFile($filecss, $csscontent)
+{
+	global $conf, $pathofwebsite;
+
+	dol_syslog("Save css file into ".$filecss);
+
+	dol_mkdir($pathofwebsite);
+	$result = file_put_contents($filecss, $csscontent);
+	if (! empty($conf->global->MAIN_UMASK))
+		@chmod($filecss, octdec($conf->global->MAIN_UMASK));
+
+		if (! $result)
+		{
+			setEventMessages('Failed to write file '.$filecss, null, 'errors');
+			return false;
+		}
+
+		return true;
+}
+
+/**
+ * Save content of a page on disk
+ *
+ * @param	string		$filejs				Full path of filename to generate
+ * @param	string		$jscontent			Content of file
+ * @return	boolean							True if OK
+ */
+function dolSaveJsFile($filejs, $jscontent)
+{
+	global $conf, $pathofwebsite;
+
+	dol_syslog("Save js file into ".$filejs);
+
+	dol_mkdir($pathofwebsite);
+	$result = file_put_contents($filejs, $jscontent);
+	if (! empty($conf->global->MAIN_UMASK))
+		@chmod($filejs, octdec($conf->global->MAIN_UMASK));
+
+		if (! $result)
+		{
+			setEventMessages('Failed to write file '.$filejs, null, 'errors');
+			return false;
+		}
+
+		return true;
+}
+
+/**
+ * Save content of a page on disk
+ *
+ * @param	string		$filerobot			Full path of filename to generate
+ * @param	string		$robotcontent		Content of file
+ * @return	boolean							True if OK
+ */
+function dolSaveRobotFile($filerobot, $robotcontent)
+{
+	global $conf, $pathofwebsite;
+
+	dol_syslog("Save robot file into ".$filerobot);
+
+	dol_mkdir($pathofwebsite);
+	$result = file_put_contents($filerobot, $robotcontent);
+	if (! empty($conf->global->MAIN_UMASK))
+		@chmod($filerobot, octdec($conf->global->MAIN_UMASK));
+
+		if (! $result)
+		{
+			setEventMessages('Failed to write file '.$filerobot, null, 'errors');
+			return false;
+		}
+
+		return true;
+}
+
+/**
+ * Save content of a page on disk
+ *
+ * @param	string		$filehtaccess		Full path of filename to generate
+ * @param	string		$htaccess			Content of file
+ * @return	boolean							True if OK
+ */
+function dolSaveHtaccessFile($filehtaccess, $htaccess)
+{
+	global $conf, $pathofwebsite;
+
+	dol_syslog("Save htaccess file into ".$filehtaccess);
+
+	dol_mkdir($pathofwebsite);
+	$result = file_put_contents($filehtaccess, $htaccess);
+	if (! empty($conf->global->MAIN_UMASK))
+		@chmod($filehtaccess, octdec($conf->global->MAIN_UMASK));
+
+		if (! $result)
+		{
+			setEventMessages('Failed to write file '.$filehtaccess, null, 'errors');
+			return false;
+		}
+
+		return true;
+}
+
+/**
+ * Save content of a page on disk
+ *
+ * @param	string		$file				Full path of filename to generate
+ * @param	string		$content			Content of file
+ * @return	boolean							True if OK
+ */
+function dolSaveManifestJson($file, $content)
+{
+	global $conf, $pathofwebsite;
+
+	dol_syslog("Save manifest.js.php file into ".$file);
+
+	dol_mkdir($pathofwebsite);
+	$result = file_put_contents($file, $content);
+	if (! empty($conf->global->MAIN_UMASK))
+		@chmod($file, octdec($conf->global->MAIN_UMASK));
+
+		if (! $result)
+		{
+			setEventMessages('Failed to write file '.$file, null, 'errors');
+			return false;
+		}
+
+		return true;
+}
+
+
+
+/**
+ * 	Show list of themes. Show all thumbs of themes
+ *
+ *	@param	Website		$website		Object website to load the tempalte into
+ * 	@return	void
+ */
+function showWebsiteTemplates(Website $website)
+{
+	global $conf,$langs,$db,$form;
+	global $bc;
+
+	$dirthemes=array('/doctemplates/websites');
+	if (! empty($conf->modules_parts['websitetemplates']))		// Using this feature slow down application
+	{
+		foreach($conf->modules_parts['websitetemplates'] as $reldir)
+		{
+			$dirthemes=array_merge($dirthemes, (array) ($reldir.'doctemplates/websites'));
+		}
+	}
+	$dirthemes=array_unique($dirthemes);
+	// Now dir_themes=array('/themes') or dir_themes=array('/theme','/mymodule/theme')
+
+	$colspan=2;
+
+	$thumbsbyrow=6;
+	print '<table class="noborder" width="100%">';
+
+	// Title
+	print '<tr class="liste_titre"><th class="titlefield"></th>';
+	print '<th class="right">';
+	$url='https://www.dolistore.com/43-web-site-templates';
+	print '<a href="'.$url.'" target="_blank">';
+	print $langs->trans('DownloadMoreSkins');
+	print '</a>';
+	print '</th></tr>';
+
+	print '<tr>';
+	print '<td>'.$langs->trans("ThemeDir").'</td>';
+	print '<td>';
+	foreach($dirthemes as $dirtheme)
+	{
+		echo '"'.$dirtheme.'" ';
+	}
+	print '</td>';
+	print '</tr>';
+
+	print '<tr><td colspan="'.$colspan.'">';
+
+	print '<table class="nobordernopadding" width="100%"><tr><td><div class="center">';
+
+	$i=0;
+	foreach($dirthemes as $dir)
+	{
+		//print $dirroot.$dir;exit;
+		$dirtheme=DOL_DATA_ROOT.$dir;	// This include loop on $conf->file->dol_document_root
+		if (is_dir($dirtheme))
+		{
+			$handle=opendir($dirtheme);
+			if (is_resource($handle))
+			{
+				while (($subdir = readdir($handle))!==false)
+				{
+					if (is_file($dirtheme."/".$subdir) && substr($subdir, 0, 1) <> '.'
+						&& substr($subdir, 0, 3) <> 'CVS' && preg_match('/\.zip$/i', $subdir))
+					{
+						$subdirwithoutzip = preg_replace('/\.zip$/i', '', $subdir);
+
+						// Disable not stable themes (dir ends with _exp or _dev)
+						if ($conf->global->MAIN_FEATURES_LEVEL < 2 && preg_match('/_dev$/i', $subdir)) continue;
+						if ($conf->global->MAIN_FEATURES_LEVEL < 1 && preg_match('/_exp$/i', $subdir)) continue;
+
+						print '<div class="inline-block" style="margin-top: 10px; margin-bottom: 10px; margin-right: 20px; margin-left: 20px;">';
+
+						$file=$dirtheme."/".$subdirwithoutzip.".jpg";
+						$url=DOL_URL_ROOT.'/viewimage.php?modulepart=doctemplateswebsite&file='.$subdirwithoutzip.".jpg";
+
+						if (! file_exists($file)) $url=DOL_URL_ROOT.'/public/theme/common/nophoto.png';
+						print '<img src="'.$url.'" border="0" width="80" height="60" alt="'.$title.'" title="'.$title.'" style="margin-bottom: 5px;">';
+						print '<br>';
+						print $subdir.' ('.dol_print_size(dol_filesize($dirtheme."/".$subdir), 1, 1).')';
+						print '<br><a href="'.$_SERVER["PHP_SELF"].'?action=importsiteconfirm&website='.$website->ref.'&templateuserfile='.$subdir.'" class="button">'.$langs->trans("Load").'</a>';
+						print '</div>';
+
+						$i++;
+					}
+				}
+			}
+		}
+	}
+
+	print '</div></td></tr></table>';
+
+	print '</td></tr>';
+	print '</table>';
+}
diff --git a/htdocs/core/modules/cheque/doc/pdf_blochet.class.php b/htdocs/core/modules/cheque/doc/pdf_blochet.class.php
index 80876747d59..f2ef19ca19a 100644
--- a/htdocs/core/modules/cheque/doc/pdf_blochet.class.php
+++ b/htdocs/core/modules/cheque/doc/pdf_blochet.class.php
@@ -252,7 +252,7 @@ class BordereauChequeBlochet extends ModeleChequeReceipts
         $pdf->MultiCell(22, 2, $outputlangs->transnoentities("Owner"), 0, 'L');
 		$pdf->SetFont('', '', $default_font_size);
         $pdf->SetXY(32, 26);
-        $pdf->MultiCell(60, 2, $outputlangs->convToOutputCharset($this->account->proprio), 0, 'L');
+        $pdf->MultiCell(80, 2, $outputlangs->convToOutputCharset($this->account->proprio), 0, 'L');
 
 		$pdf->SetFont('', '', $default_font_size);
         $pdf->SetXY(10, 32);
diff --git a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
index 519e2a3a19e..a885ebb536a 100644
--- a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
@@ -1227,7 +1227,7 @@ class pdf_einstein extends ModelePDFCommandes
 	 *  @param  int	    	$showaddress    0=no, 1=yes
 	 *  @param  Translate	$outputlangs	Object lang for output
 	 *  @param	string		$titlekey		Translation key to show as title of document
-	 *  @return	void
+	 *  @return	int                         Return topshift value
 	 */
 	protected function _pagehead(&$pdf, $object, $showaddress, $outputlangs, $titlekey = "PdfOrderTitle")
 	{
diff --git a/htdocs/core/modules/commande/doc/pdf_proforma.modules.php b/htdocs/core/modules/commande/doc/pdf_proforma.modules.php
index 2adec21a865..b6c7fe6d78f 100644
--- a/htdocs/core/modules/commande/doc/pdf_proforma.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_proforma.modules.php
@@ -67,13 +67,13 @@ class pdf_proforma extends pdf_einstein
 	 *  @param  int	    	$showaddress    0=no, 1=yes
 	 *  @param  Translate	$outputlangs	Object lang for output
 	 *  @param	string		$titlekey		Translation key to show as title of document
-	 *  @return	void
+	 *  @return	int                         Return topshift value
 	 */
 	protected function _pagehead(&$pdf, $object, $showaddress, $outputlangs, $titlekey = "InvoiceProForma")
 	{
 		// phpcs:enable
 		global $conf,$langs,$hookmanager;
 
-		parent::_pagehead($pdf, $object, $showaddress, $outputlangs, $titlekey);
+		return parent::_pagehead($pdf, $object, $showaddress, $outputlangs, $titlekey);
 	}
 }
diff --git a/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php b/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
index fa32d3df0d2..936eabeadda 100644
--- a/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
+++ b/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
@@ -136,12 +136,12 @@ class pdf_soleil extends ModelePDFFicheinter
 		$this->marge_haute =isset($conf->global->MAIN_PDF_MARGIN_TOP)?$conf->global->MAIN_PDF_MARGIN_TOP:10;
 		$this->marge_basse =isset($conf->global->MAIN_PDF_MARGIN_BOTTOM)?$conf->global->MAIN_PDF_MARGIN_BOTTOM:10;
 
-		$this->option_logo = 1;                    // Affiche logo
-		$this->option_tva = 0;                     // Gere option tva FACTURE_TVAOPTION
-		$this->option_modereg = 0;                 // Affiche mode reglement
-		$this->option_condreg = 0;                 // Affiche conditions reglement
-		$this->option_codeproduitservice = 0;      // Affiche code produit-service
-		$this->option_multilang = 1;               // Dispo en plusieurs langues
+		$this->option_logo = 1;                    // Display logo
+		$this->option_tva = 0;                     // Manage the vat option FACTURE_TVAOPTION
+		$this->option_modereg = 0;                 // Display payment mode
+		$this->option_condreg = 0;                 // Display payment terms
+		$this->option_codeproduitservice = 0;      // Display product-service code
+		$this->option_multilang = 1;               // Available in several languages
 		$this->option_draft_watermark = 1;		   //Support add of a watermark on drafts
 
 		// Get source company
diff --git a/htdocs/core/modules/import/import_csv.modules.php b/htdocs/core/modules/import/import_csv.modules.php
index 0a60d9dc0ae..606b23e2767 100644
--- a/htdocs/core/modules/import/import_csv.modules.php
+++ b/htdocs/core/modules/import/import_csv.modules.php
@@ -581,8 +581,27 @@ class ImportCsv extends ModeleImports
                                     if (is_numeric($defaultref) && $defaultref <= 0) $defaultref='';
                                     $newval=$defaultref;
                                 }
-
-
+                                elseif ($objimport->array_import_convertvalue[0][$val]['rule']=='compute')
+                                {
+                                    $file=(empty($objimport->array_import_convertvalue[0][$val]['classfile'])?$objimport->array_import_convertvalue[0][$val]['file']:$objimport->array_import_convertvalue[0][$val]['classfile']);
+                                    $class=$objimport->array_import_convertvalue[0][$val]['class'];
+                                    $method=$objimport->array_import_convertvalue[0][$val]['method'];
+                                    $resultload = dol_include_once($file);
+                                    if (empty($resultload))
+                                    {
+                                        dol_print_error('', 'Error trying to call file='.$file.', class='.$class.', method='.$method);
+                                        break;
+                                    }
+                                    $classinstance=new $class($this->db);
+                                    $res = call_user_func_array(array($classinstance, $method), array(&$arrayrecord));
+                                    if ($res<0) {
+                                        if (!empty($objimport->array_import_convertvalue[0][$val]['dict'])) $this->errors[$error]['lib']=$langs->trans('ErrorFieldValueNotIn', $key, $newval, 'code', $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['dict']));
+                                        else $this->errors[$error]['lib']='ErrorFieldValueNotIn';
+                                        $this->errors[$error]['type']='FOREIGNKEY';
+                                        $errorforthistable++;
+                                        $error++;
+                                    }
+                                }
                                 elseif ($objimport->array_import_convertvalue[0][$val]['rule']=='numeric')
                                 {
                                     $newval = price2num($newval);
diff --git a/htdocs/core/modules/import/import_xlsx.modules.php b/htdocs/core/modules/import/import_xlsx.modules.php
index 10b2a5662f3..66670247a4c 100644
--- a/htdocs/core/modules/import/import_xlsx.modules.php
+++ b/htdocs/core/modules/import/import_xlsx.modules.php
@@ -608,8 +608,27 @@ class ImportXlsx extends ModeleImports
                                     if (is_numeric($defaultref) && $defaultref <= 0) $defaultref='';
                                     $newval=$defaultref;
                                 }
-
-
+                                elseif ($objimport->array_import_convertvalue[0][$val]['rule']=='compute')
+                                {
+                                    $file=(empty($objimport->array_import_convertvalue[0][$val]['classfile'])?$objimport->array_import_convertvalue[0][$val]['file']:$objimport->array_import_convertvalue[0][$val]['classfile']);
+                                    $class=$objimport->array_import_convertvalue[0][$val]['class'];
+                                    $method=$objimport->array_import_convertvalue[0][$val]['method'];
+                                    $resultload = dol_include_once($file);
+                                    if (empty($resultload))
+                                    {
+                                        dol_print_error('', 'Error trying to call file='.$file.', class='.$class.', method='.$method);
+                                        break;
+                                    }
+                                    $classinstance=new $class($this->db);
+                                    $res = call_user_func_array(array($classinstance, $method), array(&$arrayrecord));
+                                    if ($res<0) {
+                                        if (!empty($objimport->array_import_convertvalue[0][$val]['dict'])) $this->errors[$error]['lib']=$langs->trans('ErrorFieldValueNotIn', $key, $newval, 'code', $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['dict']));
+                                        else $this->errors[$error]['lib']='ErrorFieldValueNotIn';
+                                        $this->errors[$error]['type']='FOREIGNKEY';
+                                        $errorforthistable++;
+                                        $error++;
+                                    }
+                                }
                                 elseif ($objimport->array_import_convertvalue[0][$val]['rule']=='numeric')
                                 {
                                     $newval = price2num($newval);
@@ -622,7 +641,7 @@ class ImportXlsx extends ModeleImports
 							if (! empty($objimport->array_import_regex[0][$val]) && ($newval != ''))
 							{
 								// If test is "Must exist in a field@table or field@table:..."
-								if (preg_match('/^(.+)@([^:]+)(:.+)?$/',$objimport->array_import_regex[0][$val],$reg))
+								if (preg_match('/^(.+)@([^:]+)(:.+)?$/', $objimport->array_import_regex[0][$val], $reg))
 								{
 									$field=$reg[1];
 									$table=$reg[2];
diff --git a/htdocs/core/modules/livraison/doc/pdf_typhon.modules.php b/htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
index 0a339a9a61f..fcb5ef8433e 100644
--- a/htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
+++ b/htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
@@ -139,9 +139,9 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 		$this->marge_haute =isset($conf->global->MAIN_PDF_MARGIN_TOP)?$conf->global->MAIN_PDF_MARGIN_TOP:10;
 		$this->marge_basse =isset($conf->global->MAIN_PDF_MARGIN_BOTTOM)?$conf->global->MAIN_PDF_MARGIN_BOTTOM:10;
 
-		$this->option_logo = 1;                    // Affiche logo FAC_PDF_LOGO
-		$this->option_tva = 1;                     // Gere option tva FACTURE_TVAOPTION
-		$this->option_codeproduitservice = 1;      // Affiche code produit-service
+		$this->option_logo = 1;                    // Display logo FAC_PDF_LOGO
+		$this->option_tva = 1;                     // Manage the vat option FACTURE_TVAOPTION
+		$this->option_codeproduitservice = 1;      // Display product-service code
 
 		$this->franchise=!$mysoc->tva_assuj;
 
diff --git a/htdocs/core/modules/project/doc/pdf_beluga.modules.php b/htdocs/core/modules/project/doc/pdf_beluga.modules.php
index 1d7e3d983fb..381d68c16d2 100644
--- a/htdocs/core/modules/project/doc/pdf_beluga.modules.php
+++ b/htdocs/core/modules/project/doc/pdf_beluga.modules.php
@@ -438,7 +438,7 @@ class pdf_beluga extends ModelePDFProjects
                             $pdf->MultiCell($this->posxstatut - $this->posxamountht, 3, "", 1, 'R');
                         }
                         $pdf->SetXY($this->posxstatut, $curY);
-                        $pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->posxstatut, 3, $outputlangs->transnoentities("Statut"), 1, 'R');
+                        $pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->posxstatut, 3, $outputlangs->transnoentities("Status"), 1, 'R');
 
                         if (is_array($elementarray) && count($elementarray) > 0)
                         {
diff --git a/htdocs/core/tpl/login.tpl.php b/htdocs/core/tpl/login.tpl.php
index ceebe454cfb..764f056ad15 100644
--- a/htdocs/core/tpl/login.tpl.php
+++ b/htdocs/core/tpl/login.tpl.php
@@ -209,7 +209,10 @@ if ($captcha) {
 <div id="login_line2" style="clear: both">
 
 <!-- Button Connection -->
-<br><input type="submit" class="button" value="&nbsp; <?php echo $langs->trans('Connection'); ?> &nbsp;" tabindex="5" />
+<br>
+<div id="login-submit-wrapper">
+<input type="submit" class="button" value="&nbsp; <?php echo $langs->trans('Connection'); ?> &nbsp;" tabindex="5" />
+</div>
 
 <?php
 if ($forgetpasslink || $helpcenterlink)
@@ -221,7 +224,7 @@ if ($forgetpasslink || $helpcenterlink)
 	if ($dol_use_jmobile)    $moreparam.=(strpos($moreparam, '?')===false?'?':'&').'dol_use_jmobile='.$dol_use_jmobile;
 
 	echo '<br>';
-	echo '<div class="center" style="margin-top: 15px;">';
+	echo '<div class="center" style="margin-top: 5px;">';
 	if ($forgetpasslink) {
 		$url=DOL_URL_ROOT.'/user/passwordforgotten.php'.$moreparam;
 		if (! empty($conf->global->MAIN_PASSWORD_FORGOTLINK)) $url=$conf->global->MAIN_PASSWORD_FORGOTLINK;
diff --git a/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php b/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
index 2c5c27bc939..5fe00b80346 100644
--- a/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
+++ b/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
@@ -114,8 +114,8 @@ class InterfaceWorkflowManager extends DolibarrTriggers
 					    if ($element->statut == Propal::STATUS_SIGNED || $element->statut == Propal::STATUS_BILLED) $totalonlinkedelements += $element->total_ht;
 					}
 					dol_syslog("Amount of linked proposals = ".$totalonlinkedelements.", of order = ".$object->total_ht.", egality is ".($totalonlinkedelements == $object->total_ht));
-					if ( ($totalonlinkedelements == $object->total_ht) || (! empty($conf->global->WORKFLOW_CLASSIFY_IF_AMOUNTS_ARE_DIFFERENTS)) )
-					{
+                    if ($this->shouldClassify($conf, $totalonlinkedelements, $object->total_ht))
+                    {
     					foreach($object->linkedObjects['propal'] as $element)
     					{
     					    $ret=$element->classifyBilled($user);
@@ -130,7 +130,8 @@ class InterfaceWorkflowManager extends DolibarrTriggers
         if ($action == 'BILL_VALIDATE')
         {
         	dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-
+        	$ret = 0;
+        	
 			// First classify billed the order to allow the proposal classify process
 			if (! empty($conf->commande->enabled) && ! empty($conf->workflow->enabled) && ! empty($conf->global->WORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER))
         	{
@@ -143,7 +144,7 @@ class InterfaceWorkflowManager extends DolibarrTriggers
         		        if ($element->statut == Commande::STATUS_VALIDATED || $element->statut == Commande::STATUS_SHIPMENTONPROCESS || $element->statut == Commande::STATUS_CLOSED) $totalonlinkedelements += $element->total_ht;
         		    }
         		    dol_syslog("Amount of linked orders = ".$totalonlinkedelements.", of invoice = ".$object->total_ht.", egality is ".($totalonlinkedelements == $object->total_ht));
-        		    if ( ($totalonlinkedelements == $object->total_ht) || (! empty($conf->global->WORKFLOW_CLASSIFY_IF_AMOUNTS_ARE_DIFFERENTS)) )
+                    if ($this->shouldClassify($conf, $totalonlinkedelements, $object->total_ht))
         		    {
         		        foreach($object->linkedObjects['commande'] as $element)
         		        {
@@ -151,7 +152,6 @@ class InterfaceWorkflowManager extends DolibarrTriggers
         		        }
         		    }
         		}
-        		return $ret;
         	}
 
 			// Second classify billed the proposal.
@@ -166,7 +166,7 @@ class InterfaceWorkflowManager extends DolibarrTriggers
         		        if ($element->statut == Propal::STATUS_SIGNED || $element->statut == Propal::STATUS_BILLED) $totalonlinkedelements += $element->total_ht;
         		    }
         		    dol_syslog("Amount of linked proposals = ".$totalonlinkedelements.", of invoice = ".$object->total_ht.", egality is ".($totalonlinkedelements == $object->total_ht));
-        		    if ( ($totalonlinkedelements == $object->total_ht) || (! empty($conf->global->WORKFLOW_CLASSIFY_IF_AMOUNTS_ARE_DIFFERENTS)) )
+                    if ($this->shouldClassify($conf, $totalonlinkedelements, $object->total_ht))
         		    {
         		        foreach($object->linkedObjects['propal'] as $element)
         		        {
@@ -174,8 +174,9 @@ class InterfaceWorkflowManager extends DolibarrTriggers
         		        }
         		    }
         		}
-        		return $ret;
         	}
+        	
+        	return $ret;
         }
 
         // classify billed order & billed propososal
@@ -195,8 +196,8 @@ class InterfaceWorkflowManager extends DolibarrTriggers
         				if ($element->statut == CommandeFournisseur::STATUS_ACCEPTED || $element->statut == CommandeFournisseur::STATUS_ORDERSENT || $element->statut == CommandeFournisseur::STATUS_RECEIVED_PARTIALLY || $element->statut == CommandeFournisseur::STATUS_RECEIVED_COMPLETELY) $totalonlinkedelements += $element->total_ht;
         			}
         			dol_syslog("Amount of linked orders = ".$totalonlinkedelements.", of invoice = ".$object->total_ht.", egality is ".($totalonlinkedelements == $object->total_ht));
-        			if ( ($totalonlinkedelements == $object->total_ht) || (! empty($conf->global->WORKFLOW_CLASSIFY_IF_AMOUNTS_ARE_DIFFERENTS)) )
-        			{
+                    if ($this->shouldClassify($conf, $totalonlinkedelements, $object->total_ht))
+					{
         				foreach($object->linkedObjects['order_supplier'] as $element)
         				{
         					$ret=$element->classifyBilled($user);
@@ -218,7 +219,7 @@ class InterfaceWorkflowManager extends DolibarrTriggers
         				if ($element->statut == SupplierProposal::STATUS_SIGNED || $element->statut == SupplierProposal::STATUS_BILLED) $totalonlinkedelements += $element->total_ht;
         			}
         			dol_syslog("Amount of linked supplier proposals = ".$totalonlinkedelements.", of supplier invoice = ".$object->total_ht.", egality is ".($totalonlinkedelements == $object->total_ht));
-        			if ( ($totalonlinkedelements == $object->total_ht) || (! empty($conf->global->WORKFLOW_CLASSIFY_IF_AMOUNTS_ARE_DIFFERENTS)) )
+                    if ($this->shouldClassify($conf, $totalonlinkedelements, $object->total_ht))
         			{
         				foreach($object->linkedObjects['supplier_proposal'] as $element)
         				{
@@ -246,7 +247,7 @@ class InterfaceWorkflowManager extends DolibarrTriggers
                         if ($element->statut == Commande::STATUS_VALIDATED || $element->statut == Commande::STATUS_SHIPMENTONPROCESS || $element->statut == Commande::STATUS_CLOSED) $totalonlinkedelements += $element->total_ht;
                     }
                     dol_syslog("Amount of linked orders = ".$totalonlinkedelements.", of invoice = ".$object->total_ht.", egality is ".($totalonlinkedelements == $object->total_ht));
-                    if ( ($totalonlinkedelements == $object->total_ht) || (! empty($conf->global->WORKFLOW_CLASSIFY_IF_AMOUNTS_ARE_DIFFERENTS)) )
+                    if ($this->shouldClassify($conf, $totalonlinkedelements, $object->total_ht))
                     {
                         foreach($object->linkedObjects['commande'] as $element)
                         {
@@ -345,4 +346,24 @@ class InterfaceWorkflowManager extends DolibarrTriggers
 
         return 0;
     }
+
+    /**
+     * @param Object $conf                  Dolibarr settings object
+     * @param float $totalonlinkedelements  Sum of total amounts (excl VAT) of
+     *                                      invoices linked to $object
+     * @param float $object_total_ht        The total amount (excl VAT) of the object
+     *                                      (an order, a proposal, a bill, etc.)
+     * @return bool  True if the amounts are equal (rounded on total amount)
+     *               True if the module is configured to skip the amount equality check
+     *               False otherwise.
+     */
+    private function shouldClassify($conf, $totalonlinkedelements, $object_total_ht)
+    {
+        // if the configuration allows unmatching amounts, allow classification anyway
+        if (!empty($conf->global->WORKFLOW_CLASSIFY_IF_AMOUNTS_ARE_DIFFERENTS)) {
+            return true;
+        }
+        // if the amount are same, allow classification, else deny
+        return (price2num($totalonlinkedelements, 'MT') == price2num($object_total_ht, 'MT'));
+    }
 }
diff --git a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
index bdd07c4e38d..07499ac8893 100644
--- a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
+++ b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
@@ -649,12 +649,20 @@ class InterfaceActionsAuto extends DolibarrTriggers
             // Load translation files required by the page
             $langs->loadLangs(array("agenda","other","members"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("MemberSubscriptionAddedInDolibarr", $object->ref, $object->getFullName($langs));
-            $object->actionmsg=$langs->transnoentities("MemberSubscriptionAddedInDolibarr", $object->ref, $object->getFullName($langs));
-            $object->actionmsg.="\n".$langs->transnoentities("Member").': '.$object->getFullName($langs);
-            $object->actionmsg.="\n".$langs->transnoentities("Type").': '.$object->type;
-            $object->actionmsg.="\n".$langs->transnoentities("Amount").': '.$object->last_subscription_amount;
-            $object->actionmsg.="\n".$langs->transnoentities("Period").': '.dol_print_date($object->last_subscription_date_start, 'day').' - '.dol_print_date($object->last_subscription_date_end, 'day');
+            $member = $this->context['member'];
+            if (! is_object($member))	// This should not happen
+            {
+	            include_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
+	            $member = new Adherent($this->db);
+	            $member->fetch($this->fk_adherent);
+            }
+
+            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("MemberSubscriptionAddedInDolibarr", $object->id, $member->getFullName($langs));
+            $object->actionmsg=$langs->transnoentities("MemberSubscriptionAddedInDolibarr", $object->id, $member->getFullName($langs));
+            $object->actionmsg.="\n".$langs->transnoentities("Member").': '.$member->getFullName($langs);
+            $object->actionmsg.="\n".$langs->transnoentities("Type").': '.$object->fk_type;
+            $object->actionmsg.="\n".$langs->transnoentities("Amount").': '.$object->amount;
+            $object->actionmsg.="\n".$langs->transnoentities("Period").': '.dol_print_date($object->dateh, 'day').' - '.dol_print_date($object->datef, 'day');
 
 			$object->sendtoid=0;
 			if ($object->fk_soc > 0) $object->socid=$object->fk_soc;
@@ -664,12 +672,20 @@ class InterfaceActionsAuto extends DolibarrTriggers
         	// Load translation files required by the page
             $langs->loadLangs(array("agenda","other","members"));
 
-        	if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("MemberSubscriptionModifiedInDolibarr", $object->ref, $object->getFullName($langs));
-        	$object->actionmsg=$langs->transnoentities("MemberSubscriptionModifiedInDolibarr", $object->ref, $object->getFullName($langs));
-        	$object->actionmsg.="\n".$langs->transnoentities("Member").': '.$object->getFullName($langs);
-        	$object->actionmsg.="\n".$langs->transnoentities("Type").': '.$object->type;
-        	$object->actionmsg.="\n".$langs->transnoentities("Amount").': '.$object->last_subscription_amount;
-        	$object->actionmsg.="\n".$langs->transnoentities("Period").': '.dol_print_date($object->last_subscription_date_start, 'day').' - '.dol_print_date($object->last_subscription_date_end, 'day');
+            $member = $this->context['member'];
+            if (! is_object($member))	// This should not happen
+            {
+            	include_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
+            	$member = new Adherent($this->db);
+            	$member->fetch($this->fk_adherent);
+            }
+
+            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("MemberSubscriptionModifiedInDolibarr", $object->id, $member->getFullName($langs));
+        	$object->actionmsg=$langs->transnoentities("MemberSubscriptionModifiedInDolibarr", $object->id, $member->getFullName($langs));
+        	$object->actionmsg.="\n".$langs->transnoentities("Member").': '.$member->getFullName($langs);
+        	$object->actionmsg.="\n".$langs->transnoentities("Type").': '.$object->fk_type;
+        	$object->actionmsg.="\n".$langs->transnoentities("Amount").': '.$object->amount;
+        	$object->actionmsg.="\n".$langs->transnoentities("Period").': '.dol_print_date($object->dateh, 'day').' - '.dol_print_date($object->datef, 'day');
 
         	$object->sendtoid=0;
         	if ($object->fk_soc > 0) $object->socid=$object->fk_soc;
diff --git a/htdocs/core/website.inc.php b/htdocs/core/website.inc.php
index 138f96fc7f3..cf9b76a7be1 100644
--- a/htdocs/core/website.inc.php
+++ b/htdocs/core/website.inc.php
@@ -94,5 +94,11 @@ if ($_SERVER['PHP_SELF'] != DOL_URL_ROOT.'/website/index.php')	// If we browsing
 	}
 }
 
-// Load websitepage class
-include_once DOL_DOCUMENT_ROOT.'/website/class/websitepage.class.php';
+// Show off line message
+if (! defined('USEDOLIBARREDITOR') && empty($website->status))
+{
+	$weblangs->load("website");
+	http_response_code(503);
+	print '<center><br><br>'.$weblangs->trans("SorryWebsiteIsCurrentlyOffLine").'</center>';
+	exit;
+}
diff --git a/htdocs/debugbar/class/TraceableDB.php b/htdocs/debugbar/class/TraceableDB.php
index 775c2a7c300..db84d3f9fd0 100644
--- a/htdocs/debugbar/class/TraceableDB.php
+++ b/htdocs/debugbar/class/TraceableDB.php
@@ -143,7 +143,7 @@ class TraceableDB extends DoliDB
 	 */
 	public static function convertSQLFromMysql($line, $type = 'ddl')
 	{
-		return $this->db->convertSQLFromMysql($line);
+		return self::$db->convertSQLFromMysql($line);
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index 97c67fd7701..6200b14ce19 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -353,7 +353,7 @@ class Expedition extends CommonObject
 				{
 					if (! isset($this->lines[$i]->detail_batch))
 					{	// no batch management
-						if (! $this->create_line($this->lines[$i]->entrepot_id, $this->lines[$i]->origin_line_id, $this->lines[$i]->qty, $this->lines[$i]->array_options) > 0)
+						if (! $this->create_line($this->lines[$i]->entrepot_id, $this->lines[$i]->origin_line_id, $this->lines[$i]->qty, $this->lines[$i]->rang, $this->lines[$i]->array_options) > 0)
 						{
 							$error++;
 						}
@@ -441,10 +441,11 @@ class Expedition extends CommonObject
 	 * @param 	int		$entrepot_id		Id of warehouse
 	 * @param 	int		$origin_line_id		Id of source line
 	 * @param 	int		$qty				Quantity
+	 * @param 	int		$rang				Rang
 	 * @param	array	$array_options		extrafields array
 	 * @return	int							<0 if KO, line_id if OK
 	 */
-	public function create_line($entrepot_id, $origin_line_id, $qty, $array_options = 0)
+	public function create_line($entrepot_id, $origin_line_id, $qty, $rang, $array_options = 0)
 	{
 		//phpcs:enable
 		global $user;
@@ -454,6 +455,7 @@ class Expedition extends CommonObject
 		$expeditionline->entrepot_id = $entrepot_id;
 		$expeditionline->fk_origin_line = $origin_line_id;
 		$expeditionline->qty = $qty;
+		$expeditionline->rang = $rang;
 		$expeditionline->array_options = $array_options;
 
 		if (($lineId = $expeditionline->insert($user)) < 0)
@@ -490,7 +492,7 @@ class Expedition extends CommonObject
 		// create shipment lines
 		foreach ($stockLocationQty as $stockLocation => $qty)
 		{
-			if (($line_id = $this->create_line($stockLocation, $line_ext->origin_line_id, $qty, $array_options)) < 0)
+			if (($line_id = $this->create_line($stockLocation, $line_ext->origin_line_id, $qty, $line_ext->rang, $array_options)) < 0)
 			{
 				$error++;
 			}
@@ -926,6 +928,9 @@ class Expedition extends CommonObject
 		$orderline = new OrderLine($this->db);
 		$orderline->fetch($id);
 
+		// Copy the rang of the order line to the expedition line
+		$line->rang = $orderline->rang;
+
 		if (! empty($conf->stock->enabled) && ! empty($orderline->fk_product))
 		{
 			$fk_product = $orderline->fk_product;
@@ -1383,7 +1388,7 @@ class Expedition extends CommonObject
 		$sql = "SELECT cd.rowid, cd.fk_product, cd.label as custom_label, cd.description, cd.qty as qty_asked, cd.product_type";
 		$sql.= ", cd.total_ht, cd.total_localtax1, cd.total_localtax2, cd.total_ttc, cd.total_tva";
 		$sql.= ", cd.vat_src_code, cd.tva_tx, cd.localtax1_tx, cd.localtax2_tx, cd.localtax1_type, cd.localtax2_type, cd.info_bits, cd.price, cd.subprice, cd.remise_percent,cd.buy_price_ht as pa_ht";
-		$sql.= ", cd.fk_multicurrency, cd.multicurrency_code, cd.multicurrency_subprice, cd.multicurrency_total_ht, cd.multicurrency_total_tva, cd.multicurrency_total_ttc";
+		$sql.= ", cd.fk_multicurrency, cd.multicurrency_code, cd.multicurrency_subprice, cd.multicurrency_total_ht, cd.multicurrency_total_tva, cd.multicurrency_total_ttc, cd.rang";
 		$sql.= ", ed.rowid as line_id, ed.qty as qty_shipped, ed.fk_origin_line, ed.fk_entrepot";
 		$sql.= ", p.ref as product_ref, p.label as product_label, p.fk_product_type";
 		$sql.= ", p.weight, p.weight_units, p.length, p.length_units, p.surface, p.surface_units, p.volume, p.volume_units, p.tobatch as product_tobatch";
@@ -1452,6 +1457,7 @@ class Expedition extends CommonObject
 				$line->label			= $obj->custom_label;
 				$line->description    	= $obj->description;
 				$line->qty_asked      	= $obj->qty_asked;
+				$line->rang             = $obj->rang;
 				$line->weight         	= $obj->weight;
 				$line->weight_units   	= $obj->weight_units;
 				$line->length         	= $obj->length;
@@ -2459,6 +2465,11 @@ class ExpeditionLigne extends CommonObjectLine
      */
 	public $product_desc;
 
+    /**
+     * @var int rang of line
+     */
+    public $rang;
+
     /**
      * @var float weight
      */
@@ -2579,16 +2590,28 @@ class ExpeditionLigne extends CommonObjectLine
 
 		$this->db->begin();
 
+		if (empty($this->rang)) $this->rang = 0;
+
+		// Rank to use
+		$ranktouse = $this->rang;
+		if ($ranktouse == -1)
+		{
+			$rangmax = $this->line_max($fk_expedition);
+			$ranktouse = $rangmax + 1;
+		}
+
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."expeditiondet (";
 		$sql.= "fk_expedition";
 		$sql.= ", fk_entrepot";
 		$sql.= ", fk_origin_line";
 		$sql.= ", qty";
+		$sql.= ", rang";
 		$sql.= ") VALUES (";
 		$sql.= $this->fk_expedition;
 		$sql.= ", ".(empty($this->entrepot_id) ? 'NULL' : $this->entrepot_id);
 		$sql.= ", ".$this->fk_origin_line;
 		$sql.= ", ".$this->qty;
+		$sql.= ", ".$ranktouse;
 		$sql.= ")";
 
 		dol_syslog(get_class($this)."::insert", LOG_DEBUG);
diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php
index 04044e0ad97..07318bc0571 100644
--- a/htdocs/expensereport/card.php
+++ b/htdocs/expensereport/card.php
@@ -996,6 +996,62 @@ if (empty($reshook))
     	}
     }
 
+    if ($action == 'set_unpaid' && $id > 0 && $user->rights->expensereport->to_paid)
+    {
+    	$object = new ExpenseReport($db);
+    	$object->fetch($id);
+
+    	$result = $object->set_unpaid($user);
+
+    	if ($result > 0)
+    	{
+    		// Define output language
+    		if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
+    		{
+    			$outputlangs = $langs;
+    			$newlang = '';
+    			if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09')) $newlang = GETPOST('lang_id', 'aZ09');
+    			if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $object->thirdparty->default_lang;
+    			if (! empty($newlang)) {
+    				$outputlangs = new Translate("", $conf);
+    				$outputlangs->setDefaultLang($newlang);
+    			}
+    			$model=$object->modelpdf;
+    			$ret = $object->fetch($id); // Reload to get new records
+
+    			$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
+    		}
+    	}
+    }
+
+    if ($action == 'set_unpaid' && $id > 0 && $user->rights->expensereport->to_paid)
+    {
+    	$object = new ExpenseReport($db);
+    	$object->fetch($id);
+
+    	$result = $object->set_unpaid($user);
+
+    	if ($result > 0)
+    	{
+    		// Define output language
+    		if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
+    		{
+    			$outputlangs = $langs;
+    			$newlang = '';
+    			if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09')) $newlang = GETPOST('lang_id', 'aZ09');
+    			if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $object->thirdparty->default_lang;
+    			if (! empty($newlang)) {
+    				$outputlangs = new Translate("", $conf);
+    				$outputlangs->setDefaultLang($newlang);
+    			}
+    			$model=$object->modelpdf;
+    			$ret = $object->fetch($id); // Reload to get new records
+
+    			$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
+    		}
+    	}
+    }
+
     if ($action == 'set_paid' && $id > 0 && $user->rights->expensereport->to_paid)
     {
     	$object = new ExpenseReport($db);
@@ -1679,7 +1735,7 @@ else
 
 				if ($action == 'cancel')
 				{
-					$array_input = array('text'=>$langs->trans("ConfirmCancelTrip"), array('type'=>"text",'label'=>'<strong>'.$langs->trans("Comment").'</strong>','name'=>"detail_cancel",'size'=>"50",'value'=>""));
+					$array_input = array('text'=>$langs->trans("ConfirmCancelTrip"), array('type'=>"text",'label'=>'<strong>'.$langs->trans("Comment").'</strong>','name'=>"detail_cancel",'value'=>""));
 					$formconfirm=$form->formconfirm($_SEVER["PHP_SELF"]."?id=".$id, $langs->trans("Cancel"), "", "confirm_cancel", $array_input, "", 1);
 				}
 
@@ -1690,7 +1746,7 @@ else
 
 				if ($action == 'refuse')		// Deny
 				{
-					$array_input = array('text'=>$langs->trans("ConfirmRefuseTrip"), array('type'=>"text",'label'=>$langs->trans("Comment"),'name'=>"detail_refuse",'size'=>"50",'value'=>""));
+					$array_input = array('text'=>$langs->trans("ConfirmRefuseTrip"), array('type'=>"text",'label'=>$langs->trans("Comment"),'name'=>"detail_refuse",'value'=>""));
 					$formconfirm=$form->formconfirm($_SERVER["PHP_SELF"]."?id=".$id, $langs->trans("Deny"), '', "confirm_refuse", $array_input, "yes", 1);
 				}
 
@@ -1958,7 +2014,7 @@ else
 				if ($resql)
 				{
 				    $num = $db->num_rows($resql);
-				    $i = 0; $total = 0;
+				    $i = 0; $totalpaid = 0;
 				    while ($i < $num)
 				    {
 				        $objp = $db->fetch_object($resql);
@@ -2662,8 +2718,8 @@ if ($action != 'create' && $action != 'edit')
 	}
 
 
-	// If status is Appoved
-	// --------------------
+	// If status is Approved
+	// ---------------------
 
 	if ($user->rights->expensereport->approve && $object->fk_statut == ExpenseReport::STATUS_APPROVED)
 	{
@@ -2707,9 +2763,15 @@ if ($action != 'create' && $action != 'edit')
 	    print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=cancel&id='.$object->id.'">'.$langs->trans('Cancel').'</a></div>';
 	}
 
+	if ($user->rights->expensereport->to_paid && $object->paid && $object->fk_statut == ExpenseReport::STATUS_CLOSED)
+	{
+		// Set unpaid
+		print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=set_unpaid&id='.$object->id.'">'.$langs->trans('ClassifyUnPaid').'</a></div>';
+	}
+
 	// Clone
 	if ($user->rights->expensereport->creer) {
-	    print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?id=' . $object->id . '&amp;action=clone">' . $langs->trans("ToClone") . '</a></div>';
+	    print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?id=' . $object->id . '&action=clone">' . $langs->trans("ToClone") . '</a></div>';
 	}
 
 	/* If draft, validated, cancel, and user can create, he can always delete its card before it is approved */
diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php
index 34f60120925..ae63a132965 100644
--- a/htdocs/expensereport/class/expensereport.class.php
+++ b/htdocs/expensereport/class/expensereport.class.php
@@ -1397,12 +1397,12 @@ class ExpenseReport extends CommonObject
         // phpcs:enable
 		$error = 0;
 
-        if ($this->fk_c_deplacement_statuts != 5)
+		if ($this->paid)
         {
 			$this->db->begin();
 
             $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
-            $sql.= " SET fk_statut = 5";
+            $sql.= " SET paid = 0";
             $sql.= ' WHERE rowid = '.$this->id;
 
             dol_syslog(get_class($this)."::set_unpaid sql=".$sql, LOG_DEBUG);
diff --git a/htdocs/expensereport/payment/card.php b/htdocs/expensereport/payment/card.php
index 73da11f4619..890884b2e37 100644
--- a/htdocs/expensereport/payment/card.php
+++ b/htdocs/expensereport/payment/card.php
@@ -286,7 +286,6 @@ else
 	dol_print_error($db);
 }
 
-print '</div>';
 
 
 /*
diff --git a/htdocs/fourn/class/paiementfourn.class.php b/htdocs/fourn/class/paiementfourn.class.php
index e4d70ff255a..51485a7db5e 100644
--- a/htdocs/fourn/class/paiementfourn.class.php
+++ b/htdocs/fourn/class/paiementfourn.class.php
@@ -701,7 +701,7 @@ class PaiementFourn extends Paiement
 		else
 		{
 			$langs->load("errors");
-			print $langs->trans("Error")." ".$langs->trans("ErrorModuleSetupNotComplete");
+			print $langs->trans("Error")." ".$langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("Supplier"));
 			return "";
 		}
 	}
diff --git a/htdocs/includes/evalmath/evalmath.class.php b/htdocs/includes/evalmath/evalmath.class.php
index 9426e82a8ff..9d970aed789 100644
--- a/htdocs/includes/evalmath/evalmath.class.php
+++ b/htdocs/includes/evalmath/evalmath.class.php
@@ -98,7 +98,7 @@ class EvalMath
         'sin','sinh','arcsin','asin','arcsinh','asinh',
         'cos','cosh','arccos','acos','arccosh','acosh',
         'tan','tanh','arctan','atan','arctanh','atanh',
-        'sqrt','abs','ln','log');
+        'sqrt','abs','ln','log','intval');
 
     /**
      * Constructor
diff --git a/htdocs/includes/stripe/CHANGELOG.md b/htdocs/includes/stripe/CHANGELOG.md
index 26b449ff039..bed9cff5722 100644
--- a/htdocs/includes/stripe/CHANGELOG.md
+++ b/htdocs/includes/stripe/CHANGELOG.md
@@ -1,5 +1,45 @@
 # Changelog
 
+## 6.41.0 - 2019-07-31
+* [#683](https://github.com/stripe/stripe-php/pull/683) Move the List Balance History API to `/v1/balance_transactions`
+
+## 6.40.0 - 2019-06-27
+* [#675](https://github.com/stripe/stripe-php/pull/675) Add support for `SetupIntent` resource and APIs
+
+## 6.39.2 - 2019-06-26
+* [#676](https://github.com/stripe/stripe-php/pull/676) Fix exception message in `CustomerBalanceTransaction::update()`
+
+## 6.39.1 - 2019-06-25
+* [#674](https://github.com/stripe/stripe-php/pull/674) Add new constants for `collection_method` on `Invoice`
+
+## 6.39.0 - 2019-06-24
+* [#673](https://github.com/stripe/stripe-php/pull/673) Enable request latency telemetry by default
+
+## 6.38.0 - 2019-06-17
+* [#649](https://github.com/stripe/stripe-php/pull/649) Add support for `CustomerBalanceTransaction` resource and APIs
+
+## 6.37.2 - 2019-06-17
+* [#671](https://github.com/stripe/stripe-php/pull/671) Add new PHPDoc
+* [#672](https://github.com/stripe/stripe-php/pull/672) Add constants for `submit_type` on Checkout `Session`
+
+## 6.37.1 - 2019-06-14
+* [#670](https://github.com/stripe/stripe-php/pull/670) Add new PHPDoc
+
+## 6.37.0 - 2019-05-23
+* [#663](https://github.com/stripe/stripe-php/pull/663) Add support for `radar.early_fraud_warning` resource
+
+## 6.36.0 - 2019-05-22
+* [#661](https://github.com/stripe/stripe-php/pull/661) Add constants for new TaxId types
+* [#662](https://github.com/stripe/stripe-php/pull/662) Add constants for BalanceTransaction types
+
+## 6.35.2 - 2019-05-20
+* [#655](https://github.com/stripe/stripe-php/pull/655) Add constants for payment intent statuses
+* [#659](https://github.com/stripe/stripe-php/pull/659) Fix PHPDoc for various nested Account actions
+* [#660](https://github.com/stripe/stripe-php/pull/660) Fix various PHPDoc
+
+## 6.35.1 - 2019-05-20
+* [#658](https://github.com/stripe/stripe-php/pull/658) Use absolute value when checking timestamp tolerance
+
 ## 6.35.0 - 2019-05-14
 * [#651](https://github.com/stripe/stripe-php/pull/651) Add support for the Capability resource and APIs
 
diff --git a/htdocs/includes/stripe/README.md b/htdocs/includes/stripe/README.md
index 8dca764d7d1..7d1b681c087 100644
--- a/htdocs/includes/stripe/README.md
+++ b/htdocs/includes/stripe/README.md
@@ -6,7 +6,11 @@
 [![License](https://poser.pugx.org/stripe/stripe-php/license.svg)](https://packagist.org/packages/stripe/stripe-php)
 [![Code Coverage](https://coveralls.io/repos/stripe/stripe-php/badge.svg?branch=master)](https://coveralls.io/r/stripe/stripe-php?branch=master)
 
-You can sign up for a Stripe account at https://stripe.com.
+The Stripe PHP library provides convenient access to the Stripe API from
+applications written in the PHP language. It includes a pre-defined set of
+classes for API resources that initialize themselves dynamically from API
+responses which makes it compatible with a wide range of versions of the Stripe
+API.
 
 ## Requirements
 
@@ -56,7 +60,7 @@ echo $charge;
 
 ## Documentation
 
-Please see https://stripe.com/docs/api for up-to-date documentation.
+See the [PHP API docs](https://stripe.com/docs/api/php#intro).
 
 ## Legacy Version Support
 
@@ -179,6 +183,17 @@ an intermittent network problem:
 [Idempotency keys][idempotency-keys] are added to requests to guarantee that
 retries are safe.
 
+### Request latency telemetry
+
+By default, the library sends request latency telemetry to Stripe. These
+numbers help Stripe improve the overall latency of its API for all users.
+
+You can disable this behavior if you prefer:
+
+```php
+\Stripe\Stripe::setEnableTelemetry(false);
+```
+
 ## Development
 
 Get [Composer][composer]. For example, on Mac OS:
diff --git a/htdocs/includes/stripe/VERSION b/htdocs/includes/stripe/VERSION
index b22907d080c..08c99ad1b68 100644
--- a/htdocs/includes/stripe/VERSION
+++ b/htdocs/includes/stripe/VERSION
@@ -1 +1 @@
-6.35.0
+6.41.0
diff --git a/htdocs/includes/stripe/init.php b/htdocs/includes/stripe/init.php
index 2f6ccfbf67b..e893cfcda90 100644
--- a/htdocs/includes/stripe/init.php
+++ b/htdocs/includes/stripe/init.php
@@ -76,6 +76,7 @@ require(dirname(__FILE__) . '/lib/CountrySpec.php');
 require(dirname(__FILE__) . '/lib/Coupon.php');
 require(dirname(__FILE__) . '/lib/CreditNote.php');
 require(dirname(__FILE__) . '/lib/Customer.php');
+require(dirname(__FILE__) . '/lib/CustomerBalanceTransaction.php');
 require(dirname(__FILE__) . '/lib/Discount.php');
 require(dirname(__FILE__) . '/lib/Dispute.php');
 require(dirname(__FILE__) . '/lib/EphemeralKey.php');
@@ -104,6 +105,7 @@ require(dirname(__FILE__) . '/lib/Payout.php');
 require(dirname(__FILE__) . '/lib/Person.php');
 require(dirname(__FILE__) . '/lib/Plan.php');
 require(dirname(__FILE__) . '/lib/Product.php');
+require(dirname(__FILE__) . '/lib/Radar/EarlyFraudWarning.php');
 require(dirname(__FILE__) . '/lib/Radar/ValueList.php');
 require(dirname(__FILE__) . '/lib/Radar/ValueListItem.php');
 require(dirname(__FILE__) . '/lib/Recipient.php');
@@ -112,6 +114,7 @@ require(dirname(__FILE__) . '/lib/Refund.php');
 require(dirname(__FILE__) . '/lib/Reporting/ReportRun.php');
 require(dirname(__FILE__) . '/lib/Reporting/ReportType.php');
 require(dirname(__FILE__) . '/lib/Review.php');
+require(dirname(__FILE__) . '/lib/SetupIntent.php');
 require(dirname(__FILE__) . '/lib/SKU.php');
 require(dirname(__FILE__) . '/lib/Sigma/ScheduledQueryRun.php');
 require(dirname(__FILE__) . '/lib/Source.php');
diff --git a/htdocs/includes/stripe/lib/Account.php b/htdocs/includes/stripe/lib/Account.php
index 0e84951dcd0..1adc6b79d53 100644
--- a/htdocs/includes/stripe/lib/Account.php
+++ b/htdocs/includes/stripe/lib/Account.php
@@ -152,8 +152,8 @@ class Account extends ApiResource
 
 
     /**
-     * @param string|null $id The ID of the account to which the capability belongs.
-     * @param string|null $capabilityId The ID of the capability to retrieve.
+     * @param string $id The ID of the account to which the capability belongs.
+     * @param string $capabilityId The ID of the capability to retrieve.
      * @param array|null $params
      * @param array|string|null $opts
      *
@@ -165,8 +165,8 @@ class Account extends ApiResource
     }
 
     /**
-     * @param string|null $id The ID of the account to which the capability belongs.
-     * @param string|null $capabilityId The ID of the capability to update.
+     * @param string $id The ID of the account to which the capability belongs.
+     * @param string $capabilityId The ID of the capability to update.
      * @param array|null $params
      * @param array|string|null $opts
      *
@@ -178,7 +178,7 @@ class Account extends ApiResource
     }
 
     /**
-     * @param string|null $id The ID of the account on which to retrieve the capabilities.
+     * @param string $id The ID of the account on which to retrieve the capabilities.
      * @param array|null $params
      * @param array|string|null $opts
      *
@@ -190,7 +190,7 @@ class Account extends ApiResource
     }
 
     /**
-     * @param string|null $id The ID of the account on which to create the external account.
+     * @param string $id The ID of the account on which to create the external account.
      * @param array|null $params
      * @param array|string|null $opts
      *
@@ -202,8 +202,8 @@ class Account extends ApiResource
     }
 
     /**
-     * @param string|null $id The ID of the account to which the external account belongs.
-     * @param array|null $externalAccountId The ID of the external account to retrieve.
+     * @param string $id The ID of the account to which the external account belongs.
+     * @param string $externalAccountId The ID of the external account to retrieve.
      * @param array|null $params
      * @param array|string|null $opts
      *
@@ -215,8 +215,8 @@ class Account extends ApiResource
     }
 
     /**
-     * @param string|null $id The ID of the account to which the external account belongs.
-     * @param array|null $externalAccountId The ID of the external account to update.
+     * @param string $id The ID of the account to which the external account belongs.
+     * @param string $externalAccountId The ID of the external account to update.
      * @param array|null $params
      * @param array|string|null $opts
      *
@@ -228,8 +228,8 @@ class Account extends ApiResource
     }
 
     /**
-     * @param string|null $id The ID of the account to which the external account belongs.
-     * @param array|null $externalAccountId The ID of the external account to delete.
+     * @param string $id The ID of the account to which the external account belongs.
+     * @param string $externalAccountId The ID of the external account to delete.
      * @param array|null $params
      * @param array|string|null $opts
      *
@@ -241,7 +241,7 @@ class Account extends ApiResource
     }
 
     /**
-     * @param string|null $id The ID of the account on which to retrieve the external accounts.
+     * @param string $id The ID of the account on which to retrieve the external accounts.
      * @param array|null $params
      * @param array|string|null $opts
      *
@@ -253,7 +253,7 @@ class Account extends ApiResource
     }
 
     /**
-     * @param string|null $id The ID of the account on which to create the login link.
+     * @param string $id The ID of the account on which to create the login link.
      * @param array|null $params
      * @param array|string|null $opts
      *
@@ -280,7 +280,7 @@ class Account extends ApiResource
     }
 
     /**
-     * @param string|null $id The ID of the account on which to create the person.
+     * @param string $id The ID of the account on which to create the person.
      * @param array|null $params
      * @param array|string|null $opts
      *
@@ -292,8 +292,8 @@ class Account extends ApiResource
     }
 
     /**
-     * @param string|null $id The ID of the account to which the person belongs.
-     * @param string|null $personId The ID of the person to retrieve.
+     * @param string $id The ID of the account to which the person belongs.
+     * @param string $personId The ID of the person to retrieve.
      * @param array|null $params
      * @param array|string|null $opts
      *
@@ -305,8 +305,8 @@ class Account extends ApiResource
     }
 
     /**
-     * @param string|null $id The ID of the account to which the person belongs.
-     * @param string|null $personId The ID of the person to update.
+     * @param string $id The ID of the account to which the person belongs.
+     * @param string $personId The ID of the person to update.
      * @param array|null $params
      * @param array|string|null $opts
      *
@@ -318,8 +318,8 @@ class Account extends ApiResource
     }
 
     /**
-     * @param string|null $id The ID of the account to which the person belongs.
-     * @param string|null $personId The ID of the person to delete.
+     * @param string $id The ID of the account to which the person belongs.
+     * @param string $personId The ID of the person to delete.
      * @param array|null $params
      * @param array|string|null $opts
      *
@@ -331,7 +331,7 @@ class Account extends ApiResource
     }
 
     /**
-     * @param string|null $id The ID of the account on which to retrieve the persons.
+     * @param string $id The ID of the account on which to retrieve the persons.
      * @param array|null $params
      * @param array|string|null $opts
      *
diff --git a/htdocs/includes/stripe/lib/BalanceTransaction.php b/htdocs/includes/stripe/lib/BalanceTransaction.php
index cd9b79ae675..403c4aa173e 100644
--- a/htdocs/includes/stripe/lib/BalanceTransaction.php
+++ b/htdocs/includes/stripe/lib/BalanceTransaction.php
@@ -31,11 +31,36 @@ class BalanceTransaction extends ApiResource
     use ApiOperations\Retrieve;
 
     /**
-     * @return string The class URL for this resource. It needs to be special
-     *    cased because it doesn't fit into the standard resource pattern.
+     * Possible string representations of the type of balance transaction.
+     * @link https://stripe.com/docs/api/balance/balance_transaction#balance_transaction_object-type
      */
-    public static function classUrl()
-    {
-        return "/v1/balance/history";
-    }
+    const TYPE_ADJUSTMENT                    = 'adjustment';
+    const TYPE_ADVANCE                       = 'advance';
+    const TYPE_ADVANCE_FUNDING               = 'advance_funding';
+    const TYPE_APPLICATION_FEE               = 'application_fee';
+    const TYPE_APPLICATION_FEE_REFUND        = 'application_fee_refund';
+    const TYPE_CHARGE                        = 'charge';
+    const TYPE_CONNECT_COLLECTION_TRANSFER   = 'connect_collection_transfer';
+    const TYPE_ISSUING_AUTHORIZATION_HOLD    = 'issuing_authorization_hold';
+    const TYPE_ISSUING_AUTHORIZATION_RELEASE = 'issuing_authorization_release';
+    const TYPE_ISSUING_TRANSACTION           = 'issuing_transaction';
+    const TYPE_PAYMENT                       = 'payment';
+    const TYPE_PAYMENT_FAILURE_REFUND        = 'payment_failure_refund';
+    const TYPE_PAYMENT_REFUND                = 'payment_refund';
+    const TYPE_PAYOUT                        = 'payout';
+    const TYPE_PAYOUT_CANCEL                 = 'payout_cancel';
+    const TYPE_PAYOUT_FAILURE                = 'payout_failure';
+    const TYPE_REFUND                        = 'refund';
+    const TYPE_REFUND_FAILURE                = 'refund_failure';
+    const TYPE_RESERVE_TRANSACTION           = 'reserve_transaction';
+    const TYPE_RESERVED_FUNDS                = 'reserved_funds';
+    const TYPE_STRIPE_FEE                    = 'stripe_fee';
+    const TYPE_STRIPE_FX_FEE                 = 'stripe_fx_fee';
+    const TYPE_TAX_FEE                       = 'tax_fee';
+    const TYPE_TOPUP                         = 'topup';
+    const TYPE_TOPUP_REVERSAL                = 'topup_reversal';
+    const TYPE_TRANSFER                      = 'transfer';
+    const TYPE_TRANSFER_CANCEL               = 'transfer_cancel';
+    const TYPE_TRANSFER_FAILURE              = 'transfer_failure';
+    const TYPE_TRANSFER_REFUND               = 'transfer_refund';
 }
diff --git a/htdocs/includes/stripe/lib/BankAccount.php b/htdocs/includes/stripe/lib/BankAccount.php
index 019a4d87cbd..3fdc9188c64 100644
--- a/htdocs/includes/stripe/lib/BankAccount.php
+++ b/htdocs/includes/stripe/lib/BankAccount.php
@@ -31,6 +31,16 @@ class BankAccount extends ApiResource
     use ApiOperations\Delete;
     use ApiOperations\Update;
 
+    /**
+     * Possible string representations of the bank verification status.
+     * @link https://stripe.com/docs/api/external_account_bank_accounts/object#account_bank_account_object-status
+     */
+    const STATUS_NEW                 = 'new';
+    const STATUS_VALIDATED           = 'validated';
+    const STATUS_VERIFIED            = 'verified';
+    const STATUS_VERIFICATION_FAILED = 'verification_failed';
+    const STATUS_ERRORED             = 'errored';
+
     /**
      * @return string The instance URL for this resource. It needs to be special
      *    cased because it doesn't fit into the standard resource pattern.
diff --git a/htdocs/includes/stripe/lib/Charge.php b/htdocs/includes/stripe/lib/Charge.php
index 832a07c7c04..43274c5559c 100644
--- a/htdocs/includes/stripe/lib/Charge.php
+++ b/htdocs/includes/stripe/lib/Charge.php
@@ -11,7 +11,9 @@ namespace Stripe;
  * @property int $amount_refunded
  * @property string $application
  * @property string $application_fee
+ * @property int $application_fee_amount
  * @property string $balance_transaction
+ * @property mixed $billing_details
  * @property bool $captured
  * @property int $created
  * @property string $currency
@@ -30,6 +32,8 @@ namespace Stripe;
  * @property mixed $outcome
  * @property bool $paid
  * @property string $payment_intent
+ * @property string $payment_method
+ * @property mixed $payment_method_details
  * @property string $receipt_email
  * @property string $receipt_number
  * @property string $receipt_url
@@ -86,6 +90,7 @@ class Charge extends ApiResource
     const DECLINED_INVALID_PIN                       = 'invalid_pin';
     const DECLINED_ISSUER_NOT_AVAILABLE              = 'issuer_not_available';
     const DECLINED_LOST_CARD                         = 'lost_card';
+    const DECLINED_MERCHANT_BLACKLIST                = 'merchant_blacklist';
     const DECLINED_NEW_ACCOUNT_INFORMATION_AVAILABLE = 'new_account_information_available';
     const DECLINED_NO_ACTION_TAKEN                   = 'no_action_taken';
     const DECLINED_NOT_PERMITTED                     = 'not_permitted';
diff --git a/htdocs/includes/stripe/lib/Checkout/Session.php b/htdocs/includes/stripe/lib/Checkout/Session.php
index 968d58cf632..33fc6a08ab2 100644
--- a/htdocs/includes/stripe/lib/Checkout/Session.php
+++ b/htdocs/includes/stripe/lib/Checkout/Session.php
@@ -15,6 +15,7 @@ namespace Stripe\Checkout;
  * @property bool $livemode
  * @property string $payment_intent
  * @property string[] $payment_method_types
+ * @property string $submit_type
  * @property string $subscription
  * @property string $success_url
  *
@@ -27,4 +28,13 @@ class Session extends \Stripe\ApiResource
 
     use \Stripe\ApiOperations\Create;
     use \Stripe\ApiOperations\Retrieve;
+
+    /**
+     * Possible string representations of submit type.
+     * @link https://stripe.com/docs/api/checkout/sessions/create#create_checkout_session-submit_type
+     */
+    const SUBMIT_TYPE_AUTO    = 'auto';
+    const SUBMIT_TYPE_BOOK    = 'book';
+    const SUBMIT_TYPE_DONATE  = 'donate';
+    const SUBMIT_TYPE_PAY     = 'pay';
 }
diff --git a/htdocs/includes/stripe/lib/CreditNote.php b/htdocs/includes/stripe/lib/CreditNote.php
index 169ed0815c3..66351ffb828 100644
--- a/htdocs/includes/stripe/lib/CreditNote.php
+++ b/htdocs/includes/stripe/lib/CreditNote.php
@@ -8,6 +8,7 @@ namespace Stripe;
  * @property string $id
  * @property string $object
  * @property int $amount
+ * @property string $customer_balance_transaction
  * @property int $created
  * @property string $currency
  * @property string $customer
diff --git a/htdocs/includes/stripe/lib/Customer.php b/htdocs/includes/stripe/lib/Customer.php
index 44f5e6e2f09..6e78f981ee4 100644
--- a/htdocs/includes/stripe/lib/Customer.php
+++ b/htdocs/includes/stripe/lib/Customer.php
@@ -7,8 +7,8 @@ namespace Stripe;
  *
  * @property string $id
  * @property string $object
- * @property int $account_balance
  * @property mixed $address
+ * @property int $balance
  * @property string $created
  * @property string $currency
  * @property string $default_source
@@ -26,6 +26,7 @@ namespace Stripe;
  * @property mixed $shipping
  * @property Collection $sources
  * @property Collection $subscriptions
+ * @property string $tax_exempt
  * @property Collection $tax_ids
  *
  * @package Stripe
@@ -61,6 +62,7 @@ class Customer extends ApiResource
         return $savedNestedResources;
     }
 
+    const PATH_BALANCE_TRANSACTIONS = '/balance_transactions';
     const PATH_SOURCES = '/sources';
     const PATH_TAX_IDS = '/tax_ids';
 
@@ -264,4 +266,55 @@ class Customer extends ApiResource
     {
         return self::_allNestedResources($id, static::PATH_TAX_IDS, $params, $opts);
     }
+
+    /**
+     * @param string|null $id The ID of the customer on which to create the balance transaction.
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return ApiResource
+     */
+    public static function createBalanceTransaction($id, $params = null, $opts = null)
+    {
+        return self::_createNestedResource($id, static::PATH_BALANCE_TRANSACTIONS, $params, $opts);
+    }
+
+    /**
+     * @param string|null $id The ID of the customer to which the balance transaction belongs.
+     * @param string|null $balanceTransactionId The ID of the balance transaction to retrieve.
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return ApiResource
+     */
+    public static function retrieveBalanceTransaction($id, $balanceTransactionId, $params = null, $opts = null)
+    {
+        return self::_retrieveNestedResource($id, static::PATH_BALANCE_TRANSACTIONS, $balanceTransactionId, $params, $opts);
+    }
+
+    /**
+     * @param string|null $id The ID of the customer on which to update the balance transaction.
+     * @param string|null $balanceTransactionId The ID of the balance transaction to update.
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     *
+     * @return ApiResource
+     */
+    public static function updateBalanceTransaction($id, $balanceTransactionId, $params = null, $opts = null)
+    {
+        return self::_updateNestedResource($id, static::PATH_BALANCE_TRANSACTIONS, $balanceTransactionId, $params, $opts);
+    }
+
+    /**
+     * @param string|null $id The ID of the customer on which to retrieve the customer balance transactions.
+     * @param array|null $params
+     * @param array|string|null $opts
+     *
+     * @return Collection The list of customer balance transactions.
+     */
+    public static function allBalanceTransactions($id, $params = null, $opts = null)
+    {
+        return self::_allNestedResources($id, static::PATH_BALANCE_TRANSACTIONS, $params, $opts);
+    }
 }
diff --git a/htdocs/includes/stripe/lib/CustomerBalanceTransaction.php b/htdocs/includes/stripe/lib/CustomerBalanceTransaction.php
new file mode 100644
index 00000000000..06cafcd45c6
--- /dev/null
+++ b/htdocs/includes/stripe/lib/CustomerBalanceTransaction.php
@@ -0,0 +1,88 @@
+<?php
+
+namespace Stripe;
+
+/**
+ * Class CustomerBalanceTransaction
+ *
+ * @package Stripe
+ *
+ * @property string $id
+ * @property string $object
+ * @property int $amount
+ * @property string $credit_note
+ * @property int $created
+ * @property string $currency
+ * @property string $customer
+ * @property string $description
+ * @property int $ending_balance
+ * @property string $invoice
+ * @property bool $livemode
+ * @property StripeObject $metadata
+ * @property string $type
+ */
+class CustomerBalanceTransaction extends ApiResource
+{
+    const OBJECT_NAME = "customer_balance_transaction";
+
+    /**
+     * Possible string representations of a balance transaction's type.
+     * @link https://stripe.com/docs/api/customers/customer_balance_transaction_object#customer_balance_transaction_object-type
+     */
+    const TYPE_ADJUSTEMENT             = 'adjustment';
+    const TYPE_APPLIED_TO_INVOICE      = 'applied_to_invoice';
+    const TYPE_CREDIT_NOTE             = 'credit_note';
+    const TYPE_INITIAL                 = 'initial';
+    const TYPE_INVOICE_TOO_LARGE       = 'invoice_too_large';
+    const TYPE_INVOICE_TOO_SMALL       = 'invoice_too_small';
+    const TYPE_UNSPENT_RECEIVER_CREDIT = 'unspent_receiver_credit';
+
+    /**
+     * @return string The API URL for this balance transaction.
+     */
+    public function instanceUrl()
+    {
+        $id = $this['id'];
+        $customer = $this['customer'];
+        if (!$id) {
+            throw new Error\InvalidRequest(
+                "Could not determine which URL to request: class instance has invalid ID: $id",
+                null
+            );
+        }
+        $id = Util\Util::utf8($id);
+        $customer = Util\Util::utf8($customer);
+
+        $base = Customer::classUrl();
+        $customerExtn = urlencode($customer);
+        $extn = urlencode($id);
+        return "$base/$customerExtn/balance_transactions/$extn";
+    }
+
+    /**
+     * @param array|string $_id
+     * @param array|string|null $_opts
+     *
+     * @throws \Stripe\Error\InvalidRequest
+     */
+    public static function retrieve($_id, $_opts = null)
+    {
+        $msg = "Customer Balance Transactions cannot be accessed without a customer ID. " .
+               "Retrieve a balance transaction using Customer::retrieveBalanceTransaction('cus_123', 'cbtxn_123') instead.";
+        throw new Error\InvalidRequest($msg, null);
+    }
+
+    /**
+     * @param string $_id
+     * @param array|null $_params
+     * @param array|string|null $_options
+     *
+     * @throws \Stripe\Error\InvalidRequest
+     */
+    public static function update($_id, $_params = null, $_options = null)
+    {
+        $msg = "Customer Balance Transactions cannot be accessed without a customer ID. " .
+               "Update a balance transaction using Customer::updateBalanceTransaction('cus_123', 'cbtxn_123', \$params) instead.";
+        throw new Error\InvalidRequest($msg, null);
+    }
+}
diff --git a/htdocs/includes/stripe/lib/Invoice.php b/htdocs/includes/stripe/lib/Invoice.php
index 6e0ec9d6b6c..31a84585485 100644
--- a/htdocs/includes/stripe/lib/Invoice.php
+++ b/htdocs/includes/stripe/lib/Invoice.php
@@ -19,6 +19,7 @@ namespace Stripe;
  * @property string $billing
  * @property string $billing_reason
  * @property string $charge
+ * @property string $collection_method
  * @property int $created
  * @property string $currency
  * @property array $custom_fields
@@ -28,6 +29,7 @@ namespace Stripe;
  * @property string $customer_name
  * @property string $customer_phone
  * @property mixed $customer_shipping
+ * @property string $customer_tax_exempt
  * @property array $customer_tax_ids
  * @property string $default_payment_method
  * @property string $default_source
@@ -77,6 +79,25 @@ class Invoice extends ApiResource
     use ApiOperations\Retrieve;
     use ApiOperations\Update;
 
+    /**
+     * Possible string representations of the billing reason.
+     * @link https://stripe.com/docs/api/invoices/object#invoice_object-billing_reason
+     */
+    const BILLING_REASON_MANUAL                 = 'manual';
+    const BILLING_REASON_SUBSCRIPTION           = 'subscription';
+    const BILLING_REASON_SUBSCRIPTION_CREATE    = 'subscription_create';
+    const BILLING_REASON_SUBSCRIPTION_CYCLE     = 'subscription_cycle';
+    const BILLING_REASON_SUBSCRIPTION_THRESHOLD = 'subscription_threshold';
+    const BILLING_REASON_SUBSCRIPTION_UPDATE    = 'subscription_update';
+    const BILLING_REASON_UPCOMING               = 'upcoming';
+
+    /**
+     * Possible string representations of the `collection_method` property.
+     * @link https://stripe.com/docs/api/invoices/object#invoice_object-collection_method
+     */
+    const COLLECTION_METHOD_CHARGE_AUTOMATICALLY = 'charge_automatically';
+    const COLLECTION_METHOD_SEND_INVOICE         = 'send_invoice';
+
     /**
      * Possible string representations of the invoice status.
      * @link https://stripe.com/docs/api/invoices/object#invoice_object-status
@@ -88,23 +109,12 @@ class Invoice extends ApiResource
     const STATUS_VOID          = 'void';
 
     /**
-     * Possible string representations of the billing.
+     * Possible string representations of the `billing` property.
+     * @deprecated Use `collection_method` instead.
      * @link https://stripe.com/docs/api/invoices/object#invoice_object-billing
      */
-    const BILLING_SEND_INVOICE         = 'send_invoice';
     const BILLING_CHARGE_AUTOMATICALLY = 'charge_automatically';
-
-    /**
-     * Possible string representations of the billing reason.
-     * @link https://stripe.com/docs/api/invoices/object#invoice_object-billing_reason
-     */
-    const BILLING_REASON_SUBSCRIPTION           = 'subscription';
-    const BILLING_REASON_SUBSCRIPTION_CREATE    = 'subscription_create';
-    const BILLING_REASON_SUBSCRIPTION_CYCLE     = 'subscription_cycle';
-    const BILLING_REASON_SUBSCRIPTION_UPDATE    = 'subscription_update';
-    const BILLING_REASON_SUBSCRIPTION_THRESHOLD = 'subscription_threshold';
-    const BILLING_REASON_MANUAL                 = 'manual';
-    const BILLING_REASON_UPCOMING               = 'upcoming';
+    const BILLING_SEND_INVOICE         = 'send_invoice';
 
     /**
      * @param array|null $params
diff --git a/htdocs/includes/stripe/lib/Issuing/Transaction.php b/htdocs/includes/stripe/lib/Issuing/Transaction.php
index 804b48db53c..ea90818fd25 100644
--- a/htdocs/includes/stripe/lib/Issuing/Transaction.php
+++ b/htdocs/includes/stripe/lib/Issuing/Transaction.php
@@ -17,6 +17,8 @@ namespace Stripe\Issuing;
  * @property string $dispute
  * @property bool $livemode
  * @property mixed $merchant_data
+ * @property int $merchant_amount
+ * @property string $merchant_currency
  * @property \Stripe\StripeObject $metadata
  * @property string $type
  *
diff --git a/htdocs/includes/stripe/lib/Order.php b/htdocs/includes/stripe/lib/Order.php
index 06c4ad3466f..0688c6ef937 100644
--- a/htdocs/includes/stripe/lib/Order.php
+++ b/htdocs/includes/stripe/lib/Order.php
@@ -23,7 +23,7 @@ namespace Stripe;
  * @property Collection $returns
  * @property string $selected_shipping_method
  * @property mixed $shipping
- * @property mixed $shipping_methods
+ * @property array $shipping_methods
  * @property string $status
  * @property mixed $status_transitions
  * @property int $updated
diff --git a/htdocs/includes/stripe/lib/PaymentIntent.php b/htdocs/includes/stripe/lib/PaymentIntent.php
index 9e8392f61bb..47cbf8fc6cb 100644
--- a/htdocs/includes/stripe/lib/PaymentIntent.php
+++ b/htdocs/includes/stripe/lib/PaymentIntent.php
@@ -50,6 +50,19 @@ class PaymentIntent extends ApiResource
     use ApiOperations\Retrieve;
     use ApiOperations\Update;
 
+    /**
+     * These constants are possible representations of the status field.
+     *
+     * @link https://stripe.com/docs/api/payment_intents/object#payment_intent_object-status
+     */
+    const STATUS_CANCELED                = 'canceled';
+    const STATUS_PROCESSING              = 'processing';
+    const STATUS_REQUIRES_ACTION         = 'requires_action';
+    const STATUS_REQUIRES_CAPTURE        = 'requires_capture';
+    const STATUS_REQUIRES_CONFIRMATION   = 'requires_confirmation';
+    const STATUS_REQUIRES_PAYMENT_METHOD = 'requires_payment_method';
+    const STATUS_SUCCEEDED               = 'succeeded';
+
     /**
      * @param array|null $params
      * @param array|string|null $options
diff --git a/htdocs/includes/stripe/lib/Person.php b/htdocs/includes/stripe/lib/Person.php
index 56241c4c426..f79b80da060 100644
--- a/htdocs/includes/stripe/lib/Person.php
+++ b/htdocs/includes/stripe/lib/Person.php
@@ -45,7 +45,7 @@ class Person extends ApiResource
      * Possible string representations of a person's gender.
      * @link https://stripe.com/docs/api/persons/object#person_object-gender
      */
-    const GENDER_MALE = 'male';
+    const GENDER_MALE   = 'male';
     const GENDER_FEMALE = 'female';
 
     /**
diff --git a/htdocs/includes/stripe/lib/Radar/EarlyFraudWarning.php b/htdocs/includes/stripe/lib/Radar/EarlyFraudWarning.php
new file mode 100644
index 00000000000..5131e52fc50
--- /dev/null
+++ b/htdocs/includes/stripe/lib/Radar/EarlyFraudWarning.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace Stripe\Radar;
+
+/**
+ * Class EarlyFraudWarning
+ *
+ * @property string $id
+ * @property string $object
+ * @property bool $actionable
+ * @property string $charge
+ * @property int $created
+ * @property string $fraud_type
+ * @property bool $livemode
+ *
+ * @package Stripe\Radar
+ */
+class EarlyFraudWarning extends \Stripe\ApiResource
+{
+    const OBJECT_NAME = "radar.early_fraud_warning";
+
+    use \Stripe\ApiOperations\All;
+    use \Stripe\ApiOperations\Retrieve;
+
+    /**
+     * Possible string representations of an early fraud warning's fraud type.
+     * @link https://stripe.com/docs/api/early_fraud_warnings/object#early_fraud_warning_object-fraud_type
+     */
+    const FRAUD_TYPE_CARD_NEVER_RECEIVED         = 'card_never_received';
+    const FRAUD_TYPE_FRAUDULENT_CARD_APPLICATION = 'fraudulent_card_application';
+    const FRAUD_TYPE_MADE_WITH_COUNTERFEIT_CARD  = 'made_with_counterfeit_card';
+    const FRAUD_TYPE_MADE_WITH_LOST_CARD         = 'made_with_lost_card';
+    const FRAUD_TYPE_MADE_WITH_STOLEN_CARD       = 'made_with_stolen_card';
+    const FRAUD_TYPE_MISC                        = 'misc';
+    const FRAUD_TYPE_UNAUTHORIZED_USE_OF_CARD    = 'unauthorized_use_of_card';
+}
diff --git a/htdocs/includes/stripe/lib/SetupIntent.php b/htdocs/includes/stripe/lib/SetupIntent.php
new file mode 100644
index 00000000000..f476fb35fa9
--- /dev/null
+++ b/htdocs/includes/stripe/lib/SetupIntent.php
@@ -0,0 +1,75 @@
+<?php
+
+namespace Stripe;
+
+/**
+ * Class SetupIntent
+ *
+ * @property string $id
+ * @property string $object
+ * @property string $application
+ * @property string $client_secret
+ * @property int $created
+ * @property string $customer
+ * @property string $description
+ * @property mixed $last_setup_error
+ * @property bool $livemode
+ * @property StripeObject $metadata
+ * @property mixed $next_action
+ * @property string $on_behalf_of
+ * @property string $payment_method
+ * @property string[] $payment_method_types
+ * @property string $status
+ *
+ * @package Stripe
+ */
+class SetupIntent extends ApiResource
+{
+
+    const OBJECT_NAME = "setup_intent";
+
+    use ApiOperations\All;
+    use ApiOperations\Create;
+    use ApiOperations\Retrieve;
+    use ApiOperations\Update;
+
+    /**
+     * These constants are possible representations of the status field.
+     *
+     * @link https://stripe.com/docs/api/setup_intents/object#setup_intent_object-status
+     */
+    const STATUS_CANCELED                = 'canceled';
+    const STATUS_PROCESSING              = 'processing';
+    const STATUS_REQUIRES_ACTION         = 'requires_action';
+    const STATUS_REQUIRES_CONFIRMATION   = 'requires_confirmation';
+    const STATUS_REQUIRES_PAYMENT_METHOD = 'requires_payment_method';
+    const STATUS_SUCCEEDED               = 'succeeded';
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $options
+     *
+     * @return SetupIntent The canceled setup intent.
+     */
+    public function cancel($params = null, $options = null)
+    {
+        $url = $this->instanceUrl() . '/cancel';
+        list($response, $opts) = $this->_request('post', $url, $params, $options);
+        $this->refreshFrom($response, $opts);
+        return $this;
+    }
+
+    /**
+     * @param array|null $params
+     * @param array|string|null $options
+     *
+     * @return SetupIntent The confirmed setup intent.
+     */
+    public function confirm($params = null, $options = null)
+    {
+        $url = $this->instanceUrl() . '/confirm';
+        list($response, $opts) = $this->_request('post', $url, $params, $options);
+        $this->refreshFrom($response, $opts);
+        return $this;
+    }
+}
diff --git a/htdocs/includes/stripe/lib/Source.php b/htdocs/includes/stripe/lib/Source.php
index 31b7cf77bba..1e2c8c73565 100644
--- a/htdocs/includes/stripe/lib/Source.php
+++ b/htdocs/includes/stripe/lib/Source.php
@@ -18,6 +18,7 @@ namespace Stripe;
  * @property mixed $code_verification
  * @property int $created
  * @property string $currency
+ * @property string $customer
  * @property mixed $eps
  * @property string $flow
  * @property mixed $giropay
diff --git a/htdocs/includes/stripe/lib/Stripe.php b/htdocs/includes/stripe/lib/Stripe.php
index 027f22fd83c..2397ef9c418 100644
--- a/htdocs/includes/stripe/lib/Stripe.php
+++ b/htdocs/includes/stripe/lib/Stripe.php
@@ -47,7 +47,7 @@ class Stripe
     public static $maxNetworkRetries = 0;
 
     // @var boolean Whether client telemetry is enabled. Defaults to false.
-    public static $enableTelemetry = false;
+    public static $enableTelemetry = true;
 
     // @var float Maximum delay between retries, in seconds
     private static $maxNetworkRetryDelay = 2.0;
@@ -55,7 +55,7 @@ class Stripe
     // @var float Initial delay between retries, in seconds
     private static $initialNetworkRetryDelay = 0.5;
 
-    const VERSION = '6.35.0';
+    const VERSION = '6.41.0';
 
     /**
      * @return string The API key used for requests.
diff --git a/htdocs/includes/stripe/lib/Subscription.php b/htdocs/includes/stripe/lib/Subscription.php
index 8b57d46b625..f5a46171d81 100644
--- a/htdocs/includes/stripe/lib/Subscription.php
+++ b/htdocs/includes/stripe/lib/Subscription.php
@@ -13,6 +13,7 @@ namespace Stripe;
  * @property mixed $billing_thresholds
  * @property bool $cancel_at_period_end
  * @property int $canceled_at
+ * @property string $collection_method
  * @property int $created
  * @property int $current_period_end
  * @property int $current_period_start
@@ -31,6 +32,7 @@ namespace Stripe;
  * @property int $quantity
  * @property SubscriptionSchedule $schedule
  * @property int $start
+ * @property int $start_date
  * @property string $status
  * @property float $tax_percent
  * @property int $trial_end
diff --git a/htdocs/includes/stripe/lib/TaxId.php b/htdocs/includes/stripe/lib/TaxId.php
index 2993e2d1375..0f72a2ac95f 100644
--- a/htdocs/includes/stripe/lib/TaxId.php
+++ b/htdocs/includes/stripe/lib/TaxId.php
@@ -12,7 +12,6 @@ namespace Stripe;
  * @property string $country
  * @property int $created
  * @property string $customer
- * @property bool $deleted
  * @property bool $livemode
  * @property string $type
  * @property string $value
@@ -27,10 +26,12 @@ class TaxId extends ApiResource
 
     /**
      * Possible string representations of a tax id's type.
-     * @link https://stripe.com/docs/api/customers/tax_id_object#tax_id_object-type
+     * @link https://stripe.com/docs/api/customer_tax_ids/object#tax_id_object-type
      */
     const TYPE_AU_ABN  = 'au_abn';
     const TYPE_EU_VAT  = 'eu_vat';
+    const TYPE_IN_GST  = 'in_gst';
+    const TYPE_NO_VAT  = 'no_vat';
     const TYPE_NZ_GST  = 'nz_gst';
     const TYPE_UNKNOWN = 'unknown';
 
diff --git a/htdocs/includes/stripe/lib/Util/Util.php b/htdocs/includes/stripe/lib/Util/Util.php
index e21d45dac16..f9f15440023 100644
--- a/htdocs/includes/stripe/lib/Util/Util.php
+++ b/htdocs/includes/stripe/lib/Util/Util.php
@@ -88,6 +88,7 @@ abstract class Util
             \Stripe\Coupon::OBJECT_NAME => 'Stripe\\Coupon',
             \Stripe\CreditNote::OBJECT_NAME => 'Stripe\\CreditNote',
             \Stripe\Customer::OBJECT_NAME => 'Stripe\\Customer',
+            \Stripe\CustomerBalanceTransaction::OBJECT_NAME => 'Stripe\\CustomerBalanceTransaction',
             \Stripe\Discount::OBJECT_NAME => 'Stripe\\Discount',
             \Stripe\Dispute::OBJECT_NAME => 'Stripe\\Dispute',
             \Stripe\EphemeralKey::OBJECT_NAME => 'Stripe\\EphemeralKey',
@@ -117,6 +118,7 @@ abstract class Util
             \Stripe\Person::OBJECT_NAME => 'Stripe\\Person',
             \Stripe\Plan::OBJECT_NAME => 'Stripe\\Plan',
             \Stripe\Product::OBJECT_NAME => 'Stripe\\Product',
+            \Stripe\Radar\EarlyFraudWarning::OBJECT_NAME => 'Stripe\\Radar\\EarlyFraudWarning',
             \Stripe\Radar\ValueList::OBJECT_NAME => 'Stripe\\Radar\\ValueList',
             \Stripe\Radar\ValueListItem::OBJECT_NAME => 'Stripe\\Radar\\ValueListItem',
             \Stripe\Recipient::OBJECT_NAME => 'Stripe\\Recipient',
@@ -125,6 +127,7 @@ abstract class Util
             \Stripe\Reporting\ReportRun::OBJECT_NAME => 'Stripe\\Reporting\\ReportRun',
             \Stripe\Reporting\ReportType::OBJECT_NAME => 'Stripe\\Reporting\\ReportType',
             \Stripe\Review::OBJECT_NAME => 'Stripe\\Review',
+            \Stripe\SetupIntent::OBJECT_NAME => 'Stripe\\SetupIntent',
             \Stripe\SKU::OBJECT_NAME => 'Stripe\\SKU',
             \Stripe\Sigma\ScheduledQueryRun::OBJECT_NAME => 'Stripe\\Sigma\\ScheduledQueryRun',
             \Stripe\Source::OBJECT_NAME => 'Stripe\\Source',
diff --git a/htdocs/includes/stripe/lib/Webhook.php b/htdocs/includes/stripe/lib/Webhook.php
index e0ab3021a89..45c7dc0f30a 100644
--- a/htdocs/includes/stripe/lib/Webhook.php
+++ b/htdocs/includes/stripe/lib/Webhook.php
@@ -24,6 +24,8 @@ abstract class Webhook
      */
     public static function constructEvent($payload, $sigHeader, $secret, $tolerance = self::DEFAULT_TOLERANCE)
     {
+        WebhookSignature::verifyHeader($payload, $sigHeader, $secret, $tolerance);
+
         $data = json_decode($payload, true);
         $jsonError = json_last_error();
         if ($data === null && $jsonError !== JSON_ERROR_NONE) {
@@ -33,8 +35,6 @@ abstract class Webhook
         }
         $event = Event::constructFrom($data);
 
-        WebhookSignature::verifyHeader($payload, $sigHeader, $secret, $tolerance);
-
         return $event;
     }
 }
diff --git a/htdocs/includes/stripe/lib/WebhookSignature.php b/htdocs/includes/stripe/lib/WebhookSignature.php
index 73e70dbd7de..9f8be8777b3 100644
--- a/htdocs/includes/stripe/lib/WebhookSignature.php
+++ b/htdocs/includes/stripe/lib/WebhookSignature.php
@@ -60,7 +60,7 @@ abstract class WebhookSignature
         }
 
         // Check if timestamp is within tolerance
-        if (($tolerance > 0) && ((time() - $timestamp) > $tolerance)) {
+        if (($tolerance > 0) && (abs(time() - $timestamp) > $tolerance)) {
             throw new Error\SignatureVerification(
                 "Timestamp outside the tolerance zone",
                 $header,
diff --git a/htdocs/install/doctemplates/websites/website-template-corporate.jpg b/htdocs/install/doctemplates/websites/website-template-corporate.jpg
new file mode 100644
index 00000000000..a693fb4395e
Binary files /dev/null and b/htdocs/install/doctemplates/websites/website-template-corporate.jpg differ
diff --git a/htdocs/install/mysql/data/llx_c_tva.sql b/htdocs/install/mysql/data/llx_c_tva.sql
index 17c8b7489ee..26c2acdf308 100644
--- a/htdocs/install/mysql/data/llx_c_tva.sql
+++ b/htdocs/install/mysql/data/llx_c_tva.sql
@@ -128,12 +128,6 @@ insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (11
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1162, 116,   '7','0','VAT reduced rate',1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1163, 116,   '0','0','VAT rate 0',1);
 
--- ITALY (id country=3)
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 31,  3,  '22','0','VAT standard rate',1);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 32,  3,  '10','0','VAT reduced rate',1);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 33,  3,   '4','0','VAT super-reduced rate',1);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 34,  3,   '0','0','VAT Rate 0',1);
-
 -- INDIA (id country=117)
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1171, 117,    '0','0','VAT Rate 0',            0);
 
@@ -153,6 +147,12 @@ insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 8
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 84,     8,    '9','0','VAT reduced rate',1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 85,     8,  '4.8','0','VAT reduced rate',1);
 
+-- ITALY (id country=3)
+insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 31,  3,  '22','0','VAT standard rate',1);
+insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 32,  3,  '10','0','VAT reduced rate',1);
+insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 33,  3,   '4','0','VAT super-reduced rate',1);
+insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 34,  3,   '0','0','VAT Rate 0',1);
+
 -- IVORY COST (id country=21)
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,localtax1,localtax1_type,localtax2,localtax2_type,note,active) values (211, 21,  '0','0',0,0,0,0,'IVA Rate 0',1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,localtax1,localtax1_type,localtax2,localtax2_type,note,active) values (212, 21,  '18','0',7.5,2,0,0,'IVA standard rate',1);
diff --git a/htdocs/install/mysql/migration/10.0.0-11.0.0.sql b/htdocs/install/mysql/migration/10.0.0-11.0.0.sql
index b5795a75639..63a71d59f44 100644
--- a/htdocs/install/mysql/migration/10.0.0-11.0.0.sql
+++ b/htdocs/install/mysql/migration/10.0.0-11.0.0.sql
@@ -44,6 +44,11 @@ create table llx_entrepot_extrafields
 ALTER TABLE llx_entrepot_extrafields ADD INDEX idx_entrepot_extrafields (fk_object);
 
 
+ALTER TABLE llx_facture ADD COLUMN retained_warranty real DEFAULT NULL after situation_final;
+ALTER TABLE llx_facture ADD COLUMN retained_warranty_date_limit	date DEFAULT NULL after retained_warranty;
+ALTER TABLE llx_facture ADD COLUMN retained_warranty_fk_cond_reglement	integer  DEFAULT NULL after retained_warranty_date_limit;
+
+
 ALTER TABLE llx_c_shipment_mode ADD COLUMN entity integer DEFAULT 1 NOT NULL;
 
 ALTER TABLE llx_c_shipment_mode DROP INDEX uk_c_shipment_mode;
@@ -66,4 +71,6 @@ create table llx_payment_salary_extrafields
 
 ALTER TABLE llx_payment_salary_extrafields ADD INDEX idx_payment_salary_extrafields (fk_object);
 
+ALTER TABLE llx_c_price_expression MODIFY COLUMN expression varchar(255) NOT NULL;
+
 UPDATE llx_bank_url set url = REPLACE( url, 'compta/salaries/', 'salaries/');
diff --git a/htdocs/install/mysql/migration/8.0.0-9.0.0.sql b/htdocs/install/mysql/migration/8.0.0-9.0.0.sql
index 6e38e8cff5b..61f4dc544ba 100644
--- a/htdocs/install/mysql/migration/8.0.0-9.0.0.sql
+++ b/htdocs/install/mysql/migration/8.0.0-9.0.0.sql
@@ -285,12 +285,6 @@ DELETE from llx_accounting_account where rowid in (select minid from tmp_llx_acc
 --update llx_facture_fourn_det set fk_code_ventilation = maxid WHERE fk_code_ventilation = minid;
 --update llx_expensereport_det set fk_code_ventilation = maxid WHERE fk_code_ventilation = minid;
 
-
-ALTER TABLE llx_facture ADD COLUMN retained_warranty real DEFAULT NULL after situation_final;
-ALTER TABLE llx_facture ADD COLUMN retained_warranty_date_limit	date DEFAULT NULL after retained_warranty;
-ALTER TABLE llx_facture ADD COLUMN retained_warranty_fk_cond_reglement	integer  DEFAULT NULL after retained_warranty_date_limit;
-
-
 ALTER TABLE llx_accounting_account DROP INDEX uk_accounting_account;
 ALTER TABLE llx_accounting_account ADD UNIQUE INDEX uk_accounting_account (account_number, entity, fk_pcg_version);
 
diff --git a/htdocs/install/mysql/tables/llx_c_price_expression.sql b/htdocs/install/mysql/tables/llx_c_price_expression.sql
index 4c1788e4276..085f60fe537 100755
--- a/htdocs/install/mysql/tables/llx_c_price_expression.sql
+++ b/htdocs/install/mysql/tables/llx_c_price_expression.sql
@@ -20,5 +20,5 @@ create table llx_c_price_expression
 (
 	rowid			integer AUTO_INCREMENT PRIMARY KEY,
 	title			varchar(20) NOT NULL,
-	expression		varchar(80) NOT NULL
+	expression		varchar(255) NOT NULL
 )ENGINE=innodb;
diff --git a/htdocs/install/step2.php b/htdocs/install/step2.php
index dc820633395..6ddd999ea59 100644
--- a/htdocs/install/step2.php
+++ b/htdocs/install/step2.php
@@ -453,7 +453,7 @@ if ($action == "set")
                     // Replace the prefix in table names
                     if ($dolibarr_main_db_prefix != 'llx_')
                     {
-                        $buffer=preg_replace('/llx_/i',$dolibarr_main_db_prefix,$buffer);
+                        $buffer=preg_replace('/llx_/i', $dolibarr_main_db_prefix, $buffer);
                     }
                     dolibarr_install_syslog("step2: request: " . $buffer);
                     print "<!-- Insert line : ".$buffer."<br>-->\n";
diff --git a/htdocs/langs/ar_SA/accountancy.lang b/htdocs/langs/ar_SA/accountancy.lang
index 1cdb76f1100..923d4ec20e9 100644
--- a/htdocs/langs/ar_SA/accountancy.lang
+++ b/htdocs/langs/ar_SA/accountancy.lang
@@ -265,7 +265,7 @@ AccountingJournals=Accounting journals
 AccountingJournal=Accounting journal
 NewAccountingJournal=New accounting journal
 ShowAccoutingJournal=Show accounting journal
-Nature=طبيعة
+NatureOfJournal=Nature of Journal
 AccountingJournalType1=Miscellaneous operations
 AccountingJournalType2=مبيعات
 AccountingJournalType3=مشتريات
@@ -291,6 +291,7 @@ Modelcsv_quadratus=Export for Quadratus QuadraCompta
 Modelcsv_ebp=Export for EBP
 Modelcsv_cogilog=Export for Cogilog
 Modelcsv_agiris=Export for Agiris
+Modelcsv_LDCompta=Export for LD Compta (v9 & higher) (Test)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export Configurable
 Modelcsv_FEC=Export FEC
@@ -301,7 +302,7 @@ ChartofaccountsId=Chart of accounts Id
 InitAccountancy=Init accountancy
 InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accounting account defined for sales and purchases.
 DefaultBindingDesc=This page can be used to set a default account to use to link transactions record about payment salaries, donation, taxes and vat when no specific accounting account were already set.
-DefaultClosureDesc=This page can be used to set parameters to use to enclose a balance sheet.
+DefaultClosureDesc=This page can be used to set parameters used for accounting closures.
 Options=الخيارات
 OptionModeProductSell=Mode sales
 OptionModeProductSellIntra=Mode sales exported in EEC
diff --git a/htdocs/langs/ar_SA/admin.lang b/htdocs/langs/ar_SA/admin.lang
index 1cbca5d3f51..3169b9acfad 100644
--- a/htdocs/langs/ar_SA/admin.lang
+++ b/htdocs/langs/ar_SA/admin.lang
@@ -574,7 +574,7 @@ Module510Name=الرواتب
 Module510Desc=Record and track employee payments
 Module520Name=القروض
 Module520Desc=إدارة القروض
-Module600Name=الإخطارات
+Module600Name=Notifications on business event
 Module600Desc=Send email notifications triggered by a business event: per user (setup defined on each user), per third-party contacts (setup defined on each third party) or by specific emails
 Module600Long=Note that this module sends emails in real-time when a specific business event occurs. If you are looking for a feature to send email reminders for agenda events, go into the setup of module Agenda.
 Module610Name=Product Variants
@@ -1193,6 +1193,7 @@ ExtraFieldsSupplierOrders=سمات التكميلية (أوامر)
 ExtraFieldsSupplierInvoices=سمات التكميلية (الفواتير)
 ExtraFieldsProject=سمات التكميلية (مشاريع)
 ExtraFieldsProjectTask=سمات التكميلية (المهام)
+ExtraFieldsSalaries=Complementary attributes (salaries)
 ExtraFieldHasWrongValue=السمة %s له قيمة خاطئة.
 AlphaNumOnlyLowerCharsAndNoSpace=alphanumericals فقط وشخصيات الحالة الأدنى دون الفضاء
 SendmailOptionNotComplete=تحذير، في بعض أنظمة لينكس، لإرسال البريد الإلكتروني من البريد الإلكتروني الخاص بك، يجب أن تنسخ الإعداد تنفيذ conatins الخيار، على درجة البكالوريوس (mail.force_extra_parameters المعلمة في ملف php.ini الخاص بك). إذا كان بعض المستفيدين لم تلقي رسائل البريد الإلكتروني، في محاولة لتعديل هذه المعلمة PHP مع mail.force_extra_parameters =-BA).
@@ -1220,13 +1221,14 @@ SuhosinSessionEncrypt=تخزين جلسة المشفرة بواسطة Suhosin
 ConditionIsCurrently=الشرط هو حاليا %s
 YouUseBestDriver=You use driver %s which is the best driver currently available.
 YouDoNotUseBestDriver=You use driver %s but driver %s is recommended.
-NbOfProductIsLowerThanNoPb=You have only %s products/services in the database. This does not require any particular optimization.
+NbOfObjectIsLowerThanNoPb=You have only %s %s in the database. This does not require any particular optimization.
 SearchOptim=البحث الأمثل
-YouHaveXProductUseSearchOptim=You have %s products in the database. You should add the constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+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.
 BrowserIsOK=You are using the %s web browser. This browser is ok for security and performance.
 BrowserIsKO=You are using the %s web browser. This browser is known to be a bad choice for security, performance and reliability. We recommend using Firefox, Chrome, Opera or Safari.
-XDebugInstalled=XDebug غير محملة.
-XCacheInstalled=XCache غير محملة.
+PHPModuleLoaded=PHP component %s is loaded
+PreloadOPCode=Preloaded OPCode is used
 AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.<br>Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp".
 AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".
 AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties.
@@ -1734,9 +1736,9 @@ ExpenseReportsRulesSetup=Setup of module Expense Reports - Rules
 ExpenseReportNumberingModules=Expense reports numbering module
 NoModueToManageStockIncrease=تم تفعيل أي وحدة قادرة على إدارة زيادة المخزون التلقائي. وسوف يتم زيادة الأسهم على الإدخال اليدوي فقط.
 YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for email notifications by enabling and configuring the module "Notification".
-ListOfNotificationsPerUser=List of notifications per user*
-ListOfNotificationsPerUserOrContact=List of notifications (events) available per user* or per contact**
-ListOfFixedNotifications=List of Fixed Notifications
+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
 GoOntoUserCardToAddMore=Go to the tab "Notifications" of a user to add or remove notifications for users
 GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
 Threshold=عتبة
@@ -1898,6 +1900,11 @@ OnMobileOnly=On small screen (smartphone) only
 DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be Prospect or Customer but can't be both)
 MAIN_OPTIMIZEFORTEXTBROWSER=Simplify interface for blind person
 MAIN_OPTIMIZEFORTEXTBROWSERDesc=Enable this option if you are a blind person, or if you use the application from a text browser like Lynx or 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
 ThisValueCanOverwrittenOnUserLevel=This value can be overwritten by each user from its user page - tab '%s'
 DefaultCustomerType=Default thirdparty type for "New customer" creation form
 ABankAccountMustBeDefinedOnPaymentModeSetup=Note: The bank account must be defined on the module of each payment mode (Paypal, Stripe, ...) to have this feature working.
@@ -1911,7 +1918,7 @@ LogsLinesNumber=Number of lines to show on logs tab
 UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
-DebugBarModuleActivated=Module debugbar is activated and slows dramaticaly the interface
+ModuleActivated=Module %s is activated and slows the interface
 EXPORTS_SHARE_MODELS=Export models are share with everybody
 ExportSetup=Setup of module Export
 InstanceUniqueID=Unique ID of the instance
@@ -1928,3 +1935,5 @@ 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
diff --git a/htdocs/langs/ar_SA/bills.lang b/htdocs/langs/ar_SA/bills.lang
index 2984cd416a7..793a1e530a1 100644
--- a/htdocs/langs/ar_SA/bills.lang
+++ b/htdocs/langs/ar_SA/bills.lang
@@ -95,6 +95,7 @@ PaymentHigherThanReminderToPay=دفع أعلى من دفع تذكرة
 HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess received for each overpaid invoice.
 HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess paid for each overpaid invoice.
 ClassifyPaid=تصنيف 'مدفوع'
+ClassifyUnPaid=Classify 'Unpaid'
 ClassifyPaidPartially=تصنيف 'مدفوع جزئيا'
 ClassifyCanceled=تصنيف 'المهجورة'
 ClassifyClosed=تصنيف 'مغلقة'
@@ -214,6 +215,20 @@ ShowInvoiceReplace=وتظهر استبدال الفاتورة
 ShowInvoiceAvoir=وتظهر المذكرة الائتمان
 ShowInvoiceDeposit=Show down payment invoice
 ShowInvoiceSituation=Show situation invoice
+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
 ShowPayment=وتظهر الدفع
 AlreadyPaid=دفعت بالفعل
 AlreadyPaidBack=دفعت بالفعل العودة
diff --git a/htdocs/langs/ar_SA/errors.lang b/htdocs/langs/ar_SA/errors.lang
index 87689d4edd1..7837448f102 100644
--- a/htdocs/langs/ar_SA/errors.lang
+++ b/htdocs/langs/ar_SA/errors.lang
@@ -90,7 +90,7 @@ ErrorSpecialCharNotAllowedForField=غير مسموح الأحرف الخاصة 
 ErrorNumRefModel=إشارة إلى وجود قاعدة بيانات (%s) ، وغير متوافق مع هذه القاعدة الترقيم. سجل إزالة أو إعادة تسميته اشارة الى تفعيل هذه الوحدة.
 ErrorQtyTooLowForThisSupplier=Quantity too low for this vendor or no price defined on this product for this vendor
 ErrorOrdersNotCreatedQtyTooLow=Some orders haven't been created because of too-low quantities
-ErrorModuleSetupNotComplete=Setup of module looks to be uncomplete. Go on Home - Setup - Modules to complete.
+ErrorModuleSetupNotComplete=Setup of module %s looks to be uncomplete. Go on Home - Setup - Modules to complete.
 ErrorBadMask=خطأ في قناع
 ErrorBadMaskFailedToLocatePosOfSequence=خطأ، من دون قناع رقم التسلسل
 ErrorBadMaskBadRazMonth=خطأ، قيمة إعادة سيئة
@@ -219,6 +219,7 @@ 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.
 # 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. ويمكن استخدامه من قبل وحدة / واجهة خارجية ولكن إذا كنت لا تحتاج إلى تعريف أي تسجيل دخول أو كلمة المرور لأحد أفراد، يمكنك تعطيل خيار "إدارة تسجيل دخول لكل عضو" من إعداد وحدة الأعضاء. إذا كنت بحاجة إلى إدارة تسجيل الدخول ولكن لا تحتاج إلى أي كلمة المرور، يمكنك الحفاظ على هذا الحقل فارغا لتجنب هذا التحذير. ملاحظة: يمكن أيضا أن تستخدم البريد الإلكتروني لتسجيل الدخول إذا تم ربط عضو إلى المستخدم.
 WarningMandatorySetupNotComplete=Click here to setup mandatory parameters
 WarningEnableYourModulesApplications=Click here to enable your modules and applications
diff --git a/htdocs/langs/ar_SA/main.lang b/htdocs/langs/ar_SA/main.lang
index ec726e1e0c3..7a2c477c7d0 100644
--- a/htdocs/langs/ar_SA/main.lang
+++ b/htdocs/langs/ar_SA/main.lang
@@ -445,6 +445,7 @@ ContactsAddressesForCompany=اتصالات / عناوين لهذا الطرف ا
 AddressesForCompany=عناوين لهذا الطرف الثالث
 ActionsOnCompany=Events for this third party
 ActionsOnContact=Events for this contact/address
+ActionsOnContract=Events for this contract
 ActionsOnMember=الأحداث عن هذا العضو
 ActionsOnProduct=Events about this product
 NActionsLate=٪ في وقت متأخر الصورة
@@ -759,6 +760,7 @@ LinkToSupplierProposal=Link to vendor proposal
 LinkToSupplierInvoice=Link to vendor invoice
 LinkToContract=Link to contract
 LinkToIntervention=Link to intervention
+LinkToTicket=Link to ticket
 CreateDraft=إنشاء مشروع
 SetToDraft=العودة إلى مشروع
 ClickToEdit=انقر للتحرير
diff --git a/htdocs/langs/ar_SA/products.lang b/htdocs/langs/ar_SA/products.lang
index c7830aa9639..9087ef24c7d 100644
--- a/htdocs/langs/ar_SA/products.lang
+++ b/htdocs/langs/ar_SA/products.lang
@@ -2,6 +2,7 @@
 ProductRef=مرجع المنتج
 ProductLabel=وصف المنتج
 ProductLabelTranslated=تسمية المنتج مترجمة
+ProductDescription=Product description
 ProductDescriptionTranslated=ترجمة وصف المنتج
 ProductNoteTranslated=ترجمة مذكرة المنتج
 ProductServiceCard=منتجات / بطاقة الخدمات
diff --git a/htdocs/langs/ar_SA/stripe.lang b/htdocs/langs/ar_SA/stripe.lang
index 594741ab0e8..ad1b053be34 100644
--- a/htdocs/langs/ar_SA/stripe.lang
+++ b/htdocs/langs/ar_SA/stripe.lang
@@ -65,3 +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>
diff --git a/htdocs/langs/ar_SA/withdrawals.lang b/htdocs/langs/ar_SA/withdrawals.lang
index da24cce0722..c0bd2dd5d6f 100644
--- a/htdocs/langs/ar_SA/withdrawals.lang
+++ b/htdocs/langs/ar_SA/withdrawals.lang
@@ -76,7 +76,8 @@ WithdrawalFile=ملف الانسحاب
 SetToStatusSent=تعيين إلى حالة "المرسلة ملف"
 ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and will classify them as "Paid" if remain to pay is null
 StatisticsByLineStatus=إحصاءات عن طريق وضع خطوط
-RUM=UMR
+RUM=Unique Mandate Reference (UMR)
+DateRUM=Mandate signature date
 RUMLong=Unique Mandate Reference
 RUMWillBeGenerated=If empty, a UMR (Unique Mandate Reference) will be generated once the bank account information is saved.
 WithdrawMode=Direct debit mode (FRST or RECUR)
diff --git a/htdocs/langs/bg_BG/accountancy.lang b/htdocs/langs/bg_BG/accountancy.lang
index 671bcc70f07..2f8ed951db1 100644
--- a/htdocs/langs/bg_BG/accountancy.lang
+++ b/htdocs/langs/bg_BG/accountancy.lang
@@ -1,347 +1,348 @@
 # Dolibarr language file - en_US - Accounting Expert
-Accounting=Accounting
-ACCOUNTING_EXPORT_SEPARATORCSV=Разделител за колона за експорт на файл
-ACCOUNTING_EXPORT_DATE=Формат на дата за експорт на файл
-ACCOUNTING_EXPORT_PIECE=Експортирай номера от частта
-ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Експортирай глобалния акаунт
-ACCOUNTING_EXPORT_LABEL=Export label
-ACCOUNTING_EXPORT_AMOUNT=Сума за износ
-ACCOUNTING_EXPORT_DEVISE=Експортна валута
-Selectformat=Избери формата за файла
-ACCOUNTING_EXPORT_FORMAT=Избери формата за файла
-ACCOUNTING_EXPORT_ENDLINE=Select the carriage return type
-ACCOUNTING_EXPORT_PREFIX_SPEC=Уточнете префикса за името на файла
+Accounting=Счетоводство
+ACCOUNTING_EXPORT_SEPARATORCSV=Разделител на колони в експортен файл
+ACCOUNTING_EXPORT_DATE=Формат на дата в експортен файл
+ACCOUNTING_EXPORT_PIECE=Експортиране на пореден номер
+ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Експортиране с глобална сметка
+ACCOUNTING_EXPORT_LABEL=Етикет на експортиране
+ACCOUNTING_EXPORT_AMOUNT=Сума за експортиране
+ACCOUNTING_EXPORT_DEVISE=Валута за експортиране
+Selectformat=Изберете формата за файла
+ACCOUNTING_EXPORT_FORMAT=Изберете формата за файла
+ACCOUNTING_EXPORT_ENDLINE=Изберете типа пренасяне на нов ред
+ACCOUNTING_EXPORT_PREFIX_SPEC=Посочете префикса в името на файла
 ThisService=Тази услуга
 ThisProduct=Този продукт
-DefaultForService=Default for service
+DefaultForService=По подразбиране за услуга
 DefaultForProduct=По подразбиране за продукт
-CantSuggest=Не мога да предложа
-AccountancySetupDoneFromAccountancyMenu=Most setup of the accountancy is done from the menu %s
-ConfigAccountingExpert=Configuration of the module accounting expert
+CantSuggest=Не може да се предложи
+AccountancySetupDoneFromAccountancyMenu=Повечето настройки на счетоводството се извършват от менюто %s
+ConfigAccountingExpert=Конфигурация на модул за експертно счетоводство
 Journalization=Осчетоводяване
 Journaux=Журнали
-JournalFinancial=Financial journals
-BackToChartofaccounts=Return chart of accounts
-Chartofaccounts=Chart of accounts
-CurrentDedicatedAccountingAccount=Current dedicated account
-AssignDedicatedAccountingAccount=New account to assign
-InvoiceLabel=Invoice label
-OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to an accounting account
-OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to an accounting account
+JournalFinancial=Финансови журнали
+BackToChartofaccounts=Връщане към сметкоплана
+Chartofaccounts=Сметкоплан
+CurrentDedicatedAccountingAccount=Текуща специална сметка
+AssignDedicatedAccountingAccount=Нова сметка за присвояване
+InvoiceLabel=Етикет за фактура
+OverviewOfAmountOfLinesNotBound=Преглед на количеството редове, които не са обвързани със счетоводна сметка
+OverviewOfAmountOfLinesBound=Преглед на количеството редове, които вече са свързани към счетоводна сметка
 OtherInfo=Друга информация
-DeleteCptCategory=Remove accounting account from group
-ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group?
-JournalizationInLedgerStatus=Status of journalization
-AlreadyInGeneralLedger=Already journalized in ledgers
-NotYetInGeneralLedger=Not yet journalized in ledgers
-GroupIsEmptyCheckSetup=Group is empty, check setup of the personalized accounting group
-DetailByAccount=Show detail by account
-AccountWithNonZeroValues=Accounts with non-zero values
-ListOfAccounts=List of accounts
-CountriesInEEC=Countries in EEC
-CountriesNotInEEC=Countries not in EEC
-CountriesInEECExceptMe=Countries in EEC except %s
-CountriesExceptMe=All countries except %s
-AccountantFiles=Export accounting documents
+DeleteCptCategory=Премахване на счетоводна сметка от група
+ConfirmDeleteCptCategory=Сигурни ли сте, че искате да премахнете тази счетоводна сметка от групата счетоводни сметки?
+JournalizationInLedgerStatus=Статус на осчетоводяване
+AlreadyInGeneralLedger=Вече осчетоводено в главната счетоводна книга
+NotYetInGeneralLedger=Все още не е осчетоводено в главната счетоводна книга
+GroupIsEmptyCheckSetup=Групата е празна, проверете настройката на персонализираната счетоводна група
+DetailByAccount=Показване на детайли по сметка
+AccountWithNonZeroValues=Сметки с различни от нула стойности
+ListOfAccounts=Списък на сметки
+CountriesInEEC=Държави в ЕИО
+CountriesNotInEEC=Държави извън ЕИО
+CountriesInEECExceptMe=Държави в ЕИО, с изключение на %s
+CountriesExceptMe=Всички държави с изключение на %s
+AccountantFiles=Експортиране на счетоводни документи
 
-MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
-MainAccountForSuppliersNotDefined=Main accounting account for vendors not defined in setup
-MainAccountForUsersNotDefined=Main accounting account for users not defined in setup
-MainAccountForVatPaymentNotDefined=Main accounting account for VAT payment not defined in setup
-MainAccountForSubscriptionPaymentNotDefined=Main accounting account for subscription payment not defined in setup
+MainAccountForCustomersNotDefined=Основна счетоводна сметка за клиенти, която не е дефинирана в настройката
+MainAccountForSuppliersNotDefined=Основна счетоводна сметка за доставчици, която не е дефинирана в настройката
+MainAccountForUsersNotDefined=Основна счетоводна сметка за потребители, която не е дефинирана в настройката
+MainAccountForVatPaymentNotDefined=Основна счетоводна сметка за плащане на ДДС, която не е дефинирана в настройката
+MainAccountForSubscriptionPaymentNotDefined=Основна счетоводна сметка за плащане на абонамент, която не е дефинирана в настройката
 
-AccountancyArea=Accounting area
-AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
-AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
-AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making the journalization (writing record in Journals and General ledger)
-AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
+AccountancyArea=Секция за счетоводство
+AccountancyAreaDescIntro=Използването на счетоводния модул се извършва на няколко стъпки:
+AccountancyAreaDescActionOnce=Следните действия се изпълняват обикновено само веднъж или веднъж годишно...
+AccountancyAreaDescActionOnceBis=Следващите стъпки трябва да се направят, за да ви спестят време в бъдеще, като ви предлагат правилната счетоводна сметка по подразбиране при извършване на осчетоводяване (добавяне на записи в журнали и в главната счетоводна книга)
+AccountancyAreaDescActionFreq=Следните действия се изпълняват обикновено всеки месец, седмица или ден при много големи компании...
 
-AccountancyAreaDescJournalSetup=STEP %s: Create or check content of your journal list from menu %s
-AccountancyAreaDescChartModel=STEP %s: Create a model of chart of account from menu %s
-AccountancyAreaDescChart=STEP %s: Create or check content of your chart of account from menu %s
+AccountancyAreaDescJournalSetup=СТЪПКА %s: Създайте или проверете съдържанието на списъка с журнали от меню %s
+AccountancyAreaDescChartModel=СТЪПКА %s: Създайте модел на сметкоплана от меню %s
+AccountancyAreaDescChart=СТЪПКА %s: Създайте или проверете съдържанието на вашият сметкоплан от меню %s
 
-AccountancyAreaDescVat=STEP %s: Define accounting accounts for each VAT Rates. For this, use the menu entry %s.
-AccountancyAreaDescDefault=STEP %s: Define default accounting accounts. For this, use the menu entry %s.
-AccountancyAreaDescExpenseReport=STEP %s: Define default accounting accounts for each type of expense report. For this, use the menu entry %s.
-AccountancyAreaDescSal=STEP %s: Define default accounting accounts for payment of salaries. For this, use the menu entry %s.
-AccountancyAreaDescContrib=STEP %s: Define default accounting accounts for special expenses (miscellaneous taxes). For this, use the menu entry %s.
-AccountancyAreaDescDonation=STEP %s: Define default accounting accounts for donation. For this, use the menu entry %s.
-AccountancyAreaDescSubscription=STEP %s: Define default accounting accounts for member subscription. For this, use the menu entry %s.
-AccountancyAreaDescMisc=STEP %s: Define mandatory default account and default accounting accounts for miscellaneous transactions. For this, use the menu entry %s.
-AccountancyAreaDescLoan=STEP %s: Define default accounting accounts for loans. For this, use the menu entry %s.
-AccountancyAreaDescBank=STEP %s: Define accounting accounts and journal code for each bank and financial accounts. For this, use the menu entry %s.
-AccountancyAreaDescProd=STEP %s: Define accounting accounts on your products/services. For this, use the menu entry %s.
+AccountancyAreaDescVat=СТЪПКА %s: Определете счетоводните сметки за всяка ставка на ДДС. За това използвайте менюто %s.
+AccountancyAreaDescDefault=СТЪПКА %s: Определете счетоводните сметки по подразбиране. За това използвайте менюто %s.
+AccountancyAreaDescExpenseReport=СТЪПКА %s: Определете счетоводните сметки по подразбиране за всеки вид разходен отчет. За това използвайте менюто %s.
+AccountancyAreaDescSal=СТЪПКА %s: Определете счетоводните сметки по подразбиране за плащане на заплати. За това използвайте менюто %s.
+AccountancyAreaDescContrib=СТЪПКА %s: Определете счетоводните сметки по подразбиране за специални разходи (различни данъци). За това използвайте менюто %s.
+AccountancyAreaDescDonation=СТЪПКА %s: Определете счетоводните сметки по подразбиране за дарения. За това използвайте менюто %s.
+AccountancyAreaDescSubscription=СТЪПКА %s: Определете счетоводните сметки по подразбиране за членски внос. За това използвайте менюто %s.
+AccountancyAreaDescMisc=СТЪПКА %s: Определете задължителната сметка по подразбиране и счетоводните сметки по подразбиране за различни транзакции. За това използвайте менюто %s.
+AccountancyAreaDescLoan=СТЪПКА %s: Определете счетоводните сметки по подразбиране за кредити. За това използвайте менюто %s.
+AccountancyAreaDescBank=СТЪПКА %s: Определете счетоводните сметки и кодът на журнала за всяка банка и финансови сметки. За това използвайте менюто %s.
+AccountancyAreaDescProd=СТЪПКА %s: Определете счетоводните сметки за вашите продукти / услуги. За това използвайте менюто %s.
 
-AccountancyAreaDescBind=STEP %s: Check the binding between existing %s lines and accounting account is done, so application will be able to journalize transactions in Ledger in one click. Complete missing bindings. For this, use the menu entry %s.
-AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the Ledger. For this, go into menu <strong>%s</strong>, and click into button <strong>%s</strong>.
-AccountancyAreaDescAnalyze=STEP %s: Add or edit existing transactions and generate reports and exports.
+AccountancyAreaDescBind=СТЪПКА %s: Проверете обвързването между съществуващите %s реда и готовия счетоводен акаунт, така че системата да е в състояние да осчетоводи транзакции в главната счетоводна книга с едно кликване. Осъществете липсващите връзки. За това използвайте менюто %s.
+AccountancyAreaDescWriteRecords=СТЪПКА %s: Запишете транзакции в главната счетоводна книга. За това влезте в меню <strong>%s</strong> и кликнете върху бутон <strong>%s</strong>.
+AccountancyAreaDescAnalyze=СТЪПКА %s: Добавете или променете съществуващите транзакции и генерирайте отчети и експортни данни.
 
-AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make modification in a future.
+AccountancyAreaDescClosePeriod=СТЪПКА %s: Приключете периода, за да не може да се правят промени в бъдеще.
 
-TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup was not complete (accounting code journal not defined for all bank accounts)
-Selectchartofaccounts=Select active chart of accounts
-ChangeAndLoad=Change and load
-Addanaccount=Add an accounting account
-AccountAccounting=Accounting account
+TheJournalCodeIsNotDefinedOnSomeBankAccount=Задължителна стъпка в настройката не е завършена (счетоводен код на журнал не е определен за всички банкови сметки)
+Selectchartofaccounts=Изберете активен сметкоплан
+ChangeAndLoad=Променяне и зареждане
+Addanaccount=Добавяне на счетоводна сметка
+AccountAccounting=Счетоводна сметка
 AccountAccountingShort=Сметка
-SubledgerAccount=Subledger account
-SubledgerAccountLabel=Subledger account label
-ShowAccountingAccount=Show accounting account
-ShowAccountingJournal=Show accounting journal
-AccountAccountingSuggest=Accounting account suggested
-MenuDefaultAccounts=Default accounts
+SubledgerAccount=Счетоводна сметка
+SubledgerAccountLabel=Етикет на счетоводна сметка
+ShowAccountingAccount=Показване на счетоводна сметка
+ShowAccountingJournal=Показване на счетоводен журнал
+AccountAccountingSuggest=Предложена счетоводна сметка
+MenuDefaultAccounts=Сметки по подразбиране
 MenuBankAccounts=Банкови сметки
-MenuVatAccounts=Vat accounts
-MenuTaxAccounts=Tax accounts
-MenuExpenseReportAccounts=Expense report accounts
-MenuLoanAccounts=Loan accounts
-MenuProductsAccounts=Product accounts
-MenuClosureAccounts=Closure accounts
-ProductsBinding=Products accounts
-TransferInAccounting=Transfer in accounting
-RegistrationInAccounting=Registration in accounting
-Binding=Binding to accounts
-CustomersVentilation=Customer invoice binding
-SuppliersVentilation=Vendor invoice binding
-ExpenseReportsVentilation=Expense report binding
-CreateMvts=Create new transaction
-UpdateMvts=Modification of a transaction
-ValidTransaction=Validate transaction
-WriteBookKeeping=Register transactions in Ledger
-Bookkeeping=Ledger
-AccountBalance=Account balance
-ObjectsRef=Source object ref
-CAHTF=Total purchase vendor before tax
-TotalExpenseReport=Total expense report
-InvoiceLines=Lines of invoices to bind
-InvoiceLinesDone=Bound lines of invoices
-ExpenseReportLines=Lines of expense reports to bind
-ExpenseReportLinesDone=Bound lines of expense reports
-IntoAccount=Bind line with the accounting account
+MenuVatAccounts=Сметки за ДДС
+MenuTaxAccounts=Сметки за данъци
+MenuExpenseReportAccounts=Сметки за разходни отчети
+MenuLoanAccounts=Сметки за кредити
+MenuProductsAccounts=Сметки за продукти
+MenuClosureAccounts=Сметки за приключване
+ProductsBinding=Сметки за продукти
+TransferInAccounting=Трансфер към счетоводство
+RegistrationInAccounting=Регистрация в счетоводство
+Binding=Обвързване към сметки
+CustomersVentilation=Обвързване на фактура за продажба
+SuppliersVentilation=Обвързване на фактура за доставка
+ExpenseReportsVentilation=Обвързващ на разходен отчет
+CreateMvts=Създаване на нова транзакция
+UpdateMvts=Променяне на транзакция
+ValidTransaction=Валидиране на транзакция
+WriteBookKeeping=Регистриране на транзакции в главната счетоводна книга
+Bookkeeping=Главна счетоводна книга
+AccountBalance=Салдо по сметка
+ObjectsRef=Реф. източник на обект
+CAHTF=Обща покупка от доставчик преди ДДС
+TotalExpenseReport=Общ разходен отчет
+InvoiceLines=Редове на фактури за свързване
+InvoiceLinesDone=Свързани редове на фактури
+ExpenseReportLines=Редове на разходни отчети за свързване
+ExpenseReportLinesDone=Свързани редове на разходни отчети
+IntoAccount=Свързване на ред със счетоводна сметка
 
 
-Ventilate=Bind
-LineId=Id line
-Processing=Processing
-EndProcessing=Process terminated.
-SelectedLines=Selected lines
-Lineofinvoice=Line of invoice
-LineOfExpenseReport=Line of expense report
-NoAccountSelected=No accounting account selected
-VentilatedinAccount=Binded successfully to the accounting account
-NotVentilatedinAccount=Not bound to the accounting account
-XLineSuccessfullyBinded=%s products/services successfully bound to an accounting account
-XLineFailedToBeBinded=%s products/services were not bound to any accounting account
+Ventilate=Свързване
+LineId=Идентификатор на ред
+Processing=Обработване
+EndProcessing=Обработването е прекратено.
+SelectedLines=Избрани редове
+Lineofinvoice=Ред на фактура
+LineOfExpenseReport=Ред на разходен отчет
+NoAccountSelected=Не е избрана счетоводна сметка
+VentilatedinAccount=Успешно свързване към счетоводната сметка
+NotVentilatedinAccount=Не е свързан със счетоводната сметка
+XLineSuccessfullyBinded=%s продукти / услуги успешно са свързани към счетоводна сметка
+XLineFailedToBeBinded=%s продукти / услуги, които не са свързани с нито една счетоводна сметка
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to bind shown by page (maximum recommended: 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the page "Binding to do" by the most recent elements
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding done" by the most recent elements
+ACCOUNTING_LIMIT_LIST_VENTILATION=Брой елементи за свързване, показани на страница (препоръчително: 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Започнете сортирането на страницата „За свързване“, използвайки най-новите елементи
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Започнете сортирането на страницата „Извършено свързване“, използвайки най-новите елементи
 
-ACCOUNTING_LENGTH_DESCRIPTION=Truncate product & services description in listings after x chars (Best = 50)
-ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Truncate product & services account description form in listings after x chars (Best = 50)
-ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts (If you set value to 6 here, the account '706' will appear like '706000' on screen)
-ACCOUNTING_LENGTH_AACCOUNT=Дължина на счетоводните сметки на контрагенти (ако тук зададете стойност 6, сметка '401' ще се появи на екрана като '401000')
-ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zeros at the end of an accounting account. Needed by some countries (like Switzerland). If set to off (default), you can set the following two parameters to ask the application to add virtual zeros.
-BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
-ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal
-ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
+ACCOUNTING_LENGTH_DESCRIPTION=Съкращаване на описанието на продукти и услуги в списъци след х символа (препоръчително: 50)
+ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Съкращаване на описанието на сметката на продукти и услуги в списъци след x символа (препоръчително: 50)
+ACCOUNTING_LENGTH_GACCOUNT=Дължина на главните счетоводни сметки (ако тук зададете стойност "6", сметката "706" ще се появи на екрана като "706000")
+ACCOUNTING_LENGTH_AACCOUNT=Дължина на счетоводните сметки на контрагенти (ако тук зададете стойност "6", сметката "401" ще се появи на екрана като "401000")
+ACCOUNTING_MANAGE_ZERO=Разрешава управление на различен брой нули в края на счетоводна сметка. Необходимо е в някои страни като Швейцария. Ако е изключено (по подразбиране) може да зададете следните два параметъра, за да поискате от системата да добави виртуални нули.
+BANK_DISABLE_DIRECT_INPUT=Деактивиране на директно добавяне на транзакция в банкова сметка
+ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Активиране на експортиране на журнали в състояние на чернова
+ACCOUNTANCY_COMBO_FOR_AUX=Активиране на комбиниран списък за дъщерна сметка (може да създаде забавяне, ако имате много контрагенти)
 
-ACCOUNTING_SELL_JOURNAL=Sell journal
-ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
-ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal
-ACCOUNTING_EXPENSEREPORT_JOURNAL=Expense report journal
-ACCOUNTING_SOCIAL_JOURNAL=Social journal
-ACCOUNTING_HAS_NEW_JOURNAL=Has new Journal
+ACCOUNTING_SELL_JOURNAL=Журнал за продажби
+ACCOUNTING_PURCHASE_JOURNAL=Журнал за покупки
+ACCOUNTING_MISCELLANEOUS_JOURNAL=Общ журнал
+ACCOUNTING_EXPENSEREPORT_JOURNAL=Журнал за разходни отчети
+ACCOUNTING_SOCIAL_JOURNAL=Журнал за данъци
+ACCOUNTING_HAS_NEW_JOURNAL=Има нов журнал
 
-ACCOUNTING_RESULT_PROFIT=Result accounting account (Profit)
-ACCOUNTING_RESULT_LOSS=Result accounting account (Loss)
-ACCOUNTING_CLOSURE_DEFAULT_JOURNAL=Journal of closure
+ACCOUNTING_RESULT_PROFIT=Счетоводна сметка за резултат (печалба)
+ACCOUNTING_RESULT_LOSS=Счетоводна сметка за резултат (загуба)
+ACCOUNTING_CLOSURE_DEFAULT_JOURNAL=Журнал за приключване
 
-ACCOUNTING_ACCOUNT_TRANSFER_CASH=Accounting account of transitional bank transfer
-TransitionalAccount=Transitional bank transfer account
+ACCOUNTING_ACCOUNT_TRANSFER_CASH=Счетоводна сметка на преходен банков превод
+TransitionalAccount=Преходна сметка за банков превод
 
-ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait
-DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations
-ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions
+ACCOUNTING_ACCOUNT_SUSPENSE=Счетоводна сметка за изчакване
+DONATION_ACCOUNTINGACCOUNT=Счетоводна сметка за регистриране на дарения
+ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Счетоводен акаунт за регистриране на членски внос
 
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Accounting account by default for the sold products in EEC (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Accounting account by default for the sold products export out of EEC (used if not defined in the product sheet)
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (used if not defined in the service sheet)
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (used if not defined in the service sheet)
+ACCOUNTING_PRODUCT_BUY_ACCOUNT=Счетоводна сметка по подразбиране за закупени продукти (използва се, ако не е дефинирана в продуктовата карта)
+ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Счетоводна сметка по подразбиране за продадени продукти (използва се, ако не е дефинирана в продуктовата карта)
+ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Счетоводна сметка по подразбиране за продадени продукти в ЕИО (използва се, ако не е дефинирана в продуктовата карта)
+ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Счетоводна сметка по подразбиране за продадени продукти извън ЕИО (използва се, ако не е дефинирана в продуктовата карта)
+ACCOUNTING_SERVICE_BUY_ACCOUNT=Счетоводна сметка по подразбиране за закупени услуги (използва се, ако не е дефинирана в картата на услугата)
+ACCOUNTING_SERVICE_SOLD_ACCOUNT=Счетоводна сметка по подразбиране за продадени услуги (използва се, ако не е дефинирана в картата на услугата)
 
-Doctype=Тип на документа
+Doctype=Вид документ
 Docdate=Дата
-Docref=Справка
+Docref=Референция
 LabelAccount=Етикет на сметка
-LabelOperation=Label operation
-Sens=Sens
-LetteringCode=Lettering code
-Lettering=Lettering
-Codejournal=Дневник
-JournalLabel=Journal label
-NumPiece=Номер на част
-TransactionNumShort=Num. transaction
-AccountingCategory=Personalized groups
-GroupByAccountAccounting=Group by accounting account
-AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports.
-ByAccounts=By accounts
-ByPredefinedAccountGroups=By predefined groups
-ByPersonalizedAccountGroups=By personalized groups
-ByYear=С години
-NotMatch=Not Set
-DeleteMvt=Delete Ledger lines
-DelYear=Year to delete
-DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all lines of the Ledger for year and/or from a specific journal. At least one criterion is required.
-ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted)
-FinanceJournal=Finance journal
-ExpenseReportsJournal=Expense reports journal
-DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger.
-VATAccountNotDefined=Account for VAT not defined
-ThirdpartyAccountNotDefined=Account for third party not defined
-ProductAccountNotDefined=Account for product not defined
-FeeAccountNotDefined=Account for fee not defined
-BankAccountNotDefined=Account for bank not defined
-CustomerInvoicePayment=Payment of invoice customer
-ThirdPartyAccount=Сметка на контрагент 
-NewAccountingMvt=New transaction
-NumMvts=Numero of transaction
-ListeMvts=List of movements
-ErrorDebitCredit=Debit and Credit cannot have a value at the same time
-AddCompteFromBK=Add accounting accounts to the group
-ReportThirdParty=Списък със сметки на контрагенти
-DescThirdPartyReport=Консултирайте се тук със списъка на контрагенти клиенти и доставчици и техните счетоводни сметки
-ListAccounts=List of the accounting accounts
-UnknownAccountForThirdparty=Неизвестен профил на контрагента. Ще използваме %s
-UnknownAccountForThirdpartyBlocking=Неизвестен профил на контрагента. Блокираща грешка
-ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Third-party account not defined or third party unknown. We will use %s
-ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Third-party account not defined or third party unknown. Blocking error.
-UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Неизвестен профил на контрагента и чакаща сметка не са определени. Блокираща грешка
-PaymentsNotLinkedToProduct=Payment not linked to any product / service
+LabelOperation=Етикет на операция
+Sens=Значение
+LetteringCode=Буквен код
+Lettering=Означение
+Codejournal=Журнал
+JournalLabel=Етикет на журнал
+NumPiece=Пореден номер
+TransactionNumShort=Транзакция №
+AccountingCategory=Персонализирани групи
+GroupByAccountAccounting=Групиране по счетоводна сметка
+AccountingAccountGroupsDesc=Тук може да определите някои групи счетоводни сметки. Те ще бъдат използвани за персонализирани счетоводни отчети.
+ByAccounts=По сметки
+ByPredefinedAccountGroups=По предварително определени групи
+ByPersonalizedAccountGroups=По персонализирани групи
+ByYear=По година
+NotMatch=Не е зададено
+DeleteMvt=Изтриване на редове от книгата
+DelYear=Година за изтриване
+DelJournal=Журнал за изтриване
+ConfirmDeleteMvt=Това ще изтрие всички редове в книгата за година и / или от конкретен журнал. Изисква се поне един критерий.
+ConfirmDeleteMvtPartial=Това ще изтрие транзакцията от книгата (всички редове, свързани с една и съща транзакция ще бъдат изтрити)
+FinanceJournal=Финансов журнал
+ExpenseReportsJournal=Журнал за разходни отчети
+DescFinanceJournal=Финансов журнал, включващ всички видове плащания по банкова сметка
+DescJournalOnlyBindedVisible=Това е преглед на запис, който е свързан към счетоводна сметка и може да бъде добавен в книгата.
+VATAccountNotDefined= Не е определена сметка за ДДС
+ThirdpartyAccountNotDefined=Не е определена сметка за контрагент
+ProductAccountNotDefined=Не е определена сметка за продукт
+FeeAccountNotDefined=Не е определена сметка за такса
+BankAccountNotDefined=Не е определена сметка за банка
+CustomerInvoicePayment=Плащане на фактура за продажба
+ThirdPartyAccount=Сметка на контрагент
+NewAccountingMvt=Нова транзакция
+NumMvts=Брой транзакции
+ListeMvts=Списък на движения
+ErrorDebitCredit=Дебитът и кредитът не могат да имат стойност по едно и също време
+AddCompteFromBK=Добавяне на счетоводни сметки към групата
+ReportThirdParty=Списък на сметки на контрагенти
+DescThirdPartyReport=Преглед на списъка с клиенти и доставчици, и техните счетоводни сметки
+ListAccounts=Списък на счетоводни сметки
+UnknownAccountForThirdparty=Неизвестна сметна на контрагент. Ще използваме %s
+UnknownAccountForThirdpartyBlocking=Неизвестна сметка на контрагент. Блокираща грешка.
+ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Сметката на контрагента не е определена или контрагента е неизвестен. Ще използваме %s
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Сметката на контрагента не е определена или контрагента е неизвестен. Блокираща грешка.
+UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Неизвестна сметка на контрагент и сметка за изчакване не са определени. Блокираща грешка.
+PaymentsNotLinkedToProduct=Плащането не е свързано с нито един продукт / услуга
 
-Pcgtype=Group of account
-Pcgsubtype=Subgroup of account
-PcgtypeDesc=Group and subgroup of account are used as predefined 'filter' and 'grouping' criteria for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for accounting accounts of products to build the expense/income report.
+Pcgtype=Група от сметки
+Pcgsubtype=Подгрупа от сметки
+PcgtypeDesc=Групата и подгрупата на акаунта се използват като предварително зададени критерии за „филтриране“ и „групиране“ за някои счетоводни справки. Например „Приход“ или „Разход“ се използват като групи за счетоводни сметки на продукти за съставяне на справка за разходите / приходите.
 
-TotalVente=Total turnover before tax
-TotalMarge=Total sales margin
+TotalVente=Общ оборот преди ДДС
+TotalMarge=Общ марж на продажби
 
-DescVentilCustomer=Consult here the list of customer invoice lines bound (or not) to a product accounting account
-DescVentilMore=In most cases, if you use predefined products or services and you set the account number on the product/service card, the application will be able to make all the binding between your invoice lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on product/service cards or if you still have some lines not bound to an account, you will have to make a manual binding from the menu "<strong>%s</strong>".
-DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their product accounting account
-DescVentilTodoCustomer=Bind invoice lines not already bound with a product accounting account
-ChangeAccount=Change the product/service accounting account for selected lines with the following accounting account:
+DescVentilCustomer=Преглед на списъка с редове на фактури за продажба, свързани (или не) със счетоводна сметка на продукт
+DescVentilMore=В повечето случаи, ако използвате предварително дефинирани продукти или услуги и зададете номер на сметка в картата на продукта / услугата, то системата ще може да извърши всички свързвания между вашите редове на фактури и счетоводната сметка във вашия сметкоплан, просто с едно щракване с бутона <strong>"%s"</strong>. Ако сметката не е зададена в картата на продукта / услугата или ако все още имате някои редове, които не са свързани към сметка, то ще трябва да направите ръчно свързване от менюто "<strong>%s</strong>".
+DescVentilDoneCustomer=Преглед на списъка с редове на фактури за продажба и тяхната счетоводна сметка за продукти
+DescVentilTodoCustomer=Свързване на редове на фактури, които все още не са свързани със счетоводна сметка за продукт
+ChangeAccount=Променете счетоводната сметка на продукта / услугата за избрани редове със следната счетоводна сметка:
 Vide=-
-DescVentilSupplier=Consult here the list of vendor invoice lines bound or not yet bound to a product accounting account
-DescVentilDoneSupplier=Consult here the list of the lines of vendor invoices and their accounting account
-DescVentilTodoExpenseReport=Bind expense report lines not already bound with a fee accounting account
-DescVentilExpenseReport=Consult here the list of expense report lines bound (or not) to a fee accounting account
-DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on fees dictionary or if you still have some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
-DescVentilDoneExpenseReport=Consult here the list of the lines of expenses reports and their fees accounting account
+DescVentilSupplier=Преглед на списъка с редове на фактури за доставка, свързани (или все още не) със счетоводна сметка за продукт
+DescVentilDoneSupplier=Преглед на списъка с редове на фактури за доставка и тяхната счетоводна сметка
+DescVentilTodoExpenseReport=Свържете редове на разходни отчети, които все още не са свързани със счетоводна сметка за такса
+DescVentilExpenseReport=Преглед на списъка с редове на разходни отчети, свързани (или не) със счетоводна сметка за такса
+DescVentilExpenseReportMore=Ако настроите счетоводна сметка за видовете разходен отчет, то системата ще може да извърши всички свързвания между редовете на разходния отчет и счетоводната сметка във вашия сметкоплан, просто с едно щракване с бутона <strong>"%s"</strong>. Ако сметката не е зададена в речника с таксите или ако все още имате някои редове, които не са свързани с нито една сметка ще трябва да направите ръчно свързване от менюто "<strong>%s</strong>".
+DescVentilDoneExpenseReport=Преглед на списъка с редове на разходни отчети и тяхната счетоводна сметка за такса
 
-ValidateHistory=Bind Automatically
-AutomaticBindingDone=Automatic binding done
+ValidateHistory=Автоматично свързване
+AutomaticBindingDone=Автоматичното свързване завърши
 
-ErrorAccountancyCodeIsAlreadyUse=Възникна грешка, вие не можете да изтриете тази счетоводна сметка, защото се използва.
-MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s | Credit = %s
-Balancing=Balancing
-FicheVentilation=Binding card
-GeneralLedgerIsWritten=Transactions are written in the Ledger
-GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be journalized. If there is no other error message, this is probably because they were already journalized.
-NoNewRecordSaved=No more record to journalize
-ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
-ChangeBinding=Change the binding
-Accounted=Accounted in ledger
-NotYetAccounted=Not yet accounted in ledger
+ErrorAccountancyCodeIsAlreadyUse=Грешка, не може да изтриете тази счетоводна сметка, защото се използва.
+MvtNotCorrectlyBalanced=Движението не е правилно балансирано. Дебит = %s | Credit = %s
+Balancing=Балансиране
+FicheVentilation=Свързваща карта
+GeneralLedgerIsWritten=Транзакциите са записани в главната счетоводна книга
+GeneralLedgerSomeRecordWasNotRecorded=Някои от транзакциите не бяха осчетоводени. Ако няма друго съобщение за грешка, то това вероятно е, защото те вече са били осчетоводени.
+NoNewRecordSaved=Няма повече записи за осчетоводяване
+ListOfProductsWithoutAccountingAccount=Списък на продукти, които не са свързани с нито една счетоводна сметка
+ChangeBinding=Промяна на свързване
+Accounted=Осчетоводено в книгата
+NotYetAccounted=Все още не е осчетоводено в книгата
 
 ## Admin
-ApplyMassCategories=Apply mass categories
-AddAccountFromBookKeepingWithNoCategories=Available account not yet in the personalized group
-CategoryDeleted=Category for the accounting account has been removed
-AccountingJournals=Счетоводни дневници
-AccountingJournal=Accounting journal
-NewAccountingJournal=New accounting journal
-ShowAccoutingJournal=Show accounting journal
-Nature=Същност
-AccountingJournalType1=Miscellaneous operations
-AccountingJournalType2=Sales
-AccountingJournalType3=Purchases
+ApplyMassCategories=Прилагане на масови категории
+AddAccountFromBookKeepingWithNoCategories=Наличната сметка не е част от персонализирана група
+CategoryDeleted=Категорията за счетоводната сметка е премахната
+AccountingJournals=Счетоводни журнали
+AccountingJournal=Счетоводен журнал
+NewAccountingJournal=Нов счетоводен журнал
+ShowAccoutingJournal=Показване на счетоводен журнал
+NatureOfJournal=Nature of Journal
+AccountingJournalType1=Разнородни операции
+AccountingJournalType2=Продажби
+AccountingJournalType3=Покупки
 AccountingJournalType4=Банка
-AccountingJournalType5=Expenses report
-AccountingJournalType8=Складова наличност
-AccountingJournalType9=Has-new
-ErrorAccountingJournalIsAlreadyUse=This journal is already use
-AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu <b>%s</b> - <b>%s</b>
-NumberOfAccountancyEntries=Number of entries
-NumberOfAccountancyMovements=Number of movements
+AccountingJournalType5=Разходни отчети
+AccountingJournalType8=Инвентар
+AccountingJournalType9=Има нови
+ErrorAccountingJournalIsAlreadyUse=Този журнал вече се използва
+AccountingAccountForSalesTaxAreDefinedInto=Бележка: Счетоводната сметка за данък върху продажбите е дефинирана в меню <b>%s</b> - <b>%s</b>
+NumberOfAccountancyEntries=Брой записи
+NumberOfAccountancyMovements=Брой движения
 
 ## Export
-ExportDraftJournal=Export draft journal
-Modelcsv=Model of export
-Selectmodelcsv=Select a model of export
-Modelcsv_normal=Classic export
-Modelcsv_CEGID=Export for CEGID Expert Comptabilité
-Modelcsv_COALA=Export for Sage Coala
-Modelcsv_bob50=Export for Sage BOB 50
-Modelcsv_ciel=Export for Sage Ciel Compta or Compta Evolution
-Modelcsv_quadratus=Export for Quadratus QuadraCompta
-Modelcsv_ebp=Export for EBP
-Modelcsv_cogilog=Export for Cogilog
-Modelcsv_agiris=Export for Agiris
-Modelcsv_openconcerto=Export for OpenConcerto (Test)
-Modelcsv_configurable=Export CSV Configurable
-Modelcsv_FEC=Export FEC
-Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
-ChartofaccountsId=Chart of accounts Id
+ExportDraftJournal=Експортиране на журнал в чернова
+Modelcsv=Модел на експортиране
+Selectmodelcsv=Изберете модел на експортиране
+Modelcsv_normal=Класическо експортиране
+Modelcsv_CEGID=Експортиране за CEGID Expert Comptabilité
+Modelcsv_COALA=Експортиране за Sage Coala
+Modelcsv_bob50=Експортиране за Sage BOB 50
+Modelcsv_ciel=Експортиране за Sage Ciel Compta или Compta Evolution
+Modelcsv_quadratus=Експортиране за Quadratus QuadraCompta
+Modelcsv_ebp=Експортиране за EBP
+Modelcsv_cogilog=Експортиране за Cogilog
+Modelcsv_agiris=Експортиране за Agiris
+Modelcsv_LDCompta=Export for LD Compta (v9 & higher) (Test)
+Modelcsv_openconcerto=Експортиране за OpenConcerto (Тест)
+Modelcsv_configurable=Експортиране в конфигурируем CSV
+Modelcsv_FEC=Експортиране за FEC
+Modelcsv_Sage50_Swiss=Експортиране за Sage 50 Швейцария
+ChartofaccountsId=Идентификатор на сметкоплан
 
 ## Tools - Init accounting account on product / service
-InitAccountancy=Init accountancy
-InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accounting account defined for sales and purchases.
-DefaultBindingDesc=This page can be used to set a default account to use to link transactions record about payment salaries, donation, taxes and vat when no specific accounting account were already set.
-DefaultClosureDesc=This page can be used to set parameters to use to enclose a balance sheet.
-Options=Options
-OptionModeProductSell=Mode sales
-OptionModeProductSellIntra=Mode sales exported in EEC
-OptionModeProductSellExport=Mode sales exported in other countries
-OptionModeProductBuy=Mode purchases
-OptionModeProductSellDesc=Show all products with accounting account for sales.
-OptionModeProductSellIntraDesc=Show all products with accounting account for sales in EEC.
-OptionModeProductSellExportDesc=Show all products with accounting account for other foreign sales.
-OptionModeProductBuyDesc=Show all products with accounting account for purchases.
-CleanFixHistory=Remove accounting code from lines that not exists into charts of account
-CleanHistory=Reset all bindings for selected year
-PredefinedGroups=Predefined groups
-WithoutValidAccount=Without valid dedicated account
-WithValidAccount=With valid dedicated account
-ValueNotIntoChartOfAccount=This value of accounting account does not exist into chart of account
-AccountRemovedFromGroup=Account removed from group
-SaleLocal=Local sale
-SaleExport=Export sale
-SaleEEC=Sale in EEC
+InitAccountancy=Инициализиране на счетоводство
+InitAccountancyDesc=Тази страница може да се използва за инициализиране на счетоводна сметка за продукти и услуги, за които няма определена счетоводна сметка за продажби и покупки.
+DefaultBindingDesc=Тази страница може да се използва за задаване на сметка по подразбиране, която да се използва за свързване на записи за транзакции на плащания на заплати, дарения, данъци и ДДС, когато все още не е зададена конкретна счетоводна сметка.
+DefaultClosureDesc=This page can be used to set parameters used for accounting closures.
+Options=Опции
+OptionModeProductSell=Режим продажби
+OptionModeProductSellIntra=Режим продажби, изнасяни в ЕИО
+OptionModeProductSellExport=Режим продажби, изнасяни в други държави
+OptionModeProductBuy=Режим покупки
+OptionModeProductSellDesc=Показване на всички продукти със счетоводна сметка за продажби.
+OptionModeProductSellIntraDesc=Показване на всички продукти със счетоводна сметка за продажби в ЕИО.
+OptionModeProductSellExportDesc=Показване на всички продукти със счетоводна сметка за други чуждестранни продажби.
+OptionModeProductBuyDesc=Показване на всички продукти със счетоводна сметка за покупки.
+CleanFixHistory=Премахване на счетоводния код от редове, които не съществуват в сметкоплана
+CleanHistory=Нулиране на всички връзки за избраната година
+PredefinedGroups=Предварително определени групи
+WithoutValidAccount=Без валидна специална сметка
+WithValidAccount=С валидна специална сметка
+ValueNotIntoChartOfAccount=Тази стойност на счетоводната сметка не съществува в сметкоплана
+AccountRemovedFromGroup=Сметката е премахната от групата
+SaleLocal=Локална продажба
+SaleExport=Експортна продажба
+SaleEEC=Вътреобщностна продажба
 
 ## Dictionary
-Range=Range of accounting account
-Calculated=Calculated
-Formula=Formula
+Range=Обхват на счетоводна сметка
+Calculated=Изчислено
+Formula=Формула
 
 ## Error
-SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, please complete them
-ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See Home - Setup - Dictionaries)
-ErrorInvoiceContainsLinesNotYetBounded=You try to journalize some lines of the invoice <strong>%s</strong>, but some other lines are not yet bounded to accounting account. Journalization of all invoice lines for this invoice are refused.
-ErrorInvoiceContainsLinesNotYetBoundedShort=Some lines on invoice are not bound to accounting account.
-ExportNotSupported=The export format setuped is not supported into this page
-BookeppingLineAlreayExists=Lines already existing into bookkeeping
-NoJournalDefined=No journal defined
-Binded=Lines bound
-ToBind=Lines to bind
-UseMenuToSetBindindManualy=Lines not yet bound, use menu <a href="%s">%s</a> to make the binding manually
+SomeMandatoryStepsOfSetupWereNotDone=Някои задължителни стъпки за настройка не са направени, моля изпълнете ги.
+ErrorNoAccountingCategoryForThisCountry=Няма налична група счетоводни сметки за държава %s (Вижте Начално -> Настройка -> Речници)
+ErrorInvoiceContainsLinesNotYetBounded=Опитвате се да осчетоводите някои редове на фактура <strong>%s</strong>, но някои други редове все още не са свързани към счетоводна сметка. Осчетоводяването на всички редове във фактурата е отхвърлено.
+ErrorInvoiceContainsLinesNotYetBoundedShort=Някои редове във фактурата не са свързани със счетоводна сметка.
+ExportNotSupported=Настроеният формат за експортиране не се поддържа в тази страница
+BookeppingLineAlreayExists=Вече съществуващи редове в счетоводството
+NoJournalDefined=Няма определен журнал
+Binded=Свързани редове
+ToBind=Редове за свързване
+UseMenuToSetBindindManualy=Редовете все още не са свързани, използвайте меню <a href="%s">%s</a>, за да направите връзката ръчно
 
 ## Import
-ImportAccountingEntries=Accounting entries
-DateExport=Date export
-WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manually in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
-ExpenseReportJournal=Expense Report Journal
-InventoryJournal=Inventory Journal
+ImportAccountingEntries=Счетоводни записи
+DateExport=Дата на експортиране
+WarningReportNotReliable=Внимание, тази справка не се основава на главната счетоводна книга, така че не съдържа транзакция, ръчно променена в книгата. Ако осчетоводяването ви е актуално, то прегледът на счетоводството е по-точен.
+ExpenseReportJournal=Журнал за разходни отчети
+InventoryJournal=Журнал за инвентар
diff --git a/htdocs/langs/bg_BG/admin.lang b/htdocs/langs/bg_BG/admin.lang
index 3e25a421f3f..5d854aba2ac 100644
--- a/htdocs/langs/bg_BG/admin.lang
+++ b/htdocs/langs/bg_BG/admin.lang
@@ -574,7 +574,7 @@ Module510Name=Заплати
 Module510Desc=Записване и проследяване на плащанията към служители
 Module520Name=Кредити
 Module520Desc=Управление на кредити
-Module600Name=Известия
+Module600Name=Notifications on business event
 Module600Desc=Изпращане на известия по имейл, предизвикани от дадено събитие: за потребител (настройка, определена за всеки потребител), за контакти на контрагенти (настройка, определена за всеки контрагент) или за определени имейли
 Module600Long=Имайте предвид, че този модул изпраща имейли в реално време, когато настъпи дадено събитие. Ако търсите функция за изпращане на напомняния по имейл за събития от календара отидете в настройката на модула Календар.
 Module610Name=Продуктови варианти
@@ -672,7 +672,7 @@ Permission34=Изтриване на продукти
 Permission36=Преглед / управление на скрити продукти
 Permission38=Експортиране на продукти
 Permission41=Преглед на проекти и задачи (споделени проекти и проекти, в които съм определен за контакт). Въвеждане на отделено време, за служителя или неговите подчинени, по възложени задачи (График)
-Permission42=Създаване / редактиране на проекти (споделени проекти и проекти, в които съм определен за контакт). Създаване на задачи и възлагане на проекти и задачи на потребители
+Permission42=Създаване / променяне на проекти (споделени проекти и проекти, в които съм определен за контакт). Създаване на задачи и възлагане на проекти и задачи на потребители
 Permission44=Изтриване на проекти (споделени проекти и проекти, в които съм определен за контакт)
 Permission45=Експортиране на проекти
 Permission61=Преглед на интервенции
@@ -715,12 +715,12 @@ Permission122=Създаване / промяна на контрагенти, 
 Permission125=Изтриване на контрагенти, свързани с потребителя
 Permission126=Експортиране на контрагенти
 Permission141=Преглед на всички проекти и задачи (включително частни проекти, в които служителя не е определен за контакт)
-Permission142=Създаване / редактиране на всички проекти и задачи (включително частни проекти, в които служителя не е определен за контакт)
+Permission142=Създаване / променяне на всички проекти и задачи (включително частни проекти, в които служителя не е определен за контакт)
 Permission144=Изтриване на всички проекти и задачи (включително частни проекти, в които служителя не е определен за контакт)
 Permission146=Преглед на доставчици
 Permission147=Преглед на статистически данни
 Permission151=Преглед на платежни нареждания за директен дебит
-Permission152=Създаване / редактиране на платежни нареждания за директен дебит
+Permission152=Създаване / променяне на платежни нареждания за директен дебит
 Permission153=Изпращане / предаване на платежни нареждания за директен дебит
 Permission154=Записване на кредити / отхвърляния на платежни нареждания за директен дебит
 Permission161=Преглед на договори / абонаменти
@@ -736,12 +736,12 @@ Permission174=Преглед на всички пътувания и разхо
 Permission178=Експортиране на пътувания и разходи
 Permission180=Преглед на доставчици
 Permission181=Преглед на поръчки за покупка
-Permission182=Създаване / редактиране на поръчки за покупка
+Permission182=Създаване / променяне на поръчки за покупка
 Permission183=Валидиране на поръчки за покупка
 Permission184=Одобряване на поръчки за покупка
 Permission185=Потвърждаване или анулиране на поръчки за покупка
 Permission186=Получаване на поръчки за покупка
-Permission187=Затваряне на поръчки за покупка
+Permission187=Приключване на поръчки за покупка
 Permission188=Анулиране на поръчки за покупка
 Permission192=Създаване на линии
 Permission193=Анулиране на линии
@@ -770,7 +770,7 @@ Permission244=Преглед на съдържание на скрити кат
 Permission251=Преглед на други потребители и групи
 PermissionAdvanced251=Преглед на други потребители
 Permission252=Преглед на права на други потребители
-Permission253=Създаване / редактиране на други потребители, групи и разрешения
+Permission253=Създаване / променяне на други потребители, групи и разрешения
 PermissionAdvanced253=Създаване / промяна на вътрешни / външни потребители и права
 Permission254=Създаване / променя само на външни потребители
 Permission255=Промяна на парола на други потребители
@@ -787,7 +787,7 @@ Permission291=Преглед на тарифи
 Permission292=Задаване на права за тарифи
 Permission293=Промяна на тарифите на клиента
 Permission300=Преглед на баркодове
-Permission301=Създаване / редактиране на баркодове
+Permission301=Създаване / променяне на баркодове
 Permission302=Изтриване на баркодове
 Permission311=Преглед на услуги
 Permission312=Възлагане на услуга / абонамент към договор
@@ -809,7 +809,7 @@ Permission403=Валидиране на отстъпки
 Permission404=Изтриване на отстъпки
 Permission430=Използване на инструменти за отстраняване на грешки
 Permission511=Преглед на плащания на заплати
-Permission512=Създаване / редактиране на плащания на заплати
+Permission512=Създаване / променяне на плащания на заплати
 Permission514=Изтриване на плащания на заплати
 Permission517=Експортиране на заплати
 Permission520=Преглед на кредити
@@ -852,7 +852,7 @@ Permission1125=Изтриване на запитвания към достав
 Permission1126=Приключване на запитвания към доставчици
 Permission1181=Преглед на доставчици
 Permission1182=Преглед на поръчки за покупка
-Permission1183=Създаване / редактиране на поръчки за покупка
+Permission1183=Създаване / променяне на поръчки за покупка
 Permission1184=Валидиране на поръчки за покупка
 Permission1185=Одобряване на поръчки за покупка
 Permission1186=Поръчка на поръчки за покупка
@@ -862,7 +862,7 @@ Permission1190=Одобряване (второ одобрение) на пор
 Permission1201=Получава на резултат от експортиране
 Permission1202=Създаване / промяна на експортиране
 Permission1231=Преглед на фактури за доставка
-Permission1232=Създаване / редактиране на фактури за доставка
+Permission1232=Създаване / променяне на фактури за доставка
 Permission1233=Валидиране на фактури за доставка
 Permission1234=Изтриване на фактури за доставка
 Permission1235=Изпращане на фактури за доставка по имейл
@@ -895,10 +895,10 @@ Permission10002=Създаване / Промяна на съдържание в
 Permission10003=Създаване / Промяна на съдържание в уебсайт (динамичен php код). Опасно, трябва да бъде използвано само за ограничен кръг разработчици.
 Permission10005=Изтриване на съдържание в уебсайт
 Permission20001=Преглед на молби за отпуск (на служителя и неговите подчинени)
-Permission20002=Създаване / редактиране на молби за отпуск (на служителя и неговите подчинени)
+Permission20002=Създаване / променяне на молби за отпуск (на служителя и неговите подчинени)
 Permission20003=Изтриване на молби за отпуск
 Permission20004=Преглед на всички молби за отпуск (дори на служители които не са подчинени на служителя)
-Permission20005=Създаване / редактиране на всички молби за отпуск (дори на служители, които не са подчинени на служителя)
+Permission20005=Създаване / променяне на всички молби за отпуск (дори на служители, които не са подчинени на служителя)
 Permission20006=Администриране на молби за отпуск (настройка и актуализиране на баланса)
 Permission23001=Преглед на планирани задачи
 Permission23002=Създаване / промяна на планирани задачи
@@ -927,13 +927,13 @@ Permission59001=Преглед на търговски маржове
 Permission59002=Дефиниране на търговски маржове
 Permission59003=Преглед на всички потребителски маржове
 Permission63001=Преглед на ресурси
-Permission63002=Създаване / редактиране на ресурси
+Permission63002=Създаване / променяне на ресурси
 Permission63003=Изтриване на ресурси
 Permission63004=Свързване на ресурси към събития от календара
 DictionaryCompanyType=Видове контрагенти
 DictionaryCompanyJuridicalType=Правна форма на контрагенти
 DictionaryProspectLevel=Потенциал за перспектива
-DictionaryCanton=Области / региони
+DictionaryCanton=Области / Региони
 DictionaryRegion=Региони
 DictionaryCountry=Държави
 DictionaryCurrency=Валути
@@ -1175,7 +1175,7 @@ ExternalAccess=Външен / Интернет достъп
 MAIN_PROXY_USE=Използване на прокси сървър (в противен случай достъпът към интернет е директен)
 MAIN_PROXY_HOST=Прокси сървър: Име / Адрес
 MAIN_PROXY_PORT=Прокси сървър: Порт
-MAIN_PROXY_USER=Прокси сървър: Потребител
+MAIN_PROXY_USER=Прокси сървър: Потребителско име
 MAIN_PROXY_PASS=Прокси сървър: Парола
 DefineHereComplementaryAttributes=Определете тук всички допълнителни / персонализирани атрибути, които искате да бъдат включени за: %s
 ExtraFields=Допълнителни атрибути
@@ -1193,6 +1193,7 @@ ExtraFieldsSupplierOrders=Допълнителни атрибути (поръч
 ExtraFieldsSupplierInvoices=Допълнителни атрибути (фактури за покупка)
 ExtraFieldsProject=Допълнителни атрибути (проекти)
 ExtraFieldsProjectTask=Допълнителни атрибути (задачи)
+ExtraFieldsSalaries=Complementary attributes (salaries)
 ExtraFieldHasWrongValue=Атрибут %s има грешна стойност.
 AlphaNumOnlyLowerCharsAndNoSpace=само буквено-цифрови символи с малки букви без интервал
 SendmailOptionNotComplete=Внимание, в някои Linux системи, за да изпращате имейли от вашият имейл, в настройката на Sendmail трябва да имате опция -ba (параметър mail.force_extra_parameters във вашия php.ini файл). Ако някои получатели никога не получават имейли, опитайте да промените този PHP параметър на mail.force_extra_parameters = -ba).
@@ -1220,13 +1221,14 @@ SuhosinSessionEncrypt=Съхраняването на сесии е кодира
 ConditionIsCurrently=Понастоящем състоянието е %s
 YouUseBestDriver=Използвате драйвер %s, който е най-добрият драйвер в момента.
 YouDoNotUseBestDriver=Използвате драйвер %s, но драйвер %s е препоръчителен.
-NbOfProductIsLowerThanNoPb=Вие имате само %s продукти / услуги в базата данни. Това не изисква специално оптимизиране.
+NbOfObjectIsLowerThanNoPb=You have only %s %s in the database. This does not require any particular optimization.
 SearchOptim=Оптимизация на търсене
-YouHaveXProductUseSearchOptim=В базата данни имате %s продукти. Трябва да добавите константата PRODUCT_DONOTSEARCH_ANYWHERE със стойност "1" в страницата Начало - Настройки - Други настройки. Ограничете търсенето до началото на низове, което позволява базата данни да използва индекси, а вие да получите незабавен отговор.
+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.
 BrowserIsOK=Използвате уеб браузъра %s. Този браузър е добър от гледна точка на сигурност и производителност.
 BrowserIsKO=Използвате уеб браузъра %s. Известно е, че този браузър е лош избор от гледна точка на сигурност, производителност и надеждност. Препоръчително е да използвате Firefox, Chrome, Opera или Safari.
-XDebugInstalled=XDebug е зареден.
-XCacheInstalled=XCache е зареден.
+PHPModuleLoaded=PHP component %s is loaded
+PreloadOPCode=Preloaded OPCode is used
 AddRefInList=Показване на кода на клиента / доставчика в списъка (select list или combobox) и повечето от хипервръзките.<br>Контрагентите ще се появят с формат на името "CC12345 - SC45678 - Голяма фирма ЕООД", вместо "Голяма фирма ЕООД"
 AddAdressInList=Показване на списъка с информация за адреса на клиента / доставчика (изборен списък или комбиниран списък).<br>Контрагентите ще се появят с формат на името на "Голяма фирма ЕООД - ул. Първа № 2 П. код Град - България, вместо "Голяма фирма ЕООД"
 AskForPreferredShippingMethod=Запитване към контрагенти за предпочитан начин на доставка
@@ -1570,10 +1572,10 @@ AdvancedEditor=Разширен редактор
 ActivateFCKeditor=Активиране на разширен редактор за:
 FCKeditorForCompany=WYSIWIG създаване / промяна на описание на елементите и бележки (с изключение на продукти / услуги)
 FCKeditorForProduct=WYSIWIG  създаване / промяна на описание на продукти / услуги
-FCKeditorForProductDetails=WYSIWIG създаване / редактиране на продуктови редове за всички обекти (предложения, поръчки, фактури и др.). <font class="warning">Внимание: Използването на тази опция не се препоръчва, тъй като може да създаде проблеми с някои специални символи и при форматиране на страниците, по време на генериране на PDF файловете.</font>
+FCKeditorForProductDetails=WYSIWIG създаване / променяне на продуктови редове за всички обекти (предложения, поръчки, фактури и др.). <font class="warning">Внимание: Използването на тази опция не се препоръчва, тъй като може да създаде проблеми с някои специални символи и при форматиране на страниците, по време на генериране на PDF файловете.</font>
 FCKeditorForMailing= WYSIWIG създаване / промяна на масови имейли (Инструменти -> Масови имейли)
 FCKeditorForUserSignature=WYSIWIG създаване / промяна на подпис на потребители
-FCKeditorForMail=WYSIWIG създаване / редактиране на цялата поща (с изключение на Настройки - Електронна поща)
+FCKeditorForMail=WYSIWIG създаване / променяне на цялата поща (с изключение на Настройка -> Имейли)
 ##### Stock #####
 StockSetup=Настройка на модул Наличности
 IfYouUsePointOfSaleCheckModule=Ако използвате модула Точка за продажби (POS), предоставен по подразбиране или чрез външен модул, тази настройка може да бъде игнорирана от вашия POS модул. Повечето POS модули по подразбиране са разработени да създават веднага фактура, след което да намаляват наличностите, независимо от опциите тук. В случай, че имате нужда или не от автоматично намаляване на наличностите при регистриране на продажба от POS проверете и настройката на вашия POS модул.
@@ -1711,7 +1713,7 @@ AccountingPeriods=Счетоводни периоди
 AccountingPeriodCard=Счетоводен период
 NewFiscalYear=Нов счетоводен период
 OpenFiscalYear=Отваряне на счетоводен период
-CloseFiscalYear=Затваряне на счетоводен период
+CloseFiscalYear=Приключване на счетоводен период
 DeleteFiscalYear=Изтриване на счетоводен период
 ConfirmDeleteFiscalYear=Сигурни ли сте, че искате да изтриете този счетоводен период?
 ShowFiscalYear=Преглед на счетоводен период
@@ -1734,9 +1736,9 @@ ExpenseReportsRulesSetup=Настройка на модул Разходни о
 ExpenseReportNumberingModules=Модул за номериране на разходни отчети
 NoModueToManageStockIncrease=Не е активиран модул, способен да управлява автоматичното увеличаване на наличности. Увеличаването на наличности ще се извършва само при ръчно въвеждане.
 YouMayFindNotificationsFeaturesIntoModuleNotification=Може да откриете опции за известия по имейл като активирате и конфигурирате модула "Известия".
-ListOfNotificationsPerUser=Списък с известия за потребител*
-ListOfNotificationsPerUserOrContact=Списък с известия (събития), налични за потребител* или за контакт**
-ListOfFixedNotifications=Списък с фиксирани известия
+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
 GoOntoUserCardToAddMore=Отидете в раздела „Известия“ на съответния потребител, за да добавите или премахнете известия за този потребител
 GoOntoContactCardToAddMore=Отидете в раздела „Известия“ на съответния контрагент, за да добавите или премахнете известия за съответните контакти / адреси
 Threshold=Граница
@@ -1768,7 +1770,7 @@ ColorFormat=RGB цвета е в HEX формат, например: FF0000
 PositionIntoComboList=Позиция на реда в комбинирани списъци
 SellTaxRate=Ставка на данъка върху продажби
 RecuperableOnly=Да за ДДС "Не възприеман, но възстановим", предназначен за някои области във Франция. Запазете стойността "Не" във всички останали случаи.
-UrlTrackingDesc=Ако доставчикът или транспортната услуга предлага страница или уеб сайт за проверка на статуса на вашите пратки, то може да ги въведете тук. Може да използвате ключа {TRACKID} в URL параметрите, така че системата да го замени с проследяващия номер, който потребителят е въвел в картата на пратката.
+UrlTrackingDesc=Ако доставчикът или транспортната услуга предлага страница или уеб сайт за проверка на статуса на вашите пратки, то може да ги въведете тук. Може да използвате ключа {TRACKID} в URL параметрите, така че системата да го замени с проследяващия номер, който потребителят е въвел в картата на доставката.
 OpportunityPercent=Когато създавате нова възможност определяте приблизително очакваната сума от проекта / възможността. Според статуса на възможността тази сума ще бъде умножена по определения му процент, за да се оцени общата сума, която всичките ви възможности могат да генерират. Стойността е в проценти (между 0 и 100).
 TemplateForElement=Този шаблон е специализиран за елемент
 TypeOfTemplate=Тип шаблон
@@ -1898,6 +1900,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
 ThisValueCanOverwrittenOnUserLevel=Тази стойност може да бъде променена от профила на всеки потребител в раздела '%s'
 DefaultCustomerType=Тип контрагент по подразбиране във формуляра за създаване на "Нов клиент"
 ABankAccountMustBeDefinedOnPaymentModeSetup=Забележка: Банковата сметка трябва да бъде дефинирана в модула за всеки режим на плащане (Paypal, Stripe, ...), за да работи тази функция.
@@ -1911,7 +1918,7 @@ LogsLinesNumber=Брой редове, които да се показват в
 UseDebugBar=Използване на инструменти за отстраняване на грешки
 DEBUGBAR_LOGS_LINES_NUMBER=Брой последни редове на журнал, които да се пазят в конзолата
 WarningValueHigherSlowsDramaticalyOutput=Внимание, по-високите стойности забавят драматично производителността
-DebugBarModuleActivated=Модула "Инструменти за отстраняване на грешки" е активиран и забавя драматично интерфейса
+ModuleActivated=Module %s is activated and slows the interface
 EXPORTS_SHARE_MODELS=Моделите за експортиране се споделят с всички
 ExportSetup=Настройка на модула Експортиране на данни
 InstanceUniqueID=Уникален идентификатор на инстанцията
@@ -1928,3 +1935,5 @@ YouWillFindItOnYourIFTTTAccount=Ще го намерите във вашият I
 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
diff --git a/htdocs/langs/bg_BG/agenda.lang b/htdocs/langs/bg_BG/agenda.lang
index 74975f5a6e7..caeb1f309a4 100644
--- a/htdocs/langs/bg_BG/agenda.lang
+++ b/htdocs/langs/bg_BG/agenda.lang
@@ -58,11 +58,11 @@ MemberDeletedInDolibarr=Член %s е изтрит
 MemberSubscriptionAddedInDolibarr=Членски внос %s за член %s е добавен
 MemberSubscriptionModifiedInDolibarr=Членски внос %s за член %s е променен
 MemberSubscriptionDeletedInDolibarr=Членски внос %s за член %s е изтрит
-ShipmentValidatedInDolibarr=Пратка %s е валидирана
-ShipmentClassifyClosedInDolibarr=Пратка %s е фактурирана
-ShipmentUnClassifyCloseddInDolibarr=Пратка %s е повторно отворена
-ShipmentBackToDraftInDolibarr=Пратка %s е върната в статус чернова
-ShipmentDeletedInDolibarr=Пратка %s е изтрита
+ShipmentValidatedInDolibarr=Доставка %s е валидирана
+ShipmentClassifyClosedInDolibarr=Доставка %s е фактурирана
+ShipmentUnClassifyCloseddInDolibarr=Доставка %s е повторно отворена
+ShipmentBackToDraftInDolibarr=Доставка %s е върната в статус чернова
+ShipmentDeletedInDolibarr=Доставка %s е изтрита
 OrderCreatedInDolibarr=Поръчка %s е създадена
 OrderValidatedInDolibarr=Поръчка %s е валидирана
 OrderDeliveredInDolibarr=Поръчка %s е класифицирана като доставена
@@ -77,8 +77,8 @@ OrderSentByEMail=Клиентска поръчка %s е изпратена по
 InvoiceSentByEMail=Фактура за продажба %s е изпратена по имейл
 SupplierOrderSentByEMail=Поръчка за покупка %s е изпратена по имейл
 SupplierInvoiceSentByEMail=Фактура за покупка %s е изпратена по имейл
-ShippingSentByEMail=Пратка %s е изпратена по имейл
-ShippingValidated= Пратка %s е валидирана
+ShippingSentByEMail=Доставка %s е изпратена по имейл
+ShippingValidated= Доставка %s е валидирана
 InterventionSentByEMail=Интервенция %s е изпратена по имейл
 ProposalDeleted=Предложението е изтрито
 OrderDeleted=Поръчката е изтрита
diff --git a/htdocs/langs/bg_BG/assets.lang b/htdocs/langs/bg_BG/assets.lang
index f851bd810d3..aabd6c6e46c 100644
--- a/htdocs/langs/bg_BG/assets.lang
+++ b/htdocs/langs/bg_BG/assets.lang
@@ -22,7 +22,7 @@ AccountancyCodeAsset = Счетоводен код (актив)
 AccountancyCodeDepreciationAsset = Счетоводен код (сметка за амортизационни активи)
 AccountancyCodeDepreciationExpense = Счетоводен код (сметка за амортизационни разходи)
 NewAssetType=Нов вид актив
-AssetsTypeSetup=Настройка на тип активи
+AssetsTypeSetup=Настройка на вид активи
 AssetTypeModified=Видът на актива е променен
 AssetType=Вид актив
 AssetsLines=Активи
@@ -42,17 +42,17 @@ ModuleAssetsDesc = Описание на активи
 AssetsSetup = Настройка на активи
 Settings = Настройки
 AssetsSetupPage = Страница за настройка на активите
-ExtraFieldsAssetsType = Допълнителни атрибути (Вид на актива)
+ExtraFieldsAssetsType = Допълнителни атрибути (вид актив)
 AssetsType=Вид актив
-AssetsTypeId=№ на актива
-AssetsTypeLabel=Вид актив етикет
+AssetsTypeId=Идентификатор на вида актива
+AssetsTypeLabel=Етикет на вида актив
 AssetsTypes=Видове активи
 
 #
 # Menu
 #
 MenuAssets = Активи
-MenuNewAsset = Нов Актив
+MenuNewAsset = Нов актив
 MenuTypeAssets = Вид активи
 MenuListAssets = Списък
 MenuNewTypeAssets = Нов
diff --git a/htdocs/langs/bg_BG/bills.lang b/htdocs/langs/bg_BG/bills.lang
index cd16caffcc6..67960e29678 100644
--- a/htdocs/langs/bg_BG/bills.lang
+++ b/htdocs/langs/bg_BG/bills.lang
@@ -9,8 +9,8 @@ BillsCustomersUnpaidForCompany=Неплатени фактури за прода
 BillsSuppliersUnpaid=Неплатени фактури за доставка
 BillsSuppliersUnpaidForCompany=Неплатени фактури за доставка за %s
 BillsLate=Забавени плащания
-BillsStatistics=Статистика от фактури за продажба
-BillsStatisticsSuppliers=Статистика за фактури на доставка
+BillsStatistics=Статистика на фактури за продажба
+BillsStatisticsSuppliers=Статистика на фактури за доставка
 DisabledBecauseDispatchedInBookkeeping=Деактивирано, защото фактурата е изпратена за осчетоводяване
 DisabledBecauseNotLastInvoice=Деактивирано, защото фактурата не може да се изтрие. Има регистрирани следващи фактури с поредни номера и това ще създаде дупки в брояча.
 DisabledBecauseNotErasable=Деактивирано, защото не може да бъде изтрито
@@ -22,7 +22,7 @@ InvoiceDepositAsk=Фактура за авансово плащане
 InvoiceDepositDesc=Този вид фактура се използва, когато е получено авансово плащане.
 InvoiceProForma=Проформа фактура
 InvoiceProFormaAsk=Проформа фактура
-InvoiceProFormaDesc=<b>Проформа фактура</b> е първообраз на една истинска фактура, но няма счетоводна стойност.
+InvoiceProFormaDesc=<b>Проформа фактурата</b> е първообраз на истинска фактура, но няма счетоводна стойност.
 InvoiceReplacement=Заменяща фактура
 InvoiceReplacementAsk=Фактура заменяща друга фактура
 InvoiceReplacementDesc=<b>Заменяща фактура</b> се използва за анулиране и пълно заменяне на фактура без получено плащане. <br><br> Забележка: Само фактури без плащания по тях могат да бъдат заменяни. Ако фактурата, която заменяте, все още не е приключена, то тя ще бъде автоматично приключена като „Изоставена“.
@@ -44,7 +44,7 @@ NotConsumed=Не е консумирана
 NoReplacableInvoice=Няма заменими фактури
 NoInvoiceToCorrect=Няма фактура за коригиране
 InvoiceHasAvoir=Източник на едно или няколко кредитни известия
-CardBill=Карта на фактура
+CardBill=Карта
 PredefinedInvoices=Предварително дефинирани фактури
 Invoice=Фактура
 PdfInvoiceTitle=Фактура
@@ -75,8 +75,8 @@ ReceivedPayments=Получени плащания
 ReceivedCustomersPayments=Плащания получени от клиенти
 PayedSuppliersPayments=Направени плащания към доставчици
 ReceivedCustomersPaymentsToValid=Получени плащания от клиенти за валидиране
-PaymentsReportsForYear=Отчети за плащания за %s
-PaymentsReports=Отчети за плащания
+PaymentsReportsForYear=Справки за плащания за %s
+PaymentsReports=Справки за плащания
 PaymentsAlreadyDone=Вече направени плащания
 PaymentsBackAlreadyDone=Вече направени обратни плащания
 PaymentRule=Правило за плащане
@@ -95,6 +95,7 @@ PaymentHigherThanReminderToPay=Плащането е с по-висока сто
 HelpPaymentHigherThanReminderToPay=Внимание, сумата за плащане на една или повече фактури е по-висока от дължимата сума за плащане. <br> Редактирайте записа си, в противен случай потвърдете и обмислете създаването на кредитно известие за получената сума за всяка надплатена фактура.
 HelpPaymentHigherThanReminderToPaySupplier=Внимание, сумата за плащане на една или повече фактури е по-висока от дължимата сума за плащане. <br> Редактирайте записа си, в противен случай потвърдете и обмислете създаването на кредитно известие за излишъка, платен за всяка надплатена фактура.
 ClassifyPaid=Класифициране като 'Платена'
+ClassifyUnPaid=Classify 'Unpaid'
 ClassifyPaidPartially=Класифициране като 'Частично платена'
 ClassifyCanceled=Класифициране като 'Изоставена'
 ClassifyClosed=Класифициране като 'Приключена'
@@ -150,21 +151,21 @@ ErrorBillNotFound=Фактура %s не съществува
 ErrorInvoiceAlreadyReplaced=Грешка, опитахте да валидирате фактура, за да замените фактура %s, но тя вече е заменена с фактура %s.
 ErrorDiscountAlreadyUsed=Грешка, вече се използва отстъпка
 ErrorInvoiceAvoirMustBeNegative=Грешка, коригиращата фактура трябва да има отрицателна сума
-ErrorInvoiceOfThisTypeMustBePositive=Грешка, този тип фактура трябва да има положителна стойност
+ErrorInvoiceOfThisTypeMustBePositive=Грешка, този тип фактура трябва да има положителна сума
 ErrorCantCancelIfReplacementInvoiceNotValidated=Грешка, не може да се анулира фактура, която е била заменена от друга фактура, която все още е в състояние на чернова
 ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=Тази или друга част вече е използвана, така че сериите с отстъпки не могат да бъдат премахнати.
 BillFrom=От
 BillTo=За
-ActionsOnBill=Действия по фактура
+ActionsOnBill=Свързани събития
 RecurringInvoiceTemplate=Шаблонна / Повтаряща се фактура
 NoQualifiedRecurringInvoiceTemplateFound=Няма шаблонна повтаряща се фактура за генериране
 FoundXQualifiedRecurringInvoiceTemplate=Намерени са %s шаблонни повтарящи се фактури, отговарящи на изискванията за генериране.
 NotARecurringInvoiceTemplate=Не е шаблонна повтаряща се фактура
 NewBill=Нова фактура
 LastBills=Фактури: %s последни
-LatestTemplateInvoices=Шаблонни повтарящи се фактури: %s последни
-LatestCustomerTemplateInvoices=Шаблонни повтарящи се фактури за продажба: %s последни
-LatestSupplierTemplateInvoices=Шаблонни повтарящи се фактури за доставка: %s последни
+LatestTemplateInvoices=Шаблонни фактури: %s последни
+LatestCustomerTemplateInvoices=Шаблонни фактури за продажба: %s последни
+LatestSupplierTemplateInvoices=Шаблонни фактури за доставка: %s последни
 LastCustomersBills=Фактури за продажба: %s последни
 LastSuppliersBills=Фактури за доставка: %s последни
 AllBills=Всички фактури
@@ -173,14 +174,14 @@ OtherBills=Други фактури
 DraftBills=Чернови фактури
 CustomersDraftInvoices=Чернови фактури за продажба
 SuppliersDraftInvoices=Чернови фактури за доставка
-Unpaid=Неплатено
+Unpaid=Неплатена
 ConfirmDeleteBill=Сигурни ли сте, че искате да изтриете тази фактура?
 ConfirmValidateBill=Сигурни ли сте че, искате да валидирате тази фактура <b> %s </b>?
 ConfirmUnvalidateBill=Сигурен ли сте, че искате да върнете фактура <b>%s</b> в състояние на чернова?
-ConfirmClassifyPaidBill=Сигурни ли сте че, искате да маркирате фактура <b> %s </b> със статус платена?
+ConfirmClassifyPaidBill=Сигурни ли сте че, искате да класифицирате фактура <b> %s </b> като платена?
 ConfirmCancelBill=Сигурни ли сте, че искате да анулирате фактура <b> %s </b>?
 ConfirmCancelBillQuestion=Защо искате да класифицирате тази фактура като „Изоставена“?
-ConfirmClassifyPaidPartially=Сигурни ли сте че, искате да маркирате фактура <b> %s </b> със статус платена?
+ConfirmClassifyPaidPartially=Сигурни ли сте че, искате да класифицирате фактура <b> %s </b> като платена частично?
 ConfirmClassifyPaidPartiallyQuestion=Тази фактура не е платена изцяло. Каква е причината за приключване на тази фактура?
 ConfirmClassifyPaidPartiallyReasonAvoir=Неплатения остатък <b> (%s %s) </b> е предоставена отстъпка, тъй като плащането е извършено преди срока за плащане. Уреждам ДДС с кредитно известие.
 ConfirmClassifyPaidPartiallyReasonDiscount=Неплатения остатък <b> (%s %s) </b> е предоставена отстъпка, тъй като плащането е извършено преди срока за плащане.
@@ -192,7 +193,7 @@ ConfirmClassifyPaidPartiallyReasonOther=Сумата е изоставена п
 ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=Този избор е възможен, ако фактурата е снабдена с подходящи коментари. (Например: "Само данък, съответстващ на действително платената цена, дава право на приспадане")
 ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=В някои държави този избор е възможен, само ако фактурата съдържа правилни бележки.
 ConfirmClassifyPaidPartiallyReasonAvoirDesc=Използвайте този избор, ако всички други не са подходящи
-ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=<b> Лош клиент </b> е клиент, който отказва да плати дълга си.
+ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=<b>Лош клиент</b> е клиент, който отказва да плати дълга си.
 ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=Този избор се използва, когато плащането не е пълно, тъй като някои от продуктите са били върнати
 ConfirmClassifyPaidPartiallyReasonOtherDesc=Използвайте този избор, ако всички останали не са подходящи, например в следната ситуация:\n- плащането не е завършено, защото някои продукти са изпратени обратно\n- предявената сума е задължителна, понеже отстъпката е забравена\nВъв всички случаи, надхвърлената сума трябва да бъде коригирана в счетоводната система, чрез създаване на кредитно известие.
 ConfirmClassifyAbandonReasonOther=Друго
@@ -206,22 +207,36 @@ NumberOfBills=Брой фактури
 NumberOfBillsByMonth=Брой фактури на месец
 AmountOfBills=Сума на фактури
 AmountOfBillsHT=Сума на фактури (без ДДС)
-AmountOfBillsByMonthHT=Сума на фактури по месец (без данък)
+AmountOfBillsByMonthHT=Сума на фактури по месец (без ДДС)
 ShowSocialContribution=Показване на социален / фискален данък
-ShowBill=Покажи фактура
-ShowInvoice=Покажи фактура
-ShowInvoiceReplace=Покажи заменяща фактура
-ShowInvoiceAvoir=Покажи кредитно известие
+ShowBill=Показване на фактура
+ShowInvoice=Показване на фактура
+ShowInvoiceReplace=Показване на заменяща фактура
+ShowInvoiceAvoir=Показване на кредитно известие
 ShowInvoiceDeposit=Показване на авансова фактура
 ShowInvoiceSituation=Показване на ситуационна фактура
-ShowPayment=Покажи плащане
+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
+ShowPayment=Показване на плащане
 AlreadyPaid=Вече платено
 AlreadyPaidBack=Вече платено обратно
 AlreadyPaidNoCreditNotesNoDeposits=Вече платено (без кредитни известия и авансови плащания)
 Abandoned=Изоставена
 RemainderToPay=Неплатен остатък
 RemainderToTake=Остатъчна сума за получаване
-RemainderToPayBack=Оставаща сума за възстановяване
+RemainderToPayBack=Остатъчна сума за възстановяване
 Rest=Чакаща
 AmountExpected=Претендирана сума
 ExcessReceived=Получено превишение
@@ -230,7 +245,7 @@ EscompteOffered=Предложена отстъпка (плащане преди
 EscompteOfferedShort=Отстъпка
 SendBillRef=Изпращане на фактура %s
 SendReminderBillRef=Изпращане на фактура %s (напомняне)
-StandingOrders=Нареждания с директен дебит
+StandingOrders=Нареждания за директен дебит
 StandingOrder=Нареждане за директен дебит
 NoDraftBills=Няма чернови фактури
 NoOtherDraftBills=Няма други чернови фактури
@@ -263,11 +278,11 @@ Repeatables=Шаблони
 ChangeIntoRepeatableInvoice=Конвертиране в шаблонна фактура
 CreateRepeatableInvoice=Създаване на шаблонна фактура
 CreateFromRepeatableInvoice=Създаване от шаблонна фактура
-CustomersInvoicesAndInvoiceLines=Фактури клиенти и техните детайли
+CustomersInvoicesAndInvoiceLines=Фактури за продажба и техни детайли
 CustomersInvoicesAndPayments=Фактури за продажба и плащания
-ExportDataset_invoice_1=Фактури за продажба и техните детайли
+ExportDataset_invoice_1=Фактури за продажба и техни детайли
 ExportDataset_invoice_2=Фактури за продажба и плащания
-ProformaBill=Проформа Фактура
+ProformaBill=Проформа фактура
 Reduction=Отстъпка
 ReductionShort=Отст.
 Reductions=Отстъпки
@@ -279,8 +294,8 @@ EditRelativeDiscount=Промяна на относителна отстъпка
 AddGlobalDiscount=Създаване на абсолютна отстъпка
 EditGlobalDiscounts=Промяна на абсолютна отстъпка
 AddCreditNote=Създаване на кредитно известие
-ShowDiscount=Покажи отстъпка
-ShowReduc=Покажи намалението
+ShowDiscount=Показване на отстъпка
+ShowReduc=Показване на отстъпка
 RelativeDiscount=Относителна отстъпка
 GlobalDiscount=Глобална отстъпка
 CreditNote=Кредитно известие
@@ -292,8 +307,8 @@ DiscountFromCreditNote=Отстъпка от кредитно известие %
 DiscountFromDeposit=Авансови плащания от фактура %s
 DiscountFromExcessReceived=Плащания над стойността на фактура %s
 DiscountFromExcessPaid=Плащания над стойността на фактура %s
-AbsoluteDiscountUse=Този вид кредит може да се използва по фактура преди нейното валидиране
-CreditNoteDepositUse=Фактурата трябва да бъде валидирана, за да се използва този вид кредити
+AbsoluteDiscountUse=Този вид кредит може да се използва във фактура преди нейното валидиране
+CreditNoteDepositUse=Фактурата трябва да бъде валидирана, за да използвате този вид кредити
 NewGlobalDiscount=Нова абсолютна отстъпка
 NewRelativeDiscount=Нова относителна отстъпка
 DiscountType=Тип отстъпка
@@ -303,15 +318,15 @@ DiscountOfferedBy=Предоставена от
 DiscountStillRemaining=Налични отстъпки или кредити
 DiscountAlreadyCounted=Изразходвани отстъпки или кредити
 CustomerDiscounts=Отстъпки за клиенти
-SupplierDiscounts=Отстъпки на доставчици
+SupplierDiscounts=Отстъпки от доставчици
 BillAddress=Адрес за фактуриране
 HelpEscompte=Тази отстъпка представлява отстъпка, предоставена на клиента, тъй като плащането е извършено преди срока на плащане.
 HelpAbandonBadCustomer=Тази сума е изоставена (поради некоректен (лош) клиент) и се счита за изключителна загуба.
-HelpAbandonOther=Тази сума е изоставена, тъй като е била грешка (Например: неправилен клиент или фактура заменена от друга)
+HelpAbandonOther=Тази сума е изоставена, тъй като се дължи на грешка (например: неправилен клиент или фактура заменена от друга)
 IdSocialContribution=Идентификатор за плащане на социален / фискален данък
-PaymentId=Плащане ID
+PaymentId=Идентификатор за плащане
 PaymentRef=Реф. плащане
-InvoiceId=Фактура ID
+InvoiceId=Идентификатор на фактура
 InvoiceRef=Реф. фактура
 InvoiceDateCreation=Дата на създаване на фактура
 InvoiceStatus=Статус на фактура
@@ -327,7 +342,7 @@ ConfirmCloneInvoice=Сигурни ли сте, че искате да клон
 DisabledBecauseReplacedInvoice=Действието е деактивирано, тъй като фактурата е била заменена
 DescTaxAndDividendsArea=Тази секция показва обобщение на всички плащания, направени за специални разходи. Тук са включени само записи с плащания през определената година.
 NbOfPayments=Брой плащания
-SplitDiscount=Раздели отстъпката на две
+SplitDiscount=Разделяне на отстъпка
 ConfirmSplitDiscount=Сигурни ли сте, че искате да разделите тази отстъпка <b> %s </b> %s на две по-малки отстъпки?
 TypeAmountOfEachNewDiscount=Въведете сума за всяка от двете части:
 TotalOfTwoDiscountMustEqualsOriginal=Общата сума на двете нови отстъпки трябва да бъде равна на първоначалната сума за отстъпка.
@@ -340,7 +355,7 @@ LatestRelatedBill=Последна свързана фактура
 WarningBillExist=Внимание, вече съществуват една или повече фактури
 MergingPDFTool=Инструмент за обединяване на PDF документи
 AmountPaymentDistributedOnInvoice=Сума на плащане, разпределена по фактура
-PaymentOnDifferentThirdBills=Позволява плащания по различни фактури на контрагенти, но от едно и също дружество (фирма майка)
+PaymentOnDifferentThirdBills=Позволяване на плащания по различни фактури на контрагенти, но от едно и също дружество (фирма майка)
 PaymentNote=Бележка за плащане
 ListOfPreviousSituationInvoices=Списък на предишни ситуационни фактури
 ListOfNextSituationInvoices=Списък на следващи ситуационни фактури
@@ -373,7 +388,7 @@ WarningInvoiceDateTooFarInFuture=Внимание,  датата на факту
 ViewAvailableGlobalDiscounts=Преглед на налични отстъпки
 # PaymentConditions
 Statut=Статус
-PaymentConditionShortRECEP=При получаване
+PaymentConditionShortRECEP=Получаване
 PaymentConditionRECEP=При получаване
 PaymentConditionShort30D=30 дни
 PaymentCondition30D=30 дни
@@ -399,7 +414,7 @@ PaymentConditionShort14DENDMONTH=14 дни от края на месеца
 PaymentCondition14DENDMONTH=В рамките на 14 дни след края на месеца
 FixAmount=Фиксирана сума
 VarAmount=Променлива сума (%% общо)
-VarAmountOneLine=Променлива сума (%% общ.) - 1 ред с етикет "%s"
+VarAmountOneLine=Променлива сума (%% общо) - включва ред с етикет "%s"
 # PaymentType
 PaymentTypeVIR=Банков превод
 PaymentTypeShortVIR=Банков превод
@@ -415,27 +430,27 @@ PaymentTypeTIP=TIP (Документи срещу плащане)
 PaymentTypeShortTIP=Плащане по TIP
 PaymentTypeVAD=Онлайн плащане
 PaymentTypeShortVAD=Онлайн плащане
-PaymentTypeTRA=Банково извлечение
-PaymentTypeShortTRA=Чернова
+PaymentTypeTRA=Банкова гаранция
+PaymentTypeShortTRA=Гаранция
 PaymentTypeFAC=Фактор
 PaymentTypeShortFAC=Фактор
 BankDetails=Банкови данни
 BankCode=Банков код
 DeskCode=Код на клон
 BankAccountNumber=Номер на сметка
-BankAccountNumberKey=Контролната сума
+BankAccountNumberKey=Контролна сума
 Residence=Адрес
 IBANNumber=IBAN номер на сметка
 IBAN=IBAN
 BIC=BIC / SWIFT
-BICNumber=BIC/SWIFT код
+BICNumber=BIC / SWIFT код
 ExtraInfos=Допълнителна информация
 RegulatedOn=Регулирано на
 ChequeNumber=Чек №
 ChequeOrTransferNumber=Чек / Трансфер №
 ChequeBordereau=Чек график
-ChequeMaker=Чек/трансфер предавател
-ChequeBank=Банка на чека
+ChequeMaker=Подател на чек / трансфер
+ChequeBank=Банка на чек
 CheckBank=Чек
 NetToBePaid=Нето за плащане
 PhoneNumber=Тел
@@ -443,17 +458,17 @@ FullPhoneNumber=Телефон
 TeleFax=Факс
 PrettyLittleSentence=Приемене на размера на плащанията с чекове, издадени в мое име, като член на счетоводна асоциация, одобрена от данъчната администрация.
 IntracommunityVATNumber=ДДС №
-PaymentByChequeOrderedTo=Чекови плащания (с ДДС) се извършват до %s, изпратени на адрес
+PaymentByChequeOrderedTo=Чекови плащания (с ДДС) се извършват до %s, изпратени на
 PaymentByChequeOrderedToShort=Чекови плащания (с ДДС) се извършват до
 SendTo=изпратено до
 PaymentByTransferOnThisBankAccount=Плащане, чрез превод по следната банкова сметка
 VATIsNotUsedForInvoice=* Неприложим ДДС, art-293B от CGI
-LawApplicationPart1=Чрез прилагането на закон 80.335 от 12/05/80
+LawApplicationPart1=Чрез прилагане на закон 80.335 от 12/05/80
 LawApplicationPart2=стоките остават собственост на
 LawApplicationPart3=продавача до пълното плащане на
 LawApplicationPart4=тяхната цена.
 LimitedLiabilityCompanyCapital=SARL с капитал от
-UseLine=Приложи
+UseLine=Прилагане
 UseDiscount=Използване на отстъпка
 UseCredit=Използване на кредит
 UseCreditNoteInInvoicePayment=Намаляване на сумата за плащане с този кредит
@@ -468,12 +483,12 @@ Cheques=Чекове
 DepositId=Идентификатор на депозит
 NbCheque=Брой чекове
 CreditNoteConvertedIntoDiscount=Това %s е преобразувано в %s
-UsBillingContactAsIncoiveRecipientIfExist=Използване на контакт/адрес с тип "контакт за фактуриране" вместо адрес на контрагента като получател на фактури
-ShowUnpaidAll=Покажи всички неплатени фактури
-ShowUnpaidLateOnly=Покажи само забавените неплатени фактури
+UsBillingContactAsIncoiveRecipientIfExist=Използване на контакт / адрес с тип "контакт за фактуриране" вместо адрес на контрагента като получател на фактури
+ShowUnpaidAll=Показване на всички неплатени фактури
+ShowUnpaidLateOnly=Показване на забавени неплатени фактури
 PaymentInvoiceRef=Плащане по фактура %s
 ValidateInvoice=Валидиране на фактура
-ValidateInvoices=Потвърждаване на фактури
+ValidateInvoices=Валидиране на фактури
 Cash=В брой
 Reported=Закъснели
 DisabledBecausePayments=Не е възможно, тъй като има някои плащания
@@ -482,7 +497,7 @@ ExpectedToPay=Очаквано плащане
 CantRemoveConciliatedPayment=Съгласуваното плащане не може да се премахне
 PayedByThisPayment=Платено от това плащане
 ClosePaidInvoicesAutomatically=Класифицирайте "Платени" всички стандартни, авансови или заместващи фактури, които са платени напълно.
-ClosePaidCreditNotesAutomatically=Класифицирай 'Платени' всички кредитни известия, които са изцяло платени обратно.
+ClosePaidCreditNotesAutomatically=Класифицирайте "Платени" всички кредитни известия, които са изцяло платени обратно.
 ClosePaidContributionsAutomatically=Класифицирайте "Платени" всички социални или фискални вноски, които са платени напълно.
 AllCompletelyPayedInvoiceWillBeClosed=Всички фактури без остатък за плащане ще бъдат автоматично приключени със статус "Платени".
 ToMakePayment=Плати
@@ -506,9 +521,9 @@ TypeContact_facture_external_BILLING=Контакт по фактура за п
 TypeContact_facture_external_SHIPPING=Контакт по доставка
 TypeContact_facture_external_SERVICE=Контакт по обслужване
 TypeContact_invoice_supplier_internal_SALESREPFOLL=Представител по фактура за покупка
-TypeContact_invoice_supplier_external_BILLING=Контакт на доставчик по фактура
-TypeContact_invoice_supplier_external_SHIPPING=Контакт на доставчик по доставка
-TypeContact_invoice_supplier_external_SERVICE=Контакт на доставчик по услуга
+TypeContact_invoice_supplier_external_BILLING=Контакт по фактура за доставка
+TypeContact_invoice_supplier_external_SHIPPING=Контакт по доставка
+TypeContact_invoice_supplier_external_SERVICE=Контакт по обслужване
 # Situation invoices
 InvoiceFirstSituationAsk=Първа ситуационна фактура
 InvoiceFirstSituationDesc=<b>Ситуационните фактури</b> са вързани към ситуации отнасящи се до прогрес, например процес на конструиране. Всяка ситуация е свързана с една фактура.
@@ -542,7 +557,7 @@ ToCreateARecurringInvoiceGene=За да генерирате бъдещи фак
 ToCreateARecurringInvoiceGeneAuto=Ако трябва да генерирате такива фактури автоматично, помолете администратора да активира и настрои модула <strong> %s </strong>. Имайте предвид, че двата метода (ръчен и автоматичен) могат да се използват заедно, без риск от дублиране.
 DeleteRepeatableInvoice=Изтриване на шаблонна фактура
 ConfirmDeleteRepeatableInvoice=Сигурни ли сте, че искате да изтриете тази шаблонна фактура?
-CreateOneBillByThird=Създайте по една фактура за контрагент (в противен случай по фактура за поръчка)
+CreateOneBillByThird=Създаване на една фактура за контрагент (в противен случай по една фактура за поръчка)
 BillCreated=Създадени са %s фактури
 StatusOfGeneratedDocuments=Статус на генерираните документи
 DoNotGenerateDoc=Не генерирайте файл за документа
diff --git a/htdocs/langs/bg_BG/blockedlog.lang b/htdocs/langs/bg_BG/blockedlog.lang
index 1975a28d3ed..eaf5afb0924 100644
--- a/htdocs/langs/bg_BG/blockedlog.lang
+++ b/htdocs/langs/bg_BG/blockedlog.lang
@@ -1,5 +1,5 @@
 BlockedLog=Unalterable Logs
-Field=Област
+Field=Поле
 BlockedLogDesc=This module tracks some events into an unalterable log (that you can't modify once recorded) into a block chain, in real time. This module provides compatibility with requirements of laws of some countries (like France with the law Finance 2016 - Norme NF525).
 Fingerprints=Archived events and fingerprints
 FingerprintsDesc=This is the tool to browse or extract the unalterable logs. Unalterable logs are generated and archived locally into a dedicated table, in real time when you record a business event. You can use this tool to export this archive and save it into an external support (some countries, like France, ask that you do it every year). Note that, there is no feature to purge this log and every change tried to be done directly into this log (by a hacker for example) will be reported with a non-valid fingerprint. If you really need to purge this table because you used your application for a demo/test purpose and want to clean your data to start your production, you can ask your reseller or integrator to reset your database (all your data will be removed).
diff --git a/htdocs/langs/bg_BG/boxes.lang b/htdocs/langs/bg_BG/boxes.lang
index bff0882933e..0d8cccbc657 100644
--- a/htdocs/langs/bg_BG/boxes.lang
+++ b/htdocs/langs/bg_BG/boxes.lang
@@ -9,26 +9,26 @@ BoxLastCustomerBills=Последни фактури за продажба
 BoxOldestUnpaidCustomerBills=Най-стари неплатени фактури за продажба
 BoxOldestUnpaidSupplierBills=Най-стари неплатени фактури за доставка
 BoxLastProposals=Последни търговски предложения
-BoxLastProspects=Последно променени перспективи
+BoxLastProspects=Последно променени потенциални клиенти
 BoxLastCustomers=Последно променени клиенти
 BoxLastSuppliers=Последно променени доставчици
-BoxLastCustomerOrders=Последни клиентски поръчки
+BoxLastCustomerOrders=Последни поръчки за продажба
 BoxLastActions=Последни действия
 BoxLastContracts=Последни договори
 BoxLastContacts=Последни контакти / адреси
 BoxLastMembers=Последни членове
 BoxFicheInter=Последни интервенции
 BoxCurrentAccounts=Баланс по открити сметки
-BoxTitleLastRssInfos=Новини: %s  последни от %s
+BoxTitleLastRssInfos=Новини: %s последни от %s
 BoxTitleLastProducts=Продукти / Услуги: %s последно променени
 BoxTitleProductsAlertStock=Продукти: сигнали за наличност
-BoxTitleLastSuppliers=Доставчици: %s последно записани
+BoxTitleLastSuppliers=Доставчици: %s последно добавени
 BoxTitleLastModifiedSuppliers=Доставчици: %sпоследно променени
 BoxTitleLastModifiedCustomers=Клиенти: %s последно променени
-BoxTitleLastCustomersOrProspects=Клиенти или Перспективи: %s последно добавени
+BoxTitleLastCustomersOrProspects=Клиенти или потенциални клиенти: %s последно добавени
 BoxTitleLastCustomerBills=Фактури за продажба: %s последно добавени
 BoxTitleLastSupplierBills=Фактури за доставка: %s последно добавени
-BoxTitleLastModifiedProspects=Перспективи: %s последно променени
+BoxTitleLastModifiedProspects=Потенциални клиенти: %s последно променени
 BoxTitleLastModifiedMembers=Членове: %s последно добавени
 BoxTitleLastFicheInter=Интервенции: %s последно променени
 BoxTitleOldestUnpaidCustomerBills=Фактури за продажба: %s най-стари неплатени
@@ -36,50 +36,50 @@ BoxTitleOldestUnpaidSupplierBills=Фактури за доставка: %s на
 BoxTitleCurrentAccounts=Отворени сметки: баланси
 BoxTitleLastModifiedContacts=Контакти / Адреси: %s последно променени
 BoxMyLastBookmarks=Отметки: %s последни
-BoxOldestExpiredServices=Най-старите действащи изтекли услуги
-BoxLastExpiredServices=Договори: %s най-стари договори с активни изтичащи услуги
+BoxOldestExpiredServices=Най-стари изтекли активни услуги
+BoxLastExpiredServices=Договори: %s най-стари договори с активни изтекли услуги
 BoxTitleLastActionsToDo=Действия за извършване: %s последни
 BoxTitleLastContracts=Договори: %s последно променени
 BoxTitleLastModifiedDonations=Дарения: %s последно променени
 BoxTitleLastModifiedExpenses=Разходни отчети: %s последно променени
-BoxGlobalActivity=Обща активност (фактури, предложения, поръчки)
+BoxGlobalActivity=Глобална дейност (фактури, предложения, поръчки)
 BoxGoodCustomers=Добри клиенти
 BoxTitleGoodCustomers=%s Добри клиенти
 FailedToRefreshDataInfoNotUpToDate=Неуспешно опресняване на RSS поток. Последното успешно опресняване е на дата: %s
 LastRefreshDate=Последна дата на опресняване
-NoRecordedBookmarks=Няма дефинирани отметки.
-ClickToAdd=Щракнете тук, за да добавите.
-NoRecordedCustomers=Няма записани клиенти
-NoRecordedContacts=Няма записани контакти
-NoActionsToDo=Няма дейности за вършене
-NoRecordedOrders=Няма регистрирани клиентски поръчки
-NoRecordedProposals=Няма записани предложения
+NoRecordedBookmarks=Не са дефинирани отметки
+ClickToAdd=Кликнете тук, за да добавите.
+NoRecordedCustomers=Няма регистрирани клиенти
+NoRecordedContacts=Няма регистрирани контакти
+NoActionsToDo=Няма дейности за извършване
+NoRecordedOrders=Няма регистрирани поръчки за продажба
+NoRecordedProposals=Няма регистрирани предложения
 NoRecordedInvoices=Няма регистрирани фактури за продажба
 NoUnpaidCustomerBills=Няма регистрирани неплатени фактури за продажба
 NoUnpaidSupplierBills=Няма регистрирани неплатени фактури за доставка
 NoModifiedSupplierBills=Няма регистрирани фактури за доставка
 NoRecordedProducts=Няма регистрирани продукти / услуги
-NoRecordedProspects=Няма регистрирани перспективи
+NoRecordedProspects=Няма регистрирани потенциални клиенти
 NoContractedProducts=Няма договорени продукти / услуги
 NoRecordedContracts=Няма регистрирани договори
-NoRecordedInterventions=Няма записани намеси
+NoRecordedInterventions=Няма регистрирани интервенции
 BoxLatestSupplierOrders=Последни поръчки за покупка
 NoSupplierOrder=Няма регистрирани поръчка за покупка
-BoxCustomersInvoicesPerMonth=Фактури клиенти по месец
+BoxCustomersInvoicesPerMonth=Фактури за продажба на месец
 BoxSuppliersInvoicesPerMonth=Фактури за доставка на месец
-BoxCustomersOrdersPerMonth=Клиентски поръчки на месец
+BoxCustomersOrdersPerMonth=Поръчки за продажби на месец
 BoxSuppliersOrdersPerMonth=Поръчки за покупка на месец
-BoxProposalsPerMonth=Предложения за месец
-NoTooLowStockProducts=Няма продукт в наличност под желания минимум
+BoxProposalsPerMonth=Търговски предложения за месец
+NoTooLowStockProducts=Няма продукти в наличност, които да са под желания минимум.
 BoxProductDistribution=Дистрибуция на продукти / услуги
 ForObject=На %s
 BoxTitleLastModifiedSupplierBills=Фактури за доставка: %s последно променени
 BoxTitleLatestModifiedSupplierOrders=Поръчки за покупка: %s последно променени
 BoxTitleLastModifiedCustomerBills=Фактури за продажба: %s последно променени
-BoxTitleLastModifiedCustomerOrders=Клиентски поръчки: %s последно променени
+BoxTitleLastModifiedCustomerOrders=Поръчки за продажба: %s последно променени
 BoxTitleLastModifiedPropals=Търговски предложения: %s последно променени
-ForCustomersInvoices=Клиента фактури
-ForCustomersOrders=Клиентски поръчки
+ForCustomersInvoices=Фактури за продажба
+ForCustomersOrders=Поръчки на продажба
 ForProposals=Предложения
 LastXMonthRolling=Подвижни месеци: %s последно изтекли
 ChooseBoxToAdd=Добавяне на джаджа към таблото
diff --git a/htdocs/langs/bg_BG/cashdesk.lang b/htdocs/langs/bg_BG/cashdesk.lang
index cccc3f92130..1570f16cd8a 100644
--- a/htdocs/langs/bg_BG/cashdesk.lang
+++ b/htdocs/langs/bg_BG/cashdesk.lang
@@ -34,7 +34,7 @@ UserNeedPermissionToEditStockToUsePos=Искате да намалите нал
 DolibarrReceiptPrinter=Dolibarr принтер за квитанции
 PointOfSale=Точка на продажба
 PointOfSaleShort=POS
-CloseBill=Затваряне на сметка
+CloseBill=Приключване на сметка
 Floors=Floors
 Floor=Floor
 AddTable=Добавяне на таблица
@@ -63,7 +63,7 @@ AutoPrintTickets=Автоматично отпечатване на билети
 EnableBarOrRestaurantFeatures=Включете функции за бар или ресторант
 ConfirmDeletionOfThisPOSSale=Потвърждавате ли изтриването на настоящата продажба?
 History=История
-ValidateAndClose=Валидиране и затваряне
+ValidateAndClose=Валидиране и приключване
 Terminal=Терминал
 NumberOfTerminals=Брой терминали
 TerminalSelect=Изберете терминал, който искате да използвате:
diff --git a/htdocs/langs/bg_BG/companies.lang b/htdocs/langs/bg_BG/companies.lang
index 9f839183654..ba2a4225d02 100644
--- a/htdocs/langs/bg_BG/companies.lang
+++ b/htdocs/langs/bg_BG/companies.lang
@@ -1,31 +1,31 @@
 # Dolibarr language file - Source file is en_US - companies
 ErrorCompanyNameAlreadyExists=Името на фирмата %s вече съществува. Изберете друго.
-ErrorSetACountryFirst=Първо задайте държава
+ErrorSetACountryFirst=Първо изберете държава
 SelectThirdParty=Изберете контрагент
 ConfirmDeleteCompany=Сигурни ли сте че искате да изтриете тази компания и цялата наследена информация?
-DeleteContact=Изтриване на контакт/адрес
+DeleteContact=Изтриване на контакт / адрес
 ConfirmDeleteContact=Сигурни ли сте че искате да изтриете този контакт и цялата наследена информация?
 MenuNewThirdParty=Нов контрагент
 MenuNewCustomer=Нов клиент
-MenuNewProspect=Нова перспектива
+MenuNewProspect=Нов потенциален клиент
 MenuNewSupplier=Нов доставчик
 MenuNewPrivateIndividual=Ново физическо лице
-NewCompany=Нова фирма (перспектива, клиент, доставчик)
-NewThirdParty=Нов контрагент (перспектива, клиент, доставчик)
+NewCompany=Нова фирма (потенциален клиент, клиент, доставчик)
+NewThirdParty=Нов контрагент (потенциален клиент, клиент, доставчик)
 CreateDolibarrThirdPartySupplier=Създаване на контрагент (доставчик)
-CreateThirdPartyOnly=Създаване контрагент
+CreateThirdPartyOnly=Създаване на контрагент
 CreateThirdPartyAndContact=Създаване на контрагент + свързан контакт
-ProspectionArea=Област потенциални
-IdThirdParty=ID на контрагент
-IdCompany=ID на фирма
-IdContact=ID на контакт
-Contacts=Контакти/Адреси
+ProspectionArea=Секция за потенциални клиенти
+IdThirdParty=Идентификатор на контрагент
+IdCompany=Идентификатор на фирма
+IdContact=Идентификатор на контакт
+Contacts=Контакти / Адреси
 ThirdPartyContacts=Контакти на контрагента
 ThirdPartyContact=Контакт / Адрес на контрагента
 Company=Фирма
-CompanyName=Име на фирмата
+CompanyName=Име на фирма
 AliasNames=Друго име (търговско, марка, ...)
-AliasNameShort=Псевдоним
+AliasNameShort=Друго име
 Companies=Фирми
 CountryIsInEEC=Държавата е в рамките на Европейската икономическа общност
 PriceFormatInCurrentLanguage=Формат за показване на цената в текущия език и валута
@@ -33,44 +33,44 @@ ThirdPartyName=Име на контрагент
 ThirdPartyEmail=Имейл на контрагент
 ThirdParty=Контрагент
 ThirdParties=Контрагенти
-ThirdPartyProspects=Потенциални
-ThirdPartyProspectsStats=Потенциални
+ThirdPartyProspects=Потенциални клиенти
+ThirdPartyProspectsStats=Потенциални клиенти
 ThirdPartyCustomers=Клиенти
 ThirdPartyCustomersStats=Клиенти
-ThirdPartyCustomersWithIdProf12=Клиентите с %s или %s
+ThirdPartyCustomersWithIdProf12=Клиенти с %s или %s
 ThirdPartySuppliers=Доставчици
 ThirdPartyType=Вид на контрагента
-Individual=Частно лице
+Individual=Физическо лице
 ToCreateContactWithSameName=Автоматично ще създаде контакт / адрес със същата информация като в контрагента. В повечето случаи, дори ако вашия контрагент е частно лице, е достатъчно да създадете само контрагент.
 ParentCompany=Фирма майка
-Subsidiaries=Филиали
-ReportByMonth=Отчет по месец
-ReportByCustomers=Отчет по клиент
-ReportByQuarter=Отчет по оценка
-CivilityCode=Граждански код
+Subsidiaries=Дъщерни дружества
+ReportByMonth=Справка по месеци
+ReportByCustomers=Справка по клиенти
+ReportByQuarter=Справка по ставки
+CivilityCode=Код на обръщение
 RegisteredOffice=Седалище
 Lastname=Фамилия
 Firstname=Собствено име
 PostOrFunction=Длъжност
-UserTitle=Звание
-NatureOfThirdParty=Същност контрагента
+UserTitle=Обръщение
+NatureOfThirdParty=Произход на контрагента
 Address=Адрес
 State=Област
-StateShort=Състояние
+StateShort=Област
 Region=Регион
-Region-State=Регион - Щат
+Region-State=Регион - Област
 Country=Държава
-CountryCode=Код на държавата
-CountryId=ID на държава
+CountryCode=Код на държава
+CountryId=Идентификатор на държава
 Phone=Телефон
 PhoneShort=Тел.
 Skype=Скайп
-Call=Повикай
-Chat=Чат
+Call=Позвъни на
+Chat=Чат с
 PhonePro=Сл. телефон
 PhonePerso=Дом. телефон
 PhoneMobile=Моб. телефон
-No_Email=Отказване от масови имейли
+No_Email=Отхвърляне на масови имейли
 Fax=Факс
 Zip=Пощенски код
 Town=Град
@@ -80,9 +80,9 @@ DefaultLang=Език по подразбиране
 VATIsUsed=Използване на ДДС
 VATIsUsedWhenSelling=Това определя дали този контрагент  включва ДДС или не, когато фактурира на своите собствени клиенти
 VATIsNotUsed=Не използва ДДС
-CopyAddressFromSoc=Копирай адреса от детайлите на контрагента
-ThirdpartyNotCustomerNotSupplierSoNoRef=Контрагента не е нито клиент, нито доставчик, няма налични свързани обекти
-ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Контрагента не е нито клиент, нито доставчик, няма възможност за отстъпки
+CopyAddressFromSoc=Копиране на адрес на контрагент
+ThirdpartyNotCustomerNotSupplierSoNoRef=Контрагента не е нито клиент, нито доставчик и няма налични свързани обекти
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Контрагента не е нито клиент, нито доставчик и няма възможност за отстъпки
 PaymentBankAccount=Разплащателна банкова сметка
 OverAllProposals=Предложения
 OverAllOrders=Поръчки
@@ -99,7 +99,7 @@ LocalTax1ES=RE
 LocalTax2ES=IRPF
 WrongCustomerCode=Невалиден код на клиент
 WrongSupplierCode=Невалиден код на доставчик
-CustomerCodeModel=Образец на код на клиент
+CustomerCodeModel=Модел за код на клиент
 SupplierCodeModel=Модел за код на доставчик
 Gencod=Баркод
 ##### Professional ID #####
@@ -115,8 +115,8 @@ ProfId3=Професионален ID 3
 ProfId4=Професионален ID 4
 ProfId5=Професионален ID 5
 ProfId6=Професионален ID 6
-ProfId1AR=Проф. Id 1 (CUIT/CUIL)
-ProfId2AR=Проф. Id 2 (доход бруто)
+ProfId1AR=Проф. номер 1 (CUIT/CUIL)
+ProfId2AR=Проф. номер 2 (доход бруто)
 ProfId3AR=-
 ProfId4AR=-
 ProfId5AR=-
@@ -200,7 +200,7 @@ ProfId4IN=Prof Id 4
 ProfId5IN=Prof Id 5
 ProfId6IN=-
 ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
-ProfId2LU=Id. prof. 2  (Бизнес разрешение)
+ProfId2LU=Id. prof. 2 (Business permit)
 ProfId3LU=-
 ProfId4LU=-
 ProfId5LU=-
@@ -209,7 +209,7 @@ ProfId1MA=Id prof. 1 (R.C.)
 ProfId2MA=Id prof. 2 (Patente)
 ProfId3MA=Id prof. 3 (I.F.)
 ProfId4MA=Id prof. 4 (C.N.S.S.)
-ProfId5MA=Ид. проф. 5 5 (Общ идентификационен номер на фирмата)
+ProfId5MA=Id. prof. 5 (I.C.E.)
 ProfId6MA=-
 ProfId1MX=Prof Id 1 (R.F.C).
 ProfId2MX=Prof Id 2 (R..P. IMSS)
@@ -261,25 +261,25 @@ VATIntra=Идент. номер по ДДС
 VATIntraShort=ДДС №
 VATIntraSyntaxIsValid=Синтаксиса е валиден
 VATReturn=ДДС декларация
-ProspectCustomer=Потенциален / Клиент
-Prospect=Потенциален
+ProspectCustomer=Потенциален клиент / Клиент
+Prospect=Потенциален клиент
 CustomerCard=Клиентска карта
 Customer=Клиент
 CustomerRelativeDiscount=Относителна клиентска отстъпка
-SupplierRelativeDiscount=Относителна отстъпка от доставчика
+SupplierRelativeDiscount=Относителна отстъпка от доставчик
 CustomerRelativeDiscountShort=Относителна отстъпка
 CustomerAbsoluteDiscountShort=Абсолютна отстъпка
-CompanyHasRelativeDiscount=Този клиент има по подразбиране отстъпка <b>%s%%</b>
+CompanyHasRelativeDiscount=Този клиент има отстъпка по подразбиране в размер на <b>%s%%</b>
 CompanyHasNoRelativeDiscount=Този клиент няма относителна отстъпка по подразбиране
 HasRelativeDiscountFromSupplier=Имате отстъпка по подразбиране от<b> %s%% </b> от този доставчик
 HasNoRelativeDiscountFromSupplier=Нямате относителна отстъпка по подразбиране от този доставчик
 CompanyHasAbsoluteDiscount=Този клиент има налични отстъпки (кредитни известия или авансови плащания) за <b> %s </b> %s
 CompanyHasDownPaymentOrCommercialDiscount=Този клиент има налични отстъпки (търговски предложения, авансови плащания) за <b> %s </b> %s
-CompanyHasCreditNote=Този клиент все още има кредити за <b>%s</b> %s
-HasNoAbsoluteDiscountFromSupplier=Нямате наличен отстъпка от този доставчик
+CompanyHasCreditNote=Този клиент все още има кредитни известия в размер на <b>%s</b> %s
+HasNoAbsoluteDiscountFromSupplier=Нямате налична отстъпка от този доставчик
 HasAbsoluteDiscountFromSupplier=Имате налични отстъпки (кредитно известие или авансови плащания) за <b> %s </b> %s от този доставчик
 HasDownPaymentOrCommercialDiscountFromSupplier=Имате налични отстъпки (търговски предложения, авансови плащания) за <b> %s </b> %s от този доставчик
-HasCreditNoteFromSupplier=Имате кредитно известия за <b> %s </b> от  %s този доставчик
+HasCreditNoteFromSupplier=Имате кредитни известия за <b> %s </b> %s от този доставчик
 CompanyHasNoAbsoluteDiscount=Този клиент не разполага с наличен кредит за отстъпка
 CustomerAbsoluteDiscountAllUsers=Абсолютни клиентски отстъпки (предоставени от всички потребители)
 CustomerAbsoluteDiscountMy=Абсолютни клиентски отстъпки (предоставена от вас)
@@ -288,18 +288,18 @@ SupplierAbsoluteDiscountMy=Абсолютни отстъпки от достав
 DiscountNone=Няма
 Vendor=Доставчик
 Supplier=Доставчик
-AddContact=Създай контакт
-AddContactAddress=Създй контакт/адрес
-EditContact=Редактиране на контакт
-EditContactAddress=Редактиране на контакт/адрес
+AddContact=Създаване на контакт
+AddContactAddress=Създаване на контакт / адрес
+EditContact=Променяне на контакт
+EditContactAddress=Променяне на контакт / адрес
 Contact=Контакт
-ContactId=Контакт
-ContactsAddresses=Контакти/Адреси
+ContactId=Идентификатор на контакт
+ContactsAddresses=Контакти / Адреси
 FromContactName=Име:
-NoContactDefinedForThirdParty=Няма зададен контакт за тази контрагент
-NoContactDefined=Няма зададен контакт
-DefaultContact=Контакт/адрес по подразбиране
-AddThirdParty=Създаване контрагент
+NoContactDefinedForThirdParty=Няма дефиниран контакт за този контрагент
+NoContactDefined=Няма дефиниран контакт
+DefaultContact=Контакт / адрес по подразбиране
+AddThirdParty=Създаване на контрагент
 DeleteACompany=Изтриване на фирма
 PersonalInformations=Лични данни
 AccountancyCode=Счетоводна сметка
@@ -309,92 +309,92 @@ CustomerCodeShort=Код на клиента
 SupplierCodeShort=Код на доставчика
 CustomerCodeDesc=Код на клиента, уникален за всички клиенти
 SupplierCodeDesc=Код на доставчика, уникален за всички доставчици
-RequiredIfCustomer=Изисква се, ако контрагентът е клиент или потенциален
+RequiredIfCustomer=Изисква се, ако контрагентът е клиент или потенциален клиент
 RequiredIfSupplier=Изисква се, ако контрагента е доставчик
 ValidityControledByModule=Валидност, контролирана от модул
 ThisIsModuleRules=Правила за този модул
-ProspectToContact=Потенциален за контакт
+ProspectToContact=Потенциален клиент за контакт
 CompanyDeleted=Фирма "%s" е изтрита от базата данни.
-ListOfContacts=Списък на контакти/адреси
+ListOfContacts=Списък на контакти / адреси
 ListOfContactsAddresses=Списък на контакти / адреси
 ListOfThirdParties=Списък на контрагенти
 ShowCompany=Показване на контрагент
-ShowContact=Покажи контакт
+ShowContact=Показване на контакт
 ContactsAllShort=Всички (без филтър)
-ContactType=Тип на контакт
-ContactForOrders=Контакт за поръчката
-ContactForOrdersOrShipments=Контакт за поръчки или пратки
+ContactType=Тип контакт
+ContactForOrders=Контакт за поръчка
+ContactForOrdersOrShipments=Контакт за поръчка или доставка
 ContactForProposals=Контакт за предложение
 ContactForContracts=Контакт за договор
 ContactForInvoices=Контакт за фактура
-NoContactForAnyOrder=Този контакт не е контакт за поръчка
-NoContactForAnyOrderOrShipments=Този контакт не е контакт за поръчка или пратка
-NoContactForAnyProposal=Този контакт не е контакт за търговско предложение
-NoContactForAnyContract=Този контакт не е контакт за договор
-NoContactForAnyInvoice=Този контакт не е контакт за фактура
+NoContactForAnyOrder=Не е контакт за поръчка
+NoContactForAnyOrderOrShipments=Не е контакт за поръчка или доставка
+NoContactForAnyProposal=Не е контакт за търговско предложение
+NoContactForAnyContract=Не е контакт за договор
+NoContactForAnyInvoice=Не е контакт за фактура
 NewContact=Нов контакт
 NewContactAddress=Нов контакт / адрес
-MyContacts=Моите контакти
+MyContacts=Мои контакти
 Capital=Капитал
-CapitalOf=Столица на %s
-EditCompany=Редактиране на фирма
-ThisUserIsNot=Този потребител не е перспектива, нито клиент, нито доставчик
+CapitalOf=Капитал от %s
+EditCompany=Променяне на фирма
+ThisUserIsNot=Този потребител не е потенциален клиент, нито клиент, нито доставчик
 VATIntraCheck=Проверка
-VATIntraCheckDesc=Идентификационния номер по ДДС трябва да включва префикса на държавата. Връзката <b> %s </b> използва услугата на Европейската Комисия за проверка на ДДС (VIES), която изисква достъп до интернет извън сървъра на Dolibarr.
+VATIntraCheckDesc=Идентификационния номер по ДДС трябва да включва префикса на държавата. Връзката <b> %s </b> използва услугата на Европейската комисия за проверка на номер по ДДС (VIES), която изисква достъп до интернет извън сървъра на Dolibarr.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
-VATIntraCheckableOnEUSite=Проверяване на вътрешно-общностния идентификационен номер по ДДС на интернет страницата на Европейската Комисия
-VATIntraManualCheck=Можете също така да проверите ръчно на интернет страницата на Европейската Комисия <a href="%s" target="_blank"> %s </a>
-ErrorVATCheckMS_UNAVAILABLE=Проверката не е възможнао. Услугата не се предоставя от държавата-членка (%s).
-NorProspectNorCustomer=Нито перспектива, нито клиент
+VATIntraCheckableOnEUSite=Проверяване на вътрешно-общностния идентификационен номер по ДДС в интернет страницата на Европейската Комисия
+VATIntraManualCheck=Може да проверите също така ръчно в интернет страницата на Европейската Комисия: <a href="%s" target="_blank"> %s </a>
+ErrorVATCheckMS_UNAVAILABLE=Проверка не е възможна. Услугата за проверка не се предоставя от държавата-членка (%s).
+NorProspectNorCustomer=Нито потенциален клиент, нито клиент
 JuridicalStatus=Правна форма
 Staff=Служители
-ProspectLevelShort=Потенциален
-ProspectLevel=Потенциален
-ContactPrivate=Частен
+ProspectLevelShort=Потенциал
+ProspectLevel=Потенциал
+ContactPrivate=Личен
 ContactPublic=Споделен
 ContactVisibility=Видимост
 ContactOthers=Друг
-OthersNotLinkedToThirdParty=Други, не свързани с контрагент
-ProspectStatus=Потенциален статус
+OthersNotLinkedToThirdParty=Другите, не свързани с контрагент
+ProspectStatus=Статус на клиента
 PL_NONE=Няма
 PL_UNKNOWN=Неизвестен
-PL_LOW=Ниско
-PL_MEDIUM=Средно
-PL_HIGH=Високо
+PL_LOW=Нисък
+PL_MEDIUM=Среден
+PL_HIGH=Висок
 TE_UNKNOWN=-
-TE_STARTUP=Стартира
+TE_STARTUP=Стартъп
 TE_GROUP=Голяма фирма
-TE_MEDIUM=Средно голяма фирма
+TE_MEDIUM=Средна фирма
 TE_ADMIN=Правителствена
 TE_SMALL=Малка фирма
 TE_RETAIL=Търговец на дребно
 TE_WHOLE=Търговец на едро
-TE_PRIVATE=Частно лице
+TE_PRIVATE=Физическо лице
 TE_OTHER=Друг
-StatusProspect-1=Да не контактува
-StatusProspect0=Никога не е контактувано
+StatusProspect-1=Да не се контактува
+StatusProspect0=Не е контактувано
 StatusProspect1=Да се контактува
-StatusProspect2=Контакт в процес
-StatusProspect3=Контактът е направен
-ChangeDoNotContact=Промяна на статуса до 'Да не контактува';
-ChangeNeverContacted=Промяна на статуса до 'Никога не е контактувано';
-ChangeToContact=Промяна на статуса на „Да се контактува“
-ChangeContactInProcess=Промяна на статуса до 'Контакт в процес'
-ChangeContactDone=Промяна на статуса до 'Да се контактува'
-ProspectsByStatus=Потенциални по статус
+StatusProspect2=В процес на контактуване
+StatusProspect3=Осъществен контакт
+ChangeDoNotContact=Променяне на статуса на "Да не се контактува"
+ChangeNeverContacted=Променяне на статуса на "Не е контактувано"
+ChangeToContact=Променяне на статуса на "Да се контактува"
+ChangeContactInProcess=Променяне на статуса на "В процес на контактуване"
+ChangeContactDone=Променяне на статуса на "Осъществен контакт"
+ProspectsByStatus=Потенциални клиенти по статус
 NoParentCompany=Няма
-ExportCardToFormat=Износна карта формат
-ContactNotLinkedToCompany=Контактът не е свързан с никой контрагент
-DolibarrLogin=Dolibarr вход
-NoDolibarrAccess=Няма Dolibarr достъп
-ExportDataset_company_1=Контрагенти (фирми / фондации / частни лица) и техните характеристики
+ExportCardToFormat=Карта за експортиране във формат
+ContactNotLinkedToCompany=Контактът не е свързан с нито един контрагент
+DolibarrLogin=Dolibarr потребител
+NoDolibarrAccess=Няма достъп до Dolibarr
+ExportDataset_company_1=Контрагенти (фирми / фондации / физически лица) и техните характеристики
 ExportDataset_company_2=Контакти и техните характеристики
 ImportDataset_company_1=Контрагенти и техните характеристики
 ImportDataset_company_2=Допълнителни контакти / адреси и атрибути към контрагента
-ImportDataset_company_3=Банкови сметки на контрагентите
-ImportDataset_company_4=Търговски представители на контрагента (назначени търговски представители / потребители на към фирмите)
+ImportDataset_company_3=Банкови сметки на контрагенти
+ImportDataset_company_4=Търговски представители за контрагента (назначени търговски представители / потребители към фирмите)
 PriceLevel=Ценово ниво
-PriceLevelLabels=Имена на ценовите нива
+PriceLevelLabels=Етикети на ценови нива
 DeliveryAddress=Адрес за доставка
 AddAddress=Добавяне на адрес
 SupplierCategory=Категория на доставчика
@@ -404,31 +404,31 @@ ConfirmDeleteFile=Сигурен ли сте, че искате да изтри
 AllocateCommercial=Назначен търговски представител
 Organization=Организация
 FiscalYearInformation=Фискална година
-FiscalMonthStart=Начален месец на фискалната година
-YouMustAssignUserMailFirst=Трябва да създадете имейл за този потребител, преди да можете да добавите известие по имейл.
-YouMustCreateContactFirst=За да можете да добавяте известия по имейл, първо трябва да определите контакти с валидни имейли за контрагента
-ListSuppliersShort=Списък на доставчиците
-ListProspectsShort=Списък на перспективите
-ListCustomersShort=Списък на клиентите
+FiscalMonthStart=Начален месец на фискална година
+YouMustAssignUserMailFirst=Трябва да създадете имейл за този потребител, преди да може да добавите известие по имейл.
+YouMustCreateContactFirst=За да може да добавяте известия по имейл, първо трябва да определите контакти с валидни имейли за контрагента
+ListSuppliersShort=Списък на доставчици
+ListProspectsShort=Списък на потенциални клиенти
+ListCustomersShort=Списък на клиенти
 ThirdPartiesArea=Контрагенти / контакти
 LastModifiedThirdParties=Контрагенти: %s последно променени
 UniqueThirdParties=Общ брой контрагенти
 InActivity=Отворен
 ActivityCeased=Затворен
 ThirdPartyIsClosed=Контрагента е затворен
-ProductsIntoElements=Списък на продуктите/услугите в %s
-CurrentOutstandingBill=Текуща висяща сметка
-OutstandingBill=Макс. за висяща сметка
-OutstandingBillReached=Максималния кредитен лимит е достигнат
+ProductsIntoElements=Списък на продукти / услуги в %s
+CurrentOutstandingBill=Текуща неизплатена сметка
+OutstandingBill=Максимална неизплатена сметка
+OutstandingBillReached=Достигнат е максимумът за неизплатена сметка
 OrderMinAmount=Минимално количество за поръчка
-MonkeyNumRefModelDesc=Генерира номер с формат %sYYMM-NNNN за код на клиент и %sYYMM-NNNN за код на доставчик, където YY е година, MM е месецa, а NNNN е поредица без прекъсване и без връщане към 0.
-LeopardNumRefModelDesc=Кодът е безплатен. Този код може да бъде променен по всяко време.
-ManagingDirectors=Име на управител(и) (гл. изп. директор, директор, президент...)
+MonkeyNumRefModelDesc=Генерира номер с формат %syymm-nnnn за код на клиент и %syymm-nnnn за код на доставчик, където yy е година, mm е месецa, а nnnn е поредица без прекъсване и без връщане към 0.
+LeopardNumRefModelDesc=Кодът е свободен. Този код може да бъде променян по всяко време.
+ManagingDirectors=Име на управител (изпълнителен директор, директор, президент...)
 MergeOriginThirdparty=Дублиращ контрагент (контрагентът, който искате да изтриете)
-MergeThirdparties=Сливане на контрагенти
+MergeThirdparties=Обединяване на контрагенти
 ConfirmMergeThirdparties=Сигурни ли сте, че искате да обедините този контрагент с текущия? Всички свързани обекти (фактури, поръчки, ...) ще бъдат преместени в текущия контрагент, след което контрагента ще бъде изтрит.
 ThirdpartiesMergeSuccess=Контрагентите са обединени
-SaleRepresentativeLogin=Входна информация за търговския представител
+SaleRepresentativeLogin=Входна информация за търговски представител
 SaleRepresentativeFirstname=Собствено име на търговския представител
 SaleRepresentativeLastname=Фамилия на търговския представител
 ErrorThirdpartiesMerge=При изтриването на контрагента възникна грешка. Моля, проверете историята. Промените са отменени.
diff --git a/htdocs/langs/bg_BG/contracts.lang b/htdocs/langs/bg_BG/contracts.lang
index 97a5594bab1..4009928c061 100644
--- a/htdocs/langs/bg_BG/contracts.lang
+++ b/htdocs/langs/bg_BG/contracts.lang
@@ -2,7 +2,7 @@
 ContractsArea=Секция за договори
 ListOfContracts=Списък на договори
 AllContracts=Всички договори
-ContractCard=Карта
+ContractCard=Договор
 ContractStatusNotRunning=Не се изпълнява
 ContractStatusDraft=Чернова
 ContractStatusValidated=Валидиран
diff --git a/htdocs/langs/bg_BG/donations.lang b/htdocs/langs/bg_BG/donations.lang
index d4d23b26c78..e9d89f90726 100644
--- a/htdocs/langs/bg_BG/donations.lang
+++ b/htdocs/langs/bg_BG/donations.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - donations
 Donation=Дарение
 Donations=Дарения
-DonationRef=Дарение
+DonationRef=Реф. дарение
 Donor=Дарител
 AddDonation=Създаване на дарение
 NewDonation=Ново дарение
@@ -9,26 +9,26 @@ DeleteADonation=Изтриване на дарение
 ConfirmDeleteADonation=Сигурни ли сте, че искате да изтриете това дарение?
 ShowDonation=Показване на дарение
 PublicDonation=Публично дарение
-DonationsArea=Дарения
-DonationStatusPromiseNotValidated=Обещано дарение
-DonationStatusPromiseValidated=Потвърдено дарение
-DonationStatusPaid=Получено дарение
-DonationStatusPromiseNotValidatedShort=Проект
-DonationStatusPromiseValidatedShort=Потвърдено
+DonationsArea=Секция за дарения
+DonationStatusPromiseNotValidated=Чернова
+DonationStatusPromiseValidated=Валидирано
+DonationStatusPaid=Получено
+DonationStatusPromiseNotValidatedShort=Чернова
+DonationStatusPromiseValidatedShort=Валидирано
 DonationStatusPaidShort=Получено
 DonationTitle=Разписка за дарение
 DonationDatePayment=Дата на плащане
-ValidPromess=Потвърждаване на дарението
+ValidPromess=Валидиране на дарение
 DonationReceipt=Разписка за дарение
-DonationsModels=Образци на документи за разписки за дарения
+DonationsModels=Модели на документи за разписки за дарения
 LastModifiedDonations=Дарения: %s последно променени
-DonationRecipient=Получател на дарението
-IConfirmDonationReception=Получателят декларира, че е получил дарение на стойност
-MinimumAmount=Минималното количество е %s
-FreeTextOnDonations=Свободен текст, който да се показва в долния колонтитул
+DonationRecipient=Получател на дарение
+IConfirmDonationReception=Получателят декларира полученото като дарение на следната сума
+MinimumAmount=Минималната сума е %s
+FreeTextOnDonations=Свободен текст в дарения
 FrenchOptions=Опции за Франция
-DONATION_ART200=Показване на артикул 200 от CGI ако сте загрижени
-DONATION_ART238=Показване на артикул 238 от CGI ако сте загрижени
-DONATION_ART885=Показване на артикул 885 от CGI ако сте загрижени
+DONATION_ART200=Показване на артикул 200 от CGI, ако сте загрижени
+DONATION_ART238=Показване на артикул 238 от CGI, ако сте загрижени
+DONATION_ART885=Показване на артикул 885 от CGI, ако сте загрижени
 DonationPayment=Плащане на дарение
 DonationValidated=Дарение %s е валидирано
diff --git a/htdocs/langs/bg_BG/errors.lang b/htdocs/langs/bg_BG/errors.lang
index 5818039f365..a277ca94c52 100644
--- a/htdocs/langs/bg_BG/errors.lang
+++ b/htdocs/langs/bg_BG/errors.lang
@@ -7,7 +7,7 @@ ErrorButCommitIsDone=Бяха намерени грешки, но въпреки
 ErrorBadEMail=Имейлът %s е грешен
 ErrorBadUrl=Адреса %s не е
 ErrorBadValueForParamNotAString=Неправилна стойност за параметъра ви. Обикновено, когато липсва превод.
-ErrorLoginAlreadyExists=Вход %s вече съществува.
+ErrorLoginAlreadyExists=Потребителят %s вече съществува.
 ErrorGroupAlreadyExists=Група %s вече съществува.
 ErrorRecordNotFound=Запишете не е намерен.
 ErrorFailToCopyFile=Не успя да копира файла <b>&quot;%s&quot;</b> в <b>&quot;%s&quot;.</b>
@@ -90,7 +90,7 @@ ErrorSpecialCharNotAllowedForField=Специални знаци не са ра
 ErrorNumRefModel=Позоваване съществува в база данни (%s) и не е съвместим с това правило за номериране. Премахване на запис или преименува препратка към активира този модул.
 ErrorQtyTooLowForThisSupplier=Прекалено ниско количество за този доставчик или не е определена цена на продукта за този доставчик
 ErrorOrdersNotCreatedQtyTooLow=Някои поръчки не са създадени поради твърде ниски количества
-ErrorModuleSetupNotComplete=Настройката на модула изглежда непълна. Отидете на Начало - Настройка - Модули, за да я завършите.
+ErrorModuleSetupNotComplete=Setup of module %s looks to be uncomplete. Go on Home - Setup - Modules to complete.
 ErrorBadMask=Грешка на маска
 ErrorBadMaskFailedToLocatePosOfSequence=Грешка, маска без поредния номер
 ErrorBadMaskBadRazMonth=Грешка, неправилна стойност за нулиране
@@ -102,7 +102,7 @@ ErrorProdIdAlreadyExist=%s се възлага на друга трета
 ErrorFailedToSendPassword=Не може да се изпрати парола
 ErrorFailedToLoadRSSFile=Не успее да получи RSS Feed. Опитайте се да добавите постоянно MAIN_SIMPLEXMLLOAD_DEBUG ако съобщения за грешки не предоставя достатъчно информация.
 ErrorForbidden=Достъпът отказан. <br>Опитвате се да отворите страница, зона или функция на деактивиран модул или сте в неудостоверена сесия или това не е позволено за Вашия потребител.
-ErrorForbidden2=Разрешение за вход може да бъде определена от вашия администратор Dolibarr от менюто %s-> %s.
+ErrorForbidden2=Права за този потребител могат да бъдат определени от вашият Dolibarr администратор в меню %s -> %s.
 ErrorForbidden3=Изглежда, че Dolibarr не се използва чрез заверено сесия. Обърнете внимание на документация за настройка Dolibarr за знаят как да управляват удостоверявания (Htaccess, mod_auth или други ...).
 ErrorNoImagickReadimage=Клас Imagick не се намира в тази PHP. Без визуализация могат да бъдат на разположение. Администраторите могат да деактивирате тази раздела от менюто Setup - Display.
 ErrorRecordAlreadyExists=Запис вече съществува
@@ -219,6 +219,7 @@ ErrorURLMustStartWithHttp=URL адресът %s трябва да започва
 ErrorNewRefIsAlreadyUsed=Грешка, новата референция вече е използвана
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Грешка, изтриването на плащане, свързано с приключена фактура, е невъзможно.
 # 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. Може да се използва от външен модул/интерфейс, но ако не е необходимо да дефинирате потребителско име или парола за член може да деактивирате опцията "Управление на вход за всеки член" от настройката на модула Членове. Ако трябва да управлявате вход, но не се нуждаете от парола, можете да запазите това поле празно, за да избегнете това предупреждение. Забележка: Имейлът може да се използва и като вход, ако членът е свързан с потребител.
 WarningMandatorySetupNotComplete=Кликнете тук, за да настроите задължителните параметри
 WarningEnableYourModulesApplications=Кликнете тук, за да активирате вашите модули и приложения
@@ -230,7 +231,7 @@ WarningsOnXLines=Предупреждения върху <b>%s</b> линии и
 WarningNoDocumentModelActivated=Не е активиран модел за генериране на документи. Няма да бъде избран модел по подразбиране, докато не проверите настройката на модула.
 WarningLockFileDoesNotExists=Внимание, след като инсталацията приключи, трябва да деактивирате инструментите за инсталиране/миграция, като добавите файл <b>install.lock</b> в директорията <b>%s</b>. Липсата на този файл е сериозен риск за сигурността.
 WarningUntilDirRemoved=Всички предупреждения за сигурността (видими само от администраторите) ще останат активни, докато е налице уязвимостта (или се добави константа MAIN_REMOVE_INSTALL_WARNING в Настройка -> Други настройки).
-WarningCloseAlways=Внимание, затваряне се прави, дори ако сумата се различава между източника и целеви елементи. Активирайте тази функция с повишено внимание.
+WarningCloseAlways=Внимание, приключването се извършва, дори ако количеството се различава между източника и целевите елементи. Активирайте тази функция с повишено внимание.
 WarningUsingThisBoxSlowDown=Предупреждение, използвайки това поле сериозно забавя всички страници, които го показват.
 WarningClickToDialUserSetupNotComplete=Настройките на информацията за ClickToDial за вашия потребител са непълни (вижте таб ClickToDial във вашата потребителска карта).
 WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Фунцкията е неактива, когато конфигурацията на показването е оптимизирана за незрящ човек или текстови браузери.
diff --git a/htdocs/langs/bg_BG/exports.lang b/htdocs/langs/bg_BG/exports.lang
index 8ced9342b21..09ea3bdddf6 100644
--- a/htdocs/langs/bg_BG/exports.lang
+++ b/htdocs/langs/bg_BG/exports.lang
@@ -1,42 +1,42 @@
 # Dolibarr language file - Source file is en_US - exports
-ExportsArea=Износът площ
-ImportArea=Внос област
-NewExport=Нов износ
-NewImport=Нов внос
+ExportsArea=Секция за експортиране
+ImportArea=Секция за импортиране
+NewExport=Ново експортиране
+NewImport=Ново импортиране
 ExportableDatas=Изнасяни набор от данни
 ImportableDatas=Се внасят набор от данни
 SelectExportDataSet=Изберете набор от данни, които искате да експортирате ...
 SelectImportDataSet=Изберете набор от данни, който искате да импортирате ...
-SelectExportFields=Изберете полетата, които искате да експортирате, или да изберете предварително дефинирана Profil износ
-SelectImportFields=Choose source file fields you want to import and their target field in database by moving them up and down with anchor %s, or select a predefined import profile:
-NotImportedFields=Области на файла източник не са внесени
-SaveExportModel=Запази този профил за износ, ако смятате да го използвате отново по-късно ...
-SaveImportModel=Запази този профил за внос, ако смятате да го използвате отново по-късно ...
+SelectExportFields=Изберете полетата, които искате да експортирате или изберете предварително дефиниран профил за експортиране
+SelectImportFields=Изберете полетата на вашият файл, които искате да импортирате и техните целеви полета в базата данни като ги преместите нагоре или надолу с помощта на %s, или изберете предварително дефиниран профил за импортиране:
+NotImportedFields=Полетата на входния файл не са импортирани
+SaveExportModel=Запазване на вашият избор като профил / шаблон за експортиране (за повторно използване).
+SaveImportModel=Запазване на този профил за импортиране (за повторно използване)...
 ExportModelName=Износ името на профила
-ExportModelSaved=Export профила записват под името <b>%s.</b>
+ExportModelSaved=Профилът за експортиране е запазен като <b>%s</b>.
 ExportableFields=Изнасяни полета
 ExportedFields=Износът на полета
 ImportModelName=Име Внос профил
-ImportModelSaved=Внос профила спаси под името <b>%s.</b>
+ImportModelSaved=Профилът за импортиране е запазен като <b>%s</b>.
 DatasetToExport=Dataset за износ
 DatasetToImport=Импортиране на файл в масив от данни
 ChooseFieldsOrdersAndTitle=Изберете полета за ...
 FieldsTitle=Полетата заглавие
 FieldTitle=Заглавие
-NowClickToGenerateToBuildExportFile=Сега, изберете файловия формат, в комбо кутия и кликнете върху &quot;Генериране&quot; за изграждане на файл за износ ...
+NowClickToGenerateToBuildExportFile=Сега, изберете формата на файла от полето на комбинирания списък и кликнете върху „Генериране“, за да създадете файла за експортиране...
 AvailableFormats=Налични формати
 LibraryShort=Библиотека
 Step=Стъпка
-FormatedImport=Import assistant
-FormatedImportDesc1=This area allows to import personalized data, using an assistant to help you in process without technical knowledge.
-FormatedImportDesc2=First step is to choose a king of data you want to load, then file to load, then to choose which fields you want to load.
-FormatedExport=Export assistant
-FormatedExportDesc1=This area allows to export personalized data, using an assistant to help you in process without technical knowledge.
-FormatedExportDesc2=First step is to choose a predefined dataset, then to choose which fields you want in your result files, and which order.
-FormatedExportDesc3=When data to export are selected, you can define output file format you want to export your data to.
+FormatedImport=Асистент за импортиране
+FormatedImportDesc1=Този модул ви позволява да актуализирате съществуващи данни или да добавяте нови обекти в базата данни от файл без технически познания, използвайки асистент.
+FormatedImportDesc2=Първата стъпка е да изберете вида данни, които искате да импортирате, след това формата на файла съдържащ информацията за импортиране и полетата, които искате да импортирате.
+FormatedExport=Асистент за експортиране
+FormatedExportDesc1=Тези инструменти позволяват експортирането на персонализирани данни с помощта на асистент, за да ви помогне в процеса, без да се изискват технически познания.
+FormatedExportDesc2=Първата стъпка е да изберете предварително дефиниран набор от данни, а след това кои полета искате да експортирате и в какъв ред.
+FormatedExportDesc3=Когато са избрани данните за експортиране може да изберете формата на изходния файл.
 Sheet=Лист
 NoImportableData=Не се внасят данни (без модул с определенията, за да се позволи на импортирането на данни)
-FileSuccessfullyBuilt=File generated
+FileSuccessfullyBuilt=Файлът е генериран
 SQLUsedForExport=SQL Заявка използвани за изграждане на износно досие
 LineId=Id на линия
 LineLabel=Етикет на ред
@@ -44,90 +44,90 @@ LineDescription=Описание на линия
 LineUnitPrice=Единичната цена на линия
 LineVATRate=ДДС Цена на линия
 LineQty=Количество за линия
-LineTotalHT=Сума нетно от данък за съответствие
+LineTotalHT=Сума без данък за ред
 LineTotalTTC=Сума с данък линия
 LineTotalVAT=Размер на ДДС за линия
 TypeOfLineServiceOrProduct=Вид на линията (0 = продукт, 1 = услуга)
 FileWithDataToImport=Файл с данни за внос
 FileToImport=Източник файл, за да импортирате
-FileMustHaveOneOfFollowingFormat=Файл за импортиране трябва да има следния формат
-DownloadEmptyExample=Изтеглете пример за празна файла източник
-ChooseFormatOfFileToImport=Изберете формат на файла, за да се използва като формат на файла за импортиране, като кликнете върху %s икони за да го изберете ...
-ChooseFileToImport=Качване на файл и след това кликнете върху %s икони, за да изберете файл като източник на внос файл ...
+FileMustHaveOneOfFollowingFormat=Файлът за импортиране трябва да бъде в един от следните формати
+DownloadEmptyExample=Изтегляне на шаблонния файл с информация за съдържанието на полето (* са задължителни полета)
+ChooseFormatOfFileToImport=Изберете формата на файла, който да използвате като формат за импортиране, като кликнете върху иконата на %s, за да го изберете...
+ChooseFileToImport=Качете на файл, след което кликнете върху иконата %s, за да изберете файла като файл съдържащ данните за импортиране...
 SourceFileFormat=Изходния формат на файла
 FieldsInSourceFile=Полетата в файла източник
-FieldsInTargetDatabase=Target fields in Dolibarr database (bold=mandatory)
-Field=Област
+FieldsInTargetDatabase=Целеви полета в базата данни на Dolibarr (удебелен шрифт = задължително)
+Field=Поле
 NoFields=Не полета
 MoveField=Преместете поле %s броя на колоните
 ExampleOfImportFile=Example_of_import_file
 SaveImportProfile=Запиши този профил за внос
 ErrorImportDuplicateProfil=Грешка при запазване на този профил за внос с това име. Съществуващ профил с това име вече съществува.
 TablesTarget=Целеви маси
-FieldsTarget=Целеви области
-FieldTarget=Целева областта
-FieldSource=Източник областта
+FieldsTarget=Целеви полета
+FieldTarget=Целево поле
+FieldSource=Начално поле
 NbOfSourceLines=Брой на линиите във файла източник
-NowClickToTestTheImport=Проверете внос параметрите, които сте задали. Ако те са правилни, кликнете върху бутона <b>&quot;%s&quot;,</b> за да започне симулация на процеса на импортиране (няма данни ще се промени във вашата база данни, това е само симулация за момента) ...
-RunSimulateImportFile=Стартиране на симулация внос
-FieldNeedSource=This field requires data from the source file
+NowClickToTestTheImport=Проверете дали файловият формат (разделители за поле и низ) на вашият файл съответства на показаните опции и че сте пропуснали заглавния ред или те ще бъдат маркирани като грешки в следващата симулация. <br> Кликнете върху бутона "<b>%s</b>", за да проверите структурата / съдържанието на файла и да симулирате процеса на импортиране. <br> <b>Няма да бъдат променяни данни в базата данни </b>.
+RunSimulateImportFile=Стартиране на симулация за импортиране
+FieldNeedSource=Това поле изисква данни от файла източник
 SomeMandatoryFieldHaveNoSource=Някои от задължителните полета не са източник от файл с данни
 InformationOnSourceFile=Информация за файла източник
-InformationOnTargetTables=Информация за целевите области
+InformationOnTargetTables=Информация за целевите полета
 SelectAtLeastOneField=Включете поне едно поле източник в колоната на полета за износ
 SelectFormat=Изберете този файлов формат за внос
-RunImportFile=Стартиране на файл от вноса
-NowClickToRunTheImport=Проверете резултат на внос симулация. Ако всичко е наред, стартиране на окончателен внос.
-DataLoadedWithId=Цялата информация ще бъде заредена с следното id на импорт:\n<b>%s</b>
-ErrorMissingMandatoryValue=Задължителни данни в файла източник за полеви <b>%s</b> е празна.
-TooMuchErrors=Все още <b>%s</b> други линии код с грешки, но продукцията е ограничена.
-TooMuchWarnings=Все още <b>%s</b> други линии източник с предупреждения, но продукцията е ограничена.
+RunImportFile=Импортиране на данни
+NowClickToRunTheImport=Проверете резултатите от симулацията за импортиране. Коригирайте всички грешки и повторете теста. <br> Когато симулацията не съобщава за грешки може да продължите с импортирането на данните в базата данни.
+DataLoadedWithId=Импортираните данни ще имат допълнително поле във всяка таблица на базата данни с този идентификатор за импортиране: <b>%s</b>, за да могат да се търсят в случай на проучване за проблем, свързан с това импортиране.
+ErrorMissingMandatoryValue=Липсват задължителните данни във файла източник за поле <b>%s</b>.
+TooMuchErrors=Все още има <b>%s</b> други източници с грешки, но списъкът с грешки е редуциран.
+TooMuchWarnings=Все още има <b>%s</b> други източници с предупреждения, но списъкът с грешки е редуциран.
 EmptyLine=Празен ред (ще бъдат отхвърлени)
-CorrectErrorBeforeRunningImport=Трябва първо да поправи всички грешки, преди да пуснете окончателен внос.
+CorrectErrorBeforeRunningImport=<b>Трябва</b> да коригирате всички грешки, <b>преди</b> да изпълните окончателното импортиране.
 FileWasImported=Файла е внесен с цифровите <b>%s.</b>
-YouCanUseImportIdToFindRecord=You can find all imported record in your database by filtering on field <b>import_key='%s'</b>.
+YouCanUseImportIdToFindRecord=Може да намерите всички импортирани записи във вашата база данни, чрез филтриране за поле <b>import_key = '%s'</b>.
 NbOfLinesOK=Брой на линии с грешки и без предупреждения: <b>%s.</b>
 NbOfLinesImported=Брой на линиите успешно внесени: <b>%s.</b>
 DataComeFromNoWhere=Стойност да вмъкнете идва от нищото в изходния файл.
 DataComeFromFileFieldNb=Стойност да вмъкнете идва от <b>%s</b> номер в полето файла източник.
-DataComeFromIdFoundFromRef=Стойност, която идва от <b>%s</b> номер на полето на изходния файл ще бъдат използвани за намиране ID на родител обект да използвате (Така Objet <b>%s,</b> че има код от файла източник трябва да съществува в Dolibarr).
-DataComeFromIdFoundFromCodeId=Code that comes from field number <b>%s</b> of source file will be used to find id of parent object to use (So the code from source file must exists into dictionary <b>%s</b>). Note that if you know id, you can also use it into source file instead of code. Import should work in both cases.
-DataIsInsertedInto=Данни, идващи от файла източник, ще се добавя в следните области:
-DataIDSourceIsInsertedInto=Идентификацията на родителския обект, намерен с помощта на данни във файла източник, ще се добавя в следните области:
-DataCodeIDSourceIsInsertedInto=ID на родител ред от кода, ще се включат в следните области:
+DataComeFromIdFoundFromRef=Стойността, която идва от поле с номер <b>%s</b> на файла източник ще бъде използвана за намиране на идентификатора на главния обект, който да се използва (така че обектът <b>%s</b>, който има реф. от файла източник трябва да съществува в базата данни)
+DataComeFromIdFoundFromCodeId=Кодът, който идва от поле с номер <b>%s</b> на файла източник ще бъде използван за намиране на идентификатора на главния обект, който да се използва (така че кодът от файла източник трябва да съществува в речника <b>%s</b>). Обърнете внимание, че ако знаете id-то можете да го използвате и във файла източник вместо кода. Импортирането трябва да работи и в двата случая.
+DataIsInsertedInto=Данните идващи от входния файл ще бъдат вмъкнати в следното поле:
+DataIDSourceIsInsertedInto=Идентификационният номер (id) на главния обект е намерен с помощта на данните във файла източник и ще бъде вмъкнат в следното поле:
+DataCodeIDSourceIsInsertedInto=Идентификатора на основния ред, открит от кода, ще бъде вмъкнат в следното поле:
 SourceRequired=Стойността на данните е задължително
 SourceExample=Пример за възможно стойността на данните
 ExampleAnyRefFoundIntoElement=Всеки код за елемент <b>%s</b>
 ExampleAnyCodeOrIdFoundIntoDictionary=Всеки код (или id) намерено в речник <b>%s</b>
-CSVFormatDesc=<b>Разделени със запетаи</b> формат <b>стойност</b> файл (CSV). <br> Това е формат текстов файл, където полетата са разделени със сепаратор [%s]. Ако сепаратор се намира във вътрешността съдържанието поле, поле се закръглява кръг характер [%s]. Бягство характер, за да избягат кръг характер е %s].
-Excel95FormatDesc=Файлов формат на <b>Excel</b> (XLS) <br> Това е роден Excel 95 формат (BIFF5).
-Excel2007FormatDesc=<b>Excel</b> файлов формат (XLSX) <br> Това е роден формат Excel 2007 (SpreadsheetML).
+CSVFormatDesc=<b> Стойност, разделена със запетая </b> файлов формат (.csv). <br> Това е формат на текстов файл, в който полетата са разделени от разделител [%s]. Ако в съдържанието на полето бъде открит разделител, то полето се закръглява със закръгляващ символ [%s]. Escape символа определящ закръгляващия символ е [%s].
+Excel95FormatDesc=<b>Excel</b> файлов формат (.xls) <br> Това е оригинален формат на Excel 95 (BIFF5).
+Excel2007FormatDesc=<b>Excel</b> файлов формат (.xlsx). <br> Това е оригинален формат на Excel 2007 (SpreadsheetML).
 TsvFormatDesc=<b>Tab раздяла</b> формат <b>стойност</b> файл (TSV) <br> Това е формат текстов файл, където полетата са разделени с табулатор [Tab].
-ExportFieldAutomaticallyAdded=Field <b>%s</b> was automatically added. It will avoid you to have similar lines to be treated as duplicate record (with this field added, all lines will own their own id and will differ).
-CsvOptions=Csv опции
-Separator=Разделител
-Enclosure=Enclosure
+ExportFieldAutomaticallyAdded=Полето <b>%s</b> е автоматично добавено. Ще бъдат избегнати подобни редове, които да се третират като дублиращи се записи (с добавянето на това поле всички редове ще притежават свой собствен идентификатор (id) и ще се различават).
+CsvOptions=Опции за формат CSV
+Separator=Разделител за полета
+Enclosure=Разделител на низове
 SpecialCode=Специален код
 ExportStringFilter=%% позволява заместването на един или повече знаци в текста
-ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : filters by one year/month/day<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD : filters over a range of years/months/days<br> > YYYY, > YYYYMM, > YYYYMMDD : filters on all following years/months/days<br> < YYYY, < YYYYMM, < YYYYMMDD : filters on all previous years/months/days
-ExportNumericFilter=NNNNN filters by one value<br>NNNNN+NNNNN filters over a range of values<br>< NNNNN filters by lower values<br>> NNNNN filters by higher values
-ImportFromLine=Import starting from line number
-EndAtLineNb=End at line number
-ImportFromToLine=Import line numbers (from - to)
-SetThisValueTo2ToExcludeFirstLine=For example, set this value to 3 to exclude the 2 first lines
-KeepEmptyToGoToEndOfFile=Keep this field empty to go up to the end of file
-SelectPrimaryColumnsForUpdateAttempt=Select column(s) to use as primary key for update attempt
-UpdateNotYetSupportedForThisImport=Update is not supported for this type of import (only insert)
-NoUpdateAttempt=No update attempt was performed, only insert
-ImportDataset_user_1=Users (employees or not) and properties
-ComputedField=Computed field
+ExportDateFilter=YYYY, YYYYMM, YYYYMMDD: филтри по година/месец/ден <br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD: филтри с обхват година/месец/ден <br> > YYYY, > YYYYMM, > YYYYMMDD: филтри   за следващи години/месеци/дни <br> < YYYY, < YYYYMM, < YYYYMMDD: филтри за предишни години/месеци/дни
+ExportNumericFilter=NNNNN филтри по една стойност <br>NNNNN+NNNNN филтри с обхват от стойности <br>< NNNNN филтри с по-ниски стойности <br>> NNNNN филтри с по-високи стойности
+ImportFromLine=Импортиране с начален ред
+EndAtLineNb=Край с последен ред
+ImportFromToLine=Обхват (от - до), например <b>да пропуснете заглавните редове</b>
+SetThisValueTo2ToExcludeFirstLine=Например, задайте тази стойност на 3, за да изключите първите 2 реда. <br> Ако заглавните редове не са пропуснати, това ще доведе до множество грешки по време на симулацията за импортиране.
+KeepEmptyToGoToEndOfFile=Запазете това поле празно, за да обработите всички редове до края на файла.
+SelectPrimaryColumnsForUpdateAttempt=Изберете колона(и), които да използвате като първичен ключ за импортиране на актуализация
+UpdateNotYetSupportedForThisImport=Актуализацията не се поддържа за този тип импортиране (само вмъкване)
+NoUpdateAttempt=Не е извършен опит за актуализация, само вмъкване
+ImportDataset_user_1=Потребители (служители или не) и реквизити
+ComputedField=Изчислено поле
 ## filters
 SelectFilterFields=Ако желаете на филтрирате по някои стойности, просто въведете стойностите тук.
 FilteredFields=Филтрирани полета
 FilteredFieldsValues=Стойност за филтер
 FormatControlRule=Правило за контролиране на формата
 ## imports updates
-KeysToUseForUpdates=Key to use for updating data
-NbInsert=Number of inserted lines: %s
-NbUpdate=Number of updated lines: %s
-MultipleRecordFoundWithTheseFilters=Multiple records have been found with these filters: %s
+KeysToUseForUpdates=Ключ (колона), който да се използва за <b>актуализиране</b> на съществуващи данни
+NbInsert=Брой вмъкнати редове: %s
+NbUpdate=Брой актуализирани редове: %s
+MultipleRecordFoundWithTheseFilters=Намерени са няколко записа с тези филтри: %s
diff --git a/htdocs/langs/bg_BG/holiday.lang b/htdocs/langs/bg_BG/holiday.lang
index 615a1b6e0ad..2f177c7595c 100644
--- a/htdocs/langs/bg_BG/holiday.lang
+++ b/htdocs/langs/bg_BG/holiday.lang
@@ -114,9 +114,9 @@ HolidaysToValidateBody=По-долу е молба за отпуск за вал
 HolidaysToValidateDelay=Тази молба за отпуск е за период по-малък от %s дни.
 HolidaysToValidateAlertSolde=Потребителят, който е създал молбата за отпуск, няма достатъчно налични дни.
 HolidaysValidated=Валидирани молби за отпуск
-HolidaysValidatedBody=Вашата молба за отпуск от %s до %s е валидирана.
+HolidaysValidatedBody=Вашата молба за отпуск от %s до %s е одобрена.
 HolidaysRefused=Молбата е отхвърлена
-HolidaysRefusedBody=Вашата молба за отпуск от %s до %s е отхвърлена поради следната причина:
+HolidaysRefusedBody=Вашата молба за отпуск от %s до %s е отхвърлена, поради следната причина:
 HolidaysCanceled=Анулирани молби за отпуск
 HolidaysCanceledBody=Вашата молба за отпуск от %s до %s е анулирана.
 FollowedByACounter=1: Този вид отпуск е необходимо да бъде проследяван от брояч. Броячът се увеличава ръчно или автоматично, а когато молбата за отпуск е валидирана, броячът се намалява. <br> 0: Не се проследява от брояч.
diff --git a/htdocs/langs/bg_BG/install.lang b/htdocs/langs/bg_BG/install.lang
index 99593f84b86..b2410484448 100644
--- a/htdocs/langs/bg_BG/install.lang
+++ b/htdocs/langs/bg_BG/install.lang
@@ -1,214 +1,214 @@
 # Dolibarr language file - Source file is en_US - install
 InstallEasy=Просто следвайте инструкциите стъпка по стъпка.
-MiscellaneousChecks=Предпоставки проверка
-ConfFileExists=Конфигурационния файл <b>%s</b> съществува.
-ConfFileDoesNotExistsAndCouldNotBeCreated=Configuration file <b>%s</b> does not exist and could not be created!
-ConfFileCouldBeCreated=Конфигурационния файл <b>%s</b> може да бъде създаден.
-ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permissions. For first install, your web server must be able to write into this file during configuration process ("chmod 666" for example on a Unix like OS).
-ConfFileIsWritable=Конфигурационния файл <b>%s</b> е с права за писане.
-ConfFileMustBeAFileNotADir=Конфигурационният файл <b> %s </b> трябва да бъде файл, а не директория.
-ConfFileReload=Reloading parameters from configuration file.
+MiscellaneousChecks=Проверка за необходими условия
+ConfFileExists=Конфигурационен файл <b>%s</b> съществува.
+ConfFileDoesNotExistsAndCouldNotBeCreated=Конфигурационният файл <b>%s</b> не съществува и не може да бъде създаден!
+ConfFileCouldBeCreated=Конфигурационният файл <b>%s</b> може да бъде създаден.
+ConfFileIsNotWritable=Конфигурационният файл <b> %s </b> не може да се презаписва. Проверете разрешенията. За първото инсталиране, вашият уеб сървър трябва да може да записва в този файл по време на процеса на конфигуриране (например "chmod 666" в системи от типа Unix).
+ConfFileIsWritable=Конфигурационният файл <b>%s</b> е презаписваем.
+ConfFileMustBeAFileNotADir=Конфигурационният файл <b>%s</b> трябва да е файл, а не директория.
+ConfFileReload=Презареждане на параметри от конфигурационен файл.
 PHPSupportSessions=PHP поддържа сесии.
 PHPSupportPOSTGETOk=PHP поддържа променливи POST и GET.
-PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check the parameter <b>variables_order</b> in php.ini.
-PHPSupportGD=This PHP supports GD graphical functions.
-PHPSupportCurl=This PHP supports Curl.
-PHPSupportUTF8=This PHP supports UTF8 functions.
-PHPSupportIntl=This PHP supports Intl functions.
-PHPMemoryOK=PHP макс сесия памет е <b>%s.</b> Това трябва да бъде достатъчно.
-PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This is too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
-Recheck=Click here for a more detailed test
-ErrorPHPDoesNotSupportSessions=Your PHP installation does not support sessions. This feature is required to allow Dolibarr to work. Check your PHP setup and permissions of the sessions directory.
-ErrorPHPDoesNotSupportGD=Your PHP installation does not support GD graphical functions. No graphs will be available.
-ErrorPHPDoesNotSupportCurl=Your PHP installation does not support Curl.
-ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr cannot work correctly. Resolve this before installing Dolibarr.
-ErrorPHPDoesNotSupportIntl=Your PHP installation does not support Intl functions.
+PHPSupportPOSTGETKo=Възможно е вашата настройка на PHP да не поддържа променливи POST и/или GET. Проверете параметъра <b> variables_order </b> в php.ini.
+PHPSupportGD=PHP поддържа GD графични функции.
+PHPSupportCurl=PHP поддържа Curl.
+PHPSupportUTF8=PHP поддържа UTF8 функции.
+PHPSupportIntl=PHP поддържа Intl функции.
+PHPMemoryOK=Максималният размер на паметта за PHP сесия е настроен на <b>%s</b>. Това трябва да е достатъчно.
+PHPMemoryTooLow=Вашият максимален размер на паметта за PHP сесия е настроен на <b> %s </b> байта. Това е твърде ниско. Променете <b> php.ini </b> като зададете стойност на параметър <b> memory_limit </b> поне <b> %s </b> байта.
+Recheck=Кликнете тук за по-подробен тест
+ErrorPHPDoesNotSupportSessions=Вашата PHP инсталация не поддържа сесии. Тази функция е необходима, за да позволи на Dolibarr да работи. Проверете настройките на PHP и разрешенията на директорията за сесиите.
+ErrorPHPDoesNotSupportGD=Вашата PHP инсталация не поддържа GD графични функции. Няма да се показват графики.
+ErrorPHPDoesNotSupportCurl=Вашата PHP инсталация не поддържа Curl.
+ErrorPHPDoesNotSupportUTF8=Вашата PHP инсталация не поддържа UTF8 функции. Dolibarr не може да работи правилно. Решете това преди да инсталирате Dolibarr.
+ErrorPHPDoesNotSupportIntl=Вашата PHP инсталация не поддържа Intl функции.
 ErrorDirDoesNotExists=Директорията %s не съществува.
-ErrorGoBackAndCorrectParameters=Go back and check/correct the parameters.
+ErrorGoBackAndCorrectParameters=Върнете се назад и проверете / коригирайте параметрите.
 ErrorWrongValueForParameter=Може да сте въвели грешна стойност за параметър '%s'.
-ErrorFailedToCreateDatabase=Неуспешно създаване на базата данни '%s'.
-ErrorFailedToConnectToDatabase=Неуспешна връзка с база данни '%s'.
+ErrorFailedToCreateDatabase=Неуспешно създаване на база данни '%s'.
+ErrorFailedToConnectToDatabase=Неуспешно свързване към базата данни '%s'
 ErrorDatabaseVersionTooLow=Версията на базата данни (%s) е твърде стара. Изисква се версия %s или по-нова.
 ErrorPHPVersionTooLow=Версията на PHP е твърде стара. Изисква се версия %s.
-ErrorConnectedButDatabaseNotFound=Connection to server successful but database '%s' not found.
-ErrorDatabaseAlreadyExists=Базата данни %s вече съществува.
-IfDatabaseNotExistsGoBackAndUncheckCreate=If the database does not exist, go back and check option "Create database".
+ErrorConnectedButDatabaseNotFound=Връзката със сървъра е успешна, но не е намерена база данни '%s'.
+ErrorDatabaseAlreadyExists=База данни '%s' вече съществува.
+IfDatabaseNotExistsGoBackAndUncheckCreate=Ако базата данни не съществува, върнете се и проверете опцията "Създаване на база данни".
 IfDatabaseExistsGoBackAndCheckCreate=Ако базата данни вече съществува, върнете се обратно и махнете отметката на "Създаване на база данни".
-WarningBrowserTooOld=Version of browser is too old. Upgrading your browser to a recent version of Firefox, Chrome or Opera is highly recommended.
-PHPVersion=Версия на PHP
-License=Лиценз за използване
+WarningBrowserTooOld=Версията на браузъра е твърде стара. Препоръчва се надграждане на браузъра ви до текуща версия на Firefox, Chrome или Opera.
+PHPVersion=PHP версия
+License=Използване на лиценз
 ConfigurationFile=Конфигурационен файл
-WebPagesDirectory=Директорията, в която се съхраняват уеб страници
-DocumentsDirectory=Директория за съхраняване качени и генерирани документи
-URLRoot=URL корен
-ForceHttps=Принудително сигурни връзки (HTTPS)
-CheckToForceHttps=Изберете тази опция, за принудително сигурни връзки (HTTPS). <br> Това означава, че уеб сървърът е конфигуриран с SSL сертификат.
+WebPagesDirectory=Директория, където се съхраняват уеб страници
+DocumentsDirectory=Директория за съхраняване на качени и генерирани документи
+URLRoot=Основен URL адрес
+ForceHttps=Принудителни защитени връзки (https)
+CheckToForceHttps=Изберете тази опция, за да активирате защитени връзки (https). <br> Това изисква уеб сървърът да е конфигуриран за работа със SSL сертификат.
 DolibarrDatabase=База данни на Dolibarr
-DatabaseType=Тип на базата данни
+DatabaseType=Тип база данни
 DriverType=Тип драйвер
 Server=Сървър
-ServerAddressDescription=Name or ip address for the database server. Usually 'localhost' when the database server is hosted on the same server as the web server.
-ServerPortDescription=Порт на сървъра на базата данни. Оставете празно ако е неизвестно.
-DatabaseServer=Сървър на базата данни
+ServerAddressDescription=Име или IP адрес на сървъра с базата данни. Обикновено "localhost", когато сървърът с базата данни е инсталиран на същия сървър като уеб сървъра.
+ServerPortDescription=Порт на сървъра с базата данни. Оставете празно, ако е неизвестен.
+DatabaseServer=Сървър за бази данни
 DatabaseName=Име на базата данни
-DatabasePrefix=Database table prefix
-DatabasePrefixDescription=Database table prefix. If empty, defaults to llx_.
-AdminLogin=User account for the Dolibarr database owner.
-PasswordAgain=Retype password confirmation
-AdminPassword=Парола на собственика на базата данни на Dolibarr.
+DatabasePrefix=Префикс на таблицата с база данни
+DatabasePrefixDescription=Префикс на таблицата с база данни. Ако е празно, по подразбиране ще бъде llx_.
+AdminLogin=Потребителски акаунт за собственика на базата данни на Dolibarr.
+PasswordAgain=Повторете паролата
+AdminPassword=Парола за собственика на базата данни на Dolibarr.
 CreateDatabase=Създаване на база данни
-CreateUser=Create user account or grant user account permission on the Dolibarr database
-DatabaseSuperUserAccess=Сървър на базата данни - Достъп супер потребител
-CheckToCreateDatabase=Check the box if the database does not exist yet and so must be created.<br>In this case, you must also fill in the user name and password for the superuser account at the bottom of this page.
-CheckToCreateUser=Check the box if:<br>the database user account does not yet exist and so must be created, or<br>if the user account exists but the database does not exist and permissions must be granted.<br>In this case, you must enter the user account and password and <b>also</b> the superuser account name and password at the bottom of this page. If this box is unchecked, database owner and password must already exist.
-DatabaseRootLoginDescription=Superuser account name (to create new databases or new users), mandatory if the database or its owner does not already exist.
-KeepEmptyIfNoPassword=Leave empty if superuser has no password (NOT recommended)
-SaveConfigurationFile=Saving parameters to
+CreateUser=Създайте потребителски акаунт или предоставете разрешение за потребителски акаунт на базата данни на Dolibarr
+DatabaseSuperUserAccess=Сървър за база данни - Достъп за супер потребител
+CheckToCreateDatabase=Поставете отметка в квадратчето, ако базата данни все още не съществува и трябва да бъде създадена. <br> В този случай трябва да попълните потребителското име и паролата за акаунта на супер потребителя в долната част на тази страница.
+CheckToCreateUser=Поставете отметка в квадратчето, ако: <br> потребителският акаунт за базата данни все още не съществува и трябва да бъде създаден или <br> ако съществува потребителски акаунт, но базата данни не съществува и трябва да бъдат предоставени разрешения. <br> В този случай трябва да въведете потребителския акаунт и паролата, а <b> също </b>, и името, и паролата на супер потребителя в долната част на тази страница. Ако това квадратче не е маркирано, собственикът на базата данни и паролата трябва вече да съществуват.
+DatabaseRootLoginDescription=Потребителско име на супер потребител (за създаване на нови бази данни или нови потребители), което е задължително, ако базата данни или нейният собственик все още не съществуват.
+KeepEmptyIfNoPassword=Оставете празно, ако супер потребителят няма парола (НЕ се препоръчва)
+SaveConfigurationFile=Запазване на параметрите в
 ServerConnection=Свързване със сървъра
 DatabaseCreation=Създаване на база данни
 CreateDatabaseObjects=Създаване на обекти в базата данни
 ReferenceDataLoading=Зареждане на референтни данни
 TablesAndPrimaryKeysCreation=Създаване на таблици и първични ключове
-CreateTableAndPrimaryKey=Създаване на таблицата %s
-CreateOtherKeysForTable=Създаване на чужди ключове и индекси за таблицата %s
+CreateTableAndPrimaryKey=Създаване на таблица %s
+CreateOtherKeysForTable=Създаване на чужди ключове и индекси за таблица %s
 OtherKeysCreation=Създаване на чужди ключове и индекси
 FunctionsCreation=Създаване на функции
 AdminAccountCreation=Създаване на администраторски профил
-PleaseTypePassword=Please type a password, empty passwords are not allowed!
-PleaseTypeALogin=Please type a login!
-PasswordsMismatch=Passwords differs, please try again!
-SetupEnd=Край на настройкате
-SystemIsInstalled=Инсталирането завърши.
-SystemIsUpgraded=Dolibarr е обновен успешно.
+PleaseTypePassword=Моля, въведете парола, празно поле не е разрешено!
+PleaseTypeALogin=Моля, въведете данни за вход!
+PasswordsMismatch=Паролите са различни, моля, опитайте отново!
+SetupEnd=Край на настройката
+SystemIsInstalled=Инсталация е завършена.
+SystemIsUpgraded=Dolibarr е успешно актуализиран.
 YouNeedToPersonalizeSetup=Трябва да конфигурирате Dolibarr според вашите нужди (външен вид, функции, ...). За да направите това, моля последвайте връзката по-долу:
-AdminLoginCreatedSuccessfuly=Dolibarr administrator login '<b>%s</b>' created successfully.
-GoToDolibarr=Отиди на Dolibarr
-GoToSetupArea=Отиди на Dolibarr (област за настройка)
-MigrationNotFinished=The database version is not completely up to date: run the upgrade process again.
-GoToUpgradePage=Отидете отново на страницата за надграждане
+AdminLoginCreatedSuccessfuly=Администраторския профил '<b> %s </b>' за Dolibarr е успешно създаден.
+GoToDolibarr=Отидете в Dolibarr
+GoToSetupArea=Отидете в Dolibarr (секция за настройка)
+MigrationNotFinished=Версията на базата данни не е напълно актуална, изпълнете отново процеса на актуализация.
+GoToUpgradePage=Отидете отново в страницата за актуализация
 WithNoSlashAtTheEnd=Без наклонена черта "/" в края
-DirectoryRecommendation=It is recommended to use a directory outside of the web pages.
+DirectoryRecommendation=Препоръчително е да използвате директория извън уеб страниците.
 LoginAlreadyExists=Вече съществува
-DolibarrAdminLogin=Администраторски вход в Dolibarr
-AdminLoginAlreadyExists=Dolibarr administrator account '<b>%s</b>' already exists. Go back if you want to create another one.
-FailedToCreateAdminLogin=Failed to create Dolibarr administrator account.
-WarningRemoveInstallDir=Warning, for security reasons, once the install or upgrade is complete, you should add a file called <b>install.lock</b> into the Dolibarr document directory in order to prevent the accidental/malicious use of the install tools again.
-FunctionNotAvailableInThisPHP=Not available in this PHP
+DolibarrAdminLogin=Администратор на Dolibarr
+AdminLoginAlreadyExists=Администраторският профил '<b> %s </b>' за Dolibarr вече съществува. Върнете се обратно, ако искате да създадете друг.
+FailedToCreateAdminLogin=Неуспешно създаване на администраторски профил за Dolibarr.
+WarningRemoveInstallDir=Внимание, от съображения за сигурност, след като инсталирането или приключи актуализацията, трябва да добавите файл с име <b> install.lock </b> в директорията /documents на Dolibarr, за да предотвратите повторното използване на инструментите за инсталиране.
+FunctionNotAvailableInThisPHP=Не е налично за тази PHP инсталация
 ChoosedMigrateScript=Изберете скрипт за миграция
-DataMigration=Database migration (data)
-DatabaseMigration=Database migration (structure + some data)
-ProcessMigrateScript=Скрипта обработва
+DataMigration=Миграция на база данни (данни)
+DatabaseMigration=Миграция на база данни (структура + някои данни)
+ProcessMigrateScript=Скриптова обработка
 ChooseYourSetupMode=Изберете режим на настройка и кликнете върху "Начало"...
 FreshInstall=Нова инсталация
-FreshInstallDesc=Use this mode if this is your first install. If not, this mode can repair a incomplete previous install. If you want to upgrade your version, choose "Upgrade" mode.
-Upgrade=Надграждане
-UpgradeDesc=Използвайте този режим, ако желаете да замените старите файлове на Dolibarr с файлове от по-нова версия. Това ще обнови вашата база данни и данни.
+FreshInstallDesc=Използвайте този режим, ако това е първата ви инсталация. Ако не, този режим може да поправи непълна предишна инсталация. Ако искате да актуализирате версията си, изберете режим "Актуализация".
+Upgrade=Актуализация
+UpgradeDesc=Използвайте този режим, ако сте заменили старите Dolibarr файлове с файлове от по-нова версия. Това ще подобри вашата база данни.
 Start=Начало
-InstallNotAllowed=Настройката не разрешена поради правата на файла <b>conf.php</b>
-YouMustCreateWithPermission=Трябва да създадете файл %s и да настроите права за запис в него от уеб сървъра по време на процеса на инсталиране.
-CorrectProblemAndReloadPage=Please fix the problem and press F5 to reload the page.
-AlreadyDone=Вече мигрирахте
+InstallNotAllowed=Настройката не е позволена от липса на разрешения в <b> conf.php </b>
+YouMustCreateWithPermission=Трябва да създадете файл %s и да зададете разрешения за запис върху него за уеб сървъра по време на инсталационния процес.
+CorrectProblemAndReloadPage=Моля, отстранете проблема и натиснете F5, за да презаредите страницата.
+AlreadyDone=Вече са мигрирани
 DatabaseVersion=Версия на базата данни
 ServerVersion=Версия на сървъра на базата данни
 YouMustCreateItAndAllowServerToWrite=Трябва да създадете тази директория и да позволите на уеб сървъра да записва в нея.
 DBSortingCollation=Ред за сортиране на символи
-YouAskDatabaseCreationSoDolibarrNeedToConnect=You selected create database <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
-YouAskLoginCreationSoDolibarrNeedToConnect=You selected create database user <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
-BecauseConnectionFailedParametersMayBeWrong=The database connection failed: the host or super user parameters must be wrong.
+YouAskDatabaseCreationSoDolibarrNeedToConnect=Вие избрахте да създадете база данни <b> %s </b>, но за тази цел Dolibarr трябва да се свърже със сървъра <b> %s </b> със права на супер потребител <b> %s </b>
+YouAskLoginCreationSoDolibarrNeedToConnect=Вие избрахте да създадете потребител за база данни <b> %s </b>, но за тази цел Dolibarr трябва да се свърже със сървъра <b> %s </b> с права на супер потребител <b> %s </b>.
+BecauseConnectionFailedParametersMayBeWrong=Връзката с базата данни е  неуспешна: параметрите на хоста или супер потребителя са грешни.
 OrphelinsPaymentsDetectedByMethod=Orphans плащане е открито по метода %s
-RemoveItManuallyAndPressF5ToContinue=Премахнете го ръчно и натиснете F5, за да продължите.
+RemoveItManuallyAndPressF5ToContinue=Махнете го ръчно и натиснете F5, за да продължите.
 FieldRenamed=Полето е преименувано
-IfLoginDoesNotExistsCheckCreateUser=If the user does not exist yet, you must check option "Create user"
-ErrorConnection=Server "<b>%s</b>", database name "<b>%s</b>", login "<b>%s</b>", or database password may be wrong or the PHP client version may be too old compared to the database version.
-InstallChoiceRecommanded=Препоръчителен избор е да инсталирате версия <b>%s</b> от вашата текуща версия <b>%s</b>
+IfLoginDoesNotExistsCheckCreateUser=Ако потребителят все още не съществува, трябва да включите опцията "Създаване на потребител"
+ErrorConnection=Сървърът "<b> %s </b>", името на базата данни "<b> %s </b>", потребителят "<b> %s </b>" или паролата на базата данни може да са грешни, или PHP версията на клиента може да е твърде стара в сравнение с версията на базата данни.
+InstallChoiceRecommanded=Препоръчителен избор е да се инсталира версия <b> %s </b> от текущата ви версия <b> %s </b>
 InstallChoiceSuggested=<b>Избор за инсталиране, предложен от инсталатора</b>.
-MigrateIsDoneStepByStep=The targeted version (%s) has a gap of several versions. The install wizard will come back to suggest a further migration once this one is complete.
-CheckThatDatabasenameIsCorrect=Check that the database name "<b>%s</b>" is correct.
-IfAlreadyExistsCheckOption=Ако това име е вярно и тази база данни все още не съществува, трябва да проверите опцията "Създаване на база данни".
+MigrateIsDoneStepByStep=Целевата версия (%s) има пропуск в няколко версии. Съветникът за инсталиране ще се върне, за да предложи по-нататъшна миграция, след като приключи тази.
+CheckThatDatabasenameIsCorrect=Проверете дали името на базата данни "<b> %s </b>" е правилно.
+IfAlreadyExistsCheckOption=Ако това име е вярно и тази база данни все още не съществува, трябва да изберете опцията "Създаване на база данни".
 OpenBaseDir=Параметър PHP openbasedir
-YouAskToCreateDatabaseSoRootRequired=You checked the box "Create database". For this, you need to provide the login/password of superuser (bottom of form).
-YouAskToCreateDatabaseUserSoRootRequired=You checked the box "Create database owner". For this, you need to provide the login/password of superuser (bottom of form).
-NextStepMightLastALongTime=The current step may take several minutes. Please wait until the next screen is shown completely before continuing.
-MigrationCustomerOrderShipping=Migrate shipping for sales orders storage
+YouAskToCreateDatabaseSoRootRequired=Поставихте отметка в квадратчето „Създаване на база данни“. За тази цел трябва да предоставите потребителско име / парола на супер потребителя (в края на формуляра).
+YouAskToCreateDatabaseUserSoRootRequired=Поставихте отметка в квадратчето „Създаване на собственик на база данни“. За тази цел трябва да предоставите потребителско име / парола на супер потребителя (в края на формуляра).
+NextStepMightLastALongTime=Текущата стъпка може да отнеме няколко минути. Моля, изчакайте, докато следващият екран се покаже напълно, преди да продължите.
+MigrationCustomerOrderShipping=Мигрирайте доставката за съхранение на поръчки за продажби
 MigrationShippingDelivery=Надграждане на хранилище на доставки
 MigrationShippingDelivery2=Надграждане на хранилище на доставки 2
 MigrationFinished=Миграцията завърши
-LastStepDesc=<strong>Last step</strong>: Define here the login and password you wish to use to connect to Dolibarr. <b>Do not lose this as it is the master account to administer all other/additional user accounts.</b>
+LastStepDesc=<strong> Последна стъпка </strong>: Определете тук потребителското име и паролата, които искате да използвате, за да се свържете с Dolibarr. <b> Не губете това, тъй като това е главният акаунт за администриране на всички други / допълнителни потребителски акаунти. </b>
 ActivateModule=Активиране на модул %s
-ShowEditTechnicalParameters=Натиснете тук за да покажете/редактирате параметрите за напреднали (експертен режим)
-WarningUpgrade=Warning:\nDid you run a database backup first?\nThis is highly recommended. Loss of data (due to for example bugs in mysql version 5.5.40/41/42/43) may be possible during this process, so it is essential to take a complete dump of your database before starting any migration.\n\nClick OK to start migration process...
-ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug, making data loss possible if you make structural changes in your database, such as is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a layer (patched) version (list of known buggy versions: %s)
-KeepDefaultValuesWamp=You used the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you are doing.
-KeepDefaultValuesDeb=You used the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so the values proposed here are already optimized. Only the password of the database owner to create must be entered. Change other parameters only if you know what you are doing.
-KeepDefaultValuesMamp=You used the Dolibarr setup wizard from DoliMamp, so the values proposed here are already optimized. Change them only if you know what you are doing.
-KeepDefaultValuesProxmox=You used the Dolibarr setup wizard from a Proxmox virtual appliance, so the values proposed here are already optimized. Change them only if you know what you are doing.
-UpgradeExternalModule=Run dedicated upgrade process of external module
-SetAtLeastOneOptionAsUrlParameter=Set at least one option as a parameter in URL. For example:  '...repair.php?standard=confirmed'
-NothingToDelete=Nothing to clean/delete
-NothingToDo=Nothing to do
+ShowEditTechnicalParameters=Кликнете тук, за да покажете / редактирате разширените параметри (експертен режим)
+WarningUpgrade=Внимание:\nАрхивирахте ли преди това базата данни?\nТова е силно препоръчително. Загубата на данни (поради грешки в mysql версия 5.5.40/41/42/43) може да е възможна по време на този процес, така че е важно да се направи пълно архивиране на базата данни преди започване на миграция.\n\nКликнете върху „OK“, за да започнете процеса на мигриране...
+ErrorDatabaseVersionForbiddenForMigration=Версията на вашата база данни е %s. Има критична грешка, което прави загубата на данни възможна, ако извършвате структурни промени в базата данни, каквито се изискват от процеса на миграция. Поради тази причина миграцията няма да бъде разрешена, докато не актуализирате базата данни до следваща (закърпена) версия (списък на известните версии с бъгове: %s)
+KeepDefaultValuesWamp=Използвахте съветника за настройка на Dolibarr от DoliWamp, така че предложените тук стойности вече са оптимизирани. Променяйте ги, само ако знаете какво правите.
+KeepDefaultValuesDeb=Използвахте съветника за настройка на Dolibarr от Linux пакет (Ubuntu, Debian, Fedora...), така че предложените тук стойности вече са оптимизирани. Трябва да се въведе само паролата на собственика на базата данни, който ще се създава. Променяйте другите параметри, само ако знаете какво правите.
+KeepDefaultValuesMamp=Използвахте съветника за настройка на Dolibarr от DoliMamp, така че предложените тук стойности вече са оптимизирани. Променяйте ги само, ако знаете какво правите.
+KeepDefaultValuesProxmox=Използвахте съветника за настройка на Dolibarr от виртуалното устройство на Proxmox, така че предложените тук стойности вече са оптимизирани. Променяйте ги, само ако знаете какво правите.
+UpgradeExternalModule=Изпълнете препоръчителния процес за обновяване на външния модул
+SetAtLeastOneOptionAsUrlParameter=Задайте поне един параметър като параметър в URL адреса. Например: "... repair.php?standard=confirmed"
+NothingToDelete=Няма нищо за почистване / изтриване
+NothingToDo=Няма нищо за правене
 #########
 # upgrade
-MigrationFixData=Корекция на denormalized данни
-MigrationOrder=Миграция на данни за поръчки от клиенти
-MigrationSupplierOrder=Data migration for vendor's orders
-MigrationProposal=Миграция на данни за оферти
-MigrationInvoice=Миграция на данни за фактури за клиенти
+MigrationFixData=Поправка за денормализирани данни
+MigrationOrder=Миграция на данни за поръчки за продажба
+MigrationSupplierOrder=Миграция на данни за поръчки за покупка
+MigrationProposal=Миграция на данни за търговски предложения
+MigrationInvoice=Миграция на данни за фактури за продажба
 MigrationContract=Миграция на данни за договори
-MigrationSuccessfullUpdate=Надграждането е успешно
-MigrationUpdateFailed=Неуспешен процес на надграждане
+MigrationSuccessfullUpdate=Актуализацията е успешна
+MigrationUpdateFailed=Процесът на актуализация не бе успешен
 MigrationRelationshipTables=Миграция на данни за свързани таблици (%s)
-MigrationPaymentsUpdate=Корекция на данни за плащане
-MigrationPaymentsNumberToUpdate=%s плащания за актуализиране
-MigrationProcessPaymentUpdate=Актуализиране на плащания %s
-MigrationPaymentsNothingToUpdate=Няма повече задачи
+MigrationPaymentsUpdate=Корекция на данни за плащания
+MigrationPaymentsNumberToUpdate=%s плащане(ия) за актуализиране
+MigrationProcessPaymentUpdate=Актуализиране на плащане(ия) %s
+MigrationPaymentsNothingToUpdate=Няма повече неща за правене
 MigrationPaymentsNothingUpdatable=Няма повече плащания, които могат да бъдат коригирани
-MigrationContractsUpdate=Корекция на данни в договор
+MigrationContractsUpdate=Корекция на данни за договори
 MigrationContractsNumberToUpdate=%s договор(и) за актуализиране
-MigrationContractsLineCreation=Създаване на ред в договор с реф. %s
-MigrationContractsNothingToUpdate=Няма повече задачи
-MigrationContractsFieldDontExist=Field fk_facture does not exist anymore. Nothing to do.
-MigrationContractsEmptyDatesUpdate=Корекция на празна дата в договор
-MigrationContractsEmptyDatesUpdateSuccess=Contract empty date correction done successfully
-MigrationContractsEmptyDatesNothingToUpdate=Няма празна дата на договор за коригиране
-MigrationContractsEmptyCreationDatesNothingToUpdate=Няма дата за създаване на договор за коригиране
-MigrationContractsInvalidDatesUpdate=Корекция на неправилни дати на договор
-MigrationContractsInvalidDateFix=Корекция на договор %s (Дата на договора=%s, Начална дата на услуга мин.=%s)
-MigrationContractsInvalidDatesNumber=%s променени договори
-MigrationContractsInvalidDatesNothingToUpdate=Няма дата с лоша стойност за коригиране
-MigrationContractsIncoherentCreationDateUpdate=Лоша стойност за дата на създаване на договор
-MigrationContractsIncoherentCreationDateUpdateSuccess=Bad value contract creation date correction done successfully
-MigrationContractsIncoherentCreationDateNothingToUpdate=Няма лоши стойности за дата на създаване на договор за коригиране
-MigrationReopeningContracts=Отворен договор затворен по грешка
-MigrationReopenThisContract=Ново отваряне на договор %s
-MigrationReopenedContractsNumber=%s договори са променени
-MigrationReopeningContractsNothingToUpdate=Няма затворен договор за отваряне
-MigrationBankTransfertsUpdate=Update links between bank entry and a bank transfer
+MigrationContractsLineCreation=Създаване на ред за реф. договор %s
+MigrationContractsNothingToUpdate=Няма повече неща за правене
+MigrationContractsFieldDontExist=Поле fk_facture вече не съществува. Няма нищо за правене.
+MigrationContractsEmptyDatesUpdate=Корекция на празна дата в договори
+MigrationContractsEmptyDatesUpdateSuccess=Корекцията на празната дата в договора е успешно извършена
+MigrationContractsEmptyDatesNothingToUpdate=Няма празни дати в договори за коригиране
+MigrationContractsEmptyCreationDatesNothingToUpdate=Няма дати на създаване в договори за коригиране
+MigrationContractsInvalidDatesUpdate=Корекция на неправилни дати в договори
+MigrationContractsInvalidDateFix=Корекция на договор %s (Дата на договора=%s, Начална дата на услуга=%s)
+MigrationContractsInvalidDatesNumber=%s променен(и) договор(а)
+MigrationContractsInvalidDatesNothingToUpdate=Няма неправилни дати в договори за коригиране
+MigrationContractsIncoherentCreationDateUpdate=Корекция на неправилни дати на създаване в договори
+MigrationContractsIncoherentCreationDateUpdateSuccess=Корекцията на неправилните дати на създаване в договори е успешно извършена
+MigrationContractsIncoherentCreationDateNothingToUpdate=Няма неправилни дати на създаване в договори за коригиране
+MigrationReopeningContracts=Отворен договор е затворен с грешка
+MigrationReopenThisContract=Повторно отваряне на договор %s
+MigrationReopenedContractsNumber=%s променен(и) договор(а)
+MigrationReopeningContractsNothingToUpdate=Няма затворени договори за отваряне
+MigrationBankTransfertsUpdate=Актуализиране на връзките между банков запис и банков превод
 MigrationBankTransfertsNothingToUpdate=Всички връзки са актуални
 MigrationShipmentOrderMatching=Актуализация на експедиционни бележки
 MigrationDeliveryOrderMatching=Актуализация на обратни разписки
-MigrationDeliveryDetail=Актуализация на доставката
-MigrationStockDetail=Актуализиране на наличната стойност на продукти
+MigrationDeliveryDetail=Актуализация на доставки
+MigrationStockDetail=Актуализиране на стоковата наличност на продукти
 MigrationMenusDetail=Актуализиране на таблици за динамични менюта
-MigrationDeliveryAddress=Актуализиране на адрес за доставка на пратки,
-MigrationProjectTaskActors=Data migration for table llx_projet_task_actors
-MigrationProjectUserResp=Миграция на полето fk_user_resp на llx_projet llx_element_contact
-MigrationProjectTaskTime=Актуализация на времето, прекарано в секунда
+MigrationDeliveryAddress=Актуализиране на адреси за доставка в пратки
+MigrationProjectTaskActors=Миграция на данни за таблица llx_projet_task_actors
+MigrationProjectUserResp=Миграция на поле fk_user_resp от llx_projet към llx_element_contact
+MigrationProjectTaskTime=Актуализиране на отделеното време в секунди
 MigrationActioncommElement=Актуализиране на данните за действия
-MigrationPaymentMode=Data migration for payment type
+MigrationPaymentMode=Миграция на данни за типът на плащане
 MigrationCategorieAssociation=Миграция на категории
-MigrationEvents=Migration of events to add event owner into assignment table
-MigrationEventsContact=Migration of events to add event contact into assignment table
-MigrationRemiseEntity=Update entity field value of llx_societe_remise
-MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
-MigrationUserRightsEntity=Update entity field value of llx_user_rights
-MigrationUserGroupRightsEntity=Update entity field value of llx_usergroup_rights
-MigrationUserPhotoPath=Migration of photo paths for users
-MigrationReloadModule=Презареждане на модула %s
-MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
-ShowNotAvailableOptions=Show unavailable options
-HideNotAvailableOptions=Hide unavailable options
-ErrorFoundDuringMigration=Error(s) were reported during the migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but the application or some features may not work correctly until the errors are resolved.
-YouTryInstallDisabledByDirLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (directory renamed with .lock suffix).<br>
-YouTryInstallDisabledByFileLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (by the existence of a lock file <strong>install.lock</strong> in the dolibarr documents directory).<br>
-ClickHereToGoToApp=Click here to go to your application
-ClickOnLinkOrRemoveManualy=Click on the following link. If you always see this same page, you must remove/rename the file install.lock in the documents directory.
+MigrationEvents=Миграция на данни за събития за добавяне на собственик на събитие в определената таблица
+MigrationEventsContact=Миграция на данни за събития за добавяне на контакт за събитие в определената таблица
+MigrationRemiseEntity=Актуализиране на стойността на полето в обекта llx_societe_remise
+MigrationRemiseExceptEntity=Актуализиране на стойността на полето в обекта llx_societe_remise_except
+MigrationUserRightsEntity=Актуализиране на стойността на полето в обекта llx_user_rights
+MigrationUserGroupRightsEntity=Актуализиране на стойността на полето в обекта llx_usergroup_rights
+MigrationUserPhotoPath=Миграция на пътя до снимки на потребители
+MigrationReloadModule=Презареждане на модул %s
+MigrationResetBlockedLog=Нулиране на модула BlockedLog за алгоритъм v7
+ShowNotAvailableOptions=Показване на недостъпни опции
+HideNotAvailableOptions=Скриване на недостъпни опции
+ErrorFoundDuringMigration=По време на процеса на миграция са докладвани грешки, така че следващата стъпка не е възможна. За да игнорирате грешките, може да <a href="%s"> кликнете тук </a>, но приложението или някои функции може да не работят правилно, докато грешките не бъдат отстранени.
+YouTryInstallDisabledByDirLock=Приложението се опита да се самоактуализира, но страниците за инсталация / актуализация са били изключени от гледна точка на сигурност (директорията е преименувана с .lock суфикс). <br>
+YouTryInstallDisabledByFileLock=Приложението се опита да се самоактуализира, но страниците за инсталация / актуализация са били изключени от гледна точка на сигурност (от наличието на заключващ файл <strong> install.lock </strong> в директорията documents на Dolibarr). <br>
+ClickHereToGoToApp=Кликнете тук, за да отидете в приложението си
+ClickOnLinkOrRemoveManualy=Кликнете върху следната връзка. Ако винаги виждате същата страница, трябва да премахнете / преименувате файла install.lock в директорията documents на Dolibarr.
diff --git a/htdocs/langs/bg_BG/loan.lang b/htdocs/langs/bg_BG/loan.lang
index 81bbc28a904..ca4ad3722d9 100644
--- a/htdocs/langs/bg_BG/loan.lang
+++ b/htdocs/langs/bg_BG/loan.lang
@@ -1,31 +1,31 @@
 # Dolibarr language file - Source file is en_US - loan
-Loan=Заем
-Loans=Заеми
-NewLoan=Нов Заем
-ShowLoan=Показване на Заем
-PaymentLoan=Плащане на Заем
-LoanPayment=Плащане на Заем
-ShowLoanPayment=Показване на плащането на Заем
+Loan=Кредит
+Loans=Кредити
+NewLoan=Нов кредит
+ShowLoan=Показване на кредит
+PaymentLoan=Плащане по кредит
+LoanPayment=Плащане по кредит
+ShowLoanPayment=Показване на плащане по кредит
 LoanCapital=Капитал
 Insurance=Застраховка
 Interest=Лихва
-Nbterms=Number of terms
-Term=Term
-LoanAccountancyCapitalCode=Accounting account capital
-LoanAccountancyInsuranceCode=Accounting account insurance
-LoanAccountancyInterestCode=Accounting account interest
-ConfirmDeleteLoan=Потвърдете изтриването на този заем
-LoanDeleted=Заемът е изтрит успешно
-ConfirmPayLoan=Confirm classify paid this loan
-LoanPaid=Заем Платен
-ListLoanAssociatedProject=List of loan associated with the project
-AddLoan=Create loan
-FinancialCommitment=Financial commitment
+Nbterms=Брой условия
+Term=Условие
+LoanAccountancyCapitalCode=Счетоводна сметка на капитал
+LoanAccountancyInsuranceCode=Счетоводна сметка на застраховка
+LoanAccountancyInterestCode=Счетоводна сметка за лихва
+ConfirmDeleteLoan=Потвърдете изтриването на този кредит
+LoanDeleted=Кредитът е успешно изтрит
+ConfirmPayLoan=Потвърдете класифицирането на този кредит като платен
+LoanPaid=Платен кредит
+ListLoanAssociatedProject=Списък на кредити, свързани с проекта
+AddLoan=Създаване на кредит
+FinancialCommitment=Финансово задължение
 InterestAmount=Лихва
-CapitalRemain=Capital remain
+CapitalRemain=Оставащ капитал
 # Admin
-ConfigLoan=Конфигурация на модула заем
-LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accounting account capital by default
-LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accounting account interest by default
-LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accounting account insurance by default
-CreateCalcSchedule=Edit financial commitment
+ConfigLoan=Конфигуриране на модула Кредити
+LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Счетоводна сметка на капитал по подразбиране
+LOAN_ACCOUNTING_ACCOUNT_INTEREST=Счетоводна сметка на лихва по подразбиране
+LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Счетоводна сметка на застраховка по подразбиране
+CreateCalcSchedule=Променяне на финансово задължение
diff --git a/htdocs/langs/bg_BG/mails.lang b/htdocs/langs/bg_BG/mails.lang
index 3e0699cfba3..4a4acf6b635 100644
--- a/htdocs/langs/bg_BG/mails.lang
+++ b/htdocs/langs/bg_BG/mails.lang
@@ -14,7 +14,7 @@ MailTo=Получател (и)
 MailToUsers=До потребител (и)
 MailCC=Копие до
 MailToCCUsers=Копие до потребител (и)
-MailCCC=Явно копие до
+MailCCC=Скрито копие до
 MailTopic=Тема на имейла
 MailText=Съобщение
 MailFile=Прикачени файлове
@@ -24,7 +24,7 @@ BodyNotIn=Не е в съобщение
 ShowEMailing=Показване на масови имейли
 ListOfEMailings=Списък на масови имейли
 NewMailing=Нов масов имейл
-EditMailing=Редактиране на масов имейл
+EditMailing=Променяне на масов имейл
 ResetMailing=Повторно изпращане на масов имейл
 DeleteMailing=Изтриване на масов имейл
 DeleteAMailing=Изтриване на масов имейл
diff --git a/htdocs/langs/bg_BG/main.lang b/htdocs/langs/bg_BG/main.lang
index 7481d5cd06c..a475e9445a9 100644
--- a/htdocs/langs/bg_BG/main.lang
+++ b/htdocs/langs/bg_BG/main.lang
@@ -152,7 +152,7 @@ AddLink=Добавяне на връзка
 RemoveLink=Премахване на връзка
 AddToDraft=Добавяне към чернова
 Update=Актуализиране
-Close=Затваряне
+Close=Приключване
 CloseBox=Премахнете джаджата от таблото си за управление
 Confirm=Потвърждаване
 ConfirmSendCardByMail=Наистина ли искате да изпратите съдържанието на тази карта по имейл до <b> %s </b>?
@@ -161,7 +161,7 @@ Remove=Премахване
 Resiliate=Прекратяване
 Cancel=Анулиране
 Modify=Променяне
-Edit=Редактиране
+Edit=Променяне
 Validate=Валидиране
 ValidateAndApprove=Валидиране и одобряване
 ToValidate=За валидиране
@@ -445,6 +445,7 @@ ContactsAddressesForCompany=Контакти / адреси за този кон
 AddressesForCompany=Адреси за този контрагент
 ActionsOnCompany=Събития за този контрагент
 ActionsOnContact=Събития за този контакт / адрес
+ActionsOnContract=Events for this contract
 ActionsOnMember=Събития за този член
 ActionsOnProduct=Събития за този продукт
 NActionsLate=%s закъснели
@@ -524,7 +525,7 @@ Photos=Снимки
 AddPhoto=Добавяне на снимка
 DeletePicture=Изтриване на снимка
 ConfirmDeletePicture=Потвърждавате ли изтриването на снимката?
-Login=Потребител
+Login=Потребителско име
 LoginEmail=Потребител (имейл)
 LoginOrEmail=Потребител или имейл
 CurrentLogin=Текущ потребител
@@ -759,6 +760,7 @@ LinkToSupplierProposal=Връзка към запитване към доста
 LinkToSupplierInvoice=Връзка към фактура за доставка
 LinkToContract=Връзка към договор
 LinkToIntervention=Връзка към интервенция
+LinkToTicket=Link to ticket
 CreateDraft=Създаване на чернова
 SetToDraft=Назад към черновата
 ClickToEdit=Кликнете, за да редактирате
diff --git a/htdocs/langs/bg_BG/members.lang b/htdocs/langs/bg_BG/members.lang
index b847148cb92..d19bdf8cddb 100644
--- a/htdocs/langs/bg_BG/members.lang
+++ b/htdocs/langs/bg_BG/members.lang
@@ -12,7 +12,7 @@ FundationMembers=Членове на организацията
 ListOfValidatedPublicMembers=Списък на настоящите публични членове
 ErrorThisMemberIsNotPublic=Този член не е публичен
 ErrorMemberIsAlreadyLinkedToThisThirdParty=Друг член (име: <b> %s </b>, вход: <b> %s </b> вече е свързан с контрагента <b> %s </b>. Премахнете тази връзка първо, защото контрагента не може да бъде свързана само с член (и обратно).
-ErrorUserPermissionAllowsToLinksToItselfOnly=От съображения за сигурност, трябва да ви бъдат предоставени права за редактиране на всички потребители да могат свързват член към потребител, който не е ваш.
+ErrorUserPermissionAllowsToLinksToItselfOnly=От съображения за сигурност трябва да имате права за променяне на всички потребители, за да може да свържете член с потребител, който не сте вие.
 SetLinkToUser=Връзка към Dolibarr потребител
 SetLinkToThirdParty=Линк към Dolibarr контрагент
 MembersCards=Визитни картички на членове
@@ -159,13 +159,13 @@ SubscriptionPayment=Плащане на членски внос
 LastSubscriptionDate=Date of latest subscription payment
 LastSubscriptionAmount=Amount of latest subscription
 MembersStatisticsByCountries=Статистика за членовете по държава
-MembersStatisticsByState=Статистика за членовете по област
+MembersStatisticsByState=Статистика за членове по област
 MembersStatisticsByTown=Статистика за членовете по град
 MembersStatisticsByRegion=Статистики на членовете по регион
 NbOfMembers=Брой членове
 NoValidatedMemberYet=Няма намерени потвърдени членове
 MembersByCountryDesc=Този екран показва статистическите данни за членовете по държави. Графиката зависи от онлайн услугата Google графика и е достъпна само ако имате свързаност с интернет.
-MembersByStateDesc=Този екран показва статистическите данни за членовете по област.
+MembersByStateDesc=Този екран показва статистически данни за членове по област / регион.
 MembersByTownDesc=Този екран показва статистическите данни за членовете по град.
 MembersStatisticsDesc=Изберете статистически данни, които искате да прочетете ...
 MenuMembersStats=Статистика
diff --git a/htdocs/langs/bg_BG/oauth.lang b/htdocs/langs/bg_BG/oauth.lang
index cafca379f6f..5f055216138 100644
--- a/htdocs/langs/bg_BG/oauth.lang
+++ b/htdocs/langs/bg_BG/oauth.lang
@@ -1,30 +1,30 @@
 # Dolibarr language file - Source file is en_US - oauth
-ConfigOAuth=Oauth Configuration
-OAuthServices=OAuth services
-ManualTokenGeneration=Manual token generation
-TokenManager=Token manager
-IsTokenGenerated=Is token generated ?
-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
-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.
-OAuthSetupForLogin=Page to generate an OAuth token
-SeePreviousTab=See previous tab
-OAuthIDSecret=OAuth ID and Secret
-TOKEN_REFRESH=Token Refresh Present
-TOKEN_EXPIRED=Token expired
-TOKEN_EXPIRE_AT=Token expire at
-TOKEN_DELETE=Delete saved token
-OAUTH_GOOGLE_NAME=Oauth Google service
-OAUTH_GOOGLE_ID=Oauth Google Id
-OAUTH_GOOGLE_SECRET=Oauth Google Secret
-OAUTH_GOOGLE_DESC=Go on <a class="notasortlink" href="https://console.developers.google.com/" target="_blank">this page</a> then "Credentials" to create Oauth credentials
-OAUTH_GITHUB_NAME=Oauth GitHub service
-OAUTH_GITHUB_ID=Oauth GitHub Id
-OAUTH_GITHUB_SECRET=Oauth GitHub Secret
-OAUTH_GITHUB_DESC=Go on <a class="notasortlink" href="https://github.com/settings/developers" target="_blank">this page</a> then "Register a new application" to create Oauth credentials
+ConfigOAuth=OAuth конфигурация
+OAuthServices=OAuth услуги
+ManualTokenGeneration=Ръчно генериране на токен
+TokenManager=Токен мениджър
+IsTokenGenerated=Генериран ли е токен?
+NoAccessToken=Няма запазен токен за достъп в локалната база данни
+HasAccessToken=Беше генериран и съхранен токен в локалната база данни
+NewTokenStored=Токенът е получен и съхранен
+ToCheckDeleteTokenOnProvider=Кликнете тук, за да проверите / изтриете разрешение, съхранено от %s OAuth доставчик
+TokenDeleted=Токенът е изтрит
+RequestAccess=Кликнете тук, за да заявите / подновите достъпа и да получите нов токен, който да запазите
+DeleteAccess=Кликнете тук, за да изтриете токенът
+UseTheFollowingUrlAsRedirectURI=Използвайте следния URL адрес като URI за пренасочване, когато създавате идентификационни данни през вашият доставчик на OAuth:
+ListOfSupportedOauthProviders=Въведете идентификационните данни, предоставени от вашият OAuth2 доставчик. Тук са изброени поддържаните OAuth2 доставчици. Тези услуги могат да бъдат използвани от други модули, които се нуждаят от OAuth2 удостоверяване.
+OAuthSetupForLogin=Страница за генериране на OAuth токен
+SeePreviousTab=Вижте предишния раздел
+OAuthIDSecret=OAuth ID и Secret
+TOKEN_REFRESH=Налично е опресняване на токен
+TOKEN_EXPIRED=Токенът е изтекъл
+TOKEN_EXPIRE_AT=Токенът изтича на
+TOKEN_DELETE=Изтриване на съхранен токен
+OAUTH_GOOGLE_NAME=OAuth услуга на Google
+OAUTH_GOOGLE_ID=OAuth Google Id
+OAUTH_GOOGLE_SECRET=OAuth Google Secret
+OAUTH_GOOGLE_DESC=Отидете на <a class="notasortlink" href="https://console.developers.google.com/" target="_blank">тази страница</a> след това „Удостоверения“, за да създадете OAuth идентификационни данни
+OAUTH_GITHUB_NAME=OAuth услуга на GitHub
+OAUTH_GITHUB_ID=OAuth GitHub Id
+OAUTH_GITHUB_SECRET=OAuth GitHub Secret
+OAUTH_GITHUB_DESC=Отидете на <a class="notasortlink" href="https://github.com/settings/developers" target="_blank">тази страница</a> след това „Регистрирайте ново приложение“, за да създадете OAuth идентификационни данни
diff --git a/htdocs/langs/bg_BG/opensurvey.lang b/htdocs/langs/bg_BG/opensurvey.lang
index 9a08ed868ad..76e4292029d 100644
--- a/htdocs/langs/bg_BG/opensurvey.lang
+++ b/htdocs/langs/bg_BG/opensurvey.lang
@@ -1,17 +1,17 @@
 # Dolibarr language file - Source file is en_US - opensurvey
 Survey=Анкета
 Surveys=Анкети
-OrganizeYourMeetingEasily=Организиране на вашите срещи и анкети лесно. Първо изберете типа на гласуване ...
-NewSurvey=Ново анкета
-OpenSurveyArea=Зона Анкети
-AddACommentForPoll=Можете да добавите коментар на анкетата ...
+OrganizeYourMeetingEasily=Организирайте лесно срещите и анкетите си. Първо изберете тип анкета...
+NewSurvey=Ново проучване
+OpenSurveyArea=Зона за проучвания
+AddACommentForPoll=Можете да добавите коментар към анкетата...
 AddComment=Добавяне на коментар
 CreatePoll=Създаване на анкета
 PollTitle=Тема на анкетата
 ToReceiveEMailForEachVote=Получаване на имейл за всеки глас
-TypeDate=Дата
-TypeClassic=Стандартно
-OpenSurveyStep2=Изберете вашите дата между свободните дни (сиво). Избраните дни са зелени. Можете да махнете избрания преди това ден като отново кликнете върху него. 
+TypeDate=Срочна
+TypeClassic=Стандартна
+OpenSurveyStep2=Изберете вашите дати измежду свободните дни в сиво. Избраните дни ще бъдат оцветени в зелено. Може да отмените избора си за предварително избран ден като кликнете отново върху него.
 RemoveAllDays=Премахване на всички дни
 CopyHoursOfFirstDay=Копиране на часовете от първия ден
 RemoveAllHours=Премахване на всички часове
@@ -19,43 +19,43 @@ SelectedDays=Избрани дни
 TheBestChoice=С най-много гласове в момента е
 TheBestChoices=С най-много гласове в момента са
 with=с
-OpenSurveyHowTo=Ако сте съгласни да гласувате в тази анкета, трябва въведете името си, да изберете отговорите, които най-подходящи за вас и да потвърдите с бутон плюс в края на този ред.
-CommentsOfVoters=Коментари на гласувалите
-ConfirmRemovalOfPoll=Сигурни ли сте, че желаете да премахнете анкетата (и всички гласове)
+OpenSurveyHowTo=Ако сте съгласни да гласувате в тази анкета, трябва да въведете името си, да изберете отговорите, които са най-подходящи за вас и да потвърдите с бутона плюс в края на реда.
+CommentsOfVoters=Коментари на гласоподавателите
+ConfirmRemovalOfPoll=Сигурни ли сте, че искате да премахнете тази анкета (и всички гласове)?
 RemovePoll=Премахване на анкета
-UrlForSurvey=URL за директен достъп до акетата
-PollOnChoice=You are creating a poll to make a multi-choice for a poll. First enter all possible choices for your poll:
-CreateSurveyDate=Създаване на анкета със срок
-CreateSurveyStandard=Създаване на стандартно гласуване
+UrlForSurvey=URL адрес за директен достъп до анкетата
+PollOnChoice=Създавате анкета, за да направите проучване с предварително дефинирани отговори. Първо въведете всички възможни отговори за вашата анкета:
+CreateSurveyDate=Създаване на срочна анкета
+CreateSurveyStandard=Създаване на стандартна анкета
 CheckBox=Отметка
 YesNoList=Списък (празно/да/не)
 PourContreList=Списък (празно/за/против)
 AddNewColumn=Добавяне на нова колона
 TitleChoice=Избор на етикет
-ExportSpreadsheet=Експорт на разултатна таблица
-ExpireDate=Крайната дата
-NbOfSurveys=Брой на анкетите
-NbOfVoters=Брой гласове
+ExportSpreadsheet=Експортиране на таблица с резултати
+ExpireDate=Крайна дата
+NbOfSurveys=Брой анкети
+NbOfVoters=Брой гласоподаватели
 SurveyResults=Резултати
-PollAdminDesc=Позволено ви е да променяте всички линии за гласуване от тази анкета с бутон "Редактиране". Можете, също така, изтривате колона или линия с %s. Можете също да добавяте нова колона с %s.
+PollAdminDesc=Имате право да променяте всички редове за гласуване от тази анкета с бутон 'Променяне'. Можете също така, да изтривате колона или линия с %s. Можете също да добавяте нова колона с %s.
 5MoreChoices=Още 5
 Against=Против
-YouAreInivitedToVote=Поканени сте да гласувате за тази анкета
-VoteNameAlreadyExists=Името вече е било използвано за тази анкета
+YouAreInivitedToVote=Поканени сте да гласувате в тази анкета
+VoteNameAlreadyExists=Това име вече беше използвано в тази анкета
 AddADate=Добавяне на дата
 AddStartHour=Добавяне на начален час
 AddEndHour=Добавяне на краен час
 votes=глас(а)
-NoCommentYet=Все още няма публикувани коментари за тази анкета
-CanComment=Гласуващите могат да коментират в анкетата
-CanSeeOthersVote=Анкетираните могат да виждат гласа на другите хора.
-SelectDayDesc=За всеки избран ден можете да изберете или не часовете за среща в следния формат: <br>- празно,<br>- "8h", "8H" или 8:00", за да зададете начален час на среща,<br>- "8-11", "8h-11h", "8H-11H" или "8:00-11:00", за да зададете час на край на среща,<br>- "8h15-11h15", "8H15-11H15" или "8:15-11:15" за същото нещо, но с минути.
-BackToCurrentMonth=Обратно в текущия месец
-ErrorOpenSurveyFillFirstSection=Не сте попълнили първата секция при създаването на анкетата
-ErrorOpenSurveyOneChoice=Въведете поне една възможност за избор
-ErrorInsertingComment=Възникна грешка при въвеждането на вашия коментар
-MoreChoices=Въведете повече възможности за избор за анкетираните
-SurveyExpiredInfo=The poll has been closed or voting delay has expired.
-EmailSomeoneVoted=%s е попълнил ред.\nМожете да намерите вашата анкета на линка:\n%s
-ShowSurvey=Show survey
-UserMustBeSameThanUserUsedToVote=You must have voted and use the same user name that the one used to vote, to post a comment
+NoCommentYet=Все още няма публикувани коментари в тази анкета
+CanComment=Гласоподавателите могат да коментират в анкетата
+CanSeeOthersVote=Гласоподавателите могат да виждат гласа на другите хора
+SelectDayDesc=За всеки избран ден, може да изберете или не часовете за срещи в следния формат: <br> - празно, <br> - "8h", "8H" или "8:00", за да зададете начален час на срещата, <br> - "8- 11", "8h-11h", "8H-11H" или "8: 00-11:00", за да зададете начален и краен час на срещата, <br> -"8h15-11h15", "8H15-11H15" или "8:15-11:15" за същото, но с минути.
+BackToCurrentMonth=Обратно към текущия месец
+ErrorOpenSurveyFillFirstSection=Не сте попълнили първата секция при създаване на анкетата
+ErrorOpenSurveyOneChoice=Въведете поне един избор
+ErrorInsertingComment=Възникна грешка при въвеждане на вашия коментар
+MoreChoices=Въведете повече възможности за избор на гласоподавателите
+SurveyExpiredInfo=Анкетата е затворена или срокът за гласуване е изтекъл.
+EmailSomeoneVoted=%s е попълнил ред.\nМожете да намерите вашата анкета на адрес:\n%s
+ShowSurvey=Показване на проучването
+UserMustBeSameThanUserUsedToVote=Трябва да сте гласували и да използвате същото потребителско име, с което сте гласували, за да публикувате коментар
diff --git a/htdocs/langs/bg_BG/orders.lang b/htdocs/langs/bg_BG/orders.lang
index 3379a9d3ed2..e346f7356c3 100644
--- a/htdocs/langs/bg_BG/orders.lang
+++ b/htdocs/langs/bg_BG/orders.lang
@@ -1,18 +1,18 @@
 # Dolibarr language file - Source file is en_US - orders
-OrdersArea=Зона за поръчки от клиенти
-SuppliersOrdersArea=Зона за поръчки към доставчици
-OrderCard=Карта за поръчка
-OrderId=Поръчка Id
+OrdersArea=Секция за поръчки за продажба
+SuppliersOrdersArea=Секция за поръчки за покупка
+OrderCard=Карта
+OrderId=Идентификатор на поръчка
 Order=Поръчка
 PdfOrderTitle=Поръчка
 Orders=Поръчки
-OrderLine=Ред за поръчка
+OrderLine=Ред №
 OrderDate=Дата на поръчка
 OrderDateShort=Дата на поръчка
 OrderToProcess=Поръчка за обработване
 NewOrder=Нова поръчка
-ToOrder=Направи поръчка
-MakeOrder=Направи поръчка
+ToOrder=Възлагане на поръчка
+MakeOrder=Възлагане на поръчка
 SupplierOrder=Поръчка за покупка
 SuppliersOrders=Поръчки за покупка
 SuppliersOrdersRunning=Текущи поръчки за покупка
@@ -53,8 +53,8 @@ StatusOrderRefused=Отхвърлена
 StatusOrderBilled=Фактурирана
 StatusOrderReceivedPartially=Частично получена
 StatusOrderReceivedAll=Изцяло получена
-ShippingExist=Съществува пратка
-QtyOrdered=Поръчано к-во
+ShippingExist=Съществува доставка
+QtyOrdered=Поръчано кол.
 ProductQtyInDraft=Количество на продукт в чернови поръчки
 ProductQtyInDraftOrWaitingApproved=Количество на продукт в чернови или одобрени поръчки, все още не поръчано
 MenuOrdersToBill=Доставени поръчки
@@ -65,7 +65,7 @@ RefuseOrder=Отхвърляне на поръчка
 ApproveOrder=Одобряване на поръчка
 Approve2Order=Одобряване на поръчка (второ ниво)
 ValidateOrder=Валидиране на поръчка
-UnvalidateOrder=Редактиране на поръчка
+UnvalidateOrder=Променяне на поръчка
 DeleteOrder=Изтриване на поръчка
 CancelOrder=Анулиране на поръчка
 OrderReopened= Поръчка %s е повторно отворена
@@ -87,7 +87,7 @@ OrdersStatisticsSuppliers=Статистика на поръчките за по
 NumberOfOrdersByMonth=Брой поръчки на месец
 AmountOfOrdersByMonthHT=Стойност на поръчки на месец (без ДДС)
 ListOfOrders=Списък на поръчки
-CloseOrder=Затваряне на поръчка
+CloseOrder=Приключване на поръчка
 ConfirmCloseOrder=Сигурни ли сте, че искате да поставите статус 'Доставена' на тази поръчка? След като поръчката бъде доставена, тя може да бъде фактурирана.
 ConfirmDeleteOrder=Сигурни ли сте, че искате да изтриете тази поръчка?
 ConfirmValidateOrder=Сигурни ли сте, че искате да валидирате тази поръчка под името <b>%s</b>?
@@ -100,9 +100,9 @@ DraftOrders=Чернови поръчки
 DraftSuppliersOrders=Чернови поръчки за покупка
 OnProcessOrders=Поръчки в изпълнение
 RefOrder=Реф. поръчка
-RefCustomerOrder=Реф. поръчка за клиент
-RefOrderSupplier=Реф. поръчка за доставчик
-RefOrderSupplierShort=Реф. поръчка доставчик
+RefCustomerOrder=Реф. поръчка на клиент
+RefOrderSupplier=Реф. поръчка на доставчик
+RefOrderSupplierShort=Реф. поръчка на доставчик
 SendOrderByMail=Изпращане на поръчка по имейл
 ActionsOnOrder=Свързани събития
 NoArticleOfTypeProduct=Няма артикул от тип 'продукт', така че няма артикули годни за доставка по тази поръчка
@@ -123,7 +123,7 @@ TypeContact_commande_internal_SALESREPFOLL=Представител просле
 TypeContact_commande_internal_SHIPPING=Представител проследяващ изпращането
 TypeContact_commande_external_BILLING=Контакт на клиент за фактура
 TypeContact_commande_external_SHIPPING=Контакт на клиент за доставка
-TypeContact_commande_external_CUSTOMER=Контакт на клиент за поръчка
+TypeContact_commande_external_CUSTOMER=Контакт на клиент проследяващ поръчката
 TypeContact_order_supplier_internal_SALESREPFOLL=Представител проследяващ поръчката за покупка
 TypeContact_order_supplier_internal_SHIPPING=Представител проследяващ изпращането
 TypeContact_order_supplier_external_BILLING=Контакт на доставчик за фактура
@@ -154,5 +154,5 @@ CreateOrders=Създаване на поръчки
 ToBillSeveralOrderSelectCustomer=За да създадете фактура по няколко поръчки, кликнете първо на клиент, след това изберете '%s'.
 OptionToSetOrderBilledNotEnabled=Опцията (от модул 'Работен процес') за автоматична смяна на статуса на поръчката на 'Фактурирана' при валидиране на фактурата е изключена, така че ще трябва ръчно да промените статута на поръчка на 'Фактурирана'.
 IfValidateInvoiceIsNoOrderStayUnbilled=Ако фактурата не е валидирана, поръчката ще остане със статус 'Не фактурирана', докато фактурата не бъде валидирана.
-CloseReceivedSupplierOrdersAutomatically=Затваряне на поръчката на '%s' автоматично, ако всички продукти са получени.
+CloseReceivedSupplierOrdersAutomatically=Приключване на поръчката на '%s' автоматично, ако всички продукти са получени.
 SetShippingMode=Задайте режим на доставка
diff --git a/htdocs/langs/bg_BG/other.lang b/htdocs/langs/bg_BG/other.lang
index 0f11fd65898..aea81115f73 100644
--- a/htdocs/langs/bg_BG/other.lang
+++ b/htdocs/langs/bg_BG/other.lang
@@ -7,8 +7,8 @@ ToolsDesc=Всички инструменти, които не са включе
 Birthday=Рожден ден
 BirthdayDate=Рождена дата
 DateToBirth=Дата на раждане
-BirthdayAlertOn=Известяването за рожден ден е активно
-BirthdayAlertOff=Известяването за рожден ден е неактивно
+BirthdayAlertOn=сигнал за рожден ден активен
+BirthdayAlertOff=сигнал за рожден ден неактивен
 TransKey=Превод на ключа TransKey
 MonthOfInvoice=Месец (1÷12) от датата на фактурата
 TextMonthOfInvoice=Месец (текст) на датата на фактурата
@@ -31,10 +31,10 @@ NextYearOfInvoice=Следваща година от датата на факт
 DateNextInvoiceBeforeGen=Дата на следващата фактура (преди генериране)
 DateNextInvoiceAfterGen=Дата на следващата фактура (след генериране)
 
-Notify_ORDER_VALIDATE=Клиентската поръчка е валидирана
-Notify_ORDER_SENTBYMAIL=Клиентската поръчка е изпратена на имейл
+Notify_ORDER_VALIDATE=Поръчката за продажба е валидирана
+Notify_ORDER_SENTBYMAIL=Поръчката за продажба е изпратена на имейл
 Notify_ORDER_SUPPLIER_SENTBYMAIL=Поръчката за покупка е изпратена на имейл
-Notify_ORDER_SUPPLIER_VALIDATE=Поръчката за покупка е записана
+Notify_ORDER_SUPPLIER_VALIDATE=Поръчката за покупка е валидирана
 Notify_ORDER_SUPPLIER_APPROVE=Поръчката за покупка е одобрена
 Notify_ORDER_SUPPLIER_REFUSE=Поръчката за покупка е отхвърлена
 Notify_PROPAL_VALIDATE=Търговското предложение е валидирано
@@ -44,20 +44,20 @@ Notify_PROPAL_SENTBYMAIL=Търговското предложение е изп
 Notify_WITHDRAW_TRANSMIT=Оттегляне на трансмисия
 Notify_WITHDRAW_CREDIT=Оттегляне на кредит
 Notify_WITHDRAW_EMIT=Извършване на оттегляне
-Notify_COMPANY_CREATE=Контрагента е създаден
+Notify_COMPANY_CREATE=Контрагентът е създаден
 Notify_COMPANY_SENTBYMAIL=Имейли изпратени от картата на контрагента
-Notify_BILL_VALIDATE=Клиентската фактура е валидирана
-Notify_BILL_UNVALIDATE=Клиентската фактура е не валидирана
-Notify_BILL_PAYED=Клиентската фактура е платена
-Notify_BILL_CANCEL=Клиентската фактура е анулирана
-Notify_BILL_SENTBYMAIL=Клиентската фактура е изпратена на имейл
-Notify_BILL_SUPPLIER_VALIDATE=Доставната фактура е валидирана
-Notify_BILL_SUPPLIER_PAYED=Доставната фактура е платена
-Notify_BILL_SUPPLIER_SENTBYMAIL=Доставната фактура е изпратена на имейл
-Notify_BILL_SUPPLIER_CANCELED=Доставната фактура е анулирана
-Notify_CONTRACT_VALIDATE=Договора е валидиран
+Notify_BILL_VALIDATE=Фактурата за продажба е валидирана
+Notify_BILL_UNVALIDATE=Фактурата за продажба е отворена отново
+Notify_BILL_PAYED=Фактурата за продажба е платена
+Notify_BILL_CANCEL=Фактурата за продажба е анулирана
+Notify_BILL_SENTBYMAIL=Фактурата за продажба е изпратена на имейл
+Notify_BILL_SUPPLIER_VALIDATE=Фактурата за доставка е валидирана
+Notify_BILL_SUPPLIER_PAYED=Фактурата за доставка е платена
+Notify_BILL_SUPPLIER_SENTBYMAIL=Фактурата за доставка е изпратена на имейл
+Notify_BILL_SUPPLIER_CANCELED=Фактурата за доставка е анулирана
+Notify_CONTRACT_VALIDATE=Договорът е валидиран
 Notify_FICHEINTER_VALIDATE=Интервенцията е валидирана
-Notify_FICHINTER_ADD_CONTACT=Добавен е контакт към интервенция
+Notify_FICHINTER_ADD_CONTACT=Добавен е контакт към интервенцията
 Notify_FICHINTER_SENTBYMAIL=Интервенцията е изпратена на имейл
 Notify_SHIPPING_VALIDATE=Доставката е валидирана
 Notify_SHIPPING_SENTBYMAIL=Доставката е изпратена на имейл
@@ -71,7 +71,7 @@ Notify_TASK_CREATE=Задачата е създадена
 Notify_TASK_MODIFY=Задачата е променена
 Notify_TASK_DELETE=Задачата е изтрита
 Notify_EXPENSE_REPORT_VALIDATE=Разходния отчет е валидиран (изисква се одобрение)
-Notify_EXPENSE_REPORT_APPROVE=Разходния отчет е одобрен
+Notify_EXPENSE_REPORT_APPROVE=Разходният отчет е одобрен
 Notify_HOLIDAY_VALIDATE=Молбата за отпуск е валидирана (изисква се одобрение)
 Notify_HOLIDAY_APPROVE=Молбата за отпуск е одобрена
 SeeModuleSetup=Вижте настройка на модул %s
@@ -82,7 +82,7 @@ AttachANewFile=Прикачване на нов файл / документ
 LinkedObject=Свързан обект
 NbOfActiveNotifications=Брой известия (брой получени имейли)
 PredefinedMailTest=__(Здравейте)__,\nТова е тестово съобщение, изпратено до __EMAIL__.\nДвата реда са разделени, чрез въвеждане на нов ред.\n\n__USER_SIGNATURE__
-PredefinedMailTestHtml=__(Здравейте)__,\nТова е <b>тестово</b> съобщение (думата 'тестово' трябва да бъде с удебелен шрифт).<br>Двата реда са разделени, чрез въвеждане на нов ред.<br><br>__USER_SIGNATURE__
+PredefinedMailTestHtml=__(Здравейте)__,\nТова е <b>тестово</b> съобщение (думата 'тестово' трябва да бъде с удебелен шрифт).\nДвата реда са разделени, чрез въвеждане на нов ред.\n\n__USER_SIGNATURE__
 PredefinedMailContentContract=__(Здравейте)__,\n\n\n__(Поздрави)__,\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoice=__(Здравейте)__,\n\nМоля, вижте приложената фактура __REF__\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Поздрави)__,\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__(Здравейте)__,\n\nБихме желали да Ви напомним, че фактура __REF__ все още не е платена. Копие на фактурата е прикачено към съобщението.\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Поздрави)__,\n\n__USER_SIGNATURE__
@@ -91,35 +91,35 @@ PredefinedMailContentSendSupplierProposal=__(Здравейте)__,\n\nМоля,
 PredefinedMailContentSendOrder=__(Здравейте)__\n\nМоля, вижте приложената поръчка __REF__\n\n\n__(Поздрави)__,\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__(Здравейте)__,\n\nМоля, вижте приложена нашата поръчка __REF__\n\n\n__(Поздрави)__,\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierInvoice=__(Здравейте)__,\n\nМоля, вижте приложената фактура __REF__\n\n\n__(Поздрави)__,\n\n__USER_SIGNATURE__
-PredefinedMailContentSendShipping=__(Здравейте)__,\n\nМоля, вижте приложената пратка __REF__\n\n\n__(Поздрави)__,\n\n__USER_SIGNATURE__
+PredefinedMailContentSendShipping=__(Здравейте)__,\n\nМоля, вижте приложената доставка __REF__\n\n\n__(Поздрави)__,\n\n__USER_SIGNATURE__
 PredefinedMailContentSendFichInter=__(Здравейте)__,\n\nМоля, вижте приложената интервенция __REF__\n\n\n__(Поздрави)__,\n\n__USER_SIGNATURE__
 PredefinedMailContentThirdparty=__(Здравейте)__,\n\n\n__(Поздрави)__,\n\n__USER_SIGNATURE__
 PredefinedMailContentContact=__(Здравейте)__,\n\n\n__(Поздрави)__,\n\n__USER_SIGNATURE__
 PredefinedMailContentUser=__(Здравейте)__,\n\n\n__(Поздрави)__,\n\n__USER_SIGNATURE__
-PredefinedMailContentLink=Можете да кликнете върху връзката по-долу, за да направите плащане, в случай, че не сте го извършили.\n\n%s\n\n
+PredefinedMailContentLink=Може да кликнете върху връзката по-долу, за да направите плащане, в случай, че не сте го извършили.\n\n%s\n\n
 DemoDesc=Dolibarr е компактна ERP / CRM система, която поддържа различни работни модули. Демонстрация, показваща всички модули, няма смисъл, тъй като такъв сценарий никога не се случва (стотици модули са на разположение). Така че, няколко демо профила са налични.
-ChooseYourDemoProfil=Изберете демо профила, която най-добре отговаря на вашите нужди ...
-ChooseYourDemoProfilMore=... или създайте свой собствен профил<br>(свободен избор на модули)
-DemoFundation=Управление на членовете на организацията
-DemoFundation2=Управление на членовете и банковата сметка на организацията
+ChooseYourDemoProfil=Изберете демо профила, който най-добре отговаря на вашите нужди...
+ChooseYourDemoProfilMore=...или създайте свой собствен профил<br>(свободен избор на модули)
+DemoFundation=Управление на членове на организация
+DemoFundation2=Управление на членове и банкова сметка на организация
 DemoCompanyServiceOnly=Фирма или фрийлансър продаващи само услуги
 DemoCompanyShopWithCashDesk=Управление на магазин с каса
-DemoCompanyProductAndStocks=Фирма продаваща продукти в магазин
+DemoCompanyProductAndStocks=Фирма продаваща продукти с магазин
 DemoCompanyAll=Фирма с множество дейности (всички основни модули)
 CreatedBy=Създадено от %s
 ModifiedBy=Променено от %s
 ValidatedBy=Валидирано от %s
-ClosedBy=Затворено от %s
+ClosedBy=Приключено от %s
 CreatedById=Потребител, който е създал
-ModifiedById=Потребител, който е направил последната промяна
+ModifiedById=Потребител, който е направил последна промяна
 ValidatedById=Потребител, който е валидирал
 CanceledById=Потребител, който е анулирал
-ClosedById=Потребител, който е затворил
+ClosedById=Потребител, който е приключил
 CreatedByLogin=Потребител, който е създал
-ModifiedByLogin=Потребител, който е направил последната промяна
+ModifiedByLogin=Потребител, който е направил последна промяна
 ValidatedByLogin=Потребител, който е валидирал
 CanceledByLogin=Потребител, който е анулирал
-ClosedByLogin=Потребител, който е затворил
+ClosedByLogin=Потребител, който е приключил
 FileWasRemoved=Файл %s е премахнат
 DirWasRemoved=Директория %s е премахната
 FeatureNotYetAvailable=Функцията все още не е налице в текущата версия
@@ -170,28 +170,28 @@ SizeUnitinch=инч
 SizeUnitfoot=фут
 SizeUnitpoint=точка
 BugTracker=Регистър на бъгове
-SendNewPasswordDesc=Този формуляр ви позволява да заявите нова парола. Тя ще бъде изпратена на вашия имейл адрес.<br>Промяната ще влезе в сила, след като кликнете върху връзката за потвърждение в имейла.<br>Проверете си пощата.
+SendNewPasswordDesc=Този формуляр позволява да заявите нова парола. Тя ще бъде изпратена на вашият имейл адрес.<br>Промяната ще влезе в сила след като кликнете върху връзката за потвърждение в имейла.<br>Проверете си пощата.
 BackToLoginPage=Назад към страницата за вход
-AuthenticationDoesNotAllowSendNewPassword=Режимът за удостоверяване е <b>%s</b>.<br> В този режим, системата не може да знае, нито да промени паролата ви.<br> Свържете се с вашия системен администратор, ако искате да промените паролата си.
+AuthenticationDoesNotAllowSendNewPassword=Режимът за удостоверяване е <b>%s</b>.<br> В този режим, системата не може да знае, нито да промени паролата ви.<br> Свържете се с вашият системен администратор, ако искате да промените паролата си.
 EnableGDLibraryDesc=Инсталирайте или активирайте GD библиотеката на вашата PHP инсталация, за да използвате тази опция.
 ProfIdShortDesc=<b>Проф. Id %s</b> е информация, в зависимост от държавата на контрагента.<br>Например, за държавата <b>%s</b>, това е код <b>%s</b>.
-DolibarrDemo=Dolibarr ERP/CRM демо
+DolibarrDemo=Dolibarr ERP / CRM демо
 StatsByNumberOfUnits=Статистика за общото количество продукти / услуги
-StatsByNumberOfEntities=Статистика за броя на свързаните документи (брой фактури, поръчка ...)
+StatsByNumberOfEntities=Статистика за броя на свързаните документи (брой фактури, поръчки...)
 NumberOfProposals=Брой търговски предложения
-NumberOfCustomerOrders=Брой клиентски поръчки
-NumberOfCustomerInvoices=Брой клиентски фактури
-NumberOfSupplierProposals=Брой доставни фактури
+NumberOfCustomerOrders=Брой поръчки за продажба
+NumberOfCustomerInvoices=Брой фактури за продажба
+NumberOfSupplierProposals=Брой фактури за доставка
 NumberOfSupplierOrders=Брой поръчки за покупка
-NumberOfSupplierInvoices=Брой доставни фактури
+NumberOfSupplierInvoices=Брой фактури за доставка
 NumberOfContracts=Брой договори
-NumberOfUnitsProposals=Брой единици по търговски предложения
-NumberOfUnitsCustomerOrders=Брой единици по клиентски поръчки
-NumberOfUnitsCustomerInvoices=Брой единици по клиентски фактури
-NumberOfUnitsSupplierProposals=Брой единици по запитвания към доставчици
-NumberOfUnitsSupplierOrders=Брой единици по поръчки за покупка
-NumberOfUnitsSupplierInvoices=Брой единици по доставни фактури
-NumberOfUnitsContracts=Брой единици по договори
+NumberOfUnitsProposals=Брой по търговски предложения
+NumberOfUnitsCustomerOrders=Брой по поръчки за продажба
+NumberOfUnitsCustomerInvoices=Брой по фактури за продажба
+NumberOfUnitsSupplierProposals=Брой по запитвания към доставчици
+NumberOfUnitsSupplierOrders=Брой по поръчки за покупка
+NumberOfUnitsSupplierInvoices=Брой по фактури за доставка
+NumberOfUnitsContracts=Брой по договори
 EMailTextInterventionAddedContact=Възложена ви е нова интервенция %s.
 EMailTextInterventionValidated=Интервенция %s е валидирана.
 EMailTextInvoiceValidated=Фактура %s е валидирана.
@@ -200,7 +200,7 @@ EMailTextProposalValidated=Търговско предложение %s е ва
 EMailTextProposalClosedSigned=Търговско предложение %s е подписано.
 EMailTextOrderValidated=Поръчка %s е валидирана.
 EMailTextOrderApproved=Поръчка %s е одобрена.
-EMailTextOrderValidatedBy=Поръчка %s е записана от %s.
+EMailTextOrderValidatedBy=Поръчка %s е валидирана от %s.
 EMailTextOrderApprovedBy=Поръчка %s е одобрена от %s.
 EMailTextOrderRefused=Поръчка %s е отхвърлена.
 EMailTextOrderRefusedBy=Поръчка %s е отхвърлена от %s.
@@ -209,29 +209,29 @@ EMailTextExpenseReportValidated=Разходен отчет %s е валидир
 EMailTextExpenseReportApproved=Разходен отчет %s е одобрен.
 EMailTextHolidayValidated=Молба за отпуск %s е валидирана.
 EMailTextHolidayApproved=Молба за отпуск %s е одобрена.
-ImportedWithSet=Набор от данни за импорт
+ImportedWithSet=Набор от данни за импортиране
 DolibarrNotification=Автоматично уведомяване
-ResizeDesc=Въведете нова ширина <b>ИЛИ</b> нова височина. Съотношението ще се запази по време преоразмеряването...
+ResizeDesc=Въведете нова ширина <b>или</b> нова височина. Съотношението ще се запази по време преоразмеряването...
 NewLength=Нова ширина
 NewHeight=Нова височина
 NewSizeAfterCropping=Нов размер след изрязване
 DefineNewAreaToPick=Определете нова област на изображението, за да изберете (ляв клик върху изображението, след което плъзнете, докато стигнете до противоположния ъгъл)
 CurrentInformationOnImage=Този инструмент е предназначен да ви помогне да преоразмерите или изрежете изображение. Това е информацията за текущото редактирано изображение.
 ImageEditor=Редактор на изображения
-YouReceiveMailBecauseOfNotification=Получавате това съобщение, защото вашият имейл е добавен към списъка с цел информиране за специални събития в %s софтуер на %s.
+YouReceiveMailBecauseOfNotification=Здравейте,\nПолучавате това съобщение, тъй като вашият имейл адрес е добавен към списък целящ информиране за конкретни събития в %s софтуер на %s.\n
 YouReceiveMailBecauseOfNotification2=Това събитие е следното:
-ThisIsListOfModules=Това е списък на модулите, предварително избрани за този демонстрационен профил (само най-основните модули са видими в тази демонстрация). Редактирайте, ако е необходимо, за да имате по-персонализирано демо и кликнете върху "Старт".
-UseAdvancedPerms=Използване на разширени разрешения на някои модули
+ThisIsListOfModules=Това е списък на модулите, предварително избрани за този демонстрационен профил (само най-основните модули са видими в тази демонстрация). Променете това, ако е необходимо, за да имате по-персонализирано демо и кликнете върху "Старт".
+UseAdvancedPerms=Използване на разширени права на някои модули
 FileFormat=Файлов формат
 SelectAColor=Избиране на цвят
 AddFiles=Добавяне на файлове
 StartUpload=Стартиране на качване
 CancelUpload=Анулиране на качване
-FileIsTooBig=Файлът е твърде голям
+FileIsTooBig=Файловете са твърде големи
 PleaseBePatient=Моля, бъдете търпеливи...
 NewPassword=Нова парола
 ResetPassword=Възстановяване на парола
-RequestToResetPasswordReceived=Получена е заявка за промяна на паролата ви.
+RequestToResetPasswordReceived=Получена е заявка за промяна на вашата парола.
 NewKeyIs=Това са новите ви данни за вход
 NewKeyWillBe=Вашите нови данни за вход ще бъдат
 ClickHereToGoTo=Кликнете тук, за да отидете на %s
@@ -239,29 +239,29 @@ YouMustClickToChange=Необходимо е първо да кликнете в
 ForgetIfNothing=Ако не сте заявили промяната, просто забравете за този имейл. Вашите идентификационни данни се съхраняват на сигурно място.
 IfAmountHigherThan=Ако сумата e по-висока от <strong>%s</strong>
 SourcesRepository=Хранилище за източници
-Chart=Диаграма
+Chart=Графика
 PassEncoding=Кодиране на пароли
-PermissionsAdd=Разрешенията са добавени
-PermissionsDelete=Разрешенията са премахнати
-YourPasswordMustHaveAtLeastXChars=Вашата парола трябва да има поне <strong>%s</strong> символа
+PermissionsAdd=Правата са добавени
+PermissionsDelete=Правата са премахнати
+YourPasswordMustHaveAtLeastXChars=Вашата парола трябва да съдържа поне <strong>%s</strong> символа
 YourPasswordHasBeenReset=Вашата парола е успешно възстановена.
 ApplicantIpAddress=IP адрес на заявителя
 SMSSentTo=Изпратен е SMS на %s
 MissingIds=Липсват идентификатори
-ThirdPartyCreatedByEmailCollector=Контрагент, създаден чрез имейл колектор от имейл MSGID %s
-ContactCreatedByEmailCollector=Контактът/адресът, създаден чрез имейл колектор от имейл MSGID %s
-ProjectCreatedByEmailCollector=Проект, създаден чрез имейл колектор от имейл MSGID %s
-TicketCreatedByEmailCollector=Тикет, създаден чрез имейл колектор от имейл MSGID %s
+ThirdPartyCreatedByEmailCollector=Контрагентът е създаден, чрез имейл колектор от имейл MSGID %s
+ContactCreatedByEmailCollector=Контактът / адресът е създаден, чрез имейл колектор от имейл MSGID %s
+ProjectCreatedByEmailCollector=Проектът е създаден, чрез имейл колектор от имейл MSGID %s
+TicketCreatedByEmailCollector=Тикетът е създаден, чрез имейл колектор от имейл MSGID %s
 
 ##### Export #####
-ExportsArea=Секция за експорт
+ExportsArea=Секция за експортиране
 AvailableFormats=Налични формати
 LibraryUsed=Използвана библиотека
 LibraryVersion=Версия на библиотеката
-ExportableDatas=Данни за експорт
-NoExportableData=Няма данни за експорт (няма модули със заредени данни за експорт или липсват разрешения)
+ExportableDatas=Експортни данни
+NoExportableData=Няма експортни данни (няма модули със заредени данни за експортиране или липсват права)
 ##### External sites #####
-WebsiteSetup=Настройка на Уебсайт модула
+WebsiteSetup=Настройка на модул уебсайт
 WEBSITE_PAGEURL=URL адрес на страницата
 WEBSITE_TITLE=Заглавие
 WEBSITE_DESCRIPTION=Описание
diff --git a/htdocs/langs/bg_BG/products.lang b/htdocs/langs/bg_BG/products.lang
index 751313cdc4d..e7fb38991c4 100644
--- a/htdocs/langs/bg_BG/products.lang
+++ b/htdocs/langs/bg_BG/products.lang
@@ -1,7 +1,8 @@
 # Dolibarr language file - Source file is en_US - products
-ProductRef=Реф. № на продукт
-ProductLabel=Етикет на продукта
+ProductRef=Реф. продукт
+ProductLabel=Етикет на продукт
 ProductLabelTranslated=Преведен продуктов етикет
+ProductDescription=Product description
 ProductDescriptionTranslated=Преведено продуктово описание
 ProductNoteTranslated=Преведена продуктова бележка
 ProductServiceCard=Карта
@@ -11,7 +12,7 @@ Products=Продукти
 Services=Услуги
 Product=Продукт
 Service=Услуга
-ProductId=Идентификатор на Продукт/Услуга
+ProductId=Идентификатор на Продукт / Услуга
 Create=Създаване
 Reference=Референция
 NewProduct=Нов продукт
@@ -31,19 +32,19 @@ ProductsPipeServices=Продукти | Услуги
 ProductsOnSaleOnly=Продукти само за продажба
 ProductsOnPurchaseOnly=Продукти само за покупка
 ProductsNotOnSell=Продукти, които не са за продажба, и не са за покупка
-ProductsOnSellAndOnBuy=Продукти за продажба или покупка
+ProductsOnSellAndOnBuy=Продукти за продажба и за покупка
 ServicesOnSaleOnly=Услуги само за продажба
 ServicesOnPurchaseOnly=Услуги само за покупка
 ServicesNotOnSell=Услуги, които не са за продажба, и не са за покупка
-ServicesOnSellAndOnBuy=Услуги за продажба или покупка
+ServicesOnSellAndOnBuy=Услуги за продажба и за покупка
 LastModifiedProductsAndServices=Продукти / Услуги: %s последно променени
-LastRecordedProducts=Продукти: %s последно регистрирани
-LastRecordedServices=Услуги: %s последно регистрирани
+LastRecordedProducts=Продукти: %s последно добавени
+LastRecordedServices=Услуги: %s последно добавени
 CardProduct0=Продукт
 CardProduct1=Услуга
 Stock=Наличност
 MenuStocks=Наличности
-Stocks=Наличност и движения
+Stocks=Наличности и местоположение (склад) на продуктите
 Movements=Движения
 Sell=Продажба
 Buy=Покупка
@@ -61,7 +62,7 @@ ProductStatusNotOnBuyShort=Не се купува
 UpdateVAT=Актуализиране на ДДС
 UpdateDefaultPrice=Актуализиране на цената по подразбиране
 UpdateLevelPrices=Актуализиране на цени за всяко ниво
-AppliedPricesFrom=Приложен от
+AppliedPricesFrom=Приложена на
 SellingPrice=Продажна цена
 SellingPriceHT=Продажна цена (без ДДС)
 SellingPriceTTC=Продажна цена (с ДДС)
@@ -72,21 +73,21 @@ SoldAmount=Стойност на продажбите
 PurchasedAmount=Стойност на покупките
 NewPrice=Нова цена
 MinPrice=Минимална продажна цена
-EditSellingPriceLabel=Редактиране на етикета на продажната цена
+EditSellingPriceLabel=Променяне на етикета на продажната цена
 CantBeLessThanMinPrice=Продажната цена не може да бъде по-ниска от минимално допустимата за този продукт/услуга (%s без ДДС). Това съобщение може да се появи, ако въведете твърде голяма отстъпка.
 ContractStatusClosed=Затворен
-ErrorProductAlreadyExists=Вече съществува продукт/услуга с реф. № %s.
+ErrorProductAlreadyExists=Вече съществува продукт / услуга с реф.  %s.
 ErrorProductBadRefOrLabel=Грешна стойност за референция или етикет.
 ErrorProductClone=Възникна проблем при опит за клониране на продукта/услугата.
 ErrorPriceCantBeLowerThanMinPrice=Грешка, цената не може да бъде по-ниска от минималната цена.
 Suppliers=Доставчици
-SupplierRef=Реф. № (SKU)
+SupplierRef=Реф. (SKU)
 ShowProduct=Показване на продукт
 ShowService=Показване на услуга
-ProductsAndServicesArea=Зона за Продукти | Услуги
-ProductsArea=Зона за Продукти
-ServicesArea=Зона за Услуги
-ListOfStockMovements=Списък на движения на стокови наличности
+ProductsAndServicesArea=Секция за продукти и услуги
+ProductsArea=Секция за продукти
+ServicesArea=Секция за услуги
+ListOfStockMovements=Списък с движения на наличности
 BuyingPrice=Покупна цена
 PriceForEachProduct=Продукти със специфични цени
 SupplierCard=Карта
@@ -96,7 +97,7 @@ BarcodeType=Тип баркод
 SetDefaultBarcodeType=Задаване на тип баркод
 BarcodeValue=Баркод стойност
 NoteNotVisibleOnBill=Бележка (не се вижда на фактури, предложения...)
-ServiceLimitedDuration=Ако продуктът е услуга с ограничен срок на действие:
+ServiceLimitedDuration=Ако продуктът е услуга с ограничена продължителност:
 MultiPricesAbility=Множество ценови сегменти за продукт / услуга (всеки клиент е в един ценови сегмент)
 MultiPricesNumPrices=Брой цени
 AssociatedProductsAbility=Активиране на виртуални продукти (комплекти)
@@ -114,52 +115,52 @@ ListOfProductsServices=Списък на продукти / услуги
 ProductAssociationList=Списък на продукти / услуги, които са компонент(и) на този виртуален продукт (комплект)
 ProductParentList=Списък на продукти / услуги с този продукт като компонент
 ErrorAssociationIsFatherOfThis=Един от избраните продукти е основен за текущия продукт
-DeleteProduct=Изтриване на продукт/услуга
-ConfirmDeleteProduct=Сигурни ли сте, че желаете да изтриете този продукт/услуга?
-ProductDeleted=Продукт/услуга %s е изтрит/а от базата данни.
+DeleteProduct=Изтриване на продукт / услуга
+ConfirmDeleteProduct=Сигурни ли сте, че желаете да изтриете този продукт / услуга?
+ProductDeleted=Продукт / услуга %s е изтрит(а) от базата данни.
 ExportDataset_produit_1=Продукти
 ExportDataset_service_1=Услуги
 ImportDataset_produit_1=Продукти
 ImportDataset_service_1=Услуги
-DeleteProductLine=Изтриване на продуктова линия
-ConfirmDeleteProductLine=Сигурни ли сте, че искате да изтриете тази продуктова линия?
+DeleteProductLine=Изтриване на продуктов ред
+ConfirmDeleteProductLine=Сигурни ли сте, че искате да изтриете този продуктов ред?
 ProductSpecial=Специален
 QtyMin=Минимално количество за покупка
 PriceQtyMin=Минимална цена за количество
 PriceQtyMinCurrency=Цена (във валута) за това количество (без отстъпка)
-VATRateForSupplierProduct=Ставка на ДДС (за този доставчик/продукт)
+VATRateForSupplierProduct=Ставка на ДДС (за този доставчик / продукт)
 DiscountQtyMin=Отстъпка за това количество
-NoPriceDefinedForThisSupplier=Няма дефинирана цена/количество за този доставчик/продукт
-NoSupplierPriceDefinedForThisProduct=Няма дефинирана цена/количество за този продукт
+NoPriceDefinedForThisSupplier=Няма дефинирана цена / количество за този доставчик / продукт
+NoSupplierPriceDefinedForThisProduct=Няма дефинирана цена / количество за този продукт
 PredefinedProductsToSell=Предварително определен продукт
 PredefinedServicesToSell=Предварително определена услуга
-PredefinedProductsAndServicesToSell=Предварително определени продукти/услуги за продажба
+PredefinedProductsAndServicesToSell=Предварително определени продукти / услуги за продажба
 PredefinedProductsToPurchase=Предварително определен продукт за покупка
 PredefinedServicesToPurchase=Предварително определена услуга за покупка
-PredefinedProductsAndServicesToPurchase=Предварително определени продукти/услуги за покупка
-NotPredefinedProducts=Не предварително определени продукти/услуги
-GenerateThumb=Генериране на палец
+PredefinedProductsAndServicesToPurchase=Предварително определени продукти / услуги за покупка
+NotPredefinedProducts=Не предварително определени продукти / услуги
+GenerateThumb=Генериране на миниатюра
 ServiceNb=Услуга #%s
-ListProductServiceByPopularity=Списък на продукти/услуги по популярност
+ListProductServiceByPopularity=Списък на продукти / услуги по популярност
 ListProductByPopularity=Списък на продукти по популярност
 ListServiceByPopularity=Списък на услуги по популярност
 Finished=Произведен продукт
-RowMaterial=Суров материал
-ConfirmCloneProduct=Сигурни ли сте, че искате да клонирате този продукт/услуга <b>%s</b>?
-CloneContentProduct=Клониране на цялата основна информация за продукт/услуга
+RowMaterial=Суровина
+ConfirmCloneProduct=Сигурни ли сте, че искате да клонирате този продукт / услуга <b>%s</b>?
+CloneContentProduct=Клониране на цялата основна информация за продукт / услуга
 ClonePricesProduct=Клониране на цени
-CloneCompositionProduct=Клониране на виртуален продукт/услуга
+CloneCompositionProduct=Клониране на виртуален продукт / услуга
 CloneCombinationsProduct=Клониране на варианти на продукта
 ProductIsUsed=Този продукт се използва
-NewRefForClone=Реф. № на нов продукт/услуга
+NewRefForClone=Реф. на нов продукт / услуга
 SellingPrices=Продажни цени
 BuyingPrices=Покупни цени
 CustomerPrices=Клиентски цени
 SuppliersPrices=Доставни цени
-SuppliersPricesOfProductsOrServices=Доставни цени (на продукти/услуги)
+SuppliersPricesOfProductsOrServices=Доставни цени (на продукти / услуги)
 CustomCode=Митнически / Стоков / ХС код
 CountryOrigin=Държава на произход
-Nature=Естество на продукта (материал / завършен)
+Nature=Характер на продукта (материал / завършен)
 ShortLabel=Кратък етикет
 Unit=Мярка
 p=е.
@@ -194,10 +195,10 @@ unitLM=Линеен метър
 unitM2=Квадратен метър
 unitM3=Кубичен метър
 unitL=Литър
-ProductCodeModel=Реф. шаблон на продукт
-ServiceCodeModel=Реф. шаблон на услуга
+ProductCodeModel=Шаблон за генериране на реф. продукт
+ServiceCodeModel=Шаблон за генериране на реф. услуга
 CurrentProductPrice=Текуща цена
-AlwaysUseNewPrice=Винаги да се използва текуща цена на продукт/услуга
+AlwaysUseNewPrice=Винаги да се използва текуща цена на продукт / услуга
 AlwaysUseFixedPrice=Използване на фиксирана цена
 PriceByQuantity=Различни цени за количество
 DisablePriceByQty=Деактивиране на цени за количество
@@ -213,8 +214,8 @@ VariantLabelExample=Пример: Цвят
 Build=Произвеждане
 ProductsMultiPrice=Продукти и цени за всеки ценови сегмент
 ProductsOrServiceMultiPrice=Клиентски цени (за продукт или услуги, мулти цени)
-ProductSellByQuarterHT=Оборот на продукти за тримесечие преди данъчно облагане
-ServiceSellByQuarterHT=Оборот на услуги за тримесечие преди данъчно облагане
+ProductSellByQuarterHT=Оборот на продукти за тримесечие без ДДС
+ServiceSellByQuarterHT=Оборот на услуги за тримесечие без ДДС
 Quarter1=Първо тримесечие
 Quarter2=Второ тримесечие
 Quarter3=Трето тримесечие
@@ -233,7 +234,7 @@ BarCodeDataForProduct=Информация за баркод на продукт
 BarCodeDataForThirdparty=Информация за баркод на контрагент %s:
 ResetBarcodeForAllRecords=Определяне на стойността на баркода за всеки запис (това също ще възстанови стойността на баркода, която е вече дефинирана с нови стойности)
 PriceByCustomer=Различни цени за всеки клиент
-PriceCatalogue=Една продажна цена за продукт/услуга
+PriceCatalogue=Една продажна цена за продукт / услуга
 PricingRule=Правила за продажни цени
 AddCustomerPrice=Добавяне на цена за клиент
 ForceUpdateChildPriceSoc=Определяне на една и съща цена за филиали на клиента
@@ -250,8 +251,8 @@ PriceExpressionEditorHelp5=Налични глобални стойности:
 PriceMode=Ценови режим
 PriceNumeric=Номер
 DefaultPrice=Цена по подразбиране
-ComposedProductIncDecStock=Увеличаване/Намаляване на наличност при промяна на основен продукт
-ComposedProduct=Наследени продукти
+ComposedProductIncDecStock=Увеличаване / намаляване на наличност при промяна на основен продукт
+ComposedProduct=Съставни продукти
 MinSupplierPrice=Минимална покупната цена
 MinCustomerPrice=Минимална продажна цена
 DynamicPriceConfiguration=Динамична ценова конфигурация
@@ -270,11 +271,11 @@ GlobalVariableUpdaterHelpFormat1=Формат на запитването {"URL"
 UpdateInterval=Интервал на актуализиране (минути)
 LastUpdated=Последна актуализация
 CorrectlyUpdated=Правилно актуализирано
-PropalMergePdfProductActualFile=Файловете използвани за добавяне в PDF Azur
+PropalMergePdfProductActualFile=Файловете използвани за добавяне в PDF Azur са
 PropalMergePdfProductChooseFile=Избиране на PDF файлове
-IncludingProductWithTag=Включително продукт/услуга с таг/категория
+IncludingProductWithTag=Включително продукт / услуга с таг / категория
 DefaultPriceRealPriceMayDependOnCustomer=Цена по подразбиране, реалната цена може да зависи от клиента
-WarningSelectOneDocument=Моля изберете поне един документ
+WarningSelectOneDocument=Моля, изберете поне един документ
 DefaultUnitToShow=Мярка
 NbOfQtyInProposals=Количество в предложенията
 ClinkOnALinkOfColumn=Кликнете върху връзката от колона %s, за да получите подробен изглед...
@@ -290,41 +291,41 @@ SizeUnits=Мярка за размер
 DeleteProductBuyPrice=Изтриване на покупна цена
 ConfirmDeleteProductBuyPrice=Сигурни ли сте, че искате да изтриете тази покупна цена?
 SubProduct=Подпродукт
-ProductSheet=Лист на продукт
-ServiceSheet=Лист на услуга
+ProductSheet=Спецификация на продукт
+ServiceSheet=Спецификация на услуга
 PossibleValues=Възможни стойности
 GoOnMenuToCreateVairants=Отидете в менюто %s - %s, за да подготвите атрибутите на варианта (като цветове, размер, ...)
 UseProductFournDesc=Добавяне на функция за дефиниране на описания на продуктите, определени от доставчици като допълнение към описанията за клиенти
 ProductSupplierDescription=Описание на продукта от доставчик
 #Attributes
-VariantAttributes=Атрибути на варианти
-ProductAttributes=Атрибути на продуктови варианти
-ProductAttributeName=Атрибут на варианта %s
-ProductAttribute=Атрибут на варианта
+VariantAttributes=Атрибути на вариант
+ProductAttributes=Атрибути на вариант за продукти
+ProductAttributeName=Атрибут на вариант %s
+ProductAttribute=Атрибут на вариант
 ProductAttributeDeleteDialog=Сигурни ли сте, че искате да изтриете този атрибут? Всички стойности ще бъдат изтрити.
 ProductAttributeValueDeleteDialog=Сигурни ли сте, че искате да изтриете стойността '%s' с реф. № '%s' на този атрибут?
 ProductCombinationDeleteDialog=Сигурни ли сте, че искате да изтриете варианта на продукта '<strong>%s</strong>'?
 ProductCombinationAlreadyUsed=Възникна грешка при изтриването на варианта. Моля, проверете дали не се използва в някой обект
 ProductCombinations=Варианти
 PropagateVariant=Размножаване на варианти
-HideProductCombinations=Скриване на продуктовите варианти в селектора за продукти
+HideProductCombinations=Скриване на продуктови варианти в селектора за продукти
 ProductCombination=Вариант
 NewProductCombination=Нов вариант
-EditProductCombination=Редактиране на вариант
+EditProductCombination=Промяна на вариант
 NewProductCombinations=Нови варианти
-EditProductCombinations=Редактиране на варианти
+EditProductCombinations=Промяна на варианти
 SelectCombination=Избиране на комбинация
 ProductCombinationGenerator=Генератор на варианти
 Features=Характеристики
-PriceImpact=Влияние върху цена
-WeightImpact=Влияние върху тегло
+PriceImpact=Въздействие върху цената
+WeightImpact=Въздействие върху теглото
 NewProductAttribute=Нов атрибут
 NewProductAttributeValue=Нова стойност на атрибута
 ErrorCreatingProductAttributeValue=Възникна грешка при създаването на стойността на атрибута. Това може да се дължи на факта, че вече съществува стойност с тази референция
 ProductCombinationGeneratorWarning=Ако продължите, преди да генерирате нови варианти, всички предишни ще бъдат ИЗТРИТИ. Вече съществуващите ще бъдат актуализирани с новите стойности
 TooMuchCombinationsWarning=Генерирането на много варианти може да доведе до висок разход на процесорно време, използвана памет, поради което Dolibarr няма да може да ги създаде. Активирането на опцията '%s' може да помогне за намаляване на използването на паметта.
 DoNotRemovePreviousCombinations=Не премахва предишни варианти
-UsePercentageVariations=Използване на процентни вариации
+UsePercentageVariations=Използване на процентни изменения
 PercentageVariation=Процентно изменение
 ErrorDeletingGeneratedProducts=Възникна грешка при опит за изтриване на съществуващи продуктови варианти
 NbOfDifferentValues=Брой различни стойности
diff --git a/htdocs/langs/bg_BG/projects.lang b/htdocs/langs/bg_BG/projects.lang
index 1cc17d3e576..b69000cd9f2 100644
--- a/htdocs/langs/bg_BG/projects.lang
+++ b/htdocs/langs/bg_BG/projects.lang
@@ -1,30 +1,30 @@
 # Dolibarr language file - Source file is en_US - projects
 RefProject=Реф. проект
 ProjectRef=Проект реф.
-ProjectId=Проект №
-ProjectLabel=Име на проект
+ProjectId=Идентификатор на проект
+ProjectLabel=Етикет на проект
 ProjectsArea=Секция за проекти
 ProjectStatus=Статус на проект
 SharedProject=Всички
 PrivateProject=Участници в проекта
 ProjectsImContactFor=Проекти, в които съм определен за контакт
-AllAllowedProjects=Всеки проект, който мога да видя (мой и публичен)
+AllAllowedProjects=Всеки проект, който мога да прочета (мой и публичен)
 AllProjects=Всички проекти
-MyProjectsDesc=Този изглед е ограничен до проекти, в които сте контакт
+MyProjectsDesc=Този изглед е ограничен до проекти, в които сте определен за контакт
 ProjectsPublicDesc=Този изглед представя всички проекти, които можете да прочетете.
 TasksOnProjectsPublicDesc=Този изглед представя всички задачи по проекти, които можете да прочетете.
 ProjectsPublicTaskDesc=Този изглед представя всички проекти и задачи, които можете да прочетете.
 ProjectsDesc=Този изглед представя всички проекти (вашите потребителски права ви дават разрешение да виждате всичко).
 TasksOnProjectsDesc=Този изглед представя всички задачи за всички проекти (вашите потребителски права ви дават разрешение да виждате всичко).
-MyTasksDesc=Този изглед е ограничен до проекти или задачи, в които сте контакт
-OnlyOpenedProject=Само отворените проекти са видими (чернови или затворени проекти не са видими).
-ClosedProjectsAreHidden=Затворените проекти не са видими.
+MyTasksDesc=Този изглед е ограничен до проекти или задачи, в които сте определен за контакт
+OnlyOpenedProject=Само отворените проекти са видими (чернови или приключени проекти не са видими).
+ClosedProjectsAreHidden=Приключените проекти не са видими.
 TasksPublicDesc=Този страница показва всички проекти и задачи, които може да прочетете.
 TasksDesc=Този страница показва всички проекти и задачи (вашите потребителски права ви дават разрешение да виждате всичко).
 AllTaskVisibleButEditIfYouAreAssigned=Всички задачи за определените проекти са видими, но можете да въведете време само за задача, възложена на избрания потребител. Задайте задача, ако е необходимо да въведете отделено време за нея.
 OnlyYourTaskAreVisible=Видими са само задачите, които са ви възложени. Възложете задача на себе си, ако не е видима, а трябва да въведете отделено време за нея.
 ImportDatasetTasks=Задачи по проекти
-ProjectCategories=Етикети / Категории
+ProjectCategories=Тагове / Категории на проекти
 NewProject=Нов проект
 AddProject=Създаване на проект
 DeleteAProject=Изтриване на проект
@@ -35,8 +35,8 @@ OpenedProjects=Отворени проекти
 OpenedTasks=Отворени задачи
 OpportunitiesStatusForOpenedProjects=Размер на възможностите от отворени проекти по статус
 OpportunitiesStatusForProjects=Размер на възможностите от проекти по статус
-ShowProject=Преглед на проект
-ShowTask=Преглед на задача
+ShowProject=Показване на проект
+ShowTask=Показване на задача
 SetProject=Задайте проект
 NoProject=Няма дефиниран или притежаван проект
 NbOfProjects=Брой проекти
@@ -45,9 +45,9 @@ TimeSpent=Отделено време
 TimeSpentByYou=Време, отделено от вас
 TimeSpentByUser=Време, отделено от потребител
 TimesSpent=Отделено време
-TaskId=Задача №
-RefTask=Задача реф.
-LabelTask=Име на задача
+TaskId=Идентификатор на задача
+RefTask=Реф. задача
+LabelTask=Етикет на задача
 TaskTimeSpent=Време, отделено на задачи
 TaskTimeUser=Потребител
 TaskTimeNote=Бележка
@@ -68,7 +68,7 @@ TaskDescription=Описание на задача
 NewTask=Нова задача
 AddTask=Създаване на задача
 AddTimeSpent=Въвеждане на отделено време
-AddHereTimeSpentForDay=Добавете тук отделеното време за този ден/задача
+AddHereTimeSpentForDay=Добавете тук отделеното време за този ден / задача
 Activity=Дейност
 Activities=Задачи / Дейности
 MyActivities=Мои задачи / дейности
@@ -79,14 +79,14 @@ ProgressDeclared=Деклариран напредък
 ProgressCalculated=Изчислен напредък
 Time=Време
 ListOfTasks=Списък със задачи
-GoToListOfTimeConsumed=Отидете в списъка с изразходваното време
-GoToListOfTasks=Отидете в списъка със задачи
-GoToGanttView=Преглед на Gantt диаграма
+GoToListOfTimeConsumed=Показване на списъка с изразходвано време
+GoToListOfTasks=Показване на списъка със задачи
+GoToGanttView=Показване на Gantt диаграма
 GanttView=Gantt диаграма
 ListProposalsAssociatedProject=Списък на търговски предложения, свързани с проекта
 ListOrdersAssociatedProject=Списък на поръчки за продажба, свързани с проекта
 ListInvoicesAssociatedProject=Списък на фактури за продажба, свързани с проекта
-ListPredefinedInvoicesAssociatedProject=Списък на шаблони за фактури за продажба, свързани с проекта
+ListPredefinedInvoicesAssociatedProject=Списък на шаблонни фактури за продажба, свързани с проекта
 ListSupplierOrdersAssociatedProject=Списък на поръчки за покупка, свързани с проекта
 ListSupplierInvoicesAssociatedProject=Списък на фактури за покупка, свързани с проекта
 ListContractAssociatedProject=Списък на договори, свързани с проекта
@@ -94,34 +94,34 @@ ListShippingAssociatedProject=Списък на пратки, свързани 
 ListFichinterAssociatedProject=Списък на интервенции, свързани с проекта
 ListExpenseReportsAssociatedProject=Списък на разходни отчети, свързани с проекта
 ListDonationsAssociatedProject=Списък на дарения, свързани с проекта
-ListVariousPaymentsAssociatedProject=Списък на различни плащания, свързани с проекта
+ListVariousPaymentsAssociatedProject=Списък на разнородни плащания, свързани с проекта
 ListSalariesAssociatedProject=Списък на плащания на заплати, свързани с проекта
 ListActionsAssociatedProject=Списък на събития, свързани с проекта
 ListTaskTimeUserProject=Списък на отделено време по задачи, свързани с проекта
 ListTaskTimeForTask=Списък на отделено време за задача
-ActivityOnProjectToday=Дейност по проект (за деня)
+ActivityOnProjectToday=Дейност по проект (за днес)
 ActivityOnProjectYesterday=Дейност по проект (за вчера)
-ActivityOnProjectThisWeek=Дейност по проект (за седмица)
-ActivityOnProjectThisMonth=Дейност по проект (за месеца)
-ActivityOnProjectThisYear=Дейност по проект (за година)
-ChildOfProjectTask=Наследник на проект/задача
+ActivityOnProjectThisWeek=Дейност по проект (за тази седмица)
+ActivityOnProjectThisMonth=Дейност по проект (за този месец)
+ActivityOnProjectThisYear=Дейност по проект (за тази година)
+ChildOfProjectTask=Наследник на проект / задача
 ChildOfTask=Наследник на задача
 TaskHasChild=Задачата има наследник
-NotOwnerOfProject=Не сте собственик на този частен проект
+NotOwnerOfProject=Не сте собственик на този личен проект
 AffectedTo=Разпределено на
 CantRemoveProject=Този проект не може да бъде премахнат, тъй като е свързан с някои други обекти (фактури, поръчки или други). Вижте раздела свързани файлове.
 ValidateProject=Валидиране на проект
 ConfirmValidateProject=Сигурни ли сте, че искате да валидирате този проект?
-CloseAProject=Затваряне на проект
-ConfirmCloseAProject=Сигурни ли сте, че искате да затворите този проект?
-AlsoCloseAProject=Също така затворете проекта (задръжте го отворен, ако все още трябва да работите по задачите в него)
+CloseAProject=Приключване на проект
+ConfirmCloseAProject=Сигурни ли сте, че искате да приключите този проект?
+AlsoCloseAProject=Приключване на проект (задръжте го отворен, ако все още трябва да работите по задачите в него)
 ReOpenAProject=Отваряне на проект
 ConfirmReOpenAProject=Сигурни ли сте, че искате да отворите повторно този проект?
 ProjectContact=Контакти / Участници
 TaskContact=Участници в задачата
 ActionsOnProject=Събития свързани с проекта
-YouAreNotContactOfProject=Вие не сте контакт за този частен проект
-UserIsNotContactOfProject=Потребителят не е контакт за този частен проект
+YouAreNotContactOfProject=Вие не сте определен за контакт в този личен проект
+UserIsNotContactOfProject=Потребителят не е определен за контакт в този личен проект
 DeleteATimeSpent=Изтриване на отделено време
 ConfirmDeleteATimeSpent=Сигурни ли сте, че искате да изтриете това отделено време?
 DoNotShowMyTasksOnly=Показване също на задачи, които не са възложени на мен
@@ -130,25 +130,25 @@ TaskRessourceLinks=Контакти / Участници
 ProjectsDedicatedToThisThirdParty=Проекти, насочени към този контрагент
 NoTasks=Няма задачи за този проект
 LinkedToAnotherCompany=Свързано с друг контрагент
-TaskIsNotAssignedToUser=Задачата не е възложена на потребителя. Използвайте бутона '<strong>%s</strong>', за да възложите задачата.
+TaskIsNotAssignedToUser=Задачата не е възложена на потребителя. Използвайте бутона '<strong>%s</strong>', за да възложите задачата сега.
 ErrorTimeSpentIsEmpty=Отделеното време е празно
 ThisWillAlsoRemoveTasks=Това действие ще изтрие всички задачи по проекта (<b>%s</b> задачи в момента) и всички въвеждания на отделено време.
-IfNeedToUseOtherObjectKeepEmpty=Ако някои обекти (фактура, поръчка, ...), принадлежащи на друг контрагент, трябва да бъдат свързани с проекта, за да се създаде, запази това празно, за да бъде проектът многостранен.
+IfNeedToUseOtherObjectKeepEmpty=Ако някои обекти (фактура, поръчка, ...), принадлежащи на друг контрагент, трябва да бъдат свързани с проекта за създаване, запазете това празно, за да бъде проектът мулти-контрагентен.
 CloneTasks=Клониране на задачи
 CloneContacts=Клониране на контакти
 CloneNotes=Клониране на бележки
 CloneProjectFiles=Клониране на обединени файлове в проекта
 CloneTaskFiles=Клониране на обединени файлове в задачи (ако задача(ите) са клонирани)
-CloneMoveDate=Актуализиране на датите на проекта/задачите от сега?
+CloneMoveDate=Актуализиране на датите на проекта / задачите от сега?
 ConfirmCloneProject=Сигурни ли сте, че ще искате да клонирате този проект?
 ProjectReportDate=Променете датите на задачите, според новата начална дата на проекта
 ErrorShiftTaskDate=Невъзможно е да се смени датата на задача, за да съответства на новата начална дата на проекта
 ProjectsAndTasksLines=Проекти и задачи
 ProjectCreatedInDolibarr=Проект %s е създаден
 ProjectValidatedInDolibarr=Проект %s е валидиран
-ProjectModifiedInDolibarr=Проект %s е редактиран
+ProjectModifiedInDolibarr=Проект %s е променен
 TaskCreatedInDolibarr=Задача %s е създадена
-TaskModifiedInDolibarr=Задача %s е редактирана
+TaskModifiedInDolibarr=Задача %s е променена
 TaskDeletedInDolibarr=Задача %s е изтрита
 OpportunityStatus=Статус на възможността
 OpportunityStatusShort=Статус на възможността
@@ -171,23 +171,23 @@ TypeContact_project_task_external_TASKCONTRIBUTOR=Сътрудник
 SelectElement=Избиране на елемент
 AddElement=Връзка към елемент
 # Documents models
-DocumentModelBeluga=Шаблон за проектен документ за преглед на свързани обекти
-DocumentModelBaleine=Шаблон за проектен документ за задачи
+DocumentModelBeluga=Шаблон на проектен документ за преглед на свързани елементи
+DocumentModelBaleine=Шаблон на проектен документ за задачи
 DocumentModelTimeSpent=Шаблон за отчет на отделеното време по проект
-PlannedWorkload=Планирана работна натовареност
-PlannedWorkloadShort=Работна натовареност
+PlannedWorkload=Планирана натовареност
+PlannedWorkloadShort=Натовареност
 ProjectReferers=Свързани елементи
 ProjectMustBeValidatedFirst=Проектът трябва първо да бъде валидиран
 FirstAddRessourceToAllocateTime=Определете потребителски ресурс на задачата за разпределяне на времето
 InputPerDay=За ден
 InputPerWeek=За седмица
 InputDetail=Детайли
-TimeAlreadyRecorded=Това отделено време е вече записано за тази задача/ден и потребител %s
+TimeAlreadyRecorded=Това отделено време е вече записано за тази задача / ден и потребител %s
 ProjectsWithThisUserAsContact=Проекти с потребител за контакт
-TasksWithThisUserAsContact=Задачи възложени на този потребител
+TasksWithThisUserAsContact=Задачи възложени на потребител
 ResourceNotAssignedToProject=Не е зададено към проект
 ResourceNotAssignedToTheTask=Не е зададено към задача
-NoUserAssignedToTheProject=Няма потребители, назначени за този проект
+NoUserAssignedToTheProject=Няма потребители, назначени за този проект.
 TimeSpentBy=Отделено време от
 TasksAssignedTo=Задачи, възложени на
 AssignTaskToMe=Възлагане на задача към мен
@@ -195,22 +195,22 @@ AssignTaskToUser=Възлагане на задача към %s
 SelectTaskToAssign=Изберете задача за възлагане...
 AssignTask=Възлагане
 ProjectOverview=Общ преглед
-ManageTasks=Използване на проекти, за да следите задачите и/или да докладвате за отделеното време за тях (часови листове)
-ManageOpportunitiesStatus=Използване на проекти за проследяване на възможности/потенциални клиенти
+ManageTasks=Използване на проекти, за да следите задачите и / или да докладвате за отделеното време за тях (графици)
+ManageOpportunitiesStatus=Използване на проекти за проследяване на възможности / потенциални клиенти
 ProjectNbProjectByMonth=Брой създадени проекти на месец
 ProjectNbTaskByMonth=Брой създадени задачи на месец
 ProjectOppAmountOfProjectsByMonth=Сума на възможностите на месец
 ProjectWeightedOppAmountOfProjectsByMonth=Изчислена сума на възможностите на месец
-ProjectOpenedProjectByOppStatus=Отворен проект/възможност по статус на възможността
-ProjectsStatistics=Статистики за проекти/възможности
-TasksStatistics=Статистика за задачи
+ProjectOpenedProjectByOppStatus=Отворен проект / възможност по статус на възможността
+ProjectsStatistics=Статистики на проекти / възможности
+TasksStatistics=Статистика на задачи
 TaskAssignedToEnterTime=Задачата е възложена. Въвеждането на време по тази задача трябва да е възможно.
-IdTaskTime=Id време на задача
+IdTaskTime=Идентификатор на време на задача
 YouCanCompleteRef=Ако искате да завършите реф. с някакъв суфикс, препоръчително е да добавите символ "-", за да го разделите, така че автоматичното номериране да продължи да работи правилно за следващите проекти. Например %s-MYSUFFIX
 OpenedProjectsByThirdparties=Отворени проекти по контрагенти
 OnlyOpportunitiesShort=Само възможности
 OpenedOpportunitiesShort=Отворени възможности
-NotOpenedOpportunitiesShort=Затворени възможности
+NotOpenedOpportunitiesShort=Неотворени възможности
 NotAnOpportunityShort=Не е възможност
 OpportunityTotalAmount=Обща сума на възможностите
 OpportunityPonderatedAmount=Изчислена сума на възможностите
@@ -227,14 +227,14 @@ AllowToLinkFromOtherCompany=Позволяване свързването на 
 LatestProjects=Проекти: %s последни
 LatestModifiedProjects=Проекти: %s последно променени
 OtherFilteredTasks=Други филтрирани задачи
-NoAssignedTasks=Не са намерени възложени задачи (възложете проект/задачи на текущия потребител от най-горното поле за избор, за да въведете времето в него)
+NoAssignedTasks=Не са намерени възложени задачи (възложете проект / задачи на текущия потребител от най-горното поле за избор, за да въведете времето в него)
 ThirdPartyRequiredToGenerateInvoice=Контрагент трябва да бъде дефиниран в проекта, за да може да му издавате фактури.
 # Comments trans
 AllowCommentOnTask=Разрешаване на потребителски коментари в задачите
 AllowCommentOnProject=Разрешаване на потребителски коментари в проектите
-DontHavePermissionForCloseProject=Нямате права да затворите проект %s
-DontHaveTheValidateStatus=Проектът %s трябва да бъде отворен, за да го затворите
-RecordsClosed=%s проект(а) е(са) затворен(и)
+DontHavePermissionForCloseProject=Нямате права, за да приключите проект %s.
+DontHaveTheValidateStatus=Проектът %s трябва да бъде отворен, за да го приключите.
+RecordsClosed=%s проект(а) е(са) приключен(и)
 SendProjectRef=Информация за проект %s
 ModuleSalaryToDefineHourlyRateMustBeEnabled=Модулът 'Заплати' трябва да бъде активиран, за да дефинирате почасова ставка на служителите, за да оценените отделеното по проекта време
 NewTaskRefSuggested=Реф. № на задачата вече се използва, изисква се нов
diff --git a/htdocs/langs/bg_BG/propal.lang b/htdocs/langs/bg_BG/propal.lang
index 05ae69cff51..a7392ece08c 100644
--- a/htdocs/langs/bg_BG/propal.lang
+++ b/htdocs/langs/bg_BG/propal.lang
@@ -9,7 +9,7 @@ PdfCommercialProposalTitle=Търговско предложение
 ProposalCard=Карта
 NewProp=Ново търговско предложение
 NewPropal=Ново предложение
-Prospect=Перспектива
+Prospect=Потенциален клиент
 DeleteProp=Изтриване на търговско предложение
 ValidateProp=Валидиране на търговско предложение
 AddProp=Създаване на предложение
@@ -26,19 +26,19 @@ AmountOfProposalsByMonthHT=Обща сума на месец (без ДДС)
 NbOfProposals=Брой търговски предложения
 ShowPropal=Показване на предложение
 PropalsDraft=Чернови
-PropalsOpened=Отворено
+PropalsOpened=Отворени
 PropalStatusDraft=Чернова (нужно е валидиране)
 PropalStatusValidated=Валидирано (отворено)
 PropalStatusSigned=Подписано (нужно е фактуриране)
-PropalStatusNotSigned=Неподписано (затворено)
+PropalStatusNotSigned=Отхвърлено (приключено)
 PropalStatusBilled=Фактурирано
 PropalStatusDraftShort=Чернова
 PropalStatusValidatedShort=Валидирано (отворено)
-PropalStatusClosedShort=Затворено
+PropalStatusClosedShort=Приключено
 PropalStatusSignedShort=Подписано
-PropalStatusNotSignedShort=Неподписано
+PropalStatusNotSignedShort=Отхвърлено
 PropalStatusBilledShort=Фактурирано
-PropalsToClose=Търговски предложения за затваряне
+PropalsToClose=Търговски предложения за приключване
 PropalsToBill=Подписани търговски предложения за фактуриране
 ListOfProposals=Списък на търговски предложения
 ActionsOnPropal=Свързани събития
@@ -58,10 +58,10 @@ DefaultProposalDurationValidity=Срок на валидност по подра
 UseCustomerContactAsPropalRecipientIfExist=Използване тип на контакт / адрес 'Представител проследяващ предложението', ако е определен, вместо адрес на контрагента като адрес на получателя на предложението
 ConfirmClonePropal=Сигурни ли сте, че искате да клонирате търговско предложение <b>%s</b>?
 ConfirmReOpenProp=Сигурни ли сте, че искате да отворите отново търговско предложение <b>%s</b>?
-ProposalsAndProposalsLines=Търговско предложение и линии
-ProposalLine=Линия на предложението
+ProposalsAndProposalsLines=Търговско предложение и редове
+ProposalLine=Ред №
 AvailabilityPeriod=Забавяне на наличността
-SetAvailability=Определяне на забавянето на наличността
+SetAvailability=Задайте забавяне на наличността
 AfterOrder=след поръчка
 OtherProposals=Други предложения
 ##### Availability #####
@@ -76,10 +76,10 @@ TypeContact_propal_external_BILLING=Получател на фактурата
 TypeContact_propal_external_CUSTOMER=Получател на предложението
 TypeContact_propal_external_SHIPPING=Получател на доставката
 # Document models
-DocModelAzurDescription=Завършен шаблон за предложение (logo...)
-DocModelCyanDescription=Завършен шаблон за предложение (logo...)
+DocModelAzurDescription=Завършен шаблон за предложение (лого...)
+DocModelCyanDescription=Завършен шаблон за предложение (лого...)
 DefaultModelPropalCreate=Създаване на шаблон по подразбиране
-DefaultModelPropalToBill=Шаблон по подразбиране, когато се затваря търговско предложение (за да бъде фактурирано)
-DefaultModelPropalClosed=Шаблон по подразбиране, когато се затваря търговско предложение (нефактурирано)
-ProposalCustomerSignature=Писмено приемане, фирмен печат, дата и подпис
+DefaultModelPropalToBill=Шаблон по подразбиране, когато се приключва търговско предложение (за да бъде фактурирано)
+DefaultModelPropalClosed=Шаблон по подразбиране, когато се приключва търговско предложение (не таксувано)
+ProposalCustomerSignature=Име, фамилия, фирмен печат, дата и подпис
 ProposalsStatisticsSuppliers=Статистика на запитванията към доставчици
diff --git a/htdocs/langs/bg_BG/sendings.lang b/htdocs/langs/bg_BG/sendings.lang
index 2603bb9e759..8479a33646a 100644
--- a/htdocs/langs/bg_BG/sendings.lang
+++ b/htdocs/langs/bg_BG/sendings.lang
@@ -1,33 +1,33 @@
 # Dolibarr language file - Source file is en_US - sendings
-RefSending=Реф. експедиция
-Sending=Експедиция
-Sendings=Експедиции
-AllSendings=Всички експедиции
-Shipment=Пратка
-Shipments=Пратки
-ShowSending=Показване на експедиции
+RefSending=Реф. доставка
+Sending=Доставка
+Sendings=Доставки
+AllSendings=Всички доставки
+Shipment=Доставка
+Shipments=Доставки
+ShowSending=Показване на доставка
 Receivings=Разписки за доставка
-SendingsArea=Зона на Експедиции
-ListOfSendings=Списък на експедиции
+SendingsArea=Секция за доставки
+ListOfSendings=Списък на доставки
 SendingMethod=Начин на доставка
-LastSendings=Експедиции: %s последни
-StatisticsOfSendings=Статистика за експедидиите
-NbOfSendings=Брой експедиции
-NumberOfShipmentsByMonth=Брой експедиции на месец
-SendingCard=Карта за експедиция
-NewSending=Нова експедиция
-CreateShipment=Създаване на пратка
-QtyShipped=Изпратено количество
-QtyShippedShort=Изпр. кол.
-QtyPreparedOrShipped=Приготвено или изпратено кол.
-QtyToShip=Количество за изпращане
-QtyReceived=Получено количество
-QtyInOtherShipments=Количество в други пратки
+LastSendings=Доставки: %s последни
+StatisticsOfSendings=Статистика за доставки
+NbOfSendings=Брой доставки
+NumberOfShipmentsByMonth=Брой доставки на месец
+SendingCard=Карта на доставка
+NewSending=Нова доставка
+CreateShipment=Създаване на доставка
+QtyShipped=Изпратено кол.
+QtyShippedShort=Изпратено
+QtyPreparedOrShipped=Подготвено или изпратено кол.
+QtyToShip=Кол. за изпращане
+QtyReceived=Получено кол.
+QtyInOtherShipments=Кол. в други доставки
 KeepToShip=Оставащо за изпращане
 KeepToShipShort=Оставащо
-OtherSendingsForSameOrder=Други експедиции за тази поръчка
-SendingsAndReceivingForSameOrder=Експедиции и разписки за тази поръчка
-SendingsToValidate=Експедиции за валидиране
+OtherSendingsForSameOrder=Други доставки за тази поръчка
+SendingsAndReceivingForSameOrder=Доставки и разписки за тази поръчка
+SendingsToValidate=Доставки за валидиране
 StatusSendingCanceled=Анулирана
 StatusSendingDraft=Чернова
 StatusSendingValidated=Валидирана (продукти за изпращане или вече изпратени)
@@ -35,38 +35,38 @@ StatusSendingProcessed=Обработена
 StatusSendingDraftShort=Чернова
 StatusSendingValidatedShort=Валидирана
 StatusSendingProcessedShort=Обработена
-SendingSheet=Лист за експедиция
-ConfirmDeleteSending=Сигурни ли сте, че искате да изтриете тази експедиция?
-ConfirmValidateSending=Сигурни ли сте, че искате да валидирате тази експедиция с реф. <b>%s</b>?
-ConfirmCancelSending=Сигурни ли сте, че ли искате да анулирате тази експедиция?
+SendingSheet=Формуляр за доставка
+ConfirmDeleteSending=Сигурни ли сте, че искате да изтриете тази доставка?
+ConfirmValidateSending=Сигурни ли сте, че искате да валидирате тази доставка с реф. <b>%s</b>?
+ConfirmCancelSending=Сигурни ли сте, че ли искате да анулирате тази доставка?
 DocumentModelMerou=Шаблон А5 размер
 WarningNoQtyLeftToSend=Внимание, няма продукти чакащи да бъдат изпратени.
-StatsOnShipmentsOnlyValidated=Статистики водени само от валидирани пратки. Използваната дата е дата на валидиране на пратката (планираната дата на доставка не винаги е известна)
+StatsOnShipmentsOnlyValidated=Статистики водени само от валидирани доставки. Използваната дата е дата на валидиране на доставката (планираната дата на доставка не винаги е известна)
 DateDeliveryPlanned=Планирана дата за доставка
 RefDeliveryReceipt=Реф. разписка за доставка
 StatusReceipt=Статус на разписка за доставка
 DateReceived=Дата на получаване
-SendShippingByEMail=Изпращане на пратка по имейл
-SendShippingRef=Подаване на пратка %s
-ActionsOnShipping=Събития за пратка
+SendShippingByEMail=Изпращане на доставка по имейл
+SendShippingRef=Изпращане на доставка %s
+ActionsOnShipping=Свързани събития
 LinkToTrackYourPackage=Връзка за проследяване на вашата пратка
-ShipmentCreationIsDoneFromOrder=За момента създаването на нова пратка се извършва от картата на поръчката.
-ShipmentLine=Линия на пратка
-ProductQtyInCustomersOrdersRunning=Количество продукт в отворени клиентски поръчки
+ShipmentCreationIsDoneFromOrder=За момента създаването на нова доставка се извършва от картата на поръчка.
+ShipmentLine=Ред на доставка
+ProductQtyInCustomersOrdersRunning=Количество продукт в отворени поръчки за продажба
 ProductQtyInSuppliersOrdersRunning=Количество продукт в отворени поръчки за покупка
-ProductQtyInShipmentAlreadySent=Вече изпратено количество продукт от отворена поръчка
-ProductQtyInSuppliersShipmentAlreadyRecevied=Вече получено количество продукт от отворена поръчка за покупка
+ProductQtyInShipmentAlreadySent=Количество продукт в отворени и вече изпратени поръчки за продажба
+ProductQtyInSuppliersShipmentAlreadyRecevied=Количество продукт в отворени и вече получени поръчки за покупка
 NoProductToShipFoundIntoStock=Не е намерен продукт за изпращане в склад <b>%s</b>. Коригирайте наличността или се върнете, за да изберете друг склад.
-WeightVolShort=Тегло/Обем
-ValidateOrderFirstBeforeShipment=Първо трябва да валидирате поръчката, преди да можете да изпращате пратки.
+WeightVolShort=Тегло / Обем
+ValidateOrderFirstBeforeShipment=Първо трябва да валидирате поръчката, преди да може да извършвате доставки.
 
 # Sending methods
 # ModelDocument
-DocumentModelTyphon=Завършен шаблон на разписка за доставка  (лого...)
+DocumentModelTyphon=Завършен шаблон на разписка за доставка (лого...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Константата EXPEDITION_ADDON_NUMBER не е дефинирана
 SumOfProductVolumes=Сума от обема на продуктите
 SumOfProductWeights=Сума от теглото на продуктите
 
 # warehouse details
-DetailWarehouseNumber= Подробности за склада
+DetailWarehouseNumber= Детайли за склада
 DetailWarehouseFormat= Тегло: %s (Кол.: %d)
diff --git a/htdocs/langs/bg_BG/stocks.lang b/htdocs/langs/bg_BG/stocks.lang
index 27a3b5aa48a..1e9bdd20f78 100644
--- a/htdocs/langs/bg_BG/stocks.lang
+++ b/htdocs/langs/bg_BG/stocks.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - stocks
-WarehouseCard=Карта на склад
+WarehouseCard=Карта
 Warehouse=Склад
 Warehouses=Складове
 ParentWarehouse=Основен склад
@@ -7,7 +7,7 @@ NewWarehouse=Нов склад / местоположение
 WarehouseEdit=Промяна на склад
 MenuNewWarehouse=Нов склад
 WarehouseSource=Изпращащ склад
-WarehouseSourceNotDefined=Няма зададен склад,
+WarehouseSourceNotDefined=Няма дефиниран склад
 AddWarehouse=Създаване на склад
 AddOne=Добавяне на един
 DefaultWarehouse=Склад по подразбиране
@@ -17,20 +17,20 @@ CancelSending=Анулиране на изпращане
 DeleteSending=Изтриване на изпращане
 Stock=Наличност
 Stocks=Наличности
-StocksByLotSerial=Наличности по Партида/Сериен №
-LotSerial=Партиди/Серийни номера
-LotSerialList=Списък на партиди/серийни номера
+StocksByLotSerial=Наличности по партида / сериен №
+LotSerial=Партиди / Серийни номера
+LotSerialList=Списък на партиди / серийни номера
 Movements=Движения
 ErrorWarehouseRefRequired=Изисква се референтно име на склад
 ListOfWarehouses=Списък на складове
-ListOfStockMovements=Списък на движението на стоковите наличности
+ListOfStockMovements=Списък на движения на стокови наличности
 ListOfInventories=Списък на инвентари
-MovementId=Идент. № за движение
-StockMovementForId=Идент. № за движение %d
-ListMouvementStockProject=Списък на складовите движения, свързани с проекта
-StocksArea=Зона за складове
+MovementId=Идентификатор на движение
+StockMovementForId=Идентификатор на движение %d
+ListMouvementStockProject=Списък на движения на стокови наличности, свързани с проекта
+StocksArea=Секция за складове
 AllWarehouses=Всички складове
-IncludeAlsoDraftOrders=Включва също чернови поръчки
+IncludeAlsoDraftOrders=Включва чернови поръчки
 Location=Местоположение
 LocationSummary=Кратко име на местоположение
 NumberOfDifferentProducts=Брой различни продукти
@@ -53,7 +53,7 @@ StockLowerThanLimit=Наличността е по-малка от лимита
 EnhancedValue=Стойност
 PMPValue=Средно измерена цена
 PMPValueShort=СИЦ
-EnhancedValueOfWarehouses=Стойност на складовете
+EnhancedValueOfWarehouses=Складова стойност
 UserWarehouseAutoCreate=Автоматично създаване на личен потребителски склад при създаване на потребител
 AllowAddLimitStockByWarehouse=Управляване също и на стойности за минимална и желана наличност за двойка (продукт-склад) в допълнение към стойност за продукт
 IndependantSubProductStock=Наличностите за продукти и подпродукти са независими
@@ -81,15 +81,15 @@ StockLimit=Минимално количество за предупрежден
 StockLimitDesc=(празно) означава, че няма предупреждение.<br>0 може да се използва за предупреждение веднага след като наличността е изчерпана.
 PhysicalStock=Физическа наличност
 RealStock=Реална наличност
-RealStockDesc=Физическа/реална наличност е наличността, която в момента се намира в складовете.
+RealStockDesc=Физическа / реална наличност е наличността, която в момента се намира в складовете.
 RealStockWillAutomaticallyWhen=Реалната наличност ще бъде модифицирана според това правило (както е определено в модула на Наличности):
 VirtualStock=Виртуална наличност
 VirtualStockDesc=Виртуална наличност е изчислената наличност, която се образува след като всички отворени / предстоящи действия (които засягат наличности) се затворят (получени поръчки за покупка, изпратени клиентски поръчки и т.н.)
-IdWarehouse=Идент. № на склад
+IdWarehouse=Идентификатор на склад
 DescWareHouse=Описание на склад
 LieuWareHouse=Местоположение на склад
 WarehousesAndProducts=Складове и продукти
-WarehousesAndProductsBatchDetail=Складове и продукти (с подробности за партида/ сериен №)
+WarehousesAndProductsBatchDetail=Складове и продукти (с подробности за партида / сериен №)
 AverageUnitPricePMPShort=Средно измерена входна цена
 AverageUnitPricePMP=Средно измерена входна цена
 SellPriceMin=Единична продажна цена
@@ -98,29 +98,29 @@ EstimatedStockValueSell=Стойност за продажба
 EstimatedStockValueShort=Входна стойност на наличност
 EstimatedStockValue=Входна стойност на наличност
 DeleteAWarehouse=Изтриване на склад
-ConfirmDeleteWarehouse=Сигурни ли сте, че искате да изтриете склада <b>%s</b>?
+ConfirmDeleteWarehouse=Сигурни ли сте, че искате да изтриете склад <b>%s</b>?
 PersonalStock=Наличност в %s
 ThisWarehouseIsPersonalStock=Този склад представлява фактическата наличност в %s %s
 SelectWarehouseForStockDecrease=Избиране на склад, който да се използва за намаляване на наличности
 SelectWarehouseForStockIncrease=Избиране на склад, който да се използва за увеличение на наличности
 NoStockAction=Няма действие с наличности
 DesiredStock=Желана наличност
-DesiredStockDesc=Тази стойност ще бъде използвана за попълване на наличността, чрез функцията за попълване на наличности
+DesiredStockDesc=Тази стойност ще бъде използвана за запълване на наличността, чрез функцията за попълване на наличности
 StockToBuy=За поръчка
 Replenishment=Попълване на наличности
 ReplenishmentOrders=Поръчки за попълване
-VirtualDiffersFromPhysical=Според опциите за увеличаване/намаляване на наличности, физическите и виртуални наличности (физически + текущи поръчки) могат да се различават
+VirtualDiffersFromPhysical=Според опциите за увеличаване / намаляване на наличности, физическите и виртуални наличности (физически + текущи поръчки) могат да се различават
 UseVirtualStockByDefault=Използване на виртуални наличности по подразбиране (вместо физически наличности) при използване на функцията за попълване на наличности
 UseVirtualStock=Използване на виртуални наличности
 UsePhysicalStock=Използване на физически наличности
 CurentSelectionMode=Текущ режим на избор
 CurentlyUsingVirtualStock=Виртуална наличност
-CurentlyUsingPhysicalStock=Фактическа наличност
+CurentlyUsingPhysicalStock=Физическа наличност
 RuleForStockReplenishment=Правило за попълване на наличности
 SelectProductWithNotNullQty=Избиране на най-малко един продукт с количество различно от 0 и доставчик
 AlertOnly= Само предупреждения
-WarehouseForStockDecrease=Този склад <b>%s</b> ще се използва за намаляване на наличността
-WarehouseForStockIncrease=Този склад <b>%s</b> ще се използва за увеличаване на наличността
+WarehouseForStockDecrease=Складът <b>%s</b> ще бъде използван за намаляване на наличността
+WarehouseForStockIncrease=Складът <b>%s</b> ще бъде използван за увеличаване на наличността
 ForThisWarehouse=За този склад
 ReplenishmentStatusDesc=Това е списък на всички продукти, чиято наличност е по-малка от желаната (или е по-малка от стойността на предупреждението, ако е поставена отметка в квадратчето 'Само предупреждения'). При използване на отметка в квадратчето може да създавате поръчки за покупка, за да запълните разликата.
 ReplenishmentOrdersDesc=Това е списък на всички отворени поръчки за покупка, включително предварително дефинирани продукти. Тук могат да се видят само отворени поръчки с предварително дефинирани продукти, които могат да повлияят на наличностите.
@@ -142,16 +142,16 @@ DateMovement=Дата на движение
 InventoryCode=Код на движение / Инвентарен код
 IsInPackage=Съдържа се в опаковка
 WarehouseAllowNegativeTransfer=Наличността може да бъде отрицателна
-qtyToTranferIsNotEnough=Нямате достатъчно запаси в изпращащия склад и настройката ви не позволява отрицателни наличности.
+qtyToTranferIsNotEnough=Нямате достатъчно наличности в изпращащия склад и настройката ви не позволява отрицателни наличности.
 ShowWarehouse=Показване на склад
 MovementCorrectStock=Корекция на наличност за продукт %s
 MovementTransferStock=Прехвърляне на наличност за продукт %s в друг склад
-InventoryCodeShort=Движ./Инв. код
+InventoryCodeShort=Движ. / Инв. код
 NoPendingReceptionOnSupplierOrder=Не се очаква получаване, тъй като поръчката за покупка е отворена
-ThisSerialAlreadyExistWithDifferentDate=Тази партида/сериен № (<strong>%s</strong>) вече съществува, но с различна дата на усвояване или дата на продажба (намерена е <strong>%s</strong>, но вие сте въвели <strong>%s</strong>).
+ThisSerialAlreadyExistWithDifferentDate=Тази партида / сериен № (<strong>%s</strong>) вече съществува, но с различна дата на усвояване или дата на продажба (намерена е <strong>%s</strong>, но вие сте въвели <strong>%s</strong>).
 OpenAll=Отворено за всички действия
 OpenInternal=Отворен само за вътрешни действия
-UseDispatchStatus=Използване на статус на изпращане (одобряване/отхвърляне) за продуктови линии при получаване на поръчка за покупка
+UseDispatchStatus=Използване на статус на изпращане (одобряване / отхвърляне) за продуктови редове при получаване на поръчка за покупка
 OptionMULTIPRICESIsOn=Опцията 'Няколко цени за сегмент' е включена. Това означава, че продуктът има няколко продажни цени, така че стойността за продажба не може да бъде изчислена
 ProductStockWarehouseCreated=Минималното количество за предупреждение и желаните оптимални наличности са правилно създадени
 ProductStockWarehouseUpdated=Минималното количество за предупреждение и желаните оптимални наличности са правилно актуализирани
@@ -159,19 +159,19 @@ ProductStockWarehouseDeleted=Минималното количество за п
 AddNewProductStockWarehouse=Определяне на ново минимално количество за предупреждение и желана оптимална наличност
 AddStockLocationLine=Намалете количеството, след което кликнете, за да добавите друг склад за този продукт
 InventoryDate=Дата на инвентаризация
-NewInventory=Нов инвентар
-inventorySetup = Настройка на инвентар
+NewInventory=Нова инвентаризация
+inventorySetup = Настройка на инвентаризация
 inventoryCreatePermission=Създаване на нова инвентаризация
-inventoryReadPermission=Преглед на инвентари
-inventoryWritePermission=Актуализиране на инвентари
-inventoryValidatePermission=Валидиране на инвентар
+inventoryReadPermission=Преглед на инвентаризации
+inventoryWritePermission=Актуализиране на инвентаризации
+inventoryValidatePermission=Валидиране на инвентаризация
 inventoryTitle=Инвентаризация
 inventoryListTitle=Инвентаризации
 inventoryListEmpty=Не се извършва инвентаризация
-inventoryCreateDelete=Създаване/Изтриване на инвентаризация
+inventoryCreateDelete=Създаване / Изтриване на инвентаризация
 inventoryCreate=Създаване на нова
-inventoryEdit=Редактиране
-inventoryValidate=Валидиране
+inventoryEdit=Промяна
+inventoryValidate=Валидирана
 inventoryDraft=В ход
 inventorySelectWarehouse=Избор на склад
 inventoryConfirmCreate=Създаване
@@ -182,11 +182,11 @@ inventoryWarningProductAlreadyExists=Този продукт е вече в сп
 SelectCategory=Филтър по категория
 SelectFournisseur=Филтър по доставчик
 inventoryOnDate=Инвентаризация
-INVENTORY_DISABLE_VIRTUAL=Виртуален продукт (комплект): не намалявайте наличността на подпродукт
-INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=Използване на покупна цена, ако не може да бъде намерена последна цена за покупка
+INVENTORY_DISABLE_VIRTUAL=Виртуален продукт (комплект): не намалявайте наличността на съставен продукт
+INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=Използване на покупната цена, ако не може да бъде намерена последна цена за покупка
 INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT=Движението на наличности има дата на инвентаризация
 inventoryChangePMPPermission=Променяне на стойността на СИЦ (средно изчислена цена) за даден продукт
-ColumnNewPMP=Нова единица СИЦ
+ColumnNewPMP=Нова СИЦ
 OnlyProdsInStock=Не добавяйте продукт без наличност
 TheoricalQty=Теоретично количество
 TheoricalValue=Теоретична стойност
@@ -198,17 +198,17 @@ RegulatedQty=Регулирано количество
 AddInventoryProduct=Добавяне на продукт към инвентаризация
 AddProduct=Добавяне
 ApplyPMP=Прилагане на СИЦ
-FlushInventory=Прочистване на инвентар
+FlushInventory=Прочистване на инвентаризация
 ConfirmFlushInventory=Потвърждавате ли това действие?
-InventoryFlushed=Инвентарът е прочистен
+InventoryFlushed=Инвентаризацията е прочистена
 ExitEditMode=Изходно издание
-inventoryDeleteLine=Изтриване на линия
+inventoryDeleteLine=Изтриване на ред
 RegulateStock=Регулиране на наличност
 ListInventory=Списък
 StockSupportServices=Управлението на наличности включва и услуги
 StockSupportServicesDesc=По под разбиране можете да съхранявате само продукти от тип 'продукт'. Можете също така да запазите продукт от тип 'услуга', ако модула 'Услуги' и тази опция са активирани.
 ReceiveProducts=Получаване на артикули
-StockIncreaseAfterCorrectTransfer=Увеличаване с корекция/прехвърляне
-StockDecreaseAfterCorrectTransfer=Намаляване с корекция/прехвърляне
-StockIncrease=Увеличаване на наличността
+StockIncreaseAfterCorrectTransfer=Увеличаване с корекция / прехвърляне
+StockDecreaseAfterCorrectTransfer=Намаляване с корекция / прехвърляне
+StockIncrease=Увеличаване на наличност
 StockDecrease=Намаляване на наличност
diff --git a/htdocs/langs/bg_BG/stripe.lang b/htdocs/langs/bg_BG/stripe.lang
index 2b3107da00d..210bda38787 100644
--- a/htdocs/langs/bg_BG/stripe.lang
+++ b/htdocs/langs/bg_BG/stripe.lang
@@ -65,3 +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>
diff --git a/htdocs/langs/bg_BG/supplier_proposal.lang b/htdocs/langs/bg_BG/supplier_proposal.lang
index bebe7d33843..c790cb922b5 100644
--- a/htdocs/langs/bg_BG/supplier_proposal.lang
+++ b/htdocs/langs/bg_BG/supplier_proposal.lang
@@ -48,7 +48,7 @@ DefaultModelSupplierProposalToBill=Шаблон по подразбиране, 
 DefaultModelSupplierProposalClosed=Шаблон по подразбиране, когато се затваря запитване за цена (отхвърлено)
 ListOfSupplierProposals=Списък на запитвания към доставчици
 ListSupplierProposalsAssociatedProject=Списък на запитвания към доставчици свързани с проект
-SupplierProposalsToClose=Запитвания към доставчици за затваряне
+SupplierProposalsToClose=Запитвания към доставчици за приключване
 SupplierProposalsToProcess=Запитвания към доставчици за обработка
 LastSupplierProposals=Запитвания за цени: %s последни
 AllPriceRequests=Всички запитвания
diff --git a/htdocs/langs/bg_BG/ticket.lang b/htdocs/langs/bg_BG/ticket.lang
index 5226ab9e8fc..8a751a908cf 100644
--- a/htdocs/langs/bg_BG/ticket.lang
+++ b/htdocs/langs/bg_BG/ticket.lang
@@ -25,11 +25,11 @@ Permission56001=Преглед на тикети
 Permission56002=Промяна на тикети
 Permission56003=Изтриване на тикети
 Permission56004=Управление на тикети
-Permission56005=Преглед на тикети от всички контрагенти (не е приложимо за външни потребители, винаги ще бъдат ограничени до контрагента, от който зависят)
+Permission56005=Преглед на тикети от всички контрагенти (не е приложимо за външни потребители, винаги ще бъдат ограничени до контрагента от който зависят)
 
 TicketDictType=Тикет - Видове
 TicketDictCategory=Тикет - Групи
-TicketDictSeverity=Тикет - Важност
+TicketDictSeverity=Тикет - Приоритети
 TicketTypeShortBUGSOFT=Софтуерна неизправност
 TicketTypeShortBUGHARD=Хардуерна неизправност
 TicketTypeShortCOM=Търговски въпрос
@@ -37,14 +37,14 @@ TicketTypeShortINCIDENT=Молба за съдействие
 TicketTypeShortPROJET=Проект
 TicketTypeShortOTHER=Друго
 
-TicketSeverityShortLOW=Ниска
-TicketSeverityShortNORMAL=Нормална
-TicketSeverityShortHIGH=Висока
-TicketSeverityShortBLOCKING=Критична/Блокираща
+TicketSeverityShortLOW=Нисък
+TicketSeverityShortNORMAL=Нормален
+TicketSeverityShortHIGH=Висок
+TicketSeverityShortBLOCKING=Критичен
 
 ErrorBadEmailAddress=Полето "%s" е неправилно
-MenuTicketMyAssign=Моите тикети
-MenuTicketMyAssignNonClosed=Моите отворени тикети
+MenuTicketMyAssign=Мои тикети
+MenuTicketMyAssignNonClosed=Мои отворени тикети
 MenuListNonClosed=Отворени тикети
 
 TypeContact_ticket_internal_CONTRIBUTOR=Сътрудник
@@ -58,18 +58,18 @@ Notify_TICKET_SENTBYMAIL=Изпращане на тикет съобщениет
 # Status
 NotRead=Непрочетен
 Read=Прочетен
-Assigned=Назначен
+Assigned=Възложен
 InProgress=В процес
 NeedMoreInformation=Изчакване на информация
 Answered=Отговорен
-Waiting=Изчакващ
+Waiting=В изчакване
 Closed=Затворен
 Deleted=Изтрит
 
 # Dict
 Type=Вид
-Category=Аналитичен код
-Severity=Важност
+Category=Категория
+Severity=Приоритет
 
 # Email templates
 MailToSendTicketMessage=За да изпратите имейл с това съобщение
@@ -81,9 +81,9 @@ TicketSetup=Настройка на тикет модула
 TicketSettings=Настройки
 TicketSetupPage=
 TicketPublicAccess=Публичен интерфейс, който не изисква идентификация, е достъпен на следния URL адрес
-TicketSetupDictionaries=Видът на тикета, важността и аналитичните кодове се конфигурират от речници
+TicketSetupDictionaries=Видът на тикета, приоритетът и категорията се конфигурират от речници
 TicketParamModule=Настройка на променливите в модула
-TicketParamMail=Настройка на имейл известяването
+TicketParamMail=Настройка за имейл известяване
 TicketEmailNotificationFrom=Известяващ имейл от
 TicketEmailNotificationFromHelp=Използван при отговор и изпращане на тикет съобщения
 TicketEmailNotificationTo=Известяващ имейл до
@@ -92,23 +92,23 @@ TicketNewEmailBodyLabel=Текстово съобщение, изпратено
 TicketNewEmailBodyHelp=Текстът, посочен тук, ще бъде включен в имейла, потвърждаващ създаването на нов тикет от публичния интерфейс. Информацията с детайлите на тикета се добавя автоматично.
 TicketParamPublicInterface=Настройка на публичен интерфейс
 TicketsEmailMustExist=Изисква съществуващ имейл адрес, за да се създаде тикет
-TicketsEmailMustExistHelp=В публичния интерфейс имейл адресът трябва да е вече въведен в базата данни, за да се създаде нов тикет.
+TicketsEmailMustExistHelp=За да се създаде нов тикет през публичния интерфейс имейл адресът трябва да съществува в базата данни
 PublicInterface=Публичен интерфейс
 TicketUrlPublicInterfaceLabelAdmin=Алтернативен URL адрес за публичния интерфейс
-TicketUrlPublicInterfaceHelpAdmin=Възможно е да се дефинира псевдоним на уеб сървъра и по този начин да се предостави достъп до публичния интерфейс от друг URL адрес (сървърът трябва да действа като прокси сървър в този нов URL адрес)
+TicketUrlPublicInterfaceHelpAdmin=Възможно е да се дефинира псевдоним на уеб сървъра и по този начин да се предостави достъп до публичния интерфейс от друг URL адрес (сървърът трябва да действа като прокси сървър за този нов URL адрес)
 TicketPublicInterfaceTextHomeLabelAdmin=Приветстващ текст на публичния интерфейс
-TicketPublicInterfaceTextHome=Може да създадете тикет в системата за управление и обслужване на запитвания или да прегледате съществуващ като използвате номера за проследяване и Вашият имейл адрес.
-TicketPublicInterfaceTextHomeHelpAdmin=Текстът, определен тук, ще се появи на началната страница на публичния интерфейс.
+TicketPublicInterfaceTextHome=Може да създадете тикет в системата за управление и обслужване на запитвания или да прегледате съществуващ като използвате номера за проследяване и вашият имейл адрес.
+TicketPublicInterfaceTextHomeHelpAdmin=Текстът определен тук ще се появи на началната страница на публичния интерфейс.
 TicketPublicInterfaceTopicLabelAdmin=Заглавие на интерфейса
 TicketPublicInterfaceTopicHelp=Този текст ще се появи като заглавие на публичния интерфейс.
 TicketPublicInterfaceTextHelpMessageLabelAdmin=Помощен текст към съобщението
 TicketPublicInterfaceTextHelpMessageHelpAdmin=Този текст ще се появи над мястото с въведено съобщение от потребителя.
 ExtraFieldsTicket=Допълнителни атрибути
 TicketCkEditorEmailNotActivated=HTML редакторът не е активиран. Моля, задайте стойност 1 на константата FCKEDITOR_ENABLE_MAIL, за да го активирате.
-TicketsDisableEmail=Не изпращай имейли при създаване или добавяне на съобщение
-TicketsDisableEmailHelp=По подразбиране се изпращат имейли, когато са създадени нови тикети или съобщения. Активирайте тази опция, за да деактивирате *всички* известия по имейл
+TicketsDisableEmail=Да не се изпращат имейли при създаване на тикет или добавяне на съобщение
+TicketsDisableEmailHelp=По подразбиране се изпращат имейли, когато са създадени нови тикети или са добавени съобщения. Активирайте тази опция, за да деактивирате *всички* известия по имейл.
 TicketsLogEnableEmail=Активиране на вход с имейл
-TicketsLogEnableEmailHelp=При всяка промяна ще бъде изпратен имейл **на всеки контакт**, свързан с тикета.
+TicketsLogEnableEmailHelp=При всяка промяна ще бъде изпратен имейл *на всеки контакт*, свързан с тикета.
 TicketParams=Параметри
 TicketsShowModuleLogo=Показване на логото на модула в публичния интерфейс
 TicketsShowModuleLogoHelp=Активирайте тази опция, за да скриете логото на модула от страниците на публичния интерфейс
@@ -116,7 +116,7 @@ TicketsShowCompanyLogo=Показване на логото на фирмата
 TicketsShowCompanyLogoHelp=Активирайте тази опция, за да скриете логото на основната фирма от страниците на публичния интерфейс
 TicketsEmailAlsoSendToMainAddress=Изпращане на известие до основния имейл адрес
 TicketsEmailAlsoSendToMainAddressHelp=Активирайте тази опция, за да изпратите имейл до "Известяващ имейл от" (вижте настройката по-долу)
-TicketsLimitViewAssignedOnly=Ограничаване на показването на тикети до такива, които са назначени на текущия потребител (не е приложимо за външни потребители, винаги ще бъдат ограничени до контрагента, от който зависят)
+TicketsLimitViewAssignedOnly=Ограничаване на показването на тикети до такива, които са възложени на текущия потребител (не е приложимо за външни потребители, винаги ще бъдат ограничени до контрагента, от който зависят)
 TicketsLimitViewAssignedOnlyHelp=Само тикети, възложени на текущия потребител ще бъдат показвани. Не важи за потребител с права за управление на тикети.
 TicketsActivatePublicInterface=Активиране на публичния интерфейс
 TicketsActivatePublicInterfaceHelp=Публичният интерфейс позволява на всички посетители да създават тикети.
@@ -129,13 +129,13 @@ TicketsDisableCustomerEmail=Деактивиране на имейлите, ко
 #
 # Index & list page
 #
-TicketsIndex=Начална страница
+TicketsIndex=Секция за тикети
 TicketList=Списък с тикети
-TicketAssignedToMeInfos=Тази страница показва списъка с тикети, създадени от или възложени на текущия потребител
-NoTicketsFound=Няма намерен тикет
+TicketAssignedToMeInfos=Тази страница показва списък с тикети, които са създадени от вас или са ви били възложени
+NoTicketsFound=Няма намерени тикети
 NoUnreadTicketsFound=Не са открити непрочетени тикети
 TicketViewAllTickets=Преглед на всички тикети
-TicketViewNonClosedOnly=Преглед на отворените тикети
+TicketViewNonClosedOnly=Преглед на отворени тикети
 TicketStatByStatus=Тикети по статус
 
 #
@@ -144,24 +144,24 @@ TicketStatByStatus=Тикети по статус
 Ticket=Тикет
 TicketCard=Карта
 CreateTicket=Създаване на тикет
-EditTicket=Редактиране на тикет
+EditTicket=Променяне на тикет
 TicketsManagement=Управление на тикети
 CreatedBy=Създаден от
 NewTicket=Нов тикет
 SubjectAnswerToTicket=Отговор на тикет
 TicketTypeRequest=Вид на тикета
-TicketCategory=Аналитичен код
+TicketCategory=Категория
 SeeTicket=Преглед на тикет
 TicketMarkedAsRead=Тикетът е маркиран като прочетен
 TicketReadOn=Прочетен на
 TicketCloseOn=Дата на приключване
 MarkAsRead=Маркиране на тикета като прочетен
 TicketHistory=История
-AssignUser=Възлагане на служител
+AssignUser=Възлагане на потребител
 TicketAssigned=Тикетът е възложен
-TicketChangeType=Промяна на вида
-TicketChangeCategory=Промяна на аналитичния код
-TicketChangeSeverity=Промяна на важността
+TicketChangeType=Променяне на вида
+TicketChangeCategory=Променяне на категория
+TicketChangeSeverity=Променяне на приоритет
 TicketAddMessage=Добавяне на съобщение
 AddMessage=Добавяне на съобщение
 MessageSuccessfullyAdded=Тикетът е добавен
@@ -169,36 +169,36 @@ TicketMessageSuccessfullyAdded=Съобщението е успешно доба
 TicketMessagesList=Списък със съобщения
 NoMsgForThisTicket=Няма съобщение за този тикет
 Properties=Реквизити
-LatestNewTickets=Тикети: %s най-нови тикета (непрочетени)
-TicketSeverity=Важност
+LatestNewTickets=Тикети: %s последни (непрочетени)
+TicketSeverity=Приоритет
 ShowTicket=Преглед на тикет
 RelatedTickets=Свързани тикети
 TicketAddIntervention=Създаване на интервенция
-CloseTicket=Затваряне на тикет
-CloseATicket=Затваряне на тикет
-ConfirmCloseAticket=Потвърдете затварянето на тикета
-ConfirmDeleteTicket=Моля, потвърдете изтриването на билета
+CloseTicket=Приключване на тикет
+CloseATicket=Приключване на тикет
+ConfirmCloseAticket=Потвърдете приключването на тикета
+ConfirmDeleteTicket=Потвърдете изтриването на тикета
 TicketDeletedSuccess=Тикетът е успешно изтрит
-TicketMarkedAsClosed=Тикетът е маркиран като затворен
+TicketMarkedAsClosed=Тикетът е маркиран като приключен
 TicketDurationAuto=Изчислена продължителност
 TicketDurationAutoInfos=Продължителност, изчислена автоматично според необходимите действия
 TicketUpdated=Тикетът е актуализиран
 SendMessageByEmail=Изпращане на съобщение по имейл
 TicketNewMessage=Ново съобщение
 ErrorMailRecipientIsEmptyForSendTicketMessage=Полето за получател е празно, не беше изпратен имейл.
-TicketGoIntoContactTab=Моля отидете в раздел "Контакти", откъдето може да изберете.
+TicketGoIntoContactTab=Моля отидете в раздел "Контакти" откъдето може да изберете
 TicketMessageMailIntro=Въведение
 TicketMessageMailIntroHelp=Този текст се добавя само в началото на имейла и няма да бъде запазен.
 TicketMessageMailIntroLabelAdmin=Въведение към съобщението при изпращане на имейл
-TicketMessageMailIntroText=Здравейте,<br>Беше добавено ново съобщение към тикет, за който сте асоцииран като контакт. Ето и съобщението:<br>
-TicketMessageMailIntroHelpAdmin=Този текст ще бъде вмъкнат преди текста за отговор към тикета.
+TicketMessageMailIntroText=Здравейте,<br>Беше добавено ново съобщение към тикет, в който сте посочен като контакт. Ето и съобщението:<br>
+TicketMessageMailIntroHelpAdmin=Този текст ще бъде вмъкнат преди текста на съобщението към тикета.
 TicketMessageMailSignature=Подпис
 TicketMessageMailSignatureHelp=Този текст се добавя само в края на имейла и няма да бъде запазен.
 TicketMessageMailSignatureText=<p>Поздрави,</p><p>--</p>
 TicketMessageMailSignatureLabelAdmin=Подпис в отговора към имейла
 TicketMessageMailSignatureHelpAdmin=Този текст ще бъде вмъкнат след съобщението за отговор.
 TicketMessageHelp=Само този текст ще бъде запазен в списъка със съобщения към тикета.
-TicketMessageSubstitutionReplacedByGenericValues=Заместващите променливи се заменят от стандартни стойности.
+TicketMessageSubstitutionReplacedByGenericValues=Заместващите променливи се заменят с общи стойности.
 TimeElapsedSince=Изминало време
 TicketTimeToRead=Изминало време преди прочитане
 TicketContacts=Контакти
@@ -211,16 +211,16 @@ MarkMessageAsPrivate=Маркиране на съобщението като л
 TicketMessagePrivateHelp=Това съобщение няма да се показва на външни потребители
 TicketEmailOriginIssuer=Контакт на контрагента проследяващ тикета
 InitialMessage=Първоначално съобщение
-LinkToAContract=Свързване към договор
+LinkToAContract=Връзка към договор
 TicketPleaseSelectAContract=Изберете договор
-UnableToCreateInterIfNoSocid=Не може да бъде създадена интервенция без да бъде дефиниран контрагента
+UnableToCreateInterIfNoSocid=Не може да бъде създадена интервенция преди да се посочи контрагент
 TicketMailExchanges=История на съобщенията
 TicketInitialMessageModified=Първоначалното съобщение е променено
 TicketMessageSuccesfullyUpdated=Съобщението е успешно актуализирано
 TicketChangeStatus=Промяна на статус
 TicketConfirmChangeStatus=Потвърдете промяната на статуса на: %s?
 TicketLogStatusChanged=Статусът е променен: от %s на %s
-TicketNotNotifyTiersAtCreate=Не уведомява фирмата при създаването на тикета
+TicketNotNotifyTiersAtCreate=Да не се уведомява фирмата при създаване на тикета
 Unread=Непрочетен
 
 #
@@ -229,9 +229,9 @@ Unread=Непрочетен
 TicketLogMesgReadBy=Тикет %s е прочетен от %s
 NoLogForThisTicket=Все още няма запис за този тикет
 TicketLogAssignedTo=Тикет %s е възложен на %s
-TicketLogPropertyChanged=Тикет %s е редактиран: класификация от %s на %s
-TicketLogClosedBy=Тикет %s е затворен от %s
-TicketLogReopen=Тикет %s е отворен повторно
+TicketLogPropertyChanged=Тикет %s е класифициран от %s на %s
+TicketLogClosedBy=Тикет %s е приключен от %s
+TicketLogReopen=Тикет %s е повторно отворен
 
 #
 # Public pages
@@ -239,21 +239,21 @@ TicketLogReopen=Тикет %s е отворен повторно
 TicketSystem=Тикет система
 ShowListTicketWithTrackId=Проследяване на списък с тикети
 ShowTicketWithTrackId=Проследяване на тикет
-TicketPublicDesc=Може да създадете тикет или да проследите съществуващи като използвате кода за проследяване и Вашият имейл адрес.
+TicketPublicDesc=Може да създадете тикет или да проследите съществуващи като използвате кода за проследяване и вашият имейл адрес.
 YourTicketSuccessfullySaved=Тикетът е успешно съхранен!
 MesgInfosPublicTicketCreatedWithTrackId=Беше създаден нов тикет с проследяващ код %s
 PleaseRememberThisId=Моля, запазете проследяващия код, за който може да ви попитаме по-късно.
 TicketNewEmailSubject=Потвърждение за създаване на тикет
 TicketNewEmailSubjectCustomer=Нов тикет
 TicketNewEmailBody=Това е автоматичен имейл, който потвърждава, че сте регистрирали нов тикет.
-TicketNewEmailBodyCustomer=Това е автоматичен имейл, който потвърждава, че е създаден нов тикет във вашия фирмен профил.
+TicketNewEmailBodyCustomer=Това е автоматичен имейл, който потвърждава, че е създаден нов тикет във вашият фирмен профил.
 TicketNewEmailBodyInfosTicket=Информация за наблюдение на тикета
 TicketNewEmailBodyInfosTrackId=Проследяващ код на тикета: %s
 TicketNewEmailBodyInfosTrackUrl=Може да следите напредъка по тикета като кликнете на връзката по-горе.
 TicketNewEmailBodyInfosTrackUrlCustomer=Може да следите напредъка по тикета в специалния интерфейс като кликнете върху следната връзка
 TicketEmailPleaseDoNotReplyToThisEmail=Моля, не отговаряйте директно на този имейл! Използвайте връзката, за да отговорите, чрез интерфейса.
 TicketPublicInfoCreateTicket=Тази форма позволява да регистрирате тикет в системата за управление и обслужване на запитвания.
-TicketPublicPleaseBeAccuratelyDescribe=Моля, опишете точно проблема. Посочете възможно най-много информация, за да ни позволите да идентифицираме правилно това запитване.
+TicketPublicPleaseBeAccuratelyDescribe=Моля, опишете подробно проблема. Посочете възможно най-много информация, за да ни позволите да идентифицираме правилно това запитване.
 TicketPublicMsgViewLogIn=Моля, въведете проследяващ код и имейл адрес
 TicketTrackId=Код за проследяване
 OneOfTicketTrackId=Код за проследяване
@@ -273,11 +273,11 @@ NumberOfTicketsByMonth=Брой тикети на месец
 NbOfTickets=Брой тикети
 # notifications
 TicketNotificationEmailSubject=Тикет с проследяващ код %s е актуализиран
-TicketNotificationEmailBody=Здравейте,\nТова е автоматично съобщение, което има за цел да Ви уведоми, че тикет с проследяващ код %s е бил наскоро актуализиран.
-TicketNotificationRecipient=Получател на уведомлението
+TicketNotificationEmailBody=Здравейте,\nТова е автоматично съобщение, което има за цел да ви уведоми, че тикет с проследяващ код %s е актуализиран.
+TicketNotificationRecipient=Получател на известието
 TicketNotificationLogMessage=Съобщение в историята
 TicketNotificationEmailBodyInfosTrackUrlinternal=Вижте тикета в системата
-TicketNotificationNumberEmailSent=Изпратено уведомление по имейл: %s
+TicketNotificationNumberEmailSent=Изпратени известия по имейл: %s
 
 ActionsOnTicket=Свързани събития
 
diff --git a/htdocs/langs/bg_BG/users.lang b/htdocs/langs/bg_BG/users.lang
index 149d5652857..9e29ab5b1f6 100644
--- a/htdocs/langs/bg_BG/users.lang
+++ b/htdocs/langs/bg_BG/users.lang
@@ -1,15 +1,15 @@
 # Dolibarr language file - Source file is en_US - users
-HRMArea=Секция човешки ресурси
-UserCard=Карта на потребител
-GroupCard=Карта на група
+HRMArea=Секция за човешки ресурси
+UserCard=Карта
+GroupCard=Карта
 Permission=Разрешение
 Permissions=Права
-EditPassword=Редактиране на парола
+EditPassword=Променяне на парола
 SendNewPassword=Регенериране и изпращане на парола
-SendNewPasswordLink=Връзка за възстановяване на парола
+SendNewPasswordLink=Изпращане на връзка за парола
 ReinitPassword=Регенериране на парола
 PasswordChangedTo=Паролата е променена на: %s
-SubjectNewPassword=Новата ви парола за %s
+SubjectNewPassword=Вашата нова парола за %s
 GroupRights=Групови права
 UserRights=Потребителски права
 UserGUISetup=Настройка на потребителския интерфейс
@@ -28,9 +28,9 @@ ConfirmReinitPassword=Сигурни ли сте, че искате да ген
 ConfirmSendNewPassword=Сигурни ли сте, че искате да генерирате и изпратите нова парола за потребител <b>%s</b>?
 NewUser=Нов потребител
 CreateUser=Създаване на потребител
-LoginNotDefined=Входната информация не е дефинирана.
+LoginNotDefined=Не е дефинирано потребителско име.
 NameNotDefined=Името не е дефинирано.
-ListOfUsers=Списък потребители
+ListOfUsers=Списък на потребители
 SuperAdministrator=Супер администратор
 SuperAdministratorDesc=Глобален администратор
 AdministratorDesc=Администратор
@@ -39,7 +39,7 @@ DefaultRightsDesc=Определете тук правата <u>по подра
 DolibarrUsers=Потребители на системата
 LastName=Фамилия
 FirstName=Собствено име
-ListOfGroups=Списък на групите
+ListOfGroups=Списък на групи
 NewGroup=Нова група
 CreateGroup=Създаване на група
 RemoveFromGroup=Премахване от групата
@@ -50,14 +50,14 @@ ConfirmPasswordReset=Потвърдете възстановяване на па
 MenuUsersAndGroups=Потребители и групи
 LastGroupsCreated=Групи: %s последно създадени
 LastUsersCreated=Потребители: %s последно създадени
-ShowGroup=Покажи групата
-ShowUser=Покажи потребителя
+ShowGroup=Показване на група
+ShowUser=Показване на потребител
 NonAffectedUsers=Не присвоени потребители
-UserModified=Потребителят е успешно редактиран
+UserModified=Потребителят е успешно променен
 PhotoFile=Снимка
 ListOfUsersInGroup=Списък на потребителите в тази група
 ListOfGroupsForUser=Списък на групите за този потребител
-LinkToCompanyContact=Свързване към контрагент/контакт
+LinkToCompanyContact=Свързване към контрагент / контакт
 LinkedToDolibarrMember=Свързване към член
 LinkedToDolibarrUser=Свързване към потребител на системата
 LinkedToDolibarrThirdParty=Свързване към контрагент
@@ -74,8 +74,8 @@ InternalExternalDesc=<b>Вътрешния</b> потребител е потр
 PermissionInheritedFromAGroup=Разрешението е предоставено, тъй като е наследено от една от групите на потребителя.
 Inherited=Наследено
 UserWillBeInternalUser=Създаденият потребителят ще бъде вътрешен потребител (тъй като не е свързан с определен контрагент)
-UserWillBeExternalUser=Създаденият потребителят ще бъде външен потребител (защото е свързани с определен контрагент)
-IdPhoneCaller=Идентификация на повикващия
+UserWillBeExternalUser=Създаденият потребителят ще бъде външен потребител (защото е свързан с определен контрагент)
+IdPhoneCaller=Идентификатор на повикващия
 NewUserCreated=Потребител %s е създаден
 NewUserPassword=Промяна на паролата за %s
 EventUserModified=Потребител %s е променен
@@ -88,7 +88,7 @@ GroupDeleted=Група %s е премахната
 ConfirmCreateContact=Сигурни ли сте, че искате да създадете Dolibarr профил за този контакт?
 ConfirmCreateLogin=Сигурни ли сте, че искате да създадете Dolibarr профил за този член?
 ConfirmCreateThirdParty=Сигурни ли сте, че искате да създадете контрагент за този член?
-LoginToCreate=Данни за вход за създаване
+LoginToCreate=Потребителско име
 NameToCreate=Име на контрагент за създаване
 YourRole=Вашите роли
 YourQuotaOfUsersIsReached=Вашата квота за активни потребители е достигната!
@@ -109,4 +109,4 @@ UserLogoff=Излизане от потребителя
 UserLogged=Потребителят е регистриран
 DateEmployment=Дата на назначаване
 DateEmploymentEnd=Дата на освобождаване
-CantDisableYourself=You can't disable your own user record
+CantDisableYourself=Не можете да забраните собствения си потребителски запис
diff --git a/htdocs/langs/bg_BG/withdrawals.lang b/htdocs/langs/bg_BG/withdrawals.lang
index 149fec6aa7c..efae12ef41d 100644
--- a/htdocs/langs/bg_BG/withdrawals.lang
+++ b/htdocs/langs/bg_BG/withdrawals.lang
@@ -76,7 +76,8 @@ WithdrawalFile=Withdrawal file
 SetToStatusSent=Зададен към статус "Файл Изпратен"
 ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and will classify them as "Paid" if remain to pay is null
 StatisticsByLineStatus=Статистики по статуса на линиите
-RUM=UMR
+RUM=Unique Mandate Reference (UMR)
+DateRUM=Mandate signature date
 RUMLong=Unique Mandate Reference
 RUMWillBeGenerated=If empty, a UMR (Unique Mandate Reference) will be generated once the bank account information is saved.
 WithdrawMode=Direct debit mode (FRST or RECUR)
diff --git a/htdocs/langs/bg_BG/workflow.lang b/htdocs/langs/bg_BG/workflow.lang
index 71026fb3062..dec1f41bc78 100644
--- a/htdocs/langs/bg_BG/workflow.lang
+++ b/htdocs/langs/bg_BG/workflow.lang
@@ -6,13 +6,13 @@ ThereIsNoWorkflowToModify=Няма налични промени на работ
 descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Автоматично създаване на клиентска поръчка след подписване на търговско предложение (новата поръчка ще има същата стойност като на предложение)
 descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Автоматично създаване на клиентска фактура след подписване на търговско предложение (новата фактура ще има същата стойност като на предложението)
 descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Автоматично създаване на клиентска фактура след валидиране на договор
-descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Автоматично създаване на клиентска фактура след затваряне на клиентска поръчка (новата фактура ще има същата стойност като на поръчката)
+descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Автоматично създаване на фактура за продажба след приключване на поръчка за продажба (новата фактура ще има същата стойност като на поръчката)
 # Autoclassify customer proposal or order
 descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Класифициране на свързано търговско предложение - първоизточник като фактурирано след класифициране на клиентска поръчка като фактурирана (и ако стойността на поръчката е същата като общата сума на подписаното свързано предложение)
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Класифициране на свързано търговско предложение - първоизточник като фактурирано след валидиране на клиентска фактура (и ако стойността на фактурата е същата като общата сума на подписаното свързано предложение)
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Класифициране на свързана клиентска поръчка - първоизточник като фактурирана след валидиране на клиентска фактура (и ако стойността на фактурата е същата като общата сума на свързаната поръчка)
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Класифициране на свързана клиентска поръчка - първоизточник като фактурирана след плащане на клиентска фактура (и ако стойността на фактурата е същата като общата сума на свързаната поръчка)
-descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Класифициране на свързана клиентска поръчка - първоизточник като изпратена след валидиране на пратка (и ако количеството, изпратено, чрез всички пратки е същото като в поръчката за актуализиране)
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Класифициране на свързана клиентска поръчка - първоизточник като изпратена след валидиране на доставка (и ако количеството, изпратено, чрез всички пратки е същото като в поръчката за актуализиране)
 # Autoclassify purchase order
 descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Класифициране на свързаното за запитване към доставчик - първоизточник като фактурираното след валидиране на доставната фактура (и ако стойността на фактурата е същата като общата сума на свързаното запитване)
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Класифициране на свързаната поръчка за покупка - първоизточник като фактурирана след валидиране на доставна фактура (и ако стойността на фактурата е същата като общата сума на свързаната поръчка)
diff --git a/htdocs/langs/bn_BD/accountancy.lang b/htdocs/langs/bn_BD/accountancy.lang
index 758d9c340a5..1fc3b3e05ec 100644
--- a/htdocs/langs/bn_BD/accountancy.lang
+++ b/htdocs/langs/bn_BD/accountancy.lang
@@ -265,7 +265,7 @@ AccountingJournals=Accounting journals
 AccountingJournal=Accounting journal
 NewAccountingJournal=New accounting journal
 ShowAccoutingJournal=Show accounting journal
-Nature=Nature
+NatureOfJournal=Nature of Journal
 AccountingJournalType1=Miscellaneous operations
 AccountingJournalType2=Sales
 AccountingJournalType3=Purchases
@@ -291,6 +291,7 @@ Modelcsv_quadratus=Export for Quadratus QuadraCompta
 Modelcsv_ebp=Export for EBP
 Modelcsv_cogilog=Export for Cogilog
 Modelcsv_agiris=Export for Agiris
+Modelcsv_LDCompta=Export for LD Compta (v9 & higher) (Test)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
@@ -301,7 +302,7 @@ ChartofaccountsId=Chart of accounts Id
 InitAccountancy=Init accountancy
 InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accounting account defined for sales and purchases.
 DefaultBindingDesc=This page can be used to set a default account to use to link transactions record about payment salaries, donation, taxes and vat when no specific accounting account were already set.
-DefaultClosureDesc=This page can be used to set parameters to use to enclose a balance sheet.
+DefaultClosureDesc=This page can be used to set parameters used for accounting closures.
 Options=Options
 OptionModeProductSell=Mode sales
 OptionModeProductSellIntra=Mode sales exported in EEC
diff --git a/htdocs/langs/bn_BD/admin.lang b/htdocs/langs/bn_BD/admin.lang
index f30d6edd9f7..2e27c6fe81f 100644
--- a/htdocs/langs/bn_BD/admin.lang
+++ b/htdocs/langs/bn_BD/admin.lang
@@ -574,7 +574,7 @@ Module510Name=Salaries
 Module510Desc=Record and track employee payments
 Module520Name=Loans
 Module520Desc=Management of loans
-Module600Name=Notifications
+Module600Name=Notifications on business event
 Module600Desc=Send email notifications triggered by a business event: per user (setup defined on each user), per third-party contacts (setup defined on each third party) or by specific emails
 Module600Long=Note that this module sends emails in real-time when a specific business event occurs. If you are looking for a feature to send email reminders for agenda events, go into the setup of module Agenda.
 Module610Name=Product Variants
@@ -1193,6 +1193,7 @@ ExtraFieldsSupplierOrders=Complementary attributes (orders)
 ExtraFieldsSupplierInvoices=Complementary attributes (invoices)
 ExtraFieldsProject=Complementary attributes (projects)
 ExtraFieldsProjectTask=Complementary attributes (tasks)
+ExtraFieldsSalaries=Complementary attributes (salaries)
 ExtraFieldHasWrongValue=Attribute %s has a wrong value.
 AlphaNumOnlyLowerCharsAndNoSpace=only alphanumericals and lower case characters without space
 SendmailOptionNotComplete=Warning, on some Linux systems, to send email from your email, sendmail execution setup must contains option -ba (parameter mail.force_extra_parameters into your php.ini file). If some recipients never receive emails, try to edit this PHP parameter with mail.force_extra_parameters = -ba).
@@ -1220,13 +1221,14 @@ SuhosinSessionEncrypt=Session storage encrypted by Suhosin
 ConditionIsCurrently=Condition is currently %s
 YouUseBestDriver=You use driver %s which is the best driver currently available.
 YouDoNotUseBestDriver=You use driver %s but driver %s is recommended.
-NbOfProductIsLowerThanNoPb=You have only %s products/services in the database. This does not require any particular optimization.
+NbOfObjectIsLowerThanNoPb=You have only %s %s in the database. This does not require any particular optimization.
 SearchOptim=Search optimization
-YouHaveXProductUseSearchOptim=You have %s products in the database. You should add the constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+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.
 BrowserIsOK=You are using the %s web browser. This browser is ok for security and performance.
 BrowserIsKO=You are using the %s web browser. This browser is known to be a bad choice for security, performance and reliability. We recommend using Firefox, Chrome, Opera or Safari.
-XDebugInstalled=XDebug is loaded.
-XCacheInstalled=XCache is loaded.
+PHPModuleLoaded=PHP component %s is loaded
+PreloadOPCode=Preloaded OPCode is used
 AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.<br>Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp".
 AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".
 AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties.
@@ -1734,9 +1736,9 @@ ExpenseReportsRulesSetup=Setup of module Expense Reports - Rules
 ExpenseReportNumberingModules=Expense reports numbering module
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
 YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for email notifications by enabling and configuring the module "Notification".
-ListOfNotificationsPerUser=List of notifications per user*
-ListOfNotificationsPerUserOrContact=List of notifications (events) available per user* or per contact**
-ListOfFixedNotifications=List of Fixed Notifications
+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
 GoOntoUserCardToAddMore=Go to the tab "Notifications" of a user to add or remove notifications for users
 GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
 Threshold=Threshold
@@ -1898,6 +1900,11 @@ OnMobileOnly=On small screen (smartphone) only
 DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be Prospect or Customer but can't be both)
 MAIN_OPTIMIZEFORTEXTBROWSER=Simplify interface for blind person
 MAIN_OPTIMIZEFORTEXTBROWSERDesc=Enable this option if you are a blind person, or if you use the application from a text browser like Lynx or 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
 ThisValueCanOverwrittenOnUserLevel=This value can be overwritten by each user from its user page - tab '%s'
 DefaultCustomerType=Default thirdparty type for "New customer" creation form
 ABankAccountMustBeDefinedOnPaymentModeSetup=Note: The bank account must be defined on the module of each payment mode (Paypal, Stripe, ...) to have this feature working.
@@ -1911,7 +1918,7 @@ LogsLinesNumber=Number of lines to show on logs tab
 UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
-DebugBarModuleActivated=Module debugbar is activated and slows dramaticaly the interface
+ModuleActivated=Module %s is activated and slows the interface
 EXPORTS_SHARE_MODELS=Export models are share with everybody
 ExportSetup=Setup of module Export
 InstanceUniqueID=Unique ID of the instance
@@ -1928,3 +1935,5 @@ 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
diff --git a/htdocs/langs/bn_BD/bills.lang b/htdocs/langs/bn_BD/bills.lang
index 4467e38e1e7..d977c564e29 100644
--- a/htdocs/langs/bn_BD/bills.lang
+++ b/htdocs/langs/bn_BD/bills.lang
@@ -95,6 +95,7 @@ PaymentHigherThanReminderToPay=Payment higher than reminder to pay
 HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess received for each overpaid invoice.
 HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess paid for each overpaid invoice.
 ClassifyPaid=Classify 'Paid'
+ClassifyUnPaid=Classify 'Unpaid'
 ClassifyPaidPartially=Classify 'Paid partially'
 ClassifyCanceled=Classify 'Abandoned'
 ClassifyClosed=Classify 'Closed'
@@ -214,6 +215,20 @@ ShowInvoiceReplace=Show replacing invoice
 ShowInvoiceAvoir=Show credit note
 ShowInvoiceDeposit=Show deposit invoice
 ShowInvoiceSituation=Show situation invoice
+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
 ShowPayment=Show payment
 AlreadyPaid=Already paid
 AlreadyPaidBack=Already paid back
diff --git a/htdocs/langs/bn_BD/errors.lang b/htdocs/langs/bn_BD/errors.lang
index b5a9d70cb70..1ee46fdbb92 100644
--- a/htdocs/langs/bn_BD/errors.lang
+++ b/htdocs/langs/bn_BD/errors.lang
@@ -90,7 +90,7 @@ ErrorSpecialCharNotAllowedForField=Special characters are not allowed for field
 ErrorNumRefModel=A reference exists into database (%s) and is not compatible with this numbering rule. Remove record or renamed reference to activate this module.
 ErrorQtyTooLowForThisSupplier=Quantity too low for this vendor or no price defined on this product for this vendor
 ErrorOrdersNotCreatedQtyTooLow=Some orders haven't been created because of too-low quantities
-ErrorModuleSetupNotComplete=Setup of module looks to be uncomplete. Go on Home - Setup - Modules to complete.
+ErrorModuleSetupNotComplete=Setup of module %s looks to be uncomplete. Go on Home - Setup - Modules to complete.
 ErrorBadMask=Error on mask
 ErrorBadMaskFailedToLocatePosOfSequence=Error, mask without sequence number
 ErrorBadMaskBadRazMonth=Error, bad reset value
@@ -219,6 +219,7 @@ 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.
 # 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.
 WarningMandatorySetupNotComplete=Click here to setup mandatory parameters
 WarningEnableYourModulesApplications=Click here to enable your modules and applications
diff --git a/htdocs/langs/bn_BD/main.lang b/htdocs/langs/bn_BD/main.lang
index b930ecc464e..bd4ae2153bf 100644
--- a/htdocs/langs/bn_BD/main.lang
+++ b/htdocs/langs/bn_BD/main.lang
@@ -445,6 +445,7 @@ ContactsAddressesForCompany=Contacts/addresses for this third party
 AddressesForCompany=Addresses for this third party
 ActionsOnCompany=Events for this third party
 ActionsOnContact=Events for this contact/address
+ActionsOnContract=Events for this contract
 ActionsOnMember=Events about this member
 ActionsOnProduct=Events about this product
 NActionsLate=%s late
@@ -759,6 +760,7 @@ LinkToSupplierProposal=Link to vendor proposal
 LinkToSupplierInvoice=Link to vendor invoice
 LinkToContract=Link to contract
 LinkToIntervention=Link to intervention
+LinkToTicket=Link to ticket
 CreateDraft=Create draft
 SetToDraft=Back to draft
 ClickToEdit=Click to edit
diff --git a/htdocs/langs/bn_BD/products.lang b/htdocs/langs/bn_BD/products.lang
index 7b68f5b3ebd..73e672284de 100644
--- a/htdocs/langs/bn_BD/products.lang
+++ b/htdocs/langs/bn_BD/products.lang
@@ -2,6 +2,7 @@
 ProductRef=Product ref.
 ProductLabel=Product label
 ProductLabelTranslated=Translated product label
+ProductDescription=Product description
 ProductDescriptionTranslated=Translated product description
 ProductNoteTranslated=Translated product note
 ProductServiceCard=Products/Services card
diff --git a/htdocs/langs/bn_BD/stripe.lang b/htdocs/langs/bn_BD/stripe.lang
index 7a3389f34b7..c5224982873 100644
--- a/htdocs/langs/bn_BD/stripe.lang
+++ b/htdocs/langs/bn_BD/stripe.lang
@@ -65,3 +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>
diff --git a/htdocs/langs/bn_BD/withdrawals.lang b/htdocs/langs/bn_BD/withdrawals.lang
index cbca2b2f103..88e5eaf128c 100644
--- a/htdocs/langs/bn_BD/withdrawals.lang
+++ b/htdocs/langs/bn_BD/withdrawals.lang
@@ -76,7 +76,8 @@ WithdrawalFile=Withdrawal file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and will classify them as "Paid" if remain to pay is null
 StatisticsByLineStatus=Statistics by status of lines
-RUM=UMR
+RUM=Unique Mandate Reference (UMR)
+DateRUM=Mandate signature date
 RUMLong=Unique Mandate Reference
 RUMWillBeGenerated=If empty, a UMR (Unique Mandate Reference) will be generated once the bank account information is saved.
 WithdrawMode=Direct debit mode (FRST or RECUR)
diff --git a/htdocs/langs/bs_BA/accountancy.lang b/htdocs/langs/bs_BA/accountancy.lang
index bf7de1af534..ffe0857e269 100644
--- a/htdocs/langs/bs_BA/accountancy.lang
+++ b/htdocs/langs/bs_BA/accountancy.lang
@@ -265,7 +265,7 @@ AccountingJournals=Accounting journals
 AccountingJournal=Accounting journal
 NewAccountingJournal=New accounting journal
 ShowAccoutingJournal=Show accounting journal
-Nature=Nature
+NatureOfJournal=Nature of Journal
 AccountingJournalType1=Miscellaneous operations
 AccountingJournalType2=Sales
 AccountingJournalType3=Purchases
@@ -291,6 +291,7 @@ Modelcsv_quadratus=Export for Quadratus QuadraCompta
 Modelcsv_ebp=Export for EBP
 Modelcsv_cogilog=Export for Cogilog
 Modelcsv_agiris=Export for Agiris
+Modelcsv_LDCompta=Export for LD Compta (v9 & higher) (Test)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
@@ -301,7 +302,7 @@ ChartofaccountsId=Chart of accounts Id
 InitAccountancy=Init accountancy
 InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accounting account defined for sales and purchases.
 DefaultBindingDesc=This page can be used to set a default account to use to link transactions record about payment salaries, donation, taxes and vat when no specific accounting account were already set.
-DefaultClosureDesc=This page can be used to set parameters to use to enclose a balance sheet.
+DefaultClosureDesc=This page can be used to set parameters used for accounting closures.
 Options=Options
 OptionModeProductSell=Mode sales
 OptionModeProductSellIntra=Mode sales exported in EEC
diff --git a/htdocs/langs/bs_BA/admin.lang b/htdocs/langs/bs_BA/admin.lang
index a8fe248b017..3b1cbfdb1bc 100644
--- a/htdocs/langs/bs_BA/admin.lang
+++ b/htdocs/langs/bs_BA/admin.lang
@@ -574,7 +574,7 @@ Module510Name=Salaries
 Module510Desc=Record and track employee payments
 Module520Name=Loans
 Module520Desc=Management of loans
-Module600Name=Notifikacije
+Module600Name=Notifications on business event
 Module600Desc=Send email notifications triggered by a business event: per user (setup defined on each user), per third-party contacts (setup defined on each third party) or by specific emails
 Module600Long=Note that this module sends emails in real-time when a specific business event occurs. If you are looking for a feature to send email reminders for agenda events, go into the setup of module Agenda.
 Module610Name=Product Variants
@@ -1193,6 +1193,7 @@ ExtraFieldsSupplierOrders=Dopunske atributa (naloga)
 ExtraFieldsSupplierInvoices=Dopunski atributi (fakture)
 ExtraFieldsProject=Dopunski atributi (projekti)
 ExtraFieldsProjectTask=Dopunski atributi (zadaci)
+ExtraFieldsSalaries=Complementary attributes (salaries)
 ExtraFieldHasWrongValue=Attribute %s has a wrong value.
 AlphaNumOnlyLowerCharsAndNoSpace=only alphanumericals and lower case characters without space
 SendmailOptionNotComplete=Warning, on some Linux systems, to send email from your email, sendmail execution setup must contains option -ba (parameter mail.force_extra_parameters into your php.ini file). If some recipients never receive emails, try to edit this PHP parameter with mail.force_extra_parameters = -ba).
@@ -1220,13 +1221,14 @@ SuhosinSessionEncrypt=Session storage encrypted by Suhosin
 ConditionIsCurrently=Condition is currently %s
 YouUseBestDriver=You use driver %s which is the best driver currently available.
 YouDoNotUseBestDriver=You use driver %s but driver %s is recommended.
-NbOfProductIsLowerThanNoPb=You have only %s products/services in the database. This does not require any particular optimization.
+NbOfObjectIsLowerThanNoPb=You have only %s %s in the database. This does not require any particular optimization.
 SearchOptim=Optimizacija pretraživanja
-YouHaveXProductUseSearchOptim=You have %s products in the database. You should add the constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+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.
 BrowserIsOK=You are using the %s web browser. This browser is ok for security and performance.
 BrowserIsKO=You are using the %s web browser. This browser is known to be a bad choice for security, performance and reliability. We recommend using Firefox, Chrome, Opera or Safari.
-XDebugInstalled=XDebug is loaded.
-XCacheInstalled=XCache je učitan.
+PHPModuleLoaded=PHP component %s is loaded
+PreloadOPCode=Preloaded OPCode is used
 AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.<br>Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp".
 AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".
 AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties.
@@ -1734,9 +1736,9 @@ ExpenseReportsRulesSetup=Setup of module Expense Reports - Rules
 ExpenseReportNumberingModules=Expense reports numbering module
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
 YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for email notifications by enabling and configuring the module "Notification".
-ListOfNotificationsPerUser=List of notifications per user*
-ListOfNotificationsPerUserOrContact=List of notifications (events) available per user* or per contact**
-ListOfFixedNotifications=List of Fixed Notifications
+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
 GoOntoUserCardToAddMore=Go to the tab "Notifications" of a user to add or remove notifications for users
 GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
 Threshold=Threshold
@@ -1898,6 +1900,11 @@ OnMobileOnly=On small screen (smartphone) only
 DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be Prospect or Customer but can't be both)
 MAIN_OPTIMIZEFORTEXTBROWSER=Simplify interface for blind person
 MAIN_OPTIMIZEFORTEXTBROWSERDesc=Enable this option if you are a blind person, or if you use the application from a text browser like Lynx or 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
 ThisValueCanOverwrittenOnUserLevel=This value can be overwritten by each user from its user page - tab '%s'
 DefaultCustomerType=Default thirdparty type for "New customer" creation form
 ABankAccountMustBeDefinedOnPaymentModeSetup=Note: The bank account must be defined on the module of each payment mode (Paypal, Stripe, ...) to have this feature working.
@@ -1911,7 +1918,7 @@ LogsLinesNumber=Number of lines to show on logs tab
 UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
-DebugBarModuleActivated=Module debugbar is activated and slows dramaticaly the interface
+ModuleActivated=Module %s is activated and slows the interface
 EXPORTS_SHARE_MODELS=Export models are share with everybody
 ExportSetup=Setup of module Export
 InstanceUniqueID=Unique ID of the instance
@@ -1928,3 +1935,5 @@ 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
diff --git a/htdocs/langs/bs_BA/bills.lang b/htdocs/langs/bs_BA/bills.lang
index abe5086202e..54c351b94e9 100644
--- a/htdocs/langs/bs_BA/bills.lang
+++ b/htdocs/langs/bs_BA/bills.lang
@@ -95,6 +95,7 @@ PaymentHigherThanReminderToPay=Uplata viša od zaostalog duga
 HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess received for each overpaid invoice.
 HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess paid for each overpaid invoice.
 ClassifyPaid=Označi kao 'Plaćeno'
+ClassifyUnPaid=Classify 'Unpaid'
 ClassifyPaidPartially=Označi kao 'Djelimično plaćeno'
 ClassifyCanceled=Označi kao 'Otkazano'
 ClassifyClosed=Označi kao 'Zaključeno'
@@ -214,6 +215,20 @@ ShowInvoiceReplace=Prikaži zamjensku fakturu
 ShowInvoiceAvoir=Prikaži dobropis
 ShowInvoiceDeposit=Pokaži avansne fakture
 ShowInvoiceSituation=Show situation invoice
+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
 ShowPayment=Prikaži uplatu
 AlreadyPaid=Već plaćeno
 AlreadyPaidBack=Već izvršen povrat uplate
diff --git a/htdocs/langs/bs_BA/errors.lang b/htdocs/langs/bs_BA/errors.lang
index 2f1d689e63b..d4da3b43f7a 100644
--- a/htdocs/langs/bs_BA/errors.lang
+++ b/htdocs/langs/bs_BA/errors.lang
@@ -90,7 +90,7 @@ ErrorSpecialCharNotAllowedForField=Special characters are not allowed for field
 ErrorNumRefModel=A reference exists into database (%s) and is not compatible with this numbering rule. Remove record or renamed reference to activate this module.
 ErrorQtyTooLowForThisSupplier=Quantity too low for this vendor or no price defined on this product for this vendor
 ErrorOrdersNotCreatedQtyTooLow=Some orders haven't been created because of too-low quantities
-ErrorModuleSetupNotComplete=Setup of module looks to be uncomplete. Go on Home - Setup - Modules to complete.
+ErrorModuleSetupNotComplete=Setup of module %s looks to be uncomplete. Go on Home - Setup - Modules to complete.
 ErrorBadMask=Error on mask
 ErrorBadMaskFailedToLocatePosOfSequence=Error, mask without sequence number
 ErrorBadMaskBadRazMonth=Error, bad reset value
@@ -219,6 +219,7 @@ 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.
 # 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.
 WarningMandatorySetupNotComplete=Click here to setup mandatory parameters
 WarningEnableYourModulesApplications=Click here to enable your modules and applications
diff --git a/htdocs/langs/bs_BA/main.lang b/htdocs/langs/bs_BA/main.lang
index 668e4b3bc9f..33ca3105dea 100644
--- a/htdocs/langs/bs_BA/main.lang
+++ b/htdocs/langs/bs_BA/main.lang
@@ -445,6 +445,7 @@ ContactsAddressesForCompany=Kontakti/adrese za ovaj subjekt
 AddressesForCompany=Adrese za ovaj subjekt
 ActionsOnCompany=Events for this third party
 ActionsOnContact=Events for this contact/address
+ActionsOnContract=Events for this contract
 ActionsOnMember=Događaji o ovom članu
 ActionsOnProduct=Događaji o ovom proizvodu
 NActionsLate=%s kasne
@@ -759,6 +760,7 @@ LinkToSupplierProposal=Link to vendor proposal
 LinkToSupplierInvoice=Link to vendor invoice
 LinkToContract=Link ka kontaktima
 LinkToIntervention=Link ka intervencijama
+LinkToTicket=Link to ticket
 CreateDraft=Kreiraj nacrt
 SetToDraft=Nazad na nacrt
 ClickToEdit=Klikni za uređivanje
diff --git a/htdocs/langs/bs_BA/products.lang b/htdocs/langs/bs_BA/products.lang
index 552db428cf4..69668f08904 100644
--- a/htdocs/langs/bs_BA/products.lang
+++ b/htdocs/langs/bs_BA/products.lang
@@ -2,6 +2,7 @@
 ProductRef=Ref. proizvoda
 ProductLabel=Oznaka proizvoda
 ProductLabelTranslated=Prevedeni naslov proizvoda
+ProductDescription=Product description
 ProductDescriptionTranslated=Prevedeni opis proizvoda
 ProductNoteTranslated=Prevedena napomena proizvoda
 ProductServiceCard=Kartica proizvoda/usluge
diff --git a/htdocs/langs/bs_BA/stripe.lang b/htdocs/langs/bs_BA/stripe.lang
index 1ce18d76333..4cf01154660 100644
--- a/htdocs/langs/bs_BA/stripe.lang
+++ b/htdocs/langs/bs_BA/stripe.lang
@@ -65,3 +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>
diff --git a/htdocs/langs/bs_BA/withdrawals.lang b/htdocs/langs/bs_BA/withdrawals.lang
index 1d21628ded7..9ed0ddbf482 100644
--- a/htdocs/langs/bs_BA/withdrawals.lang
+++ b/htdocs/langs/bs_BA/withdrawals.lang
@@ -76,7 +76,8 @@ WithdrawalFile=Withdrawal file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and will classify them as "Paid" if remain to pay is null
 StatisticsByLineStatus=Statistics by status of lines
-RUM=UMR
+RUM=Unique Mandate Reference (UMR)
+DateRUM=Mandate signature date
 RUMLong=Unique Mandate Reference
 RUMWillBeGenerated=If empty, a UMR (Unique Mandate Reference) will be generated once the bank account information is saved.
 WithdrawMode=Direct debit mode (FRST or RECUR)
diff --git a/htdocs/langs/ca_ES/accountancy.lang b/htdocs/langs/ca_ES/accountancy.lang
index 951da450713..06ddc2b794d 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
-Nature=Caràcter
+NatureOfJournal=Nature of Journal
 AccountingJournalType1=Operacions diverses
 AccountingJournalType2=Vendes
 AccountingJournalType3=Compres
@@ -291,6 +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_openconcerto=Exporta per a OpenConcerto (Test)
 Modelcsv_configurable=Exporta CSV configurable
 Modelcsv_FEC=Exporta FEC
@@ -301,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=Aquesta pàgina es pot utilitzar per configurar els paràmetres que s'utilitzaran per incloure un balanç.
+DefaultClosureDesc=This page can be used to set parameters used for accounting closures.
 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 3c580544f54..ebaaccb4947 100644
--- a/htdocs/langs/ca_ES/admin.lang
+++ b/htdocs/langs/ca_ES/admin.lang
@@ -574,7 +574,7 @@ Module510Name=Salaris
 Module510Desc=Registre i seguiment del pagament dels salaris dels empleats
 Module520Name=Préstecs
 Module520Desc=Gestió de préstecs
-Module600Name=Notificacions
+Module600Name=Notifications on business event
 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,6 +1193,7 @@ ExtraFieldsSupplierOrders=Atributs complementaris (comandes)
 ExtraFieldsSupplierInvoices=Atributs complementaris (factures)
 ExtraFieldsProject=Atributs complementaris (projectes)
 ExtraFieldsProjectTask=Atributs complementaris (tasques)
+ExtraFieldsSalaries=Complementary attributes (salaries)
 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>.
@@ -1220,13 +1221,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.
-NbOfProductIsLowerThanNoPb=Només teniu %s productes / serveis a la base de dades. Això no requereix cap optimització en particular.
+NbOfObjectIsLowerThanNoPb=You have only %s %s in the database. This does not require any particular optimization.
 SearchOptim=Cerca optimització
-YouHaveXProductUseSearchOptim=Teniu productes %s a la base de dades. Heu d'afegir la constant PRODUCT_DONOTSEARCH_ANYHERE a 1 a la pàgina d'inici: Configuració-Un altre. Limiteu la cerca al començament de les cadenes que permeti que la base de dades utilitzi índexs i que obtingueu una resposta immediata.
+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.
 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.
-XDebugInstalled=XDebug està carregat.
-XCacheInstalled=XCache cau està carregat.
+PHPModuleLoaded=PHP component %s is loaded
+PreloadOPCode=Preloaded OPCode is used
 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.
@@ -1734,9 +1736,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=Llista de notificacions per usuari*
-ListOfNotificationsPerUserOrContact=Llista de notificacions (esdeveniments) disponibles per usuari * o per contacte **
-ListOfFixedNotifications=Llista de notificacions fixes
+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
 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
@@ -1898,6 +1900,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.
+Protanopia=Protanopia
+Deuteranopes=Deuteranopes
+Tritanopes=Tritanopes
 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ó.
@@ -1911,7 +1918,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ó
-DebugBarModuleActivated=Quan la barra de depuració del mòdul està activada frena molt la interfície
+ModuleActivated=Module %s is activated and slows the interface
 EXPORTS_SHARE_MODELS=Els models d’exportació es comparteixen amb tothom
 ExportSetup=Configuració del mòdul Export
 InstanceUniqueID=ID únic de la instància
@@ -1928,3 +1935,5 @@ 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
diff --git a/htdocs/langs/ca_ES/bills.lang b/htdocs/langs/ca_ES/bills.lang
index 21384e91364..3f4cf8efab3 100644
--- a/htdocs/langs/ca_ES/bills.lang
+++ b/htdocs/langs/ca_ES/bills.lang
@@ -95,6 +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'
 ClassifyPaidPartially=Classificar 'Pagat parcialment'
 ClassifyCanceled=Classificar 'Abandonat'
 ClassifyClosed=Classificar 'Tancat'
@@ -214,6 +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
 ShowPayment=Veure pagament
 AlreadyPaid=Ja pagat
 AlreadyPaidBack=Ja reemborsat
diff --git a/htdocs/langs/ca_ES/errors.lang b/htdocs/langs/ca_ES/errors.lang
index bbe1bd29076..51c3ff9926e 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=La configuració de mòduls sembla incompleta. Ves a Inici - Configuració - Mòduls a completar.
+ErrorModuleSetupNotComplete=Setup of module %s looks to be uncomplete. Go on Home - Setup - Modules to complete.
 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
@@ -219,6 +219,7 @@ 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.
 # 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=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 11b3567c2ae..d4c5c98696c 100644
--- a/htdocs/langs/ca_ES/main.lang
+++ b/htdocs/langs/ca_ES/main.lang
@@ -445,6 +445,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
 ActionsOnMember=Esdeveniments d'aquest soci
 ActionsOnProduct=Esdeveniments sobre aquest producte
 NActionsLate=%s en retard
@@ -759,6 +760,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
 CreateDraft=Crea esborrany
 SetToDraft=Tornar a redactar
 ClickToEdit=Clic per a editar
diff --git a/htdocs/langs/ca_ES/products.lang b/htdocs/langs/ca_ES/products.lang
index 4605e1a6df9..cbdf58c6729 100644
--- a/htdocs/langs/ca_ES/products.lang
+++ b/htdocs/langs/ca_ES/products.lang
@@ -2,6 +2,7 @@
 ProductRef=Ref. producte
 ProductLabel=Etiqueta producte
 ProductLabelTranslated=Etiqueta de producte traduïda
+ProductDescription=Product description
 ProductDescriptionTranslated=Descripció de producte traduïda
 ProductNoteTranslated=Nota de producte traduïda
 ProductServiceCard=Fitxa producte/servei
diff --git a/htdocs/langs/ca_ES/stripe.lang b/htdocs/langs/ca_ES/stripe.lang
index 044768eb87c..1592435e8e5 100644
--- a/htdocs/langs/ca_ES/stripe.lang
+++ b/htdocs/langs/ca_ES/stripe.lang
@@ -65,3 +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>
diff --git a/htdocs/langs/ca_ES/withdrawals.lang b/htdocs/langs/ca_ES/withdrawals.lang
index ecf3b20eeff..42a67f6c4ab 100644
--- a/htdocs/langs/ca_ES/withdrawals.lang
+++ b/htdocs/langs/ca_ES/withdrawals.lang
@@ -76,7 +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=UMR
+RUM=Unique Mandate Reference (UMR)
+DateRUM=Mandate signature date
 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/accountancy.lang b/htdocs/langs/cs_CZ/accountancy.lang
index 2291178ee74..8df9d50c2c7 100644
--- a/htdocs/langs/cs_CZ/accountancy.lang
+++ b/htdocs/langs/cs_CZ/accountancy.lang
@@ -265,7 +265,7 @@ AccountingJournals=účetní deníky
 AccountingJournal=Účetní deník
 NewAccountingJournal=Nový účetní deník
 ShowAccoutingJournal=Zobrazit účetní deník
-Nature=Příroda
+NatureOfJournal=Nature of Journal
 AccountingJournalType1=Různé operace
 AccountingJournalType2=Odbyt
 AccountingJournalType3=Nákupy
@@ -291,6 +291,7 @@ Modelcsv_quadratus=Export pro Quadratus QuadraCompta
 Modelcsv_ebp=Export pro EBP
 Modelcsv_cogilog=Export pro Cogilog
 Modelcsv_agiris=Export pro Agiris
+Modelcsv_LDCompta=Export for LD Compta (v9 & higher) (Test)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV konfigurovatelný
 Modelcsv_FEC=Export FEC
@@ -301,7 +302,7 @@ ChartofaccountsId=Schéma Id účtů
 InitAccountancy=Init účetnictví
 InitAccountancyDesc=Tato stránka může být použita k inicializaci účetnictví u produktů a služeb, které nemají účetní účet definovaný pro prodej a nákup.
 DefaultBindingDesc=Tato stránka může být použita k nastavení výchozího účtu, který bude použit pro propojení záznamů o platbách, darování, daních a DPH, pokud již nebyl stanoven žádný účet.
-DefaultClosureDesc=Tato stránka může být použita pro nastavení parametrů, které se mají použít k uzavření rozvahy.
+DefaultClosureDesc=This page can be used to set parameters used for accounting closures.
 Options=možnosti
 OptionModeProductSell=prodejní režim
 OptionModeProductSellIntra=Režim prodeje vyváženého v EHS
diff --git a/htdocs/langs/cs_CZ/admin.lang b/htdocs/langs/cs_CZ/admin.lang
index 57c17f66bca..f9d993354d7 100644
--- a/htdocs/langs/cs_CZ/admin.lang
+++ b/htdocs/langs/cs_CZ/admin.lang
@@ -574,7 +574,7 @@ Module510Name=Platy
 Module510Desc=Zaznamenejte a sledujte platby zaměstnanců
 Module520Name=Úvěry
 Module520Desc=Správa úvěrů
-Module600Name=Upozornění
+Module600Name=Notifications on business event
 Module600Desc=Odeslání e-mailových upozornění vyvolaných podnikovou událostí: na uživatele (nastavení definované pro každého uživatele), na kontakty třetích stran (nastavení definováno na každé třetí straně) nebo na konkrétní e-maily
 Module600Long=Všimněte si, že tento modul pošle e-maily v reálném čase, když nastane konkrétní událost. Pokud hledáte funkci pro zasílání upozornění na události agend, přejděte do nastavení modulu Agenda.
 Module610Name=Varianty produktu
@@ -1193,6 +1193,7 @@ ExtraFieldsSupplierOrders=Doplňkové atributy (objednávky)
 ExtraFieldsSupplierInvoices=Doplňkové atributy (faktury)
 ExtraFieldsProject=Doplňkové atributy (projekty)
 ExtraFieldsProjectTask=Doplňkové atributy (úkoly)
+ExtraFieldsSalaries=Complementary attributes (salaries)
 ExtraFieldHasWrongValue=Atribut %s má nesprávnou hodnotu.
 AlphaNumOnlyLowerCharsAndNoSpace=pouze alfanumerické znaky s malými písmeny bez mezer
 SendmailOptionNotComplete=Upozornění, že v některých systémech Linux můžete odesílat e-maily z vašeho e-mailu, nastavení spuštění sendmail musí obsahovat volbu -ba (parametr mail.force_extra_parameters do souboru php.ini). Pokud někteří příjemci nikdy neobdrží e-maily, zkuste upravit tento parametr PHP mail.force_extra_parameters = -ba).
@@ -1220,13 +1221,14 @@ SuhosinSessionEncrypt=Session storage šifrované Suhosinem
 ConditionIsCurrently=Podmínkou je v současné době %s
 YouUseBestDriver=Používáte ovladač %s, který je v současné době nejlepší ovladač.
 YouDoNotUseBestDriver=Používáte ovladač %s, ale doporučuje se ovladač %s.
-NbOfProductIsLowerThanNoPb=V databázi máte pouze produkty / služby %s. To nevyžaduje žádnou konkrétní optimalizaci.
+NbOfObjectIsLowerThanNoPb=You have only %s %s in the database. This does not require any particular optimization.
 SearchOptim=Optimalizace pro vyhledávače
-YouHaveXProductUseSearchOptim=V databázi máte produkty %s. Měli byste přidat konstantní PRODUCT_DONOTSEARCH_ANYWHERE na 1 v Home-Setup-Other. Omezit vyhledávání na začátek řetězce, což umožňuje, aby databáze používala indexy a měli byste okamžitě reagovat.
+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.
 BrowserIsOK=Používáte webový prohlížeč %s. Tento prohlížeč je v pořádku pro zabezpečení a výkon.
 BrowserIsKO=Používáte webový prohlížeč %s. Tento prohlížeč je znám jako špatná volba pro zabezpečení, výkon a spolehlivost. Doporučujeme používat prohlížeče Firefox, Chrome, Opera nebo Safari.
-XDebugInstalled=Xdebug je načten.
-XCacheInstalled=XCache načten.
+PHPModuleLoaded=PHP component %s is loaded
+PreloadOPCode=Preloaded OPCode is used
 AddRefInList=Zobrazit číslo zákazníka / dodavatele seznam informací (vyberte seznam nebo kombinace) a většinu hypertextových odkazů. <br> Zobrazí se třetí strany s názvem formátu "CC12345 - SC45678 - The Big Company corp". místo "The Big Company corp".
 AddAdressInList=Zobrazte seznam informací o adresách zákazníků / prodejců (vyberte seznam nebo kombinace) <br> Subjekty se objeví ve formátu "Big Company Corp. - 21 skokové ulici 123456 Big City - USA" namísto "The Big Company corp".
 AskForPreferredShippingMethod=Požádejte o preferovanou způsob přepravy pro subjekty.
@@ -1734,9 +1736,9 @@ ExpenseReportsRulesSetup=Nastavení výkazu výdajů modulu - pravidla
 ExpenseReportNumberingModules=Způsob číslování výkazů výdajů
 NoModueToManageStockIncrease=Nebyl aktivován žádný modul schopný zvládnout automatické zvýšení zásob. Zvýšení zásob bude provedeno pouze při ručním zadávání.
 YouMayFindNotificationsFeaturesIntoModuleNotification=Možnosti upozornění na e-mail můžete najít povolením a konfigurací modulu "Oznámení".
-ListOfNotificationsPerUser=Seznam oznámení na uživatele *
-ListOfNotificationsPerUserOrContact=Seznam oznámení (událostí) dostupných na uživatele * nebo na kontakt **
-ListOfFixedNotifications=Seznam pevných oznámení
+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
 GoOntoUserCardToAddMore=Přejděte na kartu "Oznámení" uživatele, chcete-li přidat nebo odstranit oznámení pro uživatele
 GoOntoContactCardToAddMore=Přejděte na kartu "Oznámení" subjektu, chcete-li přidat nebo odstranit oznámení kontaktů / adres
 Threshold=Práh
@@ -1898,6 +1900,11 @@ OnMobileOnly=Pouze na malé obrazovce (smartphone)
 DisableProspectCustomerType=Zakázat typ subjektu "Prospekt + zákazník" (takže subjekt musí být prospekt nebo zákazník, ale nemůže být oběma)
 MAIN_OPTIMIZEFORTEXTBROWSER=Zjednodušte rozhraní pro nevidomé
 MAIN_OPTIMIZEFORTEXTBROWSERDesc=Povolte tuto možnost, pokud jste osoba slepá, nebo pokud používáte aplikaci z textového prohlížeče, jako je Lynx nebo 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
 ThisValueCanOverwrittenOnUserLevel=Tuto hodnotu může každý uživatel přepsat z jeho uživatelské stránky - záložka '%s'
 DefaultCustomerType=Výchozí typ subjektu pro formulář pro vytvoření nového zákazníka
 ABankAccountMustBeDefinedOnPaymentModeSetup=Poznámka: Bankovní účet musí být definován v modulu každého platebního režimu (Paypal, Stripe, ...), aby tato funkce fungovala.
@@ -1911,7 +1918,7 @@ LogsLinesNumber=Počet řádků, které se mají zobrazit na kartě Protokoly
 UseDebugBar=Použijte ladicí lištu
 DEBUGBAR_LOGS_LINES_NUMBER=Počet posledních řádků protokolu, které se mají uchovávat v konzole
 WarningValueHigherSlowsDramaticalyOutput=Varování, vyšší hodnoty dramaticky zpomalují výstup
-DebugBarModuleActivated=Modul debugbar je aktivován a dramaticky zpomaluje rozhraní
+ModuleActivated=Module %s is activated and slows the interface
 EXPORTS_SHARE_MODELS=Exportní modely jsou sdílené s každým
 ExportSetup=Nastavení modulu Export
 InstanceUniqueID=Jedinečné ID instance
@@ -1928,3 +1935,5 @@ 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
diff --git a/htdocs/langs/cs_CZ/bills.lang b/htdocs/langs/cs_CZ/bills.lang
index bea8b4b960a..a490990bb94 100644
--- a/htdocs/langs/cs_CZ/bills.lang
+++ b/htdocs/langs/cs_CZ/bills.lang
@@ -95,6 +95,7 @@ PaymentHigherThanReminderToPay=Platba vyšší než upomínka k zaplacení
 HelpPaymentHigherThanReminderToPay=Pozor, částka platby jedné nebo více účtů je vyšší než neuhrazená částka. <br> Upravte svůj záznam, jinak potvrďte a zvážíte vytvoření poznámky o přebytku, který jste dostali za každou přeplatku faktury.
 HelpPaymentHigherThanReminderToPaySupplier=Pozor, částka platby jedné nebo více účtů je vyšší než neuhrazená částka. <br> Upravte svůj záznam, jinak potvrďte a zvážíte vytvoření poznámky o přeplatku za každou přeplatkovou fakturu.
 ClassifyPaid=Klasifikace 'Zaplaceno'
+ClassifyUnPaid=Classify 'Unpaid'
 ClassifyPaidPartially=Klasifikace 'Částečně uhrazeno'
 ClassifyCanceled=Klasifikace 'Opuštěné'
 ClassifyClosed=Klasifikace 'Uzavřeno'
@@ -214,6 +215,20 @@ ShowInvoiceReplace=Zobrazit opravenou fakturu
 ShowInvoiceAvoir=Zobrazit dobropis
 ShowInvoiceDeposit=Zobrazit zálohovou fakturu
 ShowInvoiceSituation=Zobrazit fakturu situace
+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
 ShowPayment=Zobrazit platbu
 AlreadyPaid=Již zaplacené
 AlreadyPaidBack=Již vrácené platby
diff --git a/htdocs/langs/cs_CZ/errors.lang b/htdocs/langs/cs_CZ/errors.lang
index 881d0385adf..bf4f3a14b1c 100644
--- a/htdocs/langs/cs_CZ/errors.lang
+++ b/htdocs/langs/cs_CZ/errors.lang
@@ -90,7 +90,7 @@ ErrorSpecialCharNotAllowedForField=Speciální znaky nejsou povoleny pro pole "%
 ErrorNumRefModel=Odkaz obsahuje databázi (%s) a není kompatibilní s tímto pravidlem číslování. Chcete-li tento modul aktivovat, odstraňte záznam nebo přejmenujte odkaz.
 ErrorQtyTooLowForThisSupplier=Množství příliš nízké pro tohoto prodejce nebo není  definovaná cena u tohoto produktu pro tohoto prodejce
 ErrorOrdersNotCreatedQtyTooLow=Některé objednávky nebyly vytvořeny z příliš malých množství
-ErrorModuleSetupNotComplete=Nastavení modulu vypadá jako neúplné. Pokračujte domů - Nastavení - Dokončit moduly.
+ErrorModuleSetupNotComplete=Setup of module %s looks to be uncomplete. Go on Home - Setup - Modules to complete.
 ErrorBadMask=Chyba na masce
 ErrorBadMaskFailedToLocatePosOfSequence=Chyba, maska bez pořadového čísla
 ErrorBadMaskBadRazMonth=Chyba, špatná hodnota po resetu
@@ -219,6 +219,7 @@ 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.
 # 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.
 WarningMandatorySetupNotComplete=Klikněte zde pro nastavení povinných parametrů
 WarningEnableYourModulesApplications=Kliknutím zde povolíte moduly a aplikace
diff --git a/htdocs/langs/cs_CZ/main.lang b/htdocs/langs/cs_CZ/main.lang
index a843f00cee0..680091e5929 100644
--- a/htdocs/langs/cs_CZ/main.lang
+++ b/htdocs/langs/cs_CZ/main.lang
@@ -445,6 +445,7 @@ ContactsAddressesForCompany=Kontakty/adresy pro tento subjekt
 AddressesForCompany=Adresy pro tento subjekt
 ActionsOnCompany=Události pro tento subjekt
 ActionsOnContact=Události pro tento kontakt / adresu
+ActionsOnContract=Events for this contract
 ActionsOnMember=Akce u tohoto uživatele
 ActionsOnProduct=Události týkající se tohoto produktu
 NActionsLate=%s pozdě
@@ -759,6 +760,7 @@ LinkToSupplierProposal=Odkaz na návrh dodavatele
 LinkToSupplierInvoice=Odkaz na fakturu dodavatele
 LinkToContract=Odkaz na smlouvu
 LinkToIntervention=Odkaz na intervenci
+LinkToTicket=Link to ticket
 CreateDraft=Vytvořte návrh
 SetToDraft=Zrušit návrh
 ClickToEdit=Klepnutím lze upravit
diff --git a/htdocs/langs/cs_CZ/products.lang b/htdocs/langs/cs_CZ/products.lang
index c5e9bdbb5ec..db9f2e44105 100644
--- a/htdocs/langs/cs_CZ/products.lang
+++ b/htdocs/langs/cs_CZ/products.lang
@@ -2,6 +2,7 @@
 ProductRef=Produkt čj.
 ProductLabel=Štítek produktu
 ProductLabelTranslated=Přeložený štítek produktu
+ProductDescription=Product description
 ProductDescriptionTranslated=Přeložený popis produktu
 ProductNoteTranslated=Přeložená poznámka k produktu
 ProductServiceCard=Karta produktů/služeb
diff --git a/htdocs/langs/cs_CZ/stripe.lang b/htdocs/langs/cs_CZ/stripe.lang
index a51be24d80a..845b77bb4ff 100644
--- a/htdocs/langs/cs_CZ/stripe.lang
+++ b/htdocs/langs/cs_CZ/stripe.lang
@@ -65,3 +65,5 @@ StripeUserAccountForActions=Uživatelský účet, který se má používat pro e
 StripePayoutList=Seznam páskových výplat
 ToOfferALinkForTestWebhook=Odkaz na nastavení Stripe WebHook pro volání IPN (testovací režim)
 ToOfferALinkForLiveWebhook=Odkaz na nastavení Stripe WebHook pro volání IPN (provozní režim)
+PaymentWillBeRecordedForNextPeriod=Payment will be recorded for the next period.
+ClickHereToTryAgain=<a href="%s">Click here to try again...</a>
diff --git a/htdocs/langs/cs_CZ/withdrawals.lang b/htdocs/langs/cs_CZ/withdrawals.lang
index ba1a151d65d..27a7297267c 100644
--- a/htdocs/langs/cs_CZ/withdrawals.lang
+++ b/htdocs/langs/cs_CZ/withdrawals.lang
@@ -76,7 +76,8 @@ WithdrawalFile=Soubor výběru
 SetToStatusSent=Nastavte na stav "Odeslaný soubor"
 ThisWillAlsoAddPaymentOnInvoice=Také budou zaznamenány platby na faktury a budou klasifikovány jako "Placené", pokud zůstane platit, je nulová
 StatisticsByLineStatus=Statistika podle stavu řádků
-RUM=UMR
+RUM=Unique Mandate Reference (UMR)
+DateRUM=Mandate signature date
 RUMLong=Unikátní Mandát Referenční
 RUMWillBeGenerated=Pokud je prázdná, po uložení informací o bankovním účtu se vytvoří UMR (jedinečný mandátový odkaz).
 WithdrawMode=Režim přímé inkaso (FRST nebo opakovat)
diff --git a/htdocs/langs/da_DK/accountancy.lang b/htdocs/langs/da_DK/accountancy.lang
index 3910fb365b7..119531589d3 100644
--- a/htdocs/langs/da_DK/accountancy.lang
+++ b/htdocs/langs/da_DK/accountancy.lang
@@ -265,7 +265,7 @@ AccountingJournals=Kontokladder
 AccountingJournal=Kontokladde
 NewAccountingJournal=Ny kontokladde
 ShowAccoutingJournal=Vis kontokladde
-Nature=Natur
+NatureOfJournal=Nature of Journal
 AccountingJournalType1=Diverse operationer
 AccountingJournalType2=Salg
 AccountingJournalType3=Køb
@@ -291,6 +291,7 @@ Modelcsv_quadratus=Export for Quadratus QuadraCompta
 Modelcsv_ebp=Export for EBP
 Modelcsv_cogilog=Export for Cogilog
 Modelcsv_agiris=Export for Agiris
+Modelcsv_LDCompta=Export for LD Compta (v9 & higher) (Test)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Eksporter CSV Konfigurerbar
 Modelcsv_FEC=Export FEC
@@ -301,7 +302,7 @@ ChartofaccountsId=ID for kontoplan
 InitAccountancy=Start regnskab
 InitAccountancyDesc=Denne side kan bruges til at initialisere en regnskabskonto for varer og ydelser, der ikke har en regnskabskonto defineret til salg og indkøb.
 DefaultBindingDesc=Denne side kan bruges til at angive en standardkonto, der skal bruges til at forbinde transaktionsoversigt over betaling af lønninger, donationer, afgifter og moms, når der ikke allerede er tilknyttet regnskabskonto.
-DefaultClosureDesc=This page can be used to set parameters to use to enclose a balance sheet.
+DefaultClosureDesc=This page can be used to set parameters used for accounting closures.
 Options=Indstillinger
 OptionModeProductSell=Salg
 OptionModeProductSellIntra=Mode sales exported in EEC
diff --git a/htdocs/langs/da_DK/admin.lang b/htdocs/langs/da_DK/admin.lang
index 198a40edff8..5b877d21222 100644
--- a/htdocs/langs/da_DK/admin.lang
+++ b/htdocs/langs/da_DK/admin.lang
@@ -574,7 +574,7 @@ Module510Name=Løn
 Module510Desc=Optag og spørg medarbejderbetalinger
 Module520Name=Loans
 Module520Desc=Forvaltning af lån
-Module600Name=Adviséringer
+Module600Name=Notifications on business event
 Module600Desc=Send e-mail-meddelelser udløst af en forretningsbegivenhed: pr. Bruger (opsætning defineret på hver bruger), pr. Tredjepartskontakter (opsætning defineret på hver tredjepart) eller ved specifikke e-mails
 Module600Long=Bemærk, at dette modul sender e-mails i realtid, når en bestemt forretningsbegivenhed opstår. Hvis du leder efter en funktion til at sende e-mail påmindelser til dagsordensbegivenheder, skal du gå ind i opsætningen af modulets dagsorden.
 Module610Name=Produkt Varianter
@@ -1193,6 +1193,7 @@ ExtraFieldsSupplierOrders=Supplerende attributter (ordrer)
 ExtraFieldsSupplierInvoices=Supplerende attributter (fakturaer)
 ExtraFieldsProject=Supplerende attributter (projekter)
 ExtraFieldsProjectTask=Supplerende attributter (opgaver)
+ExtraFieldsSalaries=Complementary attributes (salaries)
 ExtraFieldHasWrongValue=Attribut %s har en forkert værdi.
 AlphaNumOnlyLowerCharsAndNoSpace=kun alfanumeriske og små bogstaver uden plads
 SendmailOptionNotComplete=Advarsel til anvendere af sendmail i Linux-system: Hvis nogle modtagere aldrig modtager e-mails, skal du prøve at redigere denne PHP-parameter med mail.force_extra_parameters = -ba i din php.ini-fil.
@@ -1220,13 +1221,14 @@ SuhosinSessionEncrypt=Sessionsopbevaring krypteret af Suhosin
 ConditionIsCurrently=Tilstanden er i øjeblikket %s
 YouUseBestDriver=Du bruger driver %s, som er den bedste driver, der for øjeblikket er tilgængelig.
 YouDoNotUseBestDriver=Du bruger driveren %s, men driveren %s anbefales.
-NbOfProductIsLowerThanNoPb=Du har kun %s produkter / tjenester i databasen. Dette kræver ikke nogen særlig optimering.
+NbOfObjectIsLowerThanNoPb=You have only %s %s in the database. This does not require any particular optimization.
 SearchOptim=Søg optimering
-YouHaveXProductUseSearchOptim=Du har %s produkter i databasen. Du skal tilføje den konstante PRODUCT_DONOTSEARCH_ANYWHERE til 1 i Home-Setup-Other. Begræns søgningen til begyndelsen af ​​strenge, der gør det muligt for databasen at bruge indekser, og du bør få et øjeblikkeligt svar.
+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.
 BrowserIsOK=Du bruger browseren %s. Denne browser er ok for sikkerhed og ydeevne.
 BrowserIsKO=Du bruger browseren %s. Denne browser er kendt for at være et dårligt valg for sikkerhed, ydeevne og pålidelighed. Vi anbefaler at bruge Firefox, Chrome, Opera eller Safari.
-XDebugInstalled=XDebug er indlæst.
-XCacheInstalled=XCache er indlæst.
+PHPModuleLoaded=PHP component %s is loaded
+PreloadOPCode=Preloaded OPCode is used
 AddRefInList=Vis kunde / sælger ref. info liste (vælg liste eller combobox) og det meste af hyperlink. <br> Tredjeparter vil blive vist med et navneformat af "CC12345 - SC45678 - The Big Company corp." i stedet for "The Big Company Corp".
 AddAdressInList=Vis kunde / leverandør adresse info liste (vælg liste eller combobox) <br> Tredjeparter vil blive vist med et navneformat af "The Big Company Corp. - 21 Jump Street 123456 Big Town - USA" i stedet for "The Big Company Corp".
 AskForPreferredShippingMethod=Anmod om en foretrukket forsendelsesmetode for tredjeparter.
@@ -1734,9 +1736,9 @@ ExpenseReportsRulesSetup=Opsætning af modul Expense Reports - Regler
 ExpenseReportNumberingModules=Udgiftsrapporter nummereringsmodul
 NoModueToManageStockIncrease=Intet modul, der er i stand til at styre automatisk lagerforhøjelse, er blevet aktiveret. Lagerforøgelse vil kun ske ved manuel indlæsning.
 YouMayFindNotificationsFeaturesIntoModuleNotification=Du kan finde muligheder for e-mail-meddelelser ved at aktivere og konfigurere modulet "Meddelelse".
-ListOfNotificationsPerUser=Liste over meddelelser pr. Bruger *
-ListOfNotificationsPerUserOrContact=Liste over anmeldelser (begivenheder) tilgængelige pr. Bruger * eller pr. Kontakt **
-ListOfFixedNotifications=Liste over faste meddelelser
+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
 GoOntoUserCardToAddMore=Gå til fanen "Notifikationer" for en bruger for at tilføje eller fjerne underretninger for brugere
 GoOntoContactCardToAddMore=Gå på fanen "Notifikationer" fra en tredjepart for at tilføje eller fjerne meddelelser for kontakter / adresser
 Threshold=Grænseværdi
@@ -1898,6 +1900,11 @@ OnMobileOnly=Kun på lille skærm (smartphone)
 DisableProspectCustomerType=Deaktiver "Emner + Kunder" tredjeparts type (så tredjepart skal være Emner eller Kunder, men kan ikke begge)
 MAIN_OPTIMIZEFORTEXTBROWSER=Forenkle brugergrænsefladen til blindperson
 MAIN_OPTIMIZEFORTEXTBROWSERDesc=Aktivér denne indstilling, hvis du er blind person, eller hvis du bruger programmet fra en tekstbrowser som Lynx eller 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
 ThisValueCanOverwrittenOnUserLevel=Denne værdi kan overskrives af hver bruger fra sin brugerside - fanebladet '%s'
 DefaultCustomerType=Standard tredjepartstype til "Ny kunde" oprettelsesformular
 ABankAccountMustBeDefinedOnPaymentModeSetup=Note: The bank account must be defined on the module of each payment mode (Paypal, Stripe, ...) to have this feature working.
@@ -1911,7 +1918,7 @@ LogsLinesNumber=Number of lines to show on logs tab
 UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
-DebugBarModuleActivated=Module debugbar is activated and slows dramaticaly the interface
+ModuleActivated=Module %s is activated and slows the interface
 EXPORTS_SHARE_MODELS=Export models are share with everybody
 ExportSetup=Setup of module Export
 InstanceUniqueID=Unique ID of the instance
@@ -1928,3 +1935,5 @@ 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
diff --git a/htdocs/langs/da_DK/bills.lang b/htdocs/langs/da_DK/bills.lang
index 999c8ee1115..bc5af21cc67 100644
--- a/htdocs/langs/da_DK/bills.lang
+++ b/htdocs/langs/da_DK/bills.lang
@@ -95,6 +95,7 @@ PaymentHigherThanReminderToPay=Betaling højere end betalingspåmindelse
 HelpPaymentHigherThanReminderToPay=Vær opmærksom på, at betalingsbeløbet på en eller flere regninger er højere end det udestående beløb, der skal betales. <br> Rediger din post, ellers bekræft og overvej at oprette en kreditnote for det overskydende beløb, der er modtaget for hver overbetalt faktura.
 HelpPaymentHigherThanReminderToPaySupplier=Vær opmærksom på, at betalingsbeløbet på en eller flere regninger er højere end det udestående beløb, der skal betales. <br> Rediger din post, ellers bekræft og overvej at oprette en kreditnota for det overskydende beløb, der betales for hver overbetalt faktura.
 ClassifyPaid=Klassificer som "Betalt"
+ClassifyUnPaid=Classify 'Unpaid'
 ClassifyPaidPartially=Klassificer som "Delvist betalt"
 ClassifyCanceled=Klassificer som "Tabt"
 ClassifyClosed=Klassificer som "Lukket"
@@ -214,6 +215,20 @@ ShowInvoiceReplace=Vis erstatning faktura
 ShowInvoiceAvoir=Vis kreditnota
 ShowInvoiceDeposit=Vis udbetalt faktura
 ShowInvoiceSituation=Vis faktura status
+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
 ShowPayment=Vis betaling
 AlreadyPaid=Allerede betalt
 AlreadyPaidBack=Allerede tilbage betalt
diff --git a/htdocs/langs/da_DK/errors.lang b/htdocs/langs/da_DK/errors.lang
index 7e5554c1f5b..957b70c5233 100644
--- a/htdocs/langs/da_DK/errors.lang
+++ b/htdocs/langs/da_DK/errors.lang
@@ -90,7 +90,7 @@ ErrorSpecialCharNotAllowedForField=Specialtegn er ikke tilladt for feltet "%s"
 ErrorNumRefModel=En henvisning findes i databasen (%s) og er ikke kompatible med denne nummerering regel. Fjern optage eller omdøbt henvisning til aktivere dette modul.
 ErrorQtyTooLowForThisSupplier=Quantity too low for this vendor or no price defined on this product for this vendor
 ErrorOrdersNotCreatedQtyTooLow=Some orders haven't been created because of too-low quantities
-ErrorModuleSetupNotComplete=Opsætning af modul ser ud til at være ufuldstændigt. Gå på Home - Setup - Moduler, der skal udfyldes.
+ErrorModuleSetupNotComplete=Setup of module %s looks to be uncomplete. Go on Home - Setup - Modules to complete.
 ErrorBadMask=Fejl på maske
 ErrorBadMaskFailedToLocatePosOfSequence=Fejl, maske uden loebenummeret
 ErrorBadMaskBadRazMonth=Fejl, dårlig reset værdi
@@ -219,6 +219,7 @@ 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.
 # 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.
 WarningMandatorySetupNotComplete=Click here to setup mandatory parameters
 WarningEnableYourModulesApplications=Click here to enable your modules and applications
diff --git a/htdocs/langs/da_DK/main.lang b/htdocs/langs/da_DK/main.lang
index 7ab0a384cb0..b3eaeb11178 100644
--- a/htdocs/langs/da_DK/main.lang
+++ b/htdocs/langs/da_DK/main.lang
@@ -445,6 +445,7 @@ ContactsAddressesForCompany=Kontakter/adresser for denne tredjepart
 AddressesForCompany=Adresse for denne tredjepart
 ActionsOnCompany=Events for this third party
 ActionsOnContact=Events for this contact/address
+ActionsOnContract=Events for this contract
 ActionsOnMember=Begivenheder for denne medlem
 ActionsOnProduct=Begivenheder omkring dette produkt
 NActionsLate=%s sent
@@ -759,6 +760,7 @@ LinkToSupplierProposal=Link to vendor proposal
 LinkToSupplierInvoice=Link to vendor invoice
 LinkToContract=Link til kontrakt
 LinkToIntervention=Link til intervention
+LinkToTicket=Link to ticket
 CreateDraft=Opret udkast
 SetToDraft=Tilbage til udkast
 ClickToEdit=Klik for at redigere
diff --git a/htdocs/langs/da_DK/products.lang b/htdocs/langs/da_DK/products.lang
index 1cf45888f60..6f9f8386b6e 100644
--- a/htdocs/langs/da_DK/products.lang
+++ b/htdocs/langs/da_DK/products.lang
@@ -2,6 +2,7 @@
 ProductRef=Produkt ref.
 ProductLabel=Produktmærke
 ProductLabelTranslated=Oversat produktmærke
+ProductDescription=Product description
 ProductDescriptionTranslated=Oversat produktbeskrivelse
 ProductNoteTranslated=Oversat produkt notat
 ProductServiceCard=Produkter / Tjenester kortet
diff --git a/htdocs/langs/da_DK/stripe.lang b/htdocs/langs/da_DK/stripe.lang
index 97a9225e981..28e1d39010e 100644
--- a/htdocs/langs/da_DK/stripe.lang
+++ b/htdocs/langs/da_DK/stripe.lang
@@ -65,3 +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>
diff --git a/htdocs/langs/da_DK/withdrawals.lang b/htdocs/langs/da_DK/withdrawals.lang
index ca6c79297aa..70e22a72d5e 100644
--- a/htdocs/langs/da_DK/withdrawals.lang
+++ b/htdocs/langs/da_DK/withdrawals.lang
@@ -76,7 +76,8 @@ WithdrawalFile=Udtagelsesfil
 SetToStatusSent=Sæt til status "Fil sendt"
 ThisWillAlsoAddPaymentOnInvoice=Dette registrerer også betalinger til fakturaer og klassificerer dem som "Betalt", hvis der fortsat skal betales, er null
 StatisticsByLineStatus=Statistikker efter status af linjer
-RUM=UMR
+RUM=Unique Mandate Reference (UMR)
+DateRUM=Mandate signature date
 RUMLong=Unik Mandat Reference
 RUMWillBeGenerated=If empty, a UMR (Unique Mandate Reference) will be generated once the bank account information is saved.
 WithdrawMode=Direkte debiteringstilstand (FRST eller RECUR)
diff --git a/htdocs/langs/de_AT/admin.lang b/htdocs/langs/de_AT/admin.lang
index 3b52ead1173..abe6c755eaf 100644
--- a/htdocs/langs/de_AT/admin.lang
+++ b/htdocs/langs/de_AT/admin.lang
@@ -93,6 +93,5 @@ FreeLegalTextOnInterventions=Freier Rechtstext für Eingriffe
 WatermarkOnDraftInterventionCards=Wasserzeichen auf Intervention Karte Dokumente (alle, wenn leer)
 ClickToDialSetup=Click-to-Dial-Moduleinstellungen
 PathToGeoIPMaxmindCountryDataFile=Pfad zur Datei mit Maxmind IP to Country Übersetzung. <br> Beispiel: / usr / local / share / GeoIP / GeoIP.dat
-ListOfFixedNotifications=List of Fixed Notifications
 MailToSendShipment=Sendungen
 MailToSendIntervention=Eingriffe
diff --git a/htdocs/langs/de_AT/withdrawals.lang b/htdocs/langs/de_AT/withdrawals.lang
index 9f6b518c6e9..1e452c7a2bd 100644
--- a/htdocs/langs/de_AT/withdrawals.lang
+++ b/htdocs/langs/de_AT/withdrawals.lang
@@ -3,6 +3,5 @@ WithdrawalRefused=Abbuchungen abgelehnt
 InvoiceRefused=Ablehnung in Rechnung stellen
 StatusWaiting=Wartestellung
 StatusMotif2=Abbuchung angefochten
-StatusMotif4=Ablehnung durch Kontoinhaber
 StatusMotif5=Fehlerhafte Kontodaten
 OrderWaiting=Wartestellung
diff --git a/htdocs/langs/de_CH/accountancy.lang b/htdocs/langs/de_CH/accountancy.lang
index 7594842ccf6..d5c777f58e2 100644
--- a/htdocs/langs/de_CH/accountancy.lang
+++ b/htdocs/langs/de_CH/accountancy.lang
@@ -155,7 +155,7 @@ ByAccounts=Nach Konto
 ByPredefinedAccountGroups=Nach Gruppe
 ByPersonalizedAccountGroups=Nach eigenen Gruppen
 NotMatch=Nicht hinterlegt
-DeleteMvt=Lösche Darlehenspositionen
+DeleteMvt=Hauptbucheinträge löschen
 DelYear=Zu löschendes Jahr
 DelJournal=Zu löschendes Journal
 ConfirmDeleteMvt=Hier kannst du alle Hauptbucheinträge des gewählten Jahres und/oder für einzelne Journale löschen. Gib mindestens eines von beidem an.
@@ -169,17 +169,17 @@ ProductAccountNotDefined=Leider ist kein Konto für das Produkt definiert.
 FeeAccountNotDefined=Leider ist kein Konto für den Betrag definiert.
 BankAccountNotDefined=Leider ist kein Bankkonto definiert.
 CustomerInvoicePayment=Kundenzahlung
-ThirdPartyAccount=Geschäftspartner
+ThirdPartyAccount=Geschäftspartner-Konto
 NewAccountingMvt=Neue Transaktion
 NumMvts=Nummer der Transaktion
 ListeMvts=Liste der Kontobewegungen
 ErrorDebitCredit=Soll und Haben können nicht beide gleichzeitig einen Wert haben.
-ReportThirdParty=Liste der Geschäftspartner
-DescThirdPartyReport=Liste der Buchhaltungskonten von Geschäftspartnern und Lieferanten
+ReportThirdParty=Liste der Geschäftspartner-Konten
+DescThirdPartyReport=Liste der Geschäftpartner (Kunden und Lieferanten) mit deren Buchhaltungskonten
 ListAccounts=Liste der Buchhaltungskonten
 UnknownAccountForThirdparty=Den Partner kenne ich nicht - wir nehmen %s.
 UnknownAccountForThirdpartyBlocking=Den Partner kenne ich nicht. Zugriffsfehler.
-ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Geschäftspartner nicht definiert oder unbekannt. Ich nehme deshalb %s.
+ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Geschäftspartner-Konto nicht definiert oder Geschäftspartner unbekannt. Wir werden %s verwenden
 ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Der Partner ist nicht definiert oder unbekannt. Zugriffsfehler.
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Mir fehlt der Partner und das Wartestellungskonto. Zugriffsfehler.
 PaymentsNotLinkedToProduct=Die Zahlung ist mit keinem Produkt oder Service verknüpft.
@@ -243,7 +243,6 @@ ChartofaccountsId=Kontenrahmen ID
 InitAccountancy=Init Buchhaltung
 InitAccountancyDesc=Auf dieser Seite weisest du Buchhaltungskonten Produkten und Leistungen zu, die keine Konten für Ein- und Verkäufe hinterlegt haben.
 DefaultBindingDesc=Auf dieser Seite kannst du ein Standard - Buchhaltungskonto an alle Arten Zahlungstransaktionen zuweisen, falls noch nicht geschehen.
-DefaultClosureDesc=Lege hier die Parameter zum Anfügen der Bilanz fest.
 OptionModeProductSell=Modus Verkauf
 OptionModeProductSellIntra=Modus Export - Verkäufe in den EWR - Raum
 OptionModeProductSellExport=Modus Export - Verkäufe in andere Länder
diff --git a/htdocs/langs/de_CH/admin.lang b/htdocs/langs/de_CH/admin.lang
index d38cb433d55..444a5c87da0 100644
--- a/htdocs/langs/de_CH/admin.lang
+++ b/htdocs/langs/de_CH/admin.lang
@@ -78,7 +78,7 @@ Purge=Säubern
 PurgeAreaDesc=Hier können Sie alle vom System erzeugten und gespeicherten Dateien löschen (temporäre Dateien oder alle Dateien im Verzeichnis <b>%s</b>). Diese Funktion ist richtet sich vorwiegend an Benutzer ohne Zugriff auf das Dateisystem des Webservers (z.B. Hostingpakete)
 PurgeDeleteTemporaryFiles=Lösche alle Temporären Dateien. Dabei gehen keine Arbeitsdaten verloren.\nHinweis: Das funktioniert nur, wenn das Verzeichnis 'Temp' seit 24h da ist.
 PurgeDeleteTemporaryFilesShort=Temporärdateien löschen
-PurgeDeleteAllFilesInDocumentsDir=Alle Datein im Verzeichnis <b>%s</b> löschen. Dies beinhaltet temporäre Dateien ebenso wie Datenbanksicherungen, Dokumente (Geschäftspartner, Rechnungen, ...) und alle Inhalte des ECM-Moduls.
+PurgeDeleteAllFilesInDocumentsDir=Alle Dateien im Verzeichnis <b>%s</b> löschen. <br> Dadurch werden alle generierten Dokumente gelöscht, die sich auf Elemente (Geschäftspartner, Rechnungen usw.), Dateien, die in das ECM-Modul hochgeladen wurden, Datenbank-Backup-Dumps und temporäre Dateien beziehen.
 PurgeNDirectoriesDeleted=<b>%s</b> Dateien oder Verzeichnisse gelöscht.
 PurgeNDirectoriesFailed=Löschen von <b>%s</b> Dateien oder Verzeichnisse fehlgeschlagen.
 PurgeAuditEvents=Bereinige alle Sicherheitsereignisse
@@ -398,6 +398,7 @@ Permission1237=Lieferantenbestellungen mit Details exportieren
 Permission1421=Kundenaufträge mit Attributen exportieren
 Permission2414=Aktionen und Aufgaben anderer exportieren
 Permission59002=Gewinspanne definieren
+DictionaryCompanyType=Geschäftspartner Typen
 DictionaryCompanyJuridicalType=Rechtsformen von Unternehmen
 DictionaryActions=Arten von Kalenderereignissen
 DictionaryVAT=MwSt.-Sätze
@@ -413,6 +414,7 @@ DriverType=Treiber Typ
 MenuCompanySetup=Firma / Organisation
 MessageOfDay=Nachricht des Tages
 CompanyInfo=Firma / Organisation
+CompanyZip=PLZ
 SetupDescription1=Der Setupbereich erlaubt das konfigurieren ihrer Dolibarr Installation vor der ersten Verwendung.
 SetupDescription4=Die Parameter im Menü <a href="%s">%s-> %s</a> sind notwenig, da Dolibarr ein modulares monolithisches ERP/CRM-System ist. Neue Funktionen werden für jedes aktivierte Modul zum Menü hinzugefügt.
 InfoDolibarr=Infos Dolibarr
@@ -507,7 +509,6 @@ ExpenseReportsIkSetup=Modul Spesenabrechnungen (Milles Index) einrichten
 ExpenseReportsRulesSetup=Modul Spesenabrechnungen (Regeln) einrichten
 ExpenseReportNumberingModules=Modul Spesenabrechnung (Numerierung)
 YouMayFindNotificationsFeaturesIntoModuleNotification=Du kannst automatische Benachrichtigungen im Modul "Benachrichtigungen" festlegen und verwalten.
-ListOfFixedNotifications=List of Fixed Notifications
 ConfFileMustContainCustom=Zur Installation eines externen Modules speichern Sie die Modul-Dateien in Verzeichnis <strong>%s</strong>. Damit Dolibarr dieses Verzeichniss verwendet, musst du in der Setupdatei <strong>conf.php</strong> die Optionen<br><strong>$dolibarr_main_url_root_alt</strong> auf<br><strong>$dolibarr_main_url_root_alt="/custom"</strong> oder <br><strong>'%s/custom';</strong> hinzufügen oder anpassen.
 LinkColor=Linkfarbe
 MinimumNoticePeriod=Kündigungsfrist (Ihre Kündigung muss vor dieser Zeit erfolgen)
diff --git a/htdocs/langs/de_CH/bills.lang b/htdocs/langs/de_CH/bills.lang
index f4deb2d45a1..d118ff710bf 100644
--- a/htdocs/langs/de_CH/bills.lang
+++ b/htdocs/langs/de_CH/bills.lang
@@ -44,7 +44,9 @@ SendReminderBillRef=Einreichung von Rechnung %s (Erinnerung)
 NoOtherDraftBills=Keine Rechnungsentwürfe Anderer
 RelatedRecurringCustomerInvoices=Verknüpfte wiederkehrende Kundenrechnung
 Reduction=Ermässigung
+ReductionShort=%
 Reductions=Ermässigungen
+ReductionsShort=%
 AddRelativeDiscount=Jeweiligen Rabatt erstellen
 EditRelativeDiscount=Relativen Rabatt bearbeiten
 AddGlobalDiscount=Rabattregel hinzufügen
@@ -73,7 +75,7 @@ RegulatedOn=Gebucht am
 ChequeBank=Scheckbank
 PrettyLittleSentence=Nehmen Sie die Höhe der Zahlungen, die aufgrund von Schecks, die in meinem Namen als Mitglied eines Accounting Association, die von der Steuerverwaltung.
 VATIsNotUsedForInvoice=* Nicht für MwSt-art-CGI-293B
-NoteListOfYourUnpaidInvoices=Bitte beachten: Diese Liste enthält nur Rechnungen an Geschäftspartner, bei denen Sie als Vertreter angegeben sind.
+NoteListOfYourUnpaidInvoices=Bitte beachten: Diese Liste enthält nur Rechnungen für Geschäftspartner, bei denen Sie als Vertreter angegeben sind.
 YouMustCreateStandardInvoiceFirstDesc=Sie müssen zuerst eine Standardrechnung Erstellen und diese dann in eine Rechnungsvorlage umwandeln
 InvoiceFirstSituationAsk=Erste Situation Rechnung
 InvoiceSituation=Situation Rechnung
diff --git a/htdocs/langs/de_CH/companies.lang b/htdocs/langs/de_CH/companies.lang
index bbfe4ef8af3..e086658ba2c 100644
--- a/htdocs/langs/de_CH/companies.lang
+++ b/htdocs/langs/de_CH/companies.lang
@@ -5,10 +5,10 @@ ConfirmDeleteCompany=Willst du diesen Geschäftspartner und alle damit verbunden
 ConfirmDeleteContact=Willst du diesen Kontakt und alle damit verbundenen Informationen wirklich löschen?
 MenuNewThirdParty=Erzeuge Geschäftspartner
 MenuNewCustomer=Erzeuge Kunde
-MenuNewSupplier=Erzeuge Lieferant
-NewCompany=Erzeuge Unternehmen (Lead / Kunde / Lieferant)
+MenuNewSupplier=Neuer Lieferant
+NewCompany=Erzeuge Partner (Lead / Kunde / Lieferant)
 NewThirdParty=Erzeuge Geschäftspartner (Lead / Kunde / Lieferant)
-CreateDolibarrThirdPartySupplier=Erzeuge Lieferant
+CreateDolibarrThirdPartySupplier=Erstelle einen Lieferant
 CreateThirdPartyOnly=Geschäftspartner erstellen
 CreateThirdPartyAndContact=Erzeuge Geschäftspartner mit Kontakt
 IdThirdParty=Geschäftspartner ID
@@ -122,7 +122,7 @@ SupplierCodeDesc=Lieferantennummer, eindeutig für jeden Lieferanten
 RequiredIfCustomer=Erforderlich falls Geschäftspartner Kunde oder Interessent ist
 RequiredIfSupplier=Erforderlich, wenn der Partner Lieferant ist
 ValidityControledByModule=Durch Modul validiert
-ListOfThirdParties=Geschäftspartner
+ListOfThirdParties=Liste der Geschäftspartner
 ShowCompany=Geschäftspartner anzeigen
 ShowContact=Zeige Kontaktangaben
 ContactsAllShort=Alle (Kein Filter)
@@ -165,8 +165,6 @@ AllocateCommercial=Vertriebsmitarbeiter zuweisen
 FiscalMonthStart=Ab Monat des Geschäftsjahres
 YouMustAssignUserMailFirst=Für E-Mail - Benachrichtigung hinterlegst du bitte zuerst eine E-Mail Adresse im Benutzerprofil.
 YouMustCreateContactFirst=Sie müssen erst E-Mail-Kontakte beim Geschäftspartner anlegen, um E-Mail-Benachrichtigungen hinzufügen zu können.
-ListSuppliersShort=Liste Lieferanten
-ListProspectsShort=Liste Interessenten
 ListCustomersShort=Kundenliste
 LastModifiedThirdParties=Die letzten %s bearbeiteten Partner
 UniqueThirdParties=Anzahl Geschäftspartner
diff --git a/htdocs/langs/de_CH/compta.lang b/htdocs/langs/de_CH/compta.lang
index 2adacb7ff44..eecf64ff1d5 100644
--- a/htdocs/langs/de_CH/compta.lang
+++ b/htdocs/langs/de_CH/compta.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - compta
 FeatureIsSupportedInInOutModeOnly=Dieses Feautre ist nur in der Soll-Haben-Option verfügbar (siehe Konfiguration des Rechnungswesen-Moduls)
-PaymentsNotLinkedToInvoice=Zahlungen mit keiner Rechnung und damit auch keinem Geschäftspartner verbunden
+PaymentsNotLinkedToInvoice=Zahlungen mit keiner Rechnung und damit auch mit keinem Geschäftspartner verbunden
 Balance=Bilanz
 LT2SummaryES=EKSt. Übersicht
 VATCollected=Erhobene MwSt.
diff --git a/htdocs/langs/de_CH/errors.lang b/htdocs/langs/de_CH/errors.lang
index a4be143308a..6faba9c6f97 100644
--- a/htdocs/langs/de_CH/errors.lang
+++ b/htdocs/langs/de_CH/errors.lang
@@ -24,7 +24,6 @@ ErrorFieldCanNotContainSpecialNorUpperCharacters=Das Feld <b>%s</b> darf keine S
 ErrorFieldMustHaveXChar=Das Feld <b>%s</b> muss mindestens %s Zeichen haben.
 ErrorCantSaveADoneUserWithZeroPercentage=Ereignisse können nicht mit Status "Nicht begonnen" gespeichert werden, wenn das Feld "Erledigt durch" schon ausgefüllt ist.
 ErrorPleaseTypeBankTransactionReportName=Gib hier den Bankkontoauszug im Format YYYYMM oder YYYYMMDD an, in den du diesen Eintrag eintragen willst.
-ErrorModuleSetupNotComplete=Das Setup des Moduls scheint unvollständig zu sein. Führen Sie nochmal das Setup aus um das Modul zu vervollständigen.
 ErrorProdIdAlreadyExist=%s wurde bereits einem Geschäftspartner zugewiesen
 ErrorForbidden3=Es scheint keine ordnungsgemässe Authentifizierung für das System vorzuliegen. Bitte werfen Sie einen Blick auf die Systemdokumentation um die entsprechenden Authentifizierungsoptionen zu verwalten (htaccess, mod_auth oder andere...)
 ErrorBadValueForCode=Unzulässiger Code-Wert. Versuchen Sie es mit einem anderen Wert erneut...
diff --git a/htdocs/langs/de_CH/main.lang b/htdocs/langs/de_CH/main.lang
index cbe2c53512c..56b47cf155c 100644
--- a/htdocs/langs/de_CH/main.lang
+++ b/htdocs/langs/de_CH/main.lang
@@ -52,6 +52,7 @@ ErrorCantLoadUserFromDolibarrDatabase=Kann Benutzer <b>%s</b> nicht aus der Syst
 ErrorNoSocialContributionForSellerCountry=Fehler, keine Definition für Sozialabgaben/Steuerwerte definiert für Land '%s'.
 ErrorCannotAddThisParentWarehouse=Du kannst dieses Lager nicht bei sich selbst einordnen...
 MaxNbOfRecordPerPage=Einträge pro Seite
+SeeHere=Schau, hier:
 FileRenamed=Datei erfolgreich umbenannt
 FileGenerated=Datei erfolgreich erzeugt
 FileSaved=Datei erfolgreich gespeichert
@@ -340,5 +341,3 @@ NoFilesUploadedYet=Bitte lade zuerst ein Dokument hoch.
 SeePrivateNote=Privatnotiz Einblenden
 PaymentInformation=Zahlungsinformationen
 ValidFrom=Gültig von
-ValidUntil=Gültig bis
-NoRecordedUsers=Keine Benutzer
diff --git a/htdocs/langs/de_CH/members.lang b/htdocs/langs/de_CH/members.lang
index 27d4cf7781a..f14c57540cc 100644
--- a/htdocs/langs/de_CH/members.lang
+++ b/htdocs/langs/de_CH/members.lang
@@ -23,6 +23,7 @@ NewSubscriptionDesc=Mit diesem Formular können Sie Ihr Abonnement als neues Mit
 Subscriptions=Abonnemente
 ListOfSubscriptions=Liste der Abonnemente
 NewMemberType=Neue Mitgliederart
+WelcomeEMail=Begrüssungs-E-Mail
 SubscriptionRequired=Abonnement notwendig
 VoteAllowed=Abstimmen erlaubt
 ShowSubscription=Abonnement anzeigen
@@ -44,4 +45,6 @@ MembersStatisticsByState=Mitgliederstatistik nach Kanton
 MembersStatisticsByTown=Mitgliederstatistik nach Ort
 NoValidatedMemberYet=Keine verifizierten Mitglieder gefunden
 LatestSubscriptionDate=Enddatum des Abonnementes
+MemberNature=Art des Mitglieds
 Public=Informationen sind öffentlich
+NewMemberbyWeb=Neues Mitglied hinzugefügt. Warten auf Genehmigung
diff --git a/htdocs/langs/de_CH/supplier_proposal.lang b/htdocs/langs/de_CH/supplier_proposal.lang
index 5a7c27d79e2..f1b50555dd7 100644
--- a/htdocs/langs/de_CH/supplier_proposal.lang
+++ b/htdocs/langs/de_CH/supplier_proposal.lang
@@ -1,24 +1,40 @@
 # Dolibarr language file - Source file is en_US - supplier_proposal
-supplier_proposalDESC=Preisanfragen Lieferant verwalten
+SupplierProposal=Lieferantenofferten
+supplier_proposalDESC=Preisanfragen an Lieferanten verwalten
 SupplierProposalNew=Neue Preisanfrage
 CommRequest=Generelle Preisanfrage
 CommRequests=Generelle Preisanfragen
 SearchRequest=Anfragen finden
 DraftRequests=Entwürfe Preisanfragen
+SupplierProposalsDraft=Lieferanten - Richtofferten
+LastModifiedRequests=Die letzten %s geänderten Offertanfragen
 RequestsOpened=Offene Preisanfragen
+SupplierProposalArea=Lieferantenangebote
+SupplierProposalShort=Lieferantenangebote
 NewAskPrice=Neue Preisanfrage
 ShowSupplierProposal=Preisanfrage zeigen
+SupplierProposalRefFourn=Lieferantennummer
 SupplierProposalRefFournNotice=Bevor die Preisanfrage mit "Angenommen" abgeschlossen wird, sollten Referenzen zum Lieferant eingeholt werden.
+ConfirmValidateAsk=Willst du diese Offertanfrage unter dem Namen <b>%s</b> bestätigen?
 ValidateAsk=Anfrage bestätigen
 SupplierProposalStatusDraft=Entwürfe (benötigen Bestätigung)
 SupplierProposalStatusSigned=Akzeptiert
+SupplierProposalStatusValidatedShort=Bestätigt
 SupplierProposalStatusSignedShort=Akzeptiert
 CopyAskFrom=Neue Preisanfrage erstellen (Kopie einer bestehenden Anfrage)
 CreateEmptyAsk=Leere Anfrage erstellen
+ConfirmCloneAsk=Willst du die Offertanfrage <b>%s</b> duplizieren?
+ConfirmReOpenAsk=Willst du diese Preisanfrage <b>%s</b> wiedereröffnen?
 SendAskByMail=Preisanfrage mit E-Mail versenden
 SendAskRef=Preisanfrage %s versenden
 SupplierProposalCard=Anfragekarte
+ConfirmDeleteAsk=Willst du diese Preisanfrage <b>%s</b> löschen?
 DocModelAuroreDescription=Eine vollständige Preisanfrage-Vorlage (Logo...)
 DefaultModelSupplierProposalCreate=Standardvorlage erstellen
 DefaultModelSupplierProposalToBill=Standardvorlage beim Abschluss einer Preisanfrage (angenommen)
 DefaultModelSupplierProposalClosed=Standardvorlage beim Abschluss einer Preisanfrage (zurückgewiesen)
+ListOfSupplierProposals=Liste der Offertanfragen an Lieferanten
+ListSupplierProposalsAssociatedProject=Liste der Lieferantenofferten, die mit diesem Projekt verknüpft sind
+SupplierProposalsToClose=Zu schliessende Lieferantenangebote
+SupplierProposalsToProcess=Zu verarbeitende Lieferantenofferten
+LastSupplierProposals=Die letzten %s Offertanfragen
diff --git a/htdocs/langs/de_CH/ticket.lang b/htdocs/langs/de_CH/ticket.lang
index 93e412de5eb..9a55f674e15 100644
--- a/htdocs/langs/de_CH/ticket.lang
+++ b/htdocs/langs/de_CH/ticket.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - Source file is en_US - ticket
+TypeContact_ticket_external_SUPPORTCLI=Kundenkontakt / Störfallverfolgung
 NotRead=Ungelesen
 InProgress=In Bearbeitung
 Category=Analysecode
diff --git a/htdocs/langs/de_CH/users.lang b/htdocs/langs/de_CH/users.lang
index ab3eb40ac4c..22967220db0 100644
--- a/htdocs/langs/de_CH/users.lang
+++ b/htdocs/langs/de_CH/users.lang
@@ -23,8 +23,8 @@ ExportDataset_user_1=Benutzer und Eigenschaften
 CreateInternalUserDesc=Hier kannst du interne Benutzer erzeugen.\nExterne Benutzer erzeugst du in den Kontakten deiner Partner.
 InternalExternalDesc=Ein interner Benutzer gehört zu deiner Firma.\nExterne User sind Partner, die Zugriff auf das System erhalten.\nSo oder wird die Reichweite mit Benutzerberechtigungen gesteuert. Man kann internen und externen Benutzern auch verschiedene Ansichten und Menus zuweisen.
 PermissionInheritedFromAGroup=Berechtigung durch eine Gruppenzugehörigkeit gererbt.
-UserWillBeInternalUser=Erstellter Benutzer ist intern (mit keinem bestimmten Geschäftspartner verknüpft)
-UserWillBeExternalUser=Erstellter Benutzer ist extern (mit einem bestimmten Geschäftspartner verknüpft)
+UserWillBeInternalUser=Erstellter Benutzer ist ein intern Benutzer (da mit keinem bestimmten Geschäftspartner verknüpft)
+UserWillBeExternalUser=Erstellter Benutzer ist ein externer Benutzer (da mit einem bestimmten Geschäftspartner verknüpft)
 ConfirmCreateContact=Willst du wirklich ein Benutzerkonto für diesen Kontakt erstellen?
 ConfirmCreateLogin=Willst du wirklich ein Benutzerkonto für dieses Mitglied erstellen?
 ConfirmCreateThirdParty=Willst du wirklich für dieses Mitglied einen Partner erzeugen?
diff --git a/htdocs/langs/de_CH/withdrawals.lang b/htdocs/langs/de_CH/withdrawals.lang
index 707c89ca841..de458cca1cc 100644
--- a/htdocs/langs/de_CH/withdrawals.lang
+++ b/htdocs/langs/de_CH/withdrawals.lang
@@ -1,3 +1,2 @@
 # Dolibarr language file - Source file is en_US - withdrawals
-ThirdPartyBankCode=BLZ Geschäftspartner
 WithdrawalRefusedConfirm=Möchten Sie wirklich eine Abbuchungsablehnung zu diesem Geschäftspartner erstellen?
diff --git a/htdocs/langs/de_DE/accountancy.lang b/htdocs/langs/de_DE/accountancy.lang
index 36aaddcf541..0ca2eb50e9a 100644
--- a/htdocs/langs/de_DE/accountancy.lang
+++ b/htdocs/langs/de_DE/accountancy.lang
@@ -265,7 +265,7 @@ AccountingJournals=Buchhaltungsjournale
 AccountingJournal=Buchhaltungsjournal
 NewAccountingJournal=Neues Buchhaltungsjournal
 ShowAccoutingJournal=Buchhaltungsjournal anzeigen
-Nature=Art
+NatureOfJournal=Nature of Journal
 AccountingJournalType1=Verschiedene Aktionen
 AccountingJournalType2=Verkauf
 AccountingJournalType3=Einkauf
@@ -291,6 +291,7 @@ Modelcsv_quadratus=Export for Quadratus QuadraCompta
 Modelcsv_ebp=Export for EBP
 Modelcsv_cogilog=Export for Cogilog
 Modelcsv_agiris=Export for Agiris
+Modelcsv_LDCompta=Export for LD Compta (v9 & higher) (Test)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Konfigurierbarer CSV Export
 Modelcsv_FEC=Export FEC
@@ -301,7 +302,7 @@ ChartofaccountsId=Kontenplan ID
 InitAccountancy=Rechnungswesen initialisieren
 InitAccountancyDesc=Auf dieser Seite kann ein Sachkonto für Artikel und Dienstleistungen vorgegeben werden, wenn noch kein Buchhaltungs-Konto für Ein- und Verkäufe definiert ist.
 DefaultBindingDesc=Diese Seite kann verwendet werden, um ein Standardkonto festzulegen, das für die Verknüpfung von Transaktionsdatensätzen zu Lohnzahlungen, Spenden, Steuern und Mwst. verwendet werden soll, wenn kein bestimmtes Konto angegeben wurde.
-DefaultClosureDesc=This page can be used to set parameters to use to enclose a balance sheet.
+DefaultClosureDesc=This page can be used to set parameters used for accounting closures.
 Options=Optionen
 OptionModeProductSell=Modus Verkäufe Inland
 OptionModeProductSellIntra=Modus Verkäufe in EU/EWG
diff --git a/htdocs/langs/de_DE/admin.lang b/htdocs/langs/de_DE/admin.lang
index c3449107abb..d6292945470 100644
--- a/htdocs/langs/de_DE/admin.lang
+++ b/htdocs/langs/de_DE/admin.lang
@@ -574,7 +574,7 @@ Module510Name=Löhne
 Module510Desc=Erfassen und Verfolgen von Mitarbeiterzahlungen
 Module520Name=Kredite / Darlehen
 Module520Desc=Verwaltung von Darlehen
-Module600Name=Benachrichtigungen
+Module600Name=Notifications on business event
 Module600Desc=E-Mail-Benachrichtigungen senden, die durch ein Geschäftsereignis ausgelöst werden: pro Benutzer (Einrichtung definiert für jeden Benutzer), pro Drittanbieter-Kontakte (Einrichtung definiert für jeden Drittanbieter) oder durch bestimmte E-Mails.
 Module600Long=Beachten Sie, dass dieses Modul E-Mails in Echtzeit sendet, wenn ein bestimmtes Geschäftsereignis stattfindet. Wenn Sie nach einer Funktion zum Senden von e-Mail-Erinnerungen für Agenda-Ereignisse suchen, gehen Sie in die Einrichtung den dem Modul Agenda.
 Module610Name=Produktvarianten
@@ -807,7 +807,7 @@ Permission401=Rabatte anzeigen
 Permission402=Rabatte erstellen/bearbeiten
 Permission403=Rabatte freigeben
 Permission404=Rabatte löschen
-Permission430=Use Debug Bar
+Permission430=Debug Bar nutzen
 Permission511=Read payments of salaries
 Permission512=Lohnzahlungen anlegen / ändern
 Permission514=Delete payments of salaries
@@ -886,10 +886,10 @@ Permission2515=Dokumentverzeichnisse verwalten
 Permission2801=FTP-Client im Lesemodus nutzen (nur ansehen und herunterladen)
 Permission2802=FTP-Client im Schreibmodus nutzen (Dateien löschen oder hochladen)
 Permission3200=Read archived events and fingerprints
-Permission4001=See employees
-Permission4002=Create employees
-Permission4003=Delete employees
-Permission4004=Export employees
+Permission4001=Mitarbeiter anzeigen
+Permission4002=Mitarbeiter erstellen
+Permission4003=Mitarbeiter löschen
+Permission4004=Mitarbeiter exportieren
 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.
@@ -1193,6 +1193,7 @@ ExtraFieldsSupplierOrders=Ergänzende Attribute (Bestellungen)
 ExtraFieldsSupplierInvoices=Ergänzende Attribute (Rechnungen)
 ExtraFieldsProject=Ergänzende Attribute (Projekte)
 ExtraFieldsProjectTask=Ergänzende Attribute (Aufgaben)
+ExtraFieldsSalaries=Complementary attributes (salaries)
 ExtraFieldHasWrongValue=Attribut %s hat einen falschen Wert.
 AlphaNumOnlyLowerCharsAndNoSpace=nur Kleinbuchstaben und Zahlen, keine Leerzeichen
 SendmailOptionNotComplete=Achtung: Auf einigen Linux-Systemen muss die Einrichtung von sendmail die Option -ba ethalten, um E-Mail versenden zu können (Parameter mail.force_extra_parameters in der php.ini-Datei). Wenn einige Empfänger niemals E-Mails erhalten, verändern Sie den PHP Parameter folgendermaßen mail.force_extra_parameters =-ba.
@@ -1220,13 +1221,14 @@ SuhosinSessionEncrypt=Sitzungsspeicher durch Suhosin verschlüsselt
 ConditionIsCurrently=Einstellung ist aktuell %s
 YouUseBestDriver=You use driver %s which is the best driver currently available.
 YouDoNotUseBestDriver=Sie verwenden Treiber %s, aber es wird der Treiber %s empfohlen.
-NbOfProductIsLowerThanNoPb=Sie haben nur %s Produkte/Leistungen in der Datenbank. Daher ist keine Optimierung erforderlich.
+NbOfObjectIsLowerThanNoPb=You have only %s %s in the database. This does not require any particular optimization.
 SearchOptim=Such Optimierung
-YouHaveXProductUseSearchOptim=You have %s products in the database. You should add the constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+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.
 BrowserIsOK=Sie verwenden %s als Webbrowser. Dieser ist hinsichtlich Sicherheit und Leistung ausreichend.
 BrowserIsKO=Sie verwenden %s als Webbrowser. Dieser ist bekanntlich eine schlechte Wahl wenn es um Sicherheit, Leistung und Zuverlässigkeit geht. Wir empfehlen Firefox, Chrome, Opera oder Safari zu benutzen.
-XDebugInstalled=XDebug installiert.
-XCacheInstalled=XCache installiert.
+PHPModuleLoaded=PHP component %s is loaded
+PreloadOPCode=Preloaded OPCode is used
 AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.<br>Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp".
 AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".
 AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties.
@@ -1734,9 +1736,9 @@ ExpenseReportsRulesSetup=Einrichtung vom Modul Spesenabrechnungen - Regeln
 ExpenseReportNumberingModules=Modul zur Nummerierung von Spesenabrechnungen
 NoModueToManageStockIncrease=Kein Modul zur automatische Bestandserhöhung ist aktiviert. Lager Bestandserhöhung kann nur durch manuelle Eingabe erfolgen.
 YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for email notifications by enabling and configuring the module "Notification".
-ListOfNotificationsPerUser=Liste der Benachrichtigungen nach Benutzer*
-ListOfNotificationsPerUserOrContact=List of notifications (events) available per user* or per contact**
-ListOfFixedNotifications=Liste von ausbesserten Benachrichtigungen
+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
 GoOntoUserCardToAddMore=Gehen Sie auf die Registerkarte "Hinweise" eines Benutzers, um Benachrichtigungen für Benutzer zu erstellen/entfernen
 GoOntoContactCardToAddMore=Gehen Sie auf die Registerkarte "Hinweise" des Partners, um Hinweise für Kontakte/Adressen zu erstellen oder zu entfernen
 Threshold=Schwellenwert
@@ -1898,6 +1900,11 @@ OnMobileOnly=Nur auf kleinen Bildschirmen (Smartphones)
 DisableProspectCustomerType=Deaktivieren Sie den Drittanbietertyp "Interessent + Kunde" (d.h. ein Drittanbieter muss ein Interessent oder Kunde sein, kann aber nicht beides sein).
 MAIN_OPTIMIZEFORTEXTBROWSER=Vereinfachte Benutzeroberfläche für Blinde
 MAIN_OPTIMIZEFORTEXTBROWSERDesc=Aktivieren Sie diese Option, wenn Sie eine blinde Person sind, oder wenn Sie die Anwendung über einen Textbrowser wie Lynx oder Links verwenden.
+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
 ThisValueCanOverwrittenOnUserLevel=Dieser Wert kann von jedem Benutzer auf seiner Benutzerseite überschrieben werden - Registerkarte  '%s'
 DefaultCustomerType=Standardmäßiger Drittanbietertyp für die Maske "Neuer Kunde". 
 ABankAccountMustBeDefinedOnPaymentModeSetup=Hinweis: Das Bankkonto muss im Modul jeder Zahlungsart (Paypal, Stripe,...) definiert sein, damit diese Funktion funktioniert.
@@ -1911,7 +1918,7 @@ LogsLinesNumber=Zahl der Zeilen, die auf der Registerkarte Logs angezeigt werden
 UseDebugBar=Verwenden Sie die Debug Leiste
 DEBUGBAR_LOGS_LINES_NUMBER=Zahl der letzten Protokollzeilen, die in der Konsole verbleiben sollen
 WarningValueHigherSlowsDramaticalyOutput=Warnung, höhere Werte verlangsamen die Ausgabe erheblich.
-DebugBarModuleActivated=Modul Debugbar ist aktiviert und verlangsamt die Oberfläche erheblich.
+ModuleActivated=Module %s is activated and slows the interface
 EXPORTS_SHARE_MODELS=Exportmodelle sind für jeden zugänglich.
 ExportSetup=Einrichtung Modul Export
 InstanceUniqueID=Eindeutige ID dieser Instanz
@@ -1928,3 +1935,5 @@ 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
diff --git a/htdocs/langs/de_DE/bills.lang b/htdocs/langs/de_DE/bills.lang
index a5809f83189..98004cb5c15 100644
--- a/htdocs/langs/de_DE/bills.lang
+++ b/htdocs/langs/de_DE/bills.lang
@@ -95,6 +95,7 @@ PaymentHigherThanReminderToPay=Zahlungsbetrag übersteigt Zahlungserinnerung
 HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess received for each overpaid invoice.
 HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess paid for each overpaid invoice.
 ClassifyPaid=Als 'bezahlt' markieren
+ClassifyUnPaid=Classify 'Unpaid'
 ClassifyPaidPartially=Als 'teilweise bezahlt' markieren
 ClassifyCanceled=Rechnung 'aufgegeben'
 ClassifyClosed=Als 'geschlossen' markieren
@@ -214,6 +215,20 @@ ShowInvoiceReplace=Zeige Ersatzrechnung
 ShowInvoiceAvoir=Zeige Gutschrift
 ShowInvoiceDeposit=Anzahlungsrechnungen anzeigen
 ShowInvoiceSituation=Zeige Fortschritt-Rechnung
+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
 ShowPayment=Zeige Zahlung
 AlreadyPaid=Bereits bezahlt
 AlreadyPaidBack=Bereits zurückbezahlt
diff --git a/htdocs/langs/de_DE/boxes.lang b/htdocs/langs/de_DE/boxes.lang
index fe434f7a49c..95c806cc442 100644
--- a/htdocs/langs/de_DE/boxes.lang
+++ b/htdocs/langs/de_DE/boxes.lang
@@ -6,13 +6,13 @@ BoxProductsAlertStock=Bestandeswarnungen für Produkte
 BoxLastProductsInContract=Zuletzt in Verträgen aufgenomme Produkte/Leistungen (maximal %s)
 BoxLastSupplierBills=neueste Lieferantenrechnungen
 BoxLastCustomerBills=neueste Kundenrechnungen
-BoxOldestUnpaidCustomerBills=Älteste unbezahlte Kundenrechnungen
+BoxOldestUnpaidCustomerBills=älteste unbezahlte Kundenrechnungen
 BoxOldestUnpaidSupplierBills=älteste unbezahlte Lieferantenrechnungen
 BoxLastProposals=neueste Angebote
 BoxLastProspects=Zuletzt bearbeitete Interessenten
 BoxLastCustomers=zuletzt berarbeitete Kunden
-BoxLastSuppliers=Zuletzt bearbeitete Lieferanten
-BoxLastCustomerOrders=Neueste Lieferantenbestellungen
+BoxLastSuppliers=zuletzt bearbeitete Lieferanten
+BoxLastCustomerOrders=neueste Lieferantenbestellungen
 BoxLastActions=Neuste Aktionen
 BoxLastContracts=Neueste Verträge
 BoxLastContacts=Neueste Kontakte/Adressen
@@ -32,7 +32,7 @@ BoxTitleLastModifiedProspects=neueste geänderte %s Interessenten
 BoxTitleLastModifiedMembers=%s neueste Mitglieder
 BoxTitleLastFicheInter=Zuletzt bearbeitete Serviceaufträge (maximal %s)
 BoxTitleOldestUnpaidCustomerBills=Älteste offene Kundenrechnungen (maximal %s)
-BoxTitleOldestUnpaidSupplierBills=Älteste offene Kundenrechnungen (maximal %s)
+BoxTitleOldestUnpaidSupplierBills=älteste offene Lieferantenrechnungen (maximal %s)
 BoxTitleCurrentAccounts=Salden offene Konten
 BoxTitleLastModifiedContacts=Zuletzt bearbeitete Kontakte/Adressen (maximal %s)
 BoxMyLastBookmarks=Meine %s neuesten Lesezeichen
diff --git a/htdocs/langs/de_DE/errors.lang b/htdocs/langs/de_DE/errors.lang
index fc26047b0bf..5e5328d3898 100644
--- a/htdocs/langs/de_DE/errors.lang
+++ b/htdocs/langs/de_DE/errors.lang
@@ -90,7 +90,7 @@ ErrorSpecialCharNotAllowedForField=Sonderzeichen sind im Feld '%s' nicht erlaubt
 ErrorNumRefModel=Es besteht ein Bezug zur Datenbank (%s) der mit dieser Numerierungsfolge nicht kompatibel ist. Entfernen Sie den Eintrag oder benennen Sie den Verweis um, um dieses Modul zu aktivieren.
 ErrorQtyTooLowForThisSupplier=Menge zu niedrig für diesen Lieferanten oder kein für dieses Produkt definierter Preis für diesen Lieferanten
 ErrorOrdersNotCreatedQtyTooLow=Einige Bestellungen wurden aufgrund zu geringer Mengen nicht erstellt
-ErrorModuleSetupNotComplete=Das Setup des Moduls ist unvollständig. Gehen Sie zu Home - Einstellungen - Module um die Einstellungen zu vervollständigen.
+ErrorModuleSetupNotComplete=Setup of module %s looks to be uncomplete. Go on Home - Setup - Modules to complete.
 ErrorBadMask=Fehler auf der Maske
 ErrorBadMaskFailedToLocatePosOfSequence=Fehler, Maske ohne fortlaufende Nummer
 ErrorBadMaskBadRazMonth=Fehler, falscher Reset-Wert
@@ -219,6 +219,7 @@ 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.
 # 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
diff --git a/htdocs/langs/de_DE/main.lang b/htdocs/langs/de_DE/main.lang
index 68d80ba1add..ae6ad4131a0 100644
--- a/htdocs/langs/de_DE/main.lang
+++ b/htdocs/langs/de_DE/main.lang
@@ -445,6 +445,7 @@ ContactsAddressesForCompany=Ansprechpartner / Adressen zu diesem Partner
 AddressesForCompany=Anschriften zu diesem Partner
 ActionsOnCompany=Aktionen für diesen Partner
 ActionsOnContact=Aktionen für diesen Kontakt
+ActionsOnContract=Events for this contract
 ActionsOnMember=Aktionen zu diesem Mitglied
 ActionsOnProduct=Ereignisse zu diesem Produkt
 NActionsLate=%s verspätet
@@ -759,6 +760,7 @@ LinkToSupplierProposal=Link zum Lieferantenangebot
 LinkToSupplierInvoice=Link zur Lieferantenrechnung
 LinkToContract=Link zum Vertrag
 LinkToIntervention=Link zu Arbeitseinsatz
+LinkToTicket=Link to ticket
 CreateDraft=Entwurf erstellen
 SetToDraft=Auf Entwurf zurücksetzen
 ClickToEdit=Klicken zum Bearbeiten
@@ -973,9 +975,9 @@ Inventory=Inventur
 AnalyticCode=Analyse-Code
 TMenuMRP=Stücklisten
 ShowMoreInfos=Show More Infos
-NoFilesUploadedYet=Please upload a document first
+NoFilesUploadedYet=Bitte zuerst ein Dokument hochladen
 SeePrivateNote=See private note
-PaymentInformation=Payment information
-ValidFrom=Valid from
-ValidUntil=Valid until
-NoRecordedUsers=No users
+PaymentInformation=Zahlungsdaten
+ValidFrom=Gültig ab
+ValidUntil=Gültig bis
+NoRecordedUsers=Keine Benutzer
diff --git a/htdocs/langs/de_DE/products.lang b/htdocs/langs/de_DE/products.lang
index 8270e25fd2f..c21d97aeafe 100644
--- a/htdocs/langs/de_DE/products.lang
+++ b/htdocs/langs/de_DE/products.lang
@@ -2,6 +2,7 @@
 ProductRef=Produkt-Nr.
 ProductLabel=Produktbezeichnung
 ProductLabelTranslated=Übersetzte Produktbezeichnung
+ProductDescription=Product description
 ProductDescriptionTranslated=Übersetzte Produktbeschreibung
 ProductNoteTranslated=Übersetzte Produkt Notiz
 ProductServiceCard=Produkte/Leistungen Karte
diff --git a/htdocs/langs/de_DE/stripe.lang b/htdocs/langs/de_DE/stripe.lang
index ad2684355a3..ee8d6fc4167 100644
--- a/htdocs/langs/de_DE/stripe.lang
+++ b/htdocs/langs/de_DE/stripe.lang
@@ -65,3 +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>
diff --git a/htdocs/langs/de_DE/withdrawals.lang b/htdocs/langs/de_DE/withdrawals.lang
index c93f95ed408..361f01de3e6 100644
--- a/htdocs/langs/de_DE/withdrawals.lang
+++ b/htdocs/langs/de_DE/withdrawals.lang
@@ -76,7 +76,8 @@ WithdrawalFile=Datei abbuchen
 SetToStatusSent=Setze in Status "Datei versandt"
 ThisWillAlsoAddPaymentOnInvoice=Hierdurch werden auch Zahlungen auf Rechnungen erfasst und als "Bezahlt" klassifiziert, wenn der Restbetrag null ist
 StatisticsByLineStatus=Statistiken nach Statuszeilen
-RUM=Mandatsreferenz
+RUM=Unique Mandate Reference (UMR)
+DateRUM=Mandate signature date
 RUMLong=Eindeutige Mandatsreferenz
 RUMWillBeGenerated=Wenn leer, wird die Mandatsreferenz generiert, sobald die Bankkontodaten gespeichert sind
 WithdrawMode=Lastschriftmodus (FRST oder RECUR)
diff --git a/htdocs/langs/el_GR/accountancy.lang b/htdocs/langs/el_GR/accountancy.lang
index c14fa13dcc9..47e353b87a3 100644
--- a/htdocs/langs/el_GR/accountancy.lang
+++ b/htdocs/langs/el_GR/accountancy.lang
@@ -265,7 +265,7 @@ AccountingJournals=Accounting journals
 AccountingJournal=Accounting journal
 NewAccountingJournal=New accounting journal
 ShowAccoutingJournal=Show accounting journal
-Nature=Nature
+NatureOfJournal=Nature of Journal
 AccountingJournalType1=Miscellaneous operations
 AccountingJournalType2=Πωλήσεις
 AccountingJournalType3=Αγορές
@@ -291,6 +291,7 @@ Modelcsv_quadratus=Export for Quadratus QuadraCompta
 Modelcsv_ebp=Export for EBP
 Modelcsv_cogilog=Export for Cogilog
 Modelcsv_agiris=Export for Agiris
+Modelcsv_LDCompta=Export for LD Compta (v9 & higher) (Test)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
@@ -301,7 +302,7 @@ ChartofaccountsId=Chart of accounts Id
 InitAccountancy=Init accountancy
 InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accounting account defined for sales and purchases.
 DefaultBindingDesc=This page can be used to set a default account to use to link transactions record about payment salaries, donation, taxes and vat when no specific accounting account were already set.
-DefaultClosureDesc=This page can be used to set parameters to use to enclose a balance sheet.
+DefaultClosureDesc=This page can be used to set parameters used for accounting closures.
 Options=Επιλογές
 OptionModeProductSell=Κατάσταση πωλήσεων
 OptionModeProductSellIntra=Mode sales exported in EEC
diff --git a/htdocs/langs/el_GR/admin.lang b/htdocs/langs/el_GR/admin.lang
index 8a86a6f41c5..ba4fa37adc8 100644
--- a/htdocs/langs/el_GR/admin.lang
+++ b/htdocs/langs/el_GR/admin.lang
@@ -574,7 +574,7 @@ Module510Name=Μισθοί
 Module510Desc=Record and track employee payments
 Module520Name=Δάνεια
 Module520Desc=Διαχείριση δανείων
-Module600Name=Notifications
+Module600Name=Notifications on business event
 Module600Desc=Send email notifications triggered by a business event: per user (setup defined on each user), per third-party contacts (setup defined on each third party) or by specific emails
 Module600Long=Note that this module sends emails in real-time when a specific business event occurs. If you are looking for a feature to send email reminders for agenda events, go into the setup of module Agenda.
 Module610Name=Product Variants
@@ -1193,6 +1193,7 @@ ExtraFieldsSupplierOrders=Complementary attributes (orders)
 ExtraFieldsSupplierInvoices=Complementary attributes (invoices)
 ExtraFieldsProject=Complementary attributes (projects)
 ExtraFieldsProjectTask=Complementary attributes (tasks)
+ExtraFieldsSalaries=Complementary attributes (salaries)
 ExtraFieldHasWrongValue=Το χαρακτηριστικό %s έχει λάθος τιμή.
 AlphaNumOnlyLowerCharsAndNoSpace=μόνο αλφαριθμητικά και πεζά γράμματα χωρίς κενά
 SendmailOptionNotComplete=Προσοχή, σε μερικά συστήματα Linux, για να στείλετε e-mail από το e-mail σας, το sendmail εγκατάστασης εκτέλεση πρέπει conatins επιλογή-βα (mail.force_extra_parameters παράμετρος σε php.ini αρχείο σας). Αν δεν ορισμένοι παραλήπτες λαμβάνουν μηνύματα ηλεκτρονικού ταχυδρομείου, προσπαθήστε να επεξεργαστείτε αυτή την PHP με την παράμετρο-mail.force_extra_parameters = βα).
@@ -1220,13 +1221,14 @@ SuhosinSessionEncrypt=Session storage encrypted by Suhosin
 ConditionIsCurrently=Condition is currently %s
 YouUseBestDriver=You use driver %s which is the best driver currently available.
 YouDoNotUseBestDriver=You use driver %s but driver %s is recommended.
-NbOfProductIsLowerThanNoPb=You have only %s products/services in the database. This does not require any particular optimization.
+NbOfObjectIsLowerThanNoPb=You have only %s %s in the database. This does not require any particular optimization.
 SearchOptim=Βελτιστοποίηση αναζήτησης
-YouHaveXProductUseSearchOptim=You have %s products in the database. You should add the constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+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.
 BrowserIsOK=You are using the %s web browser. This browser is ok for security and performance.
 BrowserIsKO=You are using the %s web browser. This browser is known to be a bad choice for security, performance and reliability. We recommend using Firefox, Chrome, Opera or Safari.
-XDebugInstalled=Xdebug είναι φορτωμένο.
-XCacheInstalled=XCache είναι φορτωμένο.
+PHPModuleLoaded=PHP component %s is loaded
+PreloadOPCode=Preloaded OPCode is used
 AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.<br>Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp".
 AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".
 AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties.
@@ -1734,9 +1736,9 @@ ExpenseReportsRulesSetup=Setup of module Expense Reports - Rules
 ExpenseReportNumberingModules=Expense reports numbering module
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
 YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for email notifications by enabling and configuring the module "Notification".
-ListOfNotificationsPerUser=Λίστα ειδοποιήσεων ανά χρήστη*
-ListOfNotificationsPerUserOrContact=List of notifications (events) available per user* or per contact**
-ListOfFixedNotifications=List of Fixed Notifications
+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
 GoOntoUserCardToAddMore=Go to the tab "Notifications" of a user to add or remove notifications for users
 GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
 Threshold=Threshold
@@ -1898,6 +1900,11 @@ OnMobileOnly=On small screen (smartphone) only
 DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be Prospect or Customer but can't be both)
 MAIN_OPTIMIZEFORTEXTBROWSER=Simplify interface for blind person
 MAIN_OPTIMIZEFORTEXTBROWSERDesc=Enable this option if you are a blind person, or if you use the application from a text browser like Lynx or 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
 ThisValueCanOverwrittenOnUserLevel=This value can be overwritten by each user from its user page - tab '%s'
 DefaultCustomerType=Default thirdparty type for "New customer" creation form
 ABankAccountMustBeDefinedOnPaymentModeSetup=Note: The bank account must be defined on the module of each payment mode (Paypal, Stripe, ...) to have this feature working.
@@ -1911,7 +1918,7 @@ LogsLinesNumber=Number of lines to show on logs tab
 UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
-DebugBarModuleActivated=Module debugbar is activated and slows dramaticaly the interface
+ModuleActivated=Module %s is activated and slows the interface
 EXPORTS_SHARE_MODELS=Export models are share with everybody
 ExportSetup=Setup of module Export
 InstanceUniqueID=Unique ID of the instance
@@ -1928,3 +1935,5 @@ 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
diff --git a/htdocs/langs/el_GR/bills.lang b/htdocs/langs/el_GR/bills.lang
index 23c3e7a1d6b..7d0689ce67d 100644
--- a/htdocs/langs/el_GR/bills.lang
+++ b/htdocs/langs/el_GR/bills.lang
@@ -95,6 +95,7 @@ PaymentHigherThanReminderToPay=Η πληρωμή είναι μεγαλύτερη
 HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess received for each overpaid invoice.
 HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess paid for each overpaid invoice.
 ClassifyPaid=Χαρακτηρισμός ως 'Πληρωμένο''
+ClassifyUnPaid=Classify 'Unpaid'
 ClassifyPaidPartially=Χαρακτηρισμός ως 'Μη Εξοφλημένο'
 ClassifyCanceled=Χαρακτηρισμός ως 'Εγκαταλελειμμένο'
 ClassifyClosed=Χαρακτηρισμός ως 'Κλειστό'
@@ -214,6 +215,20 @@ ShowInvoiceReplace=Εμφάνιση τιμολογίου αντικατάστα
 ShowInvoiceAvoir=Εμφάνιση πιστωτικού τιμολογίου
 ShowInvoiceDeposit=Εμφάνιση τιμολογίου κατάθεσης
 ShowInvoiceSituation=Εμφάνιση κατάστασης τιμολογίου
+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
 ShowPayment=Εμφάνιση πληρωμής
 AlreadyPaid=Ήδη πληρωμένο
 AlreadyPaidBack=Already paid back
diff --git a/htdocs/langs/el_GR/errors.lang b/htdocs/langs/el_GR/errors.lang
index 4d36d0a8a43..9a3f85ac11a 100644
--- a/htdocs/langs/el_GR/errors.lang
+++ b/htdocs/langs/el_GR/errors.lang
@@ -90,7 +90,7 @@ ErrorSpecialCharNotAllowedForField=Ειδικοί χαρακτήρες δεν ε
 ErrorNumRefModel=Μια αναφορά υπάρχει στη βάση δεδομένων (%s) και δεν είναι συμβατές με αυτόν τον κανόνα αρίθμηση. Αφαιρέστε το αρχείο ή μετονομαστεί αναφοράς για να ενεργοποιήσετε αυτή την ενότητα.
 ErrorQtyTooLowForThisSupplier=Quantity too low for this vendor or no price defined on this product for this vendor
 ErrorOrdersNotCreatedQtyTooLow=Some orders haven't been created because of too-low quantities
-ErrorModuleSetupNotComplete=Setup of module looks to be uncomplete. Go on Home - Setup - Modules to complete.
+ErrorModuleSetupNotComplete=Setup of module %s looks to be uncomplete. Go on Home - Setup - Modules to complete.
 ErrorBadMask=Σφάλμα στην μάσκα
 ErrorBadMaskFailedToLocatePosOfSequence=Σφάλμα, μάσκα χωρίς τον αύξοντα αριθμό
 ErrorBadMaskBadRazMonth=Σφάλμα, κακή αξία επαναφορά
@@ -219,6 +219,7 @@ 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.
 # 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.
 WarningMandatorySetupNotComplete=Click here to setup mandatory parameters
 WarningEnableYourModulesApplications=Click here to enable your modules and applications
diff --git a/htdocs/langs/el_GR/main.lang b/htdocs/langs/el_GR/main.lang
index 9b49242e3b3..98b6c9bc764 100644
--- a/htdocs/langs/el_GR/main.lang
+++ b/htdocs/langs/el_GR/main.lang
@@ -445,6 +445,7 @@ ContactsAddressesForCompany=Επαφές/Διευθύνσεις για αυτό
 AddressesForCompany=Διευθύνσεις για αυτό τον Πελ./Προμ.
 ActionsOnCompany=Events for this third party
 ActionsOnContact=Events for this contact/address
+ActionsOnContract=Events for this contract
 ActionsOnMember=Εκδηλώσεις σχετικά με αυτό το μέλος
 ActionsOnProduct=Events about this product
 NActionsLate=%s καθυστερ.
@@ -759,6 +760,7 @@ LinkToSupplierProposal=Link to vendor proposal
 LinkToSupplierInvoice=Link to vendor invoice
 LinkToContract=Σύνδεση με συμβόλαιο
 LinkToIntervention=Σύνδεση σε παρέμβαση
+LinkToTicket=Link to ticket
 CreateDraft=Δημιουργία σχεδίου
 SetToDraft=Επιστροφή στο προσχέδιο
 ClickToEdit=Κάντε κλικ για να επεξεργαστείτε
diff --git a/htdocs/langs/el_GR/products.lang b/htdocs/langs/el_GR/products.lang
index 4b73e391054..ce0f121f861 100644
--- a/htdocs/langs/el_GR/products.lang
+++ b/htdocs/langs/el_GR/products.lang
@@ -2,6 +2,7 @@
 ProductRef=Κωδ. Προϊόντος.
 ProductLabel=Ετικέτα Προϊόντος
 ProductLabelTranslated=Translated product label
+ProductDescription=Product description
 ProductDescriptionTranslated=Translated product description
 ProductNoteTranslated=Translated product note
 ProductServiceCard=Καρτέλα Προϊόντων/Υπηρεσιών
diff --git a/htdocs/langs/el_GR/stripe.lang b/htdocs/langs/el_GR/stripe.lang
index 246e61d8d00..3a711225139 100644
--- a/htdocs/langs/el_GR/stripe.lang
+++ b/htdocs/langs/el_GR/stripe.lang
@@ -65,3 +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>
diff --git a/htdocs/langs/el_GR/withdrawals.lang b/htdocs/langs/el_GR/withdrawals.lang
index 3e61ea098c5..79dd2bff9b9 100644
--- a/htdocs/langs/el_GR/withdrawals.lang
+++ b/htdocs/langs/el_GR/withdrawals.lang
@@ -76,7 +76,8 @@ WithdrawalFile=Απόσυρση αρχείο
 SetToStatusSent=Ρυθμίστε την κατάσταση "αποστολή αρχείου"
 ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and will classify them as "Paid" if remain to pay is null
 StatisticsByLineStatus=Στατιστικά στοιχεία από την κατάσταση των γραμμών
-RUM=UMR
+RUM=Unique Mandate Reference (UMR)
+DateRUM=Mandate signature date
 RUMLong=Unique Mandate Reference
 RUMWillBeGenerated=If empty, a UMR (Unique Mandate Reference) will be generated once the bank account information is saved.
 WithdrawMode=Direct debit mode (FRST or RECUR)
diff --git a/htdocs/langs/en_AU/admin.lang b/htdocs/langs/en_AU/admin.lang
index 7b0034e0ce8..447918b3b95 100644
--- a/htdocs/langs/en_AU/admin.lang
+++ b/htdocs/langs/en_AU/admin.lang
@@ -1,9 +1,11 @@
 # Dolibarr language file - Source file is en_US - admin
 OldVATRates=Old GST rate
 NewVATRates=New GST rate
+Module600Name=Notifications on business event
 DictionaryVAT=GST Rates or Sales Tax Rates
 OptionVatMode=GST due
-ListOfNotificationsPerUserOrContact=List of notifications (events) available per user* or per contact**
-ListOfFixedNotifications=List of Fixed Notifications
+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
 LinkColor=Colour of links
 OperationParamDesc=Define values to use for action, or how to extract values. For example:<br>objproperty1=SET:abc<br>objproperty1=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:abc<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey.*[^\\s]+(.*)<br>options_myextrafield=EXTRACT:SUBJECT:([^\\s]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
diff --git a/htdocs/langs/en_AU/withdrawals.lang b/htdocs/langs/en_AU/withdrawals.lang
index 503597bc8ec..967d1f20411 100644
--- a/htdocs/langs/en_AU/withdrawals.lang
+++ b/htdocs/langs/en_AU/withdrawals.lang
@@ -1,2 +1,2 @@
 # Dolibarr language file - Source file is en_US - withdrawals
-ThirdPartyBankCode=Third party bank code or BSB
+RUM=Unique Mandate Reference (UMR)
diff --git a/htdocs/langs/en_CA/admin.lang b/htdocs/langs/en_CA/admin.lang
index 93fc98ac3e2..ae0ffe7f7c7 100644
--- a/htdocs/langs/en_CA/admin.lang
+++ b/htdocs/langs/en_CA/admin.lang
@@ -1,8 +1,10 @@
 # Dolibarr language file - Source file is en_US - admin
+Module600Name=Notifications on business event
 LocalTax1Management=PST Management
 CompanyZip=Postal code
 LDAPFieldZip=Postal code
-ListOfNotificationsPerUserOrContact=List of notifications (events) available per user* or per contact**
-ListOfFixedNotifications=List of Fixed Notifications
+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
 FormatZip=Postal code
 OperationParamDesc=Define values to use for action, or how to extract values. For example:<br>objproperty1=SET:abc<br>objproperty1=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:abc<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey.*[^\\s]+(.*)<br>options_myextrafield=EXTRACT:SUBJECT:([^\\s]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
diff --git a/htdocs/langs/en_GB/accountancy.lang b/htdocs/langs/en_GB/accountancy.lang
index ebc1a049f9c..83f77f8c47c 100644
--- a/htdocs/langs/en_GB/accountancy.lang
+++ b/htdocs/langs/en_GB/accountancy.lang
@@ -117,7 +117,6 @@ Selectmodelcsv=Select an example of export
 ChartofaccountsId=Chart of accounts ID
 InitAccountancyDesc=This page can be used to create a financial account for products and services that do not have a financial account defined for sales and purchases.
 DefaultBindingDesc=This page can be used to set a default account for linking transaction records about payments, salaries, donations, taxes and vat when no specific finance account had already been set.
-DefaultClosureDesc=This page can be used to set parameters to use to enclose a balance sheet.
 OptionModeProductSell=Type of sale
 OptionModeProductBuy=Type of purchase
 OptionModeProductSellDesc=Show all products with finance accounts for sales.
diff --git a/htdocs/langs/en_GB/admin.lang b/htdocs/langs/en_GB/admin.lang
index c5e3e488406..3f23aecf4be 100644
--- a/htdocs/langs/en_GB/admin.lang
+++ b/htdocs/langs/en_GB/admin.lang
@@ -41,12 +41,14 @@ UMaskExplanation=This parameter allows you to define permissions set by default
 ListOfDirectories=List of OpenDocument template directories
 ListOfDirectoriesForModelGenODT=List of directories containing template files in OpenDocument format.<br><br>Put here full path of directories.<br>Add a carriage return between each directory.<br>To add a directory of the GED module, add here <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br>Files in those directories must end with <b>.odt</b> or <b>.ods</b>.
 FollowingSubstitutionKeysCanBeUsed=<br>To learn how to create your .odt document templates, before storing them in those directories, read wiki documentation:
+Module600Name=Notifications on business event
 Module50200Name=PayPal
 DictionaryAccountancyJournal=Finance journals
 CompanyZip=Postcode
 LDAPFieldZip=Postcode
 GenbarcodeLocation=Barcode generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".<br>For example: /usr/local/bin/genbarcode
-ListOfNotificationsPerUserOrContact=List of notifications (events) available per user* or per contact**
-ListOfFixedNotifications=List of Fixed Notifications
+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
 FormatZip=Postcode
 OperationParamDesc=Define values to use for action, or how to extract values. For example:<br>objproperty1=SET:abc<br>objproperty1=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:abc<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey.*[^\\s]+(.*)<br>options_myextrafield=EXTRACT:SUBJECT:([^\\s]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
diff --git a/htdocs/langs/en_GB/withdrawals.lang b/htdocs/langs/en_GB/withdrawals.lang
index 786cf4c2179..b34ed7e8f1f 100644
--- a/htdocs/langs/en_GB/withdrawals.lang
+++ b/htdocs/langs/en_GB/withdrawals.lang
@@ -1,6 +1,5 @@
 # Dolibarr language file - Source file is en_US - withdrawals
 NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Payment status must be set to 'credited' before declaring reject on specific lines.
-NbOfInvoiceToWithdrawWithInfo=No. of customer invoices with direct debit payment orders having defined bank account information
 AmountToWithdraw=Amount to pay
 NoInvoiceToWithdraw=No customer invoice with open 'Direct Debit requests' is waiting. Go on tab '%s' on invoice card to make a request.
 MakeWithdrawRequest=Make a Direct Debit payment request
@@ -14,10 +13,9 @@ OrderWaiting=Waiting for action
 NotifyTransmision=Payment Transmission
 NotifyCredit=Payment Credit
 WithdrawalFileNotCapable=Unable to generate Payment receipt file for your country %s (Your country is not supported)
-ShowWithdraw=Show Payment
-IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one payment not yet processed, it won't be set as paid to allow prior Payment management.
 DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Direct Debit orders to manage the direct debit payment order. When the payment order is closed, payment on the invoice will be automatically recorded, and the invoice closed if the outstanding balance is null.
 WithdrawalFile=Payment file
+RUM=Unique Mandate Reference (UMR)
 WithdrawRequestAmount=The amount of Direct Debit request:
 WithdrawRequestErrorNilAmount=Unable to create a Direct Debit request for an empty amount.
 SEPALegalText=By signing this mandate form, you authorise (A) %s to send instructions to your bank to debit your account and (B) your bank to debit your account in accordance with the instructions from %s. As part of your rights, you are entitled to a refund from your bank under the terms and conditions of your agreement with your bank. A refund must be claimed within 8 weeks starting from the date on which your account was debited. Your rights regarding the above mandate are explained in a statement that you can obtain from your bank.
diff --git a/htdocs/langs/en_IN/admin.lang b/htdocs/langs/en_IN/admin.lang
index 02a8712d64f..d19942507b6 100644
--- a/htdocs/langs/en_IN/admin.lang
+++ b/htdocs/langs/en_IN/admin.lang
@@ -1,6 +1,7 @@
 # Dolibarr language file - Source file is en_US - admin
 Module20Name=Quotations
 Module20Desc=Management of quotations
+Module600Name=Notifications on business event
 Permission21=Read quotations
 Permission22=Create/modify quotations
 Permission24=Validate quotations
@@ -13,7 +14,8 @@ ProposalsNumberingModules=Quotation numbering models
 ProposalsPDFModules=Quotation documents models
 FreeLegalTextOnProposal=Free text on quotations
 WatermarkOnDraftProposal=Watermark on draft quotations (none if empty)
-ListOfNotificationsPerUserOrContact=List of notifications (events) available per user* or per contact**
-ListOfFixedNotifications=List of Fixed Notifications
+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
 MailToSendProposal=Customer quotations
 OperationParamDesc=Define values to use for action, or how to extract values. For example:<br>objproperty1=SET:abc<br>objproperty1=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:abc<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey.*[^\\s]+(.*)<br>options_myextrafield=EXTRACT:SUBJECT:([^\\s]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 4cf9edaa28e..d408cddc5c8 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/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
@@ -1900,6 +1901,11 @@ OnMobileOnly=On small screen (smartphone) only
 DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be Prospect or Customer but can't be both)
 MAIN_OPTIMIZEFORTEXTBROWSER=Simplify interface for blind person
 MAIN_OPTIMIZEFORTEXTBROWSERDesc=Enable this option if you are a blind person, or if you use the application from a text browser like Lynx or 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
 ThisValueCanOverwrittenOnUserLevel=This value can be overwritten by each user from its user page - tab '%s'
 DefaultCustomerType=Default thirdparty type for "New customer" creation form
 ABankAccountMustBeDefinedOnPaymentModeSetup=Note: The bank account must be defined on the module of each payment mode (Paypal, Stripe, ...) to have this feature working.
@@ -1921,13 +1927,8 @@ 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
diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang
index 5f4a9ff0bba..53535e58b46 100644
--- a/htdocs/langs/en_US/bills.lang
+++ b/htdocs/langs/en_US/bills.lang
@@ -95,6 +95,7 @@ PaymentHigherThanReminderToPay=Payment higher than reminder to pay
 HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess received for each overpaid invoice.
 HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess paid for each overpaid invoice.
 ClassifyPaid=Classify 'Paid'
+ClassifyUnPaid=Classify 'Unpaid'
 ClassifyPaidPartially=Classify 'Paid partially'
 ClassifyCanceled=Classify 'Abandoned'
 ClassifyClosed=Classify 'Closed'
diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang
index 8e4d42559a8..f8c3c1a1aee 100644
--- a/htdocs/langs/en_US/errors.lang
+++ b/htdocs/langs/en_US/errors.lang
@@ -90,7 +90,7 @@ ErrorSpecialCharNotAllowedForField=Special characters are not allowed for field
 ErrorNumRefModel=A reference exists into database (%s) and is not compatible with this numbering rule. Remove record or renamed reference to activate this module.
 ErrorQtyTooLowForThisSupplier=Quantity too low for this vendor or no price defined on this product for this vendor
 ErrorOrdersNotCreatedQtyTooLow=Some orders haven't been created because of too-low quantities
-ErrorModuleSetupNotComplete=Setup of module looks to be uncomplete. Go on Home - Setup - Modules to complete.
+ErrorModuleSetupNotComplete=Setup of module %s looks to be uncomplete. Go on Home - Setup - Modules to complete.
 ErrorBadMask=Error on mask
 ErrorBadMaskFailedToLocatePosOfSequence=Error, mask without sequence number
 ErrorBadMaskBadRazMonth=Error, bad reset value
@@ -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/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 1cadc32f4ab..880978a13e5 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/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
diff --git a/htdocs/langs/en_US/members.lang b/htdocs/langs/en_US/members.lang
index acae5aa73fb..9993e05428f 100644
--- a/htdocs/langs/en_US/members.lang
+++ b/htdocs/langs/en_US/members.lang
@@ -197,4 +197,4 @@ SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired subsc
 SendReminderForExpiredSubscription=Send reminder by email to members when subscription is about to expire (parameter is number of days before end of subscription to send the remind. It can be a list of days separated by a semicolon, for example '10;5;0;-5')
 MembershipPaid=Membership paid for current period (until %s)
 YouMayFindYourInvoiceInThisEmail=You may find your invoice attached to this email
-XMembersClosed=%s member(s) closed
\ No newline at end of file
+XMembersClosed=%s member(s) closed
diff --git a/htdocs/langs/en_US/stripe.lang b/htdocs/langs/en_US/stripe.lang
index 91d1f5a54c5..6905bd41b20 100644
--- a/htdocs/langs/en_US/stripe.lang
+++ b/htdocs/langs/en_US/stripe.lang
@@ -64,4 +64,6 @@ ShowInStripe=Show in Stripe
 StripeUserAccountForActions=User account to use for email notification of some Stripe events (Stripe payouts)
 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)
\ No newline at end of file
+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>
\ No newline at end of file
diff --git a/htdocs/langs/en_US/website.lang b/htdocs/langs/en_US/website.lang
index 433e35e2d1b..f01494fcdac 100644
--- a/htdocs/langs/en_US/website.lang
+++ b/htdocs/langs/en_US/website.lang
@@ -14,6 +14,7 @@ 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
 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.
@@ -76,6 +77,7 @@ BackToListOfThirdParty=Back to list for Third Party
 DisableSiteFirst=Disable website first
 MyContainerTitle=My web site title
 AnotherContainer=Another container
+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 +91,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 +104,6 @@ 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
\ No newline at end of file
+MyWebsitePages=My website pages
+SearchReplaceInto=Search | Replace into
+ReplaceString=New string
\ No newline at end of file
diff --git a/htdocs/langs/es_CL/admin.lang b/htdocs/langs/es_CL/admin.lang
index 7e164b901b1..691cbf3bd06 100644
--- a/htdocs/langs/es_CL/admin.lang
+++ b/htdocs/langs/es_CL/admin.lang
@@ -910,12 +910,9 @@ SuhosinSessionEncrypt=Almacenamiento de sesión cifrado por Suhosin
 ConditionIsCurrently=La condición es actualmente %s
 YouUseBestDriver=Utiliza el controlador %s, que es el mejor controlador disponible en la actualidad.
 YouDoNotUseBestDriver=Utiliza el controlador %s, pero se recomienda el controlador %s.
-NbOfProductIsLowerThanNoPb=Sólo tiene productos / servicios %s en la base de datos. Esto no requiere ninguna optimización particular.
 SearchOptim=Optimización de búsqueda
-YouHaveXProductUseSearchOptim=Tiene productos %s en la base de datos. Debe agregar la constante PRODUCT_DONOTSEARCH_ANYWHERE a 1 en Home-Setup-Other. Limite la búsqueda al comienzo de las cadenas, lo que hace posible que la base de datos utilice índices y debería obtener una respuesta inmediata.
 BrowserIsOK=Está utilizando el navegador web %s. Este navegador está bien para la seguridad y el rendimiento.
 BrowserIsKO=Está utilizando el navegador web %s. Se sabe que este navegador es una mala elección para la seguridad, el rendimiento y la confiabilidad. Recomendamos usar Firefox, Chrome, Opera o Safari.
-XCacheInstalled=XCache está cargado.
 AddRefInList=Mostrar cliente / vendedor ref. Lista de información (lista de selección o cuadro combinado) y la mayoría de los hipervínculos. <br> Aparecerán terceros con un formato de nombre de &quot;CC12345 - SC45678 - The Big Company corp&quot;. en lugar de &quot;The Big Company corp&quot;.
 AddAdressInList=Mostrar la lista de información de la dirección del cliente / proveedor (seleccionar lista o cuadro combinado) <br> Aparecerán terceros con el formato de nombre &quot;The Big Company corp. - 21 jump street 123456 Big town - USA&quot; en lugar de &quot;The Big Company corp&quot;.
 AskForPreferredShippingMethod=Pregunte por el método de envío preferido para terceros.
@@ -1300,9 +1297,6 @@ TemplatePDFExpenseReports=Plantillas de documentos para generar el documento de
 ExpenseReportsIkSetup=Configuración del módulo Informes de gastos: índice Milles
 NoModueToManageStockIncrease=No se ha activado ningún módulo capaz de gestionar el aumento automático de existencias. El aumento de existencias se realizará solo con la entrada manual.
 YouMayFindNotificationsFeaturesIntoModuleNotification=Puede encontrar opciones para notificaciones por correo electrónico habilitando y configurando el módulo &quot;Notificación&quot;.
-ListOfNotificationsPerUser=Lista de notificaciones por usuario *
-ListOfNotificationsPerUserOrContact=Lista de notificaciones (eventos) disponibles por usuario * o por contacto **
-ListOfFixedNotifications=Lista de notificaciones fijas
 GoOntoUserCardToAddMore=Vaya a la pestaña &quot;Notificaciones&quot; de un usuario para agregar o eliminar notificaciones para usuarios
 GoOntoContactCardToAddMore=Vaya a la pestaña "Notificaciones" de un tercero para agregar o eliminar notificaciones de contactos/direcciones
 Threshold=Límite
@@ -1440,10 +1434,6 @@ DebugBar=Barra de debug
 WarningValueHigherSlowsDramaticalyOutput=Advertencia, los valores más altos ralentizan dramáticamente la salida.
 EXPORTS_SHARE_MODELS=Los modelos de exportación se comparten con todos.
 IfTrackingIDFoundEventWillBeLinked=Tenga en cuenta que si se encuentra un ID de seguimiento en el correo electrónico entrante, el evento se vinculará automáticamente a los objetos relacionados.
-IFTTT_SERVICE_KEY=IFTTT clave de servicio
-IFTTTDesc=Este módulo está diseñado para desencadenar eventos en IFTTT y / o para ejecutar alguna acción en desencadenadores IFTTT externos.
-UrlForIFTTT=Punto final de URL para IFTTT
-YouWillFindItOnYourIFTTTAccount=Lo encontrarás en tu cuenta de IFTTT.
 EndPointFor=Punto final para %s: %s
 DeleteEmailCollector=Eliminar el colector de correo electrónico
 ConfirmDeleteEmailCollector=¿Estás seguro de que deseas eliminar este recopilador de correo electrónico?
diff --git a/htdocs/langs/es_CO/admin.lang b/htdocs/langs/es_CO/admin.lang
index c931369f00e..208461a50aa 100644
--- a/htdocs/langs/es_CO/admin.lang
+++ b/htdocs/langs/es_CO/admin.lang
@@ -729,12 +729,9 @@ YesInSummer=Si en verano
 SuhosinSessionEncrypt=Almacenamiento de sesión encriptado por Suhosin.
 ConditionIsCurrently=La condición es actualmente %s
 YouDoNotUseBestDriver=Utiliza el controlador %s pero se recomienda el controlador %s.
-NbOfProductIsLowerThanNoPb=Solo tiene %s productos / servicios en la base de datos. Esto no requiere ninguna optimización particular.
 SearchOptim=Optimización de búsqueda
-YouHaveXProductUseSearchOptim=Tienes %s productos en la base de datos. Debe agregar la constante PRODUCT_DONOTSEARCH_ANYWHERE a 1 en Home-Setup-Other. Limite la búsqueda al comienzo de las cadenas, lo que hace posible que la base de datos utilice índices y debería obtener una respuesta inmediata.
 BrowserIsOK=Está utilizando el navegador web %s. Este navegador está bien para la seguridad y el rendimiento.
 BrowserIsKO=Está utilizando el navegador web %s. Se sabe que este navegador es una mala elección para la seguridad, el rendimiento y la confiabilidad. Recomendamos el uso de Firefox, Chrome, Opera o Safari.
-XCacheInstalled=XCache está cargado.
 AskForPreferredShippingMethod=Pregunte por el método de envío preferido para terceros.
 FillThisOnlyIfRequired=Ejemplo: +2 (rellenar solo si se experimentan problemas de compensación de zona horaria)
 PasswordGenerationStandard=Devuelva una contraseña generada de acuerdo con el algoritmo interno de Dolibarr: 8 caracteres que contienen números compartidos y caracteres en minúscula.
@@ -1069,9 +1066,6 @@ ExpenseReportsIkSetup=Configuración de los informes de gastos del módulo - Ín
 ExpenseReportsRulesSetup=Configuración de los informes de gastos del módulo - Reglas
 ExpenseReportNumberingModules=Módulo de numeración de informes de gastos.
 NoModueToManageStockIncrease=No se ha activado ningún módulo capaz de gestionar el aumento automático de stock. El aumento de stock se realizará solo con entrada manual.
-ListOfNotificationsPerUser=Lista de notificaciones por usuario *
-ListOfNotificationsPerUserOrContact=List of notifications (events) available per user* or per contact**
-ListOfFixedNotifications=List of Fixed Notifications
 GoOntoUserCardToAddMore=Vaya a la pestaña "Notificaciones" de un usuario para agregar o eliminar notificaciones para usuarios
 GoOntoContactCardToAddMore=Vaya a la pestaña "Notificaciones" de un tercero para agregar o eliminar notificaciones de contactos / direcciones
 Threshold=Límite
diff --git a/htdocs/langs/es_DO/admin.lang b/htdocs/langs/es_DO/admin.lang
index 9bc2c2bc07b..79fb1cc6155 100644
--- a/htdocs/langs/es_DO/admin.lang
+++ b/htdocs/langs/es_DO/admin.lang
@@ -7,6 +7,4 @@ Permission93=Eliminar impuestos e ITBIS
 DictionaryVAT=Tasa de ITBIS (Impuesto sobre ventas en EEUU)
 UnitPriceOfProduct=Precio unitario sin ITBIS de un producto
 OptionVatMode=Opción de carga de ITBIS
-ListOfNotificationsPerUserOrContact=List of notifications (events) available per user* or per contact**
-ListOfFixedNotifications=List of Fixed Notifications
 OperationParamDesc=Define values to use for action, or how to extract values. For example:<br>objproperty1=SET:abc<br>objproperty1=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:abc<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey.*[^\\s]+(.*)<br>options_myextrafield=EXTRACT:SUBJECT:([^\\s]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
diff --git a/htdocs/langs/es_EC/admin.lang b/htdocs/langs/es_EC/admin.lang
index e388f61c604..f2ffc48e3f7 100644
--- a/htdocs/langs/es_EC/admin.lang
+++ b/htdocs/langs/es_EC/admin.lang
@@ -901,12 +901,9 @@ SuhosinSessionEncrypt=Almacenamiento de sesión cifrado por Suhosin
 ConditionIsCurrently=Condición actual %s
 YouUseBestDriver=Utiliza el controlador %s, que es el mejor controlador actualmente disponible.
 YouDoNotUseBestDriver=Utiliza el controlador %s, pero se recomienda el controlador %s.
-NbOfProductIsLowerThanNoPb=Solo tiene %s productos / servicios en la base de datos. Esto no requiere ninguna optimización particular.
 SearchOptim=Optimización de la búsqueda
-YouHaveXProductUseSearchOptim=Tienes %s productos en la base de datos. Debe agregar la constante PRODUCT_DONOTSEARCH_ANYWHERE a 1 en Home-Setup-Other. Limite la búsqueda al comienzo de las cadenas, lo que hace posible que la base de datos utilice índices y debería obtener una respuesta inmediata.
 BrowserIsOK=Está utilizando el navegador web %s. Este navegador está bien para la seguridad y el rendimiento.
 BrowserIsKO=Está utilizando el navegador web %s. Se sabe que este navegador es una mala elección para la seguridad, el rendimiento y la confiabilidad. Recomendamos utilizar Firefox, Chrome, Opera o Safari.
-XCacheInstalled=XCache está cargado.
 AddRefInList=Mostrar cliente / vendedor ref. Lista de información (lista de selección o cuadro combinado) y la mayoría del hipervínculo. <br> Los terceros aparecerán con un formato de nombre de "CC12345 - SC45678 - The Big Company corp". en lugar de "The Big Company corp".
 AddAdressInList=Mostrar la lista de información de dirección del cliente / proveedor (seleccionar lista o cuadro combinado) <br> Aparecerán terceros con el formato de nombre "The Big Company corp. - 21 jump street 123456 Big town - USA" en lugar de "The Big Company corp".
 AskForPreferredShippingMethod=Pregunte por el método de envío preferido para terceros.
@@ -1303,9 +1300,6 @@ ExpenseReportsSetup=Configuración del módulo Informes de gastos
 TemplatePDFExpenseReports=Plantillas para generar el documento de informe de gastos
 NoModueToManageStockIncrease=No se ha activado ningún módulo capaz de gestionar el aumento automático de existencias. El aumento de existencias se realiza sólo en la entrada manual.
 YouMayFindNotificationsFeaturesIntoModuleNotification=Puede encontrar opciones para notificaciones por correo electrónico habilitando y configurando el módulo "Notificación".
-ListOfNotificationsPerUser=Lista de notificaciones por usuario *
-ListOfNotificationsPerUserOrContact=Lista de notificaciones (eventos) disponibles por usuario * o por contacto **
-ListOfFixedNotifications=Lista de notificaciones fijas
 GoOntoUserCardToAddMore=Vaya a la pestaña "Notificaciones" de un usuario para agregar o eliminar notificaciones para usuarios
 GoOntoContactCardToAddMore=Vaya a la pestaña "Notificaciones" de un cliente / proveedor para eliminar o eliminar notificaciones de contactos / direcciones
 Threshold=Límite
diff --git a/htdocs/langs/es_ES/accountancy.lang b/htdocs/langs/es_ES/accountancy.lang
index c98d1b1ed99..cf6f11de763 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
-Nature=Naturaleza
+NatureOfJournal=Nature of Journal
 AccountingJournalType1=Operaciones varias
 AccountingJournalType2=Ventas
 AccountingJournalType3=Compras
@@ -291,6 +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_openconcerto=Exportar a OpenConcerto (En pruebas)
 Modelcsv_configurable=Exportación CSV Configurable
 Modelcsv_FEC=Exportación FEC
@@ -301,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=Esta página se puede usar para configurar los parámetros que se usarán para incluir un balance general.
+DefaultClosureDesc=This page can be used to set parameters used for accounting closures.
 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 edbac2e2781..e801f9609f6 100644
--- a/htdocs/langs/es_ES/admin.lang
+++ b/htdocs/langs/es_ES/admin.lang
@@ -574,7 +574,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=Notificaciones
+Module600Name=Notifications on business event
 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,6 +1193,7 @@ ExtraFieldsSupplierOrders=Campos adicionales (pedidos a proveedores)
 ExtraFieldsSupplierInvoices=Campos adicionales (facturas)
 ExtraFieldsProject=Campos adicionales (proyectos)
 ExtraFieldsProjectTask=Campos adicionales (tareas)
+ExtraFieldsSalaries=Complementary attributes (salaries)
 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>.
@@ -1220,13 +1221,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.
-NbOfProductIsLowerThanNoPb=Tiene %s productos/servicios en su base de datos. No es necesaria ninguna optimización en particular.
+NbOfObjectIsLowerThanNoPb=You have only %s %s in the database. This does not require any particular optimization.
 SearchOptim=Buscar optimización
-YouHaveXProductUseSearchOptim=Tiene %s productos en su base de datos. Debería añadir la constante PRODUCT_DONOTSEARCH_ANYWHERE 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.
+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.
 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.
-XDebugInstalled=XDebug está cargado.
-XCacheInstalled=XCache está cargado
+PHPModuleLoaded=PHP component %s is loaded
+PreloadOPCode=Preloaded OPCode is used
 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.
@@ -1734,9 +1736,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=Listado de notificaciones por usuario*
-ListOfNotificationsPerUserOrContact=Listado de notificaciones (eventos) por usuario* o por contacto**
-ListOfFixedNotifications=Listado de notificaciones fijas
+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
 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
@@ -1898,6 +1900,11 @@ 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.
+Protanopia=Protanopia
+Deuteranopes=Deuteranopes
+Tritanopes=Tritanopes
 ThisValueCanOverwrittenOnUserLevel=Este valor puede ser cambiado por cada usuario desde su página - tab ' 1%s '
 DefaultCustomerType=Tipo de Tercero por defecto para el formulario de creación de "Nuevo cliente"
 ABankAccountMustBeDefinedOnPaymentModeSetup=Nota: Debe indicarse la cuenta bancaria en el módulo de cada modo de pago (Paypal, Stripe, ...) para que esta función funcione.
@@ -1911,7 +1918,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.
-DebugBarModuleActivated=El módulo debugbar está activado y ralentiza dramáticamente la interfaz
+ModuleActivated=Module %s is activated and slows the interface
 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
@@ -1928,3 +1935,5 @@ 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
diff --git a/htdocs/langs/es_ES/bills.lang b/htdocs/langs/es_ES/bills.lang
index fe375fa91c3..0d5289285aa 100644
--- a/htdocs/langs/es_ES/bills.lang
+++ b/htdocs/langs/es_ES/bills.lang
@@ -95,6 +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'
 ClassifyPaidPartially=Clasificar 'Pagado parcialmente'
 ClassifyCanceled=Clasificar 'Abandonado'
 ClassifyClosed=Clasificar 'Cerrado'
@@ -214,6 +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
 ShowPayment=Ver pago
 AlreadyPaid=Ya pagado
 AlreadyPaidBack=Ya reembolsado
diff --git a/htdocs/langs/es_ES/errors.lang b/htdocs/langs/es_ES/errors.lang
index bc43d68b263..10f6d76c63d 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=La configuración del módulo parece incompleta. Vaya a Inicio - Configuración - Módulos para completarla.
+ErrorModuleSetupNotComplete=Setup of module %s looks to be uncomplete. Go on Home - Setup - Modules to complete.
 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
@@ -219,6 +219,7 @@ 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.
 # 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=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 46a4e6b3eda..525c46746fb 100644
--- a/htdocs/langs/es_ES/main.lang
+++ b/htdocs/langs/es_ES/main.lang
@@ -445,6 +445,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
 ActionsOnMember=Eventos respecto a este miembro
 ActionsOnProduct=Eventos sobre este producto
 NActionsLate=%s en retraso
@@ -759,6 +760,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
 CreateDraft=Crear borrador
 SetToDraft=Volver a borrador
 ClickToEdit=Clic para editar
diff --git a/htdocs/langs/es_ES/products.lang b/htdocs/langs/es_ES/products.lang
index 68d21c54e3c..e97d80073d5 100644
--- a/htdocs/langs/es_ES/products.lang
+++ b/htdocs/langs/es_ES/products.lang
@@ -2,6 +2,7 @@
 ProductRef=Ref. producto
 ProductLabel=Etiqueta producto
 ProductLabelTranslated=Traducción etiqueta de producto
+ProductDescription=Product description
 ProductDescriptionTranslated=Traducción descripción de producto
 ProductNoteTranslated=Traducción notas de producto
 ProductServiceCard=Ficha producto/servicio
diff --git a/htdocs/langs/es_ES/stripe.lang b/htdocs/langs/es_ES/stripe.lang
index de38ab59e7a..65ca60c3c51 100644
--- a/htdocs/langs/es_ES/stripe.lang
+++ b/htdocs/langs/es_ES/stripe.lang
@@ -65,3 +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>
diff --git a/htdocs/langs/es_ES/withdrawals.lang b/htdocs/langs/es_ES/withdrawals.lang
index e31170475ac..c83868a0dc0 100644
--- a/htdocs/langs/es_ES/withdrawals.lang
+++ b/htdocs/langs/es_ES/withdrawals.lang
@@ -76,7 +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=RUM
+RUM=Unique Mandate Reference (UMR)
+DateRUM=Mandate signature date
 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/es_MX/accountancy.lang b/htdocs/langs/es_MX/accountancy.lang
index d712bd5c6c4..d7f786c2198 100644
--- a/htdocs/langs/es_MX/accountancy.lang
+++ b/htdocs/langs/es_MX/accountancy.lang
@@ -56,7 +56,6 @@ AccountingJournalType5=Informe de gastos
 AccountingJournalType9=Tiene nuevo
 ErrorAccountingJournalIsAlreadyUse=Este diario ya está en uso
 ExportDraftJournal=Exportar borrador de diario
-DefaultClosureDesc=This page can be used to set parameters to use to enclose a balance sheet.
 SomeMandatoryStepsOfSetupWereNotDone=Algunos pasos obligatorios de la instalación no se realizaron, favor de completar
 ExportNotSupported=El formato de exportación configurado no se admite en esta página
 NoJournalDefined=Ningún diario definido
diff --git a/htdocs/langs/es_MX/admin.lang b/htdocs/langs/es_MX/admin.lang
index 6c0f8fd1ec9..f89282ac0f6 100644
--- a/htdocs/langs/es_MX/admin.lang
+++ b/htdocs/langs/es_MX/admin.lang
@@ -1,10 +1,12 @@
 # Dolibarr language file - Source file is en_US - admin
 VersionProgram=Versión del programa
+VersionLastInstall=Instalar la versión inicial
+VersionLastUpgrade=Actualizar a la Versión mâs reciente
 FileCheck=Comprobación de integridad del conjunto de archivos
 FileCheckDesc=Esta herramienta te permite comprobar la integridad de los archivos y la configuración de tu aplicación, comparando cada archivo con el archivo oficial. El valor de algunas constantes de la configuración también podria ser comprobado. Tu puedes usar esta herramienta para determinar si cualquiera de los archivos a sido modificado (ejem. por un hacker).
 FileIntegrityIsStrictlyConformedWithReference=La integridad de los archivos está estrictamente conformada con la referencia.
+FileIntegrityIsOkButFilesWereAdded=La comprobación de la integridad de archivos ha terminado, sin embargo algunos archivos nuevos han sido agregados.
 FileIntegritySomeFilesWereRemovedOrModified=La verificación de integridad de los archivos ha fallado. Algunos archivos fueron modificados, eliminados o agregados.
-GlobalChecksum=Checksum global
 MakeIntegrityAnalysisFrom=Hacer análisis de integridad de los archivos de la aplicación de
 LocalSignature=Firma local integrada (menos confiable)
 RemoteSignature=Firma remota distante (mas confiable)
@@ -29,7 +31,7 @@ ClientSortingCharset=Recopilación del cliente
 WarningModuleNotActive=El módulo <b>%s</b> debe estar habilitado
 WarningOnlyPermissionOfActivatedModules=Sólo los permisos relacionados a los módulos activados son mostrados aquí. Puedes activar otros módulos en la página Inicio->Configuración->Módulos
 DolibarrSetup=Instalación o actualización de Dolibarr
-UploadNewTemplate=Subir nueva(s) plantilla(s)
+UploadNewTemplate=Cargar plantilla(s) nuevas
 FormToTestFileUploadForm=Formulario para probar la carga de archivos (según la configuración)
 IfModuleEnabled=Nota: sí es efectivo sólo si el módulo <b>%s</b> está activado
 RemoveLock=Remover/renombrar archivo <b>%s</b> si existe, para permitir el uso de la herramienta Actualizar/Instalar.
@@ -41,19 +43,28 @@ ErrorModuleRequireDolibarrVersion=Error, éste módulo requiere Dolibarr versió
 ErrorDecimalLargerThanAreForbidden=Error, una precisión superior a <b>%s</b> no es soportada.
 DictionarySetup=Configurar diccionario
 ErrorReservedTypeSystemSystemAuto=Los valores de tipo 'system' y 'systemauto' están reservados. Puedes usar 'user' como valor para añadir tu propio registro
+DisableJavascript=Deshabilitar funciones JavaScript y Ajax
+DisableJavascriptNote=Nota: Para propósito de prueba o depuración. Para optimización para una persona invidente o navegadores de texto, tu podrías  preferir usar el ajuste en el perfil de usuario
 UseSearchToSelectCompanyTooltip=Asi mismo si tu tienes un gran número de terceras partes (> 100 000), puedes incrementar la velocidad al establecer la constante COMPANY_DONOTSEARCH_ANYWHERE to 1 en Configuración->Otro. La búsqueda entonces será limitada al inicio de la cadena.
 DelaiedFullListToSelectCompany=Esperar hasta que una tecla sea presionada antes de cargar contenido del listado desplegable de terceros.<br>Esto podria incrementar el desempeño si tu tienes un gran numero de terceros, pero no se recomienda.
 DelaiedFullListToSelectContact=Esperar hasta que una tecla sea presionada antes de cargar contenido del listado desplegable de contactos.<br>Esto podria incrementar el desempeño si tu tienes un gran numero de contactos, pero no se recomienda)
+NumberOfKeyToSearch=Numero de caracteres para activar la búsqueda %s
+NumberOfBytes=Numero de Octetos
+SearchString=Cadena de búsqueda
 NotAvailableWhenAjaxDisabled=No disponible cuando Ajax está desactivado
+AllowToSelectProjectFromOtherCompany=En documento de un tercero, puede seleccionar un proyecto ligado a otro tercero
 JavascriptDisabled=JavaScript desactivado
 UsePreviewTabs=Utilizar pestañas de vista previa
 ShowPreview=Mostrar previsualización
-ThemeCurrentlyActive=Tema activo
 CurrentTimeZone=Zona horaria PHP (servidor)
+TZHasNoEffect=Las fechas son guardadas y retornadas por el servidor de base de datos como si fueran guardadas como cadenas sometidas. La zona horaria tiene efecto solo cuando usamos la función UNIX_TIMESTAMP (que no debe ser usada por Dolibarr, ya que TZ no debe tener efecto, incluso si cambió despues de que datos fueron ingresados).
 Space=Espacio
 NextValue=Valor siguiente
 NextValueForInvoices=Valor siguiente (facturas)
 NextValueForCreditNotes=Valor siguiente (notas de crédito)
+NextValueForDeposit=Valor siguiente (pago inicial)
+NextValueForReplacements=Valor siguiente (sustituciones)
+MustBeLowerThanPHPLimit=Nota: <b>tu</b> configuración PHP actualmente limita el máximo tamaño de fichero para subir a <b>%s</b> %s, independientemente de el valor de este parametro
 NoMaxSizeByPHPLimit=Nota: No hay límite establecido en la configuración de PHP
 MaxSizeForUploadedFiles=El tamaño máximo para los archivos subidos (0 para no permitir ninguna carga)
 UseCaptchaCode=Utilizar el código gráfico (CAPTCHA) en la página de inicio de sesión
@@ -63,6 +74,7 @@ AntiVirusParam=Más parámetros de línea de comandos
 AntiVirusParamExample=Ejemplo para ClamWin: --database="C:\\Archivos de programa (x86)\\ClamWin\\lib"
 ComptaSetup=Establecer modulo de Contabilidad
 UserSetup=Establecer usuario Administrador
+MultiCurrencySetup=Configurar multidivisas
 MenuLimits=Limites y exactitud
 MenuIdParent=ID del menu padre
 DetailMenuIdParent=ID de menú padre (vacante para un menú principal)
@@ -70,16 +82,26 @@ DetailPosition=Clasificar cantidad para definir posición del menú
 AllMenus=Todo
 NotConfigured=Modulo/Aplicación no configurado
 SetupShort=Configuración
+OtherSetup=Otra configuración
 CurrentValueSeparatorThousand=Separador millar
+Destination=Destino
+IdModule=ID del módulo
+IdPermissions=ID de permisos
 LanguageBrowserParameter=Parámetro %s
+LocalisationDolibarrParameters=Parametros de localización
 ClientTZ=Zona Horaria cliente (usuario)
 OSTZ=Servidor OS Zona Horaria
 PHPTZ=Servidor PHP Zona Horaria
 DaylingSavingTime=Hora de verano
 CurrentSessionTimeOut=Sesión actual pausada
+YouCanEditPHPTZ=Para establecer un zona horaria PHP diferente (no necesario), puedes intentar agregar un archivo .htaccess con una linea como "SetEnv TZ Europe/Paris"
+HoursOnThisPageAreOnServerTZ=Advertencia, a diferencia de otros monitores, las horas en esta página no estan en tu zona horaria local, sino en la zona horaria del servidor.
+MaxNbOfLinesForBoxes=Maximo. número de lineas para dispositivos
+AllWidgetsWereEnabled=Todos los dispositivos disponibles estan habilitados
 PositionByDefault=Pedido por defecto
 Position=Puesto
 MenusDesc=Administradores de menú establecen contenido de las dos barras de menú (horizontal y vertical)
+MenusEditorDesc=El editor de menú  permite definir ingresos de menú personalizado. Usarse con cuidado para evitar inestabilidad y permanente incapacidad de ingresar al menú. <br>Algunos módulos  agregan ingresos  (in menu  <b>All</b> mostly). Si tu eliminas algunos de estos ingresos por error, puedes restaurarlos desabilitando y rehabilitando el módulo.
 MenuForUsers=Menú para usuarios
 LangFile=Archivo .lang
 Language_en_US_es_MX_etc=Lenguaje (en_US, es_MX, ...)
@@ -87,9 +109,13 @@ SystemInfo=Información del sistema
 SystemToolsArea=Área de herramientas del sistema
 SystemToolsAreaDesc=Esta área provee funciones administrativas. Usar el menú  para seleccionar la característica requerida.
 PurgeAreaDesc=Esta página te permite eliminar todos los archivos generados o guardados por Dolibarr (archivos temporales o todos los archivos en <b>%s</b> el directorio). Usar esta característica no es normalmente necesario. Esta es proporcionada como una solución alternativa para usuarios cuyo Dolibarr es hospedado por un proveedor que no ofrece permisos de borrado de archivos generados por el servidor web.
+PurgeDeleteLogFile=Eliminar archivos log, incluyendo <b>%s</b> definido por módulo Syslog (sin riesgo de perdida de datos)
+PurgeDeleteTemporaryFiles=Eliminar todos los archivos temporales (sin riesgo de perdida de datos). Nota: La eliminación es hecha solo si el directorio temporal fue creado 24 horas antes.
+PurgeDeleteAllFilesInDocumentsDir=Eliminar todos los archivos en el directorio: <b>%s</b>.<br>Esto borrara todos los documentos generados relacionados a elementos (terceras partes, facturas etc...), archivos subidos a el  módulo ECM, volcados de respaldo de base de datos y archivos temporales.
 PurgeRunNow=Purgar ahora
 PurgeNothingToDelete=Ningún directorio o archivos que desee eliminar.
 PurgeNDirectoriesDeleted=<B> %s </b> archivos o directorios eliminados.
+PurgeNDirectoriesFailed=Error al  eliminar <b>%s</b> archivos o directorios.
 PurgeAuditEvents=Purgar todos los eventos de seguridad
 ConfirmPurgeAuditEvents=¿Está seguro de que desea eliminar todos los eventos de seguridad? Todos los registros de seguridad se eliminarán, no se eliminarán otros datos.
 Backup=Copia de Seguridad
@@ -97,10 +123,14 @@ Restore=Restaurar
 RunCommandSummary=Se ha iniciado la copia de seguridad con el siguiente comando
 BackupResult=Resultado de copia de seguridad
 BackupFileSuccessfullyCreated=Archivo de copia de seguridad generado correctamente
+YouCanDownloadBackupFile=Los archivos generados ahora pueden ser descargados
 NoBackupFileAvailable=No hay archivos de copia de seguridad disponibles.
 ToBuildBackupFileClickHere=Para crear un archivo de copia de seguridad, haga clic <a href="%s"> aquí </a>.
-ImportPostgreSqlDesc=Para importar un archivo de respaldo, debe usar el comando pg_restore en la linea de comandos:
+ImportMySqlDesc=Para importar un archivo de respaldo de MySQL, tu podrias usar phpMyAdmin via tu proveedor de hosting o usar el comando mysql de la linea de Comandos.<br>Por ejemplo:
+ImportPostgreSqlDesc=Para importar un archivo de respaldo, debes usar el comando pg_restore en la linea de comandos:
 ImportMySqlCommand=%s %s < miarchivoderespaldo.sql
+ImportPostgreSqlCommand=%s %s miarchivoderespaldo.sql
+FileNameToGenerate=Nombre de archivo para copia de respaldo:
 CommandsToDisableForeignKeysForImport=Comando para deshabilitar claves foráneas en la importación
 CommandsToDisableForeignKeysForImportWarning=Obligatorio si desea restaurar su copia de seguridad de SQL más tarde
 MySqlExportParameters=Parámetros de exportación de MySQL
@@ -110,7 +140,12 @@ FullPathToPostgreSQLdumpCommand=Ruta completa del comando pg_dump
 AddDropDatabase=Agregar comando DROP DATABASE
 AddDropTable=Agregar comando DROP TABLE
 NameColumn=Nombre de columnas
-EncodeBinariesInHexa=Convertir datos binarios en hexadecimal
+EncodeBinariesInHexa=Codificar datos binarios en hexadecimal
+IgnoreDuplicateRecords=Ignorar errores de registro duplicados (INSERT IGNORE)
+AutoDetectLang=Autodetectar (lenguaje del navegador)
+FeatureDisabledInDemo=Característica deshabilitada en versión demo
+FeatureAvailableOnlyOnStable=Característica unicamente disponible en versiones oficiales estables
+BoxesDesc=Widgets son componentes mostrando alguna información que tu puedes agregar para personalizar algunas páginas. Tu puedes elegir entre mostrar el widget o no al seleccionar la página objetivo y haciendo click en 'Activar', o haciendo click en la papelera de reciclaje para deshabilitarlos.
 OnlyActiveElementsAreShown=Solo elementos de <a href="%s">\nmodulos habilitados</a> son\n mostrados.
 ModulesDesc=Los módulos/aplicaciones determinan qué funciones están disponibles en el software. Algunos módulos requieren que se otorguen permisos a los usuarios después de activar el módulo. Haga clic en el botón de encendido/apagado (al final de la línea del módulo) para habilitar/deshabilitar un módulo/aplicación.
 ModulesMarketPlaceDesc=Tu puedes encontrar mas módulos para descargar en sitios web externos en el Internet
@@ -131,8 +166,6 @@ DictionaryProspectStatus=Estatus del cliente potencial
 Upgrade=Actualizar
 LDAPFieldFirstName=Nombre(s)
 AGENDA_SHOW_LINKED_OBJECT=Mostrar objeto vinculado en la vista de agenda
-ListOfNotificationsPerUserOrContact=List of notifications (events) available per user* or per contact**
-ListOfFixedNotifications=List of Fixed Notifications
 ConfFileMustContainCustom=Instalar o construir un módulo externo desde la aplicación necesita guardar los archivos del módulo en el directorio <strong> %s </strong>. Para que este directorio sea procesado por Dolibarr, debe configurar su <strong> conf/conf.php </strong> para agregar las 2 líneas de directiva: <strong> $dolibarr_main_url_root_alt='/custom'; </strong> <br> <strong> $dolibarr_main_document_root_alt='%s/custom'; </strong>
 MailToSendProposal=Propuestas de clientes
 MailToSendInvoice=Facturas de clientes
diff --git a/htdocs/langs/es_PA/admin.lang b/htdocs/langs/es_PA/admin.lang
index a4a7a82aaa0..5f6898087d4 100644
--- a/htdocs/langs/es_PA/admin.lang
+++ b/htdocs/langs/es_PA/admin.lang
@@ -1,5 +1,3 @@
 # Dolibarr language file - Source file is en_US - admin
 VersionUnknown=Desconocido
-ListOfNotificationsPerUserOrContact=List of notifications (events) available per user* or per contact**
-ListOfFixedNotifications=List of Fixed Notifications
 OperationParamDesc=Define values to use for action, or how to extract values. For example:<br>objproperty1=SET:abc<br>objproperty1=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:abc<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey.*[^\\s]+(.*)<br>options_myextrafield=EXTRACT:SUBJECT:([^\\s]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
diff --git a/htdocs/langs/es_PE/accountancy.lang b/htdocs/langs/es_PE/accountancy.lang
index 24d7b8e4f3b..50f3ac66aa1 100644
--- a/htdocs/langs/es_PE/accountancy.lang
+++ b/htdocs/langs/es_PE/accountancy.lang
@@ -44,4 +44,3 @@ Sens=Significado
 Codejournal=Periódico
 FinanceJournal=Periodo Financiero
 TotalMarge=Margen total de ventas
-DefaultClosureDesc=This page can be used to set parameters to use to enclose a balance sheet.
diff --git a/htdocs/langs/es_PE/admin.lang b/htdocs/langs/es_PE/admin.lang
index 0f15310bb3a..cc415c6dda9 100644
--- a/htdocs/langs/es_PE/admin.lang
+++ b/htdocs/langs/es_PE/admin.lang
@@ -5,6 +5,4 @@ Permission93=Eliminar impuestos e IGV
 DictionaryVAT=Tasa de IGV (Impuesto sobre ventas en EEUU)
 UnitPriceOfProduct=Precio unitario sin IGV de un producto
 OptionVatMode=Opción de carga de IGV
-ListOfNotificationsPerUserOrContact=List of notifications (events) available per user* or per contact**
-ListOfFixedNotifications=List of Fixed Notifications
 OperationParamDesc=Define values to use for action, or how to extract values. For example:<br>objproperty1=SET:abc<br>objproperty1=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:abc<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey.*[^\\s]+(.*)<br>options_myextrafield=EXTRACT:SUBJECT:([^\\s]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
diff --git a/htdocs/langs/es_VE/admin.lang b/htdocs/langs/es_VE/admin.lang
index 4daf55ade15..9d3c0f25368 100644
--- a/htdocs/langs/es_VE/admin.lang
+++ b/htdocs/langs/es_VE/admin.lang
@@ -32,6 +32,4 @@ WatermarkOnDraftSupplierProposal=Marca de agua en solicitudes de precios a prove
 LDAPMemberObjectClassListExample=Lista de ObjectClass que definen los atributos de un registro (ej: top,inetOrgPerson o top,user for active directory)
 LDAPUserObjectClassListExample=Lista de ObjectClass que definen los atributos de un registro (ej: top,inetOrgPerson o top,user for active directory)
 LDAPContactObjectClassListExample=Lista de objectClass que definen los atributos de un registro (ej: top,inetOrgPerson o top,user for active directory)
-ListOfNotificationsPerUserOrContact=List of notifications (events) available per user* or per contact**
-ListOfFixedNotifications=List of Fixed Notifications
 OperationParamDesc=Define values to use for action, or how to extract values. For example:<br>objproperty1=SET:abc<br>objproperty1=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:abc<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey.*[^\\s]+(.*)<br>options_myextrafield=EXTRACT:SUBJECT:([^\\s]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
diff --git a/htdocs/langs/et_EE/accountancy.lang b/htdocs/langs/et_EE/accountancy.lang
index 69bb680becb..25f67e0e93d 100644
--- a/htdocs/langs/et_EE/accountancy.lang
+++ b/htdocs/langs/et_EE/accountancy.lang
@@ -265,7 +265,7 @@ AccountingJournals=Accounting journals
 AccountingJournal=Accounting journal
 NewAccountingJournal=New accounting journal
 ShowAccoutingJournal=Show accounting journal
-Nature=Loomus
+NatureOfJournal=Nature of Journal
 AccountingJournalType1=Miscellaneous operations
 AccountingJournalType2=Müügid
 AccountingJournalType3=Ostud
@@ -291,6 +291,7 @@ Modelcsv_quadratus=Export for Quadratus QuadraCompta
 Modelcsv_ebp=Export for EBP
 Modelcsv_cogilog=Export for Cogilog
 Modelcsv_agiris=Export for Agiris
+Modelcsv_LDCompta=Export for LD Compta (v9 & higher) (Test)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
@@ -301,7 +302,7 @@ ChartofaccountsId=Chart of accounts Id
 InitAccountancy=Init accountancy
 InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accounting account defined for sales and purchases.
 DefaultBindingDesc=This page can be used to set a default account to use to link transactions record about payment salaries, donation, taxes and vat when no specific accounting account were already set.
-DefaultClosureDesc=This page can be used to set parameters to use to enclose a balance sheet.
+DefaultClosureDesc=This page can be used to set parameters used for accounting closures.
 Options=Options
 OptionModeProductSell=Mode sales
 OptionModeProductSellIntra=Mode sales exported in EEC
diff --git a/htdocs/langs/et_EE/admin.lang b/htdocs/langs/et_EE/admin.lang
index bb4631de3fe..b9def779562 100644
--- a/htdocs/langs/et_EE/admin.lang
+++ b/htdocs/langs/et_EE/admin.lang
@@ -574,7 +574,7 @@ Module510Name=Palgad
 Module510Desc=Record and track employee payments
 Module520Name=Loans
 Module520Desc=Management of loans
-Module600Name=Teated
+Module600Name=Notifications on business event
 Module600Desc=Send email notifications triggered by a business event: per user (setup defined on each user), per third-party contacts (setup defined on each third party) or by specific emails
 Module600Long=Note that this module sends emails in real-time when a specific business event occurs. If you are looking for a feature to send email reminders for agenda events, go into the setup of module Agenda.
 Module610Name=Product Variants
@@ -1193,6 +1193,7 @@ ExtraFieldsSupplierOrders=Täiendavad atribuudid (orders e tellimused)
 ExtraFieldsSupplierInvoices=Täiendavad atribuudid (invoices e arved)
 ExtraFieldsProject=Täiendavad atribuudid (projects e projektid)
 ExtraFieldsProjectTask=Täiendavad atribuudid (tasks e ülesanded)
+ExtraFieldsSalaries=Complementary attributes (salaries)
 ExtraFieldHasWrongValue=Atribuudil %s on vale väärtus.
 AlphaNumOnlyLowerCharsAndNoSpace=ainult tühikuteta väikesed tähed ja numbrid
 SendmailOptionNotComplete=Hoiatus: mõnedel Linuxi süsteemidel peab e-kirja saatmiseks sendmaili käivitamise seadistus sisaldama võtit -ba (php.ini failis parameeter mail.force_extra_parameters). Kui mõned adressaadid ei saa kunagi kirju kätte, siis proovi parameetri väärtust mail.force_extra_parameters = -ba
@@ -1220,13 +1221,14 @@ SuhosinSessionEncrypt=Sessiooni andmehoidla krüpteeritud Suhosini poolt
 ConditionIsCurrently=Olek on hetkel %s
 YouUseBestDriver=You use driver %s which is the best driver currently available.
 YouDoNotUseBestDriver=You use driver %s but driver %s is recommended.
-NbOfProductIsLowerThanNoPb=You have only %s products/services in the database. This does not require any particular optimization.
+NbOfObjectIsLowerThanNoPb=You have only %s %s in the database. This does not require any particular optimization.
 SearchOptim=Otsingu optimeerimine
-YouHaveXProductUseSearchOptim=You have %s products in the database. You should add the constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+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.
 BrowserIsOK=You are using the %s web browser. This browser is ok for security and performance.
 BrowserIsKO=You are using the %s web browser. This browser is known to be a bad choice for security, performance and reliability. We recommend using Firefox, Chrome, Opera or Safari.
-XDebugInstalled=XDebug on laetud.
-XCacheInstalled=XCache on laetud.
+PHPModuleLoaded=PHP component %s is loaded
+PreloadOPCode=Preloaded OPCode is used
 AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.<br>Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp".
 AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".
 AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties.
@@ -1734,9 +1736,9 @@ ExpenseReportsRulesSetup=Setup of module Expense Reports - Rules
 ExpenseReportNumberingModules=Expense reports numbering module
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
 YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for email notifications by enabling and configuring the module "Notification".
-ListOfNotificationsPerUser=List of notifications per user*
-ListOfNotificationsPerUserOrContact=List of notifications (events) available per user* or per contact**
-ListOfFixedNotifications=List of Fixed Notifications
+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
 GoOntoUserCardToAddMore=Go to the tab "Notifications" of a user to add or remove notifications for users
 GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
 Threshold=Threshold
@@ -1898,6 +1900,11 @@ OnMobileOnly=On small screen (smartphone) only
 DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be Prospect or Customer but can't be both)
 MAIN_OPTIMIZEFORTEXTBROWSER=Simplify interface for blind person
 MAIN_OPTIMIZEFORTEXTBROWSERDesc=Enable this option if you are a blind person, or if you use the application from a text browser like Lynx or 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
 ThisValueCanOverwrittenOnUserLevel=This value can be overwritten by each user from its user page - tab '%s'
 DefaultCustomerType=Default thirdparty type for "New customer" creation form
 ABankAccountMustBeDefinedOnPaymentModeSetup=Note: The bank account must be defined on the module of each payment mode (Paypal, Stripe, ...) to have this feature working.
@@ -1911,7 +1918,7 @@ LogsLinesNumber=Number of lines to show on logs tab
 UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
-DebugBarModuleActivated=Module debugbar is activated and slows dramaticaly the interface
+ModuleActivated=Module %s is activated and slows the interface
 EXPORTS_SHARE_MODELS=Export models are share with everybody
 ExportSetup=Setup of module Export
 InstanceUniqueID=Unique ID of the instance
@@ -1928,3 +1935,5 @@ 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
diff --git a/htdocs/langs/et_EE/bills.lang b/htdocs/langs/et_EE/bills.lang
index e7d4083a6a7..746bfe32149 100644
--- a/htdocs/langs/et_EE/bills.lang
+++ b/htdocs/langs/et_EE/bills.lang
@@ -95,6 +95,7 @@ PaymentHigherThanReminderToPay=Makse on suurem, kui makstava summa jääk
 HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess received for each overpaid invoice.
 HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess paid for each overpaid invoice.
 ClassifyPaid=Liigita 'Makstud'
+ClassifyUnPaid=Classify 'Unpaid'
 ClassifyPaidPartially=Liigita 'Osaliselt makstud'
 ClassifyCanceled=Liigita 'Hüljatud'
 ClassifyClosed=Liigita 'Suletud'
@@ -214,6 +215,20 @@ ShowInvoiceReplace=Näita asendusarvet
 ShowInvoiceAvoir=Näita kreeditarvet
 ShowInvoiceDeposit=Show down payment invoice
 ShowInvoiceSituation=Show situation invoice
+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
 ShowPayment=Näita makset
 AlreadyPaid=Juba makstud
 AlreadyPaidBack=Juba tagasi makstud
diff --git a/htdocs/langs/et_EE/errors.lang b/htdocs/langs/et_EE/errors.lang
index 886c3e18f8a..f307abe2390 100644
--- a/htdocs/langs/et_EE/errors.lang
+++ b/htdocs/langs/et_EE/errors.lang
@@ -90,7 +90,7 @@ ErrorSpecialCharNotAllowedForField="%s" väljal ei ole erisümbolid lubatud
 ErrorNumRefModel=Andmebaasi viide on juba olemas (%s) ja ei ole kooskõlas antud numeratsiooni reegliga. Kustuta kirje või nimeta viide ümber antud mooduli aktiveerimiseks.
 ErrorQtyTooLowForThisSupplier=Quantity too low for this vendor or no price defined on this product for this vendor
 ErrorOrdersNotCreatedQtyTooLow=Some orders haven't been created because of too-low quantities
-ErrorModuleSetupNotComplete=Setup of module looks to be uncomplete. Go on Home - Setup - Modules to complete.
+ErrorModuleSetupNotComplete=Setup of module %s looks to be uncomplete. Go on Home - Setup - Modules to complete.
 ErrorBadMask=Maski viga
 ErrorBadMaskFailedToLocatePosOfSequence=Viga: mask on järjekorranumbrita
 ErrorBadMaskBadRazMonth=Viga: halb lähteväärtus
@@ -219,6 +219,7 @@ 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.
 # 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.
 WarningMandatorySetupNotComplete=Click here to setup mandatory parameters
 WarningEnableYourModulesApplications=Click here to enable your modules and applications
diff --git a/htdocs/langs/et_EE/main.lang b/htdocs/langs/et_EE/main.lang
index 045be9f36b2..426c182d98f 100644
--- a/htdocs/langs/et_EE/main.lang
+++ b/htdocs/langs/et_EE/main.lang
@@ -445,6 +445,7 @@ ContactsAddressesForCompany=Selle kolmanda isikuga seotud kontaktid/aadressid
 AddressesForCompany=Selle kolmanda isikuga seotud aadressid
 ActionsOnCompany=Events for this third party
 ActionsOnContact=Events for this contact/address
+ActionsOnContract=Events for this contract
 ActionsOnMember=Selle liikmega seotud tegevused
 ActionsOnProduct=Events about this product
 NActionsLate=%s hiljaks jäänud
@@ -759,6 +760,7 @@ LinkToSupplierProposal=Link to vendor proposal
 LinkToSupplierInvoice=Link to vendor invoice
 LinkToContract=Link to contract
 LinkToIntervention=Link to intervention
+LinkToTicket=Link to ticket
 CreateDraft=Loo mustand
 SetToDraft=Tagasi mustandiks
 ClickToEdit=Klõpsa muutmiseks
diff --git a/htdocs/langs/et_EE/products.lang b/htdocs/langs/et_EE/products.lang
index d488dbb1fea..e886aa2d56e 100644
--- a/htdocs/langs/et_EE/products.lang
+++ b/htdocs/langs/et_EE/products.lang
@@ -2,6 +2,7 @@
 ProductRef=Toote viide
 ProductLabel=Toote nimi
 ProductLabelTranslated=Translated product label
+ProductDescription=Product description
 ProductDescriptionTranslated=Translated product description
 ProductNoteTranslated=Translated product note
 ProductServiceCard=Toodete/teenuste kaart
diff --git a/htdocs/langs/et_EE/stripe.lang b/htdocs/langs/et_EE/stripe.lang
index 0f080da0b2b..229e5a475d1 100644
--- a/htdocs/langs/et_EE/stripe.lang
+++ b/htdocs/langs/et_EE/stripe.lang
@@ -65,3 +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>
diff --git a/htdocs/langs/et_EE/withdrawals.lang b/htdocs/langs/et_EE/withdrawals.lang
index 529e07d3ffe..66b4596dafd 100644
--- a/htdocs/langs/et_EE/withdrawals.lang
+++ b/htdocs/langs/et_EE/withdrawals.lang
@@ -76,7 +76,8 @@ WithdrawalFile=Väljamaksete fail
 SetToStatusSent=Märgi staatuseks 'Fail saadetud'
 ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and will classify them as "Paid" if remain to pay is null
 StatisticsByLineStatus=Statistics by status of lines
-RUM=UMR
+RUM=Unique Mandate Reference (UMR)
+DateRUM=Mandate signature date
 RUMLong=Unique Mandate Reference
 RUMWillBeGenerated=If empty, a UMR (Unique Mandate Reference) will be generated once the bank account information is saved.
 WithdrawMode=Direct debit mode (FRST or RECUR)
diff --git a/htdocs/langs/eu_ES/accountancy.lang b/htdocs/langs/eu_ES/accountancy.lang
index 758d9c340a5..1fc3b3e05ec 100644
--- a/htdocs/langs/eu_ES/accountancy.lang
+++ b/htdocs/langs/eu_ES/accountancy.lang
@@ -265,7 +265,7 @@ AccountingJournals=Accounting journals
 AccountingJournal=Accounting journal
 NewAccountingJournal=New accounting journal
 ShowAccoutingJournal=Show accounting journal
-Nature=Nature
+NatureOfJournal=Nature of Journal
 AccountingJournalType1=Miscellaneous operations
 AccountingJournalType2=Sales
 AccountingJournalType3=Purchases
@@ -291,6 +291,7 @@ Modelcsv_quadratus=Export for Quadratus QuadraCompta
 Modelcsv_ebp=Export for EBP
 Modelcsv_cogilog=Export for Cogilog
 Modelcsv_agiris=Export for Agiris
+Modelcsv_LDCompta=Export for LD Compta (v9 & higher) (Test)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
@@ -301,7 +302,7 @@ ChartofaccountsId=Chart of accounts Id
 InitAccountancy=Init accountancy
 InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accounting account defined for sales and purchases.
 DefaultBindingDesc=This page can be used to set a default account to use to link transactions record about payment salaries, donation, taxes and vat when no specific accounting account were already set.
-DefaultClosureDesc=This page can be used to set parameters to use to enclose a balance sheet.
+DefaultClosureDesc=This page can be used to set parameters used for accounting closures.
 Options=Options
 OptionModeProductSell=Mode sales
 OptionModeProductSellIntra=Mode sales exported in EEC
diff --git a/htdocs/langs/eu_ES/admin.lang b/htdocs/langs/eu_ES/admin.lang
index 0fdb64717fc..d6df49511a8 100644
--- a/htdocs/langs/eu_ES/admin.lang
+++ b/htdocs/langs/eu_ES/admin.lang
@@ -574,7 +574,7 @@ Module510Name=Soldatak
 Module510Desc=Record and track employee payments
 Module520Name=Loans
 Module520Desc=Management of loans
-Module600Name=Jakinarazpenak
+Module600Name=Notifications on business event
 Module600Desc=Send email notifications triggered by a business event: per user (setup defined on each user), per third-party contacts (setup defined on each third party) or by specific emails
 Module600Long=Note that this module sends emails in real-time when a specific business event occurs. If you are looking for a feature to send email reminders for agenda events, go into the setup of module Agenda.
 Module610Name=Product Variants
@@ -1193,6 +1193,7 @@ ExtraFieldsSupplierOrders=Complementary attributes (orders)
 ExtraFieldsSupplierInvoices=Complementary attributes (invoices)
 ExtraFieldsProject=Complementary attributes (projects)
 ExtraFieldsProjectTask=Complementary attributes (tasks)
+ExtraFieldsSalaries=Complementary attributes (salaries)
 ExtraFieldHasWrongValue=Attribute %s has a wrong value.
 AlphaNumOnlyLowerCharsAndNoSpace=only alphanumericals and lower case characters without space
 SendmailOptionNotComplete=Warning, on some Linux systems, to send email from your email, sendmail execution setup must contains option -ba (parameter mail.force_extra_parameters into your php.ini file). If some recipients never receive emails, try to edit this PHP parameter with mail.force_extra_parameters = -ba).
@@ -1220,13 +1221,14 @@ SuhosinSessionEncrypt=Session storage encrypted by Suhosin
 ConditionIsCurrently=Condition is currently %s
 YouUseBestDriver=You use driver %s which is the best driver currently available.
 YouDoNotUseBestDriver=You use driver %s but driver %s is recommended.
-NbOfProductIsLowerThanNoPb=You have only %s products/services in the database. This does not require any particular optimization.
+NbOfObjectIsLowerThanNoPb=You have only %s %s in the database. This does not require any particular optimization.
 SearchOptim=Search optimization
-YouHaveXProductUseSearchOptim=You have %s products in the database. You should add the constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+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.
 BrowserIsOK=You are using the %s web browser. This browser is ok for security and performance.
 BrowserIsKO=You are using the %s web browser. This browser is known to be a bad choice for security, performance and reliability. We recommend using Firefox, Chrome, Opera or Safari.
-XDebugInstalled=XDebug is loaded.
-XCacheInstalled=XCache is loaded.
+PHPModuleLoaded=PHP component %s is loaded
+PreloadOPCode=Preloaded OPCode is used
 AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.<br>Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp".
 AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".
 AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties.
@@ -1734,9 +1736,9 @@ ExpenseReportsRulesSetup=Setup of module Expense Reports - Rules
 ExpenseReportNumberingModules=Expense reports numbering module
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
 YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for email notifications by enabling and configuring the module "Notification".
-ListOfNotificationsPerUser=List of notifications per user*
-ListOfNotificationsPerUserOrContact=List of notifications (events) available per user* or per contact**
-ListOfFixedNotifications=List of Fixed Notifications
+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
 GoOntoUserCardToAddMore=Go to the tab "Notifications" of a user to add or remove notifications for users
 GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
 Threshold=Threshold
@@ -1898,6 +1900,11 @@ OnMobileOnly=On small screen (smartphone) only
 DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be Prospect or Customer but can't be both)
 MAIN_OPTIMIZEFORTEXTBROWSER=Simplify interface for blind person
 MAIN_OPTIMIZEFORTEXTBROWSERDesc=Enable this option if you are a blind person, or if you use the application from a text browser like Lynx or 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
 ThisValueCanOverwrittenOnUserLevel=This value can be overwritten by each user from its user page - tab '%s'
 DefaultCustomerType=Default thirdparty type for "New customer" creation form
 ABankAccountMustBeDefinedOnPaymentModeSetup=Note: The bank account must be defined on the module of each payment mode (Paypal, Stripe, ...) to have this feature working.
@@ -1911,7 +1918,7 @@ LogsLinesNumber=Number of lines to show on logs tab
 UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
-DebugBarModuleActivated=Module debugbar is activated and slows dramaticaly the interface
+ModuleActivated=Module %s is activated and slows the interface
 EXPORTS_SHARE_MODELS=Export models are share with everybody
 ExportSetup=Setup of module Export
 InstanceUniqueID=Unique ID of the instance
@@ -1928,3 +1935,5 @@ 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
diff --git a/htdocs/langs/eu_ES/bills.lang b/htdocs/langs/eu_ES/bills.lang
index a90736a569d..a1f161e4119 100644
--- a/htdocs/langs/eu_ES/bills.lang
+++ b/htdocs/langs/eu_ES/bills.lang
@@ -95,6 +95,7 @@ PaymentHigherThanReminderToPay=Payment higher than reminder to pay
 HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess received for each overpaid invoice.
 HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess paid for each overpaid invoice.
 ClassifyPaid=Classify 'Paid'
+ClassifyUnPaid=Classify 'Unpaid'
 ClassifyPaidPartially=Classify 'Paid partially'
 ClassifyCanceled=Classify 'Abandoned'
 ClassifyClosed=Classify 'Closed'
@@ -214,6 +215,20 @@ ShowInvoiceReplace=Show replacing invoice
 ShowInvoiceAvoir=Show credit note
 ShowInvoiceDeposit=Show down payment invoice
 ShowInvoiceSituation=Show situation invoice
+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
 ShowPayment=Ordainketa erakutsi
 AlreadyPaid=Jada ordainduta
 AlreadyPaidBack=Already paid back
diff --git a/htdocs/langs/eu_ES/errors.lang b/htdocs/langs/eu_ES/errors.lang
index b5a9d70cb70..1ee46fdbb92 100644
--- a/htdocs/langs/eu_ES/errors.lang
+++ b/htdocs/langs/eu_ES/errors.lang
@@ -90,7 +90,7 @@ ErrorSpecialCharNotAllowedForField=Special characters are not allowed for field
 ErrorNumRefModel=A reference exists into database (%s) and is not compatible with this numbering rule. Remove record or renamed reference to activate this module.
 ErrorQtyTooLowForThisSupplier=Quantity too low for this vendor or no price defined on this product for this vendor
 ErrorOrdersNotCreatedQtyTooLow=Some orders haven't been created because of too-low quantities
-ErrorModuleSetupNotComplete=Setup of module looks to be uncomplete. Go on Home - Setup - Modules to complete.
+ErrorModuleSetupNotComplete=Setup of module %s looks to be uncomplete. Go on Home - Setup - Modules to complete.
 ErrorBadMask=Error on mask
 ErrorBadMaskFailedToLocatePosOfSequence=Error, mask without sequence number
 ErrorBadMaskBadRazMonth=Error, bad reset value
@@ -219,6 +219,7 @@ 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.
 # 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.
 WarningMandatorySetupNotComplete=Click here to setup mandatory parameters
 WarningEnableYourModulesApplications=Click here to enable your modules and applications
diff --git a/htdocs/langs/eu_ES/main.lang b/htdocs/langs/eu_ES/main.lang
index 3961eb46b5a..330e60e0320 100644
--- a/htdocs/langs/eu_ES/main.lang
+++ b/htdocs/langs/eu_ES/main.lang
@@ -445,6 +445,7 @@ ContactsAddressesForCompany=Contacts/addresses for this third party
 AddressesForCompany=Addresses for this third party
 ActionsOnCompany=Events for this third party
 ActionsOnContact=Events for this contact/address
+ActionsOnContract=Events for this contract
 ActionsOnMember=Events about this member
 ActionsOnProduct=Events about this product
 NActionsLate=%s late
@@ -759,6 +760,7 @@ LinkToSupplierProposal=Link to vendor proposal
 LinkToSupplierInvoice=Link to vendor invoice
 LinkToContract=Link to contract
 LinkToIntervention=Link to intervention
+LinkToTicket=Link to ticket
 CreateDraft=Create draft
 SetToDraft=Back to draft
 ClickToEdit=Click to edit
diff --git a/htdocs/langs/eu_ES/products.lang b/htdocs/langs/eu_ES/products.lang
index ed5d9ec76b6..1932b64a657 100644
--- a/htdocs/langs/eu_ES/products.lang
+++ b/htdocs/langs/eu_ES/products.lang
@@ -2,6 +2,7 @@
 ProductRef=Product ref.
 ProductLabel=Product label
 ProductLabelTranslated=Translated product label
+ProductDescription=Product description
 ProductDescriptionTranslated=Translated product description
 ProductNoteTranslated=Translated product note
 ProductServiceCard=Products/Services card
diff --git a/htdocs/langs/eu_ES/stripe.lang b/htdocs/langs/eu_ES/stripe.lang
index 6186c14a9ec..746931ff967 100644
--- a/htdocs/langs/eu_ES/stripe.lang
+++ b/htdocs/langs/eu_ES/stripe.lang
@@ -65,3 +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>
diff --git a/htdocs/langs/eu_ES/withdrawals.lang b/htdocs/langs/eu_ES/withdrawals.lang
index cbca2b2f103..88e5eaf128c 100644
--- a/htdocs/langs/eu_ES/withdrawals.lang
+++ b/htdocs/langs/eu_ES/withdrawals.lang
@@ -76,7 +76,8 @@ WithdrawalFile=Withdrawal file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and will classify them as "Paid" if remain to pay is null
 StatisticsByLineStatus=Statistics by status of lines
-RUM=UMR
+RUM=Unique Mandate Reference (UMR)
+DateRUM=Mandate signature date
 RUMLong=Unique Mandate Reference
 RUMWillBeGenerated=If empty, a UMR (Unique Mandate Reference) will be generated once the bank account information is saved.
 WithdrawMode=Direct debit mode (FRST or RECUR)
diff --git a/htdocs/langs/fa_IR/accountancy.lang b/htdocs/langs/fa_IR/accountancy.lang
index 5b8e93fda67..67a705dbedd 100644
--- a/htdocs/langs/fa_IR/accountancy.lang
+++ b/htdocs/langs/fa_IR/accountancy.lang
@@ -265,7 +265,7 @@ AccountingJournals=دفترهای حساب‌داری
 AccountingJournal=دفتر حساب‌داری
 NewAccountingJournal=دفتر حساب‌داری جدید
 ShowAccoutingJournal=نمایش دفتر حساب‌داری
-Nature=طبیعت
+NatureOfJournal=Nature of Journal
 AccountingJournalType1=فعالیت‌های متفرقه
 AccountingJournalType2=فروش
 AccountingJournalType3=خرید
@@ -291,6 +291,7 @@ Modelcsv_quadratus=صدور برای Quadratus QuadraCompta
 Modelcsv_ebp=صدور برای EBP
 Modelcsv_cogilog=صدور برای Cogilog
 Modelcsv_agiris=صدور برای Agiris
+Modelcsv_LDCompta=Export for LD Compta (v9 & higher) (Test)
 Modelcsv_openconcerto=صادرکردن برای OpenConcerto  (آزمایشی)
 Modelcsv_configurable= صدور قابل پیکربندی CSV 
 Modelcsv_FEC=Export FEC
@@ -301,7 +302,7 @@ ChartofaccountsId=ساختار شناسۀ حساب‌‌ها
 InitAccountancy=حساب‌داری اولیه
 InitAccountancyDesc=این صفحه برای مقداردهی اولیۀ یک حساب حساب‌داری برای محصولات/خدماتی قابل استفاده است که حساب حساب‌داری تعریف‌شده‌ای برای خرید و فروش ندارند
 DefaultBindingDesc=این صفحه برای تنظیم یک حساب پیش‌فرض قابل استفاده از که برای وصل کردن ردیف تراکنش‌‌های مربوط به پرداخت حقوق، اعانه و کمک، مالیات و مالیت بر ارزش افزوده در حالتی که هیچ حساب حساب‌داری تنظیم نشده، قابل استفاده است .
-DefaultClosureDesc=این صفحه برای تنظیم مؤلفه‌هائی برای پیوست کردن یک برگۀ تعدیل لازم است.
+DefaultClosureDesc=This page can be used to set parameters used for accounting closures.
 Options=گزینه‌ها
 OptionModeProductSell=حالت فروش
 OptionModeProductSellIntra=حالت فروش به شکل EEC صادر می‌گردد
diff --git a/htdocs/langs/fa_IR/admin.lang b/htdocs/langs/fa_IR/admin.lang
index a142ce5e7c8..2b995dda00f 100644
--- a/htdocs/langs/fa_IR/admin.lang
+++ b/htdocs/langs/fa_IR/admin.lang
@@ -574,7 +574,7 @@ Module510Name=حقوق
 Module510Desc=ثبت و پیگیری پرداخت‌های کارمندان
 Module520Name=وام‌ها
 Module520Desc=مدیریت وام‌ها
-Module600Name=اطلاعیه‌ها
+Module600Name=Notifications on business event
 Module600Desc=ارسال رایانامه‌های اطلاعیه مبتنی بر یک رخداد کاری: بر اساس کاربر (تنظیمات بر حسب هر کاربر)، بر اساس طرف‌سوم (تنظیمات بر اساس هر طرف سوم) یا بر اساس رایانامه‌های خاص
 Module600Long=به خاطر داشته باشید این واحد رایانامه‌را به صورت بلادرنگ در هنگام یک رخداد معین ارسال می‌نماید. در صورتی که به دنبال یک قابلیت برای ارسال یادآورنده‌های رخدادهائی مثل جلسات باشید، به واحد تنظیمات جلسات مراجعه کنید.
 Module610Name=انواع محصولات
@@ -1193,6 +1193,7 @@ ExtraFieldsSupplierOrders=ویژگی‌های تکمیلی (سفارش‌ها)
 ExtraFieldsSupplierInvoices=ویژگی‌های تکمیلی (صورت‌حساب‌ها)
 ExtraFieldsProject=ویژگی‌های تکمیلی (طرح‌ها)
 ExtraFieldsProjectTask=ویژگی‌های تکمیلی (وظایف)
+ExtraFieldsSalaries=Complementary attributes (salaries)
 ExtraFieldHasWrongValue=ویژگی %s مقدار نادرستی دارد.
 AlphaNumOnlyLowerCharsAndNoSpace=فقط حروف کوچک و اعداد انگلیسی بدون فاصله
 SendmailOptionNotComplete=هشدار، در برخی سامانه‌های لینوکس، برای ارسال رایانامه از شما، تنظیمات اجرای sendmail نیازمند گزینۀ -ba (در فایل php.ini ، مقدار mail.force_extra_parameters) است. در صورتی که برخی گیرندگان، هرگز رایانامه دریافت نکرده‌اند، این مؤلفۀ PHP را بدین شکل تغییر دهید: mail.force_extra_parameters = -ba ).
@@ -1220,13 +1221,14 @@ SuhosinSessionEncrypt=ذخیره‌سازی نشست کدبندی‌شدۀ Suhos
 ConditionIsCurrently=در حال حاضر وضعیت %s است
 YouUseBestDriver=شما از راه‌انداز %s استفاده می‌کنید که بهترین راه‌انداز دردسترس نیست.
 YouDoNotUseBestDriver=شما از راه‌انداز %s استفاده می‌کنید اما پیشنهاد ما استفادهاز %s است.
-NbOfProductIsLowerThanNoPb=در پایگاه داده شما فقط %s محصول/خدمات دارید. این دیگر نیاز به بهینه‌سازی خاصی ندارد.
+NbOfObjectIsLowerThanNoPb=You have only %s %s in the database. This does not require any particular optimization.
 SearchOptim=بهینه‌سازی جستجو
-YouHaveXProductUseSearchOptim=شما %s محصول در پایگاه داده دارید و نیاز است مقدار ثابت PRODUCT_DONOTSEARCH_ANYWHERE  را در خانه-برپاسازی-سایر به عدد 1 تغییر دهید. محدود کردن جستجو به ابتدای عبارت که به پایگاه داده امکان می‌دهد تا از شاخص‌ها استفاه نماید تا شما نتیجه‌را فوری دریافت نمائید.
+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.
 BrowserIsOK=شما از مرورگر وب %s استفاده می‌نمائید. این مرورگر برای کارائی و امنیت مناسب است.
 BrowserIsKO=شما از مرورگر وب %s استفاده می‌نمائید. این مرورگر به‌عنوان یک انتخاب بد به نسبت امنیت، کارائی و اعتمادپذیری شناخته شده است. ما به شما پیشنهاد می‌کنیم از Firefox، Chrome، Opera و Safari استفاده نمائید.
-XDebugInstalled=XDebug بارگذاری شده است.
-XCacheInstalled=XCache بارگذاری شده است.
+PHPModuleLoaded=PHP component %s is loaded
+PreloadOPCode=Preloaded OPCode is used
 AddRefInList=نمایش فهرست اطلاعات مرجع -ref. فروشنده/مشتری (فهرست انتخابی یا ترکیبی) و اکثر ابَرپیوند. <br> نام طرف‌های سوم به شکل  " CC12345 - SC45678 - شرکت بزرگ سازمانی " به جای "شرکت بزرگ سازمانی" نمایش داده خواهد شد.
 AddAdressInList=نمایش فهرست اطلاعات نشانی‌های فروشنده/مشتری (فهرست انتخابی یا ترکیبی) <br>شخص سوم‌ها به شکل "شرکت بزرگ سازمانی - شمارۀ 21 خیابان 123456 شهر بزرگ ایران" به جای "شرکت بزرگ سازمانی" نمایش داده خواهند شد.
 AskForPreferredShippingMethod=پرسش برای روش ارسال ترجیحی برای اشخاص سوم
@@ -1734,9 +1736,9 @@ ExpenseReportsRulesSetup=برپاسازی واحد گزارش هزینه‌ها
 ExpenseReportNumberingModules=واحد شماره‌گذاری گزارش هزینه‌ها
 NoModueToManageStockIncrease=هیچ واحدی که قادر به افزایش خودکار موجودی انبار باشد فعال نشده است. افزایش موجودی انبار تنها به صورت دستی انجام خواهد شد.
 YouMayFindNotificationsFeaturesIntoModuleNotification=شما می‌توانید برخی گزینه‌های مربوط به اطلاع‌رسانی از رایانامه را با فعال کردن و تنظیم واحد "آگاهی‌رسانی" تنظیم نمائید.
-ListOfNotificationsPerUser=فهرست آگاهی‌رسانی‌ها برحسب کاربر*
-ListOfNotificationsPerUserOrContact=فهرست آگاهی‌رسانی‌ها (رخدادها) ی موجود بر حسب کاربر * یا بر حسب طرف‌تماس**
-ListOfFixedNotifications=فهرست آگاهی‌رسانی‌های ثابت
+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
 GoOntoUserCardToAddMore=به زبانۀ "آگاهی‌رسانی" یک کاربر رفته تا آگاهی‌رسانی‌های مربوط به کاربران را اضافه یا حذف نمائید
 GoOntoContactCardToAddMore=به زبانۀ "آگاهی رسانی" یک طرف‌سوم رفته تا آگاهی‌رسانی‌های مربوط به یک طرف تماس/نشانی‌ها را اضافه یا حذف نمائید
 Threshold=آستانه
@@ -1898,6 +1900,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
 ThisValueCanOverwrittenOnUserLevel=این مقدار می‌تواند توسط هر کاربر از صفحۀ کاربری مربوطه و زبانۀ '%s' مورد بازنویسی قرار گیرد
 DefaultCustomerType=نوع پیش‌فرض شخص‌سوم در برگۀ ساخت "مشتری جدید"
 ABankAccountMustBeDefinedOnPaymentModeSetup=توجه: برای این‌که این قابلیت کار کند، حساب بانکی باید در تنظیمات هر واحد مربوط به پرداخت تعریف شود (Paypal، Stripe و غیره) 
@@ -1911,7 +1918,7 @@ LogsLinesNumber=تعداد سطور نمایش داده شده در زبانۀ 
 UseDebugBar=استفاده از نوار اشکال‌یابی
 DEBUGBAR_LOGS_LINES_NUMBER=تعداد آخرین سطور گزارش‌کار برای حفظ در کنسول
 WarningValueHigherSlowsDramaticalyOutput=هشدار! مقادیر بزرگ خروجی را به‌شدت کند می‌کند
-DebugBarModuleActivated=واحد نوار اشکال‌یابی فعال شده و رابط کاربری را به شدت کند می‌کند
+ModuleActivated=Module %s is activated and slows the interface
 EXPORTS_SHARE_MODELS=اشکال صادارات با همگان به اشتراک گذاشته شدند
 ExportSetup=برپاسازی واحد صادرات
 InstanceUniqueID=شناسۀ منحصر به‌فرد نمونه
@@ -1928,3 +1935,5 @@ 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
diff --git a/htdocs/langs/fa_IR/bills.lang b/htdocs/langs/fa_IR/bills.lang
index 42ecb831c69..04c90025c64 100644
--- a/htdocs/langs/fa_IR/bills.lang
+++ b/htdocs/langs/fa_IR/bills.lang
@@ -95,6 +95,7 @@ PaymentHigherThanReminderToPay=پرداخت بیشتر از یادآوری بر
 HelpPaymentHigherThanReminderToPay=توجه! مبلغ پرداخت یک یا چند صورت‌حساب پرداختی بیش از مبلغ قابل پرداخت است. <br> ورودی خود را ویرایش نمائید، در غیر این‌صورت ساخت یک یادداشت اعتباری را برای مبلغ اضافی دریافت شده برای هر صورت‌حساب را بررسی و تائید کنید.
 HelpPaymentHigherThanReminderToPaySupplier=توجه! مبلغ پرداخت یک یا چند صورت‌حساب پرداختی بیش از مبلغ قابل پرداخت است. <br> ورودی خود را ویرایش نمائید، در غیر این‌صورت ساخت یک یادداشت اعتباری را برای مبلغ اضافی پرداخت شده برای هر صورت‌حساب را بررسی و تائید کنید.
 ClassifyPaid=طبقه‌بندی "پرداخت شده"
+ClassifyUnPaid=Classify 'Unpaid'
 ClassifyPaidPartially=طبقه‌بندی "پرداخت ناقص "
 ClassifyCanceled=طبقه‌بندی "معلق"
 ClassifyClosed=طبقه‌بندی "بسته شده"
@@ -214,6 +215,20 @@ ShowInvoiceReplace=نمایش صورت‌حساب جایگزین
 ShowInvoiceAvoir=نمایش یادداشت اعتباری
 ShowInvoiceDeposit=نمایش صورت‌حساب پیش‌پرداخت
 ShowInvoiceSituation=نمایش صورت‌حساب وضعیت
+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
 ShowPayment=نمایش پرداخت
 AlreadyPaid=قبلا پرداخت‌شده است
 AlreadyPaidBack=مبلغ قبلا بازگردانده شده است
diff --git a/htdocs/langs/fa_IR/errors.lang b/htdocs/langs/fa_IR/errors.lang
index dd314e4657f..b93c42f3fd8 100644
--- a/htdocs/langs/fa_IR/errors.lang
+++ b/htdocs/langs/fa_IR/errors.lang
@@ -90,7 +90,7 @@ ErrorSpecialCharNotAllowedForField=نویسه‌های خاص در بخش "%s" 
 ErrorNumRefModel=در پایگاه‌داده ( %s ) یک ارجاع  وجود دارد و با این قواعد شماره‌دهی همخوان نیست. ردیف مربوطه را حذف کرده یا ارجاع را تغییرنام دهید تا این واحد فعال شود
 ErrorQtyTooLowForThisSupplier=تعداد برای این فروشنده بیش‌ازحد پائین است یا این‌که برای این محصول مبلغی در خصوص این فروشنده تعریف نشده است
 ErrorOrdersNotCreatedQtyTooLow=برخی از سفارش‌ها ساخته نشدند چون تعداد‌ها کم‌تر از حد مطلوب بود
-ErrorModuleSetupNotComplete=برپاسازی این واحد ناقص به نظر می‌رسد. به بخش خانه - برپاسازی - واحدها رفته تا تکمیل کنید
+ErrorModuleSetupNotComplete=Setup of module %s looks to be uncomplete. Go on Home - Setup - Modules to complete.
 ErrorBadMask=خطا در ماسک
 ErrorBadMaskFailedToLocatePosOfSequence=خطا، ماسک بدون عدد متوالی
 ErrorBadMaskBadRazMonth=خطا، مقدار نادرست بازنشانی
@@ -219,6 +219,7 @@ ErrorURLMustStartWithHttp=نشانی اینترنتی %s باید با http:// 
 ErrorNewRefIsAlreadyUsed=خطا، ارجاع جدید قبلا استفاده شده است
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Error, delete payment linked to a closed invoice is not possible.
 # 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 قابل استفاده نیست. ممکن است برای یک رابط/واحد بیرونی قابل استفاده باشد، اما اگر شما نخواهید هیچ نام کاربری ورود و گذرواژه‌ای برای یک عضو استفاده کنید، شما می‌توانید گزینۀ "ایجاد یک نام‌ورد برای هر عضو" را از برپاسازی واحد اعضاء غیرفعال کنید. در صورتی که نیاز دارید که نام‌ورود داشته باشید اما گذرواژه نداشته باشید، می‌توانید این بخش را خالی گذاشته تا از این هشدار بر حذر باشید. نکته: همچنین نشانی رایانامه می‌تواند در صورتی که عضو به یک‌کاربر متصل باشد، می‌‌تواند مورد استفاده قرار گیرد
 WarningMandatorySetupNotComplete=این گزینه را برای برپاسازی مؤلفه‌های الزامی کلیک کنید
 WarningEnableYourModulesApplications=این گزینه را برای فعال کردن واحدها و برنامه‌های مختلف کلیک کنید
diff --git a/htdocs/langs/fa_IR/main.lang b/htdocs/langs/fa_IR/main.lang
index e5d0d766ec5..e9c00db19c4 100644
--- a/htdocs/langs/fa_IR/main.lang
+++ b/htdocs/langs/fa_IR/main.lang
@@ -445,6 +445,7 @@ ContactsAddressesForCompany=طرف‌های‌تماس/نشانی‌های ای
 AddressesForCompany=نشانی‌های این شخص‌سوم
 ActionsOnCompany=روی‌دادهای مربوط به این شخص سوم
 ActionsOnContact=روی‌دادهای مربوط به این طرف‌تماس/نشانی
+ActionsOnContract=Events for this contract
 ActionsOnMember=روی‌دادهای مربوط به این عضو
 ActionsOnProduct=روی‌دادهای مربوط به این محصول
 NActionsLate=%s دیرتر
@@ -759,6 +760,7 @@ LinkToSupplierProposal=پیوند به پیشنهاد فروشنده
 LinkToSupplierInvoice=پیوند به صورت‌حساب فروشنده
 LinkToContract=پیوند به قرارداد
 LinkToIntervention=پیوند به واسطه‌گری
+LinkToTicket=Link to ticket
 CreateDraft=ساخت پیش‌نویس
 SetToDraft=بازگشت به پیش‌نویس
 ClickToEdit=کلیک برای ویرایش
diff --git a/htdocs/langs/fa_IR/products.lang b/htdocs/langs/fa_IR/products.lang
index 9dd30c1eec9..c6ef6261d7b 100644
--- a/htdocs/langs/fa_IR/products.lang
+++ b/htdocs/langs/fa_IR/products.lang
@@ -2,6 +2,7 @@
 ProductRef=ارجاع محصول
 ProductLabel=برچسب محصول
 ProductLabelTranslated=برچسب ترجمه‌شدۀ محصول
+ProductDescription=Product description
 ProductDescriptionTranslated=توضیحات ترجمه‌شدۀ محصول
 ProductNoteTranslated=یادداشت ترجمه‌شدۀ محصول
 ProductServiceCard=کارت محصولات/خدمات
diff --git a/htdocs/langs/fa_IR/stripe.lang b/htdocs/langs/fa_IR/stripe.lang
index 767799961bc..37f1d42fb57 100644
--- a/htdocs/langs/fa_IR/stripe.lang
+++ b/htdocs/langs/fa_IR/stripe.lang
@@ -65,3 +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>
diff --git a/htdocs/langs/fa_IR/withdrawals.lang b/htdocs/langs/fa_IR/withdrawals.lang
index 097d8c7ddf7..c64b0dd3fba 100644
--- a/htdocs/langs/fa_IR/withdrawals.lang
+++ b/htdocs/langs/fa_IR/withdrawals.lang
@@ -76,7 +76,8 @@ WithdrawalFile=فایل برداشت
 SetToStatusSent=تنظیم به وضعیت "فایل ارسال شد"
 ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and will classify them as "Paid" if remain to pay is null
 StatisticsByLineStatus=Statistics by status of lines
-RUM=UMR
+RUM=Unique Mandate Reference (UMR)
+DateRUM=Mandate signature date
 RUMLong=Unique Mandate Reference
 RUMWillBeGenerated=If empty, a UMR (Unique Mandate Reference) will be generated once the bank account information is saved.
 WithdrawMode=Direct debit mode (FRST or RECUR)
diff --git a/htdocs/langs/fi_FI/accountancy.lang b/htdocs/langs/fi_FI/accountancy.lang
index 96ae44884fd..3c32acbda77 100644
--- a/htdocs/langs/fi_FI/accountancy.lang
+++ b/htdocs/langs/fi_FI/accountancy.lang
@@ -265,7 +265,7 @@ AccountingJournals=Kirjanpitotilityypit
 AccountingJournal=Accounting journal
 NewAccountingJournal=New accounting journal
 ShowAccoutingJournal=Show accounting journal
-Nature=Luonto
+NatureOfJournal=Nature of Journal
 AccountingJournalType1=Miscellaneous operations
 AccountingJournalType2=Myynti
 AccountingJournalType3=Ostot
@@ -291,6 +291,7 @@ Modelcsv_quadratus=Export for Quadratus QuadraCompta
 Modelcsv_ebp=Export for EBP
 Modelcsv_cogilog=Export for Cogilog
 Modelcsv_agiris=Export for Agiris
+Modelcsv_LDCompta=Export for LD Compta (v9 & higher) (Test)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
@@ -301,7 +302,7 @@ ChartofaccountsId=Chart of accounts Id
 InitAccountancy=Init accountancy
 InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accounting account defined for sales and purchases.
 DefaultBindingDesc=This page can be used to set a default account to use to link transactions record about payment salaries, donation, taxes and vat when no specific accounting account were already set.
-DefaultClosureDesc=This page can be used to set parameters to use to enclose a balance sheet.
+DefaultClosureDesc=This page can be used to set parameters used for accounting closures.
 Options=Options
 OptionModeProductSell=Mode sales
 OptionModeProductSellIntra=Mode sales exported in EEC
diff --git a/htdocs/langs/fi_FI/admin.lang b/htdocs/langs/fi_FI/admin.lang
index bcf1f3161f8..636b3f07ac7 100644
--- a/htdocs/langs/fi_FI/admin.lang
+++ b/htdocs/langs/fi_FI/admin.lang
@@ -574,7 +574,7 @@ Module510Name=Palkat
 Module510Desc=Record and track employee payments
 Module520Name=Lainat
 Module520Desc=Lainojen hallinnointi
-Module600Name=Ilmoitukset
+Module600Name=Notifications on business event
 Module600Desc=Send email notifications triggered by a business event: per user (setup defined on each user), per third-party contacts (setup defined on each third party) or by specific emails
 Module600Long=Note that this module sends emails in real-time when a specific business event occurs. If you are looking for a feature to send email reminders for agenda events, go into the setup of module Agenda.
 Module610Name=Product Variants
@@ -1193,6 +1193,7 @@ ExtraFieldsSupplierOrders=Complementary attributes (orders)
 ExtraFieldsSupplierInvoices=Complementary attributes (invoices)
 ExtraFieldsProject=Complementary attributes (projects)
 ExtraFieldsProjectTask=Complementary attributes (tasks)
+ExtraFieldsSalaries=Complementary attributes (salaries)
 ExtraFieldHasWrongValue=Attribute %s has a wrong value.
 AlphaNumOnlyLowerCharsAndNoSpace=only alphanumericals and lower case characters without space
 SendmailOptionNotComplete=Varoitus, joissakin Linux-järjestelmissä, lähettää sähköpostia sähköpostisi, sendmail toteuttaminen setup on conatins optio-ba (parametri mail.force_extra_parameters tulee php.ini tiedosto). Jos jotkut vastaanottajat eivät koskaan vastaanottaa sähköposteja, yrittää muokata tätä PHP parametrin mail.force_extra_parameters =-ba).
@@ -1220,13 +1221,14 @@ SuhosinSessionEncrypt=Session storage encrypted by Suhosin
 ConditionIsCurrently=Condition is currently %s
 YouUseBestDriver=You use driver %s which is the best driver currently available.
 YouDoNotUseBestDriver=You use driver %s but driver %s is recommended.
-NbOfProductIsLowerThanNoPb=You have only %s products/services in the database. This does not require any particular optimization.
+NbOfObjectIsLowerThanNoPb=You have only %s %s in the database. This does not require any particular optimization.
 SearchOptim=Hakuoptimointi
-YouHaveXProductUseSearchOptim=You have %s products in the database. You should add the constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+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.
 BrowserIsOK=You are using the %s web browser. This browser is ok for security and performance.
 BrowserIsKO=You are using the %s web browser. This browser is known to be a bad choice for security, performance and reliability. We recommend using Firefox, Chrome, Opera or Safari.
-XDebugInstalled=XDebug ladattu
-XCacheInstalled=XCache ladattu
+PHPModuleLoaded=PHP component %s is loaded
+PreloadOPCode=Preloaded OPCode is used
 AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.<br>Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp".
 AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".
 AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties.
@@ -1734,9 +1736,9 @@ ExpenseReportsRulesSetup=Setup of module Expense Reports - Rules
 ExpenseReportNumberingModules=Expense reports numbering module
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
 YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for email notifications by enabling and configuring the module "Notification".
-ListOfNotificationsPerUser=List of notifications per user*
-ListOfNotificationsPerUserOrContact=List of notifications (events) available per user* or per contact**
-ListOfFixedNotifications=List of Fixed Notifications
+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
 GoOntoUserCardToAddMore=Go to the tab "Notifications" of a user to add or remove notifications for users
 GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
 Threshold=Threshold
@@ -1898,6 +1900,11 @@ OnMobileOnly=On small screen (smartphone) only
 DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be Prospect or Customer but can't be both)
 MAIN_OPTIMIZEFORTEXTBROWSER=Simplify interface for blind person
 MAIN_OPTIMIZEFORTEXTBROWSERDesc=Enable this option if you are a blind person, or if you use the application from a text browser like Lynx or 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
 ThisValueCanOverwrittenOnUserLevel=This value can be overwritten by each user from its user page - tab '%s'
 DefaultCustomerType=Default thirdparty type for "New customer" creation form
 ABankAccountMustBeDefinedOnPaymentModeSetup=Note: The bank account must be defined on the module of each payment mode (Paypal, Stripe, ...) to have this feature working.
@@ -1911,7 +1918,7 @@ LogsLinesNumber=Number of lines to show on logs tab
 UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
-DebugBarModuleActivated=Module debugbar is activated and slows dramaticaly the interface
+ModuleActivated=Module %s is activated and slows the interface
 EXPORTS_SHARE_MODELS=Export models are share with everybody
 ExportSetup=Setup of module Export
 InstanceUniqueID=Unique ID of the instance
@@ -1928,3 +1935,5 @@ 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
diff --git a/htdocs/langs/fi_FI/bills.lang b/htdocs/langs/fi_FI/bills.lang
index 3528ca862ab..6a0a6bdbac9 100644
--- a/htdocs/langs/fi_FI/bills.lang
+++ b/htdocs/langs/fi_FI/bills.lang
@@ -95,6 +95,7 @@ PaymentHigherThanReminderToPay=Maksu korkeampi kuin muistutus maksaa
 HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess received for each overpaid invoice.
 HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess paid for each overpaid invoice.
 ClassifyPaid=Luokittele "Maksettu"
+ClassifyUnPaid=Classify 'Unpaid'
 ClassifyPaidPartially=Luokittele "Osittain maksettu"
 ClassifyCanceled=Luokittele "Hylätty"
 ClassifyClosed=Luokittele "Suljettu"
@@ -214,6 +215,20 @@ ShowInvoiceReplace=Näytä korvaa lasku
 ShowInvoiceAvoir=Näytä menoilmoitus
 ShowInvoiceDeposit=Show down payment invoice
 ShowInvoiceSituation=Näytä tilannetilasku
+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
 ShowPayment=Näytä maksu
 AlreadyPaid=Jo maksanut
 AlreadyPaidBack=Already paid back
diff --git a/htdocs/langs/fi_FI/errors.lang b/htdocs/langs/fi_FI/errors.lang
index 3806c084457..326aa5f7cc2 100644
--- a/htdocs/langs/fi_FI/errors.lang
+++ b/htdocs/langs/fi_FI/errors.lang
@@ -90,7 +90,7 @@ ErrorSpecialCharNotAllowedForField=Erikoismerkkejä ei sallita kentän "%s"
 ErrorNumRefModel=Viittaus olemassa otetaan tietokantaan (%s) ja ei ole yhteensopiva tämän numeroinnin sääntöä. Poista levy tai nimen viittaus aktivoida tämän moduulin.
 ErrorQtyTooLowForThisSupplier=Quantity too low for this vendor or no price defined on this product for this vendor
 ErrorOrdersNotCreatedQtyTooLow=Some orders haven't been created because of too-low quantities
-ErrorModuleSetupNotComplete=Setup of module looks to be uncomplete. Go on Home - Setup - Modules to complete.
+ErrorModuleSetupNotComplete=Setup of module %s looks to be uncomplete. Go on Home - Setup - Modules to complete.
 ErrorBadMask=Virhe naamio
 ErrorBadMaskFailedToLocatePosOfSequence=Virhe, maski ilman järjestysnumeroa
 ErrorBadMaskBadRazMonth=Virhe, huono palautus arvo
@@ -219,6 +219,7 @@ 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.
 # 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.
 WarningMandatorySetupNotComplete=Click here to setup mandatory parameters
 WarningEnableYourModulesApplications=Click here to enable your modules and applications
diff --git a/htdocs/langs/fi_FI/main.lang b/htdocs/langs/fi_FI/main.lang
index 48580ad7667..6667c78b2ab 100644
--- a/htdocs/langs/fi_FI/main.lang
+++ b/htdocs/langs/fi_FI/main.lang
@@ -445,6 +445,7 @@ ContactsAddressesForCompany=Sidosryhmien kontaktit/osoitteet
 AddressesForCompany=Sidosryhmien osoitteet
 ActionsOnCompany=Events for this third party
 ActionsOnContact=Events for this contact/address
+ActionsOnContract=Events for this contract
 ActionsOnMember=Jäsenen tapahtumat
 ActionsOnProduct=Tapahtumat tästä tuotteesta
 NActionsLate=%s myöhässä
@@ -759,6 +760,7 @@ LinkToSupplierProposal=Link to vendor proposal
 LinkToSupplierInvoice=Link to vendor invoice
 LinkToContract=Linkki Sopimuksiin
 LinkToIntervention=Link to intervention
+LinkToTicket=Link to ticket
 CreateDraft=Luo luonnos
 SetToDraft=Palaa luonnokseen
 ClickToEdit=Klikkaa muokataksesi
diff --git a/htdocs/langs/fi_FI/products.lang b/htdocs/langs/fi_FI/products.lang
index d8c06ce88b4..b7b9c98dde6 100644
--- a/htdocs/langs/fi_FI/products.lang
+++ b/htdocs/langs/fi_FI/products.lang
@@ -2,6 +2,7 @@
 ProductRef=Tuote nro.
 ProductLabel=Tuotenimike
 ProductLabelTranslated=Translated product label
+ProductDescription=Product description
 ProductDescriptionTranslated=Translated product description
 ProductNoteTranslated=Translated product note
 ProductServiceCard=Tuotteet / Palvelut kortti
diff --git a/htdocs/langs/fi_FI/stripe.lang b/htdocs/langs/fi_FI/stripe.lang
index 4418dc1f5e8..d3845bed9e3 100644
--- a/htdocs/langs/fi_FI/stripe.lang
+++ b/htdocs/langs/fi_FI/stripe.lang
@@ -65,3 +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>
diff --git a/htdocs/langs/fi_FI/withdrawals.lang b/htdocs/langs/fi_FI/withdrawals.lang
index 1c301fffe55..1819f200b56 100644
--- a/htdocs/langs/fi_FI/withdrawals.lang
+++ b/htdocs/langs/fi_FI/withdrawals.lang
@@ -76,7 +76,8 @@ WithdrawalFile=Withdrawal file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and will classify them as "Paid" if remain to pay is null
 StatisticsByLineStatus=Statistics by status of lines
-RUM=UMR
+RUM=Unique Mandate Reference (UMR)
+DateRUM=Mandate signature date
 RUMLong=Unique Mandate Reference
 RUMWillBeGenerated=If empty, a UMR (Unique Mandate Reference) will be generated once the bank account information is saved.
 WithdrawMode=Direct debit mode (FRST or RECUR)
diff --git a/htdocs/langs/fr_BE/accountancy.lang b/htdocs/langs/fr_BE/accountancy.lang
index 30535d01188..1071dd5c68b 100644
--- a/htdocs/langs/fr_BE/accountancy.lang
+++ b/htdocs/langs/fr_BE/accountancy.lang
@@ -7,4 +7,3 @@ ErrorDebitCredit=Débit et crédit ne peuvent pas être non-nuls en même temps
 TotalMarge=Marge de ventes totale
 Selectmodelcsv=Sélectionnez un modèle d'export
 Modelcsv_normal=Export classique
-DefaultClosureDesc=This page can be used to set parameters to use to enclose a balance sheet.
diff --git a/htdocs/langs/fr_BE/admin.lang b/htdocs/langs/fr_BE/admin.lang
index 3090455190b..7d99260c310 100644
--- a/htdocs/langs/fr_BE/admin.lang
+++ b/htdocs/langs/fr_BE/admin.lang
@@ -16,7 +16,9 @@ FormToTestFileUploadForm=Formulaire pour tester l'upload de fichiers (selon la c
 IfModuleEnabled=Note: oui ne fonctionne que si le module <b>%s</b> est activé
 Module20Name=Propales
 Module30Name=Factures
+Module600Name=Notifications on business event
 Target=Objectif
-ListOfNotificationsPerUserOrContact=List of notifications (events) available per user* or per contact**
-ListOfFixedNotifications=List of Fixed Notifications
+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
 OperationParamDesc=Define values to use for action, or how to extract values. For example:<br>objproperty1=SET:abc<br>objproperty1=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:abc<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey.*[^\\s]+(.*)<br>options_myextrafield=EXTRACT:SUBJECT:([^\\s]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
diff --git a/htdocs/langs/fr_BE/withdrawals.lang b/htdocs/langs/fr_BE/withdrawals.lang
index eb336cadcc0..305bdf13d8e 100644
--- a/htdocs/langs/fr_BE/withdrawals.lang
+++ b/htdocs/langs/fr_BE/withdrawals.lang
@@ -1,2 +1,3 @@
 # Dolibarr language file - Source file is en_US - withdrawals
 StatusTrans=Envoyé
+RUM=Unique Mandate Reference (UMR)
diff --git a/htdocs/langs/fr_CA/accountancy.lang b/htdocs/langs/fr_CA/accountancy.lang
index f7069e0d730..b509e180e22 100644
--- a/htdocs/langs/fr_CA/accountancy.lang
+++ b/htdocs/langs/fr_CA/accountancy.lang
@@ -102,7 +102,6 @@ ErrorAccountingJournalIsAlreadyUse=Ce journal est déjà utilisé
 ChartofaccountsId=Carte comptable Id
 InitAccountancy=Compabilité initiale
 DefaultBindingDesc=Cette page peut être utilisée pour définir un compte par défaut à utiliser pour lier l'historique des transactions sur les salaires de paiement, le don, les taxes et la TVA lorsque aucun compte comptable spécifique n'a été défini.
-DefaultClosureDesc=This page can be used to set parameters to use to enclose a balance sheet.
 OptionModeProductSell=Mode de ventes
 OptionModeProductBuy=Mode d'achats
 OptionModeProductSellDesc=Afficher tous les produits avec compte comptable pour les ventes.
diff --git a/htdocs/langs/fr_CA/admin.lang b/htdocs/langs/fr_CA/admin.lang
index fa8441ff760..69ce614e588 100644
--- a/htdocs/langs/fr_CA/admin.lang
+++ b/htdocs/langs/fr_CA/admin.lang
@@ -89,6 +89,7 @@ WatermarkOnDraftExpenseReports=Filigrane sur les projets de rapports de dépense
 Module0Desc=Gestion des utilisateurs / employés et des groupes
 Module42Desc=Installations de journalisation (fichier, syslog, ...). Ces journaux sont à des fins techniques / de débogage.
 Module75Name=Notes de frais et déplacements
+Module600Name=Notifications on business event
 Module2400Name=Evénements / Agenda
 Module2600Name=services API / Web ( serveur SOAP )
 Module2600Desc=Active le serveur de Web Services de Dolibarr
@@ -198,9 +199,9 @@ DeleteFiscalYear=Supprimer la période comptable
 ConfirmDeleteFiscalYear=Êtes-vous sûr de supprimer cette période comptable?
 ShowFiscalYear=Afficher la période comptable
 SalariesSetup=Configuration du module salariés
-ListOfNotificationsPerUser=Liste des notifications par utilisateur *
-ListOfNotificationsPerUserOrContact=List of notifications (events) available per user* or per contact**
-ListOfFixedNotifications=List of Fixed Notifications
+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
 ConfFileMustContainCustom=L'installation ou la construction d'un module externe à partir de l'application doit sauvegarder les fichiers du module dans le répertoire <strong>%s</strong>. Pour que ce répertoire soit traité par Dolibarr, vous devez configurer votre <strong> conf / conf.php </strong> pour ajouter les 2 lignes de directive: <br><strong> $ dolibarr_main_url_root_alt = '/ custom'; </strong><br><strong> $ dolibarr_main_document_root_alt = '%s / custom'; </strong>
 HighlightLinesOnMouseHover=Mettez en surbrillance les lignes de table lorsque déplacement de la souris passe au-dessus
 PressF5AfterChangingThis=Appuyez sur CTRL + F5 sur le clavier ou effacez votre cache de navigateur après avoir changé cette valeur pour l'avoir efficace
diff --git a/htdocs/langs/fr_CA/errors.lang b/htdocs/langs/fr_CA/errors.lang
index 3f76316e170..967bf583d1c 100644
--- a/htdocs/langs/fr_CA/errors.lang
+++ b/htdocs/langs/fr_CA/errors.lang
@@ -57,7 +57,6 @@ ErrorPasswordsMustMatch=Les deux mots de passe dactylographiés doivent correspo
 ErrorFileIsInfectedWithAVirus=Le programme antivirus n'a pas pu valider le fichier (le fichier peut être infecté par un virus)
 ErrorSpecialCharNotAllowedForField=Les caractères spéciaux ne sont pas autorisés pour le champ "%s"
 ErrorNumRefModel=Une référence existe dans la base de données (%s) et n'est pas compatible avec cette règle de numérotation. Supprimez l'enregistrement ou la renommée référence pour activer ce module.
-ErrorModuleSetupNotComplete=La configuration du module semble être inachevée. Allez sur Accueil - Configuration - Modules à compléter.
 ErrorBadMaskBadRazMonth=Erreur, mauvaise valeur de réinitialisation
 ErrorCounterMustHaveMoreThan3Digits=Le compteur doit avoir plus de 3 chiffres
 ErrorProdIdAlreadyExist=%s est affecté à un autre tiers
diff --git a/htdocs/langs/fr_CA/withdrawals.lang b/htdocs/langs/fr_CA/withdrawals.lang
index 722d0dc02df..d8dc0f4bd1a 100644
--- a/htdocs/langs/fr_CA/withdrawals.lang
+++ b/htdocs/langs/fr_CA/withdrawals.lang
@@ -11,17 +11,16 @@ WithdrawalsLines=Lignes de commande de débit direct
 RequestStandingOrderToTreat=Demande d'ordonnance de paiement de débit direct à traiter
 RequestStandingOrderTreated=Demande d'ordonnance de paiement par prélèvement automatique traitée
 NotPossibleForThisStatusOfWithdrawReceiptORLine=Pas encore possible. L'état de retrait doit être défini sur 'crédité' avant de déclarer le rejet sur des lignes spécifiques.
-NbOfInvoiceToWithdrawWithInfo=Nb. De la facture du client avec des ordres de paiement de débit direct ayant des informations définies sur le compte bancaire
 InvoiceWaitingWithdraw=Facture en attente de débit direct
 AmountToWithdraw=Montant à retirer
 WithdrawsRefused=Débit direct refusé
 NoInvoiceToWithdraw=Aucune facture de client avec Open 'Demandes de débit direct' est en attente. Allez sur l'onglet '%s' sur la carte de facture pour faire une demande.
+WithdrawalsSetup=Configuration du paiement par débit direct
 WithdrawStatistics=Statistiques de paiement par débit direct
 WithdrawRejectStatistics=Statistiques de rejet de paiement par débit direct
 LastWithdrawalReceipt=Derniers %s reçus de débit direct
 MakeWithdrawRequest=Faire une demande de paiement par prélèvement automatique
 WithdrawRequestsDone=%s demandes de paiement par prélèvement automatique enregistrées
-ThirdPartyBankCode=Code bancaire tiers
 ClassCreditedConfirm=Êtes-vous sûr de vouloir classer ce reçu de retrait comme crédité sur votre compte bancaire?
 WithdrawalRefused=Retrait refusée
 WithdrawalRefusedConfirm=Êtes-vous sûr de vouloir introduire un rejet de retrait pour la société?
@@ -38,7 +37,6 @@ StatusMotif0=Non spécifié
 StatusMotif1=Fonds insuffisants
 StatusMotif2=Demande contestée
 StatusMotif3=Aucune ordonnance de paiement par prélèvement automatique
-StatusMotif4=Commande du client
 StatusMotif5=RIB inutilisable
 StatusMotif6=Compte sans solde
 StatusMotif8=Autre raison
@@ -49,15 +47,13 @@ NotifyCredit=Crédit de retrait
 NumeroNationalEmetter=Numéro national de l'émetteur
 WithBankUsingRIB=Pour les comptes bancaires utilisant RIB
 WithBankUsingBANBIC=Pour les comptes bancaires utilisant IBAN / BIC / SWIFT
-BankToReceiveWithdraw=Compte bancaire pour recevoir des débits directs
 CreditDate=Crédit sur
 WithdrawalFileNotCapable=Impossible de générer un fichier de retrait de retrait pour votre pays %s (Votre pays n'est pas pris en charge)
-ShowWithdraw=Afficher le retrait
-IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Toutefois, si la facture a au moins un paiement de retrait non encore traité, elle ne sera pas définie comme payée pour permettre la gestion préalable du retrait.
 DoStandingOrdersBeforePayments=Cet onglet vous permet de demander une commande de paiement par prélèvement automatique. Une fois terminé, accédez au menu Banque-> Ordres de débit direct pour gérer l'ordre de paiement de débit direct. Lorsque la commande de paiement est fermée, le paiement sur facture sera automatiquement enregistré et la facture sera fermée si le solde à payer est nul.
 WithdrawalFile=Fichier de retrait
 SetToStatusSent=Définir le statut "Fichier envoyé"
 StatisticsByLineStatus=Statistiques par état des lignes
+RUM=Unique Mandate Reference (UMR)
 RUMLong=Référence de mandat unique
 WithdrawMode=Mode de débit direct (FRST ou RECUR)
 WithdrawRequestAmount=Montant de la demande de débit direct:
@@ -66,11 +62,9 @@ SepaMandate=Mandat de débit direct SEPA
 PleaseReturnMandate=Veuillez renvoyer ce formulaire de mandat par courrier électronique à %s ou par courrier à
 SEPALegalText=En signant ce formulaire de mandat, vous autorisez (A) %s à envoyer des instructions à votre banque pour débiter votre compte et (B) votre banque pour débiter votre compte conformément aux instructions de %s. Dans le cadre de vos droits, vous avez droit à un remboursement de votre banque selon les termes et conditions de votre contrat avec votre banque. Un remboursement doit être demandé dans les 8 semaines à partir de la date à laquelle votre compte a été débité. Vos droits concernant le mandat ci-dessus sont expliqués dans un état que vous pouvez obtenir auprès de votre banque.
 CreditorIdentifier=Identificateur du créancier
-CreditorName=Nom du créancier
 SEPAFillForm=(B) Veuillez compléter tous les champs marqués *
 SEPAFormYourBAN=Votre nom de compte bancaire (IBAN)
 SEPAFormYourBIC=Votre code d'identification de banque (BIC)
-ModeRECUR=Paiement récurrent
 ModeFRST=Paiement unique
 PleaseCheckOne=Veuillez cocher un seul
 InfoCreditSubject=Paiement de l'ordre de paiement de débit direct %s par la banque
diff --git a/htdocs/langs/fr_FR/accountancy.lang b/htdocs/langs/fr_FR/accountancy.lang
index de6f26337d7..5e098dd5e05 100644
--- a/htdocs/langs/fr_FR/accountancy.lang
+++ b/htdocs/langs/fr_FR/accountancy.lang
@@ -246,7 +246,7 @@ ValidateHistory=Lier automatiquement
 AutomaticBindingDone=Liaison automatique faite
 
 ErrorAccountancyCodeIsAlreadyUse=Erreur, vous ne pouvez pas détruire de compte comptable car il est utilisé
-MvtNotCorrectlyBalanced=Mouvement non équilibré. Débit = %s| Crébit = %s
+MvtNotCorrectlyBalanced=Mouvement non équilibré. Débit = %s| Crédit = %s
 Balancing=Équilibrage
 FicheVentilation=Fiche lien
 GeneralLedgerIsWritten=Les transactions sont enregistrées dans le grand livre
@@ -265,7 +265,7 @@ AccountingJournals=Journaux comptables
 AccountingJournal=Journal comptable
 NewAccountingJournal=Nouveau journal comptable
 ShowAccoutingJournal=Afficher le journal
-Nature=Nature
+NatureOfJournal=Nature du journal
 AccountingJournalType1=Opérations diverses
 AccountingJournalType2=Ventes
 AccountingJournalType3=Achats
@@ -291,17 +291,19 @@ Modelcsv_quadratus=Export vers Quadratus QuadraCompta
 Modelcsv_ebp=Export vers EBP
 Modelcsv_cogilog=Export vers Cogilog
 Modelcsv_agiris=Export vers Agiris
+Modelcsv_LDCompta=Export pour LD Compta (v9 et supérieur) (Test)
 Modelcsv_openconcerto=Export pour OpenConcerto (Test)
 Modelcsv_configurable=Export configurable
 Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export pour Sage 50 Suisse
+Modelcsv_charlemagne=Export vers Charlemagne
 ChartofaccountsId=Id plan comptable
 
 ## Tools - Init accounting account on product / service
 InitAccountancy=Initialisation comptabilité
 InitAccountancyDesc=Cette page peut être utilisée pour initialiser un compte comptable sur les produits et services qui ne disposent pas de compte comptable défini pour les ventes et les achats.
 DefaultBindingDesc=Cette page peut être utilisée pour définir un compte par défaut à utiliser pour la ventilation des transactions sur le paiement des salaires, les dons, les charges sociales et fiscales et la TVA lorsqu'aucun compte spécifique n'a été défini.
-DefaultClosureDesc=Cette page peut être utilisée pour définir les paramètres pour clore un bilan.
+DefaultClosureDesc=Cette page peut être utilisée pour définir les paramètres pour une cloture comptable.
 Options=Options
 OptionModeProductSell=Mode ventes
 OptionModeProductSellIntra=Mode ventes exportées dans la CEE
diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index 3276f9c1312..ea029762214 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -574,7 +574,7 @@ Module510Name=Salaires
 Module510Desc=Enregistrer et suivre le paiement des salaires des employés
 Module520Name=Emprunts
 Module520Desc=Gestion des emprunts
-Module600Name=Notifications
+Module600Name=Notifications sur les évênements métiers
 Module600Desc=Envoi de notifications par e-mails déclenchées par des événements métiers: par utilisateur (configuration faite sur chaque fiche utilisateur), par contact de tiers (configuration faite sur chaque fiche tiers) ou vers des adresses e-mails spécifiques.
 Module600Long=Notez que ce module est dédié à l'envoi d'e-mails en temps réel lorsqu'un événement métier dédié se produit. Si vous cherchez une fonctionnalité pour envoyer des rappels par email de vos événements agenda, allez dans la configuration du module Agenda.
 Module610Name=Variantes de produits
@@ -1193,6 +1193,7 @@ ExtraFieldsSupplierOrders=Attributs supplémentaires (commandes)
 ExtraFieldsSupplierInvoices=Attributs supplémentaires (factures)
 ExtraFieldsProject=Attributs supplémentaires (projets)
 ExtraFieldsProjectTask=Attributs supplémentaires (tâches)
+ExtraFieldsSalaries=Attributs complémentaires (salaires)
 ExtraFieldHasWrongValue=L'attribut %s a une valeur incorrecte.
 AlphaNumOnlyLowerCharsAndNoSpace=uniquement des caractères alphanumériques et en minuscule sans espace
 SendmailOptionNotComplete=Attention, sur certains systèmes Linux, avec cette méthode d'envoi, pour pouvoir envoyer des emails en votre nom, la configuration d'exécution de sendmail doit contenir l'option <b>-ba</b> (paramètre <b>mail.force_extra_parameters</b> dans le fichier <b>php.ini</b>). Si certains de vos destinataires ne reçoivent pas de message, essayer de modifier ce paramètre PHP avec <b>mail.force_extra_parameters = -ba</b>.
@@ -1220,13 +1221,14 @@ SuhosinSessionEncrypt=Stockage des sessions chiffrées par Suhosin
 ConditionIsCurrently=La condition est actuellement %s
 YouUseBestDriver=Vous utilisez le driver %s qui est le driver recommandé actuellement.
 YouDoNotUseBestDriver=Vous utilisez le pilote %s mais le pilote %s est recommandé.
-NbOfProductIsLowerThanNoPb=Vous avez uniquement %s produits / services dans la base de données. Cela ne nécessite aucune optimisation particulière.
+NbOfObjectIsLowerThanNoPb=Vous avez seulement %s %s dans la base de données. Cela ne nécessite aucune optimisation particulière.
 SearchOptim=Optimisation des recherches
-YouHaveXProductUseSearchOptim=Vous avez des produits %s dans la base de données. Vous devez ajouter la constante PRODUCT_DONOTSEARCH_ANYWHERE à 1 dans Home-Setup-Other. Limitez la recherche au début des chaînes, ce qui permet à la base de données d'utiliser des index et vous devez obtenir une réponse immédiate.
+YouHaveXObjectUseSearchOptim=Vous avez %s %s dans la base de données. Vous devez ajouter la constante %s à 1 dans Accueil-Configuration-Autre. Ceci limite la recherche au début des chaînes, ce qui permet à la base de données d'utiliser des index et vous devriez obtenir une réponse immédiate.
+YouHaveXObjectAndSearchOptimOn=Vous avez %s %s dans la base de données et la constante %s est définie sur 1 dans Accueil-Configuration-Autre.
 BrowserIsOK=Vous utilisez le navigateur Web %s. Ce navigateur est correct pour la sécurité et la performance.
 BrowserIsKO=Vous utilisez le navigateur %s. Ce navigateur est déconseillé pour des raisons de sécurité, performance et qualité des pages restituées. Nous vous recommandons d'utiliser Firefox, Chrome, Opera ou Safari.
-XDebugInstalled=XDebug est chargé.
-XCacheInstalled=XCache est chargé.
+PHPModuleLoaded=Le composant PHP %s est chargé
+PreloadOPCode=Le code OP préchargé est utilisé
 AddRefInList=Afficher les références client/fournisseur dans les listes (listes déroulantes ou à autocomplétion) et les libellés des liens clicables.<br>Les tiers apparaîtront alors sous la forme "CC12345 - SC45678 - La big company coorp", au lieu de "La big company coorp".
 AddAdressInList=Affiche les informations sur l’adresse du client/fournisseur (liste de sélection ou liste déroulante) <br> Les tiers apparaîtront avec le format de nom suivant: "The Big Company corp. - 21, rue du saut 123456 Big town - USA" au lieu de "The Big Company corp".
 AskForPreferredShippingMethod=Demander la méthode d'expédition préférée pour les Tiers
@@ -1328,7 +1330,7 @@ AdherentLoginRequired= Gérer un identifiant pour chaque adhérent
 AdherentMailRequired=Email obligatoire pour créer un nouvel adhérent
 MemberSendInformationByMailByDefault=Case à cocher pour envoyer un email de confirmation (validation ou nouvelle cotisation) aux adhérents est à oui par défaut.
 VisitorCanChooseItsPaymentMode=Le visiteur peut choisir parmi les modes de paiement disponibles
-MEMBER_REMINDER_EMAIL=Activer le rappel automatique <b> par e-mail </b> des abonnements expirés. Remarque: le module <strong> %s </strong> doit être activé et configuré correctement pour qu'un rappel soit envoyé.
+MEMBER_REMINDER_EMAIL=Activer le rappel automatique <b> par e-mail </b> des adhésions expirées. Remarque: le module <strong> %s </strong> doit être activé et configuré correctement pour qu'un rappel soit envoyé.
 ##### LDAP setup #####
 LDAPSetup=Configuration du module LDAP
 LDAPGlobalParameters=Paramètres globaux
@@ -1734,8 +1736,8 @@ ExpenseReportsRulesSetup=Configuration du module Notes de frais - Règles
 ExpenseReportNumberingModules=Modèle de numérotation des notes de frais
 NoModueToManageStockIncrease=Aucun module capable d'assurer l'augmentation de stock en automatique a été activé. La réduction de stock se fera donc uniquement sur mise à jour manuelle.
 YouMayFindNotificationsFeaturesIntoModuleNotification=Vous pouvez trouver d'autres options pour la notification par Email en activant et configurant le module "Notification".
-ListOfNotificationsPerUser=Liste des notifications par utilisateur*
-ListOfNotificationsPerUserOrContact=Liste des notifications par utilisateur* ou par contact**
+ListOfNotificationsPerUser=Liste des notifications automatiques par utilisateur*
+ListOfNotificationsPerUserOrContact=Liste des notifications automatiques (sur les évênements métiers) par utilisateur* ou par contact**
 ListOfFixedNotifications=Liste des notifications emails fixes
 GoOntoUserCardToAddMore=Allez dans l'onglet "Notifications" d'un utilisateur pour ajouter ou supprimer des notifications pour les utilisateurs
 GoOntoContactCardToAddMore=Rendez-vous sur l'onglet "Notifications" d'un tiers pour ajouter ou enlever les notifications pour les contacts/adresses
@@ -1898,6 +1900,11 @@ OnMobileOnly=Sur petit écran (smartphone) uniquement
 DisableProspectCustomerType=Désactiver le type de tiers "Prospect + Client" (le tiers doit donc être un client potentiel ou un client, mais ne peut pas être les deux)
 MAIN_OPTIMIZEFORTEXTBROWSER=Simplifier l'interface pour les malvoyants
 MAIN_OPTIMIZEFORTEXTBROWSERDesc=Activez cette option si vous êtes une personne malvoyante ou utilisez l'application à partir d'un navigateur de texte tel que Lynx ou Links.
+MAIN_OPTIMIZEFORCOLORBLIND=Changer la couleur de l'interface pour daltoniens
+MAIN_OPTIMIZEFORCOLORBLINDDesc=Activez cette option si vous êtes daltonien. Dans certains cas, l'interface changera la configuration des couleurs pour augmenter le contraste.
+Protanopia=Protanopia
+Deuteranopes=Deutéranopes
+Tritanopes=Tritanopes
 ThisValueCanOverwrittenOnUserLevel=Cette valeur peut être écrasée par chaque utilisateur à partir de sa page utilisateur - onglet '%s'
 DefaultCustomerType=Type de tiers par défaut pour un "Nouveau client" dans le formulaire de création
 ABankAccountMustBeDefinedOnPaymentModeSetup=Remarque: Le compte bancaire doit être défini sur le module de chaque mode de paiement (Paypal, Stripe, ...) pour que cette fonctionnalité fonctionne.
@@ -1911,7 +1918,7 @@ LogsLinesNumber=Nombre de lignes à afficher dans l'onglet des logs
 UseDebugBar=Utilisez la barre de débogage
 DEBUGBAR_LOGS_LINES_NUMBER=Nombre de dernières lignes de logs à conserver dans la console
 WarningValueHigherSlowsDramaticalyOutput=Attention, les valeurs élevées ralentissent considérablement les affichages
-DebugBarModuleActivated=Le module debugbar est activé et ralentit considérablement l'interface
+ModuleActivated=Le module %s est activé et ralentit l'interface
 EXPORTS_SHARE_MODELS=Les modèles d'exportation sont partagés avec tout le monde
 ExportSetup=Configuration du module Export
 InstanceUniqueID=ID unique de l'instance
@@ -1928,3 +1935,5 @@ YouWillFindItOnYourIFTTTAccount=Vous le trouverez sur votre compte IFTTT
 EndPointFor=Endpoint pour %s: %s
 DeleteEmailCollector=Supprimer le collecteur d'email
 ConfirmDeleteEmailCollector=Êtes-vous sûr de vouloir supprimer ce collecteur d'email ?
+RecipientEmailsWillBeReplacedWithThisValue=Les emails des destinataires seront toujours remplacés par cette valeur
+AtLeastOneDefaultBankAccountMandatory=Au moins 1 compte bancaire par défaut doit être défini
diff --git a/htdocs/langs/fr_FR/agenda.lang b/htdocs/langs/fr_FR/agenda.lang
index e187aa037c3..84bd47e9d93 100644
--- a/htdocs/langs/fr_FR/agenda.lang
+++ b/htdocs/langs/fr_FR/agenda.lang
@@ -55,9 +55,9 @@ MemberValidatedInDolibarr=Adhérent %s validé
 MemberModifiedInDolibarr=Adhérent %s modifié
 MemberResiliatedInDolibarr=Adhérent %s résilié
 MemberDeletedInDolibarr=Adhérent %s supprimé
-MemberSubscriptionAddedInDolibarr=Adhésion %s pour l'adhérent %s ajoutée
-MemberSubscriptionModifiedInDolibarr=Abonnement %s pour l'adhérent %s modifié
-MemberSubscriptionDeletedInDolibarr=Abonnement %s pour l'adhérent %s supprimé
+MemberSubscriptionAddedInDolibarr=Cotisation %s pour l'adhérent %s ajoutée
+MemberSubscriptionModifiedInDolibarr=Cotisation %s pour l'adhérent %s modifié
+MemberSubscriptionDeletedInDolibarr=Cotisation %s pour l'adhérent %s supprimé
 ShipmentValidatedInDolibarr=Expédition %s validée
 ShipmentClassifyClosedInDolibarr=Expédition %s classée payée
 ShipmentUnClassifyCloseddInDolibarr=Expédition %s réouverte
diff --git a/htdocs/langs/fr_FR/bills.lang b/htdocs/langs/fr_FR/bills.lang
index 41f5aca717c..fefc478c146 100644
--- a/htdocs/langs/fr_FR/bills.lang
+++ b/htdocs/langs/fr_FR/bills.lang
@@ -95,6 +95,7 @@ PaymentHigherThanReminderToPay=Règlement supérieur au reste à payer
 HelpPaymentHigherThanReminderToPay=Attention, le montant de paiement pour une ou plusieurs factures est supérieur au reste à payer.<br>Corrigez votre saisie, sinon, confirmez et pensez à créer un avoir du trop perçu lors de la fermeture de chacune des factures surpayées.
 HelpPaymentHigherThanReminderToPaySupplier=Attention, le montant de paiement pour une ou plusieurs factures est supérieur au reste à payer.<br>Corrigez votre saisie, sinon, confirmez et pensez à créer un avoir pour l'excédent pour chaque facture surpayée.
 ClassifyPaid=Classer 'Payée'
+ClassifyUnPaid=Classer 'impayé'
 ClassifyPaidPartially=Classer 'Payée partiellement'
 ClassifyCanceled=Classer 'Abandonnée'
 ClassifyClosed=Classer 'Fermée'
@@ -214,6 +215,20 @@ ShowInvoiceReplace=Afficher facture de remplacement
 ShowInvoiceAvoir=Afficher facture d'avoir
 ShowInvoiceDeposit=Afficher facture d'acompte
 ShowInvoiceSituation=Afficher la facture de situation
+UseSituationInvoices=Autoriser les factures de situation
+UseSituationInvoicesCreditNote=Autoriser les avoirs de factures de situation
+Retainedwarranty=Retenue de garantie
+RetainedwarrantyDefaultPercent=Pourcentage par défaut de la retenue de garantie
+ToPayOn=A payer sur %s
+toPayOn=à payer sur %s
+RetainedWarranty=Retenue de garantie
+PaymentConditionsShortRetainedWarranty=Conditions de réglement de la retenue de garantie
+DefaultPaymentConditionsRetainedWarranty=Conditions de paiement par défaut des retenues de garantie
+setPaymentConditionsShortRetainedWarranty=Fixer les conditions de paiement de la retenue de garantie
+setretainedwarranty=Définir la retenue de garantie
+setretainedwarrantyDateLimit=Définir la date limite de retenue de garantie
+RetainedWarrantyDateLimit=Date limite de retenue de garantie
+RetainedWarrantyNeed100Percent=La facture de la situation doit être à 100%% progress pour être affichée sur le PDF
 ShowPayment=Afficher règlement
 AlreadyPaid=Déjà réglé
 AlreadyPaidBack=Déjà remboursé
diff --git a/htdocs/langs/fr_FR/errors.lang b/htdocs/langs/fr_FR/errors.lang
index 1cf435379cd..b1180581b42 100644
--- a/htdocs/langs/fr_FR/errors.lang
+++ b/htdocs/langs/fr_FR/errors.lang
@@ -90,7 +90,7 @@ ErrorSpecialCharNotAllowedForField=Les caractères spéciaux ne sont pas admis p
 ErrorNumRefModel=Une référence existe en base (%s) et est incompatible avec cette numérotation. Supprimez la ligne ou renommez la référence pour activer ce module.
 ErrorQtyTooLowForThisSupplier=Quantité insuffisante pour ce fournisseur ou aucun tarif défini sur ce produit pour ce fournisseur
 ErrorOrdersNotCreatedQtyTooLow=Certaines commandes n'ont pas été créées en raison de quantités trop faibles
-ErrorModuleSetupNotComplete=La configuration des modules semble incomplète. Aller sur la page Accueil - Configuration - Modules pour corriger.
+ErrorModuleSetupNotComplete=La configuration du module %s semble incomplète. Aller sur la page Accueil - Configuration - Modules pour corriger.
 ErrorBadMask=Erreur sur le masque
 ErrorBadMaskFailedToLocatePosOfSequence=Erreur, masque sans numéro de séquence
 ErrorBadMaskBadRazMonth=Erreur, mauvais valeur de remise à zéro
@@ -219,6 +219,7 @@ ErrorURLMustStartWithHttp=L'URL %s doit commencer par http:// ou https://
 ErrorNewRefIsAlreadyUsed=Erreur, la nouvelle référence est déjà utilisée
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Erreur, supprimer le paiement lié à une facture clôturée n'est pas possible.
 # Warnings
+WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Votre paramètre PHP upload_max_filesize (%s) est supérieur au paramètre PHP post_max_size (%s). Ceci n'est pas une configuration cohérente.
 WarningPasswordSetWithNoAccount=Un mot de passe a été fixé pour cet adhérent. Cependant, aucun compte d'utilisateur n'a été créé. Donc, ce mot de passe est stocké, mais ne peut être utilisé pour accéder à Dolibarr. Il peut être utilisé par un module/interface externe, mais si vous n'avez pas besoin de définir ni login ni mot de passe pour un adhérent, vous pouvez désactiver l'option «Gérer un login pour chaque adhérent" depuis la configuration du module Adhérents. Si vous avez besoin de gérer un login, mais pas de mot de passe, vous pouvez laisser ce champ vide pour éviter cet avertissement. Remarque: L'email peut également être utilisé comme login si l'adhérent est lié à un utilisateur.
 WarningMandatorySetupNotComplete=Cliquez ici pour configurer les paramètres obligatoires
 WarningEnableYourModulesApplications=Cliquez ici pour activer vos modules et applications
diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang
index fb8f282eed8..5c3a3c51d4f 100644
--- a/htdocs/langs/fr_FR/main.lang
+++ b/htdocs/langs/fr_FR/main.lang
@@ -447,6 +447,7 @@ ContactsAddressesForCompany=Contacts/adresses de ce tiers
 AddressesForCompany=Adresses de ce tiers
 ActionsOnCompany=Événements sur ce tiers
 ActionsOnContact=Événements à propos de ce contact/adresse
+ActionsOnContract=Événements pour ce contrat
 ActionsOnMember=Événements vis à vis de cet adhérent
 ActionsOnProduct=Événements liés au produit
 NActionsLate=%s en retard
@@ -761,6 +762,7 @@ LinkToSupplierProposal=Lier à une proposition commerciale fournisseur
 LinkToSupplierInvoice=Lier à une facture fournisseur
 LinkToContract=Lier à un contrat
 LinkToIntervention=Lier à une intervention
+LinkToTicket=Lien vers le ticket
 CreateDraft=Créer brouillon
 SetToDraft=Retour en brouillon
 ClickToEdit=Cliquer ici pour éditer
diff --git a/htdocs/langs/fr_FR/members.lang b/htdocs/langs/fr_FR/members.lang
index 2d5b024df4f..dfc874bab79 100644
--- a/htdocs/langs/fr_FR/members.lang
+++ b/htdocs/langs/fr_FR/members.lang
@@ -110,8 +110,8 @@ ShowSubscription=Afficher adhésion
 SendingAnEMailToMember=Envoi d'informations par e-mail à un adhérent
 SendingEmailOnAutoSubscription=Envoi d'email lors de l'auto-inscription
 SendingEmailOnMemberValidation=Envoie d'email à la validation d'un nouvel adhérent
-SendingEmailOnNewSubscription=Envoyer un email sur un nouvel abonnement
-SendingReminderForExpiredSubscription=Envoi d'un rappel pour les abonnements expirés
+SendingEmailOnNewSubscription=Envoyer un email sur une nouvelle adhésion
+SendingReminderForExpiredSubscription=Envoi d'un rappel pour les adhésions expirées
 SendingEmailOnCancelation=Envoie d'email à l'annulation
 # Topic of email templates
 YourMembershipRequestWasReceived=Votre demande d'adhésion a été reçue.
@@ -130,8 +130,8 @@ DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Sujet de l'email reçu en cas d'aut
 DescADHERENT_AUTOREGISTER_NOTIF_MAIL=Email reçu en cas d'auto-inscription d'un invité
 DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Modèle Email à utiliser pour envoyer un email à un adhérent sur auto-adhésion de l'adhérent
 DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Modèle d'email à utiliser pour envoyer un email à un membre sur la validation d'un membre
-DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Modèle d'email électronique à utiliser pour envoyer un courrier électronique à un membre lors de l'enregistrement d'un nouvel abonnement
-DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Modèle d'email électronique à utiliser pour envoyer un rappel par courrier électronique lorsque l'abonnement est sur le point d'expirer
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Modèle d'email électronique à utiliser pour envoyer un courrier électronique à un membre lors de l'enregistrement d'une nouvelle cotisation
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Modèle d'email électronique à utiliser pour envoyer un rappel par courrier électronique lorsque l'adhésion est sur le point d'expirer
 DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Modèle d'email utilisé pour envoyer un email à un adhérent lors de l'annulation d'adhésion
 DescADHERENT_MAIL_FROM=Email émetteur pour les mails automatiques
 DescADHERENT_ETIQUETTE_TYPE=Format pages étiquettes
diff --git a/htdocs/langs/fr_FR/products.lang b/htdocs/langs/fr_FR/products.lang
index fe794e65446..097e2e3fc8d 100644
--- a/htdocs/langs/fr_FR/products.lang
+++ b/htdocs/langs/fr_FR/products.lang
@@ -2,6 +2,7 @@
 ProductRef=Réf. produit
 ProductLabel=Libellé produit
 ProductLabelTranslated=Libellé produit traduit
+ProductDescription=Description du produit
 ProductDescriptionTranslated=Description produit traduite
 ProductNoteTranslated=Traduire la note de produit
 ProductServiceCard=Fiche produit/service
diff --git a/htdocs/langs/fr_FR/stripe.lang b/htdocs/langs/fr_FR/stripe.lang
index a88a2f40c3b..1e69e280562 100644
--- a/htdocs/langs/fr_FR/stripe.lang
+++ b/htdocs/langs/fr_FR/stripe.lang
@@ -65,3 +65,5 @@ StripeUserAccountForActions=Compte d'utilisateur à utiliser pour certains e-mai
 StripePayoutList=Liste des versements par Stripe
 ToOfferALinkForTestWebhook=Lien pour la configuration de Stripe WebHook pour appeler l'IPN (mode test)
 ToOfferALinkForLiveWebhook=Lien pour la configuration de Stripe WebHook pour appeler l'IPN (mode actif)
+PaymentWillBeRecordedForNextPeriod=Le paiement sera enregistré pour la prochaine période.
+ClickHereToTryAgain=<a href="%s">Cliquez ici pour essayer à nouveau...</a>
diff --git a/htdocs/langs/fr_FR/website.lang b/htdocs/langs/fr_FR/website.lang
index e8a11ce5594..0bf16fbb663 100644
--- a/htdocs/langs/fr_FR/website.lang
+++ b/htdocs/langs/fr_FR/website.lang
@@ -39,8 +39,8 @@ ViewPageInNewTab=Pré-visualiser la page dans un nouvel onglet
 SetAsHomePage=Définir comme page d'accueil
 RealURL=URL réelle
 ViewWebsiteInProduction=Pré-visualiser le site web en utilisant l'URL de la page d'accueil
-SetHereVirtualHost=<u> Utilisation avec Apache/NGinx/...</u> <br> Si vous pouvez créer sur votre serveur Web (Apache, Nginx, ...) un hôte virtuel dédié avec PHP activé et un répertoire racine sur <br> <strong> %s </strong> <br> alors entrez le nom de l'hôte virtuel que vous avez créé afin que l'aperçu puisse également être fait en utilisant cet accès via ce serveur Web dédié plutôt que le serveur interne Dolibarr.
-YouCanAlsoTestWithPHPS=<u> Utilisation avec un serveur PHP incorporé </u> <br> Sous environnement de développement, vous pouvez préférer tester le site avec le serveur Web PHP intégré (PHP 5.5 requis) en exécutant <br> <strong> php -S 0.0. 0,0: 8080 -t %s </strong>
+SetHereVirtualHost=<u> Utilisation avec Apache/NGinx/...</u> <br> Si vous pouvez créer sur votre serveur Web (Apache, Nginx, ...) un hôte virtuel dédié avec PHP activé et un répertoire racine sur <br> <strong> %s </strong> <br> alors entrez le nom de l'hôte virtuel que vous avez créé dans les propriétés du site, ainsi l'aperçu pourra être fait en utilisant cette URL pour un accès via le serveur Web dédié plutôt que via le serveur interne Dolibarr.
+YouCanAlsoTestWithPHPS=<u> Utilisation avec un serveur PHP incorporé </u> <br> Sous environnement de développement, vous pouvez préférer tester le site avec le serveur Web PHP intégré (PHP 5.5 requis) en exécutant <br> <strong> php -S 0.0.0.0:8080 -t %s </strong>
 CheckVirtualHostPerms=Vérifiez également que le virtual host a la permission <strong> %s </strong> sur les fichiers dans <strong> %s </strong>
 ReadPerm=Lire
 WritePerm=Écrire
diff --git a/htdocs/langs/fr_FR/withdrawals.lang b/htdocs/langs/fr_FR/withdrawals.lang
index 586da7253da..468cdd8b9f3 100644
--- a/htdocs/langs/fr_FR/withdrawals.lang
+++ b/htdocs/langs/fr_FR/withdrawals.lang
@@ -76,7 +76,8 @@ WithdrawalFile=Fichier de prélèvement
 SetToStatusSent=Mettre au statut "Fichier envoyé"
 ThisWillAlsoAddPaymentOnInvoice=Cette action enregistrera les règlements des factures et les classera au statut "Payé" si le solde est nul
 StatisticsByLineStatus=Statistiques par statut des lignes
-RUM=RUM
+RUM=Référence de Mandat Unique (RUM)
+DateRUM=Date de signature du mandat
 RUMLong=Référence Unique de Mandat
 RUMWillBeGenerated=Si vide, le numéro de RUM sera généré une fois les informations de compte bancaire enregistrées
 WithdrawMode=Mode de prélévement (FRST ou RECUR)
diff --git a/htdocs/langs/he_IL/accountancy.lang b/htdocs/langs/he_IL/accountancy.lang
index 758d9c340a5..1fc3b3e05ec 100644
--- a/htdocs/langs/he_IL/accountancy.lang
+++ b/htdocs/langs/he_IL/accountancy.lang
@@ -265,7 +265,7 @@ AccountingJournals=Accounting journals
 AccountingJournal=Accounting journal
 NewAccountingJournal=New accounting journal
 ShowAccoutingJournal=Show accounting journal
-Nature=Nature
+NatureOfJournal=Nature of Journal
 AccountingJournalType1=Miscellaneous operations
 AccountingJournalType2=Sales
 AccountingJournalType3=Purchases
@@ -291,6 +291,7 @@ Modelcsv_quadratus=Export for Quadratus QuadraCompta
 Modelcsv_ebp=Export for EBP
 Modelcsv_cogilog=Export for Cogilog
 Modelcsv_agiris=Export for Agiris
+Modelcsv_LDCompta=Export for LD Compta (v9 & higher) (Test)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
@@ -301,7 +302,7 @@ ChartofaccountsId=Chart of accounts Id
 InitAccountancy=Init accountancy
 InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accounting account defined for sales and purchases.
 DefaultBindingDesc=This page can be used to set a default account to use to link transactions record about payment salaries, donation, taxes and vat when no specific accounting account were already set.
-DefaultClosureDesc=This page can be used to set parameters to use to enclose a balance sheet.
+DefaultClosureDesc=This page can be used to set parameters used for accounting closures.
 Options=Options
 OptionModeProductSell=Mode sales
 OptionModeProductSellIntra=Mode sales exported in EEC
diff --git a/htdocs/langs/he_IL/admin.lang b/htdocs/langs/he_IL/admin.lang
index 91d7f6f0c2c..8de440a7812 100644
--- a/htdocs/langs/he_IL/admin.lang
+++ b/htdocs/langs/he_IL/admin.lang
@@ -574,7 +574,7 @@ Module510Name=Salaries
 Module510Desc=Record and track employee payments
 Module520Name=Loans
 Module520Desc=Management of loans
-Module600Name=הודעות
+Module600Name=Notifications on business event
 Module600Desc=Send email notifications triggered by a business event: per user (setup defined on each user), per third-party contacts (setup defined on each third party) or by specific emails
 Module600Long=Note that this module sends emails in real-time when a specific business event occurs. If you are looking for a feature to send email reminders for agenda events, go into the setup of module Agenda.
 Module610Name=Product Variants
@@ -1193,6 +1193,7 @@ ExtraFieldsSupplierOrders=Complementary attributes (orders)
 ExtraFieldsSupplierInvoices=Complementary attributes (invoices)
 ExtraFieldsProject=Complementary attributes (projects)
 ExtraFieldsProjectTask=Complementary attributes (tasks)
+ExtraFieldsSalaries=Complementary attributes (salaries)
 ExtraFieldHasWrongValue=Attribute %s has a wrong value.
 AlphaNumOnlyLowerCharsAndNoSpace=only alphanumericals and lower case characters without space
 SendmailOptionNotComplete=אזהרה, על כמה מערכות לינוקס, לשלוח דוא&quot;ל הדוא&quot;ל שלך, הגדרת sendmail ביצוע חובה conatins אפשרות-BA (mail.force_extra_parameters פרמטר לקובץ php.ini שלך). אם מקבלי כמה לא לקבל הודעות דוא&quot;ל, מנסה לערוך פרמטר זה PHP עם mail.force_extra_parameters =-BA).
@@ -1220,13 +1221,14 @@ SuhosinSessionEncrypt=Session storage encrypted by Suhosin
 ConditionIsCurrently=Condition is currently %s
 YouUseBestDriver=You use driver %s which is the best driver currently available.
 YouDoNotUseBestDriver=You use driver %s but driver %s is recommended.
-NbOfProductIsLowerThanNoPb=You have only %s products/services in the database. This does not require any particular optimization.
+NbOfObjectIsLowerThanNoPb=You have only %s %s in the database. This does not require any particular optimization.
 SearchOptim=Search optimization
-YouHaveXProductUseSearchOptim=You have %s products in the database. You should add the constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+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.
 BrowserIsOK=You are using the %s web browser. This browser is ok for security and performance.
 BrowserIsKO=You are using the %s web browser. This browser is known to be a bad choice for security, performance and reliability. We recommend using Firefox, Chrome, Opera or Safari.
-XDebugInstalled=XDebug is loaded.
-XCacheInstalled=XCache is loaded.
+PHPModuleLoaded=PHP component %s is loaded
+PreloadOPCode=Preloaded OPCode is used
 AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.<br>Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp".
 AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".
 AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties.
@@ -1734,9 +1736,9 @@ ExpenseReportsRulesSetup=Setup of module Expense Reports - Rules
 ExpenseReportNumberingModules=Expense reports numbering module
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
 YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for email notifications by enabling and configuring the module "Notification".
-ListOfNotificationsPerUser=List of notifications per user*
-ListOfNotificationsPerUserOrContact=List of notifications (events) available per user* or per contact**
-ListOfFixedNotifications=List of Fixed Notifications
+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
 GoOntoUserCardToAddMore=Go to the tab "Notifications" of a user to add or remove notifications for users
 GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
 Threshold=Threshold
@@ -1898,6 +1900,11 @@ OnMobileOnly=On small screen (smartphone) only
 DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be Prospect or Customer but can't be both)
 MAIN_OPTIMIZEFORTEXTBROWSER=Simplify interface for blind person
 MAIN_OPTIMIZEFORTEXTBROWSERDesc=Enable this option if you are a blind person, or if you use the application from a text browser like Lynx or 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
 ThisValueCanOverwrittenOnUserLevel=This value can be overwritten by each user from its user page - tab '%s'
 DefaultCustomerType=Default thirdparty type for "New customer" creation form
 ABankAccountMustBeDefinedOnPaymentModeSetup=Note: The bank account must be defined on the module of each payment mode (Paypal, Stripe, ...) to have this feature working.
@@ -1911,7 +1918,7 @@ LogsLinesNumber=Number of lines to show on logs tab
 UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
-DebugBarModuleActivated=Module debugbar is activated and slows dramaticaly the interface
+ModuleActivated=Module %s is activated and slows the interface
 EXPORTS_SHARE_MODELS=Export models are share with everybody
 ExportSetup=Setup of module Export
 InstanceUniqueID=Unique ID of the instance
@@ -1928,3 +1935,5 @@ 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
diff --git a/htdocs/langs/he_IL/bills.lang b/htdocs/langs/he_IL/bills.lang
index 51e56257d26..2ee05e17cfe 100644
--- a/htdocs/langs/he_IL/bills.lang
+++ b/htdocs/langs/he_IL/bills.lang
@@ -95,6 +95,7 @@ PaymentHigherThanReminderToPay=Payment higher than reminder to pay
 HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess received for each overpaid invoice.
 HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess paid for each overpaid invoice.
 ClassifyPaid=Classify 'Paid'
+ClassifyUnPaid=Classify 'Unpaid'
 ClassifyPaidPartially=Classify 'Paid partially'
 ClassifyCanceled=Classify 'Abandoned'
 ClassifyClosed=Classify 'Closed'
@@ -214,6 +215,20 @@ ShowInvoiceReplace=Show replacing invoice
 ShowInvoiceAvoir=Show credit note
 ShowInvoiceDeposit=Show down payment invoice
 ShowInvoiceSituation=Show situation invoice
+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
 ShowPayment=Show payment
 AlreadyPaid=Already paid
 AlreadyPaidBack=Already paid back
diff --git a/htdocs/langs/he_IL/errors.lang b/htdocs/langs/he_IL/errors.lang
index b5a9d70cb70..1ee46fdbb92 100644
--- a/htdocs/langs/he_IL/errors.lang
+++ b/htdocs/langs/he_IL/errors.lang
@@ -90,7 +90,7 @@ ErrorSpecialCharNotAllowedForField=Special characters are not allowed for field
 ErrorNumRefModel=A reference exists into database (%s) and is not compatible with this numbering rule. Remove record or renamed reference to activate this module.
 ErrorQtyTooLowForThisSupplier=Quantity too low for this vendor or no price defined on this product for this vendor
 ErrorOrdersNotCreatedQtyTooLow=Some orders haven't been created because of too-low quantities
-ErrorModuleSetupNotComplete=Setup of module looks to be uncomplete. Go on Home - Setup - Modules to complete.
+ErrorModuleSetupNotComplete=Setup of module %s looks to be uncomplete. Go on Home - Setup - Modules to complete.
 ErrorBadMask=Error on mask
 ErrorBadMaskFailedToLocatePosOfSequence=Error, mask without sequence number
 ErrorBadMaskBadRazMonth=Error, bad reset value
@@ -219,6 +219,7 @@ 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.
 # 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.
 WarningMandatorySetupNotComplete=Click here to setup mandatory parameters
 WarningEnableYourModulesApplications=Click here to enable your modules and applications
diff --git a/htdocs/langs/he_IL/main.lang b/htdocs/langs/he_IL/main.lang
index 8fe7834c2d0..c62afca2efb 100644
--- a/htdocs/langs/he_IL/main.lang
+++ b/htdocs/langs/he_IL/main.lang
@@ -445,6 +445,7 @@ ContactsAddressesForCompany=Contacts/addresses for this third party
 AddressesForCompany=Addresses for this third party
 ActionsOnCompany=Events for this third party
 ActionsOnContact=Events for this contact/address
+ActionsOnContract=Events for this contract
 ActionsOnMember=Events about this member
 ActionsOnProduct=Events about this product
 NActionsLate=%s late
@@ -759,6 +760,7 @@ LinkToSupplierProposal=Link to vendor proposal
 LinkToSupplierInvoice=Link to vendor invoice
 LinkToContract=Link to contract
 LinkToIntervention=Link to intervention
+LinkToTicket=Link to ticket
 CreateDraft=Create draft
 SetToDraft=Back to draft
 ClickToEdit=Click to edit
diff --git a/htdocs/langs/he_IL/products.lang b/htdocs/langs/he_IL/products.lang
index 304814e958e..b6228d61aea 100644
--- a/htdocs/langs/he_IL/products.lang
+++ b/htdocs/langs/he_IL/products.lang
@@ -2,6 +2,7 @@
 ProductRef=Product ref.
 ProductLabel=Product label
 ProductLabelTranslated=Translated product label
+ProductDescription=Product description
 ProductDescriptionTranslated=Translated product description
 ProductNoteTranslated=Translated product note
 ProductServiceCard=Products/Services card
diff --git a/htdocs/langs/he_IL/stripe.lang b/htdocs/langs/he_IL/stripe.lang
index 7a3389f34b7..c5224982873 100644
--- a/htdocs/langs/he_IL/stripe.lang
+++ b/htdocs/langs/he_IL/stripe.lang
@@ -65,3 +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>
diff --git a/htdocs/langs/he_IL/withdrawals.lang b/htdocs/langs/he_IL/withdrawals.lang
index cbca2b2f103..88e5eaf128c 100644
--- a/htdocs/langs/he_IL/withdrawals.lang
+++ b/htdocs/langs/he_IL/withdrawals.lang
@@ -76,7 +76,8 @@ WithdrawalFile=Withdrawal file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and will classify them as "Paid" if remain to pay is null
 StatisticsByLineStatus=Statistics by status of lines
-RUM=UMR
+RUM=Unique Mandate Reference (UMR)
+DateRUM=Mandate signature date
 RUMLong=Unique Mandate Reference
 RUMWillBeGenerated=If empty, a UMR (Unique Mandate Reference) will be generated once the bank account information is saved.
 WithdrawMode=Direct debit mode (FRST or RECUR)
diff --git a/htdocs/langs/hr_HR/accountancy.lang b/htdocs/langs/hr_HR/accountancy.lang
index 81a9aa03a11..841716ba364 100644
--- a/htdocs/langs/hr_HR/accountancy.lang
+++ b/htdocs/langs/hr_HR/accountancy.lang
@@ -265,7 +265,7 @@ AccountingJournals=Accounting journals
 AccountingJournal=Accounting journal
 NewAccountingJournal=New accounting journal
 ShowAccoutingJournal=Show accounting journal
-Nature=Vrsta
+NatureOfJournal=Nature of Journal
 AccountingJournalType1=Miscellaneous operations
 AccountingJournalType2=Prodaja
 AccountingJournalType3=Nabava
@@ -291,6 +291,7 @@ Modelcsv_quadratus=Export for Quadratus QuadraCompta
 Modelcsv_ebp=Export for EBP
 Modelcsv_cogilog=Export for Cogilog
 Modelcsv_agiris=Export for Agiris
+Modelcsv_LDCompta=Export for LD Compta (v9 & higher) (Test)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
@@ -301,7 +302,7 @@ ChartofaccountsId=Chart of accounts Id
 InitAccountancy=Inicijalizacija računovodstva
 InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accounting account defined for sales and purchases.
 DefaultBindingDesc=This page can be used to set a default account to use to link transactions record about payment salaries, donation, taxes and vat when no specific accounting account were already set.
-DefaultClosureDesc=This page can be used to set parameters to use to enclose a balance sheet.
+DefaultClosureDesc=This page can be used to set parameters used for accounting closures.
 Options=Opcije
 OptionModeProductSell=Načini prodaje
 OptionModeProductSellIntra=Mode sales exported in EEC
diff --git a/htdocs/langs/hr_HR/admin.lang b/htdocs/langs/hr_HR/admin.lang
index 40f4dc40255..03b8897ad05 100644
--- a/htdocs/langs/hr_HR/admin.lang
+++ b/htdocs/langs/hr_HR/admin.lang
@@ -508,7 +508,7 @@ Module22Name=Mass Emailings
 Module22Desc=Manage bulk emailing
 Module23Name=Energija
 Module23Desc=Praćenje potrošnje energije
-Module25Name=Sales Orders
+Module25Name=Narudžbe kupaca
 Module25Desc=Sales order management
 Module30Name=Računi
 Module30Desc=Management of invoices and credit notes for customers. Management of invoices and credit notes for suppliers
@@ -574,7 +574,7 @@ Module510Name=Plaće
 Module510Desc=Record and track employee payments
 Module520Name=Krediti
 Module520Desc=Upravljanje kreditima
-Module600Name=Obavijesti
+Module600Name=Notifications on business event
 Module600Desc=Send email notifications triggered by a business event: per user (setup defined on each user), per third-party contacts (setup defined on each third party) or by specific emails
 Module600Long=Note that this module sends emails in real-time when a specific business event occurs. If you are looking for a feature to send email reminders for agenda events, go into the setup of module Agenda.
 Module610Name=Product Variants
@@ -590,7 +590,7 @@ Module1200Desc=Integracija Mantisa
 Module1520Name=Generiranje dokumenta
 Module1520Desc=Mass email document generation
 Module1780Name=Kategorije
-Module1780Desc=Kreiraj kategoriju (proizvodi, kupci, dobavljači, kontakti ili članovi)
+Module1780Desc=Izradi oznake/skupinu (proizvodi, kupci, dobavljači, kontakti ili članovi)
 Module2000Name=WYSIWYG editor
 Module2000Desc=Allow text fields to be edited/formatted using CKEditor (html)
 Module2200Name=Dinamičke cijene
@@ -653,21 +653,21 @@ Module62000Desc=Add features to manage Incoterms
 Module63000Name=Sredstva
 Module63000Desc=Manage resources (printers, cars, rooms, ...) for allocating to events
 Permission11=Čitaj račune kupca
-Permission12=Kreiraj/promjeni 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
-Permission16=Kreiraj plaćanje za račune kupca
+Permission16=Izradi plaćanje za račune kupca
 Permission19=Obriši račun kupca
 Permission21=Pročitaj ponude
-Permission22=Kreiraj/izmjeni ponudu
+Permission22=Izradi/izmjeni ponudu
 Permission24=Ovjeri ponudu
 Permission25=Pošalji ponudu
 Permission26=Zatvori ponudu
 Permission27=Obriši ponudu
 Permission28=Izvezi ponude
 Permission31=Čitaj proizvode
-Permission32=Kreiraj/izmjeni proizvod
+Permission32=Izradi/izmjeni proizvod
 Permission34=Obriši proizvod
 Permission36=Pregled/upravljanje skrivenim proizvodima
 Permission38=izvoz proizvoda
@@ -676,16 +676,16 @@ Permission42=Create/modify projects (shared project and projects I'm contact for
 Permission44=Delete projects (shared project and projects I'm contact for)
 Permission45=Izvezi projekte
 Permission61=Čitaj intervencije
-Permission62=Kreiraj/promjeni intervencije
+Permission62=Izradi/promjeni intervencije
 Permission64=Obriši intervencije
 Permission67=Izvezi intervencije
 Permission71=Čitaj članove
-Permission72=Kreiraj/izmjeni članove
+Permission72=Izradi/izmjeni članove
 Permission74=Obriši članove
-Permission75=Podešavanje tipova članarine
+Permission75=Podešavanje vrsta članarine
 Permission76=Izvoz podataka
 Permission78=Čitaj pretplate
-Permission79=Kreiraj/izmjeni pretplate
+Permission79=Izradi/izmjeni pretplate
 Permission81=Čitaj narudžbe kupca
 Permission82=Izradi/izmjeni narudžbe kupaca
 Permission84=Ovjeri narudžbu kupca
@@ -694,24 +694,24 @@ Permission87=Zatvori narudžbu kupca
 Permission88=Otkaži potvrdu 
 Permission89=Obriši narudžbe kupaca
 Permission91=Čitaj društvene ili fiskalne poreze i PDV
-Permission92=Kreiraj/izmjeni društvene ili fiskalne poreze i PDV
+Permission92=Izradi/izmjeni društvene ili fiskalne poreze i PDV
 Permission93=Obriši društvene ili fiskalne poreze i PDV
 Permission94=Izvezi društvene ili fiskalne poreze
 Permission95=Čitaj izvještaje
 Permission101=Čitaj slanja
-Permission102=Kreiraj/izmjeni slanja
+Permission102=Izradi/izmjeni slanja
 Permission104=Ovjeri slanja
 Permission106=Izvezi slanja
 Permission109=Obriši slanja
 Permission111=Čitanje financijskih računa
-Permission112=Kreiraj/izmjeni/obriši i usporedi transakcije
+Permission112=Izradi/izmjeni/obriši i usporedi transakcije
 Permission113=Podešavanje financijskih računa (kreiranje, upravljanje kategorijama)
 Permission114=Reconcile transactions
 Permission115=Izvoz transakcija i izvodi
 Permission116=Prijenos između računa
 Permission117=Manage checks dispatching
 Permission121=Čitaj veze komitenata s korisnicima
-Permission122=Kreiraj/izmjeni komitente povezane s korisnicima
+Permission122=Izradi/izmjeni komitente povezane s korisnicima
 Permission125=Obriši komitente povezane s korisnicima
 Permission126=Izvezi komitente
 Permission141=Read all projects and tasks (also private projects for which I am not a contact)
@@ -724,13 +724,13 @@ Permission152=Create/modify a direct debit payment orders
 Permission153=Send/Transmit direct debit payment orders
 Permission154=Record Credits/Rejections of direct debit payment orders
 Permission161=Čitaj ugovore/pretplate
-Permission162=Kreiraj/izmjeni ugovore/pretplate
+Permission162=Izradi/izmjeni ugovore/pretplate
 Permission163=Aktiviraj uslugu/pretplatu ugovora
 Permission164=Deaktiviraj uslugu/pretplatu ugovora
 Permission165=Obriši ugovore/pretplate
 Permission167=Izvezi ugovore
 Permission171=Čitaj putne naloge i troškove (vaši i vaših podređenih)
-Permission172=Kreiraj/izmjeni putne naloge i troškove
+Permission172=Izradi/izmjeni putne naloge i troškove
 Permission173=Obriši putne naloge i troškove
 Permission174=Čitaj sve putne naloge i troškove
 Permission178=Izvezi putne naloge i troškove
@@ -743,10 +743,10 @@ Permission185=Order or cancel purchase orders
 Permission186=Receive purchase orders
 Permission187=Close purchase orders
 Permission188=Cancel purchase orders
-Permission192=Kreiraj stavke
+Permission192=Izradi stavke
 Permission193=Otkaži stavke
 Permission194=Read the bandwidth lines
-Permission202=Kreiraj ADSL sapajanje
+Permission202=Izradi ADSL sapajanje
 Permission203=Naruči narudžbe spajanja
 Permission204=Narudžba spajanja
 Permission205=Upravljanje spajanjima
@@ -757,22 +757,22 @@ Permission213=Aktiviraj liniju
 Permission214=Postavke telefonije
 Permission215=Postavke pružatelja
 Permission221=Čitaj korespodenciju
-Permission222=Kreiraj/izmjeni korespodenciju (teme, primatelji...)
+Permission222=Izradi/izmjeni korespodenciju (teme, primatelji...)
 Permission223=Ovjeri korespodenciju (omogućuje slanje)
 Permission229=Obriši korespodenciju
 Permission237=Pregled primatelja i informacije
 Permission238=Ručno slanje korespodencije
 Permission239=Obriši korespodenciju nakon ovjere ili slanja
 Permission241=Čitaj kategorije
-Permission242=Kreiraj/izmjeni kategorije
+Permission242=Izradi/izmjeni kategorije
 Permission243=Obriši kategorije
 Permission244=Vidi sadržaj skrivenih kategorija
 Permission251=Čitaj ostale korisnike i grupe
 PermissionAdvanced251=Čitaj ostale korisnike
 Permission252=Čitaj dozvole ostalih korisnika
 Permission253=Create/modify other users, groups and permissions
-PermissionAdvanced253=Kreiraj/izmjeni interne/vanjske korisnike i dozvole
-Permission254=Kreiraj/izmjeni samo vanjske korisnike
+PermissionAdvanced253=Izradi/izmjeni interne/vanjske korisnike i dozvole
+Permission254=Izradi/izmjeni samo vanjske korisnike
 Permission255=Izmjeni lozinku ostalih korisnika
 Permission256=Obriši ili isključi ostale korisnike
 Permission262=Extend access to all third parties (not only third parties for which that user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
@@ -780,7 +780,7 @@ Permission271=Čitaj CA
 Permission272=Čitaj račune
 Permission273=Izdaj račun
 Permission281=Čitaj kontakte
-Permission282=Kreiraj/izmjeni kontakte
+Permission282=Izradi/izmjeni kontakte
 Permission283=Obriši kontakte
 Permission286=Izvezi kontakte
 Permission291=Čitaj tarife
@@ -792,19 +792,19 @@ Permission302=Delete barcodes
 Permission311=Čitaj usluge
 Permission312=Dodavanje usluge/pretplate ugovoru
 Permission331=Čitaj zabilješke
-Permission332=Kreiraj/izmjeni zabilješke
+Permission332=Izradi/izmjeni zabilješke
 Permission333=Obriši zabilješke
 Permission341=Čitaj svoje dozvole
-Permission342=Kreiraj/izmjeni svoje korisničke informacije
+Permission342=Izradi/izmjeni svoje korisničke informacije
 Permission343=Izmjeni svoju lozinku
 Permission344=Izmjeni svoje dozvole
 Permission351=Čitaj grupe
 Permission352=Čitaj dozvole grupa
-Permission353=Kreiraj/izmjeni grupe
+Permission353=Izradi/izmjeni grupe
 Permission354=Obriši ili iskljući grupe
 Permission358=Izvezi korisnike
 Permission401=Čitaj popuste
-Permission402=Kreiraj/izmjeni popuste
+Permission402=Izradi/izmjeni popuste
 Permission403=Ovjeri popuste
 Permission404=Obriši popuste
 Permission430=Use Debug Bar
@@ -813,12 +813,12 @@ Permission512=Create/modify payments of salaries
 Permission514=Delete payments of salaries
 Permission517=Izvoz plaća
 Permission520=Čitaj kredite
-Permission522=Kreiraj/izmjeni kredite
+Permission522=Izradi/izmjeni kredite
 Permission524=Obriši kredite
 Permission525=Pristup kreditnom kalkulatoru
 Permission527=Izvoz kredita
 Permission531=Čitaj usluge
-Permission532=Kreiraj/izmjeni usluge
+Permission532=Izradi/izmjeni usluge
 Permission534=Obriši usluge
 Permission536=Vidi/upravljaj skrivenim uslugama
 Permission538=Izvezi usluge
@@ -826,22 +826,22 @@ Permission650=Read Bills of Materials
 Permission651=Create/Update Bills of Materials
 Permission652=Delete Bills of Materials
 Permission701=Čitaj donacije
-Permission702=Kreiraj/izmjeni donacije
+Permission702=Izradi/izmjeni donacije
 Permission703=Obriši donacije
 Permission771=Čitaj izvještaje troška (vaši i vaših podređenih)
-Permission772=Kreiraj/izmjeni izvještaje troška
+Permission772=Izradi/izmjeni izvještaje troška
 Permission773=Obriši izvještaje troška
 Permission774=Čitaj sve izvještaje troška (čak i svoje i podređenih)
 Permission775=Odobri izvještaje trška
 Permission776=Isplati izvještaje troška
 Permission779=Izvezi izvještaje troška
 Permission1001=Čitaj zalihe
-Permission1002=Kreiraj/izmjeni skladišta
+Permission1002=Izradi/izmjeni skladišta
 Permission1003=Obriši skladišta
 Permission1004=Čitaj kretanja zaliha
-Permission1005=Kreiraj/izmjeni kretanja zaliha
+Permission1005=Izradi/izmjeni kretanja zaliha
 Permission1101=Čitaj naloge isporuka
-Permission1102=Kreiraj/izmjeni naloge isporuka
+Permission1102=Izradi/izmjeni naloge isporuka
 Permission1104=Ovjeri naloge isporuka
 Permission1109=Obriši naloge isporuka
 Permission1121=Read supplier proposals
@@ -860,7 +860,7 @@ Permission1187=Acknowledge receipt of purchase orders
 Permission1188=Delete purchase orders
 Permission1190=Approve (second approval) purchase orders
 Permission1201=Primi rezultat izvoza
-Permission1202=Kreiraj/izmjeni izvoz
+Permission1202=Izradi/izmjeni izvoz
 Permission1231=Read vendor invoices
 Permission1232=Create/modify vendor invoices
 Permission1233=Validate vendor invoices
@@ -873,10 +873,10 @@ Permission1321=Izvezi račune kupaca, atribute i plačanja
 Permission1322=Reopen a paid bill
 Permission1421=Export sales orders and attributes
 Permission2401=Čitaj akcije (događaje ili zadatke) povezanih s njegovim računom
-Permission2402=Kreiraj/izmjeni akcije (događaje ili zadatke) povezanih s njegovim računom
+Permission2402=Izradi/izmjeni akcije (događaje ili zadatke) povezanih s njegovim računom
 Permission2403=Obriši akcije (događaje ili zadatke) povezanih s njegovim računom
 Permission2411=Čitaj akcije (događaje ili zadatke) ostalih
-Permission2412=Kreiraj/izmjeni akcije (događaje ili zadatke) ostalih
+Permission2412=Izradi/izmjeni akcije (događaje ili zadatke) ostalih
 Permission2413=Obriši akcije (događaje ili zadatke) ostalih
 Permission2414=Izvezi ostale akcije/zadatke
 Permission2501=Čitaj/Skini dokumente
@@ -901,7 +901,7 @@ Permission20004=Read all leave requests (even of user not subordinates)
 Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
 Permission20006=Admin zahtjevi odsutnosti ( podešavanje i saldo ) 
 Permission23001=Pročitaj planirani posao
-Permission23002=Kreiraj/izmjeni Planirani posao
+Permission23002=Izradi/izmjeni Planirani posao
 Permission23003=Obriši planirani posao
 Permission23004=Izvrši planirani posao
 Permission50101=Use Point of Sale
@@ -922,15 +922,15 @@ Permission51003=Delete assets
 Permission51005=Setup types of asset
 Permission54001=Ispis
 Permission55001=Čitaj ankete
-Permission55002=Kreiraj/izmjeni ankete
+Permission55002=Izradi/izmjeni ankete
 Permission59001=Pročitaj komercijalne marže
 Permission59002=Postavi komercijalne marže
 Permission59003=Čitaj marže svakog korisnika
 Permission63001=Čitaj sredstva
-Permission63002=Kreiraj/izmjeni sredstva
+Permission63002=Izradi/izmjeni sredstva
 Permission63003=Obriši sredstva
 Permission63004=Poveži sredstava sa događajima agende
-DictionaryCompanyType=Third-party types
+DictionaryCompanyType=Vrste trećih osoba
 DictionaryCompanyJuridicalType=Third-party legal entities
 DictionaryProspectLevel=Potencijalni kupac
 DictionaryCanton=States/Provinces
@@ -942,7 +942,7 @@ DictionaryActions=Tipovi događaja agende
 DictionarySocialContributions=Types of social or fiscal taxes
 DictionaryVAT=Stope PDV-a ili stope prodajnih poreza
 DictionaryRevenueStamp=Amount of tax stamps
-DictionaryPaymentConditions=Payment Terms
+DictionaryPaymentConditions=Rok plaćanja
 DictionaryPaymentModes=Payment Modes
 DictionaryTypeContact=Tipovi Kontakata/adresa
 DictionaryTypeOfContainer=Website - Type of website pages/containers
@@ -981,13 +981,13 @@ LTRate=Stopa
 LocalTax1IsNotUsed=Nemoj koristit drugi porez
 LocalTax1IsUsedDesc=Use a second type of tax (other than first one)
 LocalTax1IsNotUsedDesc=Do not use other type of tax (other than first one)
-LocalTax1Management=Tip drugog poreza
+LocalTax1Management=Vrsta drugog poreza
 LocalTax1IsUsedExample=
 LocalTax1IsNotUsedExample=
 LocalTax2IsNotUsed=Nemoj koristiti treći porez
 LocalTax2IsUsedDesc=Use a third type of tax (other than first one)
 LocalTax2IsNotUsedDesc=Do not use other type of tax (other than first one)
-LocalTax2Management=Tip trećeg poreza
+LocalTax2Management=Vrsta trećeg poreza
 LocalTax2IsUsedExample=
 LocalTax2IsNotUsedExample=
 LocalTax1ManagementES=Upravljenje RE
@@ -1038,7 +1038,7 @@ Tables=Tabele
 TableName=Naziv tabele
 NbOfRecord=No. of records
 Host=Server
-DriverType=Tip upr. programa
+DriverType=Vrsta upr. programa
 SummarySystem=Sažetak informacija o sistemu
 SummaryConst=Popis svih Dolibarr parametara podešavanja
 MenuCompanySetup=Tvrtka/Organizacija
@@ -1186,13 +1186,14 @@ ExtraFieldsSupplierInvoicesLines=Dodatni atributi (stavke računa)
 ExtraFieldsThirdParties=Complementary attributes (third party)
 ExtraFieldsContacts=Complementary attributes (contacts/address)
 ExtraFieldsMember=Dodatni atributi (član)
-ExtraFieldsMemberType=Dodatni atributi (tip člana)
+ExtraFieldsMemberType=Dodatni atributi (vrsta člana)
 ExtraFieldsCustomerInvoices=Dodatni atributi (računi)
 ExtraFieldsCustomerInvoicesRec=Complementary attributes (templates invoices)
 ExtraFieldsSupplierOrders=Dodatni atributi (narudžbe)
 ExtraFieldsSupplierInvoices=Dodatni atributi (računi)
 ExtraFieldsProject=Dodatni atributi (projekti)
 ExtraFieldsProjectTask=Dodatni atributi (zadaci)
+ExtraFieldsSalaries=Complementary attributes (salaries)
 ExtraFieldHasWrongValue=Atribut %s ima krivu vrijednost.
 AlphaNumOnlyLowerCharsAndNoSpace=samo alfanumerički i mala slova bez razmaka
 SendmailOptionNotComplete=Warning, on some Linux systems, to send email from your email, sendmail execution setup must contains option -ba (parameter mail.force_extra_parameters into your php.ini file). If some recipients never receive emails, try to edit this PHP parameter with mail.force_extra_parameters = -ba).
@@ -1220,13 +1221,14 @@ SuhosinSessionEncrypt=Session storage encrypted by Suhosin
 ConditionIsCurrently=Stanje je trenutno %s
 YouUseBestDriver=You use driver %s which is the best driver currently available.
 YouDoNotUseBestDriver=You use driver %s but driver %s is recommended.
-NbOfProductIsLowerThanNoPb=You have only %s products/services in the database. This does not require any particular optimization.
+NbOfObjectIsLowerThanNoPb=You have only %s %s in the database. This does not require any particular optimization.
 SearchOptim=Optimizacija pretrage
-YouHaveXProductUseSearchOptim=You have %s products in the database. You should add the constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+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.
 BrowserIsOK=You are using the %s web browser. This browser is ok for security and performance.
 BrowserIsKO=You are using the %s web browser. This browser is known to be a bad choice for security, performance and reliability. We recommend using Firefox, Chrome, Opera or Safari.
-XDebugInstalled=XDebug is loaded.
-XCacheInstalled=XCache is loaded.
+PHPModuleLoaded=PHP component %s is loaded
+PreloadOPCode=Preloaded OPCode is used
 AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.<br>Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp".
 AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".
 AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties.
@@ -1498,8 +1500,8 @@ MergePropalProductCard=Activate in product/service Attached Files tab an option
 ViewProductDescInThirdpartyLanguageAbility=Display products descriptions in the language of the third party
 UseSearchToSelectProductTooltip=Also if you have a large number of products (> 100 000), you can increase speed by setting constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectProduct=Wait until you press a key before loading content of product combo list (This may increase performance if you have a large number of products, but it is less convenient)
-SetDefaultBarcodeTypeProducts=Zadani tip barkoda za korištenje kod proizvoda
-SetDefaultBarcodeTypeThirdParties=Zadani tip barkoda za korištenje kod komitenta
+SetDefaultBarcodeTypeProducts=Zadana vrsta barkoda za korištenje kod proizvoda
+SetDefaultBarcodeTypeThirdParties=Zadana vrsta barkoda za korištenje kod komitenta
 UseUnits=Define a unit of measure for Quantity during order, proposal or invoice lines edition
 ProductCodeChecker= Module for product code generation and checking (product or service)
 ProductOtherConf= Konfiguracija Proizvoda / Usluga
@@ -1522,7 +1524,7 @@ DonationsReceiptModel=Predložak za donacijsku primku
 ##### Barcode #####
 BarcodeSetup=Podešavanje barkoda
 PaperFormatModule=Modul formata ispisa
-BarcodeEncodeModule=Tip dekodiranja barkoda
+BarcodeEncodeModule=Vrsta dekodiranja barkoda
 CodeBarGenerator=Generator barkoda
 ChooseABarCode=Generator nije definiran
 FormatNotSupportedByGenerator=Format nije podržan ovim generatora
@@ -1590,7 +1592,7 @@ HideUnauthorizedMenu= Sakrij neautorizirane izbornike (sivo)
 DetailId=ID Izbornika
 DetailMenuHandler=Nosioc izbornika gdje da se prikaže novi izbornik
 DetailMenuModule=Naziv modula ako stavka izbornika dolazi iz modula
-DetailType=Tip izbornika (gore ili lijevi)
+DetailType=Vrsta izbornika (gore ili lijevi)
 DetailTitre=Oznaka izbornika ili oznaka koda za prijevod
 DetailUrl=URL where menu send you (Absolute URL link or external link with http://)
 DetailEnabled=Uvjet za prikaz stavke ili ne
@@ -1734,9 +1736,9 @@ ExpenseReportsRulesSetup=Setup of module Expense Reports - Rules
 ExpenseReportNumberingModules=Expense reports numbering module
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
 YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for email notifications by enabling and configuring the module "Notification".
-ListOfNotificationsPerUser=Popis obavijesti po korisniku *
-ListOfNotificationsPerUserOrContact=List of notifications (events) available per user* or per contact**
-ListOfFixedNotifications=List of Fixed Notifications
+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
 GoOntoUserCardToAddMore=Go to the tab "Notifications" of a user to add or remove notifications for users
 GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
 Threshold=Najviše dopušteno
@@ -1771,7 +1773,7 @@ RecuperableOnly=Yes for VAT "Not Perceived but Recoverable" dedicated for some s
 UrlTrackingDesc=If the provider or transport service offers a page or web site to check the status of your shipments, you may enter it here. You can use the key {TRACKID} in the URL parameters so the system will replace it with the tracking number the user entered into the shipment card.
 OpportunityPercent=When you create a lead, you will define an estimated amount of project/lead. According to status of the lead, this amount may be multiplied by this rate to evaluate a total amount all your leads may generate. Value is a percentage (between 0 and 100).
 TemplateForElement=This template record is dedicated to which element
-TypeOfTemplate=Tip predloška
+TypeOfTemplate=Vrsta predloška
 TemplateIsVisibleByOwnerOnly=Template is visible to owner only
 VisibleEverywhere=Visible everywhere
 VisibleNowhere=Visible nowhere
@@ -1898,6 +1900,11 @@ OnMobileOnly=On small screen (smartphone) only
 DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be Prospect or Customer but can't be both)
 MAIN_OPTIMIZEFORTEXTBROWSER=Simplify interface for blind person
 MAIN_OPTIMIZEFORTEXTBROWSERDesc=Enable this option if you are a blind person, or if you use the application from a text browser like Lynx or 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
 ThisValueCanOverwrittenOnUserLevel=This value can be overwritten by each user from its user page - tab '%s'
 DefaultCustomerType=Default thirdparty type for "New customer" creation form
 ABankAccountMustBeDefinedOnPaymentModeSetup=Note: The bank account must be defined on the module of each payment mode (Paypal, Stripe, ...) to have this feature working.
@@ -1911,7 +1918,7 @@ LogsLinesNumber=Number of lines to show on logs tab
 UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
-DebugBarModuleActivated=Module debugbar is activated and slows dramaticaly the interface
+ModuleActivated=Module %s is activated and slows the interface
 EXPORTS_SHARE_MODELS=Export models are share with everybody
 ExportSetup=Setup of module Export
 InstanceUniqueID=Unique ID of the instance
@@ -1928,3 +1935,5 @@ 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
diff --git a/htdocs/langs/hr_HR/agenda.lang b/htdocs/langs/hr_HR/agenda.lang
index 6192a20c6aa..645ac6c0003 100644
--- a/htdocs/langs/hr_HR/agenda.lang
+++ b/htdocs/langs/hr_HR/agenda.lang
@@ -125,9 +125,9 @@ ExtSiteUrlAgenda=URL za pristup .ical datoteki
 ExtSiteNoLabel=Bez opisa
 VisibleTimeRange=Vidljivi vremenski raspon
 VisibleDaysRange=Vidljivi dnevni raspon
-AddEvent=Kreiraj događaj
+AddEvent=Izradi događaj
 MyAvailability=Moja dostupnost
-ActionType=Tip događaja
+ActionType=Vrsta događaja
 DateActionBegin=Datum početka događaja
 ConfirmCloneEvent=Are you sure you want to clone the event <b>%s</b>?
 RepeatEvent=Ponovi događaj
diff --git a/htdocs/langs/hr_HR/banks.lang b/htdocs/langs/hr_HR/banks.lang
index 8c6708b063c..25dc19fe6c8 100644
--- a/htdocs/langs/hr_HR/banks.lang
+++ b/htdocs/langs/hr_HR/banks.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - banks
 Bank=Banka
-MenuBankCash=Banks | Cash
+MenuBankCash=Banke | Gotovina
 MenuVariousPayment=Miscellaneous payments
 MenuNewVariousPayment=New Miscellaneous payment
 BankName=Ime banke
@@ -47,13 +47,13 @@ BankAccountCountry=Država računa
 BankAccountOwner=Naziv vlasnika računa
 BankAccountOwnerAddress=Adresa vlasinka računa
 RIBControlError=Integrity check of values failed. This means the information for this account number is not complete or is incorrect (check country, numbers and IBAN).
-CreateAccount=Kreiraj račun
+CreateAccount=Izradi račun
 NewBankAccount=Novi račun
 NewFinancialAccount=Novi financijski račun
 MenuNewFinancialAccount=Novi financijski račun
 EditFinancialAccount=Uredi račun
 LabelBankCashAccount=Oznaka za banku ili gotovinu
-AccountType=Tip računa
+AccountType=Vrsta računa
 BankType0=Štedni račun
 BankType1=Tekući račun ili kreditna kartica
 BankType2=Gotovinski račun
diff --git a/htdocs/langs/hr_HR/bills.lang b/htdocs/langs/hr_HR/bills.lang
index 6f68286f9ae..993ae31d4c3 100644
--- a/htdocs/langs/hr_HR/bills.lang
+++ b/htdocs/langs/hr_HR/bills.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - bills
-Bill=Račun R1
+Bill=Račun
 Bills=Računi
 BillsCustomers=Računi kupaca
 BillsCustomer=Račun kupca
@@ -16,7 +16,7 @@ DisabledBecauseNotLastInvoice=Nije moguće provesti jer se račun ne može izbri
 DisabledBecauseNotErasable=Nije moguće provesti jer ne može biti obrisano
 InvoiceStandard=Običan račun
 InvoiceStandardAsk=Običan račun
-InvoiceStandardDesc=Ovo je uobičajeni tip računa.
+InvoiceStandardDesc=Ovo je uobičajena vrsta računa.
 InvoiceDeposit=Račun za predujam
 InvoiceDepositAsk=Račun za predujam
 InvoiceDepositDesc=Ovakav račun izdaje se kada je zaprimljen predujam
@@ -46,8 +46,8 @@ NoInvoiceToCorrect=Nema računa za ispravak
 InvoiceHasAvoir=Bio je izvor od jednog ili više knjižnih odobrenja
 CardBill=Kartica računa
 PredefinedInvoices=Predlošci računa
-Invoice=Račun R1
-PdfInvoiceTitle=Račun R1
+Invoice=Račun
+PdfInvoiceTitle=Račun
 Invoices=Računi
 InvoiceLine=Redak računa
 InvoiceCustomer=Račun za kupca
@@ -80,27 +80,28 @@ PaymentsReports=Izvještaji plaćanja
 PaymentsAlreadyDone=Izvršena plaćanja
 PaymentsBackAlreadyDone=Izvršeni povrati plaćanja
 PaymentRule=Način plaćanja
-PaymentMode=Payment Type
+PaymentMode=Način plaćanja
 PaymentTypeDC=Debitna/kreditna kartica
 PaymentTypePP=PayPal
 IdPaymentMode=Payment Type (id)
 CodePaymentMode=Payment Type (code)
 LabelPaymentMode=Payment Type (label)
-PaymentModeShort=Payment Type
+PaymentModeShort=Način plaćanja
 PaymentTerm=Payment Term
-PaymentConditions=Payment Terms
-PaymentConditionsShort=Payment Terms
+PaymentConditions=Rok plaćanja
+PaymentConditionsShort=Rok plaćanja
 PaymentAmount=Iznos plaćanja
 PaymentHigherThanReminderToPay=Iznos plaćanja veći je od iznosa po podsjetniku na plaćanje
 HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess received for each overpaid invoice.
 HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess paid for each overpaid invoice.
 ClassifyPaid=Označi kao plaćeno
+ClassifyUnPaid=Classify 'Unpaid'
 ClassifyPaidPartially=Označi kao djelomično plaćeno
 ClassifyCanceled=Označi kao napušteno
 ClassifyClosed=Označi kao zatvoreno
 ClassifyUnBilled=Označi kao "nezaračunato"
 CreateBill=Izradi račun
-CreateCreditNote=Create credit note
+CreateCreditNote=Izradi storno računa/knjižno odobrenje
 AddBill=Izradi račun ili storno računa/knjižno odobrenje
 AddToDraftInvoices=Dodati u predložak računa
 DeleteBill=Izbriši račun
@@ -108,12 +109,12 @@ SearchACustomerInvoice=Traži račun za kupca
 SearchASupplierInvoice=Search for a vendor invoice
 CancelBill=Poništi račun
 SendRemindByMail=Pošalji podsjetnik e-poštom
-DoPayment=Enter payment
+DoPayment=Unesi uplatu
 DoPaymentBack=Enter refund
 ConvertToReduc=Mark as credit available
 ConvertExcessReceivedToReduc=Convert excess received into available credit
 ConvertExcessPaidToReduc=Convert excess paid into available discount
-EnterPaymentReceivedFromCustomer=Upiši zaprimljeno plaćanje kupca
+EnterPaymentReceivedFromCustomer=Unesi uplatu od kupca
 EnterPaymentDueToCustomer=Napravi 
 DisabledBecauseRemainderToPayIsZero=Isključeno jer preostalo dugovanje je nula.
 PriceBase=Osnovica
@@ -150,7 +151,7 @@ ErrorBillNotFound=Račun %s ne postoji
 ErrorInvoiceAlreadyReplaced=Error, you tried to validate an invoice to replace invoice %s. But this one has already been replaced by invoice %s.
 ErrorDiscountAlreadyUsed=Greška! Popust je već iskorišten.
 ErrorInvoiceAvoirMustBeNegative=Greška! Ispravan račun treba imati negativan iznos.
-ErrorInvoiceOfThisTypeMustBePositive=Greška! Ovaj tip računa mora imati pozitivan iznos
+ErrorInvoiceOfThisTypeMustBePositive=Greška! Ova vrsta računa mora imati pozitivan iznos
 ErrorCantCancelIfReplacementInvoiceNotValidated=Greška! Ne može se poništiti račun koji je zamijenjen drugim računom koji je otvoren kao skica.
 ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount series cannot be removed.
 BillFrom=Od
@@ -211,9 +212,23 @@ ShowSocialContribution=Prikaži društveni/fiskalni porez
 ShowBill=Prikaži račun
 ShowInvoice=Prikaži račun
 ShowInvoiceReplace=Prikaži zamjenski računa
-ShowInvoiceAvoir=Prikaži bonifikaciju
+ShowInvoiceAvoir=Prikaži storno računa/knjižno odobrenje
 ShowInvoiceDeposit=Prikaži račun za predujam
 ShowInvoiceSituation=Prikaži račun etape
+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
 ShowPayment=Prikaži plaćanje
 AlreadyPaid=Plaćeno do sada
 AlreadyPaidBack=Povrati do sada
@@ -251,8 +266,8 @@ ClassifyBill=Svrstavanje računa
 SupplierBillsToPay=Unpaid vendor invoices
 CustomerBillsUnpaid=Neplaćeni računi kupaca
 NonPercuRecuperable=Nepovratno
-SetConditions=Set Payment Terms
-SetMode=Set Payment Type
+SetConditions=Odredi rok plaćanja
+SetMode=Izaberi način plaćanja
 SetRevenuStamp=Postavi prihodovnu markicu
 Billed=Zaračunato
 RecurringInvoices=Pretplatnički računi
@@ -269,26 +284,26 @@ ExportDataset_invoice_1=Customer invoices and invoice details
 ExportDataset_invoice_2=Računi i plaćanja kupca
 ProformaBill=Predračun:
 Reduction=Smanjivanje
-ReductionShort=Disc.
+ReductionShort=Popust
 Reductions=Smanjivanja
-ReductionsShort=Disc.
+ReductionsShort=Popust
 Discounts=Popusti
 AddDiscount=Izradi popust
 AddRelativeDiscount=Izradi relativan popust
 EditRelativeDiscount=Izmjeni relativan popust
 AddGlobalDiscount=Izradi apsolutni popust
 EditGlobalDiscounts=Izmjeni apsolutni popust
-AddCreditNote=Izradi bonifikaciju
+AddCreditNote=Izradi storno računa/knjižno odobrenje
 ShowDiscount=Prikaži popust
 ShowReduc=Prikaži odbitak
 RelativeDiscount=Relativni popust
 GlobalDiscount=Opći popust
-CreditNote=Bonifikacija
-CreditNotes=Bonifikacija
+CreditNote=Storno računa/knjižno odobrenje
+CreditNotes=Storno računa/knjižno odobrenje
 CreditNotesOrExcessReceived=Storno računa/knjižno odobrenje
 Deposit=Predujam
 Deposits=Predujam
-DiscountFromCreditNote=Popust iz bonifikacije %s
+DiscountFromCreditNote=Popust od storno računa/knjižnog odobrenja %s
 DiscountFromDeposit=Predujmovi iz računa %s
 DiscountFromExcessReceived=Payments in excess of invoice %s
 DiscountFromExcessPaid=Payments in excess of invoice %s
@@ -446,7 +461,7 @@ IntracommunityVATNumber=Intra-Community VAT ID
 PaymentByChequeOrderedTo=Check payments (including tax) are payable to %s, send to
 PaymentByChequeOrderedToShort=Check payments (incl. tax) are payable to
 SendTo=Pošalji
-PaymentByTransferOnThisBankAccount=Payment by transfer to the following bank account
+PaymentByTransferOnThisBankAccount=Plaćanje na sljedeći bankovni račun
 VATIsNotUsedForInvoice=Ne primjenjivo VAT čl.-293B CGI-a
 LawApplicationPart1=Po primjeni zakona 80.335 od 12.05.80
 LawApplicationPart2=Roba ostaje vlasništvo
@@ -518,7 +533,7 @@ InvoiceSituationDesc=Kreiranje nove etapu koja prati postojeću
 SituationAmount=Iznos računa etape (net)
 SituationDeduction=Oduzimanje po etapama
 ModifyAllLines=Izmjeni sve stavke
-CreateNextSituationInvoice=Kreiraj sljedeću etapu
+CreateNextSituationInvoice=Izradi sljedeću etapu
 ErrorFindNextSituationInvoice=Error unable to find next situation cycle ref
 ErrorOutingSituationInvoiceOnUpdate=Unable to outing this situation invoice.
 ErrorOutingSituationInvoiceCreditNote=Unable to outing linked credit note.
diff --git a/htdocs/langs/hr_HR/bookmarks.lang b/htdocs/langs/hr_HR/bookmarks.lang
index b6ab8f9613d..fc2ceb8024c 100644
--- a/htdocs/langs/hr_HR/bookmarks.lang
+++ b/htdocs/langs/hr_HR/bookmarks.lang
@@ -6,15 +6,15 @@ ListOfBookmarks=Lista zabilješki
 EditBookmarks=Prikaži/izmjeni zabilješke
 NewBookmark=Nova zabilješka
 ShowBookmark=Prikaži zabilješku
-OpenANewWindow=Otvori novi prozor
-ReplaceWindow=Zamjeni trenutno prozor
-BookmarkTargetNewWindowShort=Novi prozor
-BookmarkTargetReplaceWindowShort=Trenutno prozor
-BookmarkTitle=Naziv zabilješke
+OpenANewWindow=Open a new tab
+ReplaceWindow=Replace current tab
+BookmarkTargetNewWindowShort=New tab
+BookmarkTargetReplaceWindowShort=Current tab
+BookmarkTitle=Bookmark name
 UrlOrLink=URL
 BehaviourOnClick=Behaviour when a bookmark URL is selected
-CreateBookmark=Kreiraj zabilješku
-SetHereATitleForLink=Postavi naslov za zabilješku
-UseAnExternalHttpLinkOrRelativeDolibarrLink=Koristi eksterni http URL ili relativni Dolibarr URL
-ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=Odaberite ako se povezana stranica mora/ne mora otvoriti u novom prozoru 
+CreateBookmark=Izradi zabilješku
+SetHereATitleForLink=Set a name for the bookmark
+UseAnExternalHttpLinkOrRelativeDolibarrLink=Use an external/absolute link (https://URL) or an internal/relative link (/DOLIBARR_ROOT/htdocs/...)
+ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=Choose if the linked page should open in the current tab or a new tab
 BookmarksManagement=Upravljanje zabilješkama
diff --git a/htdocs/langs/hr_HR/boxes.lang b/htdocs/langs/hr_HR/boxes.lang
index 6d56bdbf22b..784440f4f7d 100644
--- a/htdocs/langs/hr_HR/boxes.lang
+++ b/htdocs/langs/hr_HR/boxes.lang
@@ -9,7 +9,7 @@ BoxLastCustomerBills=Latest Customer invoices
 BoxOldestUnpaidCustomerBills=Najstariji neplaćeni račun kupca
 BoxOldestUnpaidSupplierBills=Oldest unpaid vendor invoices
 BoxLastProposals=Zadnja ponuda
-BoxLastProspects=Zadnji izmjenjeni potencijalni kupci
+BoxLastProspects=Zadnji izmjenjeni mogući kupci
 BoxLastCustomers=Zadnji promjenjei kupci
 BoxLastSuppliers=Zadnji promjenjeni dobavljači
 BoxLastCustomerOrders=Latest sales orders
diff --git a/htdocs/langs/hr_HR/categories.lang b/htdocs/langs/hr_HR/categories.lang
index 8e19e62f594..f383628a932 100644
--- a/htdocs/langs/hr_HR/categories.lang
+++ b/htdocs/langs/hr_HR/categories.lang
@@ -3,7 +3,7 @@ Rubrique=Kategorija
 Rubriques=Kategorije
 RubriquesTransactions=Tags/Categories of transactions
 categories=kategorije
-NoCategoryYet=Nije kreirana kategorija ovog tipa
+NoCategoryYet=Skupina ove vrste nije izrađena
 In=U
 AddIn=Dodaj u
 modify=promjeni
@@ -22,8 +22,8 @@ CatList=Popis kategorija
 NewCategory=Nova kategorija
 ModifCat=Promjeni kategoriju
 CatCreated=Kategorija kreirana
-CreateCat=Kreiraj kategoriju
-CreateThisCat=Kreiraj ovu kategoriju
+CreateCat=Izradi kategoriju
+CreateThisCat=Izradi ovu kategoriju
 NoSubCat=Nema podkategorije.
 SubCatOf=Podkategorija
 FoundCats=Pronađene kategorije
diff --git a/htdocs/langs/hr_HR/commercial.lang b/htdocs/langs/hr_HR/commercial.lang
index a6dffff41bb..7bf167c2068 100644
--- a/htdocs/langs/hr_HR/commercial.lang
+++ b/htdocs/langs/hr_HR/commercial.lang
@@ -1,14 +1,14 @@
 # Dolibarr language file - Source file is en_US - commercial
 Commercial=Trgovina
-CommercialArea=Sučelje trgovine
+CommercialArea=Trgovina
 Customer=Kupac
 Customers=Kupci
 Prospect=Potencijalni kupac
-Prospects=Potencijalni kupci
+Prospects=Mogući kupci
 DeleteAction=Obriši događaj
 NewAction=Novi događaj
-AddAction=Kreiraj događaj
-AddAnAction=Kreiraj događaj
+AddAction=Izradi događaj
+AddAnAction=Izradi događaj
 AddActionRendezVous=Kreirajte sastanak
 ConfirmDeleteAction=Are you sure you want to delete this event?
 CardAction=Kartica događaja
@@ -27,15 +27,15 @@ SalesRepresentativeSignature=Prodajni predstavnik (potpis)
 NoSalesRepresentativeAffected=Nije dodjeljen prodajni predstavnik
 ShowCustomer=Prikaži kupca
 ShowProspect=Prikaži potencijalnog kupca
-ListOfProspects=Lista potencijalnih kupaca
-ListOfCustomers=Lista kupaca
+ListOfProspects=Popis mogućih kupaca
+ListOfCustomers=Popis kupaca
 LastDoneTasks=Latest %s completed actions
 LastActionsToDo=Najstarijih %s nezavršenih akcija
 DoneAndToDoActions=Završeni i za odraditi 
 DoneActions=Završeni događaji
 ToDoActions=Nedovršeni događaji
 SendPropalRef=Ponuda %s
-SendOrderRef=Predaja narudžbe %s
+SendOrderRef=Narudžba %s
 StatusNotApplicable=Nije primjenjivo
 StatusActionToDo=Napraviti
 StatusActionDone=Završeno
@@ -59,7 +59,7 @@ ActionAC_FAC=Pošalji račun kupca poštom
 ActionAC_REL=Pošalji narudđbu kupca putem pošte (podsjetnik)
 ActionAC_CLO=Zatvoren
 ActionAC_EMAILING=Masovno slanje e-pošte
-ActionAC_COM=Pošalji narudžbu kupca putem pošte
+ActionAC_COM=Send sales order by mail
 ActionAC_SHIP=Pošalji dostavu putem pošte
 ActionAC_SUP_ORD=Pošalji narudžbenicu e-poštom
 ActionAC_SUP_INV=Send vendor invoice by mail
diff --git a/htdocs/langs/hr_HR/companies.lang b/htdocs/langs/hr_HR/companies.lang
index a8189128d76..f5e548f5e79 100644
--- a/htdocs/langs/hr_HR/companies.lang
+++ b/htdocs/langs/hr_HR/companies.lang
@@ -20,8 +20,8 @@ IdThirdParty=Oznaka treće osobe
 IdCompany=Oznaka tvrtke
 IdContact=Oznaka kontakta
 Contacts=Kontakti/Adrese
-ThirdPartyContacts=Third-party contacts
-ThirdPartyContact=Third-party contact/address
+ThirdPartyContacts=Kontakti treće osobe
+ThirdPartyContact=Kontakt/adresa treće osobe
 Company=Tvrtka
 CompanyName=Naziv tvrtke
 AliasNames=Alias (komercijala, zaštitni znak, ...)
@@ -29,17 +29,17 @@ AliasNameShort=Alias Name
 Companies=Kompanije
 CountryIsInEEC=Country is inside the European Economic Community
 PriceFormatInCurrentLanguage=Price display format in the current language and currency
-ThirdPartyName=Third-party name
+ThirdPartyName=Naziv treće osobe
 ThirdPartyEmail=Third-party email
-ThirdParty=Third-party
-ThirdParties=Third-parties
+ThirdParty=Treća osoba
+ThirdParties=Treće osobe
 ThirdPartyProspects=Potencijalni kupac
-ThirdPartyProspectsStats=Potencijalni kupci
+ThirdPartyProspectsStats=Mogući kupci
 ThirdPartyCustomers=Kupci
 ThirdPartyCustomersStats=Kupci
 ThirdPartyCustomersWithIdProf12=Kupci sa %s ili %s
 ThirdPartySuppliers=Vendors
-ThirdPartyType=Third-party type
+ThirdPartyType=Vrsta treće osobe
 Individual=Privatna osoba
 ToCreateContactWithSameName=Will automatically create a contact/address with same information as the third party under the third party. In most cases, even if your third party is a physical person, creating a third party alone is enough.
 ParentCompany=Matična tvrtka
@@ -111,7 +111,7 @@ ProfId5Short=Prof. id 5
 ProfId6Short=Prof. id 6
 ProfId1=Sjedište banke
 ProfId2=Tekući račun
-ProfId3=VAT N°
+ProfId3=PDV broj
 ProfId4=Upis
 ProfId5=MBS
 ProfId6=MB
@@ -257,8 +257,8 @@ ProfId1DZ=RC
 ProfId2DZ=Art.
 ProfId3DZ=NIF
 ProfId4DZ=NIS
-VATIntra=VAT ID
-VATIntraShort=VAT ID
+VATIntra=OIB
+VATIntraShort=OIB
 VATIntraSyntaxIsValid=Sintaksa je u redu
 VATReturn=VAT return
 ProspectCustomer=Potencijalni / Kupac
@@ -273,7 +273,7 @@ CompanyHasRelativeDiscount=Ovaj kupac ima predefiniran popust od <b>%s%%</b>
 CompanyHasNoRelativeDiscount=Ovaj kupac nema predefiniran relativni popust
 HasRelativeDiscountFromSupplier=You have a default discount of <b>%s%%</b> from this vendor
 HasNoRelativeDiscountFromSupplier=You have no default relative discount from this vendor
-CompanyHasAbsoluteDiscount=This customer has discounts available (credits notes or down payments) for <b>%s</b> %s
+CompanyHasAbsoluteDiscount=Ovaj kupac ima raspoloživih popusta (knjižnih odobrenja ili predujmova) u iznosu od<b>%s</b> %s
 CompanyHasDownPaymentOrCommercialDiscount=This customer has discounts available (commercial, down payments) for <b>%s</b> %s
 CompanyHasCreditNote=Ovaj kupac još uvijek ima odobrenje za <b>%s</b> %s
 HasNoAbsoluteDiscountFromSupplier=You have no discount credit available from this vendor
@@ -286,20 +286,20 @@ CustomerAbsoluteDiscountMy=Absolute customer discounts (granted by yourself)
 SupplierAbsoluteDiscountAllUsers=Absolute vendor discounts (entered by all users)
 SupplierAbsoluteDiscountMy=Absolute vendor discounts (entered by yourself)
 DiscountNone=Ništa
-Vendor=Vendor
-Supplier=Vendor
-AddContact=Kreiraj kontakt
+Vendor=Dobavljač
+Supplier=Dobavljač
+AddContact=Izradi kontakt
 AddContactAddress=Izradi kontakt/adresu
 EditContact=Uredi kontakt
 EditContactAddress=Uredi kontakt/adresu
 Contact=Kontakt
 ContactId=ID kontakta
-ContactsAddresses=Kontakt/adrese
+ContactsAddresses=Kontakti/adrese
 FromContactName=Ime:
 NoContactDefinedForThirdParty=Nema kontakta za ovog komitenta
 NoContactDefined=Nije definiran kontakt
 DefaultContact=Predefinirani kontakt/adresa
-AddThirdParty=Kreiraj komitenta
+AddThirdParty=Izradi komitenta
 DeleteACompany=Izbriši tvrtku
 PersonalInformations=Osobni podaci
 AccountancyCode=Obračunski račun
@@ -321,7 +321,7 @@ ListOfThirdParties=Popis trećih osoba
 ShowCompany=Show Third Party
 ShowContact=Prikaži kontakt
 ContactsAllShort=Sve(bez filtera)
-ContactType=Tip kontakta
+ContactType=Vrsta kontakta
 ContactForOrders=Kontakt narudžbe
 ContactForOrdersOrShipments=Kontakt narudžbe ili pošiljke
 ContactForProposals=Kontakt ponude
@@ -333,7 +333,7 @@ NoContactForAnyProposal=Ovaj kontakt nije kontakt za bilo koju ponudu
 NoContactForAnyContract=Ovaj kontakt nije kontakt za nikakav ugovor
 NoContactForAnyInvoice=Ovaj kontakt nije kontakt za nikakav račun
 NewContact=Novi kontakt
-NewContactAddress=New Contact/Address
+NewContactAddress=Novi kontakt/adresa
 MyContacts=Moji kontakti
 Capital=Kapital
 CapitalOf=Temeljna vrijednost %s
@@ -381,18 +381,18 @@ ChangeNeverContacted=Promjeni status u 'nikad kontaktiran'
 ChangeToContact=Promjeni status u 'Za kontaktiranje'
 ChangeContactInProcess=Promjeni status u 'kontakt u tijeku'
 ChangeContactDone=Promjeni status u 'kontaktiran'
-ProspectsByStatus=Potencijalni kupci po statusu
+ProspectsByStatus=Mogući kupci po statusu
 NoParentCompany=Ništa
 ExportCardToFormat=Izvezi karticu u formatu
 ContactNotLinkedToCompany=Kontakt nije povezan ni sa jednim komitentom
 DolibarrLogin=Dolibarr korisničko ime
 NoDolibarrAccess=Nema pristup Dolibarr-u
-ExportDataset_company_1=Third-parties (companies/foundations/physical people) and their properties
+ExportDataset_company_1=Treće osobe\n(tvrtke/zaklade/fizičke osobe) i njihove osobine
 ExportDataset_company_2=Contacts and their properties
-ImportDataset_company_1=Third-parties and their properties
+ImportDataset_company_1=Treće osobe i njihove osobine
 ImportDataset_company_2=Third-parties additional contacts/addresses and attributes
-ImportDataset_company_3=Third-parties Bank accounts
-ImportDataset_company_4=Third-parties Sales representatives (assign sales representatives/users to companies)
+ImportDataset_company_3=Bankovni računi trećih osoba
+ImportDataset_company_4=Prodajni predstavnici za treće osobe (dodjela predstavnika/korisnika za tvrtke)
 PriceLevel=Price Level
 PriceLevelLabels=Price Level Labels
 DeliveryAddress=Adresa dostave
@@ -407,9 +407,9 @@ FiscalYearInformation=Fiscal Year
 FiscalMonthStart=Početni mjesec fiskalne godine
 YouMustAssignUserMailFirst=You must create an email for this user prior to being able to add an email notification.
 YouMustCreateContactFirst=Kako biste bili u mogućnosti dodavanja obavijesti e-poštom, prvo morate definirati kontakt s valjanom adresom e-pošte za komitenta
-ListSuppliersShort=List of Vendors
-ListProspectsShort=List of Prospects
-ListCustomersShort=List of Customers
+ListSuppliersShort=Popis dobavljača
+ListProspectsShort=Popis mogućih kupaca
+ListCustomersShort=Popis kupaca
 ThirdPartiesArea=Treće osobe/Kontakti
 LastModifiedThirdParties=Zadnjih %s izmijenjenih trećih osoba
 UniqueThirdParties=Ukupno trećih osoba
@@ -435,7 +435,7 @@ ErrorThirdpartiesMerge=Došlo je do greške tijekom brisanja treće osobe. Molim
 NewCustomerSupplierCodeProposed=Customer or Vendor code already used, a new code is suggested
 #Imports
 PaymentTypeCustomer=Payment Type - Customer
-PaymentTermsCustomer=Payment Terms - Customer
+PaymentTermsCustomer=Rok plaćanja - kupac
 PaymentTypeSupplier=Payment Type - Vendor
 PaymentTermsSupplier=Payment Term - Vendor
 MulticurrencyUsed=Use Multicurrency
diff --git a/htdocs/langs/hr_HR/compta.lang b/htdocs/langs/hr_HR/compta.lang
index b3076decbe1..1b5b6ba12c9 100644
--- a/htdocs/langs/hr_HR/compta.lang
+++ b/htdocs/langs/hr_HR/compta.lang
@@ -70,7 +70,7 @@ SocialContributions=Društveni ili fiskanlni porezi
 SocialContributionsDeductibles=Odbitak društveni ili fiskalni porezi
 SocialContributionsNondeductibles=Neodbijajući društveni ili fiskalni porezi
 LabelContrib=Oznaka doprinosa
-TypeContrib=Tip doprinosa
+TypeContrib=Vrsta doprinosa
 MenuSpecialExpenses=Specijalni troškovi
 MenuTaxAndDividends=Porezi i dividende
 MenuSocialContributions=Društveni/fiskalni porezi
@@ -166,7 +166,7 @@ RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accou
 RulesResultBookkeepingPredefined=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting accounts <b>grouped by personalized groups</b>
 SeePageForSetup=See menu <a href="%s">%s</a> for setup
-DepositsAreNotIncluded=- Down payment invoices are not included
+DepositsAreNotIncluded=- Računi za predujam nisu uključeni
 DepositsAreIncluded=- Down payment invoices are included
 LT1ReportByCustomers=Report tax 2 by third party
 LT2ReportByCustomers=Report tax 3 by third party
@@ -215,9 +215,9 @@ 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"
 LinkedOrder=Poveži s narudžbom
-Mode1=Metoda 1
-Mode2=Metoda 2
-CalculationRuleDesc=Za izračunavanje poreza, postoje dvije metode:<br> Metoda 1 je zaokruživanje PDV za svaku  stavku te njihov zbroj.<br>Metoda 2 je zbrajanje PDV za svaku stavku te zaokruživanje rezultata.<br>Konačni rezultat se može razlikovati za par lipa. Zadani način je način <b>%s</b>.
+Mode1=Način 1
+Mode2=Način 2
+CalculationRuleDesc=Za izračunavanje poreza, postoje dvije metode:<br> Način 1 je zaokruživanje PDV za svaku  stavku te njihov zbroj.<br>Način 2 je zbrajanje PDV za svaku stavku te zaokruživanje rezultata.<br>Konačni rezultat se može razlikovati za par lipa. Zadani način je način <b>%s</b>.
 CalculationRuleDescSupplier=According to vendor, choose appropriate method to apply same calculation rule and get same result expected by your vendor.
 TurnoverPerProductInCommitmentAccountingNotRelevant=The report of Turnover collected per product is not available. This report is only available for turnover invoiced.
 TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant=The report of Turnover collected per sale tax rate is not available. This report is only available for turnover invoiced.
diff --git a/htdocs/langs/hr_HR/cron.lang b/htdocs/langs/hr_HR/cron.lang
index 9e8813d0f36..c2e49dacddf 100644
--- a/htdocs/langs/hr_HR/cron.lang
+++ b/htdocs/langs/hr_HR/cron.lang
@@ -2,7 +2,7 @@
 # About page
 # Right
 Permission23101 = Pročitaj planirani posao
-Permission23102 = Kreiraj/promjeni planirani posao
+Permission23102 = Izradi/promjeni planirani posao
 Permission23103 = Obriši planirani posao
 Permission23104 = Pokreni planirani posao
 # Admin
@@ -37,13 +37,13 @@ CronDtLastLaunch=Početni datum zadnjeg pokretanja
 CronDtLastResult=Datum završetka zadnjeg pokretanja
 CronFrequency=Učestalost
 CronClass=Klasa
-CronMethod=Metoda
+CronMethod=Način
 CronModule=Modul
 CronNoJobs=Nema registriranih poslova
 CronPriority=Prioritet
 CronLabel=Naziv
-CronNbRun=No. launches
-CronMaxRun=Max number launch
+CronNbRun=Number of launches
+CronMaxRun=Maximum number of launches
 CronEach=Svakih
 JobFinished=Posao pokrenut i završen
 #Page card
@@ -67,11 +67,11 @@ CronObjectHelp=The object name to load. <BR> For example to call the fetch metho
 CronMethodHelp=The object method to launch. <BR> For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is<br><i>fetch</i>
 CronArgsHelp=The method arguments. <BR> For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be<br><i>0, ProductRef</i>
 CronCommandHelp=Sistemska komanda za pokretanje
-CronCreateJob=Kreiraj novi planirani posao
+CronCreateJob=Izradi novi planirani posao
 CronFrom=Od
 # Info
 # Common
-CronType=Tip posla
+CronType=Vrsta posla
 CronType_method=Call method of a PHP Class
 CronType_command=Shell command
 CronCannotLoadClass=Cannot load class file %s (to use class %s)
diff --git a/htdocs/langs/hr_HR/donations.lang b/htdocs/langs/hr_HR/donations.lang
index c2d8cd40d04..134409d1d52 100644
--- a/htdocs/langs/hr_HR/donations.lang
+++ b/htdocs/langs/hr_HR/donations.lang
@@ -1,15 +1,15 @@
 # Dolibarr language file - Source file is en_US - donations
 Donation=Donacija
 Donations=Donacije
-DonationRef=Ref. donacije
+DonationRef=Broj donacije
 Donor=Donator
-AddDonation=Kreiraj donaciju
+AddDonation=Izradi donaciju
 NewDonation=Nova donacija
 DeleteADonation=Obriši donaciju
 ConfirmDeleteADonation=Are you sure you want to delete this donation?
 ShowDonation=Prikaži donaciju
 PublicDonation=Javna donacija
-DonationsArea=Sučelje donacija
+DonationsArea=Donacije
 DonationStatusPromiseNotValidated=Skica obečanja
 DonationStatusPromiseValidated=Ovjeri obečanje
 DonationStatusPaid=Primljene donacije
diff --git a/htdocs/langs/hr_HR/errors.lang b/htdocs/langs/hr_HR/errors.lang
index 6dddf9bb0ce..afe8c61f603 100644
--- a/htdocs/langs/hr_HR/errors.lang
+++ b/htdocs/langs/hr_HR/errors.lang
@@ -21,7 +21,7 @@ ErrorFailToDeleteDir=Failed to delete directory '<b>%s</b>'.
 ErrorFailToMakeReplacementInto=Failed to make replacement into file '<b>%s</b>'.
 ErrorFailToGenerateFile=Failed to generate file '<b>%s</b>'.
 ErrorThisContactIsAlreadyDefinedAsThisType=This contact is already defined as contact for this type.
-ErrorCashAccountAcceptsOnlyCashMoney=Ovaj bankovni račun je gotovinski račun, te kao takav prihvača samo gotovinske uplate.
+ErrorCashAccountAcceptsOnlyCashMoney=Ovaj bankovni račun je gotovinski te prihvaća samo gotovinske uplate.
 ErrorFromToAccountsMustDiffers=Izvorni i odredišni bankovni računi moraju biti različiti.
 ErrorBadThirdPartyName=Bad value for third-party name
 ErrorProdIdIsMandatory=The %s is mandatory
@@ -90,7 +90,7 @@ ErrorSpecialCharNotAllowedForField=Special characters are not allowed for field
 ErrorNumRefModel=A reference exists into database (%s) and is not compatible with this numbering rule. Remove record or renamed reference to activate this module.
 ErrorQtyTooLowForThisSupplier=Quantity too low for this vendor or no price defined on this product for this vendor
 ErrorOrdersNotCreatedQtyTooLow=Some orders haven't been created because of too-low quantities
-ErrorModuleSetupNotComplete=Setup of module looks to be uncomplete. Go on Home - Setup - Modules to complete.
+ErrorModuleSetupNotComplete=Setup of module %s looks to be uncomplete. Go on Home - Setup - Modules to complete.
 ErrorBadMask=Error on mask
 ErrorBadMaskFailedToLocatePosOfSequence=Error, mask without sequence number
 ErrorBadMaskBadRazMonth=Error, bad reset value
@@ -219,6 +219,7 @@ 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.
 # 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.
 WarningMandatorySetupNotComplete=Click here to setup mandatory parameters
 WarningEnableYourModulesApplications=Click here to enable your modules and applications
diff --git a/htdocs/langs/hr_HR/exports.lang b/htdocs/langs/hr_HR/exports.lang
index abd5d73c9e6..b461078ecab 100644
--- a/htdocs/langs/hr_HR/exports.lang
+++ b/htdocs/langs/hr_HR/exports.lang
@@ -1,59 +1,59 @@
 # Dolibarr language file - Source file is en_US - exports
-ExportsArea=Exports area
-ImportArea=Import area
-NewExport=New export
-NewImport=New import
+ExportsArea=Exports
+ImportArea=Import
+NewExport=New Export
+NewImport=New Import
 ExportableDatas=Exportable dataset
 ImportableDatas=Importable dataset
 SelectExportDataSet=Choose dataset you want to export...
 SelectImportDataSet=Choose dataset you want to import...
-SelectExportFields=Choose fields you want to export, or select a predefined export profile
-SelectImportFields=Choose source file fields you want to import and their target field in database by moving them up and down with anchor %s, or select a predefined import profile:
+SelectExportFields=Choose the fields you want to export, or select a predefined export profile
+SelectImportFields=Choose the source file fields you want to import and their target field in database by moving them up and down with anchor %s, or select a predefined import profile:
 NotImportedFields=Fields of source file not imported
-SaveExportModel=Save this export profile if you plan to reuse it later...
-SaveImportModel=Save this import profile if you plan to reuse it later...
+SaveExportModel=Save your selections as an export profile/template (for reuse).
+SaveImportModel=Save this import profile (for reuse) ...
 ExportModelName=Export profile name
-ExportModelSaved=Export profile saved under name <b>%s</b>.
+ExportModelSaved=Export profile saved as <b>%s</b>.
 ExportableFields=Exportable fields
 ExportedFields=Exported fields
 ImportModelName=Import profile name
-ImportModelSaved=Import profile saved under name <b>%s</b>.
+ImportModelSaved=Import profile saved as <b>%s</b>.
 DatasetToExport=Dataset to export
 DatasetToImport=Import file into dataset
 ChooseFieldsOrdersAndTitle=Choose fields order...
 FieldsTitle=Fields title
 FieldTitle=Field title
-NowClickToGenerateToBuildExportFile=Now, select file format in combo box and click on "Generate" to build export file...
-AvailableFormats=Available formats
+NowClickToGenerateToBuildExportFile=Now, select the file format in the combo box and click on "Generate" to build the export file...
+AvailableFormats=Available Formats
 LibraryShort=Biblioteka
 Step=Step
-FormatedImport=Import assistant
-FormatedImportDesc1=This area allows to import personalized data, using an assistant to help you in process without technical knowledge.
-FormatedImportDesc2=First step is to choose a king of data you want to load, then file to load, then to choose which fields you want to load.
-FormatedExport=Export assistant
-FormatedExportDesc1=This area allows to export personalized data, using an assistant to help you in process without technical knowledge.
-FormatedExportDesc2=First step is to choose a predefined dataset, then to choose which fields you want in your result files, and which order.
-FormatedExportDesc3=When data to export are selected, you can define output file format you want to export your data to.
+FormatedImport=Import Assistant
+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.
+FormatedExport=Export Assistant
+FormatedExportDesc1=These tools allow the export of personalized data using an assistant, to help you in the process without requiring technical knowledge.
+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.
 Sheet=Sheet
 NoImportableData=No importable data (no module with definitions to allow data imports)
 FileSuccessfullyBuilt=File generated
 SQLUsedForExport=SQL Request used to build export file
 LineId=Id of line
 LineLabel=Label of line
-LineDescription=Description of line
+LineDescription=Opis redka
 LineUnitPrice=Unit price of line
 LineVATRate=VAT Rate of line
 LineQty=Quantity for line
-LineTotalHT=Amount net of tax for line
+LineTotalHT=Iznos bez PDV-a za redak
 LineTotalTTC=Amount with tax for line
 LineTotalVAT=Amount of VAT for line
 TypeOfLineServiceOrProduct=Type of line (0=product, 1=service)
 FileWithDataToImport=File with data to import
 FileToImport=Source file to import
-FileMustHaveOneOfFollowingFormat=File to import must have one of following format
-DownloadEmptyExample=Download example of empty source file
-ChooseFormatOfFileToImport=Choose file format to use as import file format by clicking on picto %s to select it...
-ChooseFileToImport=Upload file then click on picto %s to select file as source import file...
+FileMustHaveOneOfFollowingFormat=File to import must have one of following formats
+DownloadEmptyExample=Download template file with field content information (* are mandatory fields)
+ChooseFormatOfFileToImport=Choose the file format to use as import file format by clicking on the %s icon to select it...
+ChooseFileToImport=Upload file then click on the %s icon to select file as source import file...
 SourceFileFormat=Source file format
 FieldsInSourceFile=Fields in source file
 FieldsInTargetDatabase=Target fields in Dolibarr database (bold=mandatory)
@@ -68,55 +68,55 @@ FieldsTarget=Targeted fields
 FieldTarget=Targeted field
 FieldSource=Source field
 NbOfSourceLines=Number of lines in source file
-NowClickToTestTheImport=Check import parameters you have defined. If they are correct, click on button "<b>%s</b>" to launch a simulation of import process (no data will be changed in your database, it's only a simulation for the moment)...
-RunSimulateImportFile=Launch the import simulation
+NowClickToTestTheImport=Check that the file format (field and string delimiters) of your file matches the options shown and that you have omitted the header line, or these will be flagged as errors in the following simulation.<br>Click on the "<b>%s</b>" button to run a check of the file structure/contents and simulate the import process.<br><b>No data will be changed in your database</b>.
+RunSimulateImportFile=Run Import Simulation
 FieldNeedSource=This field requires data from the source file
 SomeMandatoryFieldHaveNoSource=Some mandatory fields have no source from data file
 InformationOnSourceFile=Information on source file
 InformationOnTargetTables=Information on target fields
 SelectAtLeastOneField=Switch at least one source field in the column of fields to export
 SelectFormat=Choose this import file format
-RunImportFile=Launch import file
-NowClickToRunTheImport=Check result of import simulation. If everything is ok, launch the definitive import.
-DataLoadedWithId=All data will be loaded with the following import id: <b>%s</b>
-ErrorMissingMandatoryValue=Mandatory data is empty in source file for field <b>%s</b>.
-TooMuchErrors=There is still <b>%s</b> other source lines with errors but output has been limited.
-TooMuchWarnings=There is still <b>%s</b> other source lines with warnings but output has been limited.
+RunImportFile=Import Data
+NowClickToRunTheImport=Check the results of the import simulation. Correct any errors and re-test.<br>When the simulation reports no errors you may proceed to import the data into the database.
+DataLoadedWithId=The imported data will have an additional field in each database table with this import id: <b>%s</b>, to allow it to be searchable in the case of investigating a problem related to this import.
+ErrorMissingMandatoryValue=Mandatory data is empty in the source file for field <b>%s</b>.
+TooMuchErrors=There are still <b>%s</b> other source lines with errors but output has been limited.
+TooMuchWarnings=There are still <b>%s</b> other source lines with warnings but output has been limited.
 EmptyLine=Empty line (will be discarded)
-CorrectErrorBeforeRunningImport=You must first correct all errors before running definitive import.
+CorrectErrorBeforeRunningImport=You <b>must</b> correct all errors <b>before</b> running the definitive import.
 FileWasImported=File was imported with number <b>%s</b>.
-YouCanUseImportIdToFindRecord=You can find all imported record in your database by filtering on field <b>import_key='%s'</b>.
+YouCanUseImportIdToFindRecord=You can find all the imported records in your database by filtering on field <b>import_key='%s'</b>.
 NbOfLinesOK=Number of lines with no errors and no warnings: <b>%s</b>.
 NbOfLinesImported=Number of lines successfully imported: <b>%s</b>.
 DataComeFromNoWhere=Value to insert comes from nowhere in source file.
 DataComeFromFileFieldNb=Value to insert comes from field number <b>%s</b> in source file.
-DataComeFromIdFoundFromRef=Value that comes from field number <b>%s</b> of source file will be used to find id of parent object to use (So the objet <b>%s</b> that has the ref. from source file must exists into Dolibarr).
-DataComeFromIdFoundFromCodeId=Code that comes from field number <b>%s</b> of source file will be used to find id of parent object to use (So the code from source file must exists into dictionary <b>%s</b>). Note that if you know id, you can also use it into source file instead of code. Import should work in both cases.
+DataComeFromIdFoundFromRef=Value that comes from field number <b>%s</b> of source file will be used to find the id of the parent object to use (so the object <b>%s</b> that has the ref. from source file must exist in the database).
+DataComeFromIdFoundFromCodeId=Code that comes from field number <b>%s</b> of source file will be used to find the id of the parent object to use (so the code from source file must exist in the dictionary <b>%s</b>). Note that if you know the id, you can also use it in the source file instead of the code. Import should work in both cases.
 DataIsInsertedInto=Data coming from source file will be inserted into the following field:
-DataIDSourceIsInsertedInto=The id of parent object found using the data in source file, will be inserted into the following field:
+DataIDSourceIsInsertedInto=The id of parent object was found using the data in the source file, will be inserted into the following field:
 DataCodeIDSourceIsInsertedInto=The id of parent line found from code, will be inserted into following field:
 SourceRequired=Data value is mandatory
 SourceExample=Example of possible data value
 ExampleAnyRefFoundIntoElement=Any ref found for element <b>%s</b>
 ExampleAnyCodeOrIdFoundIntoDictionary=Any code (or id) found into dictionary <b>%s</b>
-CSVFormatDesc=<b>Comma Separated Value</b> file format (.csv).<br>This is a text file format where fields are separated by separator [ %s ]. If separator is found inside a field content, field is rounded by round character [ %s ]. Escape character to escape round character is [ %s ].
-Excel95FormatDesc=<b>Excel</b> file format (.xls)<br>This is native Excel 95 format (BIFF5).
-Excel2007FormatDesc=<b>Excel</b> file format (.xlsx)<br>This is native Excel 2007 format (SpreadsheetML).
+CSVFormatDesc=<b>Comma Separated Value</b> file format (.csv).<br>This is a text file format where fields are separated by a separator [ %s ]. If separator is found inside a field content, field is rounded by round character [ %s ]. Escape character to escape round character is [ %s ].
+Excel95FormatDesc=<b>Excel</b> file format (.xls)<br>This is the native Excel 95 format (BIFF5).
+Excel2007FormatDesc=<b>Excel</b> file format (.xlsx)<br>This is the native Excel 2007 format (SpreadsheetML).
 TsvFormatDesc=<b>Tab Separated Value</b> file format (.tsv)<br>This is a text file format where fields are separated by a tabulator [tab].
 ExportFieldAutomaticallyAdded=Field <b>%s</b> was automatically added. It will avoid you to have similar lines to be treated as duplicate record (with this field added, all lines will own their own id and will differ).
-CsvOptions=Csv Options
-Separator=Separator
-Enclosure=Enclosure
+CsvOptions=CSV format options
+Separator=Field Separator
+Enclosure=String Delimiter
 SpecialCode=Special code
 ExportStringFilter=%% allows replacing one or more characters in the text
-ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : filters by one year/month/day<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD : filters over a range of years/months/days<br> > YYYY, > YYYYMM, > YYYYMMDD : filters on all following years/months/days<br> < YYYY, < YYYYMM, < YYYYMMDD : filters on all previous years/months/days
+ExportDateFilter=YYYY, YYYYMM, YYYYMMDD: filters by one year/month/day<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD: filters over a range of years/months/days<br> > YYYY, > YYYYMM, > YYYYMMDD: filters on all following years/months/days<br> < YYYY, < YYYYMM, < YYYYMMDD: filters on all previous years/months/days
 ExportNumericFilter=NNNNN filters by one value<br>NNNNN+NNNNN filters over a range of values<br>< NNNNN filters by lower values<br>> NNNNN filters by higher values
 ImportFromLine=Import starting from line number
 EndAtLineNb=End at line number
-ImportFromToLine=Import line numbers (from - to)
-SetThisValueTo2ToExcludeFirstLine=For example, set this value to 3 to exclude the 2 first lines
-KeepEmptyToGoToEndOfFile=Keep this field empty to go up to the end of file
-SelectPrimaryColumnsForUpdateAttempt=Select column(s) to use as primary key for update attempt
+ImportFromToLine=Limit range (From - To) eg. <b>to omit header line(s)</b>
+SetThisValueTo2ToExcludeFirstLine=For example, set this value to 3 to exclude the 2 first lines.<br>If the header lines are NOT omitted, this will result in multiple errors in the Import Simulation.
+KeepEmptyToGoToEndOfFile=Keep this field empty to process all lines to the end of the file.
+SelectPrimaryColumnsForUpdateAttempt=Select column(s) to use as primary key for an UPDATE import
 UpdateNotYetSupportedForThisImport=Update is not supported for this type of import (only insert)
 NoUpdateAttempt=No update attempt was performed, only insert
 ImportDataset_user_1=Users (employees or not) and properties
@@ -127,7 +127,7 @@ FilteredFields=Filtered fields
 FilteredFieldsValues=Value for filter
 FormatControlRule=Format control rule
 ## imports updates
-KeysToUseForUpdates=Key to use for updating data
+KeysToUseForUpdates=Key (column) to use for <b>updating</b> existing data
 NbInsert=Number of inserted lines: %s
 NbUpdate=Number of updated lines: %s
 MultipleRecordFoundWithTheseFilters=Multiple records have been found with these filters: %s
diff --git a/htdocs/langs/hr_HR/help.lang b/htdocs/langs/hr_HR/help.lang
index 25e0f10a260..aba9b32e9b4 100644
--- a/htdocs/langs/hr_HR/help.lang
+++ b/htdocs/langs/hr_HR/help.lang
@@ -1,16 +1,16 @@
 # Dolibarr language file - Source file is en_US - help
 CommunitySupport=Forum/Wiki podrška
 EMailSupport=Podrška e-poštom
-RemoteControlSupport=Online real time / remote podrška
+RemoteControlSupport=Online real-time / remote support
 OtherSupport=Ostala podrška
 ToSeeListOfAvailableRessources=Da biste kontaktirali/vidjeli raspoložive resurse:
-HelpCenter=Help centar
+HelpCenter=Help Center
 DolibarrHelpCenter=Dolibarr Help and Support Center
 ToGoBackToDolibarr=Otherwise, <a href="%s">click here to continue to use Dolibarr</a>.
 TypeOfSupport=Type of support
 TypeSupportCommunauty=Zajednica (besplatno)
 TypeSupportCommercial=Komercijalno
-TypeOfHelp=Tip
+TypeOfHelp=Vrsta
 NeedHelpCenter=Need help or support?
 Efficiency=Efikasnost
 TypeHelpOnly=Samo pomoć
diff --git a/htdocs/langs/hr_HR/holiday.lang b/htdocs/langs/hr_HR/holiday.lang
index b7b72669126..e47e5f49b5c 100644
--- a/htdocs/langs/hr_HR/holiday.lang
+++ b/htdocs/langs/hr_HR/holiday.lang
@@ -23,7 +23,7 @@ UserForApprovalFirstname=First name of approval user
 UserForApprovalLastname=Last name of approval user
 UserForApprovalLogin=Login of approval user
 DescCP=Opis
-SendRequestCP=Kreiraj zahtjev odsustva
+SendRequestCP=Izradi zahtjev odsustva
 DelayToRequestCP=Zahtjev odsustva mora biti kreiran najmanje <b>%s dan(a)</b> prije.
 MenuConfCP=Balance of leave
 SoldeCPUser=Leave balance is <b>%s</b> days.
diff --git a/htdocs/langs/hr_HR/install.lang b/htdocs/langs/hr_HR/install.lang
index d21db0da090..45c000ca09c 100644
--- a/htdocs/langs/hr_HR/install.lang
+++ b/htdocs/langs/hr_HR/install.lang
@@ -45,7 +45,7 @@ ForceHttps=Force secure connections (https)
 CheckToForceHttps=Check this option to force secure connections (https).<br>This requires that the web server is configured with an SSL certificate.
 DolibarrDatabase=Dolibarr Database
 DatabaseType=Database type
-DriverType=Tip upr. programa
+DriverType=Vrsta upr. programa
 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.
diff --git a/htdocs/langs/hr_HR/interventions.lang b/htdocs/langs/hr_HR/interventions.lang
index 202e8e47ad7..b0ce784e85b 100644
--- a/htdocs/langs/hr_HR/interventions.lang
+++ b/htdocs/langs/hr_HR/interventions.lang
@@ -3,13 +3,13 @@ Intervention=Intervencija
 Interventions=Intervencije
 InterventionCard=Kartica intervencije
 NewIntervention=Nova intervencija
-AddIntervention=Kreiraj intervenciju
+AddIntervention=Izradi intervenciju
 ChangeIntoRepeatableIntervention=Change to repeatable intervention
 ListOfInterventions=Popis intervencija
 ActionsOnFicheInter=Akcije na intervencije
 LastInterventions=Zadnjih %s intervencija
 AllInterventions=Sve intervencije
-CreateDraftIntervention=Kreiraj skicu
+CreateDraftIntervention=Izradi skicu
 InterventionContact=Kontakt za intervenciju
 DeleteIntervention=Obriši intervenciju
 ValidateIntervention=Potvrdi intervenciju
diff --git a/htdocs/langs/hr_HR/main.lang b/htdocs/langs/hr_HR/main.lang
index 8571f615495..fac8dcf0a66 100644
--- a/htdocs/langs/hr_HR/main.lang
+++ b/htdocs/langs/hr_HR/main.lang
@@ -58,7 +58,7 @@ ErrorNoRequestInError=Nema zahtjeva s greškom
 ErrorServiceUnavailableTryLater=Usluga trenutno nije dostupna. Pokušajte ponovo poslije.
 ErrorDuplicateField=Dvostruka vrijednost za jedno polje
 ErrorSomeErrorWereFoundRollbackIsDone=Pronađene su greške. Izmjene povućene.
-ErrorConfigParameterNotDefined=Parameter <b>%s</b> is not defined in the Dolibarr config file <b>conf.php</b>.
+ErrorConfigParameterNotDefined=Značajka <b>%s</b> nije određena u Dolibarr datoteci s postavkama <b>conf.php</b>.
 ErrorCantLoadUserFromDolibarrDatabase=Korisnik <b>%s</b> ne postoji u bazi Dolibarra
 ErrorNoVATRateDefinedForSellerCountry=Greška, za zemlju '%s' nisu upisane stope poreza
 ErrorNoSocialContributionForSellerCountry=Greška, za zemlju '%s' nisu upisani društveni/fiskalni porezi.
@@ -170,7 +170,7 @@ Save=Spremi
 SaveAs=Spremi kao
 TestConnection=Provjera veze
 ToClone=Kloniraj
-ConfirmClone=Choose data you want to clone:
+ConfirmClone=Izaberite podatke koje želite klonirati:
 NoCloneOptionsSpecified=Podaci za kloniranje nisu izabrani.
 Of=od
 Go=Idi
@@ -202,7 +202,7 @@ Password=Zaporka
 PasswordRetype=Ponovi zaporku
 NoteSomeFeaturesAreDisabled=Uzmite u obzir da je dosta mogućnosti i modula onemogućeno u ovom izlaganju.
 Name=Ime
-NameSlashCompany=Name / Company
+NameSlashCompany=Ime / Tvrtka
 Person=Osoba
 Parameter=Značajka
 Parameters=Značajke
@@ -212,7 +212,7 @@ NewObject=Novi%s
 NewValue=Nova vrijednost
 CurrentValue=Trenutna vrijednost
 Code=Oznaka
-Type=Tip
+Type=Vrsta
 Language=Jezik
 MultiLanguage=Višejezični
 Note=Napomena
@@ -223,8 +223,8 @@ Info=Dnevnik
 Family=Obitelj
 Description=Opis
 Designation=Opis
-DescriptionOfLine=Description of line
-DateOfLine=Date of line
+DescriptionOfLine=Opis redka
+DateOfLine=Datum redka
 DurationOfLine=Duration of line
 Model=Predložak dokumenta
 DefaultModel=Osnovni doc predložak
@@ -350,13 +350,13 @@ AmountInvoiced=Zaračunati iznos
 AmountPayment=Iznos plaćanja
 AmountHTShort=Amount (excl.)
 AmountTTCShort=Iznos (s porezom)
-AmountHT=Amount (excl. tax)
+AmountHT=Iznos (bez PDV-a)
 AmountTTC=Iznos (s porezom)
 AmountVAT=Iznos poreza
 MulticurrencyAlreadyPaid=Već plaćeno, u izvornoj valuti
 MulticurrencyRemainderToPay=Preostalo za platiti, u izvornoj valuti
 MulticurrencyPaymentAmount=Iznos plaćanja, u izvornoj valuti
-MulticurrencyAmountHT=Amount (excl. tax), original currency
+MulticurrencyAmountHT=Iznos (bez PDV-a), prvotna valuta
 MulticurrencyAmountTTC=Iznos (s porezom), u izvornoj valuti
 MulticurrencyAmountVAT=Iznos poreza, u izvornoj valuti
 AmountLT1=Iznos poreza 2
@@ -374,8 +374,8 @@ TotalHTShort=Total (excl.)
 TotalHT100Short=Total 100%% (excl.)
 TotalHTShortCurrency=Total (excl. in currency)
 TotalTTCShort=Ukupno s PDV-om
-TotalHT=Total (excl. tax)
-TotalHTforthispage=Total (excl. tax) for this page
+TotalHT=Ukupno bez PDV-a
+TotalHTforthispage=Ukupno (bez PDV-a) na ovoj stranici
 Totalforthispage=Ukupno na ovoj stranici
 TotalTTC=Ukupno s PDV-om
 TotalTTCToYourCredit=Ukupno s porezom na vaš račun
@@ -387,7 +387,7 @@ TotalLT1ES=Ukupno RE
 TotalLT2ES=Ukupno IRPF
 TotalLT1IN=Ukupno CGST
 TotalLT2IN=Ukupno SGST
-HT=Excl. tax
+HT=Bez PDV-a
 TTC=S porezom
 INCVATONLY=S PDV-om
 INCT=Zajedno sa svim porezima
@@ -445,6 +445,7 @@ ContactsAddressesForCompany=Kontakti/adrese ove treće osobe
 AddressesForCompany=Adrese ove treće osobe
 ActionsOnCompany=Events for this third party
 ActionsOnContact=Events for this contact/address
+ActionsOnContract=Events for this contract
 ActionsOnMember=Događaji vezani uz ovog člana
 ActionsOnProduct=Radnje vezane uz ovaj proizvod
 NActionsLate=%s kasni
@@ -463,7 +464,7 @@ Duration=Trajanje
 TotalDuration=Ukupno trajanje
 Summary=Sažetak
 DolibarrStateBoard=Statistika baze podataka
-DolibarrWorkBoard=Open Items
+DolibarrWorkBoard=Otvorene stavke
 NoOpenedElementToProcess=Nema otvorenih radnji za provedbu
 Available=Dostupno
 NotYetAvailable=Nije još dostupno
@@ -709,7 +710,7 @@ Notes=Bilješke
 AddNewLine=Dodaj novu stavku
 AddFile=Dodaj datoteku
 FreeZone=Ovaj proizvod/usluga nije predhodno upisan
-FreeLineOfType=Free-text item, type:
+FreeLineOfType=Slobodan upis, vrsta stavke:
 CloneMainAttributes=Kloniraj predmet sa svim glavnim svojstvima
 ReGeneratePDF=Re-generate PDF
 PDFMerge=Spoji PDF
@@ -759,6 +760,7 @@ LinkToSupplierProposal=Link to vendor proposal
 LinkToSupplierInvoice=Link to vendor invoice
 LinkToContract=Poveži s ugovorom
 LinkToIntervention=Poveži s zahvatom
+LinkToTicket=Link to ticket
 CreateDraft=Izradi skicu
 SetToDraft=Nazad na skice
 ClickToEdit=Klikni za uređivanje
diff --git a/htdocs/langs/hr_HR/margins.lang b/htdocs/langs/hr_HR/margins.lang
index 4f6f998b9e8..0ee046592c7 100644
--- a/htdocs/langs/hr_HR/margins.lang
+++ b/htdocs/langs/hr_HR/margins.lang
@@ -31,14 +31,14 @@ MARGIN_TYPE=Kupovno/troškovna cijena sugerirana za izračun marže
 MargeType1=Margin on Best vendor price
 MargeType2=Marža prema Procjenjenoj prosječnoj cijeni (PPC)
 MargeType3=Marža po cijeni troškova
-MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
+MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best vendor price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best vendor price if WAP not yet defined
 CostPrice=Cijena troška
 UnitCharges=Troškovi jedinice
 Charges=Troškovi
-AgentContactType=Tip kontakta komercijalnog agenta
+AgentContactType=Vrsta kontakta komercijalnog agenta
 AgentContactTypeDetails=Odredite koji tip kontakta (povezan na računu) će biti korišten za izvještaj marže po prodajnom predstavniku
 rateMustBeNumeric=Stopa mora biti brojčana vrijednost
 markRateShouldBeLesserThan100=Mark rate should be lower than 100
 ShowMarginInfos=Prikaži infomacije o marži
 CheckMargins=Detalji marže
-MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any ddiated sale representative and some thirdparties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any dedicated sale representative and some third parties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
diff --git a/htdocs/langs/hr_HR/members.lang b/htdocs/langs/hr_HR/members.lang
index 49945d46b38..ce9538cc391 100644
--- a/htdocs/langs/hr_HR/members.lang
+++ b/htdocs/langs/hr_HR/members.lang
@@ -35,8 +35,8 @@ EndSubscription=Kraj pretplate
 SubscriptionId=Pretplata ID
 MemberId=Član ID
 NewMember=Novi član
-MemberType=Tip člana
-MemberTypeId=Tip ID člana
+MemberType=Vrsta člana
+MemberTypeId=Vrsta ID člana
 MemberTypeLabel=Oznaka tipa člana
 MembersTypes=Tipovi članova
 MemberStatusDraft=Skica (potrebna potvrditi)
@@ -68,7 +68,7 @@ SubscriptionLate=Kasni
 SubscriptionNotReceived=Pretplata nikad zaprimljena
 ListOfSubscriptions=Popis pretplata
 SendCardByMail=Send card by email
-AddMember=Kreiraj člana
+AddMember=Izradi člana
 NoTypeDefinedGoToSetup=Nema definiranih tipova člana. Idite na izbornik "Tipovi članova"
 NewMemberType=Novi tip člana
 WelcomeEMail=Welcome email
@@ -104,7 +104,7 @@ Int=Int
 DateAndTime=Datum i vrijeme
 PublicMemberCard=Javna članska kartica
 SubscriptionNotRecorded=Pretplata nije pohranjena
-AddSubscription=Kreiraj pretplatu
+AddSubscription=Izradi pretplatu
 ShowSubscription=Prikaži pretplatu
 # Label of email templates
 SendingAnEMailToMember=Sending information email to member
@@ -149,7 +149,7 @@ MoreActions=Dodatna akcija za snimanje
 MoreActionsOnSubscription=Dodatne akcije, predloži kao zadano kod pohrane pretplate
 MoreActionBankDirect=Create a direct entry on bank account
 MoreActionBankViaInvoice=Create an invoice, and a payment on bank account
-MoreActionInvoiceOnly=Kreiraj račun bez plačanja
+MoreActionInvoiceOnly=Izradi račun bez plačanja
 LinkToGeneratedPages=Genereiraj vizit kartu
 LinkToGeneratedPagesDesc=This screen allows you to generate PDF files with business cards for all your members or a particular member.
 DocForAllMembersCards=Generiraj vizit karte za sve članove
diff --git a/htdocs/langs/hr_HR/opensurvey.lang b/htdocs/langs/hr_HR/opensurvey.lang
index ba2ca276e1c..46358d63a49 100644
--- a/htdocs/langs/hr_HR/opensurvey.lang
+++ b/htdocs/langs/hr_HR/opensurvey.lang
@@ -3,15 +3,15 @@ Survey=Anketa
 Surveys=Ankete
 OrganizeYourMeetingEasily=Jednostavno organizirajte sastanke i ankete. Prvo odaberite tip ankete...
 NewSurvey=Nova anketa
-OpenSurveyArea=Sučelje anketa
+OpenSurveyArea=Ankete
 AddACommentForPoll=Možete dodati komentar u anketu...
 AddComment=Dodaj komentar
-CreatePoll=Kreiraj anketu
+CreatePoll=Izradi anketu
 PollTitle=Naziv ankete
 ToReceiveEMailForEachVote=Primi e-poštu za svaki glas
 TypeDate=Vremenski tip
 TypeClassic=Standardni tip
-OpenSurveyStep2=Odaberite datume između slobodnih dana (sivo). Odabarni dani su zeleni. Odabir možete poništiti tako da kliknete ponovo na dan koji ste odabrali
+OpenSurveyStep2=Select your dates among the free days (grey). The selected days are green. You can unselect a day previously selected by clicking again on it
 RemoveAllDays=Makni sve dane
 CopyHoursOfFirstDay=Kopiraj sate prvog dana
 RemoveAllHours=Makni sve sate
@@ -25,8 +25,8 @@ ConfirmRemovalOfPoll=Jeste li sigurni da želite maknuti ovo glasanje (i sve gla
 RemovePoll=Makni anketu
 UrlForSurvey=URL za direktni pristup anketi
 PollOnChoice=Kreirate anketu s više odabira u anketi. Prvo unesite sve moguće odabire za vašu anketu:
-CreateSurveyDate=Kreiraj vremensku anketu
-CreateSurveyStandard=Kreiraj standardnu anketu
+CreateSurveyDate=Izradi vremensku anketu
+CreateSurveyStandard=Izradi standardnu anketu
 CheckBox=Jednostavni checkbox
 YesNoList=Popis (prazno/da/ne)
 PourContreList=Popis (prazno/za/protiv)
@@ -35,7 +35,7 @@ TitleChoice=Oznaka odabira
 ExportSpreadsheet=Izvezi rezultate u tabelu
 ExpireDate=Ograničen datum
 NbOfSurveys=Broj anketa
-NbOfVoters=Br. glasača
+NbOfVoters=No. of voters
 SurveyResults=Rezultati
 PollAdminDesc=Niste ovlašteni za promjenu svih linija u anketi. Možete maknuti kolonu ili liniju sa %s. Također možete dodati novu kolonu sa %s.
 5MoreChoices=Još 5 odabira
@@ -49,7 +49,7 @@ votes=glas(ova)
 NoCommentYet=Nema komentara za anketu
 CanComment=Glasači mogu komentirati anketu
 CanSeeOthersVote=Glasači mogu vidjeti glasove drugih glasača
-SelectDayDesc=Za svaki odabrani dan, možete odabrati, ili ne morate, sat sastanka u sljedećem formatu: <br>- prazno,<br>- "8h", "8H" ili "8:00" za početak sastanka,<br>- "8-11", "8h-11h", "8H-11H" ili "8:00-11:00" za početak i kraj sastanka,<br>- "8h15-11h15", "8H15-11H15" ili "8:15-11:15" za isto samo sa minutama.
+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.
 BackToCurrentMonth=Povratak na trenutni mjesec
 ErrorOpenSurveyFillFirstSection=Niste popunili prvi dio kreiranja ankete
 ErrorOpenSurveyOneChoice=Unesite barem jedan odabir
diff --git a/htdocs/langs/hr_HR/orders.lang b/htdocs/langs/hr_HR/orders.lang
index 0009a2edad2..484bcfa17ce 100644
--- a/htdocs/langs/hr_HR/orders.lang
+++ b/htdocs/langs/hr_HR/orders.lang
@@ -17,7 +17,7 @@ SupplierOrder=Narudžba dobavljaču
 SuppliersOrders=Narudžbe dobavljačima
 SuppliersOrdersRunning=Otvorene narudžbe dobavljačima
 CustomerOrder=Sales Order
-CustomersOrders=Sales Orders
+CustomersOrders=Narudžbe kupaca
 CustomersOrdersRunning=Current sales orders
 CustomersOrdersAndOrdersLines=Sales orders and order details
 OrdersDeliveredToBill=Sales orders delivered to bill
@@ -60,7 +60,7 @@ ProductQtyInDraftOrWaitingApproved=Količina proizvoda u skicama ili odobrenim n
 MenuOrdersToBill=Isporučene narudžbe
 MenuOrdersToBill2=Naplative narudžbe
 ShipProduct=Pošalji proizvod
-CreateOrder=Kreiraj narudžbu
+CreateOrder=Izradi narudžbu
 RefuseOrder=Odbij narudžbu
 ApproveOrder=Odobri narudžbu
 Approve2Order=Odobri narudžbu (druga razina)
@@ -69,7 +69,7 @@ UnvalidateOrder=Neovjeri narudžbu
 DeleteOrder=Obriši narudžbu
 CancelOrder=Poništi narudžbu
 OrderReopened= Narudžba %s ponovo otvorena
-AddOrder=Kreiraj narudžbu
+AddOrder=Izradi narudžbu
 AddToDraftOrders=Dodati u skice narudžbe
 ShowOrder=Prikaži narudžbu
 OrdersOpened=Narudžbe za obradu
@@ -85,7 +85,7 @@ NbOfOrders=Broj narudžbe
 OrdersStatistics=Statistike narudžbe
 OrdersStatisticsSuppliers=Purchase order statistics
 NumberOfOrdersByMonth=Broj narudžba tijekom mjeseca
-AmountOfOrdersByMonthHT=Amount of orders by month (excl. tax)
+AmountOfOrdersByMonthHT=Ukupan iznos narudžbi po mjesecu (bez PDV-a)
 ListOfOrders=Lista narudžbi
 CloseOrder=Zatvori narudžbu
 ConfirmCloseOrder=Are you sure you want to set this order to delivered? Once an order is delivered, it can be set to billed.
@@ -94,7 +94,7 @@ ConfirmValidateOrder=Are you sure you want to validate this order under name <b>
 ConfirmUnvalidateOrder=Are you sure you want to restore order <b>%s</b> to draft status?
 ConfirmCancelOrder=Are you sure you want to cancel this order?
 ConfirmMakeOrder=Are you sure you want to confirm you made this order on <b>%s</b>?
-GenerateBill=Kreiraj račun
+GenerateBill=Izradi račun
 ClassifyShipped=Označi kao isporučeno
 DraftOrders=Skica narudžbi
 DraftSuppliersOrders=Draft purchase orders
@@ -106,7 +106,7 @@ RefOrderSupplierShort=Ref. order vendor
 SendOrderByMail=Pošalji narudžbu e-poštom
 ActionsOnOrder=Događaji vezani uz narudžbu
 NoArticleOfTypeProduct=Ne postoji stavka tipa proizvod tako da nema isporučive stavke za ovu narudžbu
-OrderMode=Metoda narudžbe
+OrderMode=Način narudžbe
 AuthorRequest=Autor zahtjeva
 UserWithApproveOrderGrant=Korisniku je dozvoljeno "odobravanje narudžbi"
 PaymentOrderRef=Plaćanje po narudžbi %s
diff --git a/htdocs/langs/hr_HR/printing.lang b/htdocs/langs/hr_HR/printing.lang
index c699c5187cd..32f9944db38 100644
--- a/htdocs/langs/hr_HR/printing.lang
+++ b/htdocs/langs/hr_HR/printing.lang
@@ -2,7 +2,7 @@
 Module64000Name=Direktni ispis
 Module64000Desc=Omogući sistem direktnog ispisa
 PrintingSetup=Podešavanje sistema direktnog ispisa
-PrintingDesc=This module adds a Print button to send documents directly to a printer (without opening document into an application) with various module.
+PrintingDesc=This module adds a Print button to various modules to allow documents to be printed directly to a printer without needing to open the document in another application.
 MenuDirectPrinting=Zadaci direktnog ispisa
 DirectPrint=Direktni ispis
 PrintingDriverDesc=Configuration variables for printing driver.
@@ -19,15 +19,15 @@ UserConf=Podešavanje prema korisniku
 PRINTGCP_INFO=Podešavanje Google OAuth API
 PRINTGCP_AUTHLINK=Autentifikacija
 PRINTGCP_TOKEN_ACCESS=Google Cloud Print OAuth Token
-PrintGCPDesc=This driver allow to send documents directly to a printer with Google Cloud Print.
+PrintGCPDesc=This driver allows sending documents directly to a printer using Google Cloud Print.
 GCP_Name=Naziv
 GCP_displayName=Prikazani naziv
 GCP_Id=ID pisača
 GCP_OwnerName=Vlasnik
 GCP_State=Stanje pisača
 GCP_connectionStatus=Online stanje
-GCP_Type=Tip pisača
-PrintIPPDesc=This driver allow to send documents directly to a printer. It requires a Linux system with CUPS installed.
+GCP_Type=Vrsta pisača
+PrintIPPDesc=This driver allows sending of documents directly to a printer. It requires a Linux system with CUPS installed.
 PRINTIPP_HOST=Print server
 PRINTIPP_PORT=Port
 PRINTIPP_USER=Korisničko ime
@@ -44,9 +44,11 @@ IPP_BW=CB
 IPP_Color=Kolor
 IPP_Device=Uređaj
 IPP_Media=Medij pisača
-IPP_Supported=Tip medija
+IPP_Supported=Vrsta medija
 DirectPrintingJobsDesc=This page lists printing jobs found for available printers.
-GoogleAuthNotConfigured=Google OAuth setup not done. Enable module OAuth and set a Google ID/Secret.
+GoogleAuthNotConfigured=Google OAuth has not been setup. Enable module OAuth and set a Google ID/Secret.
 GoogleAuthConfigured=Google OAuth credentials were found into setup of module OAuth.
 PrintingDriverDescprintgcp=Configuration variables for printing driver Google Cloud Print.
+PrintingDriverDescprintipp=Configuration variables for printing driver Cups.
 PrintTestDescprintgcp=List of Printers for Google Cloud Print.
+PrintTestDescprintipp=List of Printers for Cups.
diff --git a/htdocs/langs/hr_HR/products.lang b/htdocs/langs/hr_HR/products.lang
index 4d43f08396a..48f1ecedb9f 100644
--- a/htdocs/langs/hr_HR/products.lang
+++ b/htdocs/langs/hr_HR/products.lang
@@ -2,6 +2,7 @@
 ProductRef=Proizvod ref.
 ProductLabel=Oznaka proizvoda
 ProductLabelTranslated=Prevedena oznaka proizvoda
+ProductDescription=Product description
 ProductDescriptionTranslated=Preveden opis proizvoda
 ProductNoteTranslated=Prevedena napomena proizvoda
 ProductServiceCard=Kartica proizvoda/usluga
@@ -63,7 +64,7 @@ UpdateDefaultPrice=Promjeni predefiniranu cijenu
 UpdateLevelPrices=Promijeni cijene za svaki nivo
 AppliedPricesFrom=Applied from
 SellingPrice=Prodajna cijena
-SellingPriceHT=Selling price (excl. tax)
+SellingPriceHT=Prodajna cijena (bez PDV-a)
 SellingPriceTTC=Prodajna cijena (sa PDV-om)
 SellingMinPriceTTC=Minimum Selling price (inc. tax)
 CostPriceDescription=This price field (excl. tax) can be used to store the average amount this product costs to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
@@ -92,8 +93,8 @@ PriceForEachProduct=Proizvodi s specifičnom cijenom
 SupplierCard=Vendor card
 PriceRemoved=Cijena uklonjena
 BarCode=Barkod
-BarcodeType=Tip barkoda
-SetDefaultBarcodeType=Odredi tip barkoda
+BarcodeType=Vrsta barkoda
+SetDefaultBarcodeType=Odredi vrstu barkoda
 BarcodeValue=Vrijednost barkoda
 NoteNotVisibleOnBill=Bilješka (ne vidi se na računima, ponudama...)
 ServiceLimitedDuration=Ako je proizvod usluga ograničenog trajanja:
@@ -133,7 +134,7 @@ NoPriceDefinedForThisSupplier=No price/qty defined for this vendor/product
 NoSupplierPriceDefinedForThisProduct=No vendor price/qty defined for this product
 PredefinedProductsToSell=Predefined Product
 PredefinedServicesToSell=Predefined Service
-PredefinedProductsAndServicesToSell=Predefinirani proizvodi/usluge za prodaju
+PredefinedProductsAndServicesToSell=Upisani proizvodi i usluge na prodaju
 PredefinedProductsToPurchase=Predefinirani proizvod za kupovinu
 PredefinedServicesToPurchase=Predifinirana usluga za kupovinu
 PredefinedProductsAndServicesToPurchase=Predefined products/services to purchase
diff --git a/htdocs/langs/hr_HR/projects.lang b/htdocs/langs/hr_HR/projects.lang
index c40b0ff3f7b..5a9ef2fdf4e 100644
--- a/htdocs/langs/hr_HR/projects.lang
+++ b/htdocs/langs/hr_HR/projects.lang
@@ -26,7 +26,7 @@ OnlyYourTaskAreVisible=Only tasks assigned to you are visible. Assign task to yo
 ImportDatasetTasks=Tasks of projects
 ProjectCategories=Project tags/categories
 NewProject=Novi projekt
-AddProject=Kreiraj projekt
+AddProject=Izradi projekt
 DeleteAProject=Izbriši projekt
 DeleteATask=Izbriši zadatak
 ConfirmDeleteAProject=Are you sure you want to delete this project?
@@ -66,7 +66,7 @@ TaskDateStart=Početak zadatka
 TaskDateEnd=Završetak zadatka
 TaskDescription=Opis zadatka
 NewTask=Novi zadatak
-AddTask=Kreiraj zadatak
+AddTask=Izradi zadatak
 AddTimeSpent=Create time spent
 AddHereTimeSpentForDay=Add here time spent for this day/task
 Activity=Aktivnost
diff --git a/htdocs/langs/hr_HR/propal.lang b/htdocs/langs/hr_HR/propal.lang
index 676fdc0efe3..9a8c94fd209 100644
--- a/htdocs/langs/hr_HR/propal.lang
+++ b/htdocs/langs/hr_HR/propal.lang
@@ -22,7 +22,7 @@ SearchAProposal=Pronađi ponudu
 NoProposal=Bez ponude
 ProposalsStatistics=Statistika ponuda
 NumberOfProposalsByMonth=Broj u mjesecu
-AmountOfProposalsByMonthHT=Amount by month (excl. tax)
+AmountOfProposalsByMonthHT=Iznos po mjesecu (bez PDV-a)
 NbOfProposals=Broj ponuda
 ShowPropal=Prikaži ponudu
 PropalsDraft=Skice
diff --git a/htdocs/langs/hr_HR/resource.lang b/htdocs/langs/hr_HR/resource.lang
index 1b85c37daf1..c16e266ebe7 100644
--- a/htdocs/langs/hr_HR/resource.lang
+++ b/htdocs/langs/hr_HR/resource.lang
@@ -5,13 +5,13 @@ DeleteResource=Obriši sredstvo
 ConfirmDeleteResourceElement=Potvrdite brisanje sredstva za ovaj element
 NoResourceInDatabase=Nema sredstava u bazi
 NoResourceLinked=Nema povezanih sredstava
-
+ActionsOnResource=Events about this resource
 ResourcePageIndex=Popis sredstava
 ResourceSingular=Sredstvo
 ResourceCard=Kartica sredstva
-AddResource=Kreiraj sredstvo
+AddResource=Izradi sredstvo
 ResourceFormLabel_ref=Naziv sredstva
-ResourceType=Tip sredstva
+ResourceType=Vrsta sredstva
 ResourceFormLabel_description=Opis sredstva
 
 ResourcesLinkedToElement=Sredstva povezana s elementom
diff --git a/htdocs/langs/hr_HR/sendings.lang b/htdocs/langs/hr_HR/sendings.lang
index aff0410d44a..433fc80c152 100644
--- a/htdocs/langs/hr_HR/sendings.lang
+++ b/htdocs/langs/hr_HR/sendings.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - sendings
-RefSending=Ref. isporuke
+RefSending=Broj
 Sending=Isporuka
 Sendings=Isporuke
 AllSendings=Sve otpremnice
@@ -7,20 +7,20 @@ Shipment=Pošiljka
 Shipments=Pošiljke
 ShowSending=Prikaži otrpemnice
 Receivings=Dostavne primke
-SendingsArea=Sučelje otprema
+SendingsArea=Otprema
 ListOfSendings=Popis pošiljki
-SendingMethod=Metoda dostave
+SendingMethod=Način dostave
 LastSendings=Zadnjih %s isporuka
 StatisticsOfSendings=Statistike pošiljki
 NbOfSendings=Broj pošiljki
 NumberOfShipmentsByMonth=Broj pošiljki tijekom mjeseca
 SendingCard=Kartica otpreme
 NewSending=Nova pošiljka
-CreateShipment=Kreiraj pošiljku
+CreateShipment=Izradi pošiljku
 QtyShipped=Količina poslana
 QtyShippedShort=Qty ship.
 QtyPreparedOrShipped=Qty prepared or shipped
-QtyToShip=Količina za poslat
+QtyToShip=Količina za isporuku
 QtyReceived=Količina primljena
 QtyInOtherShipments=Qty in other shipments
 KeepToShip=Preostalo za isporuku
@@ -35,29 +35,29 @@ StatusSendingProcessed=Obrađen
 StatusSendingDraftShort=Skica
 StatusSendingValidatedShort=Ovjereno
 StatusSendingProcessedShort=Obrađen
-SendingSheet=Otpremni list
+SendingSheet=Dostavnica
 ConfirmDeleteSending=Are you sure you want to delete this shipment?
 ConfirmValidateSending=Are you sure you want to validate this shipment with reference <b>%s</b>?
 ConfirmCancelSending=Are you sure you want to cancel this shipment?
 DocumentModelMerou=Merou A5 model
 WarningNoQtyLeftToSend=Upozorenje, nema prozvoda za isporuku.
 StatsOnShipmentsOnlyValidated=Statistika se vodi po otpremnicama koje su ovjerene. Korišteni datum je datum ovjere otpremnice (planirani datum isporuke nije uvjek poznat).
-DateDeliveryPlanned=Planirani dan isporuke
+DateDeliveryPlanned=Planirani datum isporuke
 RefDeliveryReceipt=Ref delivery receipt
 StatusReceipt=Status delivery receipt
 DateReceived=Datum primitka pošiljke
-SendShippingByEMail=Pošalji pošiljku putem e-pošte
-SendShippingRef=Podnošenje otpeme %s
+SendShippingByEMail=Send shipment by email
+SendShippingRef=Dostavnica %s
 ActionsOnShipping=Događaji na otpremnici
-LinkToTrackYourPackage=Poveznica za pračenje pošiljke
+LinkToTrackYourPackage=Poveznica na praćenje pošiljke
 ShipmentCreationIsDoneFromOrder=Trenutno, kreiranje nove otpremnice se radi iz kartice narudžbe.
 ShipmentLine=Stavka otpremnice
-ProductQtyInCustomersOrdersRunning=Product quantity into open customer orders
+ProductQtyInCustomersOrdersRunning=Product quantity into open sales orders
 ProductQtyInSuppliersOrdersRunning=Product quantity into open purchase orders
-ProductQtyInShipmentAlreadySent=Product quantity from open customer order already sent
-ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from open supplier order already received
-NoProductToShipFoundIntoStock=Nije pronađen proizvod za isporuku u skladištu <b>%s</b>. Ispravite zalihe ili se vratite nazad i odaberite drugo skladište. 
-WeightVolShort=Težina/Volumen
+ProductQtyInShipmentAlreadySent=Product quantity from open sales order already sent
+ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from open purchase order already received
+NoProductToShipFoundIntoStock=No product to ship found in warehouse <b>%s</b>. Correct stock or go back to choose another warehouse.
+WeightVolShort=Masa/Volumen
 ValidateOrderFirstBeforeShipment=Prvo morate ovjeriti narudžbu prije izrade otpremnice.
 
 # Sending methods
@@ -69,4 +69,4 @@ SumOfProductWeights=Ukupna težina proizvoda
 
 # warehouse details
 DetailWarehouseNumber= Skladišni detalji
-DetailWarehouseFormat= W:%s (Qty : %d)
+DetailWarehouseFormat= W:%s (Qty: %d)
diff --git a/htdocs/langs/hr_HR/stripe.lang b/htdocs/langs/hr_HR/stripe.lang
index b8d4e4275e8..b730288aa37 100644
--- a/htdocs/langs/hr_HR/stripe.lang
+++ b/htdocs/langs/hr_HR/stripe.lang
@@ -65,3 +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>
diff --git a/htdocs/langs/hr_HR/supplier_proposal.lang b/htdocs/langs/hr_HR/supplier_proposal.lang
index 3f24fc4f0f1..524872ec4ab 100644
--- a/htdocs/langs/hr_HR/supplier_proposal.lang
+++ b/htdocs/langs/hr_HR/supplier_proposal.lang
@@ -15,7 +15,7 @@ SupplierProposals=Ponude dobavljača
 SupplierProposalsShort=Ponude dobavljača
 NewAskPrice=Novo traženje cijene
 ShowSupplierProposal=Prikaži zahtjev
-AddSupplierProposal=Kreiraj zahtjev za cijenom
+AddSupplierProposal=Izradi zahtjev za cijenom
 SupplierProposalRefFourn=Vendor ref
 SupplierProposalDate=Datum isporuke
 SupplierProposalRefFournNotice=Prije zatvaranja s "Prihvačeno", provjerite reference dobavljača.
@@ -32,8 +32,8 @@ SupplierProposalStatusValidatedShort=Ovjereno
 SupplierProposalStatusClosedShort=Zatvoreno
 SupplierProposalStatusSignedShort=Prihvačeno
 SupplierProposalStatusNotSignedShort=Odbijeno
-CopyAskFrom=Kreiraj zahtjev za cijenom kopirajući postojeći zahtjev
-CreateEmptyAsk=Kreiraj prazan zahtjev
+CopyAskFrom=Izradi zahtjev za cijenom kopirajući postojeći zahtjev
+CreateEmptyAsk=Izradi prazan zahtjev
 ConfirmCloneAsk=Are you sure you want to clone the price request <b>%s</b>?
 ConfirmReOpenAsk=Are you sure you want to open back the price request <b>%s</b>?
 SendAskByMail=Pošalji zahtjev za cijenom poštom
diff --git a/htdocs/langs/hr_HR/suppliers.lang b/htdocs/langs/hr_HR/suppliers.lang
index 7572f5a92cb..f75d38c44c8 100644
--- a/htdocs/langs/hr_HR/suppliers.lang
+++ b/htdocs/langs/hr_HR/suppliers.lang
@@ -1,10 +1,10 @@
-# Dolibarr language file - Source file is en_US - suppliers
+# Dolibarr language file - Source file is en_US - vendors
 Suppliers=Vendors
 SuppliersInvoice=Vendor invoice
 ShowSupplierInvoice=Show Vendor Invoice
 NewSupplier=New vendor
 History=Povijest
-ListOfSuppliers=List of vendors
+ListOfSuppliers=Popis dobavljača
 ShowSupplier=Show vendor
 OrderDate=Datum narudžbe
 BuyingPriceMin=Best buying price
@@ -15,15 +15,15 @@ SomeSubProductHaveNoPrices=Neki od pod proizvoda nemaju definiranu cijenu
 AddSupplierPrice=Add buying price
 ChangeSupplierPrice=Change buying price
 SupplierPrices=Vendor prices
-ReferenceSupplierIsAlreadyAssociatedWithAProduct=Ova ref. dobavljača već je povezana s ref.: %s
+ReferenceSupplierIsAlreadyAssociatedWithAProduct=This vendor reference is already associated with a product: %s
 NoRecordedSuppliers=No vendor recorded
 SupplierPayment=Vendor payment
 SuppliersArea=Vendor area
-RefSupplierShort=Ref. vendor
+RefSupplierShort=Oznaka dobavljača
 Availability=Dostupnost
-ExportDataset_fournisseur_1=Vendor invoices list and invoice lines
+ExportDataset_fournisseur_1=Vendor invoices and invoice details
 ExportDataset_fournisseur_2=Vendor invoices and payments
-ExportDataset_fournisseur_3=Purchase orders and order lines
+ExportDataset_fournisseur_3=Purchase orders and order details
 ApproveThisOrder=Odobri narudžbu
 ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b>?
 DenyingThisOrder=Zabrani narudžbu
@@ -35,13 +35,13 @@ 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=Kašnjenje isporuke u danima
-DescNbDaysToDelivery=Najveće kašnjenje za proizvode s ove narudžbe
+NbDaysToDelivery=Delivery delay (days)
+DescNbDaysToDelivery=The longest delivery delay of the products from this order
 SupplierReputation=Vendor reputation
 DoNotOrderThisProductToThisSupplier=Nemoj naručiti
-NotTheGoodQualitySupplier=Loša kvaliteta
+NotTheGoodQualitySupplier=Low quality
 ReputationForThisProduct=Reputacija
 BuyerName=Naziv kupca
 AllProductServicePrices=All product / service prices
-AllProductReferencesOfSupplier=All product / service references of supplier
+AllProductReferencesOfSupplier=All product / service references of vendor
 BuyingPriceNumShort=Vendor prices
diff --git a/htdocs/langs/hr_HR/ticket.lang b/htdocs/langs/hr_HR/ticket.lang
index 86f6cdbe2a5..cdb66a82bfd 100644
--- a/htdocs/langs/hr_HR/ticket.lang
+++ b/htdocs/langs/hr_HR/ticket.lang
@@ -67,7 +67,7 @@ Closed=Zatvoreno
 Deleted=Deleted
 
 # Dict
-Type=Tip
+Type=Vrsta
 Category=Analytic code
 Severity=Severity
 
@@ -173,7 +173,7 @@ LatestNewTickets=Latest %s newest tickets (not read)
 TicketSeverity=Severity
 ShowTicket=See ticket
 RelatedTickets=Related tickets
-TicketAddIntervention=Kreiraj intervenciju
+TicketAddIntervention=Izradi intervenciju
 CloseTicket=Close ticket
 CloseATicket=Close a ticket
 ConfirmCloseAticket=Confirm ticket closing
diff --git a/htdocs/langs/hr_HR/trips.lang b/htdocs/langs/hr_HR/trips.lang
index 2f00625bee8..bfcc0163d43 100644
--- a/htdocs/langs/hr_HR/trips.lang
+++ b/htdocs/langs/hr_HR/trips.lang
@@ -4,7 +4,7 @@ Trips=Izvještaji troška
 TripsAndExpenses=Izvještaji troškova
 TripsAndExpensesStatistics=Statistika izvještaja troška
 TripCard=Kartica izvještaja troška
-AddTrip=Kreiraj izvještaj troška
+AddTrip=Izradi izvještaj troška
 ListOfTrips=Popis izvještaja troškova
 ListOfFees=Popis pristojbi
 TypeFees=Tipovi pristojbi
@@ -148,4 +148,4 @@ nolimitbyEX_EXP=by line (no limitation)
 CarCategory=Category of car
 ExpenseRangeOffset=Offset amount: %s
 RangeIk=Mileage range
-AttachTheNewLineToTheDocument=Attach the new line to an existing document
+AttachTheNewLineToTheDocument=Attach the line to an uploaded document
diff --git a/htdocs/langs/hr_HR/users.lang b/htdocs/langs/hr_HR/users.lang
index cb4d867e8ac..f34d994e94b 100644
--- a/htdocs/langs/hr_HR/users.lang
+++ b/htdocs/langs/hr_HR/users.lang
@@ -41,7 +41,7 @@ LastName=Prezime
 FirstName=Ime
 ListOfGroups=Lista grupa
 NewGroup=Nova grupa
-CreateGroup=Kreiraj grupu
+CreateGroup=Izradi grupu
 RemoveFromGroup=Ukloni iz grupe
 PasswordChangedAndSentTo=Lozinka je promjenjena i poslana <b>%s</b>.
 PasswordChangeRequest=Request to change password for <b>%s</b>
@@ -61,8 +61,8 @@ LinkToCompanyContact=Veza na komitenta/kontakt
 LinkedToDolibarrMember=Poveži s članom
 LinkedToDolibarrUser=Poveži s korisnikom
 LinkedToDolibarrThirdParty=Veza na Dolibarr komitenta
-CreateDolibarrLogin=Kreiraj korisnika
-CreateDolibarrThirdParty=Kreiraj komitenta
+CreateDolibarrLogin=Izradi korisnika
+CreateDolibarrThirdParty=Izradi komitenta
 LoginAccountDisableInDolibarr=Račun je onemogučen u Dolibarr-u.
 UsePersonalValue=Koristi osobnu vrijednost
 InternalUser=Interni korisnik
@@ -97,7 +97,7 @@ NbOfPermissions=No. of permissions
 DontDowngradeSuperAdmin=Samo superadmin može unazaditi superadmina
 HierarchicalResponsible=Nadglednik
 HierarchicView=Hijerarhijski prikaz
-UseTypeFieldToChange=Koristi polje Tip za promjenu
+UseTypeFieldToChange=Koristi polje Vrsta za promjenu
 OpenIDURL=OpenID URL
 LoginUsingOpenID=Koristi OpenID za prijavu
 WeeklyHours=Hours worked (per week)
diff --git a/htdocs/langs/hr_HR/withdrawals.lang b/htdocs/langs/hr_HR/withdrawals.lang
index 784d9f2ba53..06c7880bb11 100644
--- a/htdocs/langs/hr_HR/withdrawals.lang
+++ b/htdocs/langs/hr_HR/withdrawals.lang
@@ -76,7 +76,8 @@ WithdrawalFile=Isplatna datoteka
 SetToStatusSent=Postavi status "Datoteka poslana"
 ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and will classify them as "Paid" if remain to pay is null
 StatisticsByLineStatus=Statistika statusa stavki
-RUM=UMR
+RUM=Unique Mandate Reference (UMR)
+DateRUM=Mandate signature date
 RUMLong=Unique Mandate Reference
 RUMWillBeGenerated=If empty, a UMR (Unique Mandate Reference) will be generated once the bank account information is saved.
 WithdrawMode=Direct debit mode (FRST or RECUR)
diff --git a/htdocs/langs/hu_HU/accountancy.lang b/htdocs/langs/hu_HU/accountancy.lang
index d6b1e1ba041..b001cd9bf1a 100644
--- a/htdocs/langs/hu_HU/accountancy.lang
+++ b/htdocs/langs/hu_HU/accountancy.lang
@@ -265,7 +265,7 @@ AccountingJournals=Accounting journals
 AccountingJournal=Accounting journal
 NewAccountingJournal=New accounting journal
 ShowAccoutingJournal=Show accounting journal
-Nature=Természet
+NatureOfJournal=Nature of Journal
 AccountingJournalType1=Miscellaneous operations
 AccountingJournalType2=Eladások
 AccountingJournalType3=Beszerzések
@@ -291,6 +291,7 @@ Modelcsv_quadratus=Export for Quadratus QuadraCompta
 Modelcsv_ebp=Export for EBP
 Modelcsv_cogilog=Export for Cogilog
 Modelcsv_agiris=Export for Agiris
+Modelcsv_LDCompta=Export for LD Compta (v9 & higher) (Test)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
@@ -301,7 +302,7 @@ ChartofaccountsId=Chart of accounts Id
 InitAccountancy=Init accountancy
 InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accounting account defined for sales and purchases.
 DefaultBindingDesc=This page can be used to set a default account to use to link transactions record about payment salaries, donation, taxes and vat when no specific accounting account were already set.
-DefaultClosureDesc=This page can be used to set parameters to use to enclose a balance sheet.
+DefaultClosureDesc=This page can be used to set parameters used for accounting closures.
 Options=Options
 OptionModeProductSell=Mode sales
 OptionModeProductSellIntra=Mode sales exported in EEC
diff --git a/htdocs/langs/hu_HU/admin.lang b/htdocs/langs/hu_HU/admin.lang
index 381bd02eadf..b7a4c9177cb 100644
--- a/htdocs/langs/hu_HU/admin.lang
+++ b/htdocs/langs/hu_HU/admin.lang
@@ -574,7 +574,7 @@ Module510Name=Salaries
 Module510Desc=Record and track employee payments
 Module520Name=Loans
 Module520Desc=Management of loans
-Module600Name=Értesítések
+Module600Name=Notifications on business event
 Module600Desc=Send email notifications triggered by a business event: per user (setup defined on each user), per third-party contacts (setup defined on each third party) or by specific emails
 Module600Long=Note that this module sends emails in real-time when a specific business event occurs. If you are looking for a feature to send email reminders for agenda events, go into the setup of module Agenda.
 Module610Name=Product Variants
@@ -1193,6 +1193,7 @@ ExtraFieldsSupplierOrders=Complementary attributes (orders)
 ExtraFieldsSupplierInvoices=Complementary attributes (invoices)
 ExtraFieldsProject=Complementary attributes (projects)
 ExtraFieldsProjectTask=Complementary attributes (tasks)
+ExtraFieldsSalaries=Complementary attributes (salaries)
 ExtraFieldHasWrongValue=Attribute %s has a wrong value.
 AlphaNumOnlyLowerCharsAndNoSpace=only alphanumericals and lower case characters without space
 SendmailOptionNotComplete=Figyelem, egyes Linux rendszereken, hogy küldjön e-mailt az e-mail, sendmail beállítás végrehajtása lehetőséget kell conatins-ba (paraméter mail.force_extra_parameters be a php.ini fájl). Ha néhány címzett nem fogadja az üzeneteket, próbáld meg szerkeszteni ezt a PHP paraméter = mail.force_extra_parameters-ba).
@@ -1220,13 +1221,14 @@ SuhosinSessionEncrypt=Session storage encrypted by Suhosin
 ConditionIsCurrently=Condition is currently %s
 YouUseBestDriver=You use driver %s which is the best driver currently available.
 YouDoNotUseBestDriver=You use driver %s but driver %s is recommended.
-NbOfProductIsLowerThanNoPb=You have only %s products/services in the database. This does not require any particular optimization.
+NbOfObjectIsLowerThanNoPb=You have only %s %s in the database. This does not require any particular optimization.
 SearchOptim=Keresés optimalizálása
-YouHaveXProductUseSearchOptim=You have %s products in the database. You should add the constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+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.
 BrowserIsOK=You are using the %s web browser. This browser is ok for security and performance.
 BrowserIsKO=You are using the %s web browser. This browser is known to be a bad choice for security, performance and reliability. We recommend using Firefox, Chrome, Opera or Safari.
-XDebugInstalled=XDebug betöltve.
-XCacheInstalled=XCache betöltve.
+PHPModuleLoaded=PHP component %s is loaded
+PreloadOPCode=Preloaded OPCode is used
 AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.<br>Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp".
 AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".
 AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties.
@@ -1734,9 +1736,9 @@ ExpenseReportsRulesSetup=Setup of module Expense Reports - Rules
 ExpenseReportNumberingModules=Expense reports numbering module
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
 YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for email notifications by enabling and configuring the module "Notification".
-ListOfNotificationsPerUser=List of notifications per user*
-ListOfNotificationsPerUserOrContact=List of notifications (events) available per user* or per contact**
-ListOfFixedNotifications=List of Fixed Notifications
+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
 GoOntoUserCardToAddMore=Go to the tab "Notifications" of a user to add or remove notifications for users
 GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
 Threshold=Threshold
@@ -1898,6 +1900,11 @@ OnMobileOnly=On small screen (smartphone) only
 DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be Prospect or Customer but can't be both)
 MAIN_OPTIMIZEFORTEXTBROWSER=Simplify interface for blind person
 MAIN_OPTIMIZEFORTEXTBROWSERDesc=Enable this option if you are a blind person, or if you use the application from a text browser like Lynx or 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
 ThisValueCanOverwrittenOnUserLevel=This value can be overwritten by each user from its user page - tab '%s'
 DefaultCustomerType=Default thirdparty type for "New customer" creation form
 ABankAccountMustBeDefinedOnPaymentModeSetup=Note: The bank account must be defined on the module of each payment mode (Paypal, Stripe, ...) to have this feature working.
@@ -1911,7 +1918,7 @@ LogsLinesNumber=Number of lines to show on logs tab
 UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
-DebugBarModuleActivated=Module debugbar is activated and slows dramaticaly the interface
+ModuleActivated=Module %s is activated and slows the interface
 EXPORTS_SHARE_MODELS=Export models are share with everybody
 ExportSetup=Setup of module Export
 InstanceUniqueID=Unique ID of the instance
@@ -1928,3 +1935,5 @@ 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
diff --git a/htdocs/langs/hu_HU/bills.lang b/htdocs/langs/hu_HU/bills.lang
index 3b14581d116..f09b0754b02 100644
--- a/htdocs/langs/hu_HU/bills.lang
+++ b/htdocs/langs/hu_HU/bills.lang
@@ -95,6 +95,7 @@ PaymentHigherThanReminderToPay=Fizetés magasabb az emlékeztetőben leírtnál
 HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess received for each overpaid invoice.
 HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess paid for each overpaid invoice.
 ClassifyPaid=Osztályozva mint 'Fizetve'
+ClassifyUnPaid=Classify 'Unpaid'
 ClassifyPaidPartially=Osztályozva mint 'Részben fizetve'
 ClassifyCanceled=Osztályozva mint 'Elhagyott'
 ClassifyClosed=Osztályozva mint 'Lezárt'
@@ -214,6 +215,20 @@ ShowInvoiceReplace=Helyetesítő számla megjelenítése
 ShowInvoiceAvoir=Jóváírás mutatása
 ShowInvoiceDeposit=Show down payment invoice
 ShowInvoiceSituation=Show situation invoice
+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
 ShowPayment=Fizetés mutatása
 AlreadyPaid=Már kifizetett
 AlreadyPaidBack=Visszafizetés megtörtént
diff --git a/htdocs/langs/hu_HU/errors.lang b/htdocs/langs/hu_HU/errors.lang
index 6819767dad9..53bc6470549 100644
--- a/htdocs/langs/hu_HU/errors.lang
+++ b/htdocs/langs/hu_HU/errors.lang
@@ -90,7 +90,7 @@ ErrorSpecialCharNotAllowedForField=Speciális karakterek használata nem engedé
 ErrorNumRefModel=A referencia létezik az adatbázis (%s), és nem kompatibilis ezzel a számozással a szabály. Vegye rekord vagy átnevezték hivatkozással, hogy aktiválja ezt a modult.
 ErrorQtyTooLowForThisSupplier=Quantity too low for this vendor or no price defined on this product for this vendor
 ErrorOrdersNotCreatedQtyTooLow=Some orders haven't been created because of too-low quantities
-ErrorModuleSetupNotComplete=Setup of module looks to be uncomplete. Go on Home - Setup - Modules to complete.
+ErrorModuleSetupNotComplete=Setup of module %s looks to be uncomplete. Go on Home - Setup - Modules to complete.
 ErrorBadMask=Hiba a maszk
 ErrorBadMaskFailedToLocatePosOfSequence=Hiba, maszk sorozatszám nélkül
 ErrorBadMaskBadRazMonth=Hiba, rossz érték visszaállítása
@@ -219,6 +219,7 @@ 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.
 # 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.
 WarningMandatorySetupNotComplete=Click here to setup mandatory parameters
 WarningEnableYourModulesApplications=Click here to enable your modules and applications
diff --git a/htdocs/langs/hu_HU/main.lang b/htdocs/langs/hu_HU/main.lang
index 0f997f74480..c94e91f20af 100644
--- a/htdocs/langs/hu_HU/main.lang
+++ b/htdocs/langs/hu_HU/main.lang
@@ -445,6 +445,7 @@ ContactsAddressesForCompany=Kapcsolat/cím ehhez a harmadik félhez
 AddressesForCompany=Cím ehhez a harmadik félhez
 ActionsOnCompany=Events for this third party
 ActionsOnContact=Events for this contact/address
+ActionsOnContract=Events for this contract
 ActionsOnMember=Események ezzel a taggal kapcsolatban
 ActionsOnProduct=Events about this product
 NActionsLate=%s késés
@@ -759,6 +760,7 @@ LinkToSupplierProposal=Link to vendor proposal
 LinkToSupplierInvoice=Link to vendor invoice
 LinkToContract=Link to contract
 LinkToIntervention=Link to intervention
+LinkToTicket=Link to ticket
 CreateDraft=Tervezet készítése
 SetToDraft=Vissza a vázlathoz
 ClickToEdit=Kattintson a szerkesztéshez
diff --git a/htdocs/langs/hu_HU/products.lang b/htdocs/langs/hu_HU/products.lang
index 4045450ea37..d60bbc8519c 100644
--- a/htdocs/langs/hu_HU/products.lang
+++ b/htdocs/langs/hu_HU/products.lang
@@ -2,6 +2,7 @@
 ProductRef=Termék ref#.
 ProductLabel=Termék neve
 ProductLabelTranslated=Translated product label
+ProductDescription=Product description
 ProductDescriptionTranslated=Translated product description
 ProductNoteTranslated=Translated product note
 ProductServiceCard=Termék/Szolgáltatás kártya
diff --git a/htdocs/langs/hu_HU/stripe.lang b/htdocs/langs/hu_HU/stripe.lang
index 224c4a49612..436eed8920c 100644
--- a/htdocs/langs/hu_HU/stripe.lang
+++ b/htdocs/langs/hu_HU/stripe.lang
@@ -65,3 +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>
diff --git a/htdocs/langs/hu_HU/withdrawals.lang b/htdocs/langs/hu_HU/withdrawals.lang
index 1455787b6b5..0c3d5001cc4 100644
--- a/htdocs/langs/hu_HU/withdrawals.lang
+++ b/htdocs/langs/hu_HU/withdrawals.lang
@@ -76,7 +76,8 @@ WithdrawalFile=Withdrawal file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and will classify them as "Paid" if remain to pay is null
 StatisticsByLineStatus=Statistics by status of lines
-RUM=UMR
+RUM=Unique Mandate Reference (UMR)
+DateRUM=Mandate signature date
 RUMLong=Unique Mandate Reference
 RUMWillBeGenerated=If empty, a UMR (Unique Mandate Reference) will be generated once the bank account information is saved.
 WithdrawMode=Direct debit mode (FRST or RECUR)
diff --git a/htdocs/langs/id_ID/accountancy.lang b/htdocs/langs/id_ID/accountancy.lang
index e54efc59469..59a863574ff 100644
--- a/htdocs/langs/id_ID/accountancy.lang
+++ b/htdocs/langs/id_ID/accountancy.lang
@@ -265,7 +265,7 @@ AccountingJournals=Accounting journals
 AccountingJournal=Accounting journal
 NewAccountingJournal=New accounting journal
 ShowAccoutingJournal=Show accounting journal
-Nature=Nature
+NatureOfJournal=Nature of Journal
 AccountingJournalType1=Miscellaneous operations
 AccountingJournalType2=Sales
 AccountingJournalType3=Purchases
@@ -291,6 +291,7 @@ Modelcsv_quadratus=Export for Quadratus QuadraCompta
 Modelcsv_ebp=Export for EBP
 Modelcsv_cogilog=Export for Cogilog
 Modelcsv_agiris=Export for Agiris
+Modelcsv_LDCompta=Export for LD Compta (v9 & higher) (Test)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
@@ -301,7 +302,7 @@ ChartofaccountsId=Chart of accounts Id
 InitAccountancy=init akuntansi
 InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accounting account defined for sales and purchases.
 DefaultBindingDesc=This page can be used to set a default account to use to link transactions record about payment salaries, donation, taxes and vat when no specific accounting account were already set.
-DefaultClosureDesc=This page can be used to set parameters to use to enclose a balance sheet.
+DefaultClosureDesc=This page can be used to set parameters used for accounting closures.
 Options=Pilihan
 OptionModeProductSell=Mode penjualan
 OptionModeProductSellIntra=Mode sales exported in EEC
diff --git a/htdocs/langs/id_ID/admin.lang b/htdocs/langs/id_ID/admin.lang
index 122aa5382fb..1ef3844c9e5 100644
--- a/htdocs/langs/id_ID/admin.lang
+++ b/htdocs/langs/id_ID/admin.lang
@@ -574,7 +574,7 @@ Module510Name=Gaji
 Module510Desc=Record and track employee payments
 Module520Name=Loans
 Module520Desc=Management of loans
-Module600Name=Notifikasi
+Module600Name=Notifications on business event
 Module600Desc=Send email notifications triggered by a business event: per user (setup defined on each user), per third-party contacts (setup defined on each third party) or by specific emails
 Module600Long=Note that this module sends emails in real-time when a specific business event occurs. If you are looking for a feature to send email reminders for agenda events, go into the setup of module Agenda.
 Module610Name=Product Variants
@@ -1193,6 +1193,7 @@ ExtraFieldsSupplierOrders=Complementary attributes (orders)
 ExtraFieldsSupplierInvoices=Complementary attributes (invoices)
 ExtraFieldsProject=Complementary attributes (projects)
 ExtraFieldsProjectTask=Complementary attributes (tasks)
+ExtraFieldsSalaries=Complementary attributes (salaries)
 ExtraFieldHasWrongValue=Attribute %s has a wrong value.
 AlphaNumOnlyLowerCharsAndNoSpace=only alphanumericals and lower case characters without space
 SendmailOptionNotComplete=Warning, on some Linux systems, to send email from your email, sendmail execution setup must contains option -ba (parameter mail.force_extra_parameters into your php.ini file). If some recipients never receive emails, try to edit this PHP parameter with mail.force_extra_parameters = -ba).
@@ -1220,13 +1221,14 @@ SuhosinSessionEncrypt=Session storage encrypted by Suhosin
 ConditionIsCurrently=Condition is currently %s
 YouUseBestDriver=You use driver %s which is the best driver currently available.
 YouDoNotUseBestDriver=You use driver %s but driver %s is recommended.
-NbOfProductIsLowerThanNoPb=You have only %s products/services in the database. This does not require any particular optimization.
+NbOfObjectIsLowerThanNoPb=You have only %s %s in the database. This does not require any particular optimization.
 SearchOptim=Search optimization
-YouHaveXProductUseSearchOptim=You have %s products in the database. You should add the constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+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.
 BrowserIsOK=You are using the %s web browser. This browser is ok for security and performance.
 BrowserIsKO=You are using the %s web browser. This browser is known to be a bad choice for security, performance and reliability. We recommend using Firefox, Chrome, Opera or Safari.
-XDebugInstalled=XDebug is loaded.
-XCacheInstalled=XCache is loaded.
+PHPModuleLoaded=PHP component %s is loaded
+PreloadOPCode=Preloaded OPCode is used
 AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.<br>Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp".
 AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".
 AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties.
@@ -1734,9 +1736,9 @@ ExpenseReportsRulesSetup=Setup of module Expense Reports - Rules
 ExpenseReportNumberingModules=Expense reports numbering module
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
 YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for email notifications by enabling and configuring the module "Notification".
-ListOfNotificationsPerUser=List of notifications per user*
-ListOfNotificationsPerUserOrContact=List of notifications (events) available per user* or per contact**
-ListOfFixedNotifications=List of Fixed Notifications
+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
 GoOntoUserCardToAddMore=Go to the tab "Notifications" of a user to add or remove notifications for users
 GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
 Threshold=Threshold
@@ -1898,6 +1900,11 @@ OnMobileOnly=On small screen (smartphone) only
 DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be Prospect or Customer but can't be both)
 MAIN_OPTIMIZEFORTEXTBROWSER=Simplify interface for blind person
 MAIN_OPTIMIZEFORTEXTBROWSERDesc=Enable this option if you are a blind person, or if you use the application from a text browser like Lynx or 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
 ThisValueCanOverwrittenOnUserLevel=This value can be overwritten by each user from its user page - tab '%s'
 DefaultCustomerType=Default thirdparty type for "New customer" creation form
 ABankAccountMustBeDefinedOnPaymentModeSetup=Note: The bank account must be defined on the module of each payment mode (Paypal, Stripe, ...) to have this feature working.
@@ -1911,7 +1918,7 @@ LogsLinesNumber=Number of lines to show on logs tab
 UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
-DebugBarModuleActivated=Module debugbar is activated and slows dramaticaly the interface
+ModuleActivated=Module %s is activated and slows the interface
 EXPORTS_SHARE_MODELS=Export models are share with everybody
 ExportSetup=Setup of module Export
 InstanceUniqueID=Unique ID of the instance
@@ -1928,3 +1935,5 @@ 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
diff --git a/htdocs/langs/id_ID/bills.lang b/htdocs/langs/id_ID/bills.lang
index 81ec0d98abc..f59b569b7f2 100644
--- a/htdocs/langs/id_ID/bills.lang
+++ b/htdocs/langs/id_ID/bills.lang
@@ -95,6 +95,7 @@ PaymentHigherThanReminderToPay=Pengingat untuk pembayaran yang lebih tinggi
 HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess received for each overpaid invoice.
 HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess paid for each overpaid invoice.
 ClassifyPaid=Menggolongkan 'Telah dibayar'
+ClassifyUnPaid=Classify 'Unpaid'
 ClassifyPaidPartially=Menggolongkan 'Telah dibayarkan sebagian'
 ClassifyCanceled=Menggolongkan 'Ditinggalkan'
 ClassifyClosed=Menggolongkan 'Ditutup'
@@ -214,6 +215,20 @@ ShowInvoiceReplace=Show replacing invoice
 ShowInvoiceAvoir=Show credit note
 ShowInvoiceDeposit=Show down payment invoice
 ShowInvoiceSituation=Show situation invoice
+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
 ShowPayment=Show payment
 AlreadyPaid=Already paid
 AlreadyPaidBack=Already paid back
diff --git a/htdocs/langs/id_ID/errors.lang b/htdocs/langs/id_ID/errors.lang
index b5a9d70cb70..1ee46fdbb92 100644
--- a/htdocs/langs/id_ID/errors.lang
+++ b/htdocs/langs/id_ID/errors.lang
@@ -90,7 +90,7 @@ ErrorSpecialCharNotAllowedForField=Special characters are not allowed for field
 ErrorNumRefModel=A reference exists into database (%s) and is not compatible with this numbering rule. Remove record or renamed reference to activate this module.
 ErrorQtyTooLowForThisSupplier=Quantity too low for this vendor or no price defined on this product for this vendor
 ErrorOrdersNotCreatedQtyTooLow=Some orders haven't been created because of too-low quantities
-ErrorModuleSetupNotComplete=Setup of module looks to be uncomplete. Go on Home - Setup - Modules to complete.
+ErrorModuleSetupNotComplete=Setup of module %s looks to be uncomplete. Go on Home - Setup - Modules to complete.
 ErrorBadMask=Error on mask
 ErrorBadMaskFailedToLocatePosOfSequence=Error, mask without sequence number
 ErrorBadMaskBadRazMonth=Error, bad reset value
@@ -219,6 +219,7 @@ 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.
 # 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.
 WarningMandatorySetupNotComplete=Click here to setup mandatory parameters
 WarningEnableYourModulesApplications=Click here to enable your modules and applications
diff --git a/htdocs/langs/id_ID/main.lang b/htdocs/langs/id_ID/main.lang
index 9a83f1a851e..b294092f3c7 100644
--- a/htdocs/langs/id_ID/main.lang
+++ b/htdocs/langs/id_ID/main.lang
@@ -445,6 +445,7 @@ ContactsAddressesForCompany=Contacts/addresses for this third party
 AddressesForCompany=Addresses for this third party
 ActionsOnCompany=Events for this third party
 ActionsOnContact=Events for this contact/address
+ActionsOnContract=Events for this contract
 ActionsOnMember=Events about this member
 ActionsOnProduct=Events about this product
 NActionsLate=%s late
@@ -759,6 +760,7 @@ LinkToSupplierProposal=Link to vendor proposal
 LinkToSupplierInvoice=Link to vendor invoice
 LinkToContract=Link to contract
 LinkToIntervention=Link to intervention
+LinkToTicket=Link to ticket
 CreateDraft=Create draft
 SetToDraft=Back to draft
 ClickToEdit=Click to edit
diff --git a/htdocs/langs/id_ID/products.lang b/htdocs/langs/id_ID/products.lang
index e36e3d80ff7..35807138810 100644
--- a/htdocs/langs/id_ID/products.lang
+++ b/htdocs/langs/id_ID/products.lang
@@ -2,6 +2,7 @@
 ProductRef=Item ref.
 ProductLabel=Item label
 ProductLabelTranslated=Translated product label
+ProductDescription=Product description
 ProductDescriptionTranslated=Translated product description
 ProductNoteTranslated=Translated product note
 ProductServiceCard=Products/Services card
diff --git a/htdocs/langs/id_ID/stripe.lang b/htdocs/langs/id_ID/stripe.lang
index 7a3389f34b7..c5224982873 100644
--- a/htdocs/langs/id_ID/stripe.lang
+++ b/htdocs/langs/id_ID/stripe.lang
@@ -65,3 +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>
diff --git a/htdocs/langs/id_ID/withdrawals.lang b/htdocs/langs/id_ID/withdrawals.lang
index a243902eaf8..eddea5d8abc 100644
--- a/htdocs/langs/id_ID/withdrawals.lang
+++ b/htdocs/langs/id_ID/withdrawals.lang
@@ -76,7 +76,8 @@ WithdrawalFile=Withdrawal file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and will classify them as "Paid" if remain to pay is null
 StatisticsByLineStatus=Statistics by status of lines
-RUM=UMR
+RUM=Unique Mandate Reference (UMR)
+DateRUM=Mandate signature date
 RUMLong=Unique Mandate Reference
 RUMWillBeGenerated=If empty, a UMR (Unique Mandate Reference) will be generated once the bank account information is saved.
 WithdrawMode=Direct debit mode (FRST or RECUR)
diff --git a/htdocs/langs/is_IS/accountancy.lang b/htdocs/langs/is_IS/accountancy.lang
index 54ec9883ec9..c567b93094e 100644
--- a/htdocs/langs/is_IS/accountancy.lang
+++ b/htdocs/langs/is_IS/accountancy.lang
@@ -265,7 +265,7 @@ AccountingJournals=Accounting journals
 AccountingJournal=Accounting journal
 NewAccountingJournal=New accounting journal
 ShowAccoutingJournal=Show accounting journal
-Nature=Náttúra
+NatureOfJournal=Nature of Journal
 AccountingJournalType1=Miscellaneous operations
 AccountingJournalType2=Velta
 AccountingJournalType3=Innkaup
@@ -291,6 +291,7 @@ Modelcsv_quadratus=Export for Quadratus QuadraCompta
 Modelcsv_ebp=Export for EBP
 Modelcsv_cogilog=Export for Cogilog
 Modelcsv_agiris=Export for Agiris
+Modelcsv_LDCompta=Export for LD Compta (v9 & higher) (Test)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
@@ -301,7 +302,7 @@ ChartofaccountsId=Chart of accounts Id
 InitAccountancy=Init accountancy
 InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accounting account defined for sales and purchases.
 DefaultBindingDesc=This page can be used to set a default account to use to link transactions record about payment salaries, donation, taxes and vat when no specific accounting account were already set.
-DefaultClosureDesc=This page can be used to set parameters to use to enclose a balance sheet.
+DefaultClosureDesc=This page can be used to set parameters used for accounting closures.
 Options=Options
 OptionModeProductSell=Mode sales
 OptionModeProductSellIntra=Mode sales exported in EEC
diff --git a/htdocs/langs/is_IS/admin.lang b/htdocs/langs/is_IS/admin.lang
index 7deb68bf5a0..fcda617c4b1 100644
--- a/htdocs/langs/is_IS/admin.lang
+++ b/htdocs/langs/is_IS/admin.lang
@@ -574,7 +574,7 @@ Module510Name=Salaries
 Module510Desc=Record and track employee payments
 Module520Name=Loans
 Module520Desc=Management of loans
-Module600Name=Tilkynningar
+Module600Name=Notifications on business event
 Module600Desc=Send email notifications triggered by a business event: per user (setup defined on each user), per third-party contacts (setup defined on each third party) or by specific emails
 Module600Long=Note that this module sends emails in real-time when a specific business event occurs. If you are looking for a feature to send email reminders for agenda events, go into the setup of module Agenda.
 Module610Name=Product Variants
@@ -1193,6 +1193,7 @@ ExtraFieldsSupplierOrders=Complementary attributes (orders)
 ExtraFieldsSupplierInvoices=Complementary attributes (invoices)
 ExtraFieldsProject=Complementary attributes (projects)
 ExtraFieldsProjectTask=Complementary attributes (tasks)
+ExtraFieldsSalaries=Complementary attributes (salaries)
 ExtraFieldHasWrongValue=Attribute %s has a wrong value.
 AlphaNumOnlyLowerCharsAndNoSpace=only alphanumericals and lower case characters without space
 SendmailOptionNotComplete=Aðvörun, á sumum Linux kerfi, að senda tölvupóst úr bréfinu, sendu mail framkvæmd skipulag verður conatins valkostur-BA (breytu mail.force_extra_parameters í skrá php.ini þinn). Ef viðtakendur eru margir aldrei fá tölvupóst, reyna að breyta þessari PHP breytu með mail.force_extra_parameters =-BA).
@@ -1220,13 +1221,14 @@ SuhosinSessionEncrypt=Session storage encrypted by Suhosin
 ConditionIsCurrently=Condition is currently %s
 YouUseBestDriver=You use driver %s which is the best driver currently available.
 YouDoNotUseBestDriver=You use driver %s but driver %s is recommended.
-NbOfProductIsLowerThanNoPb=You have only %s products/services in the database. This does not require any particular optimization.
+NbOfObjectIsLowerThanNoPb=You have only %s %s in the database. This does not require any particular optimization.
 SearchOptim=Search optimization
-YouHaveXProductUseSearchOptim=You have %s products in the database. You should add the constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+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.
 BrowserIsOK=You are using the %s web browser. This browser is ok for security and performance.
 BrowserIsKO=You are using the %s web browser. This browser is known to be a bad choice for security, performance and reliability. We recommend using Firefox, Chrome, Opera or Safari.
-XDebugInstalled=XDebug is loaded.
-XCacheInstalled=XCache is loaded.
+PHPModuleLoaded=PHP component %s is loaded
+PreloadOPCode=Preloaded OPCode is used
 AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.<br>Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp".
 AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".
 AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties.
@@ -1734,9 +1736,9 @@ ExpenseReportsRulesSetup=Setup of module Expense Reports - Rules
 ExpenseReportNumberingModules=Expense reports numbering module
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
 YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for email notifications by enabling and configuring the module "Notification".
-ListOfNotificationsPerUser=List of notifications per user*
-ListOfNotificationsPerUserOrContact=List of notifications (events) available per user* or per contact**
-ListOfFixedNotifications=List of Fixed Notifications
+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
 GoOntoUserCardToAddMore=Go to the tab "Notifications" of a user to add or remove notifications for users
 GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
 Threshold=Threshold
@@ -1898,6 +1900,11 @@ OnMobileOnly=On small screen (smartphone) only
 DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be Prospect or Customer but can't be both)
 MAIN_OPTIMIZEFORTEXTBROWSER=Simplify interface for blind person
 MAIN_OPTIMIZEFORTEXTBROWSERDesc=Enable this option if you are a blind person, or if you use the application from a text browser like Lynx or 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
 ThisValueCanOverwrittenOnUserLevel=This value can be overwritten by each user from its user page - tab '%s'
 DefaultCustomerType=Default thirdparty type for "New customer" creation form
 ABankAccountMustBeDefinedOnPaymentModeSetup=Note: The bank account must be defined on the module of each payment mode (Paypal, Stripe, ...) to have this feature working.
@@ -1911,7 +1918,7 @@ LogsLinesNumber=Number of lines to show on logs tab
 UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
-DebugBarModuleActivated=Module debugbar is activated and slows dramaticaly the interface
+ModuleActivated=Module %s is activated and slows the interface
 EXPORTS_SHARE_MODELS=Export models are share with everybody
 ExportSetup=Setup of module Export
 InstanceUniqueID=Unique ID of the instance
@@ -1928,3 +1935,5 @@ 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
diff --git a/htdocs/langs/is_IS/bills.lang b/htdocs/langs/is_IS/bills.lang
index d4bcf37cc17..7c4b15c6d68 100644
--- a/htdocs/langs/is_IS/bills.lang
+++ b/htdocs/langs/is_IS/bills.lang
@@ -95,6 +95,7 @@ PaymentHigherThanReminderToPay=Greiðsla hærri en áminning að borga
 HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess received for each overpaid invoice.
 HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess paid for each overpaid invoice.
 ClassifyPaid=Flokka 'Greiddur'
+ClassifyUnPaid=Classify 'Unpaid'
 ClassifyPaidPartially=Flokka 'Greiddur hluta'
 ClassifyCanceled=Flokka 'Yfirgefinn'
 ClassifyClosed=Lokað Flokka '
@@ -214,6 +215,20 @@ ShowInvoiceReplace=Sýna skipta Reikningar
 ShowInvoiceAvoir=Sýna kredit athugið
 ShowInvoiceDeposit=Show down payment invoice
 ShowInvoiceSituation=Show situation invoice
+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
 ShowPayment=Sýna greiðslu
 AlreadyPaid=Þegar greitt
 AlreadyPaidBack=Already paid back
diff --git a/htdocs/langs/is_IS/errors.lang b/htdocs/langs/is_IS/errors.lang
index 0f5966e525c..eef5defc668 100644
--- a/htdocs/langs/is_IS/errors.lang
+++ b/htdocs/langs/is_IS/errors.lang
@@ -90,7 +90,7 @@ ErrorSpecialCharNotAllowedForField=Sérstafir eru ekki leyfðar í reitinn " %s
 ErrorNumRefModel=Vísun til staðar í gagnagrunninum ( %s ) og er ekki með þessari tala reglu. Fjarlægja færslu eða endurnefna þær tilvísun til að virkja þessa einingu.
 ErrorQtyTooLowForThisSupplier=Quantity too low for this vendor or no price defined on this product for this vendor
 ErrorOrdersNotCreatedQtyTooLow=Some orders haven't been created because of too-low quantities
-ErrorModuleSetupNotComplete=Setup of module looks to be uncomplete. Go on Home - Setup - Modules to complete.
+ErrorModuleSetupNotComplete=Setup of module %s looks to be uncomplete. Go on Home - Setup - Modules to complete.
 ErrorBadMask=Villa á grímu
 ErrorBadMaskFailedToLocatePosOfSequence=Villa, gríma án fjölda röð
 ErrorBadMaskBadRazMonth=Villa, slæmt endurstilla gildi
@@ -219,6 +219,7 @@ 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.
 # 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.
 WarningMandatorySetupNotComplete=Click here to setup mandatory parameters
 WarningEnableYourModulesApplications=Click here to enable your modules and applications
diff --git a/htdocs/langs/is_IS/main.lang b/htdocs/langs/is_IS/main.lang
index 14b355fae1d..8e128f16e1f 100644
--- a/htdocs/langs/is_IS/main.lang
+++ b/htdocs/langs/is_IS/main.lang
@@ -445,6 +445,7 @@ ContactsAddressesForCompany=Contacts/addresses for this third party
 AddressesForCompany=Addresses for this third party
 ActionsOnCompany=Events for this third party
 ActionsOnContact=Events for this contact/address
+ActionsOnContract=Events for this contract
 ActionsOnMember=Viðburðir um þennan notanda
 ActionsOnProduct=Events about this product
 NActionsLate=%s  seint
@@ -759,6 +760,7 @@ LinkToSupplierProposal=Link to vendor proposal
 LinkToSupplierInvoice=Link to vendor invoice
 LinkToContract=Link to contract
 LinkToIntervention=Link to intervention
+LinkToTicket=Link to ticket
 CreateDraft=Búa til drög
 SetToDraft=Back to draft
 ClickToEdit=Smelltu til að breyta
diff --git a/htdocs/langs/is_IS/products.lang b/htdocs/langs/is_IS/products.lang
index 563abacb975..84eddde13a9 100644
--- a/htdocs/langs/is_IS/products.lang
+++ b/htdocs/langs/is_IS/products.lang
@@ -2,6 +2,7 @@
 ProductRef=Vara dómari.
 ProductLabel=Merkimiða vöru
 ProductLabelTranslated=Translated product label
+ProductDescription=Product description
 ProductDescriptionTranslated=Translated product description
 ProductNoteTranslated=Translated product note
 ProductServiceCard=Vörur / Þjónusta kort
diff --git a/htdocs/langs/is_IS/stripe.lang b/htdocs/langs/is_IS/stripe.lang
index 434ccddb77c..5d320f9ed1a 100644
--- a/htdocs/langs/is_IS/stripe.lang
+++ b/htdocs/langs/is_IS/stripe.lang
@@ -65,3 +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>
diff --git a/htdocs/langs/is_IS/withdrawals.lang b/htdocs/langs/is_IS/withdrawals.lang
index dafb7abf728..e934164fafa 100644
--- a/htdocs/langs/is_IS/withdrawals.lang
+++ b/htdocs/langs/is_IS/withdrawals.lang
@@ -76,7 +76,8 @@ WithdrawalFile=Withdrawal file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and will classify them as "Paid" if remain to pay is null
 StatisticsByLineStatus=Statistics by status of lines
-RUM=UMR
+RUM=Unique Mandate Reference (UMR)
+DateRUM=Mandate signature date
 RUMLong=Unique Mandate Reference
 RUMWillBeGenerated=If empty, a UMR (Unique Mandate Reference) will be generated once the bank account information is saved.
 WithdrawMode=Direct debit mode (FRST or RECUR)
diff --git a/htdocs/langs/it_IT/accountancy.lang b/htdocs/langs/it_IT/accountancy.lang
index 49e09d6bed2..d94debdc2fd 100644
--- a/htdocs/langs/it_IT/accountancy.lang
+++ b/htdocs/langs/it_IT/accountancy.lang
@@ -265,7 +265,7 @@ AccountingJournals=Libri contabili
 AccountingJournal=Accounting journal
 NewAccountingJournal=New accounting journal
 ShowAccoutingJournal=Mostra diario contabile
-Nature=Natura
+NatureOfJournal=Nature of Journal
 AccountingJournalType1=Miscellaneous operations
 AccountingJournalType2=Vendite
 AccountingJournalType3=Acquisti
@@ -291,6 +291,7 @@ Modelcsv_quadratus=Export for Quadratus QuadraCompta
 Modelcsv_ebp=Export for EBP
 Modelcsv_cogilog=Export for Cogilog
 Modelcsv_agiris=Export for Agiris
+Modelcsv_LDCompta=Export for LD Compta (v9 & higher) (Test)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
@@ -301,7 +302,7 @@ ChartofaccountsId=Id Piano dei Conti
 InitAccountancy=Inizializza contabilità
 InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accounting account defined for sales and purchases.
 DefaultBindingDesc=This page can be used to set a default account to use to link transactions record about payment salaries, donation, taxes and vat when no specific accounting account were already set.
-DefaultClosureDesc=This page can be used to set parameters to use to enclose a balance sheet.
+DefaultClosureDesc=This page can be used to set parameters used for accounting closures.
 Options=Opzioni
 OptionModeProductSell=Modalità vendita
 OptionModeProductSellIntra=Mode sales exported in EEC
diff --git a/htdocs/langs/it_IT/admin.lang b/htdocs/langs/it_IT/admin.lang
index 61af6b824bb..690abd0b4c7 100644
--- a/htdocs/langs/it_IT/admin.lang
+++ b/htdocs/langs/it_IT/admin.lang
@@ -508,7 +508,7 @@ Module22Name=Mass Emailings
 Module22Desc=Manage bulk emailing
 Module23Name=Energia
 Module23Desc=Monitoraggio del consumo energetico
-Module25Name=Sales Orders
+Module25Name=Ordini Cliente
 Module25Desc=Sales order management
 Module30Name=Fatture
 Module30Desc=Management of invoices and credit notes for customers. Management of invoices and credit notes for suppliers
@@ -574,7 +574,7 @@ Module510Name=Stipendi
 Module510Desc=Record and track employee payments
 Module520Name=Prestiti
 Module520Desc=Gestione dei prestiti
-Module600Name=Notifiche
+Module600Name=Notifications on business event
 Module600Desc=Send email notifications triggered by a business event: per user (setup defined on each user), per third-party contacts (setup defined on each third party) or by specific emails
 Module600Long=Note that this module sends emails in real-time when a specific business event occurs. If you are looking for a feature to send email reminders for agenda events, go into the setup of module Agenda.
 Module610Name=Varianti prodotto
@@ -871,7 +871,7 @@ Permission1237=Export purchase orders and their details
 Permission1251=Eseguire importazioni di massa di dati esterni nel database (data load)
 Permission1321=Esportare fatture attive, attributi e pagamenti
 Permission1322=Riaprire le fatture pagate
-Permission1421=Export sales orders and attributes
+Permission1421=Esporta Ordini Cliente e attributi
 Permission2401=Vedere azioni (eventi o compiti) personali
 Permission2402=Creare/modificare azioni (eventi o compiti) personali
 Permission2403=Cancellare azioni (eventi o compiti) personali
@@ -958,7 +958,7 @@ DictionarySource=Origine delle proposte/ordini
 DictionaryAccountancyCategory=Personalized groups for reports
 DictionaryAccountancysystem=Modelli per piano dei conti
 DictionaryAccountancyJournal=Libri contabili
-DictionaryEMailTemplates=Email Templates
+DictionaryEMailTemplates=Modelli e-mail
 DictionaryUnits=Unità
 DictionaryMeasuringUnits=Unità di misura
 DictionaryProspectStatus=Stato cliente potenziale
@@ -1090,10 +1090,10 @@ Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Pending bank reconciliation
 Delays_MAIN_DELAY_MEMBERS=Delayed membership fee
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Check deposit not done
 Delays_MAIN_DELAY_EXPENSEREPORTS=Expense report to approve
-SetupDescription1=Before starting to use Dolibarr some initial parameters must be defined and modules enabled/configured.
-SetupDescription2=The following two sections are mandatory (the two first entries in the Setup menu):
-SetupDescription3=<a href="%s">%s -> %s</a><br>Basic parameters used to customize the default behavior of your application (e.g for country-related features).
-SetupDescription4=<a href="%s">%s -> %s</a><br>This software is a suite of many modules/applications, all more or less independent. The modules relevant to your needs must be enabled and configured. New items/options are added to menus with the activation of a module.
+SetupDescription1=Prima di iniziare ad utilizzare Dolibarr si devono definire alcuni parametri iniziali ed abilitare/configurare i moduli.
+SetupDescription2=Le 2 seguenti sezioni sono obbligatorie (le prime 2 sezioni nel menu Impostazioni):
+SetupDescription3=<a href="%s">%s -> %s</a><br>Parametri di base utilizzati per personalizzare il comportamento predefinito della tua applicazione (es: caratteristiche relative alla nazione).
+SetupDescription4=<a href="%s">%s -> %s</a><br>Questo software è una suite composta da molteplici moduli/applicazioni, tutti più o meno indipendenti. I moduli rilevanti per le tue necessità devono essere abilitati e configurati. Nuovi oggetti/opzioni vengono aggiunti ai menu quando un modulo viene attivato.
 SetupDescription5=Other Setup menu entries manage optional parameters.
 LogEvents=Eventi di audit di sicurezza
 Audit=Audit
@@ -1193,6 +1193,7 @@ ExtraFieldsSupplierOrders=Attributi Complementari (ordini)
 ExtraFieldsSupplierInvoices=Attributi Complementari (fatture)
 ExtraFieldsProject=Attributi Complementari (progetti)
 ExtraFieldsProjectTask=Attributi Complementari (attività)
+ExtraFieldsSalaries=Complementary attributes (salaries)
 ExtraFieldHasWrongValue=L'attributo %s ha un valore errato.
 AlphaNumOnlyLowerCharsAndNoSpace=only alphanumericals and lower case characters without space
 SendmailOptionNotComplete=Attenzione: su alcuni sistemi Linux, per poter inviare email, la configurazione di sendmail deve contenere l'opzione -ba (il parametro mail.force_extra_parameters nel file php.ini). Se alcuni destinatari non ricevono messaggi di posta elettronica, provate a modificare questo parametro con mail.force_extra_parameters =-BA).
@@ -1220,13 +1221,14 @@ SuhosinSessionEncrypt=Sessioni salvate con criptazione tramite Suhosin
 ConditionIsCurrently=La condizione corrente è %s
 YouUseBestDriver=You use driver %s which is the best driver currently available.
 YouDoNotUseBestDriver=You use driver %s but driver %s is recommended.
-NbOfProductIsLowerThanNoPb=You have only %s products/services in the database. This does not require any particular optimization.
+NbOfObjectIsLowerThanNoPb=You have only %s %s in the database. This does not require any particular optimization.
 SearchOptim=Ottimizzazione della ricerca
-YouHaveXProductUseSearchOptim=You have %s products in the database. You should add the constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+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.
 BrowserIsOK=You are using the %s web browser. This browser is ok for security and performance.
 BrowserIsKO=You are using the %s web browser. This browser is known to be a bad choice for security, performance and reliability. We recommend using Firefox, Chrome, Opera or Safari.
-XDebugInstalled=XDebug caricato
-XCacheInstalled=XCache attivato
+PHPModuleLoaded=PHP component %s is loaded
+PreloadOPCode=Preloaded OPCode is used
 AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.<br>Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp".
 AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".
 AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties.
@@ -1302,7 +1304,7 @@ WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Ask for Warehouse Source for order
 ##### Suppliers Orders #####
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of purchase order
 ##### Orders #####
-OrdersSetup=Sales Orders management setup
+OrdersSetup=Impostazione gestione Ordini Cliente
 OrdersNumberingModules=Modelli di numerazione ordini
 OrdersModelModule=Modelli per ordini in pdf
 FreeLegalTextOnOrders=Testo libero sugli ordini
@@ -1734,9 +1736,9 @@ ExpenseReportsRulesSetup=Setup of module Expense Reports - Rules
 ExpenseReportNumberingModules=Expense reports numbering module
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
 YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for email notifications by enabling and configuring the module "Notification".
-ListOfNotificationsPerUser=Lista notifiche per utente
-ListOfNotificationsPerUserOrContact=List of notifications (events) available per user* or per contact**
-ListOfFixedNotifications=List of Fixed Notifications
+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
 GoOntoUserCardToAddMore=Go to the tab "Notifications" of a user to add or remove notifications for users
 GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
 Threshold=Soglia
@@ -1781,13 +1783,13 @@ ExpectedChecksum=Checksum previsto
 CurrentChecksum=Checksum attuale
 ForcedConstants=E' richiesto un valore costante
 MailToSendProposal=Proposte del cliente
-MailToSendOrder=Sales orders
+MailToSendOrder=Ordini Cliente
 MailToSendInvoice=Fatture attive
 MailToSendShipment=Spedizioni
 MailToSendIntervention=Interventi
 MailToSendSupplierRequestForQuotation=Richiesta di preventivo
 MailToSendSupplierOrder=Ordini d'acquisto
-MailToSendSupplierInvoice=Fatture fornitore
+MailToSendSupplierInvoice=Fatture Fornitore
 MailToSendContract=Contratti
 MailToThirdparty=Soggetti terzi
 MailToMember=Membri
@@ -1875,8 +1877,8 @@ NoNewEmailToProcess=No new email (matching filters) to process
 NothingProcessed=Nothing done
 XEmailsDoneYActionsDone=%s emails qualified, %s emails successfully processed (for %s record/actions done)
 RecordEvent=Record email event
-CreateLeadAndThirdParty=Create lead (and third party if necessary)
-CreateTicketAndThirdParty=Create ticket (and third party if necessary)
+CreateLeadAndThirdParty=Crea Opportunità (e Soggetto terzo se necessario)
+CreateTicketAndThirdParty=Crea Ticket (e Soggetto terzo se necessario)
 CodeLastResult=Ultimo codice risultato
 NbOfEmailsInInbox=Number of emails in source directory
 LoadThirdPartyFromName=Load third party searching on %s (load only)
@@ -1898,6 +1900,11 @@ OnMobileOnly=On small screen (smartphone) only
 DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be Prospect or Customer but can't be both)
 MAIN_OPTIMIZEFORTEXTBROWSER=Simplify interface for blind person
 MAIN_OPTIMIZEFORTEXTBROWSERDesc=Enable this option if you are a blind person, or if you use the application from a text browser like Lynx or 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
 ThisValueCanOverwrittenOnUserLevel=This value can be overwritten by each user from its user page - tab '%s'
 DefaultCustomerType=Default thirdparty type for "New customer" creation form
 ABankAccountMustBeDefinedOnPaymentModeSetup=Note: The bank account must be defined on the module of each payment mode (Paypal, Stripe, ...) to have this feature working.
@@ -1911,7 +1918,7 @@ LogsLinesNumber=Number of lines to show on logs tab
 UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
-DebugBarModuleActivated=Module debugbar is activated and slows dramaticaly the interface
+ModuleActivated=Module %s is activated and slows the interface
 EXPORTS_SHARE_MODELS=Export models are share with everybody
 ExportSetup=Setup of module Export
 InstanceUniqueID=Unique ID of the instance
@@ -1928,3 +1935,5 @@ 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
diff --git a/htdocs/langs/it_IT/bills.lang b/htdocs/langs/it_IT/bills.lang
index 4955a8a9598..6579fb17d2d 100644
--- a/htdocs/langs/it_IT/bills.lang
+++ b/htdocs/langs/it_IT/bills.lang
@@ -6,8 +6,8 @@ BillsCustomer=Fattura attive
 BillsSuppliers=Fatture fornitore
 BillsCustomersUnpaid=Fatture attive non pagate
 BillsCustomersUnpaidForCompany=Fatture attive non pagate per %s
-BillsSuppliersUnpaid=Unpaid vendor invoices
-BillsSuppliersUnpaidForCompany=Unpaid vendors invoices for %s
+BillsSuppliersUnpaid=Fatture Fornitore non pagate
+BillsSuppliersUnpaidForCompany=Fatture Fornitore non pagate per %s
 BillsLate=Ritardi nei pagamenti
 BillsStatistics=Statistiche fatture attive
 BillsStatisticsSuppliers=Vendors invoices statistics
@@ -54,7 +54,7 @@ InvoiceCustomer=Fattura attiva
 CustomerInvoice=Fattura attive
 CustomersInvoices=Fatture attive
 SupplierInvoice=Fattura fornitore
-SuppliersInvoices=Vendors invoices
+SuppliersInvoices=Fatture Fornitore
 SupplierBill=Fattura fornitore
 SupplierBills=Fatture passive
 Payment=Pagamento
@@ -95,6 +95,7 @@ PaymentHigherThanReminderToPay=Pagamento superiore alla rimanenza da pagare
 HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess received for each overpaid invoice.
 HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess paid for each overpaid invoice.
 ClassifyPaid=Classifica come "pagata"
+ClassifyUnPaid=Classify 'Unpaid'
 ClassifyPaidPartially=Classifica come "parzialmente pagata"
 ClassifyCanceled=Classifica come "abbandonata"
 ClassifyClosed=Classifica come "chiusa"
@@ -172,7 +173,7 @@ AllCustomerTemplateInvoices=Tutti i modelli delle fatture
 OtherBills=Altre fatture
 DraftBills=Fatture in bozza
 CustomersDraftInvoices=Bozze di fatture attive
-SuppliersDraftInvoices=Vendor draft invoices
+SuppliersDraftInvoices=Fatture Fornitore in bozza
 Unpaid=Non pagato
 ConfirmDeleteBill=Vuoi davvero cancellare questa fattura?
 ConfirmValidateBill=Vuoi davvero convalidare questa fattura con riferimento <b>%s</b>?
@@ -214,6 +215,20 @@ ShowInvoiceReplace=Visualizza la fattura sostitutiva
 ShowInvoiceAvoir=Visualizza nota di credito
 ShowInvoiceDeposit=Mostra fattura d'acconto
 ShowInvoiceSituation=Mostra avanzamento lavori
+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
 ShowPayment=Visualizza pagamento
 AlreadyPaid=Già pagato
 AlreadyPaidBack=Già rimborsato
@@ -248,7 +263,7 @@ DateInvoice=Data di fatturazione
 DatePointOfTax=Punto di imposta
 NoInvoice=Nessuna fattura
 ClassifyBill=Classificazione fattura
-SupplierBillsToPay=Unpaid vendor invoices
+SupplierBillsToPay=Fatture Fornitore non pagate
 CustomerBillsUnpaid=Fatture attive non pagate
 NonPercuRecuperable=Non recuperabile
 SetConditions=Imposta Termini di Pagamento
diff --git a/htdocs/langs/it_IT/boxes.lang b/htdocs/langs/it_IT/boxes.lang
index 1879e9f03c1..3ed6053cd40 100644
--- a/htdocs/langs/it_IT/boxes.lang
+++ b/htdocs/langs/it_IT/boxes.lang
@@ -7,12 +7,12 @@ BoxLastProductsInContract=Ultimi %s prodotti/servizi contrattualizzati
 BoxLastSupplierBills=Latest Vendor invoices
 BoxLastCustomerBills=Latest Customer invoices
 BoxOldestUnpaidCustomerBills=Ultime fatture attive non pagate
-BoxOldestUnpaidSupplierBills=Oldest unpaid vendor invoices
+BoxOldestUnpaidSupplierBills=Fatture Fornitore non pagate più vecchie
 BoxLastProposals=Ultime proposte commerciali
 BoxLastProspects=Ultimi clienti potenziali modificati
 BoxLastCustomers=Ultimi clienti modificati
 BoxLastSuppliers=Ultimi fornitori modificati
-BoxLastCustomerOrders=Latest sales orders
+BoxLastCustomerOrders=Ultimi Ordini Cliente
 BoxLastActions=Ultime azioni
 BoxLastContracts=Ultimi contratti
 BoxLastContacts=Ultimi contatti/indirizzi
@@ -26,8 +26,8 @@ BoxTitleLastSuppliers=Ultimi %s ordini fornitore
 BoxTitleLastModifiedSuppliers=Fornitori: ultimi %s modificati
 BoxTitleLastModifiedCustomers=Clienti: ultimi %s modificati
 BoxTitleLastCustomersOrProspects=Ultimi %s clienti o potenziali clienti
-BoxTitleLastCustomerBills=Latest %s Customer invoices
-BoxTitleLastSupplierBills=Latest %s Vendor invoices
+BoxTitleLastCustomerBills=Ultime %s Fatture Cliente
+BoxTitleLastSupplierBills=Ultime %sFatture Fornitore
 BoxTitleLastModifiedProspects=Clienti potenziali: ultimi %s modificati
 BoxTitleLastModifiedMembers=Ultimi %s membri
 BoxTitleLastFicheInter=Ultimi %s interventi modificati
@@ -52,11 +52,11 @@ ClickToAdd=Clicca qui per aggiungere
 NoRecordedCustomers=Nessun cliente registrato
 NoRecordedContacts=Nessun contatto registrato
 NoActionsToDo=Nessuna azione da fare
-NoRecordedOrders=No recorded sales orders
+NoRecordedOrders=Nessun Ordine Cliente registrato
 NoRecordedProposals=Nessuna proposta registrata
 NoRecordedInvoices=Nessuna fattura attiva registrata
 NoUnpaidCustomerBills=Nessuna fattura attiva non pagata
-NoUnpaidSupplierBills=No unpaid vendor invoices
+NoUnpaidSupplierBills=Nessuna Fattura Fornitore non pagata
 NoModifiedSupplierBills=No recorded vendor invoices
 NoRecordedProducts=Nessun prodotto/servizio registrato
 NoRecordedProspects=Nessun potenziale cliente registrato
@@ -67,7 +67,7 @@ BoxLatestSupplierOrders=Latest purchase orders
 NoSupplierOrder=No recorded purchase order
 BoxCustomersInvoicesPerMonth=Fatture cliente al mese
 BoxSuppliersInvoicesPerMonth=Vendor Invoices per month
-BoxCustomersOrdersPerMonth=Sales Orders per month
+BoxCustomersOrdersPerMonth=Ordini Cliente per mese
 BoxSuppliersOrdersPerMonth=Vendor Orders per month
 BoxProposalsPerMonth=proposte al mese
 NoTooLowStockProducts=Nessun prodotto sotto la soglia minima di scorte
diff --git a/htdocs/langs/it_IT/companies.lang b/htdocs/langs/it_IT/companies.lang
index 556096c3565..e148e1d10ce 100644
--- a/htdocs/langs/it_IT/companies.lang
+++ b/htdocs/langs/it_IT/companies.lang
@@ -12,7 +12,7 @@ MenuNewSupplier=Nuovo fornitore
 MenuNewPrivateIndividual=Nuovo privato
 NewCompany=Nuova società (cliente, cliente potenziale, fornitore) 
 NewThirdParty=Nuovo soggetto terzo (cliente potenziale , cliente, fornitore) 
-CreateDolibarrThirdPartySupplier=Crea una terza parte (fornitore)
+CreateDolibarrThirdPartySupplier=Crea un Soggetto terzo (fornitore)
 CreateThirdPartyOnly=Crea soggetto terzo
 CreateThirdPartyAndContact=Crea un soggetto terzo + un contatto
 ProspectionArea=Area clienti potenziali
@@ -29,9 +29,9 @@ AliasNameShort=Pseudonimo
 Companies=Società
 CountryIsInEEC=Paese appartenente alla Comunità Economica Europea
 PriceFormatInCurrentLanguage=Price display format in the current language and currency
-ThirdPartyName=Third-party name
-ThirdPartyEmail=Third-party email
-ThirdParty=Third-party
+ThirdPartyName=Nome Soggetto terzo
+ThirdPartyEmail=e-mail Soggetto terzo
+ThirdParty=Soggetto terzo
 ThirdParties=Soggetti Terzi
 ThirdPartyProspects=Clienti potenziali
 ThirdPartyProspectsStats=Clienti potenziali
@@ -39,7 +39,7 @@ ThirdPartyCustomers=Clienti
 ThirdPartyCustomersStats=Clienti
 ThirdPartyCustomersWithIdProf12=Clienti con %s o %s
 ThirdPartySuppliers=Fornitori
-ThirdPartyType=Third-party type
+ThirdPartyType=Tipo di Soggetto terzo
 Individual=Privato
 ToCreateContactWithSameName=Will automatically create a contact/address with same information as the third party under the third party. In most cases, even if your third party is a physical person, creating a third party alone is enough.
 ParentCompany=Società madre
diff --git a/htdocs/langs/it_IT/errors.lang b/htdocs/langs/it_IT/errors.lang
index b27e9b572f4..4625655d891 100644
--- a/htdocs/langs/it_IT/errors.lang
+++ b/htdocs/langs/it_IT/errors.lang
@@ -23,7 +23,7 @@ ErrorFailToGenerateFile=Failed to generate file '<b>%s</b>'.
 ErrorThisContactIsAlreadyDefinedAsThisType=Questo contatto è già tra i contatti di questo tipo
 ErrorCashAccountAcceptsOnlyCashMoney=Questo conto corrente è un conto di cassa e accetta solo pagamenti in contanti.
 ErrorFromToAccountsMustDiffers=I conti bancari di origine e destinazione devono essere diversi.
-ErrorBadThirdPartyName=Bad value for third-party name
+ErrorBadThirdPartyName=Valore non valido per Nome Soggetto terzo
 ErrorProdIdIsMandatory=%s obbligatorio
 ErrorBadCustomerCodeSyntax=Sintassi del codice cliente errata
 ErrorBadBarCodeSyntax=Bad syntax for barcode. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned.
@@ -90,7 +90,7 @@ ErrorSpecialCharNotAllowedForField=I caratteri speciali non sono ammessi per il
 ErrorNumRefModel=Esiste un riferimento nel database (%s) e non è compatibile con questa regola di numerazione. Rimuovere o rinominare il record per attivare questo modulo.
 ErrorQtyTooLowForThisSupplier=Quantity too low for this vendor or no price defined on this product for this vendor
 ErrorOrdersNotCreatedQtyTooLow=Some orders haven't been created because of too-low quantities
-ErrorModuleSetupNotComplete=Setup of module looks to be uncomplete. Go on Home - Setup - Modules to complete.
+ErrorModuleSetupNotComplete=Setup of module %s looks to be uncomplete. Go on Home - Setup - Modules to complete.
 ErrorBadMask=Errore sulla maschera
 ErrorBadMaskFailedToLocatePosOfSequence=Errore, maschera senza numero di sequenza
 ErrorBadMaskBadRazMonth=Errore, valore di reset non valido
@@ -219,6 +219,7 @@ 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.
 # 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.
 WarningMandatorySetupNotComplete=Click here to setup mandatory parameters
 WarningEnableYourModulesApplications=Click here to enable your modules and applications
@@ -228,8 +229,8 @@ WarningPassIsEmpty=Attenzione, il database è accessibile senza password. Questa
 WarningConfFileMustBeReadOnly=Attenzione, il file di configurazione <b>htdocs/conf/conf.php</b> è scrivibile dal server web. Questa è una grave falla di sicurezza! Impostare il file in sola lettura per l'utente utilizzato dal server web. Se si utilizza Windows e il formato FAT per il disco, dovete sapere che tale filesystem non consente la gestione delle autorizzazioni sui file, quindi non può essere completamente sicuro.
 WarningsOnXLines=Warning su <b>%s</b> righe del sorgente
 WarningNoDocumentModelActivated=No model, for document generation, has been activated. A model will be chosen by default until you check your module setup.
-WarningLockFileDoesNotExists=Warning, once setup is finished, you must disable the installation/migration tools by adding a file <b>install.lock</b> into directory <b>%s</b>. Omitting the creation of this file is a grave security risk.
-WarningUntilDirRemoved=All security warnings (visible by admin users only) will remain active as long as the vulnerability is present (or that constant MAIN_REMOVE_INSTALL_WARNING is added in Setup->Other Setup).
+WarningLockFileDoesNotExists=Attenzione, una volta terminato il setup, devi disabilitare gli strumenti di installazione/migrazione aggiungendo il file <b>install.lock</b> nella directory <b>%s</b>. Omettendo la creazione di questo file è un grave riscuio per la sicurezza.
+WarningUntilDirRemoved=Tutti gli avvisi di sicurezza (visibili solo dagli amministratori) rimarranno attivi fintanto che la vulnerabilità è presente (o la costante MAIN_REMOVE_INSTALL_WARNING viene aggiunta in Impostazioni->Altre impostazioni).
 WarningCloseAlways=Attenzione, la chiusura è effettiva anche se il numero degli elementi non coincide fra inizio e fine. Abilitare questa opzione con cautela.
 WarningUsingThisBoxSlowDown=Attenzione: l'uso di questo box rallenterà pesantemente tutte le pagine che lo visualizzano
 WarningClickToDialUserSetupNotComplete=Le impostazioni di informazione del ClickToDial per il tuo utente non sono complete (vedi la scheda ClickToDial sulla tua scheda utente)
diff --git a/htdocs/langs/it_IT/main.lang b/htdocs/langs/it_IT/main.lang
index 1cdfe3e6746..de9aa73f69b 100644
--- a/htdocs/langs/it_IT/main.lang
+++ b/htdocs/langs/it_IT/main.lang
@@ -445,6 +445,7 @@ ContactsAddressesForCompany=Contatti/indirizzi per questo soggetto terzo
 AddressesForCompany=Indirizzi per questo soggetto terzo
 ActionsOnCompany=Events for this third party
 ActionsOnContact=Events for this contact/address
+ActionsOnContract=Events for this contract
 ActionsOnMember=Azioni su questo membro
 ActionsOnProduct=Eventi su questo prodotto
 NActionsLate=%s azioni in ritardo
@@ -759,6 +760,7 @@ LinkToSupplierProposal=Link to vendor proposal
 LinkToSupplierInvoice=Link to vendor invoice
 LinkToContract=Collega a contratto
 LinkToIntervention=Collega a intervento
+LinkToTicket=Link to ticket
 CreateDraft=Crea bozza
 SetToDraft=Ritorna a bozza
 ClickToEdit=Clicca per modificare
@@ -875,7 +877,7 @@ TitleSetToDraft=Torna a Bozza
 ConfirmSetToDraft=Are you sure you want to go back to Draft status?
 ImportId=ID di importazione
 Events=Eventi
-EMailTemplates=Email templates
+EMailTemplates=Modelli e-mail
 FileNotShared=File non condiviso con pubblico esterno
 Project=Progetto
 Projects=Progetti
@@ -937,8 +939,8 @@ SearchIntoProductsOrServices=Prodotti o servizi
 SearchIntoProjects=Progetti
 SearchIntoTasks=Compiti
 SearchIntoCustomerInvoices=Fatture attive
-SearchIntoSupplierInvoices=Fatture fornitore
-SearchIntoCustomerOrders=Sales orders
+SearchIntoSupplierInvoices=Fatture Fornitore
+SearchIntoCustomerOrders=Ordini Cliente
 SearchIntoSupplierOrders=Ordini d'acquisto
 SearchIntoCustomerProposals=Proposte del cliente
 SearchIntoSupplierProposals=Proposta venditore
@@ -967,7 +969,7 @@ AssignedTo=Azione assegnata a
 Deletedraft=Elimina bozza
 ConfirmMassDraftDeletion=Draft mass delete confirmation
 FileSharedViaALink=File condiviso con un link
-SelectAThirdPartyFirst=Select a third party first...
+SelectAThirdPartyFirst=Seleziona prima un Soggetto terzo...
 YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
 Inventory=Inventario
 AnalyticCode=Analytic code
diff --git a/htdocs/langs/it_IT/members.lang b/htdocs/langs/it_IT/members.lang
index 7e387e3ebd3..780c0003f30 100644
--- a/htdocs/langs/it_IT/members.lang
+++ b/htdocs/langs/it_IT/members.lang
@@ -6,7 +6,7 @@ Member=Membro
 Members=Membri
 ShowMember=Visualizza scheda membro
 UserNotLinkedToMember=L'utente non è collegato ad un membro
-ThirdpartyNotLinkedToMember=Third party not linked to a member
+ThirdpartyNotLinkedToMember=Soggetto terzo non collegato ad un membro
 MembersTickets=Biglietti membri
 FundationMembers=Membri della fondazione
 ListOfValidatedPublicMembers=Elenco membri pubblici convalidati
diff --git a/htdocs/langs/it_IT/orders.lang b/htdocs/langs/it_IT/orders.lang
index a9aa89d62f6..9f439db00ee 100644
--- a/htdocs/langs/it_IT/orders.lang
+++ b/htdocs/langs/it_IT/orders.lang
@@ -17,14 +17,14 @@ SupplierOrder=Ordine d'acquisto
 SuppliersOrders=Ordini d'acquisto
 SuppliersOrdersRunning=Current purchase orders
 CustomerOrder=Sales Order
-CustomersOrders=Sales Orders
-CustomersOrdersRunning=Current sales orders
+CustomersOrders=Ordini Cliente
+CustomersOrdersRunning=Ordini Cliente in corso
 CustomersOrdersAndOrdersLines=Sales orders and order details
 OrdersDeliveredToBill=Sales orders delivered to bill
 OrdersToBill=Sales orders delivered
 OrdersInProcess=Sales orders in process
-OrdersToProcess=Sales orders to process
-SuppliersOrdersToProcess=Purchase orders to process
+OrdersToProcess=Ordini Cliente da trattare
+SuppliersOrdersToProcess=Ordini Fornitore da trattare
 StatusOrderCanceledShort=Annullato
 StatusOrderDraftShort=Bozza
 StatusOrderValidatedShort=Convalidato
@@ -97,7 +97,7 @@ ConfirmMakeOrder=Vuoi davvero confermare di aver creato questo ordine su <b>%s</
 GenerateBill=Genera fattura
 ClassifyShipped=Classifica come spedito
 DraftOrders=Bozze di ordini
-DraftSuppliersOrders=Draft purchase orders
+DraftSuppliersOrders=Ordini di acquisto in bozza
 OnProcessOrders=Ordini in lavorazione
 RefOrder=Rif. ordine
 RefCustomerOrder=Rif. fornitore
diff --git a/htdocs/langs/it_IT/other.lang b/htdocs/langs/it_IT/other.lang
index 4ce59b419c6..452d5758eeb 100644
--- a/htdocs/langs/it_IT/other.lang
+++ b/htdocs/langs/it_IT/other.lang
@@ -83,7 +83,7 @@ LinkedObject=Oggetto collegato
 NbOfActiveNotifications=Number of notifications (no. of recipient emails)
 PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two lines are separated by a carriage return.\n\n__USER_SIGNATURE__
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
-PredefinedMailContentContract=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentContract=__(Buongiorno)__\n\n\n__(Cordialmente)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoice=__(Hello)__\n\nPlease find invoice __REF__ attached \n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to remind you that the invoice  __REF__ seems to have not been paid. A copy of the invoice is attached as a reminder.\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendProposal=__(Hello)__\n\nPlease find commercial proposal __REF__ attached \n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -93,9 +93,9 @@ PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nPlease find our order __RE
 PredefinedMailContentSendSupplierInvoice=__(Hello)__\n\nPlease find invoice __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendShipping=__(Hello)__\n\nPlease find shipping __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendFichInter=__(Hello)__\n\nPlease find intervention __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentThirdparty=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentContact=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentUser=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentThirdparty=__(Buongiorno)__\n\n\n__(Cordialmente)__\n\n__USER_SIGNATURE__
+PredefinedMailContentContact=__(Buongiorno)__\n\n\n__(Cordialmente)__\n\n__USER_SIGNATURE__
+PredefinedMailContentUser=__(Buongiorno)__\n\n\n__(Cordialmente)__\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=You can click on the link below to make your payment if it is not already done.\n\n%s\n\n
 DemoDesc=Dolibarr è un ERP/CRM compatto composto di diversi moduli funzionali. Un demo comprendente tutti i moduli non ha alcun senso, perché un caso simile non esiste nella realtà. Sono dunque disponibili diversi profili demo.
 ChooseYourDemoProfil=Scegli il profilo demo che corrisponde alla tua attività ...
diff --git a/htdocs/langs/it_IT/products.lang b/htdocs/langs/it_IT/products.lang
index 55901af6281..e956b7e7730 100644
--- a/htdocs/langs/it_IT/products.lang
+++ b/htdocs/langs/it_IT/products.lang
@@ -2,6 +2,7 @@
 ProductRef=Rif. prodotto
 ProductLabel=Etichetta prodotto
 ProductLabelTranslated=Etichetta del prodotto tradotto
+ProductDescription=Product description
 ProductDescriptionTranslated=Descrizione del prodotto tradotto
 ProductNoteTranslated=Tradotto nota prodotto
 ProductServiceCard=Scheda Prodotti/servizi
diff --git a/htdocs/langs/it_IT/stripe.lang b/htdocs/langs/it_IT/stripe.lang
index 6cad9de00dd..4f231e769ee 100644
--- a/htdocs/langs/it_IT/stripe.lang
+++ b/htdocs/langs/it_IT/stripe.lang
@@ -65,3 +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>
diff --git a/htdocs/langs/it_IT/users.lang b/htdocs/langs/it_IT/users.lang
index 25624aa1fe3..191fead905f 100644
--- a/htdocs/langs/it_IT/users.lang
+++ b/htdocs/langs/it_IT/users.lang
@@ -87,7 +87,7 @@ GroupModified=Gruppo %s modificato con successo
 GroupDeleted=Gruppo %s rimosso
 ConfirmCreateContact=Vuoi davvero creare un account Dolibarr per questo contatto?
 ConfirmCreateLogin=Vuoi davvero creare un account Dolibarr per questo utente?
-ConfirmCreateThirdParty=Vuoi davvero creare un soggetto terzo per questo utente?
+ConfirmCreateThirdParty=Vuoi davvero creare un soggetto terzo per questo membro?
 LoginToCreate=Accedi per creare
 NameToCreate=Nome del soggetto terzo da creare
 YourRole=Il tuo ruolo
diff --git a/htdocs/langs/it_IT/withdrawals.lang b/htdocs/langs/it_IT/withdrawals.lang
index 366383c6284..38e96eaf840 100644
--- a/htdocs/langs/it_IT/withdrawals.lang
+++ b/htdocs/langs/it_IT/withdrawals.lang
@@ -25,7 +25,7 @@ WithdrawRejectStatistics=Direct debit payment reject statistics
 LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
 WithdrawRequestsDone=%s direct debit payment requests recorded
-ThirdPartyBankCode=Third-party bank code
+ThirdPartyBankCode=Codice bancario del Soggetto terzo
 NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
 ClassCredited=Classifica come accreditata
 ClassCreditedConfirm=Vuoi davvero classificare questa ricevuta di domiciliazione come accreditata sul vostro conto bancario?
@@ -76,7 +76,8 @@ WithdrawalFile=Ricevuta bancaria
 SetToStatusSent=Imposta stato come "file inviato"
 ThisWillAlsoAddPaymentOnInvoice=Questo inserirà i pagamenti relativi alle fatture e le classificherà come "Pagate" se il restante da pagare sarà uguale a 0
 StatisticsByLineStatus=Statistics by status of lines
-RUM=RUM
+RUM=Unique Mandate Reference (UMR)
+DateRUM=Mandate signature date
 RUMLong=Riferimento Unico Mandato
 RUMWillBeGenerated=If empty, a UMR (Unique Mandate Reference) will be generated once the bank account information is saved.
 WithdrawMode=Tipologia sequenza d'incasso (FRST o RECUR)
diff --git a/htdocs/langs/ja_JP/accountancy.lang b/htdocs/langs/ja_JP/accountancy.lang
index 11b5f42eb07..12f6c5a9a8b 100644
--- a/htdocs/langs/ja_JP/accountancy.lang
+++ b/htdocs/langs/ja_JP/accountancy.lang
@@ -265,7 +265,7 @@ AccountingJournals=Accounting journals
 AccountingJournal=Accounting journal
 NewAccountingJournal=New accounting journal
 ShowAccoutingJournal=Show accounting journal
-Nature=自然
+NatureOfJournal=Nature of Journal
 AccountingJournalType1=Miscellaneous operations
 AccountingJournalType2=販売
 AccountingJournalType3=購入
@@ -291,6 +291,7 @@ Modelcsv_quadratus=Export for Quadratus QuadraCompta
 Modelcsv_ebp=Export for EBP
 Modelcsv_cogilog=Export for Cogilog
 Modelcsv_agiris=Export for Agiris
+Modelcsv_LDCompta=Export for LD Compta (v9 & higher) (Test)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
@@ -301,7 +302,7 @@ ChartofaccountsId=Chart of accounts Id
 InitAccountancy=Init accountancy
 InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accounting account defined for sales and purchases.
 DefaultBindingDesc=This page can be used to set a default account to use to link transactions record about payment salaries, donation, taxes and vat when no specific accounting account were already set.
-DefaultClosureDesc=This page can be used to set parameters to use to enclose a balance sheet.
+DefaultClosureDesc=This page can be used to set parameters used for accounting closures.
 Options=Options
 OptionModeProductSell=Mode sales
 OptionModeProductSellIntra=Mode sales exported in EEC
diff --git a/htdocs/langs/ja_JP/admin.lang b/htdocs/langs/ja_JP/admin.lang
index d3e4b8730ca..995a7de34f0 100644
--- a/htdocs/langs/ja_JP/admin.lang
+++ b/htdocs/langs/ja_JP/admin.lang
@@ -574,7 +574,7 @@ Module510Name=Salaries
 Module510Desc=Record and track employee payments
 Module520Name=Loans
 Module520Desc=Management of loans
-Module600Name=通知
+Module600Name=Notifications on business event
 Module600Desc=Send email notifications triggered by a business event: per user (setup defined on each user), per third-party contacts (setup defined on each third party) or by specific emails
 Module600Long=Note that this module sends emails in real-time when a specific business event occurs. If you are looking for a feature to send email reminders for agenda events, go into the setup of module Agenda.
 Module610Name=Product Variants
@@ -1193,6 +1193,7 @@ ExtraFieldsSupplierOrders=Complementary attributes (orders)
 ExtraFieldsSupplierInvoices=Complementary attributes (invoices)
 ExtraFieldsProject=Complementary attributes (projects)
 ExtraFieldsProjectTask=Complementary attributes (tasks)
+ExtraFieldsSalaries=Complementary attributes (salaries)
 ExtraFieldHasWrongValue=Attribute %s has a wrong value.
 AlphaNumOnlyLowerCharsAndNoSpace=only alphanumericals and lower case characters without space
 SendmailOptionNotComplete=警告は、一部のLinuxシステムでは、電子メールから電子メールを送信するためには、sendmailの実行セットアップする必要があります含むオプション-BA（パラメータmail.force_extra_parameters php.iniファイルに）。一部の受信者がメールを受信しない場合は、mail.force_extra_parameters =-BA）と、このPHPパラメータを編集してみてください。
@@ -1220,13 +1221,14 @@ SuhosinSessionEncrypt=Session storage encrypted by Suhosin
 ConditionIsCurrently=Condition is currently %s
 YouUseBestDriver=You use driver %s which is the best driver currently available.
 YouDoNotUseBestDriver=You use driver %s but driver %s is recommended.
-NbOfProductIsLowerThanNoPb=You have only %s products/services in the database. This does not require any particular optimization.
+NbOfObjectIsLowerThanNoPb=You have only %s %s in the database. This does not require any particular optimization.
 SearchOptim=Search optimization
-YouHaveXProductUseSearchOptim=You have %s products in the database. You should add the constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+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.
 BrowserIsOK=You are using the %s web browser. This browser is ok for security and performance.
 BrowserIsKO=You are using the %s web browser. This browser is known to be a bad choice for security, performance and reliability. We recommend using Firefox, Chrome, Opera or Safari.
-XDebugInstalled=XDebug is loaded.
-XCacheInstalled=XCache is loaded.
+PHPModuleLoaded=PHP component %s is loaded
+PreloadOPCode=Preloaded OPCode is used
 AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.<br>Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp".
 AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".
 AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties.
@@ -1734,9 +1736,9 @@ ExpenseReportsRulesSetup=Setup of module Expense Reports - Rules
 ExpenseReportNumberingModules=Expense reports numbering module
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
 YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for email notifications by enabling and configuring the module "Notification".
-ListOfNotificationsPerUser=List of notifications per user*
-ListOfNotificationsPerUserOrContact=List of notifications (events) available per user* or per contact**
-ListOfFixedNotifications=List of Fixed Notifications
+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
 GoOntoUserCardToAddMore=Go to the tab "Notifications" of a user to add or remove notifications for users
 GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
 Threshold=Threshold
@@ -1898,6 +1900,11 @@ OnMobileOnly=On small screen (smartphone) only
 DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be Prospect or Customer but can't be both)
 MAIN_OPTIMIZEFORTEXTBROWSER=Simplify interface for blind person
 MAIN_OPTIMIZEFORTEXTBROWSERDesc=Enable this option if you are a blind person, or if you use the application from a text browser like Lynx or 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
 ThisValueCanOverwrittenOnUserLevel=This value can be overwritten by each user from its user page - tab '%s'
 DefaultCustomerType=Default thirdparty type for "New customer" creation form
 ABankAccountMustBeDefinedOnPaymentModeSetup=Note: The bank account must be defined on the module of each payment mode (Paypal, Stripe, ...) to have this feature working.
@@ -1911,7 +1918,7 @@ LogsLinesNumber=Number of lines to show on logs tab
 UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
-DebugBarModuleActivated=Module debugbar is activated and slows dramaticaly the interface
+ModuleActivated=Module %s is activated and slows the interface
 EXPORTS_SHARE_MODELS=Export models are share with everybody
 ExportSetup=Setup of module Export
 InstanceUniqueID=Unique ID of the instance
@@ -1928,3 +1935,5 @@ 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
diff --git a/htdocs/langs/ja_JP/bills.lang b/htdocs/langs/ja_JP/bills.lang
index f821606de2e..43bf3b0f91d 100644
--- a/htdocs/langs/ja_JP/bills.lang
+++ b/htdocs/langs/ja_JP/bills.lang
@@ -95,6 +95,7 @@ PaymentHigherThanReminderToPay=支払うために思い出させるよりも高
 HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess received for each overpaid invoice.
 HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess paid for each overpaid invoice.
 ClassifyPaid=分類 '有料'
+ClassifyUnPaid=Classify 'Unpaid'
 ClassifyPaidPartially='は部分的に有料 &quot;に分類
 ClassifyCanceled=&quot;放棄&quot;を分類する
 ClassifyClosed=&quot;クローズ&quot;を分類する
@@ -214,6 +215,20 @@ ShowInvoiceReplace=請求書を交換見せる
 ShowInvoiceAvoir=クレジットメモを表示する
 ShowInvoiceDeposit=Show down payment invoice
 ShowInvoiceSituation=Show situation invoice
+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
 ShowPayment=支払を表示する
 AlreadyPaid=既に支払わ
 AlreadyPaidBack=Already paid back
diff --git a/htdocs/langs/ja_JP/errors.lang b/htdocs/langs/ja_JP/errors.lang
index 2fde390abbd..35e5c4e343e 100644
--- a/htdocs/langs/ja_JP/errors.lang
+++ b/htdocs/langs/ja_JP/errors.lang
@@ -90,7 +90,7 @@ ErrorSpecialCharNotAllowedForField=特殊文字は、フィールド &quot;%s&qu
 ErrorNumRefModel=参照は、データベース（%s）に存在し、この番号規則と互換性がありません。レコードを削除するか、このモジュールを有効にするために参照を変更しました。
 ErrorQtyTooLowForThisSupplier=Quantity too low for this vendor or no price defined on this product for this vendor
 ErrorOrdersNotCreatedQtyTooLow=Some orders haven't been created because of too-low quantities
-ErrorModuleSetupNotComplete=Setup of module looks to be uncomplete. Go on Home - Setup - Modules to complete.
+ErrorModuleSetupNotComplete=Setup of module %s looks to be uncomplete. Go on Home - Setup - Modules to complete.
 ErrorBadMask=マスク上でのエラー
 ErrorBadMaskFailedToLocatePosOfSequence=シーケンス番号のないエラー、マスク
 ErrorBadMaskBadRazMonth=エラー、不正なリセット値
@@ -219,6 +219,7 @@ 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.
 # 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.
 WarningMandatorySetupNotComplete=Click here to setup mandatory parameters
 WarningEnableYourModulesApplications=Click here to enable your modules and applications
diff --git a/htdocs/langs/ja_JP/main.lang b/htdocs/langs/ja_JP/main.lang
index 370b99a62d2..a37b98039bd 100644
--- a/htdocs/langs/ja_JP/main.lang
+++ b/htdocs/langs/ja_JP/main.lang
@@ -445,6 +445,7 @@ ContactsAddressesForCompany=Contacts/addresses for this third party
 AddressesForCompany=Addresses for this third party
 ActionsOnCompany=Events for this third party
 ActionsOnContact=Events for this contact/address
+ActionsOnContract=Events for this contract
 ActionsOnMember=このメンバーに関するイベント
 ActionsOnProduct=Events about this product
 NActionsLate=%s後半
@@ -759,6 +760,7 @@ LinkToSupplierProposal=Link to vendor proposal
 LinkToSupplierInvoice=Link to vendor invoice
 LinkToContract=Link to contract
 LinkToIntervention=Link to intervention
+LinkToTicket=Link to ticket
 CreateDraft=ドラフトを作成します。
 SetToDraft=Back to draft
 ClickToEdit=クリックして編集
diff --git a/htdocs/langs/ja_JP/products.lang b/htdocs/langs/ja_JP/products.lang
index fe9fa2eb27d..ccdf589b609 100644
--- a/htdocs/langs/ja_JP/products.lang
+++ b/htdocs/langs/ja_JP/products.lang
@@ -2,6 +2,7 @@
 ProductRef=製品のref。
 ProductLabel=製品のラベル
 ProductLabelTranslated=Translated product label
+ProductDescription=Product description
 ProductDescriptionTranslated=Translated product description
 ProductNoteTranslated=Translated product note
 ProductServiceCard=製品/サービスカード
diff --git a/htdocs/langs/ja_JP/stripe.lang b/htdocs/langs/ja_JP/stripe.lang
index 8884b28ea4b..845bf30215c 100644
--- a/htdocs/langs/ja_JP/stripe.lang
+++ b/htdocs/langs/ja_JP/stripe.lang
@@ -65,3 +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>
diff --git a/htdocs/langs/ja_JP/withdrawals.lang b/htdocs/langs/ja_JP/withdrawals.lang
index 96559a7dfad..7734a63a35f 100644
--- a/htdocs/langs/ja_JP/withdrawals.lang
+++ b/htdocs/langs/ja_JP/withdrawals.lang
@@ -76,7 +76,8 @@ WithdrawalFile=Withdrawal file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and will classify them as "Paid" if remain to pay is null
 StatisticsByLineStatus=Statistics by status of lines
-RUM=UMR
+RUM=Unique Mandate Reference (UMR)
+DateRUM=Mandate signature date
 RUMLong=Unique Mandate Reference
 RUMWillBeGenerated=If empty, a UMR (Unique Mandate Reference) will be generated once the bank account information is saved.
 WithdrawMode=Direct debit mode (FRST or RECUR)
diff --git a/htdocs/langs/ka_GE/accountancy.lang b/htdocs/langs/ka_GE/accountancy.lang
index 758d9c340a5..1fc3b3e05ec 100644
--- a/htdocs/langs/ka_GE/accountancy.lang
+++ b/htdocs/langs/ka_GE/accountancy.lang
@@ -265,7 +265,7 @@ AccountingJournals=Accounting journals
 AccountingJournal=Accounting journal
 NewAccountingJournal=New accounting journal
 ShowAccoutingJournal=Show accounting journal
-Nature=Nature
+NatureOfJournal=Nature of Journal
 AccountingJournalType1=Miscellaneous operations
 AccountingJournalType2=Sales
 AccountingJournalType3=Purchases
@@ -291,6 +291,7 @@ Modelcsv_quadratus=Export for Quadratus QuadraCompta
 Modelcsv_ebp=Export for EBP
 Modelcsv_cogilog=Export for Cogilog
 Modelcsv_agiris=Export for Agiris
+Modelcsv_LDCompta=Export for LD Compta (v9 & higher) (Test)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
@@ -301,7 +302,7 @@ ChartofaccountsId=Chart of accounts Id
 InitAccountancy=Init accountancy
 InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accounting account defined for sales and purchases.
 DefaultBindingDesc=This page can be used to set a default account to use to link transactions record about payment salaries, donation, taxes and vat when no specific accounting account were already set.
-DefaultClosureDesc=This page can be used to set parameters to use to enclose a balance sheet.
+DefaultClosureDesc=This page can be used to set parameters used for accounting closures.
 Options=Options
 OptionModeProductSell=Mode sales
 OptionModeProductSellIntra=Mode sales exported in EEC
diff --git a/htdocs/langs/ka_GE/admin.lang b/htdocs/langs/ka_GE/admin.lang
index f30d6edd9f7..2e27c6fe81f 100644
--- a/htdocs/langs/ka_GE/admin.lang
+++ b/htdocs/langs/ka_GE/admin.lang
@@ -574,7 +574,7 @@ Module510Name=Salaries
 Module510Desc=Record and track employee payments
 Module520Name=Loans
 Module520Desc=Management of loans
-Module600Name=Notifications
+Module600Name=Notifications on business event
 Module600Desc=Send email notifications triggered by a business event: per user (setup defined on each user), per third-party contacts (setup defined on each third party) or by specific emails
 Module600Long=Note that this module sends emails in real-time when a specific business event occurs. If you are looking for a feature to send email reminders for agenda events, go into the setup of module Agenda.
 Module610Name=Product Variants
@@ -1193,6 +1193,7 @@ ExtraFieldsSupplierOrders=Complementary attributes (orders)
 ExtraFieldsSupplierInvoices=Complementary attributes (invoices)
 ExtraFieldsProject=Complementary attributes (projects)
 ExtraFieldsProjectTask=Complementary attributes (tasks)
+ExtraFieldsSalaries=Complementary attributes (salaries)
 ExtraFieldHasWrongValue=Attribute %s has a wrong value.
 AlphaNumOnlyLowerCharsAndNoSpace=only alphanumericals and lower case characters without space
 SendmailOptionNotComplete=Warning, on some Linux systems, to send email from your email, sendmail execution setup must contains option -ba (parameter mail.force_extra_parameters into your php.ini file). If some recipients never receive emails, try to edit this PHP parameter with mail.force_extra_parameters = -ba).
@@ -1220,13 +1221,14 @@ SuhosinSessionEncrypt=Session storage encrypted by Suhosin
 ConditionIsCurrently=Condition is currently %s
 YouUseBestDriver=You use driver %s which is the best driver currently available.
 YouDoNotUseBestDriver=You use driver %s but driver %s is recommended.
-NbOfProductIsLowerThanNoPb=You have only %s products/services in the database. This does not require any particular optimization.
+NbOfObjectIsLowerThanNoPb=You have only %s %s in the database. This does not require any particular optimization.
 SearchOptim=Search optimization
-YouHaveXProductUseSearchOptim=You have %s products in the database. You should add the constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+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.
 BrowserIsOK=You are using the %s web browser. This browser is ok for security and performance.
 BrowserIsKO=You are using the %s web browser. This browser is known to be a bad choice for security, performance and reliability. We recommend using Firefox, Chrome, Opera or Safari.
-XDebugInstalled=XDebug is loaded.
-XCacheInstalled=XCache is loaded.
+PHPModuleLoaded=PHP component %s is loaded
+PreloadOPCode=Preloaded OPCode is used
 AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.<br>Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp".
 AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".
 AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties.
@@ -1734,9 +1736,9 @@ ExpenseReportsRulesSetup=Setup of module Expense Reports - Rules
 ExpenseReportNumberingModules=Expense reports numbering module
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
 YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for email notifications by enabling and configuring the module "Notification".
-ListOfNotificationsPerUser=List of notifications per user*
-ListOfNotificationsPerUserOrContact=List of notifications (events) available per user* or per contact**
-ListOfFixedNotifications=List of Fixed Notifications
+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
 GoOntoUserCardToAddMore=Go to the tab "Notifications" of a user to add or remove notifications for users
 GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
 Threshold=Threshold
@@ -1898,6 +1900,11 @@ OnMobileOnly=On small screen (smartphone) only
 DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be Prospect or Customer but can't be both)
 MAIN_OPTIMIZEFORTEXTBROWSER=Simplify interface for blind person
 MAIN_OPTIMIZEFORTEXTBROWSERDesc=Enable this option if you are a blind person, or if you use the application from a text browser like Lynx or 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
 ThisValueCanOverwrittenOnUserLevel=This value can be overwritten by each user from its user page - tab '%s'
 DefaultCustomerType=Default thirdparty type for "New customer" creation form
 ABankAccountMustBeDefinedOnPaymentModeSetup=Note: The bank account must be defined on the module of each payment mode (Paypal, Stripe, ...) to have this feature working.
@@ -1911,7 +1918,7 @@ LogsLinesNumber=Number of lines to show on logs tab
 UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
-DebugBarModuleActivated=Module debugbar is activated and slows dramaticaly the interface
+ModuleActivated=Module %s is activated and slows the interface
 EXPORTS_SHARE_MODELS=Export models are share with everybody
 ExportSetup=Setup of module Export
 InstanceUniqueID=Unique ID of the instance
@@ -1928,3 +1935,5 @@ 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
diff --git a/htdocs/langs/ka_GE/bills.lang b/htdocs/langs/ka_GE/bills.lang
index 4f114d4df1c..53535e58b46 100644
--- a/htdocs/langs/ka_GE/bills.lang
+++ b/htdocs/langs/ka_GE/bills.lang
@@ -95,6 +95,7 @@ PaymentHigherThanReminderToPay=Payment higher than reminder to pay
 HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess received for each overpaid invoice.
 HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess paid for each overpaid invoice.
 ClassifyPaid=Classify 'Paid'
+ClassifyUnPaid=Classify 'Unpaid'
 ClassifyPaidPartially=Classify 'Paid partially'
 ClassifyCanceled=Classify 'Abandoned'
 ClassifyClosed=Classify 'Closed'
@@ -214,6 +215,20 @@ ShowInvoiceReplace=Show replacing invoice
 ShowInvoiceAvoir=Show credit note
 ShowInvoiceDeposit=Show down payment invoice
 ShowInvoiceSituation=Show situation invoice
+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
 ShowPayment=Show payment
 AlreadyPaid=Already paid
 AlreadyPaidBack=Already paid back
diff --git a/htdocs/langs/ka_GE/errors.lang b/htdocs/langs/ka_GE/errors.lang
index b5a9d70cb70..1ee46fdbb92 100644
--- a/htdocs/langs/ka_GE/errors.lang
+++ b/htdocs/langs/ka_GE/errors.lang
@@ -90,7 +90,7 @@ ErrorSpecialCharNotAllowedForField=Special characters are not allowed for field
 ErrorNumRefModel=A reference exists into database (%s) and is not compatible with this numbering rule. Remove record or renamed reference to activate this module.
 ErrorQtyTooLowForThisSupplier=Quantity too low for this vendor or no price defined on this product for this vendor
 ErrorOrdersNotCreatedQtyTooLow=Some orders haven't been created because of too-low quantities
-ErrorModuleSetupNotComplete=Setup of module looks to be uncomplete. Go on Home - Setup - Modules to complete.
+ErrorModuleSetupNotComplete=Setup of module %s looks to be uncomplete. Go on Home - Setup - Modules to complete.
 ErrorBadMask=Error on mask
 ErrorBadMaskFailedToLocatePosOfSequence=Error, mask without sequence number
 ErrorBadMaskBadRazMonth=Error, bad reset value
@@ -219,6 +219,7 @@ 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.
 # 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.
 WarningMandatorySetupNotComplete=Click here to setup mandatory parameters
 WarningEnableYourModulesApplications=Click here to enable your modules and applications
diff --git a/htdocs/langs/ka_GE/main.lang b/htdocs/langs/ka_GE/main.lang
index 6efbe942032..1cadc32f4ab 100644
--- a/htdocs/langs/ka_GE/main.lang
+++ b/htdocs/langs/ka_GE/main.lang
@@ -445,6 +445,7 @@ ContactsAddressesForCompany=Contacts/addresses for this third party
 AddressesForCompany=Addresses for this third party
 ActionsOnCompany=Events for this third party
 ActionsOnContact=Events for this contact/address
+ActionsOnContract=Events for this contract
 ActionsOnMember=Events about this member
 ActionsOnProduct=Events about this product
 NActionsLate=%s late
@@ -759,6 +760,7 @@ LinkToSupplierProposal=Link to vendor proposal
 LinkToSupplierInvoice=Link to vendor invoice
 LinkToContract=Link to contract
 LinkToIntervention=Link to intervention
+LinkToTicket=Link to ticket
 CreateDraft=Create draft
 SetToDraft=Back to draft
 ClickToEdit=Click to edit
diff --git a/htdocs/langs/ka_GE/products.lang b/htdocs/langs/ka_GE/products.lang
index 7b68f5b3ebd..73e672284de 100644
--- a/htdocs/langs/ka_GE/products.lang
+++ b/htdocs/langs/ka_GE/products.lang
@@ -2,6 +2,7 @@
 ProductRef=Product ref.
 ProductLabel=Product label
 ProductLabelTranslated=Translated product label
+ProductDescription=Product description
 ProductDescriptionTranslated=Translated product description
 ProductNoteTranslated=Translated product note
 ProductServiceCard=Products/Services card
diff --git a/htdocs/langs/ka_GE/stripe.lang b/htdocs/langs/ka_GE/stripe.lang
index 7a3389f34b7..c5224982873 100644
--- a/htdocs/langs/ka_GE/stripe.lang
+++ b/htdocs/langs/ka_GE/stripe.lang
@@ -65,3 +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>
diff --git a/htdocs/langs/ka_GE/withdrawals.lang b/htdocs/langs/ka_GE/withdrawals.lang
index cbca2b2f103..88e5eaf128c 100644
--- a/htdocs/langs/ka_GE/withdrawals.lang
+++ b/htdocs/langs/ka_GE/withdrawals.lang
@@ -76,7 +76,8 @@ WithdrawalFile=Withdrawal file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and will classify them as "Paid" if remain to pay is null
 StatisticsByLineStatus=Statistics by status of lines
-RUM=UMR
+RUM=Unique Mandate Reference (UMR)
+DateRUM=Mandate signature date
 RUMLong=Unique Mandate Reference
 RUMWillBeGenerated=If empty, a UMR (Unique Mandate Reference) will be generated once the bank account information is saved.
 WithdrawMode=Direct debit mode (FRST or RECUR)
diff --git a/htdocs/langs/km_KH/main.lang b/htdocs/langs/km_KH/main.lang
index 545a6c660c9..57b062774ea 100644
--- a/htdocs/langs/km_KH/main.lang
+++ b/htdocs/langs/km_KH/main.lang
@@ -445,6 +445,7 @@ ContactsAddressesForCompany=Contacts/addresses for this third party
 AddressesForCompany=Addresses for this third party
 ActionsOnCompany=Events for this third party
 ActionsOnContact=Events for this contact/address
+ActionsOnContract=Events for this contract
 ActionsOnMember=Events about this member
 ActionsOnProduct=Events about this product
 NActionsLate=%s late
@@ -759,6 +760,7 @@ LinkToSupplierProposal=Link to vendor proposal
 LinkToSupplierInvoice=Link to vendor invoice
 LinkToContract=Link to contract
 LinkToIntervention=Link to intervention
+LinkToTicket=Link to ticket
 CreateDraft=Create draft
 SetToDraft=Back to draft
 ClickToEdit=Click to edit
diff --git a/htdocs/langs/kn_IN/accountancy.lang b/htdocs/langs/kn_IN/accountancy.lang
index 758d9c340a5..1fc3b3e05ec 100644
--- a/htdocs/langs/kn_IN/accountancy.lang
+++ b/htdocs/langs/kn_IN/accountancy.lang
@@ -265,7 +265,7 @@ AccountingJournals=Accounting journals
 AccountingJournal=Accounting journal
 NewAccountingJournal=New accounting journal
 ShowAccoutingJournal=Show accounting journal
-Nature=Nature
+NatureOfJournal=Nature of Journal
 AccountingJournalType1=Miscellaneous operations
 AccountingJournalType2=Sales
 AccountingJournalType3=Purchases
@@ -291,6 +291,7 @@ Modelcsv_quadratus=Export for Quadratus QuadraCompta
 Modelcsv_ebp=Export for EBP
 Modelcsv_cogilog=Export for Cogilog
 Modelcsv_agiris=Export for Agiris
+Modelcsv_LDCompta=Export for LD Compta (v9 & higher) (Test)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
@@ -301,7 +302,7 @@ ChartofaccountsId=Chart of accounts Id
 InitAccountancy=Init accountancy
 InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accounting account defined for sales and purchases.
 DefaultBindingDesc=This page can be used to set a default account to use to link transactions record about payment salaries, donation, taxes and vat when no specific accounting account were already set.
-DefaultClosureDesc=This page can be used to set parameters to use to enclose a balance sheet.
+DefaultClosureDesc=This page can be used to set parameters used for accounting closures.
 Options=Options
 OptionModeProductSell=Mode sales
 OptionModeProductSellIntra=Mode sales exported in EEC
diff --git a/htdocs/langs/kn_IN/admin.lang b/htdocs/langs/kn_IN/admin.lang
index 4f98d74a676..c0997f3eb4b 100644
--- a/htdocs/langs/kn_IN/admin.lang
+++ b/htdocs/langs/kn_IN/admin.lang
@@ -574,7 +574,7 @@ Module510Name=Salaries
 Module510Desc=Record and track employee payments
 Module520Name=Loans
 Module520Desc=Management of loans
-Module600Name=Notifications
+Module600Name=Notifications on business event
 Module600Desc=Send email notifications triggered by a business event: per user (setup defined on each user), per third-party contacts (setup defined on each third party) or by specific emails
 Module600Long=Note that this module sends emails in real-time when a specific business event occurs. If you are looking for a feature to send email reminders for agenda events, go into the setup of module Agenda.
 Module610Name=Product Variants
@@ -1193,6 +1193,7 @@ ExtraFieldsSupplierOrders=Complementary attributes (orders)
 ExtraFieldsSupplierInvoices=Complementary attributes (invoices)
 ExtraFieldsProject=Complementary attributes (projects)
 ExtraFieldsProjectTask=Complementary attributes (tasks)
+ExtraFieldsSalaries=Complementary attributes (salaries)
 ExtraFieldHasWrongValue=Attribute %s has a wrong value.
 AlphaNumOnlyLowerCharsAndNoSpace=only alphanumericals and lower case characters without space
 SendmailOptionNotComplete=Warning, on some Linux systems, to send email from your email, sendmail execution setup must contains option -ba (parameter mail.force_extra_parameters into your php.ini file). If some recipients never receive emails, try to edit this PHP parameter with mail.force_extra_parameters = -ba).
@@ -1220,13 +1221,14 @@ SuhosinSessionEncrypt=Session storage encrypted by Suhosin
 ConditionIsCurrently=Condition is currently %s
 YouUseBestDriver=You use driver %s which is the best driver currently available.
 YouDoNotUseBestDriver=You use driver %s but driver %s is recommended.
-NbOfProductIsLowerThanNoPb=You have only %s products/services in the database. This does not require any particular optimization.
+NbOfObjectIsLowerThanNoPb=You have only %s %s in the database. This does not require any particular optimization.
 SearchOptim=Search optimization
-YouHaveXProductUseSearchOptim=You have %s products in the database. You should add the constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+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.
 BrowserIsOK=You are using the %s web browser. This browser is ok for security and performance.
 BrowserIsKO=You are using the %s web browser. This browser is known to be a bad choice for security, performance and reliability. We recommend using Firefox, Chrome, Opera or Safari.
-XDebugInstalled=XDebug is loaded.
-XCacheInstalled=XCache is loaded.
+PHPModuleLoaded=PHP component %s is loaded
+PreloadOPCode=Preloaded OPCode is used
 AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.<br>Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp".
 AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".
 AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties.
@@ -1734,9 +1736,9 @@ ExpenseReportsRulesSetup=Setup of module Expense Reports - Rules
 ExpenseReportNumberingModules=Expense reports numbering module
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
 YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for email notifications by enabling and configuring the module "Notification".
-ListOfNotificationsPerUser=List of notifications per user*
-ListOfNotificationsPerUserOrContact=List of notifications (events) available per user* or per contact**
-ListOfFixedNotifications=List of Fixed Notifications
+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
 GoOntoUserCardToAddMore=Go to the tab "Notifications" of a user to add or remove notifications for users
 GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
 Threshold=Threshold
@@ -1898,6 +1900,11 @@ OnMobileOnly=On small screen (smartphone) only
 DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be Prospect or Customer but can't be both)
 MAIN_OPTIMIZEFORTEXTBROWSER=Simplify interface for blind person
 MAIN_OPTIMIZEFORTEXTBROWSERDesc=Enable this option if you are a blind person, or if you use the application from a text browser like Lynx or 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
 ThisValueCanOverwrittenOnUserLevel=This value can be overwritten by each user from its user page - tab '%s'
 DefaultCustomerType=Default thirdparty type for "New customer" creation form
 ABankAccountMustBeDefinedOnPaymentModeSetup=Note: The bank account must be defined on the module of each payment mode (Paypal, Stripe, ...) to have this feature working.
@@ -1911,7 +1918,7 @@ LogsLinesNumber=Number of lines to show on logs tab
 UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
-DebugBarModuleActivated=Module debugbar is activated and slows dramaticaly the interface
+ModuleActivated=Module %s is activated and slows the interface
 EXPORTS_SHARE_MODELS=Export models are share with everybody
 ExportSetup=Setup of module Export
 InstanceUniqueID=Unique ID of the instance
@@ -1928,3 +1935,5 @@ 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
diff --git a/htdocs/langs/kn_IN/bills.lang b/htdocs/langs/kn_IN/bills.lang
index e7b17c926d2..6d3cd311c75 100644
--- a/htdocs/langs/kn_IN/bills.lang
+++ b/htdocs/langs/kn_IN/bills.lang
@@ -95,6 +95,7 @@ PaymentHigherThanReminderToPay=Payment higher than reminder to pay
 HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess received for each overpaid invoice.
 HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess paid for each overpaid invoice.
 ClassifyPaid=Classify 'Paid'
+ClassifyUnPaid=Classify 'Unpaid'
 ClassifyPaidPartially=Classify 'Paid partially'
 ClassifyCanceled=Classify 'Abandoned'
 ClassifyClosed=Classify 'Closed'
@@ -214,6 +215,20 @@ ShowInvoiceReplace=Show replacing invoice
 ShowInvoiceAvoir=Show credit note
 ShowInvoiceDeposit=Show down payment invoice
 ShowInvoiceSituation=Show situation invoice
+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
 ShowPayment=Show payment
 AlreadyPaid=Already paid
 AlreadyPaidBack=Already paid back
diff --git a/htdocs/langs/kn_IN/errors.lang b/htdocs/langs/kn_IN/errors.lang
index b5a9d70cb70..1ee46fdbb92 100644
--- a/htdocs/langs/kn_IN/errors.lang
+++ b/htdocs/langs/kn_IN/errors.lang
@@ -90,7 +90,7 @@ ErrorSpecialCharNotAllowedForField=Special characters are not allowed for field
 ErrorNumRefModel=A reference exists into database (%s) and is not compatible with this numbering rule. Remove record or renamed reference to activate this module.
 ErrorQtyTooLowForThisSupplier=Quantity too low for this vendor or no price defined on this product for this vendor
 ErrorOrdersNotCreatedQtyTooLow=Some orders haven't been created because of too-low quantities
-ErrorModuleSetupNotComplete=Setup of module looks to be uncomplete. Go on Home - Setup - Modules to complete.
+ErrorModuleSetupNotComplete=Setup of module %s looks to be uncomplete. Go on Home - Setup - Modules to complete.
 ErrorBadMask=Error on mask
 ErrorBadMaskFailedToLocatePosOfSequence=Error, mask without sequence number
 ErrorBadMaskBadRazMonth=Error, bad reset value
@@ -219,6 +219,7 @@ 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.
 # 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.
 WarningMandatorySetupNotComplete=Click here to setup mandatory parameters
 WarningEnableYourModulesApplications=Click here to enable your modules and applications
diff --git a/htdocs/langs/kn_IN/main.lang b/htdocs/langs/kn_IN/main.lang
index b9b20772410..aae0806ec95 100644
--- a/htdocs/langs/kn_IN/main.lang
+++ b/htdocs/langs/kn_IN/main.lang
@@ -445,6 +445,7 @@ ContactsAddressesForCompany=Contacts/addresses for this third party
 AddressesForCompany=Addresses for this third party
 ActionsOnCompany=Events for this third party
 ActionsOnContact=Events for this contact/address
+ActionsOnContract=Events for this contract
 ActionsOnMember=Events about this member
 ActionsOnProduct=Events about this product
 NActionsLate=%s late
@@ -759,6 +760,7 @@ LinkToSupplierProposal=Link to vendor proposal
 LinkToSupplierInvoice=Link to vendor invoice
 LinkToContract=Link to contract
 LinkToIntervention=Link to intervention
+LinkToTicket=Link to ticket
 CreateDraft=Create draft
 SetToDraft=Back to draft
 ClickToEdit=Click to edit
diff --git a/htdocs/langs/kn_IN/products.lang b/htdocs/langs/kn_IN/products.lang
index 0dc770ad9e5..478e1ac0d9f 100644
--- a/htdocs/langs/kn_IN/products.lang
+++ b/htdocs/langs/kn_IN/products.lang
@@ -2,6 +2,7 @@
 ProductRef=Product ref.
 ProductLabel=Product label
 ProductLabelTranslated=Translated product label
+ProductDescription=Product description
 ProductDescriptionTranslated=Translated product description
 ProductNoteTranslated=Translated product note
 ProductServiceCard=Products/Services card
diff --git a/htdocs/langs/kn_IN/stripe.lang b/htdocs/langs/kn_IN/stripe.lang
index 7a3389f34b7..c5224982873 100644
--- a/htdocs/langs/kn_IN/stripe.lang
+++ b/htdocs/langs/kn_IN/stripe.lang
@@ -65,3 +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>
diff --git a/htdocs/langs/kn_IN/withdrawals.lang b/htdocs/langs/kn_IN/withdrawals.lang
index cbca2b2f103..88e5eaf128c 100644
--- a/htdocs/langs/kn_IN/withdrawals.lang
+++ b/htdocs/langs/kn_IN/withdrawals.lang
@@ -76,7 +76,8 @@ WithdrawalFile=Withdrawal file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and will classify them as "Paid" if remain to pay is null
 StatisticsByLineStatus=Statistics by status of lines
-RUM=UMR
+RUM=Unique Mandate Reference (UMR)
+DateRUM=Mandate signature date
 RUMLong=Unique Mandate Reference
 RUMWillBeGenerated=If empty, a UMR (Unique Mandate Reference) will be generated once the bank account information is saved.
 WithdrawMode=Direct debit mode (FRST or RECUR)
diff --git a/htdocs/langs/ko_KR/accountancy.lang b/htdocs/langs/ko_KR/accountancy.lang
index 3ce2ffde609..21ac14a025b 100644
--- a/htdocs/langs/ko_KR/accountancy.lang
+++ b/htdocs/langs/ko_KR/accountancy.lang
@@ -265,7 +265,7 @@ AccountingJournals=Accounting journals
 AccountingJournal=Accounting journal
 NewAccountingJournal=New accounting journal
 ShowAccoutingJournal=Show accounting journal
-Nature=Nature
+NatureOfJournal=Nature of Journal
 AccountingJournalType1=Miscellaneous operations
 AccountingJournalType2=Sales
 AccountingJournalType3=Purchases
@@ -291,6 +291,7 @@ Modelcsv_quadratus=Export for Quadratus QuadraCompta
 Modelcsv_ebp=Export for EBP
 Modelcsv_cogilog=Export for Cogilog
 Modelcsv_agiris=Export for Agiris
+Modelcsv_LDCompta=Export for LD Compta (v9 & higher) (Test)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
@@ -301,7 +302,7 @@ ChartofaccountsId=Chart of accounts Id
 InitAccountancy=Init accountancy
 InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accounting account defined for sales and purchases.
 DefaultBindingDesc=This page can be used to set a default account to use to link transactions record about payment salaries, donation, taxes and vat when no specific accounting account were already set.
-DefaultClosureDesc=This page can be used to set parameters to use to enclose a balance sheet.
+DefaultClosureDesc=This page can be used to set parameters used for accounting closures.
 Options=Options
 OptionModeProductSell=Mode sales
 OptionModeProductSellIntra=Mode sales exported in EEC
diff --git a/htdocs/langs/ko_KR/admin.lang b/htdocs/langs/ko_KR/admin.lang
index 00d354072b1..5a407bc2806 100644
--- a/htdocs/langs/ko_KR/admin.lang
+++ b/htdocs/langs/ko_KR/admin.lang
@@ -574,7 +574,7 @@ Module510Name=Salaries
 Module510Desc=Record and track employee payments
 Module520Name=Loans
 Module520Desc=Management of loans
-Module600Name=Notifications
+Module600Name=Notifications on business event
 Module600Desc=Send email notifications triggered by a business event: per user (setup defined on each user), per third-party contacts (setup defined on each third party) or by specific emails
 Module600Long=Note that this module sends emails in real-time when a specific business event occurs. If you are looking for a feature to send email reminders for agenda events, go into the setup of module Agenda.
 Module610Name=Product Variants
@@ -1193,6 +1193,7 @@ ExtraFieldsSupplierOrders=Complementary attributes (orders)
 ExtraFieldsSupplierInvoices=Complementary attributes (invoices)
 ExtraFieldsProject=Complementary attributes (projects)
 ExtraFieldsProjectTask=Complementary attributes (tasks)
+ExtraFieldsSalaries=Complementary attributes (salaries)
 ExtraFieldHasWrongValue=Attribute %s has a wrong value.
 AlphaNumOnlyLowerCharsAndNoSpace=only alphanumericals and lower case characters without space
 SendmailOptionNotComplete=Warning, on some Linux systems, to send email from your email, sendmail execution setup must contains option -ba (parameter mail.force_extra_parameters into your php.ini file). If some recipients never receive emails, try to edit this PHP parameter with mail.force_extra_parameters = -ba).
@@ -1220,13 +1221,14 @@ SuhosinSessionEncrypt=Session storage encrypted by Suhosin
 ConditionIsCurrently=Condition is currently %s
 YouUseBestDriver=You use driver %s which is the best driver currently available.
 YouDoNotUseBestDriver=You use driver %s but driver %s is recommended.
-NbOfProductIsLowerThanNoPb=You have only %s products/services in the database. This does not require any particular optimization.
+NbOfObjectIsLowerThanNoPb=You have only %s %s in the database. This does not require any particular optimization.
 SearchOptim=Search optimization
-YouHaveXProductUseSearchOptim=You have %s products in the database. You should add the constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+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.
 BrowserIsOK=You are using the %s web browser. This browser is ok for security and performance.
 BrowserIsKO=You are using the %s web browser. This browser is known to be a bad choice for security, performance and reliability. We recommend using Firefox, Chrome, Opera or Safari.
-XDebugInstalled=XDebug is loaded.
-XCacheInstalled=XCache is loaded.
+PHPModuleLoaded=PHP component %s is loaded
+PreloadOPCode=Preloaded OPCode is used
 AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.<br>Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp".
 AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".
 AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties.
@@ -1734,9 +1736,9 @@ ExpenseReportsRulesSetup=Setup of module Expense Reports - Rules
 ExpenseReportNumberingModules=Expense reports numbering module
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
 YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for email notifications by enabling and configuring the module "Notification".
-ListOfNotificationsPerUser=List of notifications per user*
-ListOfNotificationsPerUserOrContact=List of notifications (events) available per user* or per contact**
-ListOfFixedNotifications=List of Fixed Notifications
+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
 GoOntoUserCardToAddMore=Go to the tab "Notifications" of a user to add or remove notifications for users
 GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
 Threshold=Threshold
@@ -1898,6 +1900,11 @@ OnMobileOnly=On small screen (smartphone) only
 DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be Prospect or Customer but can't be both)
 MAIN_OPTIMIZEFORTEXTBROWSER=Simplify interface for blind person
 MAIN_OPTIMIZEFORTEXTBROWSERDesc=Enable this option if you are a blind person, or if you use the application from a text browser like Lynx or 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
 ThisValueCanOverwrittenOnUserLevel=This value can be overwritten by each user from its user page - tab '%s'
 DefaultCustomerType=Default thirdparty type for "New customer" creation form
 ABankAccountMustBeDefinedOnPaymentModeSetup=Note: The bank account must be defined on the module of each payment mode (Paypal, Stripe, ...) to have this feature working.
@@ -1911,7 +1918,7 @@ LogsLinesNumber=Number of lines to show on logs tab
 UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
-DebugBarModuleActivated=Module debugbar is activated and slows dramaticaly the interface
+ModuleActivated=Module %s is activated and slows the interface
 EXPORTS_SHARE_MODELS=Export models are share with everybody
 ExportSetup=Setup of module Export
 InstanceUniqueID=Unique ID of the instance
@@ -1928,3 +1935,5 @@ 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
diff --git a/htdocs/langs/ko_KR/bills.lang b/htdocs/langs/ko_KR/bills.lang
index fc1a2e2058d..7793367f923 100644
--- a/htdocs/langs/ko_KR/bills.lang
+++ b/htdocs/langs/ko_KR/bills.lang
@@ -95,6 +95,7 @@ PaymentHigherThanReminderToPay=Payment higher than reminder to pay
 HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess received for each overpaid invoice.
 HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess paid for each overpaid invoice.
 ClassifyPaid=Classify 'Paid'
+ClassifyUnPaid=Classify 'Unpaid'
 ClassifyPaidPartially=Classify 'Paid partially'
 ClassifyCanceled=Classify 'Abandoned'
 ClassifyClosed=Classify 'Closed'
@@ -214,6 +215,20 @@ ShowInvoiceReplace=Show replacing invoice
 ShowInvoiceAvoir=Show credit note
 ShowInvoiceDeposit=Show down payment invoice
 ShowInvoiceSituation=Show situation invoice
+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
 ShowPayment=Show payment
 AlreadyPaid=Already paid
 AlreadyPaidBack=Already paid back
diff --git a/htdocs/langs/ko_KR/errors.lang b/htdocs/langs/ko_KR/errors.lang
index b5a9d70cb70..1ee46fdbb92 100644
--- a/htdocs/langs/ko_KR/errors.lang
+++ b/htdocs/langs/ko_KR/errors.lang
@@ -90,7 +90,7 @@ ErrorSpecialCharNotAllowedForField=Special characters are not allowed for field
 ErrorNumRefModel=A reference exists into database (%s) and is not compatible with this numbering rule. Remove record or renamed reference to activate this module.
 ErrorQtyTooLowForThisSupplier=Quantity too low for this vendor or no price defined on this product for this vendor
 ErrorOrdersNotCreatedQtyTooLow=Some orders haven't been created because of too-low quantities
-ErrorModuleSetupNotComplete=Setup of module looks to be uncomplete. Go on Home - Setup - Modules to complete.
+ErrorModuleSetupNotComplete=Setup of module %s looks to be uncomplete. Go on Home - Setup - Modules to complete.
 ErrorBadMask=Error on mask
 ErrorBadMaskFailedToLocatePosOfSequence=Error, mask without sequence number
 ErrorBadMaskBadRazMonth=Error, bad reset value
@@ -219,6 +219,7 @@ 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.
 # 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.
 WarningMandatorySetupNotComplete=Click here to setup mandatory parameters
 WarningEnableYourModulesApplications=Click here to enable your modules and applications
diff --git a/htdocs/langs/ko_KR/main.lang b/htdocs/langs/ko_KR/main.lang
index 43241b1201b..e3bfba6b683 100644
--- a/htdocs/langs/ko_KR/main.lang
+++ b/htdocs/langs/ko_KR/main.lang
@@ -445,6 +445,7 @@ ContactsAddressesForCompany=이 협력업체의 연락처 / 주소
 AddressesForCompany=이 협력업체의 주소
 ActionsOnCompany=Events for this third party
 ActionsOnContact=Events for this contact/address
+ActionsOnContract=Events for this contract
 ActionsOnMember=이 멤버에 대한 이벤트
 ActionsOnProduct=Events about this product
 NActionsLate=%s 늦게
@@ -759,6 +760,7 @@ LinkToSupplierProposal=Link to vendor proposal
 LinkToSupplierInvoice=Link to vendor invoice
 LinkToContract=계약서 링크
 LinkToIntervention=중재에 연결
+LinkToTicket=Link to ticket
 CreateDraft=초안 작성
 SetToDraft=초안으로 돌아 가기
 ClickToEdit=편집하려면 클릭하십시오.
diff --git a/htdocs/langs/ko_KR/products.lang b/htdocs/langs/ko_KR/products.lang
index 5951c9bcae9..76a94d718c0 100644
--- a/htdocs/langs/ko_KR/products.lang
+++ b/htdocs/langs/ko_KR/products.lang
@@ -2,6 +2,7 @@
 ProductRef=Product ref.
 ProductLabel=Product label
 ProductLabelTranslated=Translated product label
+ProductDescription=Product description
 ProductDescriptionTranslated=Translated product description
 ProductNoteTranslated=Translated product note
 ProductServiceCard=Products/Services card
diff --git a/htdocs/langs/ko_KR/stripe.lang b/htdocs/langs/ko_KR/stripe.lang
index 84c51758320..f6a259ca219 100644
--- a/htdocs/langs/ko_KR/stripe.lang
+++ b/htdocs/langs/ko_KR/stripe.lang
@@ -65,3 +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>
diff --git a/htdocs/langs/ko_KR/withdrawals.lang b/htdocs/langs/ko_KR/withdrawals.lang
index 94d4de3b91d..a49e46a47a2 100644
--- a/htdocs/langs/ko_KR/withdrawals.lang
+++ b/htdocs/langs/ko_KR/withdrawals.lang
@@ -76,7 +76,8 @@ WithdrawalFile=Withdrawal file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and will classify them as "Paid" if remain to pay is null
 StatisticsByLineStatus=Statistics by status of lines
-RUM=UMR
+RUM=Unique Mandate Reference (UMR)
+DateRUM=Mandate signature date
 RUMLong=Unique Mandate Reference
 RUMWillBeGenerated=If empty, a UMR (Unique Mandate Reference) will be generated once the bank account information is saved.
 WithdrawMode=Direct debit mode (FRST or RECUR)
diff --git a/htdocs/langs/lo_LA/accountancy.lang b/htdocs/langs/lo_LA/accountancy.lang
index d64c13327b4..256b24e349e 100644
--- a/htdocs/langs/lo_LA/accountancy.lang
+++ b/htdocs/langs/lo_LA/accountancy.lang
@@ -265,7 +265,7 @@ AccountingJournals=Accounting journals
 AccountingJournal=Accounting journal
 NewAccountingJournal=New accounting journal
 ShowAccoutingJournal=Show accounting journal
-Nature=Nature
+NatureOfJournal=Nature of Journal
 AccountingJournalType1=Miscellaneous operations
 AccountingJournalType2=Sales
 AccountingJournalType3=Purchases
@@ -291,6 +291,7 @@ Modelcsv_quadratus=Export for Quadratus QuadraCompta
 Modelcsv_ebp=Export for EBP
 Modelcsv_cogilog=Export for Cogilog
 Modelcsv_agiris=Export for Agiris
+Modelcsv_LDCompta=Export for LD Compta (v9 & higher) (Test)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
@@ -301,7 +302,7 @@ ChartofaccountsId=Chart of accounts Id
 InitAccountancy=Init accountancy
 InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accounting account defined for sales and purchases.
 DefaultBindingDesc=This page can be used to set a default account to use to link transactions record about payment salaries, donation, taxes and vat when no specific accounting account were already set.
-DefaultClosureDesc=This page can be used to set parameters to use to enclose a balance sheet.
+DefaultClosureDesc=This page can be used to set parameters used for accounting closures.
 Options=Options
 OptionModeProductSell=Mode sales
 OptionModeProductSellIntra=Mode sales exported in EEC
diff --git a/htdocs/langs/lo_LA/admin.lang b/htdocs/langs/lo_LA/admin.lang
index f3335cb7b23..4dad4d295f0 100644
--- a/htdocs/langs/lo_LA/admin.lang
+++ b/htdocs/langs/lo_LA/admin.lang
@@ -574,7 +574,7 @@ Module510Name=Salaries
 Module510Desc=Record and track employee payments
 Module520Name=Loans
 Module520Desc=Management of loans
-Module600Name=Notifications
+Module600Name=Notifications on business event
 Module600Desc=Send email notifications triggered by a business event: per user (setup defined on each user), per third-party contacts (setup defined on each third party) or by specific emails
 Module600Long=Note that this module sends emails in real-time when a specific business event occurs. If you are looking for a feature to send email reminders for agenda events, go into the setup of module Agenda.
 Module610Name=Product Variants
@@ -1193,6 +1193,7 @@ ExtraFieldsSupplierOrders=Complementary attributes (orders)
 ExtraFieldsSupplierInvoices=Complementary attributes (invoices)
 ExtraFieldsProject=Complementary attributes (projects)
 ExtraFieldsProjectTask=Complementary attributes (tasks)
+ExtraFieldsSalaries=Complementary attributes (salaries)
 ExtraFieldHasWrongValue=Attribute %s has a wrong value.
 AlphaNumOnlyLowerCharsAndNoSpace=only alphanumericals and lower case characters without space
 SendmailOptionNotComplete=Warning, on some Linux systems, to send email from your email, sendmail execution setup must contains option -ba (parameter mail.force_extra_parameters into your php.ini file). If some recipients never receive emails, try to edit this PHP parameter with mail.force_extra_parameters = -ba).
@@ -1220,13 +1221,14 @@ SuhosinSessionEncrypt=Session storage encrypted by Suhosin
 ConditionIsCurrently=Condition is currently %s
 YouUseBestDriver=You use driver %s which is the best driver currently available.
 YouDoNotUseBestDriver=You use driver %s but driver %s is recommended.
-NbOfProductIsLowerThanNoPb=You have only %s products/services in the database. This does not require any particular optimization.
+NbOfObjectIsLowerThanNoPb=You have only %s %s in the database. This does not require any particular optimization.
 SearchOptim=Search optimization
-YouHaveXProductUseSearchOptim=You have %s products in the database. You should add the constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+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.
 BrowserIsOK=You are using the %s web browser. This browser is ok for security and performance.
 BrowserIsKO=You are using the %s web browser. This browser is known to be a bad choice for security, performance and reliability. We recommend using Firefox, Chrome, Opera or Safari.
-XDebugInstalled=XDebug is loaded.
-XCacheInstalled=XCache is loaded.
+PHPModuleLoaded=PHP component %s is loaded
+PreloadOPCode=Preloaded OPCode is used
 AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.<br>Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp".
 AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".
 AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties.
@@ -1734,9 +1736,9 @@ ExpenseReportsRulesSetup=Setup of module Expense Reports - Rules
 ExpenseReportNumberingModules=Expense reports numbering module
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
 YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for email notifications by enabling and configuring the module "Notification".
-ListOfNotificationsPerUser=List of notifications per user*
-ListOfNotificationsPerUserOrContact=List of notifications (events) available per user* or per contact**
-ListOfFixedNotifications=List of Fixed Notifications
+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
 GoOntoUserCardToAddMore=Go to the tab "Notifications" of a user to add or remove notifications for users
 GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
 Threshold=Threshold
@@ -1898,6 +1900,11 @@ OnMobileOnly=On small screen (smartphone) only
 DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be Prospect or Customer but can't be both)
 MAIN_OPTIMIZEFORTEXTBROWSER=Simplify interface for blind person
 MAIN_OPTIMIZEFORTEXTBROWSERDesc=Enable this option if you are a blind person, or if you use the application from a text browser like Lynx or 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
 ThisValueCanOverwrittenOnUserLevel=This value can be overwritten by each user from its user page - tab '%s'
 DefaultCustomerType=Default thirdparty type for "New customer" creation form
 ABankAccountMustBeDefinedOnPaymentModeSetup=Note: The bank account must be defined on the module of each payment mode (Paypal, Stripe, ...) to have this feature working.
@@ -1911,7 +1918,7 @@ LogsLinesNumber=Number of lines to show on logs tab
 UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
-DebugBarModuleActivated=Module debugbar is activated and slows dramaticaly the interface
+ModuleActivated=Module %s is activated and slows the interface
 EXPORTS_SHARE_MODELS=Export models are share with everybody
 ExportSetup=Setup of module Export
 InstanceUniqueID=Unique ID of the instance
@@ -1928,3 +1935,5 @@ 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
diff --git a/htdocs/langs/lo_LA/bills.lang b/htdocs/langs/lo_LA/bills.lang
index 4f114d4df1c..53535e58b46 100644
--- a/htdocs/langs/lo_LA/bills.lang
+++ b/htdocs/langs/lo_LA/bills.lang
@@ -95,6 +95,7 @@ PaymentHigherThanReminderToPay=Payment higher than reminder to pay
 HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess received for each overpaid invoice.
 HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess paid for each overpaid invoice.
 ClassifyPaid=Classify 'Paid'
+ClassifyUnPaid=Classify 'Unpaid'
 ClassifyPaidPartially=Classify 'Paid partially'
 ClassifyCanceled=Classify 'Abandoned'
 ClassifyClosed=Classify 'Closed'
@@ -214,6 +215,20 @@ ShowInvoiceReplace=Show replacing invoice
 ShowInvoiceAvoir=Show credit note
 ShowInvoiceDeposit=Show down payment invoice
 ShowInvoiceSituation=Show situation invoice
+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
 ShowPayment=Show payment
 AlreadyPaid=Already paid
 AlreadyPaidBack=Already paid back
diff --git a/htdocs/langs/lo_LA/errors.lang b/htdocs/langs/lo_LA/errors.lang
index b5a9d70cb70..1ee46fdbb92 100644
--- a/htdocs/langs/lo_LA/errors.lang
+++ b/htdocs/langs/lo_LA/errors.lang
@@ -90,7 +90,7 @@ ErrorSpecialCharNotAllowedForField=Special characters are not allowed for field
 ErrorNumRefModel=A reference exists into database (%s) and is not compatible with this numbering rule. Remove record or renamed reference to activate this module.
 ErrorQtyTooLowForThisSupplier=Quantity too low for this vendor or no price defined on this product for this vendor
 ErrorOrdersNotCreatedQtyTooLow=Some orders haven't been created because of too-low quantities
-ErrorModuleSetupNotComplete=Setup of module looks to be uncomplete. Go on Home - Setup - Modules to complete.
+ErrorModuleSetupNotComplete=Setup of module %s looks to be uncomplete. Go on Home - Setup - Modules to complete.
 ErrorBadMask=Error on mask
 ErrorBadMaskFailedToLocatePosOfSequence=Error, mask without sequence number
 ErrorBadMaskBadRazMonth=Error, bad reset value
@@ -219,6 +219,7 @@ 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.
 # 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.
 WarningMandatorySetupNotComplete=Click here to setup mandatory parameters
 WarningEnableYourModulesApplications=Click here to enable your modules and applications
diff --git a/htdocs/langs/lo_LA/main.lang b/htdocs/langs/lo_LA/main.lang
index 33d9661f91a..ded9062fdce 100644
--- a/htdocs/langs/lo_LA/main.lang
+++ b/htdocs/langs/lo_LA/main.lang
@@ -445,6 +445,7 @@ ContactsAddressesForCompany=Contacts/addresses for this third party
 AddressesForCompany=Addresses for this third party
 ActionsOnCompany=Events for this third party
 ActionsOnContact=Events for this contact/address
+ActionsOnContract=Events for this contract
 ActionsOnMember=Events about this member
 ActionsOnProduct=Events about this product
 NActionsLate=%s late
@@ -759,6 +760,7 @@ LinkToSupplierProposal=Link to vendor proposal
 LinkToSupplierInvoice=Link to vendor invoice
 LinkToContract=Link to contract
 LinkToIntervention=Link to intervention
+LinkToTicket=Link to ticket
 CreateDraft=Create draft
 SetToDraft=Back to draft
 ClickToEdit=Click to edit
diff --git a/htdocs/langs/lo_LA/products.lang b/htdocs/langs/lo_LA/products.lang
index cba53debed1..2db91fc0e29 100644
--- a/htdocs/langs/lo_LA/products.lang
+++ b/htdocs/langs/lo_LA/products.lang
@@ -2,6 +2,7 @@
 ProductRef=Product ref.
 ProductLabel=Product label
 ProductLabelTranslated=Translated product label
+ProductDescription=Product description
 ProductDescriptionTranslated=Translated product description
 ProductNoteTranslated=Translated product note
 ProductServiceCard=Products/Services card
diff --git a/htdocs/langs/lo_LA/stripe.lang b/htdocs/langs/lo_LA/stripe.lang
index 7a3389f34b7..c5224982873 100644
--- a/htdocs/langs/lo_LA/stripe.lang
+++ b/htdocs/langs/lo_LA/stripe.lang
@@ -65,3 +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>
diff --git a/htdocs/langs/lo_LA/withdrawals.lang b/htdocs/langs/lo_LA/withdrawals.lang
index cbca2b2f103..88e5eaf128c 100644
--- a/htdocs/langs/lo_LA/withdrawals.lang
+++ b/htdocs/langs/lo_LA/withdrawals.lang
@@ -76,7 +76,8 @@ WithdrawalFile=Withdrawal file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and will classify them as "Paid" if remain to pay is null
 StatisticsByLineStatus=Statistics by status of lines
-RUM=UMR
+RUM=Unique Mandate Reference (UMR)
+DateRUM=Mandate signature date
 RUMLong=Unique Mandate Reference
 RUMWillBeGenerated=If empty, a UMR (Unique Mandate Reference) will be generated once the bank account information is saved.
 WithdrawMode=Direct debit mode (FRST or RECUR)
diff --git a/htdocs/langs/lt_LT/accountancy.lang b/htdocs/langs/lt_LT/accountancy.lang
index d3befafadf9..01dda78192d 100644
--- a/htdocs/langs/lt_LT/accountancy.lang
+++ b/htdocs/langs/lt_LT/accountancy.lang
@@ -265,7 +265,7 @@ AccountingJournals=Apskaitos žurnalai
 AccountingJournal=Apskaitos žurnalas
 NewAccountingJournal=Naujas apskaitos žurnalas
 ShowAccoutingJournal=Rodyti apskaitos žurnalą
-Nature=Prigimtis
+NatureOfJournal=Nature of Journal
 AccountingJournalType1=Įvairiarūšės operacijos
 AccountingJournalType2=Pardavimai
 AccountingJournalType3=Pirkimai
@@ -291,6 +291,7 @@ Modelcsv_quadratus=Export for Quadratus QuadraCompta
 Modelcsv_ebp=Export for EBP
 Modelcsv_cogilog=Export for Cogilog
 Modelcsv_agiris=Export for Agiris
+Modelcsv_LDCompta=Export for LD Compta (v9 & higher) (Test)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
@@ -301,7 +302,7 @@ ChartofaccountsId=Chart of accounts Id
 InitAccountancy=Init accountancy
 InitAccountancyDesc=Šis puslapis gali būti naudojamas inicijuoti apskaitos sąskaitą prekėms ir paslaugoms, kurių pardavimo ir pirkimo apibrėžtoje apskaitos sąskaitoje nėra.
 DefaultBindingDesc=This page can be used to set a default account to use to link transactions record about payment salaries, donation, taxes and vat when no specific accounting account were already set.
-DefaultClosureDesc=This page can be used to set parameters to use to enclose a balance sheet.
+DefaultClosureDesc=This page can be used to set parameters used for accounting closures.
 Options=Options
 OptionModeProductSell=Rėžimas pardavimas
 OptionModeProductSellIntra=Mode sales exported in EEC
diff --git a/htdocs/langs/lt_LT/admin.lang b/htdocs/langs/lt_LT/admin.lang
index 40655912693..f8f1ab31a6c 100644
--- a/htdocs/langs/lt_LT/admin.lang
+++ b/htdocs/langs/lt_LT/admin.lang
@@ -574,7 +574,7 @@ Module510Name=Atlyginimai
 Module510Desc=Record and track employee payments
 Module520Name=Paskolos
 Module520Desc=Paskolų valdymas
-Module600Name=Pranešimai
+Module600Name=Notifications on business event
 Module600Desc=Send email notifications triggered by a business event: per user (setup defined on each user), per third-party contacts (setup defined on each third party) or by specific emails
 Module600Long=Note that this module sends emails in real-time when a specific business event occurs. If you are looking for a feature to send email reminders for agenda events, go into the setup of module Agenda.
 Module610Name=Product Variants
@@ -1193,6 +1193,7 @@ ExtraFieldsSupplierOrders=Papildomi požymiai (užsakymai)
 ExtraFieldsSupplierInvoices=Papildomi požymiai (sąskaitos-faktūros)
 ExtraFieldsProject=Papildomi požymiai (projektai)
 ExtraFieldsProjectTask=Papildomi požymiai (užduotys)
+ExtraFieldsSalaries=Complementary attributes (salaries)
 ExtraFieldHasWrongValue=Požymis %s turi klaidingą reikšmę.
 AlphaNumOnlyLowerCharsAndNoSpace=Tik raidiniai-skaitmeniniai simboliai, mažosiomis raidėmis, be tarpų
 SendmailOptionNotComplete=ĮSPĖJIMAS, kai kuriose Linux sistemose, norint siųsti el. laiškus iš savo pašto, vykdymo nuostatose turi būti opcija -ba (parametras mail.force_extra_parameters į savo php.ini failą). Jei kai kurie gavėjai niekada negauna el. laiškų, pabandykite redaguoti šį PHP parametrą su mail.force_extra_parameters = -ba).
@@ -1220,13 +1221,14 @@ SuhosinSessionEncrypt=Sesijų saugykla užšifruota Suhosin
 ConditionIsCurrently=Dabartinė būklė yra %s
 YouUseBestDriver=You use driver %s which is the best driver currently available.
 YouDoNotUseBestDriver=You use driver %s but driver %s is recommended.
-NbOfProductIsLowerThanNoPb=You have only %s products/services in the database. This does not require any particular optimization.
+NbOfObjectIsLowerThanNoPb=You have only %s %s in the database. This does not require any particular optimization.
 SearchOptim=Paieškos optimizavimas
-YouHaveXProductUseSearchOptim=You have %s products in the database. You should add the constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+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.
 BrowserIsOK=You are using the %s web browser. This browser is ok for security and performance.
 BrowserIsKO=You are using the %s web browser. This browser is known to be a bad choice for security, performance and reliability. We recommend using Firefox, Chrome, Opera or Safari.
-XDebugInstalled=XDebug yraužkrautas.
-XCacheInstalled=Xcache yra įkelta.
+PHPModuleLoaded=PHP component %s is loaded
+PreloadOPCode=Preloaded OPCode is used
 AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.<br>Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp".
 AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".
 AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties.
@@ -1734,9 +1736,9 @@ ExpenseReportsRulesSetup=Setup of module Expense Reports - Rules
 ExpenseReportNumberingModules=Expense reports numbering module
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
 YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for email notifications by enabling and configuring the module "Notification".
-ListOfNotificationsPerUser=List of notifications per user*
-ListOfNotificationsPerUserOrContact=List of notifications (events) available per user* or per contact**
-ListOfFixedNotifications=List of Fixed Notifications
+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
 GoOntoUserCardToAddMore=Go to the tab "Notifications" of a user to add or remove notifications for users
 GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
 Threshold=Slenkstis
@@ -1898,6 +1900,11 @@ OnMobileOnly=On small screen (smartphone) only
 DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be Prospect or Customer but can't be both)
 MAIN_OPTIMIZEFORTEXTBROWSER=Simplify interface for blind person
 MAIN_OPTIMIZEFORTEXTBROWSERDesc=Enable this option if you are a blind person, or if you use the application from a text browser like Lynx or 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
 ThisValueCanOverwrittenOnUserLevel=This value can be overwritten by each user from its user page - tab '%s'
 DefaultCustomerType=Default thirdparty type for "New customer" creation form
 ABankAccountMustBeDefinedOnPaymentModeSetup=Note: The bank account must be defined on the module of each payment mode (Paypal, Stripe, ...) to have this feature working.
@@ -1911,7 +1918,7 @@ LogsLinesNumber=Number of lines to show on logs tab
 UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
-DebugBarModuleActivated=Module debugbar is activated and slows dramaticaly the interface
+ModuleActivated=Module %s is activated and slows the interface
 EXPORTS_SHARE_MODELS=Export models are share with everybody
 ExportSetup=Setup of module Export
 InstanceUniqueID=Unique ID of the instance
@@ -1928,3 +1935,5 @@ 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
diff --git a/htdocs/langs/lt_LT/bills.lang b/htdocs/langs/lt_LT/bills.lang
index a0f656f429a..fb86c79720d 100644
--- a/htdocs/langs/lt_LT/bills.lang
+++ b/htdocs/langs/lt_LT/bills.lang
@@ -95,6 +95,7 @@ PaymentHigherThanReminderToPay=Mokėjimas svarbesnis už priminimą sumokėti
 HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess received for each overpaid invoice.
 HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess paid for each overpaid invoice.
 ClassifyPaid=Priskirti 'Apmokėtos'
+ClassifyUnPaid=Classify 'Unpaid'
 ClassifyPaidPartially=Priskirti 'Dalinai apmokėtos'
 ClassifyCanceled=Priskirti 'Neįvykusios'
 ClassifyClosed=Priskirti 'Uždarytos'
@@ -214,6 +215,20 @@ ShowInvoiceReplace=Rodyti pakeičiančią sąskaitą-faktūrą
 ShowInvoiceAvoir=Rodyti kreditinę sąskaitą
 ShowInvoiceDeposit=Show down payment invoice
 ShowInvoiceSituation=Show situation invoice
+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
 ShowPayment=Rodyti mokėjimą
 AlreadyPaid=Jau apmokėta
 AlreadyPaidBack=Mokėjimas jau grąžintas
diff --git a/htdocs/langs/lt_LT/errors.lang b/htdocs/langs/lt_LT/errors.lang
index d7758180fb6..d3fcc029198 100644
--- a/htdocs/langs/lt_LT/errors.lang
+++ b/htdocs/langs/lt_LT/errors.lang
@@ -90,7 +90,7 @@ ErrorSpecialCharNotAllowedForField=Specialūs simboliai neleidžiami laukelyje "
 ErrorNumRefModel=Nuoroda yra į duomenų bazę (%s) ir yra nesuderinama su šiomis numeravimo tasyklėmis. Pašalinkite įrašą arba pervadinkite nuorodą, kad aktyvuoti šį modulį.
 ErrorQtyTooLowForThisSupplier=Quantity too low for this vendor or no price defined on this product for this vendor
 ErrorOrdersNotCreatedQtyTooLow=Some orders haven't been created because of too-low quantities
-ErrorModuleSetupNotComplete=Setup of module looks to be uncomplete. Go on Home - Setup - Modules to complete.
+ErrorModuleSetupNotComplete=Setup of module %s looks to be uncomplete. Go on Home - Setup - Modules to complete.
 ErrorBadMask=Maskavimo (mask) klaida
 ErrorBadMaskFailedToLocatePosOfSequence=Klaida, maskavimas be eilės numeris
 ErrorBadMaskBadRazMonth=Klaida, bloga perkrovimo reikšmė
@@ -219,6 +219,7 @@ 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.
 # 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.
 WarningMandatorySetupNotComplete=Click here to setup mandatory parameters
 WarningEnableYourModulesApplications=Click here to enable your modules and applications
diff --git a/htdocs/langs/lt_LT/main.lang b/htdocs/langs/lt_LT/main.lang
index 77fad226e8f..78e8ba8df8f 100644
--- a/htdocs/langs/lt_LT/main.lang
+++ b/htdocs/langs/lt_LT/main.lang
@@ -445,6 +445,7 @@ ContactsAddressesForCompany=Adresatai/adresai šiai trečiajai šaliai
 AddressesForCompany=Adresai šiai trečiajai šaliai
 ActionsOnCompany=Events for this third party
 ActionsOnContact=Events for this contact/address
+ActionsOnContract=Events for this contract
 ActionsOnMember=Įvykiai su šiuo nariu
 ActionsOnProduct=Events about this product
 NActionsLate=%s vėluoja
@@ -759,6 +760,7 @@ LinkToSupplierProposal=Link to vendor proposal
 LinkToSupplierInvoice=Link to vendor invoice
 LinkToContract=Link to contract
 LinkToIntervention=Link to intervention
+LinkToTicket=Link to ticket
 CreateDraft=Sukurti projektą
 SetToDraft=Atgal į projektą
 ClickToEdit=Spausk redaguoti
diff --git a/htdocs/langs/lt_LT/products.lang b/htdocs/langs/lt_LT/products.lang
index 110c1b650ec..db38cb8e31a 100644
--- a/htdocs/langs/lt_LT/products.lang
+++ b/htdocs/langs/lt_LT/products.lang
@@ -2,6 +2,7 @@
 ProductRef=Produkto nuoroda
 ProductLabel=Produkto etiketė
 ProductLabelTranslated=Translated product label
+ProductDescription=Product description
 ProductDescriptionTranslated=Translated product description
 ProductNoteTranslated=Translated product note
 ProductServiceCard=Produkto / Paslaugos kortelė
diff --git a/htdocs/langs/lt_LT/stripe.lang b/htdocs/langs/lt_LT/stripe.lang
index cbed09acbf1..327ed0661ed 100644
--- a/htdocs/langs/lt_LT/stripe.lang
+++ b/htdocs/langs/lt_LT/stripe.lang
@@ -65,3 +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>
diff --git a/htdocs/langs/lt_LT/withdrawals.lang b/htdocs/langs/lt_LT/withdrawals.lang
index 92eb828c596..4b86443e69a 100644
--- a/htdocs/langs/lt_LT/withdrawals.lang
+++ b/htdocs/langs/lt_LT/withdrawals.lang
@@ -76,7 +76,8 @@ WithdrawalFile=Išėmimo failas
 SetToStatusSent=Nustatyti būklę "Failas išsiųstas"
 ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and will classify them as "Paid" if remain to pay is null
 StatisticsByLineStatus=Eilučių būklės statistika
-RUM=UMR
+RUM=Unique Mandate Reference (UMR)
+DateRUM=Mandate signature date
 RUMLong=Unique Mandate Reference
 RUMWillBeGenerated=If empty, a UMR (Unique Mandate Reference) will be generated once the bank account information is saved.
 WithdrawMode=Direct debit mode (FRST or RECUR)
diff --git a/htdocs/langs/lv_LV/accountancy.lang b/htdocs/langs/lv_LV/accountancy.lang
index 7808991734b..cd7a3f66474 100644
--- a/htdocs/langs/lv_LV/accountancy.lang
+++ b/htdocs/langs/lv_LV/accountancy.lang
@@ -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
-Nature=Daba
+NatureOfJournal=Nature of Journal
 AccountingJournalType1=Dažādas darbības
 AccountingJournalType2=Pārdošanas
 AccountingJournalType3=Pirkumi
@@ -291,6 +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_openconcerto=Eksportēt OpenConcerto (tests)
 Modelcsv_configurable=Eksportēt CSV konfigurējamu
 Modelcsv_FEC=Eksporta FEC
@@ -301,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=Šo lapu var izmantot, lai iestatītu parametrus, kas jāizmanto bilances pievienošanai.
+DefaultClosureDesc=This page can be used to set parameters used for accounting closures.
 Options=Iespējas
 OptionModeProductSell=Mode pārdošana
 OptionModeProductSellIntra=Pārdošanas veids, ko eksportē EEK
diff --git a/htdocs/langs/lv_LV/admin.lang b/htdocs/langs/lv_LV/admin.lang
index 226e333fcd1..7eddfe886cf 100644
--- a/htdocs/langs/lv_LV/admin.lang
+++ b/htdocs/langs/lv_LV/admin.lang
@@ -108,7 +108,7 @@ MultiCurrencySetup=Daudzvalūtu iestatījumi
 MenuLimits=Robežas un precizitāte
 MenuIdParent=Galvenās izvēlnes ID
 DetailMenuIdParent=ID vecāku izvēlnē (tukšs top izvēlnē)
-DetailPosition=Šķirot skaits definēt izvēlnes novietojumu
+DetailPosition=Secības numurs, lai definēt izvēlnes novietojumu
 AllMenus=Viss
 NotConfigured=Modulis / aplikācija nav konfigurēta
 Active=Aktīvs
@@ -574,7 +574,7 @@ Module510Name=Algas
 Module510Desc=Ierakstiet un sekojiet darbinieku maksājumiem
 Module520Name=Aizdevumi
 Module520Desc=Aizdevumu vadība
-Module600Name=Paziņojumi
+Module600Name=Notifications on business event
 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
@@ -1185,7 +1185,7 @@ ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
 ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
 ExtraFieldsThirdParties=Papildus atribūti (trešā persona)
 ExtraFieldsContacts=Papildus atribūti (kontakts/adrese)
-ExtraFieldsMember=Papildinošas atribūti (biedrs)
+ExtraFieldsMember=Papildinošie atribūti (dalībnieks)
 ExtraFieldsMemberType=Papildinošas atribūti (biedrs tipa)
 ExtraFieldsCustomerInvoices=Papildinošas atribūti (rēķini)
 ExtraFieldsCustomerInvoicesRec=Papildu atribūti (veidņu rēķini)
@@ -1193,6 +1193,7 @@ 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)
 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).
@@ -1220,13 +1221,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.
-NbOfProductIsLowerThanNoPb=Jums ir tikai %s produkti/pakalpojumi datu bāzē. Tai nav nepieciešama īpaša optimizācija.
+NbOfObjectIsLowerThanNoPb=You have only %s %s in the database. This does not require any particular optimization.
 SearchOptim=Meklēšanas optimizācija
-YouHaveXProductUseSearchOptim=Jūs esat %s produktu datu bāzē. Jums vajadzētu pievienot pastāvīgo PRODUCT_DONOTSEARCH_ANYWHERE uz 1 vietne Home-Setup-Other. Ierobežojiet meklēšanu ar virkņu sākumu, kas ļauj datubāzei izmantot indeksus, un jums vajadzētu saņemt tūlītēju atbildi.
+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.
 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.
-XDebugInstalled=XDebug ir ielādēts
-XCacheInstalled=XCache ir ielādēts.
+PHPModuleLoaded=PHP component %s is loaded
+PreloadOPCode=Preloaded OPCode is used
 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.
@@ -1286,7 +1288,7 @@ SupplierPaymentSetup=Pārdevēja maksājumu iestatīšana
 ##### Proposals #####
 PropalSetup=Commercial priekšlikumi modulis uzstādīšana
 ProposalsNumberingModules=Komerciālie priekšlikumu numerācijas modeļi
-ProposalsPDFModules=Komerciālie priekšlikumu dokumenti modeļi
+ProposalsPDFModules=Komerciālie priekšlikumu dokumentu modeļi
 SuggestedPaymentModesIfNotDefinedInProposal=Ieteicamais maksājuma režīms pēc piedāvājuma pēc noklusējuma, ja tas nav definēts priekšlikumam
 FreeLegalTextOnProposal=Brīvais teksts komerciālajos priekšlikumos
 WatermarkOnDraftProposal=Ūdenszīme projektu komerciālo priekšlikumu (none ja tukšs)
@@ -1545,7 +1547,7 @@ NewRSS=Jauna RSS barotne
 RSSUrl=RSS links
 RSSUrlExample=Interesants RSS
 ##### Mailing #####
-MailingSetup=Pasta vēstuļu sūtīšanas modulis iestatīšanu
+MailingSetup=Pasta vēstuļu sūtīšanas moduļa iestatīšana
 MailingEMailFrom=Sūtītāja e-pasts (no) e-pasta moduļa sūtītajiem e-pastiem
 MailingEMailError=Atgriezties e-pastā (kļūdas) e-pastiem ar kļūdām
 MailingDelay=Seconds to wait after sending next message
@@ -1734,9 +1736,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=Paziņojumu saraksts katram lietotājam *
-ListOfNotificationsPerUserOrContact=Paziņojumu (notikumu) saraksts, kas pieejami katram lietotājam * vai kontaktam **
-ListOfFixedNotifications=Fiksēto paziņojumu saraksts
+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
 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
@@ -1898,6 +1900,11 @@ 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
+Deuteranopes=Deuteranopes
+Tritanopes=Tritanopes
 ThisValueCanOverwrittenOnUserLevel=Šo vērtību katrs lietotājs var pārrakstīt no lietotāja lapas - cilnes '%s'
 DefaultCustomerType="Jaunā klienta" izveides veidlapas noklusējuma trešās puses veids
 ABankAccountMustBeDefinedOnPaymentModeSetup=Piezīme. Lai veiktu šo funkciju, katra maksājuma režīma modulī (Paypal, Stripe, ...) ir jānosaka bankas konts.
@@ -1911,7 +1918,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
-DebugBarModuleActivated=Moduļa atkļūdošanas josla ir aktivizēta un palēnina saskarni
+ModuleActivated=Module %s is activated and slows the interface
 EXPORTS_SHARE_MODELS=Eksporta modeļi ir kopīgi ar visiem
 ExportSetup=Moduļa Eksportēšana iestatīšana
 InstanceUniqueID=Unikāls gadījuma ID
@@ -1928,3 +1935,5 @@ 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
diff --git a/htdocs/langs/lv_LV/banks.lang b/htdocs/langs/lv_LV/banks.lang
index 4675ef3a14a..8c1b9e53a95 100644
--- a/htdocs/langs/lv_LV/banks.lang
+++ b/htdocs/langs/lv_LV/banks.lang
@@ -30,7 +30,7 @@ AllTime=No sākuma
 Reconciliation=Samierināšanās
 RIB=Bankas konta numurs
 IBAN=IBAN numurs
-BIC=BIC / SWIFT kods
+BIC=BIC/SWIFT kods
 SwiftValid=BIC / SWIFT derīgs
 SwiftVNotalid=BIC/SWIFT nav derīgs
 IbanValid=Derīgs BAN
@@ -71,8 +71,8 @@ IdTransaction=Darījuma ID
 BankTransactions=Bankas ieraksti
 BankTransaction=Bankas ieraksts
 ListTransactions=Saraksta ieraksti
-ListTransactionsByCategory=List entries/category
-TransactionsToConciliate=Entries to reconcile
+ListTransactionsByCategory=Ierakstu saraksti/ sadaļas
+TransactionsToConciliate=Ieraksti, kas jāsaskaņo
 Conciliable=Var saskaņot
 Conciliate=Samierināt
 Conciliation=Samierināšanās
@@ -100,8 +100,8 @@ NotReconciled=Nesaskaņot
 CustomerInvoicePayment=Klienta maksājums
 SupplierInvoicePayment=Piegādātāja maksājums
 SubscriptionPayment=Abonēšanas maksa
-WithdrawalPayment=Debit payment order
-SocialContributionPayment=Social/fiscal tax payment
+WithdrawalPayment=Debeta maksājuma rīkojums
+SocialContributionPayment=Sociālā/fiskālā nodokļa samaksa
 BankTransfer=Bankas pārskaitījums
 BankTransfers=Bankas pārskaitījumi
 MenuBankInternalTransfer=Iekšējā pārsūtīšana
diff --git a/htdocs/langs/lv_LV/bills.lang b/htdocs/langs/lv_LV/bills.lang
index 44f7d7838b1..1e20c7216ae 100644
--- a/htdocs/langs/lv_LV/bills.lang
+++ b/htdocs/langs/lv_LV/bills.lang
@@ -95,8 +95,9 @@ 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'
 ClassifyPaidPartially=Klasificēt 'Apmaksāts daļēji'
-ClassifyCanceled=Klasificēt &quot;Abandoned&quot;
+ClassifyCanceled=Klasificēt “pamestu”
 ClassifyClosed=Klasificēt 'Slēgts'
 ClassifyUnBilled=Klasificēt "neapstiprinātas"
 CreateBill=Izveidot rēķinu
@@ -207,13 +208,27 @@ NumberOfBillsByMonth=Rēķinu skaits mēnesī
 AmountOfBills=Rēķinu summa
 AmountOfBillsHT=Rēķinu summa (bez nodokļiem)
 AmountOfBillsByMonthHT=Summa rēķini mēnesī (neto pēc nodokļiem)
-ShowSocialContribution=Show social/fiscal tax
+ShowSocialContribution=Rādīt sociālo/fiskālo nodokli
 ShowBill=Rādīt rēķinu
 ShowInvoice=Rādīt rēķinu
 ShowInvoiceReplace=Rādīt aizstājošo rēķinu
 ShowInvoiceAvoir=Rādīt kredīta piezīmi
-ShowInvoiceDeposit=Show down payment invoice
+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
 ShowPayment=Rādīt maksājumu
 AlreadyPaid=Jau samaksāts
 AlreadyPaidBack=Jau atgriezta nauda
@@ -221,14 +236,14 @@ AlreadyPaidNoCreditNotesNoDeposits=Jau samaksāts (bez kredīta piezīmes un nog
 Abandoned=Pamests
 RemainderToPay=Neapmaksāts
 RemainderToTake=Atlikusī summa, kas jāsaņem
-RemainderToPayBack=Remaining amount to refund
+RemainderToPayBack=Atlikušā summa atmaksai
 Rest=Gaida
 AmountExpected=Pieprasītā summa
 ExcessReceived=Saņemts pārpalikums
 ExcessPaid=Pārmaksātā summa
 EscompteOffered=Piedāvāta atlaide (maksājums pirms termiņa)
 EscompteOfferedShort=Atlaide
-SendBillRef=Submission of invoice %s
+SendBillRef=Rēķina iesniegšana %s
 SendReminderBillRef=Submission of invoice %s (reminder)
 StandingOrders=Tiešā debeta pasūtījumi
 StandingOrder=Tiešā debeta pasūtījums
@@ -289,11 +304,11 @@ CreditNotesOrExcessReceived=Kredītkritumi vai saņemtie pārsniegumi
 Deposit=Sākuma maksājums
 Deposits=Sākuma maksājumi
 DiscountFromCreditNote=Atlaide no kredīta piezīmes %s
-DiscountFromDeposit=Down payments from invoice %s
+DiscountFromDeposit=Sākuma maksājumi no rēķina %s
 DiscountFromExcessReceived=Maksājumi, kas pārsniedz rēķinu %s
 DiscountFromExcessPaid=Maksājumi, kas pārsniedz rēķinu %s
 AbsoluteDiscountUse=Šis kredīta veids var izmantot rēķinā pirms tās apstiprināšanas
-CreditNoteDepositUse=Invoice must be validated to use this kind of credits
+CreditNoteDepositUse=Rēķins ir jāapstiprina, lai izmantotu šāda veida kredītus
 NewGlobalDiscount=Jauna absolūta atlaide
 NewRelativeDiscount=Jauna relatīva atlaide
 DiscountType=Atlaides veids
@@ -377,12 +392,12 @@ PaymentConditionShortRECEP=Pienākas pēc saņemšanas
 PaymentConditionRECEP=Pienākas pēc saņemšanas
 PaymentConditionShort30D=30 dienas
 PaymentCondition30D=30 dienas
-PaymentConditionShort30DENDMONTH=30 days of month-end
-PaymentCondition30DENDMONTH=Within 30 days following the end of the month
+PaymentConditionShort30DENDMONTH=30 dienas mēneša beigās
+PaymentCondition30DENDMONTH=30 dienu laikā pēc mēneša beigām
 PaymentConditionShort60D=60 dienas
 PaymentCondition60D=60 dienas
-PaymentConditionShort60DENDMONTH=60 days of month-end
-PaymentCondition60DENDMONTH=Within 60 days following the end of the month
+PaymentConditionShort60DENDMONTH=60 dienas mēneša beigās
+PaymentCondition60DENDMONTH=60 dienu laikā pēc mēneša beigām
 PaymentConditionShortPT_DELIVERY=Piegāde
 PaymentConditionPT_DELIVERY=Pēc piegādes
 PaymentConditionShortPT_ORDER=Pasūtījums
@@ -398,13 +413,13 @@ PaymentCondition14D=14 dienas
 PaymentConditionShort14DENDMONTH=Mēneša 14 dienas
 PaymentCondition14DENDMONTH=14 dienu laikā pēc mēneša beigām
 FixAmount=Fiksētā summa
-VarAmount=Mainīgais apjoms (%% tot.)
+VarAmount=Mainīgais apjoms (%% kop.)
 VarAmountOneLine=Mainīgā summa (%% kopā) - 1 rinda ar etiķeti '%s'
 # PaymentType
 PaymentTypeVIR=Bankas pārskaitījums
 PaymentTypeShortVIR=Bankas pārskaitījums
-PaymentTypePRE=Direct debit payment order
-PaymentTypeShortPRE=Debit payment order
+PaymentTypePRE=Tiešā debeta maksājuma rīkojums
+PaymentTypeShortPRE=Debeta maksājuma rīkojums
 PaymentTypeLIQ=Skaidra nauda
 PaymentTypeShortLIQ=Skaidra nauda
 PaymentTypeCB=Kredītkarte
@@ -434,7 +449,7 @@ RegulatedOn=Regulēta uz
 ChequeNumber=Pārbaudiet N °
 ChequeOrTransferNumber=Pārbaudiet / Transfer N °
 ChequeBordereau=Pārbaudīt grafiku
-ChequeMaker=Check/Transfer transmitter
+ChequeMaker=Pārbaudiet / pārsūtiet raidītāju
 ChequeBank=Čeka izsniegšanas banka
 CheckBank=Čeks
 NetToBePaid=Neto jāmaksā
@@ -489,7 +504,7 @@ ToMakePayment=Maksāt
 ToMakePaymentBack=Atmaksāt
 ListOfYourUnpaidInvoices=Saraksts ar neapmaksātiem rēķiniem
 NoteListOfYourUnpaidInvoices=Piezīme: Šis saraksts satur tikai rēķinus par trešo pušu Jums ir saistīti ar kā pārdošanas pārstāvis.
-RevenueStamp=Ieņēmumi zīmogs
+RevenueStamp=Ieņēmumu zīmogs
 YouMustCreateInvoiceFromThird=Šī opcija ir pieejama tikai tad, ja izveidojat rēķinu no trešās personas cilnes "Klients"
 YouMustCreateInvoiceFromSupplierThird=Šī opcija ir pieejama tikai tad, ja izveidojat rēķinu no trešās puses cilnes „Pārdevējs”
 YouMustCreateStandardInvoiceFirstDesc=Vispirms vispirms jāizveido standarta rēķins un jāpārveido tas par "veidni", lai izveidotu jaunu veidnes rēķinu
diff --git a/htdocs/langs/lv_LV/companies.lang b/htdocs/langs/lv_LV/companies.lang
index 349661c2a6f..aa373cac4f1 100644
--- a/htdocs/langs/lv_LV/companies.lang
+++ b/htdocs/langs/lv_LV/companies.lang
@@ -383,7 +383,7 @@ ChangeContactInProcess=Mainīt statusu uz 'Sazināšanās procesā'
 ChangeContactDone=Mainīt statusu uz 'Sazinājāmies'
 ProspectsByStatus=Perspektīvu statuss
 NoParentCompany=Nav
-ExportCardToFormat=Eksporta karti formātā
+ExportCardToFormat=Eksportēt karti uz formātu
 ContactNotLinkedToCompany=Kontakts nav saistīts ar trešajām personām
 DolibarrLogin=Dolibarr pieteikšanās
 NoDolibarrAccess=Nav Dolibarr piekļuve
@@ -416,7 +416,7 @@ UniqueThirdParties=Trešo personu kopskaits
 InActivity=Atvērts
 ActivityCeased=Slēgts
 ThirdPartyIsClosed=Trešā persona ir slēgta
-ProductsIntoElements=List of products/services into %s
+ProductsIntoElements=Produktu/pakalpojumu saraksts %s
 CurrentOutstandingBill=Current outstanding bill
 OutstandingBill=Maks. par izcilu rēķinu
 OutstandingBillReached=Maks. par izcilu rēķinu
diff --git a/htdocs/langs/lv_LV/compta.lang b/htdocs/langs/lv_LV/compta.lang
index a5bfc0331a9..41f8c11125b 100644
--- a/htdocs/langs/lv_LV/compta.lang
+++ b/htdocs/langs/lv_LV/compta.lang
@@ -65,16 +65,16 @@ LT2SupplierIN=SGST pirkumi
 VATCollected=Iekasētais PVN
 ToPay=Jāsamaksā
 SpecialExpensesArea=Sadaļa visiem īpašajiem maksājumiem
-SocialContribution=Social or fiscal tax
-SocialContributions=Social or fiscal taxes
+SocialContribution=Sociālais vai fiskālais nodoklis
+SocialContributions=Sociālie vai fiskālie nodokļi
 SocialContributionsDeductibles=Atskaitāmi sociālie vai fiskālie nodokļi
 SocialContributionsNondeductibles=Nekonkurējoši sociālie vai fiskālie nodokļi
 LabelContrib=Marķējuma ieguldījums
 TypeContrib=Veida iemaksa
 MenuSpecialExpenses=Īpašie izdevumi
 MenuTaxAndDividends=Nodokļi un dividendes
-MenuSocialContributions=Social/fiscal taxes
-MenuNewSocialContribution=New social/fiscal tax
+MenuSocialContributions=Sociālie/fiskālie nodokļi
+MenuNewSocialContribution=Jauns sociālais/fiskālais nodoklis
 NewSocialContribution=New social/fiscal tax
 AddSocialContribution=Pievienot sociālo / fiskālo nodokli
 ContributionsToPay=Social/fiscal taxes to pay
@@ -101,13 +101,13 @@ LT1PaymentES=RE Payment
 LT1PaymentsES=RE Payments
 LT2PaymentES=IRPF Maksājumu
 LT2PaymentsES=IRPF Maksājumi
-VATPayment=Sales tax payment
-VATPayments=Sales tax payments
+VATPayment=Tirdzniecības nodokļa samaksa
+VATPayments=Tirdzniecības nodokļa maksājumi
 VATRefund=PVN atmaksa
 NewVATPayment=Jauns apgrozījuma nodokļa maksājums
 NewLocalTaxPayment=Jauns nodokļa %s maksājums
 Refund=Atmaksa
-SocialContributionsPayments=Social/fiscal taxes payments
+SocialContributionsPayments=Sociālo/fiskālo nodokļu maksājumi
 ShowVatPayment=Rādīt PVN maksājumu
 TotalToPay=Summa
 BalanceVisibilityDependsOnSortAndFilters=Bilance ir redzama šajā sarakstā tikai tad, ja tabula ir sakārtota uz augšu %s un tiek filtrēta 1 bankas kontam.
@@ -132,11 +132,11 @@ NewCheckDepositOn=Izveidot kvīti par depozīta kontā: %s
 NoWaitingChecks=No checks awaiting deposit.
 DateChequeReceived=Pārbaudiet uzņemšanas datumu
 NbOfCheques=Pārbaužu skaits
-PaySocialContribution=Pay a social/fiscal tax
+PaySocialContribution=Maksāt sociālo/fiskālo nodokli
 ConfirmPaySocialContribution=Vai tiešām vēlaties klasificēt šo sociālo vai fiskālo nodokli kā samaksātu?
 DeleteSocialContribution=Dzēst sociālo vai fiskālo nodokļu maksājumu
 ConfirmDeleteSocialContribution=Vai tiešām vēlaties dzēst šo sociālo / fiskālo nodokļu maksājumu?
-ExportDataset_tax_1=Social and fiscal taxes and payments
+ExportDataset_tax_1=Sociālie un fiskālie nodokļi un maksājumi
 CalcModeVATDebt=Mode <b>%sVAT par saistību accounting%s.</b>
 CalcModeVATEngagement=Mode <b>%sVAT par ienākumu-expense%sS.</b>
 CalcModeDebt=Zināma reģistrēto rēķinu analīze, pat ja tie vēl nav uzskaitīti virsgrāmatā.
@@ -148,8 +148,8 @@ CalcModeLT1Rec= Mode <b>%sRE on suppliers invoices%s</b>
 CalcModeLT2= Mode <b>%sIRPF on customer invoices - suppliers invoices%s</b>
 CalcModeLT2Debt=Mode <b>%sIRPF on customer invoices%s</b>
 CalcModeLT2Rec= Mode <b>%sIRPF on suppliers invoices%s</b>
-AnnualSummaryDueDebtMode=Līdzsvars ienākumiem un izdevumiem, gada kopsavilkums
-AnnualSummaryInputOutputMode=Līdzsvars ienākumiem un izdevumiem, gada kopsavilkums
+AnnualSummaryDueDebtMode=Ienākumu un izdevumu bilance, gada kopsavilkums
+AnnualSummaryInputOutputMode=Ienākumu un izdevumu bilance, gada kopsavilkums
 AnnualByCompanies=Ieņēmumu un izdevumu līdzsvars pēc iepriekš definētām kontu grupām
 AnnualByCompaniesDueDebtMode=Ieņēmumu un izdevumu bilance, detalizēti pēc iepriekš definētām grupām, režīms <b> %sClaims-Debts%s </b> norādīja <b> Saistību grāmatvedība </b>.
 AnnualByCompaniesInputOutputMode=Ieņēmumu un izdevumu līdzsvars, detalizēti pēc iepriekš definētām grupām, režīms <b> %sIncomes-Expenses%s </b> norādīja <b> naudas līdzekļu uzskaiti </b>.
diff --git a/htdocs/langs/lv_LV/dict.lang b/htdocs/langs/lv_LV/dict.lang
index 21b821fa218..a56b6837c4a 100644
--- a/htdocs/langs/lv_LV/dict.lang
+++ b/htdocs/langs/lv_LV/dict.lang
@@ -197,7 +197,7 @@ CountryPM=Senpjēra un Mikelona
 CountryVC=Sentvinsenta un Grenadīnas
 CountryWS=Samoa
 CountrySM=San Marino
-CountryST=Santome un Prinsipi
+CountryST=Santome un Principe
 CountryRS=Serbija
 CountrySC=Seišelu salas
 CountrySL=Sierra Leone
diff --git a/htdocs/langs/lv_LV/ecm.lang b/htdocs/langs/lv_LV/ecm.lang
index b6db88ee895..c0290037ad5 100644
--- a/htdocs/langs/lv_LV/ecm.lang
+++ b/htdocs/langs/lv_LV/ecm.lang
@@ -35,7 +35,7 @@ ECMDocsByUsers=Ar lietotājiem saistītie dokumenti
 ECMDocsByInterventions=Documents linked to interventions
 ECMDocsByExpenseReports=Ar izdevumu ziņojumiem saistītie dokumenti
 ECMDocsByHolidays=Ar brīvdienām saistītie dokumenti
-ECMDocsBySupplierProposals=Dokumenti, kas saistīti ar piegādātāju priekšlikumiem
+ECMDocsBySupplierProposals=Dokumenti, kas saistīti ar pārdevēja priekšlikumiem
 ECMNoDirectoryYet=Nav izveidots katalogs
 ShowECMSection=Rādīt katalogu
 DeleteSection=Dzēst direktoriju
diff --git a/htdocs/langs/lv_LV/errors.lang b/htdocs/langs/lv_LV/errors.lang
index a86ec95eb85..27836af5be3 100644
--- a/htdocs/langs/lv_LV/errors.lang
+++ b/htdocs/langs/lv_LV/errors.lang
@@ -55,7 +55,7 @@ ErrorDirNotFound=Directory <b>%s</b> nav atrasts (Bad ceļš, aplamas tiesības
 ErrorFunctionNotAvailableInPHP=Funkcija <b>%s</b> ir nepieciešama šī funkcija, bet nav pieejams šajā versijā / uzstādīšanas PHP.
 ErrorDirAlreadyExists=Direrktorija ar šādu nosaukumu jau pastāv.
 ErrorFileAlreadyExists=Fails ar šādu nosaukumu jau eksistē.
-ErrorPartialFile=Fails nav saņēmusi pilnīgi ar serveri.
+ErrorPartialFile=Serveris failu nav saņemis pilnīgi.
 ErrorNoTmpDir=Pagaidu direktorija %s neeksistē.
 ErrorUploadBlockedByAddon=Augšupielāde bloķēja ar PHP/Apache spraudni.
 ErrorFileSizeTooLarge=Faila izmērs ir pārāk liels.
@@ -64,7 +64,7 @@ ErrorSizeTooLongForVarcharType=Izmērs ir pārāk garš (%s simboli maksimums)
 ErrorNoValueForSelectType=Lūdzu izvēlieties vērtību no saraksta
 ErrorNoValueForCheckBoxType=Lūdzu, aizpildiet vērtību rūtiņu sarakstā
 ErrorNoValueForRadioType=Lūdzu, aizpildiet vērtību radio pogu sarakstā
-ErrorBadFormatValueList=The list value cannot have more than one comma: <u>%s</u>, but need at least one: key,value
+ErrorBadFormatValueList=Saraksta vērtībā nedrīkst būt vairāk par vienu komatu: <u>%s</u> , bet tai ir nepieciešams vismaz viena: atslēga, vērtība
 ErrorFieldCanNotContainSpecialCharacters=Laukā <b> %s </b> nedrīkst būt īpašas rakstzīmes.
 ErrorFieldCanNotContainSpecialNorUpperCharacters=Laukā <b> %s </b> nedrīkst būt speciālās rakstzīmes vai lielformāta rakstzīmes, un tajos nedrīkst būt tikai cipari.
 ErrorFieldMustHaveXChar=Laukā <b>%s</b>jābūt vismaz %s rakstzīmēm.
@@ -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 looks to be uncomplete. Go on Home - Setup - Modules to complet
+ErrorModuleSetupNotComplete=Setup of module %s looks to be uncomplete. Go on Home - Setup - Modules to complete.
 ErrorBadMask=Kļūda masku
 ErrorBadMaskFailedToLocatePosOfSequence=Kļūda, maska ​​bez kārtas numuru
 ErrorBadMaskBadRazMonth=Kļūdas, slikta reset vērtība
@@ -219,6 +219,7 @@ 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.
 # 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.
 WarningMandatorySetupNotComplete=Noklikšķiniet šeit, lai iestatītu obligātos parametrus
 WarningEnableYourModulesApplications=Noklikšķiniet šeit, lai iespējotu moduļus un lietojumprogrammas
diff --git a/htdocs/langs/lv_LV/exports.lang b/htdocs/langs/lv_LV/exports.lang
index 043b2ee0583..4f7708caaea 100644
--- a/htdocs/langs/lv_LV/exports.lang
+++ b/htdocs/langs/lv_LV/exports.lang
@@ -13,11 +13,11 @@ NotImportedFields=Jomas avota failā nav importēti
 SaveExportModel=Saglabājiet atlases kā eksporta profilu / veidni (atkārtotai izmantošanai).
 SaveImportModel=Saglabājiet šo importa profilu (lai to atkārtoti izmantotu) ...
 ExportModelName=Eksportēšanas profila nosaukums
-ExportModelSaved=Eksporta profils tiek saglabāts kā <b> %s </b>.
+ExportModelSaved=Eksporta profils tiek saglabāts kā <b>%s</b>.
 ExportableFields=Eksportējami lauki
 ExportedFields=Eksportēti lauki
 ImportModelName=Importēšanas profila nosaukums
-ImportModelSaved=Importa profils tiek saglabāts kā <b> %s </b>.
+ImportModelSaved=Importa profils tiek saglabāts kā <b>%s</b>.
 DatasetToExport=Datu kopas eksports
 DatasetToImport=Importēt failu datu kopā
 ChooseFieldsOrdersAndTitle=Izvēlieties lauku secību ...
@@ -44,7 +44,7 @@ LineDescription=Līnijas apraksts
 LineUnitPrice=Vienības cenas līnija
 LineVATRate=PVN likme līnijas
 LineQty=Daudzums līnijas
-LineTotalHT=Summa bez nodokļiem līnijas
+LineTotalHT=Summa, neskaitot nodoklis par līniju
 LineTotalTTC=Summa ar nodokļiem līniju
 LineTotalVAT=PVN summu, par līnijas
 TypeOfLineServiceOrProduct=Veids (0=produkts, 1=pakalpojums)
@@ -68,7 +68,7 @@ FieldsTarget=Mērķtiecīga lauki
 FieldTarget=Mērķtiecīga lauks
 FieldSource=Avota lauks
 NbOfSourceLines=Līniju skaits avota failā
-NowClickToTestTheImport=Pārbaudiet iestatīto importēšanas iestatījumu (pārbaudiet, vai jums ir jāizslēdz galvenes līnijas vai arī tās tiks atzīmētas kā kļūdas nākamajā simulācijā). <br> Noklikšķiniet uz pogas <b> %s </ b>, lai veiktu čeku no faila struktūras / satura un imitē importa procesu. <br> <b> Jūsu datubāzē dati netiks mainīti </ b>.
+NowClickToTestTheImport=Pārbaudiet, vai faila formāts (lauka un virknes norobežotāji) atbilst redzamajām opcijām un ka esat izlaidis galvenes rindu, vai arī šie simboli tiks atzīmēti kā kļūdas. <br> Noklikšķiniet uz "<b> %s </b> "poga, lai veiktu faila struktūras / satura pārbaudi un imitētu importa procesu. <br> <b> Jūsu datu bāzē dati netiks mainīti </b>.
 RunSimulateImportFile=Palaist importa simulāciju
 FieldNeedSource=Šim laukam nepieciešami dati no avota faila
 SomeMandatoryFieldHaveNoSource=Daži obligātie lauki nav avotu, no datu faila
@@ -78,14 +78,14 @@ SelectAtLeastOneField=Pārslēgt vismaz vienu avota lauku slejā jomās eksport
 SelectFormat=Izvēlieties šo importa failu formātu
 RunImportFile=Importēt datus
 NowClickToRunTheImport=Pārbaudiet importa simulācijas rezultātus. Labojiet kļūdas un atkārtojiet testu. <br> Kad simulācijā nav kļūdu, jūs varat turpināt importēt datus datu bāzē.
-DataLoadedWithId=Visi dati tiks ielādēti ar šādu importa ID: <b> %s </b>, lai iespējotu meklēšanu šajā datu kopā, ja nākotnē atklāsiet problēmas.
+DataLoadedWithId=Importētajiem datiem katrā datu bāzes tabulā būs papildu lauks ar šo ievešanas ID: <b> %s </b>, lai ļautu tai atrast meklēšanu, ja tiek izmeklēta ar šo importu saistīta problēma.
 ErrorMissingMandatoryValue=Obligātie dati avota failā ir tukši laukā <b> %s </b>.
 TooMuchErrors=Vēl ir <b> %s </b> citas avota līnijas ar kļūdām, taču izlaide ir ierobežota.
 TooMuchWarnings=Vēl ir <b> %s </b> citas avota līnijas ar brīdinājumiem, bet izlaide ir ierobežota.
 EmptyLine=Tukšas līnijas (tiks izmestas)
 CorrectErrorBeforeRunningImport=Jums <b> ir </b> jāizlabo visas kļūdas <b> pirms </b> varat veikt importu.
 FileWasImported=Fails tika importēts ar numuru <b>%s.</b>
-YouCanUseImportIdToFindRecord=Jūs varat atrast visus importētos ierakstus savā datubāzē, filtrējot laukā <b> import_key = '%s' </b>.
+YouCanUseImportIdToFindRecord=Visus importētos ierakstus varat atrast savā datu bāzē, filtrējot laukā <b>import_key = '%s'</b> .
 NbOfLinesOK=Skaits līniju bez kļūdām un bez brīdinājumiem: <b>%s.</b>
 NbOfLinesImported=Skaits līniju veiksmīgi importēto: <b>%s.</b>
 DataComeFromNoWhere=Vērtību, lai ievietotu nāk no nekur avota failā.
@@ -100,8 +100,8 @@ SourceExample=Piemērs par iespējamo datu vērtības
 ExampleAnyRefFoundIntoElement=Jebkura atsauce atrasts elementu <b>%s</b>
 ExampleAnyCodeOrIdFoundIntoDictionary=Any code (or id) found into dictionary <b>%s</b>
 CSVFormatDesc=<b> Kumijas atdalītas vērtības </ b> faila formāts (.csv). <br> Šis ir teksta faila formāts, kurā lauki atdala ar atdalītāju [%s]. Ja lauka saturā atrodas atdalītājs, lauku noapaļo apaļa formā [%s]. Escape raksturs, lai izvairītos no apaļa raksturs ir [%s].
-Excel95FormatDesc=<b> Excel </ b> faila formāts (.xls) <br> Šis ir iekšējais Excel 95 formāts (BIFF5).
-Excel2007FormatDesc=<b> Excel </ b> faila formāts (.xlsx) <br> Šis ir vietējais Excel 2007 formāts (SpreadsheetML).
+Excel95FormatDesc=<b>Excel</b> faila formāts (.xls) <br> Šis ir iekšējais Excel 95 formāts (BIFF5).
+Excel2007FormatDesc=<b>Excel</b> faila formāts (.xlsx) <br> Šis ir Excel 2007 formāts (SpreadsheetML).
 TsvFormatDesc=<b>Tab atdalītu vērtību</b> failu formāts (. TSV) <br> Tas ir teksta faila formāts, kur lauki ir atdalīti ar tabulācijas [Tab].
 ExportFieldAutomaticallyAdded=Field <b>%s</b> was automatically added. It will avoid you to have similar lines to be treated as duplicate record (with this field added, all lines will own their own id and will differ).
 CsvOptions=CSV formāta opcijas
@@ -109,14 +109,14 @@ Separator=Lauka atdalītājs
 Enclosure=Virknes atdalītājs
 SpecialCode=Speciāls kods
 ExportStringFilter=%% allows replacing one or more characters in the text
-ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : filters by one year/month/day<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD : filters over a range of years/months/days<br> > YYYY, > YYYYMM, > YYYYMMDD : filters on all following years/months/days<br> < YYYY, < YYYYMM, < YYYYMMDD : filters on all previous years/months/days
+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
-ImportFromToLine=Ierobežojuma diapazons (no - līdz), piem. izlaist galvenes līniju
-SetThisValueTo2ToExcludeFirstLine=For example, set this value to 3 to exclude the 2 first lines
-KeepEmptyToGoToEndOfFile=Saglabājiet šo lauku tukšu, lai pārietu uz faila beigām
-SelectPrimaryColumnsForUpdateAttempt=Atlasiet kolonnu (-es), kuru izmantojat kā primāro atslēgu atjaunināšanas mēģinājumam
+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.
+SelectPrimaryColumnsForUpdateAttempt=Atlasiet kolonnu (-as), ko izmantot kā primāro atslēgu UPDATE importēšanai
 UpdateNotYetSupportedForThisImport=Šī veida importa atjaunināšana nav atbalstīta (tikai ievietot).
 NoUpdateAttempt=Netika veikts atjaunināšanas mēģinājums, tikai ievietojiet
 ImportDataset_user_1=Lietotāji (darbinieki vai ne) un īpašumi
@@ -124,7 +124,7 @@ ComputedField=Aprēķinātais lauks
 ## filters
 SelectFilterFields=Ja jūs vēlaties filtrēt dažas vērtības, vienkārši ievadi vērtības šeit.
 FilteredFields=Filtrētie lauki
-FilteredFieldsValues=Cenas filtru
+FilteredFieldsValues=Filtra vērtība
 FormatControlRule=Format control rule
 ## imports updates
 KeysToUseForUpdates=Atslēga (sleja), ko izmantot esošo datu <b> atjaunināšanai </ b>
diff --git a/htdocs/langs/lv_LV/help.lang b/htdocs/langs/lv_LV/help.lang
index 48124086432..0482ffc903b 100644
--- a/htdocs/langs/lv_LV/help.lang
+++ b/htdocs/langs/lv_LV/help.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - help
 CommunitySupport=Forums / Vikipēdijas atbalsts
 EMailSupport=E-pasta atbalsts
-RemoteControlSupport=Tiešsaistes reālā laika / tālvadības atbalsts
+RemoteControlSupport=Tiešsaistes reālā laika/tālvadības atbalsts
 OtherSupport=Cits atbalsts
 ToSeeListOfAvailableRessources=Lai sazinātos / skatītu pieejamos resursus:
 HelpCenter=Palīdzības centrs
diff --git a/htdocs/langs/lv_LV/holiday.lang b/htdocs/langs/lv_LV/holiday.lang
index 943bea2de07..c47d52c0704 100644
--- a/htdocs/langs/lv_LV/holiday.lang
+++ b/htdocs/langs/lv_LV/holiday.lang
@@ -77,12 +77,12 @@ UserCP=Lietotājs
 ErrorAddEventToUserCP=Pievienojot ārpuskārtas atvaļinājumu, radās kļūda.
 AddEventToUserOkCP=Par ārkārtas atvaļinājumu papildinājums ir pabeigta.
 MenuLogCP=Skatīt izmaiņu žurnālus
-LogCP=Log of updates of available vacation days
+LogCP=Pieejamo atvaļinājumu dienu atjauninājumu žurnāls
 ActionByCP=Veic
 UserUpdateCP=Lietotājam
 PrevSoldeCP=Iepriekšējā bilance
 NewSoldeCP=Jana Bilance
-alreadyCPexist=A leave request has already been done on this period.
+alreadyCPexist=Šajā periodā atvaļinājuma pieprasījums jau ir veikts.
 FirstDayOfHoliday=Pirmā atvaļinājuma diena
 LastDayOfHoliday=Pēdēja atvaļinājuma diena
 BoxTitleLastLeaveRequests=Jaunākie %s labotie atvaļinājumu pieprasījumi
@@ -101,7 +101,7 @@ LEAVE_SICK=Slimības lapa
 LEAVE_OTHER=Cits atvaļinājums
 LEAVE_PAID_FR=Apmaksāts atvaļinājums
 ## Configuration du Module ##
-LastUpdateCP=Jaunākais automātiska atvaļinājuma piešķiršanas atjaunināšana
+LastUpdateCP=Jaunākais atvaļinājumu piešķiršanas atjauninājums
 MonthOfLastMonthlyUpdate=Pēdējā automātiskā atvaļinājuma piešķiršanas mēneša pēdējā mēneša laikā
 UpdateConfCPOK=Veiksmīgi atjaunināta.
 Module27130Name= Atvaļinājuma pieprasījumu pārvaldība
diff --git a/htdocs/langs/lv_LV/install.lang b/htdocs/langs/lv_LV/install.lang
index 615fb3cce42..28d768c312e 100644
--- a/htdocs/langs/lv_LV/install.lang
+++ b/htdocs/langs/lv_LV/install.lang
@@ -4,7 +4,7 @@ MiscellaneousChecks=Priekšnoteikumu pārbaude
 ConfFileExists=Konfigurācijas fails <b>%s</b> eksistē.
 ConfFileDoesNotExistsAndCouldNotBeCreated=Konfigurācijas fails <b> %s </b> nepastāv un to nevarēja izveidot!
 ConfFileCouldBeCreated=Konfigurācijas failu <b>%s</b> var izveidot.
-ConfFileIsNotWritable=Konfigurācijas fails <b> %s </ b> nav rakstāms. Pārbaudīt atļaujas. Pirmajai instalēšanai jūsu tīmekļa serverim jāspēj rakstīt šajā failā konfigurācijas procesa laikā ("chmod 666", piemēram, operētājsistēmā Unix, piemēram).
+ConfFileIsNotWritable=Konfigurācijas failā <b>%s</b>  nevar ierakstīt. Pārbaudīt atļaujas. Pirmajai instalēšanai jūsu tīmekļa serverim jāspēj rakstīt šajā failā konfigurācijas procesa laikā ("chmod 666", piemērs, operētājsistēmai Unix).
 ConfFileIsWritable=Konfigurācijas failā <b>%s</b> var ierakstīt.
 ConfFileMustBeAFileNotADir=Konfigurācijas failam <b> %s </b> jābūt failam, nevis direktorijai.
 ConfFileReload=Pārsūtot parametrus no konfigurācijas faila.
@@ -40,7 +40,7 @@ License=Izmantojot licenci
 ConfigurationFile=Konfigurācijas fails
 WebPagesDirectory=Katalogs kur web lapas tiek uzglabātas
 DocumentsDirectory=Direktorija kurā uzglabāt augšupielādētos un ģenerētos  dokumentus
-URLRoot=URL Root
+URLRoot=URL sakne
 ForceHttps=Piespiedu drošais savienojums (https)
 CheckToForceHttps=Pārbaudiet šo opciju, lai piespiestu drošus savienojumus (https). <br> Tas nozīmē, ka tīmekļa serveris ir konfigurēts ar SSL sertifikātu.
 DolibarrDatabase=Dolibarr datubāze
diff --git a/htdocs/langs/lv_LV/main.lang b/htdocs/langs/lv_LV/main.lang
index 96717fe3a56..567160c1ec8 100644
--- a/htdocs/langs/lv_LV/main.lang
+++ b/htdocs/langs/lv_LV/main.lang
@@ -445,6 +445,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
 ActionsOnMember=Pasākumi par šo locekli
 ActionsOnProduct=Notikumi ar šo produktu
 NActionsLate=%s vēlu
@@ -759,6 +760,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
 CreateDraft=Izveidot melnrakstu
 SetToDraft=Atpakaļ uz melnrakstu
 ClickToEdit=Klikšķiniet, lai rediģētu
diff --git a/htdocs/langs/lv_LV/products.lang b/htdocs/langs/lv_LV/products.lang
index 7db31a84a8e..afa35a4b839 100644
--- a/htdocs/langs/lv_LV/products.lang
+++ b/htdocs/langs/lv_LV/products.lang
@@ -2,6 +2,7 @@
 ProductRef=Produkta ref.
 ProductLabel=Produkta marķējums
 ProductLabelTranslated=Tulkots produkta nosaukums
+ProductDescription=Product description
 ProductDescriptionTranslated=Tulkotā produkta apraksts
 ProductNoteTranslated=Tulkota produkta piezīme
 ProductServiceCard=Produktu / Pakalpojumu kartiņa
diff --git a/htdocs/langs/lv_LV/stripe.lang b/htdocs/langs/lv_LV/stripe.lang
index 32c2bb4722f..ae403d0fee8 100644
--- a/htdocs/langs/lv_LV/stripe.lang
+++ b/htdocs/langs/lv_LV/stripe.lang
@@ -65,3 +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>
diff --git a/htdocs/langs/lv_LV/withdrawals.lang b/htdocs/langs/lv_LV/withdrawals.lang
index 841f1627174..f91254633f6 100644
--- a/htdocs/langs/lv_LV/withdrawals.lang
+++ b/htdocs/langs/lv_LV/withdrawals.lang
@@ -76,7 +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=RUM
+RUM=Unique Mandate Reference (UMR)
+DateRUM=Mandate signature date
 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/accountancy.lang b/htdocs/langs/mk_MK/accountancy.lang
index 758d9c340a5..1fc3b3e05ec 100644
--- a/htdocs/langs/mk_MK/accountancy.lang
+++ b/htdocs/langs/mk_MK/accountancy.lang
@@ -265,7 +265,7 @@ AccountingJournals=Accounting journals
 AccountingJournal=Accounting journal
 NewAccountingJournal=New accounting journal
 ShowAccoutingJournal=Show accounting journal
-Nature=Nature
+NatureOfJournal=Nature of Journal
 AccountingJournalType1=Miscellaneous operations
 AccountingJournalType2=Sales
 AccountingJournalType3=Purchases
@@ -291,6 +291,7 @@ Modelcsv_quadratus=Export for Quadratus QuadraCompta
 Modelcsv_ebp=Export for EBP
 Modelcsv_cogilog=Export for Cogilog
 Modelcsv_agiris=Export for Agiris
+Modelcsv_LDCompta=Export for LD Compta (v9 & higher) (Test)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
@@ -301,7 +302,7 @@ ChartofaccountsId=Chart of accounts Id
 InitAccountancy=Init accountancy
 InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accounting account defined for sales and purchases.
 DefaultBindingDesc=This page can be used to set a default account to use to link transactions record about payment salaries, donation, taxes and vat when no specific accounting account were already set.
-DefaultClosureDesc=This page can be used to set parameters to use to enclose a balance sheet.
+DefaultClosureDesc=This page can be used to set parameters used for accounting closures.
 Options=Options
 OptionModeProductSell=Mode sales
 OptionModeProductSellIntra=Mode sales exported in EEC
diff --git a/htdocs/langs/mk_MK/admin.lang b/htdocs/langs/mk_MK/admin.lang
index c021eeb4cff..fc4715fc86d 100644
--- a/htdocs/langs/mk_MK/admin.lang
+++ b/htdocs/langs/mk_MK/admin.lang
@@ -574,7 +574,7 @@ Module510Name=Плати
 Module510Desc=Record and track employee payments
 Module520Name=Loans
 Module520Desc=Management of loans
-Module600Name=Notifications
+Module600Name=Notifications on business event
 Module600Desc=Send email notifications triggered by a business event: per user (setup defined on each user), per third-party contacts (setup defined on each third party) or by specific emails
 Module600Long=Note that this module sends emails in real-time when a specific business event occurs. If you are looking for a feature to send email reminders for agenda events, go into the setup of module Agenda.
 Module610Name=Product Variants
@@ -1193,6 +1193,7 @@ ExtraFieldsSupplierOrders=Complementary attributes (orders)
 ExtraFieldsSupplierInvoices=Complementary attributes (invoices)
 ExtraFieldsProject=Complementary attributes (projects)
 ExtraFieldsProjectTask=Complementary attributes (tasks)
+ExtraFieldsSalaries=Complementary attributes (salaries)
 ExtraFieldHasWrongValue=Attribute %s has a wrong value.
 AlphaNumOnlyLowerCharsAndNoSpace=only alphanumericals and lower case characters without space
 SendmailOptionNotComplete=Warning, on some Linux systems, to send email from your email, sendmail execution setup must contains option -ba (parameter mail.force_extra_parameters into your php.ini file). If some recipients never receive emails, try to edit this PHP parameter with mail.force_extra_parameters = -ba).
@@ -1220,13 +1221,14 @@ SuhosinSessionEncrypt=Session storage encrypted by Suhosin
 ConditionIsCurrently=Condition is currently %s
 YouUseBestDriver=You use driver %s which is the best driver currently available.
 YouDoNotUseBestDriver=You use driver %s but driver %s is recommended.
-NbOfProductIsLowerThanNoPb=You have only %s products/services in the database. This does not require any particular optimization.
+NbOfObjectIsLowerThanNoPb=You have only %s %s in the database. This does not require any particular optimization.
 SearchOptim=Search optimization
-YouHaveXProductUseSearchOptim=You have %s products in the database. You should add the constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+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.
 BrowserIsOK=You are using the %s web browser. This browser is ok for security and performance.
 BrowserIsKO=You are using the %s web browser. This browser is known to be a bad choice for security, performance and reliability. We recommend using Firefox, Chrome, Opera or Safari.
-XDebugInstalled=XDebug is loaded.
-XCacheInstalled=XCache is loaded.
+PHPModuleLoaded=PHP component %s is loaded
+PreloadOPCode=Preloaded OPCode is used
 AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.<br>Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp".
 AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".
 AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties.
@@ -1734,9 +1736,9 @@ ExpenseReportsRulesSetup=Setup of module Expense Reports - Rules
 ExpenseReportNumberingModules=Expense reports numbering module
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
 YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for email notifications by enabling and configuring the module "Notification".
-ListOfNotificationsPerUser=List of notifications per user*
-ListOfNotificationsPerUserOrContact=List of notifications (events) available per user* or per contact**
-ListOfFixedNotifications=List of Fixed Notifications
+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
 GoOntoUserCardToAddMore=Go to the tab "Notifications" of a user to add or remove notifications for users
 GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
 Threshold=Threshold
@@ -1898,6 +1900,11 @@ OnMobileOnly=On small screen (smartphone) only
 DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be Prospect or Customer but can't be both)
 MAIN_OPTIMIZEFORTEXTBROWSER=Simplify interface for blind person
 MAIN_OPTIMIZEFORTEXTBROWSERDesc=Enable this option if you are a blind person, or if you use the application from a text browser like Lynx or 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
 ThisValueCanOverwrittenOnUserLevel=This value can be overwritten by each user from its user page - tab '%s'
 DefaultCustomerType=Default thirdparty type for "New customer" creation form
 ABankAccountMustBeDefinedOnPaymentModeSetup=Note: The bank account must be defined on the module of each payment mode (Paypal, Stripe, ...) to have this feature working.
@@ -1911,7 +1918,7 @@ LogsLinesNumber=Number of lines to show on logs tab
 UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
-DebugBarModuleActivated=Module debugbar is activated and slows dramaticaly the interface
+ModuleActivated=Module %s is activated and slows the interface
 EXPORTS_SHARE_MODELS=Export models are share with everybody
 ExportSetup=Setup of module Export
 InstanceUniqueID=Unique ID of the instance
@@ -1928,3 +1935,5 @@ 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
diff --git a/htdocs/langs/mk_MK/bills.lang b/htdocs/langs/mk_MK/bills.lang
index aef2b5fce2f..10e23576099 100644
--- a/htdocs/langs/mk_MK/bills.lang
+++ b/htdocs/langs/mk_MK/bills.lang
@@ -95,6 +95,7 @@ PaymentHigherThanReminderToPay=Payment higher than reminder to pay
 HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess received for each overpaid invoice.
 HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess paid for each overpaid invoice.
 ClassifyPaid=Classify 'Paid'
+ClassifyUnPaid=Classify 'Unpaid'
 ClassifyPaidPartially=Classify 'Paid partially'
 ClassifyCanceled=Classify 'Abandoned'
 ClassifyClosed=Classify 'Closed'
@@ -214,6 +215,20 @@ ShowInvoiceReplace=Show replacing invoice
 ShowInvoiceAvoir=Show credit note
 ShowInvoiceDeposit=Show down payment invoice
 ShowInvoiceSituation=Show situation invoice
+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
 ShowPayment=Show payment
 AlreadyPaid=Already paid
 AlreadyPaidBack=Already paid back
diff --git a/htdocs/langs/mk_MK/errors.lang b/htdocs/langs/mk_MK/errors.lang
index b5a9d70cb70..1ee46fdbb92 100644
--- a/htdocs/langs/mk_MK/errors.lang
+++ b/htdocs/langs/mk_MK/errors.lang
@@ -90,7 +90,7 @@ ErrorSpecialCharNotAllowedForField=Special characters are not allowed for field
 ErrorNumRefModel=A reference exists into database (%s) and is not compatible with this numbering rule. Remove record or renamed reference to activate this module.
 ErrorQtyTooLowForThisSupplier=Quantity too low for this vendor or no price defined on this product for this vendor
 ErrorOrdersNotCreatedQtyTooLow=Some orders haven't been created because of too-low quantities
-ErrorModuleSetupNotComplete=Setup of module looks to be uncomplete. Go on Home - Setup - Modules to complete.
+ErrorModuleSetupNotComplete=Setup of module %s looks to be uncomplete. Go on Home - Setup - Modules to complete.
 ErrorBadMask=Error on mask
 ErrorBadMaskFailedToLocatePosOfSequence=Error, mask without sequence number
 ErrorBadMaskBadRazMonth=Error, bad reset value
@@ -219,6 +219,7 @@ 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.
 # 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.
 WarningMandatorySetupNotComplete=Click here to setup mandatory parameters
 WarningEnableYourModulesApplications=Click here to enable your modules and applications
diff --git a/htdocs/langs/mk_MK/main.lang b/htdocs/langs/mk_MK/main.lang
index 7fee58b853b..0982c8b0195 100644
--- a/htdocs/langs/mk_MK/main.lang
+++ b/htdocs/langs/mk_MK/main.lang
@@ -445,6 +445,7 @@ ContactsAddressesForCompany=Contacts/addresses for this third party
 AddressesForCompany=Addresses for this third party
 ActionsOnCompany=Events for this third party
 ActionsOnContact=Events for this contact/address
+ActionsOnContract=Events for this contract
 ActionsOnMember=Events about this member
 ActionsOnProduct=Events about this product
 NActionsLate=%s late
@@ -759,6 +760,7 @@ LinkToSupplierProposal=Link to vendor proposal
 LinkToSupplierInvoice=Link to vendor invoice
 LinkToContract=Link to contract
 LinkToIntervention=Link to intervention
+LinkToTicket=Link to ticket
 CreateDraft=Create draft
 SetToDraft=Back to draft
 ClickToEdit=Click to edit
diff --git a/htdocs/langs/mk_MK/products.lang b/htdocs/langs/mk_MK/products.lang
index 7b68f5b3ebd..73e672284de 100644
--- a/htdocs/langs/mk_MK/products.lang
+++ b/htdocs/langs/mk_MK/products.lang
@@ -2,6 +2,7 @@
 ProductRef=Product ref.
 ProductLabel=Product label
 ProductLabelTranslated=Translated product label
+ProductDescription=Product description
 ProductDescriptionTranslated=Translated product description
 ProductNoteTranslated=Translated product note
 ProductServiceCard=Products/Services card
diff --git a/htdocs/langs/mk_MK/stripe.lang b/htdocs/langs/mk_MK/stripe.lang
index 7a3389f34b7..c5224982873 100644
--- a/htdocs/langs/mk_MK/stripe.lang
+++ b/htdocs/langs/mk_MK/stripe.lang
@@ -65,3 +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>
diff --git a/htdocs/langs/mk_MK/withdrawals.lang b/htdocs/langs/mk_MK/withdrawals.lang
index cbca2b2f103..88e5eaf128c 100644
--- a/htdocs/langs/mk_MK/withdrawals.lang
+++ b/htdocs/langs/mk_MK/withdrawals.lang
@@ -76,7 +76,8 @@ WithdrawalFile=Withdrawal file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and will classify them as "Paid" if remain to pay is null
 StatisticsByLineStatus=Statistics by status of lines
-RUM=UMR
+RUM=Unique Mandate Reference (UMR)
+DateRUM=Mandate signature date
 RUMLong=Unique Mandate Reference
 RUMWillBeGenerated=If empty, a UMR (Unique Mandate Reference) will be generated once the bank account information is saved.
 WithdrawMode=Direct debit mode (FRST or RECUR)
diff --git a/htdocs/langs/mn_MN/accountancy.lang b/htdocs/langs/mn_MN/accountancy.lang
index 758d9c340a5..1fc3b3e05ec 100644
--- a/htdocs/langs/mn_MN/accountancy.lang
+++ b/htdocs/langs/mn_MN/accountancy.lang
@@ -265,7 +265,7 @@ AccountingJournals=Accounting journals
 AccountingJournal=Accounting journal
 NewAccountingJournal=New accounting journal
 ShowAccoutingJournal=Show accounting journal
-Nature=Nature
+NatureOfJournal=Nature of Journal
 AccountingJournalType1=Miscellaneous operations
 AccountingJournalType2=Sales
 AccountingJournalType3=Purchases
@@ -291,6 +291,7 @@ Modelcsv_quadratus=Export for Quadratus QuadraCompta
 Modelcsv_ebp=Export for EBP
 Modelcsv_cogilog=Export for Cogilog
 Modelcsv_agiris=Export for Agiris
+Modelcsv_LDCompta=Export for LD Compta (v9 & higher) (Test)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
@@ -301,7 +302,7 @@ ChartofaccountsId=Chart of accounts Id
 InitAccountancy=Init accountancy
 InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accounting account defined for sales and purchases.
 DefaultBindingDesc=This page can be used to set a default account to use to link transactions record about payment salaries, donation, taxes and vat when no specific accounting account were already set.
-DefaultClosureDesc=This page can be used to set parameters to use to enclose a balance sheet.
+DefaultClosureDesc=This page can be used to set parameters used for accounting closures.
 Options=Options
 OptionModeProductSell=Mode sales
 OptionModeProductSellIntra=Mode sales exported in EEC
diff --git a/htdocs/langs/mn_MN/admin.lang b/htdocs/langs/mn_MN/admin.lang
index f30d6edd9f7..2e27c6fe81f 100644
--- a/htdocs/langs/mn_MN/admin.lang
+++ b/htdocs/langs/mn_MN/admin.lang
@@ -574,7 +574,7 @@ Module510Name=Salaries
 Module510Desc=Record and track employee payments
 Module520Name=Loans
 Module520Desc=Management of loans
-Module600Name=Notifications
+Module600Name=Notifications on business event
 Module600Desc=Send email notifications triggered by a business event: per user (setup defined on each user), per third-party contacts (setup defined on each third party) or by specific emails
 Module600Long=Note that this module sends emails in real-time when a specific business event occurs. If you are looking for a feature to send email reminders for agenda events, go into the setup of module Agenda.
 Module610Name=Product Variants
@@ -1193,6 +1193,7 @@ ExtraFieldsSupplierOrders=Complementary attributes (orders)
 ExtraFieldsSupplierInvoices=Complementary attributes (invoices)
 ExtraFieldsProject=Complementary attributes (projects)
 ExtraFieldsProjectTask=Complementary attributes (tasks)
+ExtraFieldsSalaries=Complementary attributes (salaries)
 ExtraFieldHasWrongValue=Attribute %s has a wrong value.
 AlphaNumOnlyLowerCharsAndNoSpace=only alphanumericals and lower case characters without space
 SendmailOptionNotComplete=Warning, on some Linux systems, to send email from your email, sendmail execution setup must contains option -ba (parameter mail.force_extra_parameters into your php.ini file). If some recipients never receive emails, try to edit this PHP parameter with mail.force_extra_parameters = -ba).
@@ -1220,13 +1221,14 @@ SuhosinSessionEncrypt=Session storage encrypted by Suhosin
 ConditionIsCurrently=Condition is currently %s
 YouUseBestDriver=You use driver %s which is the best driver currently available.
 YouDoNotUseBestDriver=You use driver %s but driver %s is recommended.
-NbOfProductIsLowerThanNoPb=You have only %s products/services in the database. This does not require any particular optimization.
+NbOfObjectIsLowerThanNoPb=You have only %s %s in the database. This does not require any particular optimization.
 SearchOptim=Search optimization
-YouHaveXProductUseSearchOptim=You have %s products in the database. You should add the constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+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.
 BrowserIsOK=You are using the %s web browser. This browser is ok for security and performance.
 BrowserIsKO=You are using the %s web browser. This browser is known to be a bad choice for security, performance and reliability. We recommend using Firefox, Chrome, Opera or Safari.
-XDebugInstalled=XDebug is loaded.
-XCacheInstalled=XCache is loaded.
+PHPModuleLoaded=PHP component %s is loaded
+PreloadOPCode=Preloaded OPCode is used
 AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.<br>Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp".
 AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".
 AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties.
@@ -1734,9 +1736,9 @@ ExpenseReportsRulesSetup=Setup of module Expense Reports - Rules
 ExpenseReportNumberingModules=Expense reports numbering module
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
 YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for email notifications by enabling and configuring the module "Notification".
-ListOfNotificationsPerUser=List of notifications per user*
-ListOfNotificationsPerUserOrContact=List of notifications (events) available per user* or per contact**
-ListOfFixedNotifications=List of Fixed Notifications
+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
 GoOntoUserCardToAddMore=Go to the tab "Notifications" of a user to add or remove notifications for users
 GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
 Threshold=Threshold
@@ -1898,6 +1900,11 @@ OnMobileOnly=On small screen (smartphone) only
 DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be Prospect or Customer but can't be both)
 MAIN_OPTIMIZEFORTEXTBROWSER=Simplify interface for blind person
 MAIN_OPTIMIZEFORTEXTBROWSERDesc=Enable this option if you are a blind person, or if you use the application from a text browser like Lynx or 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
 ThisValueCanOverwrittenOnUserLevel=This value can be overwritten by each user from its user page - tab '%s'
 DefaultCustomerType=Default thirdparty type for "New customer" creation form
 ABankAccountMustBeDefinedOnPaymentModeSetup=Note: The bank account must be defined on the module of each payment mode (Paypal, Stripe, ...) to have this feature working.
@@ -1911,7 +1918,7 @@ LogsLinesNumber=Number of lines to show on logs tab
 UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
-DebugBarModuleActivated=Module debugbar is activated and slows dramaticaly the interface
+ModuleActivated=Module %s is activated and slows the interface
 EXPORTS_SHARE_MODELS=Export models are share with everybody
 ExportSetup=Setup of module Export
 InstanceUniqueID=Unique ID of the instance
@@ -1928,3 +1935,5 @@ 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
diff --git a/htdocs/langs/mn_MN/bills.lang b/htdocs/langs/mn_MN/bills.lang
index 4f114d4df1c..53535e58b46 100644
--- a/htdocs/langs/mn_MN/bills.lang
+++ b/htdocs/langs/mn_MN/bills.lang
@@ -95,6 +95,7 @@ PaymentHigherThanReminderToPay=Payment higher than reminder to pay
 HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess received for each overpaid invoice.
 HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess paid for each overpaid invoice.
 ClassifyPaid=Classify 'Paid'
+ClassifyUnPaid=Classify 'Unpaid'
 ClassifyPaidPartially=Classify 'Paid partially'
 ClassifyCanceled=Classify 'Abandoned'
 ClassifyClosed=Classify 'Closed'
@@ -214,6 +215,20 @@ ShowInvoiceReplace=Show replacing invoice
 ShowInvoiceAvoir=Show credit note
 ShowInvoiceDeposit=Show down payment invoice
 ShowInvoiceSituation=Show situation invoice
+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
 ShowPayment=Show payment
 AlreadyPaid=Already paid
 AlreadyPaidBack=Already paid back
diff --git a/htdocs/langs/mn_MN/errors.lang b/htdocs/langs/mn_MN/errors.lang
index b5a9d70cb70..1ee46fdbb92 100644
--- a/htdocs/langs/mn_MN/errors.lang
+++ b/htdocs/langs/mn_MN/errors.lang
@@ -90,7 +90,7 @@ ErrorSpecialCharNotAllowedForField=Special characters are not allowed for field
 ErrorNumRefModel=A reference exists into database (%s) and is not compatible with this numbering rule. Remove record or renamed reference to activate this module.
 ErrorQtyTooLowForThisSupplier=Quantity too low for this vendor or no price defined on this product for this vendor
 ErrorOrdersNotCreatedQtyTooLow=Some orders haven't been created because of too-low quantities
-ErrorModuleSetupNotComplete=Setup of module looks to be uncomplete. Go on Home - Setup - Modules to complete.
+ErrorModuleSetupNotComplete=Setup of module %s looks to be uncomplete. Go on Home - Setup - Modules to complete.
 ErrorBadMask=Error on mask
 ErrorBadMaskFailedToLocatePosOfSequence=Error, mask without sequence number
 ErrorBadMaskBadRazMonth=Error, bad reset value
@@ -219,6 +219,7 @@ 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.
 # 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.
 WarningMandatorySetupNotComplete=Click here to setup mandatory parameters
 WarningEnableYourModulesApplications=Click here to enable your modules and applications
diff --git a/htdocs/langs/mn_MN/main.lang b/htdocs/langs/mn_MN/main.lang
index cd5066560a2..5f83892413d 100644
--- a/htdocs/langs/mn_MN/main.lang
+++ b/htdocs/langs/mn_MN/main.lang
@@ -445,6 +445,7 @@ ContactsAddressesForCompany=Contacts/addresses for this third party
 AddressesForCompany=Addresses for this third party
 ActionsOnCompany=Events for this third party
 ActionsOnContact=Events for this contact/address
+ActionsOnContract=Events for this contract
 ActionsOnMember=Events about this member
 ActionsOnProduct=Events about this product
 NActionsLate=%s late
@@ -759,6 +760,7 @@ LinkToSupplierProposal=Link to vendor proposal
 LinkToSupplierInvoice=Link to vendor invoice
 LinkToContract=Link to contract
 LinkToIntervention=Link to intervention
+LinkToTicket=Link to ticket
 CreateDraft=Create draft
 SetToDraft=Back to draft
 ClickToEdit=Click to edit
diff --git a/htdocs/langs/mn_MN/products.lang b/htdocs/langs/mn_MN/products.lang
index 7b68f5b3ebd..73e672284de 100644
--- a/htdocs/langs/mn_MN/products.lang
+++ b/htdocs/langs/mn_MN/products.lang
@@ -2,6 +2,7 @@
 ProductRef=Product ref.
 ProductLabel=Product label
 ProductLabelTranslated=Translated product label
+ProductDescription=Product description
 ProductDescriptionTranslated=Translated product description
 ProductNoteTranslated=Translated product note
 ProductServiceCard=Products/Services card
diff --git a/htdocs/langs/mn_MN/stripe.lang b/htdocs/langs/mn_MN/stripe.lang
index 7a3389f34b7..c5224982873 100644
--- a/htdocs/langs/mn_MN/stripe.lang
+++ b/htdocs/langs/mn_MN/stripe.lang
@@ -65,3 +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>
diff --git a/htdocs/langs/mn_MN/withdrawals.lang b/htdocs/langs/mn_MN/withdrawals.lang
index cbca2b2f103..88e5eaf128c 100644
--- a/htdocs/langs/mn_MN/withdrawals.lang
+++ b/htdocs/langs/mn_MN/withdrawals.lang
@@ -76,7 +76,8 @@ WithdrawalFile=Withdrawal file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and will classify them as "Paid" if remain to pay is null
 StatisticsByLineStatus=Statistics by status of lines
-RUM=UMR
+RUM=Unique Mandate Reference (UMR)
+DateRUM=Mandate signature date
 RUMLong=Unique Mandate Reference
 RUMWillBeGenerated=If empty, a UMR (Unique Mandate Reference) will be generated once the bank account information is saved.
 WithdrawMode=Direct debit mode (FRST or RECUR)
diff --git a/htdocs/langs/nb_NO/accountancy.lang b/htdocs/langs/nb_NO/accountancy.lang
index 1357c7572c0..600e7ed6a76 100644
--- a/htdocs/langs/nb_NO/accountancy.lang
+++ b/htdocs/langs/nb_NO/accountancy.lang
@@ -265,7 +265,7 @@ AccountingJournals=Regnskapsjournaler
 AccountingJournal=Regnskapsjournal
 NewAccountingJournal=Ny regnskapsjourna
 ShowAccoutingJournal=Vis regnskapsjournal
-Nature=Natur
+NatureOfJournal=Nature of Journal
 AccountingJournalType1=Diverse operasjoner
 AccountingJournalType2=Salg
 AccountingJournalType3=Innkjøp
@@ -291,6 +291,7 @@ Modelcsv_quadratus=Eksport til Quadratus QuadraCompta
 Modelcsv_ebp=Eksport tilEBP
 Modelcsv_cogilog=Eksport til Cogilog
 Modelcsv_agiris=Eksport til Agiris
+Modelcsv_LDCompta=Export for LD Compta (v9 & higher) (Test)
 Modelcsv_openconcerto=Eksport for OpenConcerto (Test)
 Modelcsv_configurable=Eksport CSV Konfigurerbar
 Modelcsv_FEC=Eksporter FEC
@@ -301,7 +302,7 @@ ChartofaccountsId=Kontoplan ID
 InitAccountancy=Initier regnskap
 InitAccountancyDesc=Denne siden kan brukes til å initialisere en regnskapskonto for produkter og tjenester som ikke har en regnskapskonto definert for salg og kjøp.
 DefaultBindingDesc=Denne siden kan brukes til å sette en standardkonto til bruk for å for å koble transaksjonsposter om lønnsutbetaling, donasjon, skatter og MVA når ingen bestemt regnskapskonto er satt.
-DefaultClosureDesc=Denne siden kan brukes til å angi parametere som skal brukes til å legge inn en balanse.
+DefaultClosureDesc=This page can be used to set parameters used for accounting closures.
 Options=Innstillinger
 OptionModeProductSell=Salgsmodus
 OptionModeProductSellIntra=Modussalg eksportert i EU
diff --git a/htdocs/langs/nb_NO/admin.lang b/htdocs/langs/nb_NO/admin.lang
index 104b197123c..850c648f279 100644
--- a/htdocs/langs/nb_NO/admin.lang
+++ b/htdocs/langs/nb_NO/admin.lang
@@ -574,7 +574,7 @@ Module510Name=Lønn
 Module510Desc=Registrer og følg opp ansattebetalinger
 Module520Name=Lån
 Module520Desc=Administrering av lån
-Module600Name=Varsler
+Module600Name=Notifications on business event
 Module600Desc=Send epostvarsler utløst av en forretningshendelse): pr. bruker (oppsett definert for hver bruker), tredjeparts kontakt (oppsett definert for hver tredjepart) eller spesifikke eposter
 Module600Long=Vær oppmerksom på at denne modulen sender e-post i sanntid når en bestemt forretningshendelse oppstår. Hvis du leter etter en funksjon for å sende e-postpåminnelser for agendahendelser, går du inn i oppsettet av agendamodulen .
 Module610Name=Varevarianter
@@ -1193,6 +1193,7 @@ ExtraFieldsSupplierOrders=Komplementære attributter (ordre)
 ExtraFieldsSupplierInvoices=Komplementære attributter (fakturaer)
 ExtraFieldsProject=Komplementære attributter (prosjekter)
 ExtraFieldsProjectTask=Komplementære attributter (oppgaver)
+ExtraFieldsSalaries=Complementary attributes (salaries)
 ExtraFieldHasWrongValue=Attributten %s har en feil verdi
 AlphaNumOnlyLowerCharsAndNoSpace=kun alfanumeriske tegn og små bokstaver uten mellomrom
 SendmailOptionNotComplete=Advarsel, på noen Linux-systemer, for å sende fra din e-post, må oppsettet av sendmail-kjøring inneholde opsjon -ba (parameter mail.force_extra_parameters i din php.ini fil). Hvis noen mottakere aldri mottar e-post, kan du prøve å redigere PHP parameter med mail.force_extra_parameters = -ba).
@@ -1220,13 +1221,14 @@ SuhosinSessionEncrypt=Session lagring kryptert av Suhosin
 ConditionIsCurrently=Tilstand er for øyeblikket %s
 YouUseBestDriver=Du bruker driver %s som er den beste driveren som er tilgjengelig for øyeblikket.
 YouDoNotUseBestDriver=Du bruker driveren %s. Driver %s anbefales.
-NbOfProductIsLowerThanNoPb=Du har bare %s varer/tjenester i databasen. Ingen optimalisering er påkrevet
+NbOfObjectIsLowerThanNoPb=You have only %s %s in the database. This does not require any particular optimization.
 SearchOptim=Forbedre søket
-YouHaveXProductUseSearchOptim=Du har %s varer i databasen. Du bør legge til konstanten PRODUCT_DONOTSEARCH_ANYWHERE til 1 i Hjem-Oppsett-Annet for å begrense søket til begynnelsen av strenger. Dette gjør det mulig for databasen å bruke indeksen og du bør få en raskere respons.
+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.
 BrowserIsOK=Du bruker nettleseren %s. Denne nettleseren er ok for sikkerhet og ytelse.
 BrowserIsKO=Du bruker nettleseren %s. Denne nettleseren er kjent for å være et dårlig valg for sikkerhet, ytelse og pålitelighet. Vi anbefaler deg å bruke Firefox, Chrome, Opera eller Safari.
-XDebugInstalled=XDebug er lastet
-XCacheInstalled=XCache er lastet
+PHPModuleLoaded=PHP component %s is loaded
+PreloadOPCode=Preloaded OPCode is used
 AddRefInList=Vis kunde/leverandør-ref i liste (velg liste eller kombinasjonsboks), og det meste av hyperkobling. Tredjepart vil vises med navnet "CC12345 - SC45678 - Stort selskap", i stedet for "Stort selskap".
 AddAdressInList=Vis liste over kunde-/leverandøradresseinfo (velg liste eller kombinasjonsboks) <br> Tredjeparter vil vises med et navnformat av "The Big Company Corp." - 21 Jump Street 123456 Big Town - USA "i stedet for" The Big Company Corp ".
 AskForPreferredShippingMethod=Spør etter foretrukket sendingsmetode for tredjeparter
@@ -1734,9 +1736,9 @@ ExpenseReportsRulesSetup=Oppsett av modul Utgiftsrapporter - Regler
 ExpenseReportNumberingModules=Utgiftsrapport nummereringsmodul
 NoModueToManageStockIncrease=Ingen modul i stand til å håndtere automatisk lagerøkning er blitt aktivert. Lagerøkning kan bare gjøres manuelt.
 YouMayFindNotificationsFeaturesIntoModuleNotification=Du kan finne alternativer for e-postmeldinger ved å aktivere og konfigurere modulen "Varslingen".
-ListOfNotificationsPerUser=Liste over varslinger pr. bruker*
-ListOfNotificationsPerUserOrContact=Liste over varsler (hendelser) tilgjengelig pr. bruker * eller pr. kontakt **
-ListOfFixedNotifications=Liste over faste varsler
+ListOfNotificationsPerUser=Liste over automatiske varsler per bruker *
+ListOfNotificationsPerUserOrContact=List of possible automatic notifications (on business event) available per user* or per contact**
+ListOfFixedNotifications=Liste over faste automatiske varslinger
 GoOntoUserCardToAddMore=Gå til fanen "Varslinger" hos en bruker for å legge til eller fjerne en varsling
 GoOntoContactCardToAddMore=Gå til fanen "Notefikasjoner" hos en tredjepart for å legge til notifikasjoner for kontakter/adresser
 Threshold=Terskel
@@ -1898,6 +1900,11 @@ OnMobileOnly=Kun på små skjermer (smarttelefon)
 DisableProspectCustomerType=Deaktiver "Prospect + Customer" tredjeparts type (tredjepart må være prospekt eller kunde, men kan ikke være begge)
 MAIN_OPTIMIZEFORTEXTBROWSER=Forenkle grensesnitt for blinde personer
 MAIN_OPTIMIZEFORTEXTBROWSERDesc=Aktiver dette alternativet hvis du er blind, eller hvis du bruker programmet fra en tekstbrowser som Lynx eller 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
 ThisValueCanOverwrittenOnUserLevel=Denne verdien kan overskrives av hver bruker fra brukersiden - fanen '%s'
 DefaultCustomerType=Standard tredjepartstype for "Ny kunde"-opprettingsskjema
 ABankAccountMustBeDefinedOnPaymentModeSetup=Merk: Bankkontoen må defineres i modulen for hver betalingsmodus (Paypal, Stripe, ...) for å få denne funksjonen til å fungere.
@@ -1911,7 +1918,7 @@ LogsLinesNumber=Antall linjer som skal vises under loggfanene
 UseDebugBar=Bruk feilsøkingsfeltet
 DEBUGBAR_LOGS_LINES_NUMBER=Nummer på siste logglinjer å beholde i konsollen
 WarningValueHigherSlowsDramaticalyOutput=Advarsel, høyere verdier reduserer resultatet dramatisk
-DebugBarModuleActivated=Modul feilsøkingsfelt er aktivert og bremser grensesnittet dramatisk
+ModuleActivated=Module %s is activated and slows the interface
 EXPORTS_SHARE_MODELS=Eksportmodellene er delt med alle
 ExportSetup=Oppsett av modul Eksport
 InstanceUniqueID=Unik ID for forekomsten
@@ -1928,3 +1935,5 @@ 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
diff --git a/htdocs/langs/nb_NO/bills.lang b/htdocs/langs/nb_NO/bills.lang
index 5cfdfb3c6e0..972bbbf4a5d 100644
--- a/htdocs/langs/nb_NO/bills.lang
+++ b/htdocs/langs/nb_NO/bills.lang
@@ -95,6 +95,7 @@ PaymentHigherThanReminderToPay=Betalingen er høyere enn restbeløp
 HelpPaymentHigherThanReminderToPay=NB! Innbetalingen av en eller flere fakturaer er høyere enn restbeløpet. <br> Endre oppføringen eller bekreft for å lage kreditnota av det overskytende for overbetalte fakturaer.
 HelpPaymentHigherThanReminderToPaySupplier=Vær oppmerksom på at betalingsbeløpet på en eller flere regninger er høyere enn gjenstående å betale. <br> Rediger oppføringen din, ellers bekreft og opprett en kredittnota av overskuddet betalt for hver overbetalt faktura.
 ClassifyPaid=Merk 'Betalt'
+ClassifyUnPaid=Klassifiser 'Ubetalt'
 ClassifyPaidPartially=Merk 'Delbetalt'
 ClassifyCanceled=Merk 'Tapsført'
 ClassifyClosed=Merk 'Lukket'
@@ -214,6 +215,20 @@ ShowInvoiceReplace=Vis erstatningsfaktura
 ShowInvoiceAvoir=Vis kreditnota
 ShowInvoiceDeposit=Vis nedbetalingsfaktura
 ShowInvoiceSituation=Vis delfaktura
+UseSituationInvoices=Allow situation invoice
+UseSituationInvoicesCreditNote=Allow situation invoice credit note
+Retainedwarranty=Retained warranty
+RetainedwarrantyDefaultPercent=Retained warranty default percent
+ToPayOn=To pay on %s
+toPayOn=å betale på %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
 ShowPayment=Vis betaling
 AlreadyPaid=Allerede betalt
 AlreadyPaidBack=Allerede tilbakebetalt
diff --git a/htdocs/langs/nb_NO/errors.lang b/htdocs/langs/nb_NO/errors.lang
index 3b286905bdd..0e078b11525 100644
--- a/htdocs/langs/nb_NO/errors.lang
+++ b/htdocs/langs/nb_NO/errors.lang
@@ -90,7 +90,7 @@ ErrorSpecialCharNotAllowedForField=Spesialtegn er ikke tillatt for feltet "%s"
 ErrorNumRefModel=En referanse finnes i databasen (%s), og er ikke kompatibel med denne nummereringsregelen. Fjern posten eller omdøp referansen for å aktivere denne modulen.
 ErrorQtyTooLowForThisSupplier=Mengde for lav for denne leverandøren eller ingen pris angitt på dette produktet for denne leverandøren
 ErrorOrdersNotCreatedQtyTooLow=Noen ordrer er ikke opprettet på grunn av for lave mengder
-ErrorModuleSetupNotComplete=Oppsett av modulen ser ikke ut til å være komplett. Gå til Hjem - Oppsett - Moduler for å fullføre.
+ErrorModuleSetupNotComplete=Setup of module %s looks to be uncomplete. Go on Home - Setup - Modules to complete.
 ErrorBadMask=Feil på maske
 ErrorBadMaskFailedToLocatePosOfSequence=Feil! Maske uten sekvensnummer
 ErrorBadMaskBadRazMonth=Feil, ikke korrekt tilbakestillingsverdi
@@ -219,6 +219,7 @@ 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.
 # 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.
 WarningMandatorySetupNotComplete=Klikk her for å sette opp obligatoriske parametere
 WarningEnableYourModulesApplications=Klikk her for å aktivere modulene og applikasjonene dine
diff --git a/htdocs/langs/nb_NO/main.lang b/htdocs/langs/nb_NO/main.lang
index 2eb11b9a9d1..12ce6966c2f 100644
--- a/htdocs/langs/nb_NO/main.lang
+++ b/htdocs/langs/nb_NO/main.lang
@@ -445,6 +445,7 @@ ContactsAddressesForCompany=Kontakter/adresser for denne tredjepart
 AddressesForCompany=Adresser for tredjepart
 ActionsOnCompany=Hendelser for denne tredjeparten
 ActionsOnContact=Hendelser for denne kontakten/adressen
+ActionsOnContract=Events for this contract
 ActionsOnMember=Hendelser om dette medlemmet
 ActionsOnProduct=Hendelser om denne varen
 NActionsLate=%s forsinket
@@ -759,6 +760,7 @@ LinkToSupplierProposal=Link til leverandørtilbud
 LinkToSupplierInvoice=Link til leverandørfaktura
 LinkToContract=Lenke til kontakt
 LinkToIntervention=Lenke til intervensjon
+LinkToTicket=Link to ticket
 CreateDraft=Lag utkast
 SetToDraft=Tilbake til kladd
 ClickToEdit=Klikk for å redigere
diff --git a/htdocs/langs/nb_NO/products.lang b/htdocs/langs/nb_NO/products.lang
index e8cabae97da..f3ec0dcdb08 100644
--- a/htdocs/langs/nb_NO/products.lang
+++ b/htdocs/langs/nb_NO/products.lang
@@ -2,6 +2,7 @@
 ProductRef=Vare ref.
 ProductLabel=Vareetikett
 ProductLabelTranslated=Oversatt produktetikett
+ProductDescription=Product description
 ProductDescriptionTranslated=Oversatt produktbeskrivelse
 ProductNoteTranslated=Oversatt produktnotat
 ProductServiceCard=Kort for Varer/Tjenester
diff --git a/htdocs/langs/nb_NO/stripe.lang b/htdocs/langs/nb_NO/stripe.lang
index 431c64269fc..ff83e5b392b 100644
--- a/htdocs/langs/nb_NO/stripe.lang
+++ b/htdocs/langs/nb_NO/stripe.lang
@@ -65,3 +65,5 @@ StripeUserAccountForActions=Brukerkonto til bruk for e-postvarsling av noen Stri
 StripePayoutList=Liste over Stripe utbetalinger
 ToOfferALinkForTestWebhook=Link til oppsett av Stripe WebHook for oppkall av IPN (test-modus)
 ToOfferALinkForLiveWebhook=Link til oppsett av Stripe WebHook for oppkall av IPN (live-modus)
+PaymentWillBeRecordedForNextPeriod=Payment will be recorded for the next period.
+ClickHereToTryAgain=<a href="%s">Click here to try again...</a>
diff --git a/htdocs/langs/nb_NO/withdrawals.lang b/htdocs/langs/nb_NO/withdrawals.lang
index 12a9ddada5f..77931dbf507 100644
--- a/htdocs/langs/nb_NO/withdrawals.lang
+++ b/htdocs/langs/nb_NO/withdrawals.lang
@@ -76,7 +76,8 @@ WithdrawalFile=Tilbaketrekkingsfil
 SetToStatusSent=Sett status til "Fil Sendt"
 ThisWillAlsoAddPaymentOnInvoice=Dette vil også registrere innbetalinger til fakturaer og klassifisere dem som "Betalt" hvis restbeløp å betale er null
 StatisticsByLineStatus=Statistikk etter linjestatus
-RUM=UMR
+RUM=Unique Mandate Reference (UMR)
+DateRUM=Mandate signature date
 RUMLong=Unik Mandat Referanse
 RUMWillBeGenerated=Hvis tomt, vil UMR (Unique Mandate Reference) bli generert når bankkontoinformasjon er lagret
 WithdrawMode=Direktedebetsmodus (FRST eller RECUR)
diff --git a/htdocs/langs/nl_NL/accountancy.lang b/htdocs/langs/nl_NL/accountancy.lang
index c815dc9d158..f905175c2ed 100644
--- a/htdocs/langs/nl_NL/accountancy.lang
+++ b/htdocs/langs/nl_NL/accountancy.lang
@@ -265,7 +265,7 @@ AccountingJournals=Dagboeken
 AccountingJournal=Dagboek
 NewAccountingJournal=Nieuw dagboek
 ShowAccoutingJournal=Toon dagboek
-Nature=Natuur
+NatureOfJournal=Nature of Journal
 AccountingJournalType1=Overige bewerkingen
 AccountingJournalType2=Verkopen
 AccountingJournalType3=Aankopen
@@ -291,6 +291,7 @@ Modelcsv_quadratus=Exporteren naar Quadratus QuadraCompta
 Modelcsv_ebp=Exporteren naar EBP
 Modelcsv_cogilog=Exporteren naar Cogilog
 Modelcsv_agiris=Exporteren naar Agiris
+Modelcsv_LDCompta=Export for LD Compta (v9 & higher) (Test)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Configureerbare CSV export
 Modelcsv_FEC=Export FEC
@@ -301,7 +302,7 @@ ChartofaccountsId=Rekeningschema Id
 InitAccountancy=Instellen boekhouding
 InitAccountancyDesc=Deze pagina kan worden gebruikt om een ​​grootboekrekening toe te wijzen aan producten en services waarvoor geen grootboekrekening is gedefinieerd voor verkopen en aankopen.
 DefaultBindingDesc=Hier kunt u een standaard grootboekrekening koppelen aan salaris betalingen, donaties, belastingen en BTW, wanneer deze nog niet apart zijn ingesteld.
-DefaultClosureDesc=This page can be used to set parameters to use to enclose a balance sheet.
+DefaultClosureDesc=This page can be used to set parameters used for accounting closures.
 Options=Opties
 OptionModeProductSell=Instellingen verkopen
 OptionModeProductSellIntra=Mode sales exported in EEC
diff --git a/htdocs/langs/nl_NL/admin.lang b/htdocs/langs/nl_NL/admin.lang
index fd7b4ac1aae..b31c1579740 100644
--- a/htdocs/langs/nl_NL/admin.lang
+++ b/htdocs/langs/nl_NL/admin.lang
@@ -574,7 +574,7 @@ Module510Name=Salarissen
 Module510Desc=Record and track employee payments
 Module520Name=Leningen
 Module520Desc=Het beheer van de leningen
-Module600Name=Kennisgevingen
+Module600Name=Notifications on business event
 Module600Desc=Send email notifications triggered by a business event: per user (setup defined on each user), per third-party contacts (setup defined on each third party) or by specific emails
 Module600Long=Note that this module sends emails in real-time when a specific business event occurs. If you are looking for a feature to send email reminders for agenda events, go into the setup of module Agenda.
 Module610Name=Productvarianten
@@ -1193,6 +1193,7 @@ ExtraFieldsSupplierOrders=Aanvullende kenmerken (orders)
 ExtraFieldsSupplierInvoices=Aanvullende kenmerken (facturen)
 ExtraFieldsProject=Aanvullende kenmerken (projecten)
 ExtraFieldsProjectTask=Aanvullende kenmerken (taken)
+ExtraFieldsSalaries=Complementary attributes (salaries)
 ExtraFieldHasWrongValue=Attribuut %s heeft een verkeerde waarde.
 AlphaNumOnlyLowerCharsAndNoSpace=alleen alfanumerieke tekens en kleine letters zonder spatie
 SendmailOptionNotComplete=Waarschuwing, op sommige Linux-systemen, e-mail verzenden vanaf uw e-mail, sendmail uitvoering setup moet conatins optie-ba (parameter mail.force_extra_parameters in uw php.ini-bestand). Als sommige ontvangers nooit e-mails ontvangen, probeer dit PHP parameter bewerken met mail.force_extra_parameters =-ba).
@@ -1220,13 +1221,14 @@ SuhosinSessionEncrypt=Sessie opslag geencrypteerd door Suhosin
 ConditionIsCurrently=Voorwaarde is momenteel %s
 YouUseBestDriver=You use driver %s which is the best driver currently available.
 YouDoNotUseBestDriver=You use driver %s but driver %s is recommended.
-NbOfProductIsLowerThanNoPb=You have only %s products/services in the database. This does not require any particular optimization.
+NbOfObjectIsLowerThanNoPb=You have only %s %s in the database. This does not require any particular optimization.
 SearchOptim=Zoekmachine optimalisatie
-YouHaveXProductUseSearchOptim=You have %s products in the database. You should add the constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+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.
 BrowserIsOK=You are using the %s web browser. This browser is ok for security and performance.
 BrowserIsKO=You are using the %s web browser. This browser is known to be a bad choice for security, performance and reliability. We recommend using Firefox, Chrome, Opera or Safari.
-XDebugInstalled=Xdebug is geladen.
-XCacheInstalled=Xcache is geladen.
+PHPModuleLoaded=PHP component %s is loaded
+PreloadOPCode=Preloaded OPCode is used
 AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.<br>Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp".
 AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".
 AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties.
@@ -1734,9 +1736,9 @@ ExpenseReportsRulesSetup=Opzetten van module onkostendeclaraties - regels
 ExpenseReportNumberingModules=Onkostenrapportage nummeringsmodule
 NoModueToManageStockIncrease=Geen module in staat om automatische voorraad toename beheren is geactiveerd. Stock verhoging zal worden gedaan via handmatige invoer.
 YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for email notifications by enabling and configuring the module "Notification".
-ListOfNotificationsPerUser=Lijst van meldingen per gebruiker*
-ListOfNotificationsPerUserOrContact=List of notifications (events) available per user* or per contact**
-ListOfFixedNotifications=List of Fixed Notifications
+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
 GoOntoUserCardToAddMore=Go to the tab "Notifications" of a user to add or remove notifications for users
 GoOntoContactCardToAddMore=Ga naar het tabblad "Meldingen" bij een relatie om meldingen voor contacten/adressen toe te voegen of te verwijderen
 Threshold=Drempel
@@ -1898,6 +1900,11 @@ OnMobileOnly=On small screen (smartphone) only
 DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be Prospect or Customer but can't be both)
 MAIN_OPTIMIZEFORTEXTBROWSER=Simplify interface for blind person
 MAIN_OPTIMIZEFORTEXTBROWSERDesc=Enable this option if you are a blind person, or if you use the application from a text browser like Lynx or 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
 ThisValueCanOverwrittenOnUserLevel=This value can be overwritten by each user from its user page - tab '%s'
 DefaultCustomerType=Default thirdparty type for "New customer" creation form
 ABankAccountMustBeDefinedOnPaymentModeSetup=Note: The bank account must be defined on the module of each payment mode (Paypal, Stripe, ...) to have this feature working.
@@ -1911,7 +1918,7 @@ LogsLinesNumber=Number of lines to show on logs tab
 UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
-DebugBarModuleActivated=Module debugbar is activated and slows dramaticaly the interface
+ModuleActivated=Module %s is activated and slows the interface
 EXPORTS_SHARE_MODELS=Export models are share with everybody
 ExportSetup=Setup of module Export
 InstanceUniqueID=Unique ID of the instance
@@ -1928,3 +1935,5 @@ 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
diff --git a/htdocs/langs/nl_NL/bills.lang b/htdocs/langs/nl_NL/bills.lang
index 00421a77b3b..cdaa069db64 100644
--- a/htdocs/langs/nl_NL/bills.lang
+++ b/htdocs/langs/nl_NL/bills.lang
@@ -95,6 +95,7 @@ PaymentHigherThanReminderToPay=Betaling hoger dan herinnering te betalen
 HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess received for each overpaid invoice.
 HelpPaymentHigherThanReminderToPaySupplier=Let op, het betalingsbedrag van een of meer rekeningen is hoger dan het openstaande bedrag dat moet worden betaald. <br> Bewerk uw invoer, bevestig anders en overweeg een creditnota te maken voor het teveel betaalde.
 ClassifyPaid=Klassificeer 'betaald'
+ClassifyUnPaid=Classify 'Unpaid'
 ClassifyPaidPartially=Classificeer 'gedeeltelijk betaald'
 ClassifyCanceled=Classificeer 'verlaten'
 ClassifyClosed=Classificeer 'Gesloten'
@@ -214,6 +215,20 @@ ShowInvoiceReplace=Toon vervangingsfactuur
 ShowInvoiceAvoir=Toon creditnota
 ShowInvoiceDeposit=Bekijk factuurbetalingen
 ShowInvoiceSituation=Situatie factuur weergeven
+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
 ShowPayment=Toon betaling
 AlreadyPaid=Reeds betaald
 AlreadyPaidBack=Reeds terugbetaald
diff --git a/htdocs/langs/nl_NL/errors.lang b/htdocs/langs/nl_NL/errors.lang
index 661c92660c9..5417ae6daf2 100644
--- a/htdocs/langs/nl_NL/errors.lang
+++ b/htdocs/langs/nl_NL/errors.lang
@@ -90,7 +90,7 @@ ErrorSpecialCharNotAllowedForField=Speciale tekens zijn niet toegestaan in het v
 ErrorNumRefModel=Er bestaat een verwijzing in de database (%s) en deze is niet compatibel met deze nummeringsregel. Verwijder de tabelregel of hernoem de verwijzing om deze module te activeren.
 ErrorQtyTooLowForThisSupplier=Quantity too low for this vendor or no price defined on this product for this vendor
 ErrorOrdersNotCreatedQtyTooLow=Some orders haven't been created because of too-low quantities
-ErrorModuleSetupNotComplete=Het instellen van de module lijkt onvolledig. Ga naar Home - Setup - Modules om te voltooien.
+ErrorModuleSetupNotComplete=Setup of module %s looks to be uncomplete. Go on Home - Setup - Modules to complete.
 ErrorBadMask=Fout bij het masker
 ErrorBadMaskFailedToLocatePosOfSequence=Fout, masker zonder het volgnummer
 ErrorBadMaskBadRazMonth=Fout, slechte resetwaarde
@@ -219,6 +219,7 @@ 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.
 # 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.
 WarningMandatorySetupNotComplete=Click here to setup mandatory parameters
 WarningEnableYourModulesApplications=Click here to enable your modules and applications
diff --git a/htdocs/langs/nl_NL/main.lang b/htdocs/langs/nl_NL/main.lang
index 82620f9ab84..a4195e82691 100644
--- a/htdocs/langs/nl_NL/main.lang
+++ b/htdocs/langs/nl_NL/main.lang
@@ -445,6 +445,7 @@ ContactsAddressesForCompany=Contacten / adressen voor deze relatie
 AddressesForCompany=Adressen voor deze relatie
 ActionsOnCompany=Events for this third party
 ActionsOnContact=Events for this contact/address
+ActionsOnContract=Events for this contract
 ActionsOnMember=Events over dit lid
 ActionsOnProduct=Evenementen in dit product
 NActionsLate=%s is laat
@@ -759,6 +760,7 @@ LinkToSupplierProposal=Link to vendor proposal
 LinkToSupplierInvoice=Link to vendor invoice
 LinkToContract=Link naar contract
 LinkToIntervention=Link naar interventie
+LinkToTicket=Link to ticket
 CreateDraft=Maak een ontwerp
 SetToDraft=Terug naar ontwerp
 ClickToEdit=Klik om te bewerken
diff --git a/htdocs/langs/nl_NL/products.lang b/htdocs/langs/nl_NL/products.lang
index a743fb9211c..1a7d0537a9c 100644
--- a/htdocs/langs/nl_NL/products.lang
+++ b/htdocs/langs/nl_NL/products.lang
@@ -2,6 +2,7 @@
 ProductRef=Productreferentie
 ProductLabel=Naam
 ProductLabelTranslated=Vertaald product label
+ProductDescription=Product description
 ProductDescriptionTranslated=Vertaalde product beschrijving
 ProductNoteTranslated=Vertaalde product aantekening
 ProductServiceCard=Producten / Dienstendetailkaart
diff --git a/htdocs/langs/nl_NL/stripe.lang b/htdocs/langs/nl_NL/stripe.lang
index b3f50b98772..770bd51df11 100644
--- a/htdocs/langs/nl_NL/stripe.lang
+++ b/htdocs/langs/nl_NL/stripe.lang
@@ -65,3 +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>
diff --git a/htdocs/langs/nl_NL/withdrawals.lang b/htdocs/langs/nl_NL/withdrawals.lang
index 2fd0c894135..2e4a9746bee 100644
--- a/htdocs/langs/nl_NL/withdrawals.lang
+++ b/htdocs/langs/nl_NL/withdrawals.lang
@@ -76,7 +76,8 @@ WithdrawalFile=Withdrawal file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and will classify them as "Paid" if remain to pay is null
 StatisticsByLineStatus=Statistics by status of lines
-RUM=UMR
+RUM=Unique Mandate Reference (UMR)
+DateRUM=Mandate signature date
 RUMLong=Unique Mandate Reference
 RUMWillBeGenerated=If empty, a UMR (Unique Mandate Reference) will be generated once the bank account information is saved.
 WithdrawMode=Direct debit mode (FRST or RECUR)
diff --git a/htdocs/langs/pl_PL/accountancy.lang b/htdocs/langs/pl_PL/accountancy.lang
index fae0558c485..81b47382431 100644
--- a/htdocs/langs/pl_PL/accountancy.lang
+++ b/htdocs/langs/pl_PL/accountancy.lang
@@ -265,7 +265,7 @@ AccountingJournals=Dzienniki kont księgowych
 AccountingJournal=Dziennik księgowy
 NewAccountingJournal=Nowy dziennik księgowy
 ShowAccoutingJournal=Wyświetl dziennik konta księgowego
-Nature=Natura
+NatureOfJournal=Nature of Journal
 AccountingJournalType1=Miscellaneous operations
 AccountingJournalType2=Sprzedaż
 AccountingJournalType3=Zakupy
@@ -291,6 +291,7 @@ Modelcsv_quadratus=Export for Quadratus QuadraCompta
 Modelcsv_ebp=Export for EBP
 Modelcsv_cogilog=Export for Cogilog
 Modelcsv_agiris=Export for Agiris
+Modelcsv_LDCompta=Export for LD Compta (v9 & higher) (Test)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
@@ -301,7 +302,7 @@ ChartofaccountsId=Chart of accounts Id
 InitAccountancy=Init accountancy
 InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accounting account defined for sales and purchases.
 DefaultBindingDesc=This page can be used to set a default account to use to link transactions record about payment salaries, donation, taxes and vat when no specific accounting account were already set.
-DefaultClosureDesc=This page can be used to set parameters to use to enclose a balance sheet.
+DefaultClosureDesc=This page can be used to set parameters used for accounting closures.
 Options=Opcje
 OptionModeProductSell=Tryb sprzedaży
 OptionModeProductSellIntra=Mode sales exported in EEC
diff --git a/htdocs/langs/pl_PL/admin.lang b/htdocs/langs/pl_PL/admin.lang
index 7cf5c8b6e13..e3e453b3b20 100644
--- a/htdocs/langs/pl_PL/admin.lang
+++ b/htdocs/langs/pl_PL/admin.lang
@@ -574,7 +574,7 @@ Module510Name=Wynagrodzenia
 Module510Desc=Record and track employee payments
 Module520Name=Kredyty
 Module520Desc=Zarządzanie kredytów
-Module600Name=Powiadomienia
+Module600Name=Notifications on business event
 Module600Desc=Send email notifications triggered by a business event: per user (setup defined on each user), per third-party contacts (setup defined on each third party) or by specific emails
 Module600Long=Note that this module sends emails in real-time when a specific business event occurs. If you are looking for a feature to send email reminders for agenda events, go into the setup of module Agenda.
 Module610Name=Product Variants
@@ -1193,6 +1193,7 @@ ExtraFieldsSupplierOrders=Zamówienia uzupełniające (atrybuty)
 ExtraFieldsSupplierInvoices=Atrybuty uzupełniające (faktury)
 ExtraFieldsProject=Atrybuty uzupełniające (projektów)
 ExtraFieldsProjectTask=Atrybuty uzupełniające (zadania)
+ExtraFieldsSalaries=Complementary attributes (salaries)
 ExtraFieldHasWrongValue=Atrybut% s ma nieprawidłową wartość.
 AlphaNumOnlyLowerCharsAndNoSpace=tylko alphanumericals i małe litery bez przestrzeni
 SendmailOptionNotComplete=Uwaga, w niektórych systemach Linux, aby wysłać e-mail z poczty elektronicznej, konfiguracja wykonanie sendmail musi conatins opcja-ba (mail.force_extra_parameters parametr w pliku php.ini). Jeśli nigdy niektórzy odbiorcy otrzymywać e-maile, spróbuj edytować ten parametr PHP z mail.force_extra_parameters =-ba).
@@ -1220,13 +1221,14 @@ SuhosinSessionEncrypt=Przechowywania sesji szyfrowane Suhosin
 ConditionIsCurrently=Stan jest obecnie% s
 YouUseBestDriver=You use driver %s which is the best driver currently available.
 YouDoNotUseBestDriver=You use driver %s but driver %s is recommended.
-NbOfProductIsLowerThanNoPb=You have only %s products/services in the database. This does not require any particular optimization.
+NbOfObjectIsLowerThanNoPb=You have only %s %s in the database. This does not require any particular optimization.
 SearchOptim=Pozycjonowanie
-YouHaveXProductUseSearchOptim=You have %s products in the database. You should add the constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+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.
 BrowserIsOK=You are using the %s web browser. This browser is ok for security and performance.
 BrowserIsKO=You are using the %s web browser. This browser is known to be a bad choice for security, performance and reliability. We recommend using Firefox, Chrome, Opera or Safari.
-XDebugInstalled=XDebug jest załadowany.
-XCacheInstalled=XCache jest załadowany.
+PHPModuleLoaded=PHP component %s is loaded
+PreloadOPCode=Preloaded OPCode is used
 AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.<br>Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp".
 AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".
 AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties.
@@ -1734,9 +1736,9 @@ ExpenseReportsRulesSetup=Setup of module Expense Reports - Rules
 ExpenseReportNumberingModules=Expense reports numbering module
 NoModueToManageStockIncrease=Nie Moduł stanie zarządzać automatyczny wzrost akcji zostało aktywowane. Wzrost Zdjęcie zostanie zrobione tylko na ręczne wprowadzanie.
 YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for email notifications by enabling and configuring the module "Notification".
-ListOfNotificationsPerUser=Lista powiadomień na użytkownika*
-ListOfNotificationsPerUserOrContact=List of notifications (events) available per user* or per contact**
-ListOfFixedNotifications=List of Fixed Notifications
+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
 GoOntoUserCardToAddMore=Go to the tab "Notifications" of a user to add or remove notifications for users
 GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
 Threshold=Próg
@@ -1898,6 +1900,11 @@ OnMobileOnly=On small screen (smartphone) only
 DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be Prospect or Customer but can't be both)
 MAIN_OPTIMIZEFORTEXTBROWSER=Simplify interface for blind person
 MAIN_OPTIMIZEFORTEXTBROWSERDesc=Enable this option if you are a blind person, or if you use the application from a text browser like Lynx or 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
 ThisValueCanOverwrittenOnUserLevel=This value can be overwritten by each user from its user page - tab '%s'
 DefaultCustomerType=Default thirdparty type for "New customer" creation form
 ABankAccountMustBeDefinedOnPaymentModeSetup=Note: The bank account must be defined on the module of each payment mode (Paypal, Stripe, ...) to have this feature working.
@@ -1911,7 +1918,7 @@ LogsLinesNumber=Number of lines to show on logs tab
 UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
-DebugBarModuleActivated=Module debugbar is activated and slows dramaticaly the interface
+ModuleActivated=Module %s is activated and slows the interface
 EXPORTS_SHARE_MODELS=Export models are share with everybody
 ExportSetup=Setup of module Export
 InstanceUniqueID=Unique ID of the instance
@@ -1928,3 +1935,5 @@ 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
diff --git a/htdocs/langs/pl_PL/bills.lang b/htdocs/langs/pl_PL/bills.lang
index 55121d67d6c..5ec7c6593ca 100644
--- a/htdocs/langs/pl_PL/bills.lang
+++ b/htdocs/langs/pl_PL/bills.lang
@@ -95,6 +95,7 @@ PaymentHigherThanReminderToPay=Płatności wyższe niż upomnienie do zapłaty
 HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess received for each overpaid invoice.
 HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess paid for each overpaid invoice.
 ClassifyPaid=Klasyfikacja "wpłacono"
+ClassifyUnPaid=Classify 'Unpaid'
 ClassifyPaidPartially=Klasyfikacja "wpłacono częściowo"
 ClassifyCanceled=Klasyfikacja "Porzucono"
 ClassifyClosed=Klasyfikacja "zamknięte"
@@ -214,6 +215,20 @@ ShowInvoiceReplace=Pokaż faktury zastępcze
 ShowInvoiceAvoir=Pokaż notę kredytową
 ShowInvoiceDeposit=Pokaż fakturę zaliczkową
 ShowInvoiceSituation=Show situation invoice
+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
 ShowPayment=Pokaż płatności
 AlreadyPaid=Zapłacono
 AlreadyPaidBack=Zwrócono
@@ -316,7 +331,7 @@ InvoiceRef=Nr referencyjny faktury
 InvoiceDateCreation=Data utworzenia faktury
 InvoiceStatus=Status faktury
 InvoiceNote=Notatka do faktury
-InvoicePaid=Faktura paid
+InvoicePaid=Faktura zapłacona
 OrderBilled=Order billed
 DonationPaid=Donation paid
 PaymentNumber=Numer płatności
diff --git a/htdocs/langs/pl_PL/errors.lang b/htdocs/langs/pl_PL/errors.lang
index 520c90cde06..5ba2ccf5418 100644
--- a/htdocs/langs/pl_PL/errors.lang
+++ b/htdocs/langs/pl_PL/errors.lang
@@ -90,7 +90,7 @@ ErrorSpecialCharNotAllowedForField=Znaki specjalne nie są dozwolone dla pola "%
 ErrorNumRefModel=Odniesienia nie istnieje w bazie danych (%s) i nie jest zgodna z tą zasadą numeracji. Zmiana nazwy lub usuwanie zapisu w odniesieniu do aktywacji tego modułu.
 ErrorQtyTooLowForThisSupplier=Quantity too low for this vendor or no price defined on this product for this vendor
 ErrorOrdersNotCreatedQtyTooLow=Some orders haven't been created because of too-low quantities
-ErrorModuleSetupNotComplete=Ustawienia modułu wyglądają na niekompletne. Idź do Strona główna - Konfiguracja - Moduły aby ukończyć.
+ErrorModuleSetupNotComplete=Setup of module %s looks to be uncomplete. Go on Home - Setup - Modules to complete.
 ErrorBadMask=Błąd w masce wprowadzania
 ErrorBadMaskFailedToLocatePosOfSequence=Błąd, maska ​​bez kolejnego numeru
 ErrorBadMaskBadRazMonth=Błąd, zła wartość zresetowane
@@ -219,6 +219,7 @@ 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.
 # 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.
 WarningMandatorySetupNotComplete=Click here to setup mandatory parameters
 WarningEnableYourModulesApplications=Click here to enable your modules and applications
diff --git a/htdocs/langs/pl_PL/main.lang b/htdocs/langs/pl_PL/main.lang
index 09a0383d899..80fa7e37072 100644
--- a/htdocs/langs/pl_PL/main.lang
+++ b/htdocs/langs/pl_PL/main.lang
@@ -445,6 +445,7 @@ ContactsAddressesForCompany=Kontakt/adres dla tej części/zamówienia/
 AddressesForCompany=Adressy dla części trzeciej
 ActionsOnCompany=Events for this third party
 ActionsOnContact=Events for this contact/address
+ActionsOnContract=Events for this contract
 ActionsOnMember=Informacje o wydarzeniach dla tego uzytkownika
 ActionsOnProduct=Wydarzenia dotyczące tego produktu
 NActionsLate=%s późno
@@ -759,6 +760,7 @@ LinkToSupplierProposal=Link to vendor proposal
 LinkToSupplierInvoice=Link to vendor invoice
 LinkToContract=Link do umowy
 LinkToIntervention=Link do interwencji
+LinkToTicket=Link to ticket
 CreateDraft=Utwórz Szic
 SetToDraft=Wróć do szkicu
 ClickToEdit=Kliknij by edytować
diff --git a/htdocs/langs/pl_PL/products.lang b/htdocs/langs/pl_PL/products.lang
index 10b9789e003..cd286f20b57 100644
--- a/htdocs/langs/pl_PL/products.lang
+++ b/htdocs/langs/pl_PL/products.lang
@@ -2,6 +2,7 @@
 ProductRef=Nr ref. produktu
 ProductLabel=Etykieta produktu
 ProductLabelTranslated=Przetłumaczone na etykiecie produktu
+ProductDescription=Product description
 ProductDescriptionTranslated=Przetłumczony opis produktu
 ProductNoteTranslated=Przetłumaczona nota produktu
 ProductServiceCard=Karta Produktu / Usługi
diff --git a/htdocs/langs/pl_PL/stripe.lang b/htdocs/langs/pl_PL/stripe.lang
index 2a6f68fef72..ecce980c764 100644
--- a/htdocs/langs/pl_PL/stripe.lang
+++ b/htdocs/langs/pl_PL/stripe.lang
@@ -65,3 +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>
diff --git a/htdocs/langs/pl_PL/withdrawals.lang b/htdocs/langs/pl_PL/withdrawals.lang
index 0c20ba09a77..fa420bcd025 100644
--- a/htdocs/langs/pl_PL/withdrawals.lang
+++ b/htdocs/langs/pl_PL/withdrawals.lang
@@ -76,7 +76,8 @@ WithdrawalFile=Plik Wycofanie
 SetToStatusSent=Ustaw status "Plik Wysłane"
 ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and will classify them as "Paid" if remain to pay is null
 StatisticsByLineStatus=Statystyki według stanu linii
-RUM=UMR
+RUM=Unique Mandate Reference (UMR)
+DateRUM=Mandate signature date
 RUMLong=Unique Mandate Reference
 RUMWillBeGenerated=If empty, a UMR (Unique Mandate Reference) will be generated once the bank account information is saved.
 WithdrawMode=Direct debit mode (FRST or RECUR)
diff --git a/htdocs/langs/pt_BR/accountancy.lang b/htdocs/langs/pt_BR/accountancy.lang
index a72182b0755..4005c164e54 100644
--- a/htdocs/langs/pt_BR/accountancy.lang
+++ b/htdocs/langs/pt_BR/accountancy.lang
@@ -107,6 +107,7 @@ ACCOUNTING_RESULT_PROFIT=Conta de contabilidade de resultado (Lucro)
 ACCOUNTING_RESULT_LOSS=Conta contábil do resultado (perda)
 ACCOUNTING_CLOSURE_DEFAULT_JOURNAL=Jornal de encerramento
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Conta contábil da transferência bancária transitória
+TransitionalAccount=Conta de transferência bancária transitória
 ACCOUNTING_ACCOUNT_SUSPENSE=Conta contábil de espera
 DONATION_ACCOUNTINGACCOUNT=Conta contábil para registro de doações.
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Conta contábil para registrar assinaturas
@@ -191,7 +192,6 @@ ChartofaccountsId=ID do gráfico de contas
 InitAccountancy=Contabilidade Inicial
 InitAccountancyDesc=Esta página pode ser usado para inicializar um código de barras em objetos que não têm código de barras definidas. Verifique  que o módulo de código de barras tenha sido instalado antes.
 DefaultBindingDesc=Esta página pode ser usada para definir a conta padrão a ser usada para conectar o registro das transações sobre o pagamento de salários, doações, taxas e o ICMS quando nenhuma conta da Contabilidade específica tiver sido definida.
-DefaultClosureDesc=Esta página pode ser usada para definir parâmetros a serem usados para incluir um balanço.
 OptionModeProductSell=Modo vendas
 OptionModeProductSellIntra=Vendas de modo exportadas na CEE
 OptionModeProductSellExport=Vendas de modo exportadas em outros países
@@ -206,7 +206,9 @@ PredefinedGroups=Grupos predefinidos
 WithoutValidAccount=Sem conta dedicada válida
 ValueNotIntoChartOfAccount=Este valor da conta contábil não existe no gráfico de conta
 AccountRemovedFromGroup=Conta removida do grupo
+SaleExport=Venda de exportação
 Range=Faixa da conta da Contabilidade
 SomeMandatoryStepsOfSetupWereNotDone=Algumas etapas obrigatórias de configuração não foram feitas, preencha-as
 ErrorNoAccountingCategoryForThisCountry=Nenhum Plano de Contas Contábil disponível para este país %s (Veja Home - Configurações- Dicionário)
 ExportNotSupported=O formato de exportação definido não é suportado nesta página
+DateExport=Data de exportação
diff --git a/htdocs/langs/pt_BR/admin.lang b/htdocs/langs/pt_BR/admin.lang
index 147b7dbabcc..15c007915cd 100644
--- a/htdocs/langs/pt_BR/admin.lang
+++ b/htdocs/langs/pt_BR/admin.lang
@@ -120,6 +120,7 @@ SystemToolsAreaDesc=Essa área dispõem de funções administrativas. Use esse m
 Purge=Purgar (apagar tudo)
 PurgeAreaDesc=Esta página permite deletar todos os arquivos gerados ou armazenados pelo Dolibarr (arquivos temporários ou todos os arquivos no diretório <b>%s</b>). Este recurso é fornecido como uma solução alternativa aos usuários cujo a instalação esteja hospedado num servidor que impeça o acesso as pastas onde os arquivos gerados pelo Dolibarr são armazenados, para excluí-los.
 PurgeDeleteLogFile=Excluir os arquivos de registro, incluindo o <b>%s</b> definido pelo módulo Syslog (não há risco de perda de dados)
+PurgeDeleteTemporaryFiles=Exclua todos os arquivos temporários (sem risco de perder dados). Nota: A exclusão é feita apenas se o diretório temporário foi criado 24 horas atrás.
 PurgeDeleteTemporaryFilesShort=Excluir arquivos temporários
 PurgeDeleteAllFilesInDocumentsDir=Eliminar todos os arquivos do diretório <b>%s</b>. Isto irá excluir todos documentos (Terceiros, faturas, ...), arquivos carregados no módulo ECM, Backups e arquivos temporários
 PurgeRunNow=Purgar(Apagar) Agora
@@ -356,6 +357,7 @@ RequiredBy=Este módulo é exigido por módulo(s)
 PageUrlForDefaultValues=Você deve inserir o caminho relativo do URL da página. Se você incluir parâmetros na URL, os valores padrão serão efetivos se todos os parâmetros estiverem definidos com o mesmo valor.
 PageUrlForDefaultValuesCreate=<br> Exemplo: <br> Para o formulário para criar um novo terceiro, é <strong>%s</strong> . <br> Para a URL dos módulos externos instalados no diretório personalizado, não inclua o "custom /", portanto, use o caminho como <strong>mymodule / mypage.php</strong> e não o custom / mymodule / mypage.php. <br> Se você quer o valor padrão somente se o url tiver algum parâmetro, você pode usar <strong>%s</strong>
 PageUrlForDefaultValuesList=<br> Exemplo: <br> Para a página que lista terceiros, é <strong>%s</strong> . <br> Para URL de módulos externos instalados no diretório customizado, não inclua o "custom", então use um caminho como <strong>mymodule / mypagelist.php</strong> e não custom / mymodule / mypagelist.php. <br> Se você quer o valor padrão somente se o url tiver algum parâmetro, você pode usar <strong>%s</strong>
+AlsoDefaultValuesAreEffectiveForActionCreate=Observe que a sobrescrita de valores padrão para a criação de formulários funciona apenas para páginas que foram projetadas corretamente (portanto, com a ação do parâmetro = create or presend ...)
 EnableDefaultValues=Ativar personalização de valores padrão
 WarningSettingSortOrder=Atenção, a configuração de um ordenamento padrão par os pedidos pode resultar em um erro técnico quando indo para a página da lista, se o campo é um campo desconhecido. Se você se depara com tal erro, volte para esta página para remover o ordenamento padrão dos pedidos e restaure o comportamento padrão.
 ProductDocumentTemplates=Temas de documentos para a geração do documento do produto
@@ -422,6 +424,7 @@ Module330Desc=Crie atalhos, sempre acessíveis, para as páginas internas ou ext
 Module410Desc=Integração do Webcalendar
 Module500Name=Impostos e Despesas Especiais
 Module520Desc=Gestão dos empréstimos
+Module600Name=Notificações em evento de negócios
 Module600Desc=Enviar notificações de e-mail acionadas por um evento de negócios: por usuário (configuração definida para cada usuário), por contatos de terceiros (configuração definida em cada terceiro) ou por e-mails específicos
 Module600Long=Observe que este módulo envia e-mails em tempo real quando ocorre um evento de negócios específico. Se você estiver procurando por um recurso para enviar lembretes por e-mail para eventos da agenda, entre na configuração do módulo Agenda.
 Module610Name=Variáveis de produtos
@@ -619,6 +622,7 @@ Permission401=Ler Descontos
 Permission402=Criar/Modificar Descontos
 Permission403=Validar Descontos
 Permission404=Excluir Descontos
+Permission430=Use a barra de depuração
 Permission517=Salários de exportação
 Permission520=Leia Empréstimos
 Permission522=Criar / modificar empréstimos
@@ -630,6 +634,9 @@ Permission532=Criar/Modificar Serviços
 Permission534=Excluir Serviços
 Permission536=Ver/gerenciar Serviços Ocultos
 Permission538=Exportar Serviços
+Permission650=Leia as listas de materiais
+Permission651=Criar / atualizar listas de materiais
+Permission652=Excluir listas de materiais
 Permission701=Ler Doações
 Permission702=Criar/Modificar Doações
 Permission703=Excluir Doações
@@ -649,6 +656,12 @@ Permission1101=Ler Pedidos de Entrega
 Permission1102=Criar/Modificar Pedidos de Entrega
 Permission1104=Validar Pedidos de Entrega
 Permission1109=Excluir Pedidos de Entrega
+Permission1121=Leia propostas de fornecedores
+Permission1122=Criar / modificar propostas de fornecedores
+Permission1123=Validar propostas de fornecedores
+Permission1124=Enviar propostas de fornecedores
+Permission1125=Excluir propostas de fornecedores
+Permission1126=Fechar solicitações de preços de fornecedores
 Permission1181=Ler Fornecedores
 Permission1182=Leia pedidos de compra
 Permission1183=Criar/modificar pedidos
@@ -684,6 +697,11 @@ Permission2503=Submeter ou Deletar Documentos
 Permission2515=Configurar Diretórios dos Documentos
 Permission2801=Usar cliente FTP no modo leitura (somente navegador e baixar)
 Permission2802=Usar cliente FTP no modo escrita (deletar ou upload de arquivos)
+Permission3200=Leia eventos arquivados e impressões digitais
+Permission4001=Visualizar funcionários
+Permission4002=Criar funcionários
+Permission4003=Excluir funcionários
+Permission4004=Exportar funcionários
 Permission20001=Leia pedidos de licença (sua licença e os de seus subordinados)
 Permission20002=Criar/modificar seus pedidos de licença (sua licença e os de seus subordinados)
 Permission20003=Excluir pedidos de licença
@@ -916,8 +934,6 @@ SuhosinSessionEncrypt=Sessão armazenada criptografada pelo Suhosin
 ConditionIsCurrently=Condição é atualmente %s
 YouUseBestDriver=Você usa o driver %s, que é o melhor driver atualmente disponível.
 SearchOptim=Procurar Otimização
-XDebugInstalled=XDebug é carregado.
-XCacheInstalled=XCache é carregado.
 AddRefInList=Mostrar ref. Cliente / fornecedor lista de informações (lista de seleção ou caixa de combinação) e a maior parte do hiperlink. <br> Terceiros aparecerão com um formato de nome "CC12345 - SC45678 - Empresa X." em vez de "Empresa X.".
 AddAdressInList=Exibir lista de informações de endereço do cliente / fornecedor (lista de seleção ou caixa de combinação) <br> Terceiros aparecerão com um formato de nome de "Empresa X. -  Rua tal, n°:21, sala: 123456, Cidade/Estado - Brasil" em vez de "Empresa X".
 FillThisOnlyIfRequired=Exemplo: +2 (Preencha somente se compensar o problema do timezone é experiente)
@@ -1280,9 +1296,6 @@ ExpenseReportsRulesSetup=Configuração do módulo Relatórios de Despesas - Reg
 ExpenseReportNumberingModules=Módulo de numeração dos relatórios de despesas
 NoModueToManageStockIncrease=Nenhum módulo disponível foi ativado para gerenciar o aumento automático do estoque. O aumento do estoque será feito apenas de forma manual.
 YouMayFindNotificationsFeaturesIntoModuleNotification=Você pode encontrar opções para notificações por e-mail ativando e configurando o módulo "Notificação"
-ListOfNotificationsPerUser=Lista de notificações por usuário*
-ListOfNotificationsPerUserOrContact=Lista de notificações (eventos) disponíveis por usuário * ou por contato **
-ListOfFixedNotifications=Lista de Notificações Fixas
 GoOntoContactCardToAddMore=Ir para a aba "Notificações" de um terceiro para adicionar ou remover as notificações para contatos/endereços
 BackupDumpWizard=Assistente para criar o arquivo de backup
 SomethingMakeInstallFromWebNotPossible=A instalação do módulo externo não é possível a partir da interface web pelo seguinte motivo:
@@ -1404,7 +1417,6 @@ LogsLinesNumber=Número de linhas para mostrar na guia logs
 UseDebugBar=Use a barra de depuração
 DEBUGBAR_LOGS_LINES_NUMBER=Número de últimas linhas de log para manter no console
 WarningValueHigherSlowsDramaticalyOutput=Atenção, valores mais altos reduzem drasticamente a saída
-DebugBarModuleActivated=A barra de depuração do módulo é ativada e retarda dramaticamente a interface
 EXPORTS_SHARE_MODELS=Modelos de exportação são compartilhar com todos
 ExportSetup=Configuração do módulo Export
 InstanceUniqueID=ID exclusivo da instância
@@ -1412,9 +1424,3 @@ SmallerThan=Menor que
 LargerThan=Maior que
 IfTrackingIDFoundEventWillBeLinked=Observe que, se um ID de rastreamento for encontrado no e-mail recebido, o evento será automaticamente vinculado aos objetos relacionados.
 WithGMailYouCanCreateADedicatedPassword=Com uma conta do GMail, se você ativou a validação de 2 etapas, é recomendável criar uma segunda senha dedicada para o aplicativo, em vez de usar sua própria senha da conta em https://myaccount.google.com/.
-IFTTTSetup=Configuração do módulo IFTTT
-IFTTT_SERVICE_KEY=Chave do serviço IFTTT
-IFTTT_DOLIBARR_ENDPOINT_SECUREKEY=Chave de segurança para proteger o URL do terminal usado pelo IFTTT para enviar mensagens para o Dolibarr.
-IFTTTDesc=Este módulo é projetado para acionar eventos no IFTTT e / ou executar alguma ação em gatilhos externos do IFTTT.
-UrlForIFTTT=endpoint do URL para o IFTTT
-YouWillFindItOnYourIFTTTAccount=Você vai encontrá-lo em sua conta IFTTT
diff --git a/htdocs/langs/pt_BR/agenda.lang b/htdocs/langs/pt_BR/agenda.lang
index cf795e7633e..0a4c932e1c9 100644
--- a/htdocs/langs/pt_BR/agenda.lang
+++ b/htdocs/langs/pt_BR/agenda.lang
@@ -1,6 +1,5 @@
 # Dolibarr language file - Source file is en_US - agenda
 IdAgenda=ID do evento
-TMenuAgenda=Agenda Eletrônica
 LocalAgenda=Calendário local
 ActionsOwnedBy=Evento de propriedade do
 ListOfActions=Lista de eventos
diff --git a/htdocs/langs/pt_BR/banks.lang b/htdocs/langs/pt_BR/banks.lang
index 5be7583130b..565c01edf16 100644
--- a/htdocs/langs/pt_BR/banks.lang
+++ b/htdocs/langs/pt_BR/banks.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - banks
-MenuBankCash=Banco | Dinheiro
+MenuBankCash=Banco | Dinheiro - Financeiro
 BankAccounts=Contas bancárias
 BankAccountsAndGateways=Contas Bancárias | Gateways
 ShowAccount=Mostrar conta
@@ -79,6 +79,7 @@ BankLineConciliated=Transação reconciliada
 Reconciled=Conciliada
 NotReconciled=Não conciliada
 SupplierInvoicePayment=Pagamento do fornecedores
+WithdrawalPayment=Pedido com pagamento por débito
 SocialContributionPayment=Pagamento de contribuição social
 BankTransfers=Transferências bancárias
 TransferDesc=Transferência de uma conta para outra, o Dolibarr vai escrever dois registros (um débito na conta de origem e um crédito na conta de destino). A mesma quantia (exceto sinal), rótulo e data serão usados para esta transação)
@@ -121,6 +122,10 @@ RejectCheckDate=Data que o cheque foi devolvido
 BankAccountModelModule=Temas de documentos para as contas bancárias.
 DocumentModelSepaMandate=Modelo de mandato SEPA. Uso somente em países da União Européia
 DocumentModelBan=Tema para imprimir a página com a informação BAN.
+NewVariousPayment=Novo pagamento diverso
+VariousPayment=Pagamento diverso
+ShowVariousPayment=Mostrar pagamento diverso
+AddVariousPayment=Adicionar pagamento diverso
 YourSEPAMandate=Seu mandato Área Única de Pagamentos em Euros
 AutoReportLastAccountStatement=Preencha automaticamente o campo 'número de extrato bancário' com o último número de extrato ao fazer a reconciliação
 CashControl=Caixa de dinheiro POS
diff --git a/htdocs/langs/pt_BR/deliveries.lang b/htdocs/langs/pt_BR/deliveries.lang
index 8a56722c9f9..3c8cb0c2cd8 100644
--- a/htdocs/langs/pt_BR/deliveries.lang
+++ b/htdocs/langs/pt_BR/deliveries.lang
@@ -1,6 +1,8 @@
 # Dolibarr language file - Source file is en_US - deliveries
+Delivery=Entrega
 DeliveryRef=Ref. entrega
-DeliveryCard=Recibo de recebimento
+DeliveryCard=Cartão de recibo
+CreateDeliveryOrder=Gerar recebimento de entrega
 DeliveryStateSaved=Estado de entrega salvo
 SetDeliveryDate=Indicar a Data de Envio
 ValidateDeliveryReceipt=Confirmar a Nota de Entrega
@@ -11,6 +13,7 @@ DeliveryMethod=Método de entrega
 TrackingNumber=Número de rastreamento
 StatusDeliveryValidated=Recebida
 GoodStatusDeclaration=Recebi a mercadorias acima em bom estado,
+Deliverer=Entregador :
 Sender=Remetente
 ErrorStockIsNotEnough=Não existe estoque suficiente
 Shippable=Disponivel para envio
diff --git a/htdocs/langs/pt_BR/errors.lang b/htdocs/langs/pt_BR/errors.lang
index 8951fdcbded..55dde5f8a7c 100644
--- a/htdocs/langs/pt_BR/errors.lang
+++ b/htdocs/langs/pt_BR/errors.lang
@@ -72,7 +72,6 @@ ErrorSpecialCharNotAllowedForField=O campo "%s" não aceita caracteres especiais
 ErrorNumRefModel=Uma referência existe no banco de dados (% s) e não é compatível com esta regra de numeração. Remover registro ou referência renomeado para ativar este módulo.
 ErrorQtyTooLowForThisSupplier=Quantidade muito baixa para este fornecedor ou nenhum preço definido neste produto para este fornecedor
 ErrorOrdersNotCreatedQtyTooLow=Algumas encomendas não foram criadas por causa de quantidades muito baixas
-ErrorModuleSetupNotComplete=A configuração do módulo parece estar incompleta. Vá para Início >> Configuração >> Módulos para completá-la.
 ErrorBadMaskFailedToLocatePosOfSequence=Erro, máscara sem número de sequência
 ErrorBadMaskBadRazMonth=Erro, valor de redefinição ruim
 ErrorMaxNumberReachForThisMask=Número máximo atingido para esta máscara
diff --git a/htdocs/langs/pt_BR/paypal.lang b/htdocs/langs/pt_BR/paypal.lang
index f9f857755a3..8f57a572bdb 100644
--- a/htdocs/langs/pt_BR/paypal.lang
+++ b/htdocs/langs/pt_BR/paypal.lang
@@ -26,3 +26,4 @@ ErrorSeverityCode=Erro grave de código
 PaypalLiveEnabled=Modo "ao vivo" do PayPal ativado (caso contrário, modo teste/sandbox)
 PostActionAfterPayment=Poste as ações após os pagamentos
 CardOwner=Titular do cartão
+PayPalBalance=Crédito Paypal
diff --git a/htdocs/langs/pt_BR/products.lang b/htdocs/langs/pt_BR/products.lang
index 0ebc2916b18..b802c37f398 100644
--- a/htdocs/langs/pt_BR/products.lang
+++ b/htdocs/langs/pt_BR/products.lang
@@ -2,6 +2,7 @@
 ProductRef=Ref. produto
 ProductLabel=Rótulo do produto
 ProductLabelTranslated=Etiqueta do produto traduzido
+ProductDescription=Descrição do produto
 ProductDescriptionTranslated=Descrição do produto traduzido
 ProductNoteTranslated=Nota produto traduzido
 ProductServiceCard=Ficha do produto/serviço
@@ -97,6 +98,7 @@ CustomerPrices=Preços de cliente
 SuppliersPrices=Preços de fornecedores
 SuppliersPricesOfProductsOrServices=Preços do fornecedor (produtos ou serviços)
 CountryOrigin=Pais de origem
+Nature=Natureza do produto (matéria-prima/manufaturado)
 ShortLabel=Etiqueta curta
 set=conjunto
 se=conjunto
@@ -152,6 +154,7 @@ MinSupplierPrice=Preco de compra minimo
 DynamicPriceConfiguration=Configuração de preço dinâmico
 DynamicPriceDesc=Voce pode definir uma fórmula matemática para calcular preços de clientes e fornecedores. Nessas fórmulas podem ser usadas todos as operações, contantes e variáveis. Voce pode definir aqui as variáveis que voce quer usar. Se a variável, deve ser automaticamente ajustada, voce pode definir uma URLl externa, que irá permitir o Dolibarr atualizar este valor automaticamente
 GlobalVariables=As variáveis ​​globais
+GlobalVariableUpdaters=Atualizadores externos para variáveis
 GlobalVariableUpdaterHelp0=Analisa os dados JSON de URL especificada, valor especifica a localização de valor relevante,
 GlobalVariableUpdaterType1=Dados WebService
 GlobalVariableUpdaterHelp1=Analisa os dados WebService de URL especificada, NS especifica o namespace, valor especifica a localização de valor relevante, os dados devem conter os dados para enviar e método é o método chamando WS
diff --git a/htdocs/langs/pt_BR/website.lang b/htdocs/langs/pt_BR/website.lang
index 91b0123fe9f..d18fb52ff0b 100644
--- a/htdocs/langs/pt_BR/website.lang
+++ b/htdocs/langs/pt_BR/website.lang
@@ -62,3 +62,7 @@ NoWebSiteCreateOneFirst=Nenhum site foi criado ainda. Comece a criar o primeiro.
 GoTo=Ir para
 DynamicPHPCodeContainsAForbiddenInstruction=Você adiciona código PHP dinâmico que contém a instrução PHP <strong>%s</strong> que é proibida por padrão como conteúdo dinâmico (consulte as opções ocultas WEBSITE_PHP_ALLOW_xxx para aumentar a lista de comandos permitidos).
 NotAllowedToAddDynamicContent=Você não tem permissão para adicionar ou editar conteúdo em PHP dinâmico dos sites. Solicite a permissão ou apenas mantenha o código em tags do php não modificadas.
+ReplaceWebsiteContent=Pesquisar ou substituir conteúdo do site
+DeleteAlsoJs=Excluir todos os arquivos javascript específicos deste site?\n
+DeleteAlsoMedias=Excluir todos os arquivos de mídia específicos deste site?
+MyWebsitePages=Paginas do meu site
diff --git a/htdocs/langs/pt_BR/withdrawals.lang b/htdocs/langs/pt_BR/withdrawals.lang
index b7e6e587e31..9143c35872d 100644
--- a/htdocs/langs/pt_BR/withdrawals.lang
+++ b/htdocs/langs/pt_BR/withdrawals.lang
@@ -49,8 +49,6 @@ NumeroNationalEmetter=Nacional Número Transmissor
 BankToReceiveWithdraw=Conta bancária de recebimento
 CreditDate=A crédito
 WithdrawalFileNotCapable=Não foi possível gerar arquivos recibo retirada para o seu país %s (O seu país não é suportado)
-ShowWithdraw=Mostrar Retire
-IfInvoiceNeedOnWithdrawPaymentWontBeClosed=No entanto, se fatura não tem pelo menos um pagamento retirada ainda processado, não vai ser definido como pago para permitir a gestão de remoção prévia.
 DoStandingOrdersBeforePayments=Esta aba lhe permite solicitar um pagamento de pedido por Débito direto. Uma vez feito, vá ao menu Banco->Pedidos com Débito Direto para gerenciar o pagamento dos pedidos com Débito direto. Quando o pagamento do pedido estiver fechado, o pagamento da fatura será automaticamente registrado, e a fatura fechada se o alerta para pagamento é nulo.
 WithdrawalFile=Arquivo Retirada
 SetToStatusSent=Defina o status "arquivo enviado"
@@ -63,6 +61,7 @@ WithdrawRequestAmount=Quantidade de pedido de débito direto:
 WithdrawRequestErrorNilAmount=Não foi possível criar solicitação de débito direto para quantidade vazia.
 PleaseReturnMandate=Favor devolver este formulário de mandato por e-mail para %s ou por correio para
 SEPALegalText=Pela assinatura deste formulário de mandato, você autoriza (A) %s a enviar instruções para o seu banco efetuar débito em sua conta e (B) que o seu banco efetue débito em sua conta de acordo com as instruções de %s. Como parte dos seus direitos, você tem direito ao reembolso do seu banco sob os termos e condições do acordo com ele firmado. O reembolso deve ser solicitado dentro de 8 semanas a partir da data em que a sua conta foi debitada. Os seus direitos relativos ao mandato acima são explicados em uma declaração que você pode obter junto a seu banco.
+CreditorName=Nome do Credor
 SEPAFillForm=(B) Favor preencher todos os campos marcados com *
 SEPAFormYourName=Seu nome
 SEPAFormYourBAN=Nome da Conta do Seu Banco (IBAN)
@@ -71,6 +70,10 @@ ModeRECUR=Pagamento recorrente
 PleaseCheckOne=Favor marcar apenas um
 DirectDebitOrderCreated=Pedido de débito direto %s criado
 CreateForSepa=Crie um arquivo de débito direto
+ICS=Identificador do credor
+END_TO_END=Tag SEPA XML "EndToEndId" - ID exclusivo atribuído por transação
+USTRD=Tag SEPA XML "não estruturada"
+ADDDAYS=Adicionar dias à data de execução
 InfoCreditSubject=Pagamento do pedido com pagamento por Débito direto %s pelo banco
 InfoCreditMessage=O pagamento do pedido por Débito direto %s foi feito pelo banco.<br>Dados do pagamento: %s
 InfoTransSubject=Transmissão do pedido com pagamento por Débito direto %s para o banco
diff --git a/htdocs/langs/pt_PT/accountancy.lang b/htdocs/langs/pt_PT/accountancy.lang
index 7e3445ffca9..cb399e5565a 100644
--- a/htdocs/langs/pt_PT/accountancy.lang
+++ b/htdocs/langs/pt_PT/accountancy.lang
@@ -265,7 +265,7 @@ AccountingJournals=Diários contabilisticos
 AccountingJournal=Diário contabilistico
 NewAccountingJournal=Novo diário contabilistico
 ShowAccoutingJournal=Mostrar diário contabilistico
-Nature=Natureza
+NatureOfJournal=Nature of Journal
 AccountingJournalType1=Operações diversas
 AccountingJournalType2=Vendas
 AccountingJournalType3=Compras
@@ -291,6 +291,7 @@ Modelcsv_quadratus=Export for Quadratus QuadraCompta
 Modelcsv_ebp=Export for EBP
 Modelcsv_cogilog=Export for Cogilog
 Modelcsv_agiris=Export for Agiris
+Modelcsv_LDCompta=Export for LD Compta (v9 & higher) (Test)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Exportar CSV configurável
 Modelcsv_FEC=Export FEC
@@ -301,7 +302,7 @@ ChartofaccountsId=ID de plano de contas
 InitAccountancy=Iniciar contabilidade
 InitAccountancyDesc=Essa página pode ser usada para inicializar uma conta contábil em produtos e serviços que não tenham uma conta contábil definida para vendas e compras.
 DefaultBindingDesc=Esta página pode ser usada para definir uma conta padrão a ser usada para vincular registo de transações sobre salários, doações, impostos e IVA quando nenhuma conta contabilística específica estiver definida.
-DefaultClosureDesc=This page can be used to set parameters to use to enclose a balance sheet.
+DefaultClosureDesc=This page can be used to set parameters used for accounting closures.
 Options=Opções
 OptionModeProductSell=Modo de vendas
 OptionModeProductSellIntra=Mode sales exported in EEC
diff --git a/htdocs/langs/pt_PT/admin.lang b/htdocs/langs/pt_PT/admin.lang
index dec7048306a..9fb236effd4 100644
--- a/htdocs/langs/pt_PT/admin.lang
+++ b/htdocs/langs/pt_PT/admin.lang
@@ -574,7 +574,7 @@ Module510Name=Salários
 Module510Desc=Registrar e acompanhar pagamentos de funcionários
 Module520Name=Empréstimos
 Module520Desc=Gestão de empréstimos
-Module600Name=Notificações
+Module600Name=Notifications on business event
 Module600Desc=Send email notifications triggered by a business event: per user (setup defined on each user), per third-party contacts (setup defined on each third party) or by specific emails
 Module600Long=Note that this module sends emails in real-time when a specific business event occurs. If you are looking for a feature to send email reminders for agenda events, go into the setup of module Agenda.
 Module610Name=Variantes de produtos
@@ -1193,6 +1193,7 @@ ExtraFieldsSupplierOrders=Atributos complementares (encomendas)
 ExtraFieldsSupplierInvoices=Atributos complementares (faturas)
 ExtraFieldsProject=Atributos complementares (projetos)
 ExtraFieldsProjectTask=Atributos complementares (tarefas)
+ExtraFieldsSalaries=Complementary attributes (salaries)
 ExtraFieldHasWrongValue=O atributo %s tem um valor errado.
 AlphaNumOnlyLowerCharsAndNoSpace=somente caracteres alfanuméricos e minúsculas, sem espaço
 SendmailOptionNotComplete=Aviso, em alguns sistemas Linux, para enviar emails, a configuração sendmail deve conter a opção -ba (o parâmetro mail.force_extra_parameters no seu ficheiro php.ini). Se alguns destinatários não receberem e-mails, tente editar este parâmetro PHP com mail.force_extra_parameters = -ba
@@ -1220,13 +1221,14 @@ SuhosinSessionEncrypt=Sessão de armazenamento encriptada por Suhosin
 ConditionIsCurrently=A condição está atualmente %s
 YouUseBestDriver=You use driver %s which is the best driver currently available.
 YouDoNotUseBestDriver=Você usa o driver %s, mas o driver %s é recomendado.
-NbOfProductIsLowerThanNoPb=Você tem apenas produtos / serviços %s no banco de dados. Isso não requer nenhuma otimização específica.
+NbOfObjectIsLowerThanNoPb=You have only %s %s in the database. This does not require any particular optimization.
 SearchOptim=Optimização da pesquisa
-YouHaveXProductUseSearchOptim=Você tem produtos %s no banco de dados. Você deve adicionar a constante PRODUCT_DONOTSEARCH_ANYWHERE a 1 em Home-Setup-Other. Limite a pesquisa ao início de strings, o que possibilita que o banco de dados use índices e você deve obter uma resposta imediata.
+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.
 BrowserIsOK=Você está usando o navegador da web %s. Este navegador está ok para segurança e desempenho.
 BrowserIsKO=Você está usando o navegador da web %s. Este navegador é conhecido por ser uma má escolha para segurança, desempenho e confiabilidade. Recomendamos o uso do Firefox, Chrome, Opera ou Safari.
-XDebugInstalled=XDebug está carregado.
-XCacheInstalled=XCache está carregada.
+PHPModuleLoaded=PHP component %s is loaded
+PreloadOPCode=Preloaded OPCode is used
 AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.<br>Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp".
 AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".
 AskForPreferredShippingMethod=Peça o método de envio preferido para terceiros.
@@ -1734,9 +1736,9 @@ ExpenseReportsRulesSetup=Configuração do módulo Relatórios de despesas - Reg
 ExpenseReportNumberingModules=Módulo de numeração de relatórios de despesas
 NoModueToManageStockIncrease=Não foi ativado nenhum módulo capaz de efetuar a gestão automática do acréscimo de stock. O acrescimo de stock será efetuado manualmente.
 YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for email notifications by enabling and configuring the module "Notification".
-ListOfNotificationsPerUser=Lista de notificações por utilizador*
-ListOfNotificationsPerUserOrContact=List of notifications (events) available per user* or per contact**
-ListOfFixedNotifications=List of Fixed Notifications
+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
 GoOntoUserCardToAddMore=Vá até a guia "Notificações" de um usuário para adicionar ou remover notificações para usuários
 GoOntoContactCardToAddMore=Vá ao separador "Notificações" de um terceiro para adicionar ou remover as notificações de contactos/endereços
 Threshold=Limite
@@ -1898,6 +1900,11 @@ OnMobileOnly=Apenas na tela pequena (smartphone)
 DisableProspectCustomerType=Desativar o tipo de terceiro "cliente + cliente" (assim, o terceiro deve ser cliente ou cliente, mas não pode ser ambos)
 MAIN_OPTIMIZEFORTEXTBROWSER=Simplify interface for blind person
 MAIN_OPTIMIZEFORTEXTBROWSERDesc=Enable this option if you are a blind person, or if you use the application from a text browser like Lynx or 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
 ThisValueCanOverwrittenOnUserLevel=This value can be overwritten by each user from its user page - tab '%s'
 DefaultCustomerType=Default thirdparty type for "New customer" creation form
 ABankAccountMustBeDefinedOnPaymentModeSetup=Note: The bank account must be defined on the module of each payment mode (Paypal, Stripe, ...) to have this feature working.
@@ -1911,7 +1918,7 @@ LogsLinesNumber=Number of lines to show on logs tab
 UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
-DebugBarModuleActivated=Module debugbar is activated and slows dramaticaly the interface
+ModuleActivated=Module %s is activated and slows the interface
 EXPORTS_SHARE_MODELS=Export models are share with everybody
 ExportSetup=Setup of module Export
 InstanceUniqueID=Unique ID of the instance
@@ -1928,3 +1935,5 @@ 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
diff --git a/htdocs/langs/pt_PT/bills.lang b/htdocs/langs/pt_PT/bills.lang
index cc737fc2d1d..695ec103e84 100644
--- a/htdocs/langs/pt_PT/bills.lang
+++ b/htdocs/langs/pt_PT/bills.lang
@@ -95,6 +95,7 @@ PaymentHigherThanReminderToPay=Pagamento superior ao valor a pagar
 HelpPaymentHigherThanReminderToPay=Atenção, o valor do pagamento de uma ou mais contas é maior do que o valor pendente a pagar. <br> Edite sua entrada, caso contrário, confirme e considere a criação de uma nota de crédito para o excesso recebido para cada fatura paga em excesso.
 HelpPaymentHigherThanReminderToPaySupplier=Atenção, o valor do pagamento de uma ou mais contas é maior do que o valor pendente a pagar. <br> Edite sua entrada, caso contrário, confirme e considere a criação de uma nota de crédito para o excesso pago por cada fatura paga em excesso.
 ClassifyPaid=Classificar como 'Pago'
+ClassifyUnPaid=Classify 'Unpaid'
 ClassifyPaidPartially=Classificar como 'Pago Parcialmente'
 ClassifyCanceled=Classificar como 'Abandonado'
 ClassifyClosed=Classificar como 'Fechado'
@@ -214,6 +215,20 @@ ShowInvoiceReplace=Ver fatura retificativa
 ShowInvoiceAvoir=Ver deposito
 ShowInvoiceDeposit=Mostrar fatura de adiantamento
 ShowInvoiceSituation=Mostrar fatura da situação
+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
 ShowPayment=Mostrar pagamento
 AlreadyPaid=Já e
 AlreadyPaidBack=Já reembolsado
diff --git a/htdocs/langs/pt_PT/errors.lang b/htdocs/langs/pt_PT/errors.lang
index 16ff4e1572f..886d1ba6642 100644
--- a/htdocs/langs/pt_PT/errors.lang
+++ b/htdocs/langs/pt_PT/errors.lang
@@ -90,7 +90,7 @@ ErrorSpecialCharNotAllowedForField=Os caracteres especiais não são permitidos
 ErrorNumRefModel=Existe uma referência em banco de dados (%s) e não é compatível com esta regra de numeração. Remover registro ou renomeado de referência para ativar este módulo.
 ErrorQtyTooLowForThisSupplier=Quantity too low for this vendor or no price defined on this product for this vendor
 ErrorOrdersNotCreatedQtyTooLow=Some orders haven't been created because of too-low quantities
-ErrorModuleSetupNotComplete=A configuração do módulo parece incompleta. Vá em Home - Setup - Módulos para completar.
+ErrorModuleSetupNotComplete=Setup of module %s looks to be uncomplete. Go on Home - Setup - Modules to complete.
 ErrorBadMask=Erro na máscara
 ErrorBadMaskFailedToLocatePosOfSequence=Máscara de erro, sem número de seqüência
 ErrorBadMaskBadRazMonth=Erro, o valor de reset ruim
@@ -219,6 +219,7 @@ 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.
 # 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.
 WarningMandatorySetupNotComplete=Click here to setup mandatory parameters
 WarningEnableYourModulesApplications=Click here to enable your modules and applications
diff --git a/htdocs/langs/pt_PT/main.lang b/htdocs/langs/pt_PT/main.lang
index 1c175a3c7b2..2ff9c3ef136 100644
--- a/htdocs/langs/pt_PT/main.lang
+++ b/htdocs/langs/pt_PT/main.lang
@@ -445,6 +445,7 @@ ContactsAddressesForCompany=Contactos/moradas para este terceiro
 AddressesForCompany=Moradas para este terceiro
 ActionsOnCompany=Events for this third party
 ActionsOnContact=Events for this contact/address
+ActionsOnContract=Events for this contract
 ActionsOnMember=Eventos sobre este membro
 ActionsOnProduct=Eventos sobre este produto
 NActionsLate=%s em atraso
@@ -759,6 +760,7 @@ LinkToSupplierProposal=Link to vendor proposal
 LinkToSupplierInvoice=Link to vendor invoice
 LinkToContract=Associar a contrato
 LinkToIntervention=Associar a intervenção
+LinkToTicket=Link to ticket
 CreateDraft=Criar Rascunho
 SetToDraft=Voltar para o rascunho
 ClickToEdit=Clique para editar
diff --git a/htdocs/langs/pt_PT/products.lang b/htdocs/langs/pt_PT/products.lang
index 14b1b68ad0a..947a4f4d624 100644
--- a/htdocs/langs/pt_PT/products.lang
+++ b/htdocs/langs/pt_PT/products.lang
@@ -2,6 +2,7 @@
 ProductRef=Ref. do produto
 ProductLabel=Etiqueta do produto
 ProductLabelTranslated=Etiqueta do produto traduzida
+ProductDescription=Product description
 ProductDescriptionTranslated=Categoria do produto traduzida
 ProductNoteTranslated=Nota do produto traduzida
 ProductServiceCard=Ficha de produto/serviço
diff --git a/htdocs/langs/pt_PT/stripe.lang b/htdocs/langs/pt_PT/stripe.lang
index 4b3edb96134..66bf8590edb 100644
--- a/htdocs/langs/pt_PT/stripe.lang
+++ b/htdocs/langs/pt_PT/stripe.lang
@@ -65,3 +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>
diff --git a/htdocs/langs/pt_PT/withdrawals.lang b/htdocs/langs/pt_PT/withdrawals.lang
index 36049ddec43..7a63c003b00 100644
--- a/htdocs/langs/pt_PT/withdrawals.lang
+++ b/htdocs/langs/pt_PT/withdrawals.lang
@@ -76,7 +76,8 @@ WithdrawalFile=arquivo retirado
 SetToStatusSent=Definir o estado como "Ficheiro Enviado"
 ThisWillAlsoAddPaymentOnInvoice=Isso também registrará os pagamentos para as faturas e os classificará como "Pago" se o restante a pagar for nulo
 StatisticsByLineStatus=Estatísticas por status de linhas
-RUM=UMR
+RUM=Unique Mandate Reference (UMR)
+DateRUM=Mandate signature date
 RUMLong=Referência de mandato exclusivo
 RUMWillBeGenerated=If empty, a UMR (Unique Mandate Reference) will be generated once the bank account information is saved.
 WithdrawMode=Modo de débito direto (FRST ou RECUR)
diff --git a/htdocs/langs/ro_RO/accountancy.lang b/htdocs/langs/ro_RO/accountancy.lang
index 472c02c9452..966e5a7a9e8 100644
--- a/htdocs/langs/ro_RO/accountancy.lang
+++ b/htdocs/langs/ro_RO/accountancy.lang
@@ -265,7 +265,7 @@ AccountingJournals=Jurnalele contabile
 AccountingJournal=Jurnalul contabil
 NewAccountingJournal=Jurnal contabil nou
 ShowAccoutingJournal=Arătați jurnalul contabil
-Nature=Personalitate juridică
+NatureOfJournal=Nature of Journal
 AccountingJournalType1=Operațiuni diverse
 AccountingJournalType2=Vânzări
 AccountingJournalType3=Achiziţii
@@ -291,6 +291,7 @@ Modelcsv_quadratus=Export pentru Quadratus QuadraCompta
 Modelcsv_ebp=Export pentru EBP
 Modelcsv_cogilog=Export pentru Cogilog
 Modelcsv_agiris=Export pentru Agiris
+Modelcsv_LDCompta=Export for LD Compta (v9 & higher) (Test)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Exportați CSV configurabil
 Modelcsv_FEC=Export FEC
@@ -301,7 +302,7 @@ ChartofaccountsId=Id-ul listei de conturi
 InitAccountancy=Init contabilitate
 InitAccountancyDesc=Această pagină poate fi utilizată pentru a inițializa un cont contabil pentru produse și servicii care nu au cont contabil definit pentru vânzări și achiziții.
 DefaultBindingDesc=Această pagină poate fi utilizată pentru a seta un cont implicit care să fie folosit pentru a lega înregistrarea tranzacțiilor cu privire la salariile de plată, donațiile, impozitele și taxe atunci când nu a fost deja stabilit niciun cont contabil.
-DefaultClosureDesc=Această pagină poate fi utilizată pentru a seta parametrii care trebuie utilizați pentru a închide un bilanț.
+DefaultClosureDesc=This page can be used to set parameters used for accounting closures.
 Options=Opţiuni
 OptionModeProductSell=Mod vanzari
 OptionModeProductSellIntra=Mode sales exported in EEC
diff --git a/htdocs/langs/ro_RO/admin.lang b/htdocs/langs/ro_RO/admin.lang
index 8f9e5dc09fd..ca53c0a762f 100644
--- a/htdocs/langs/ro_RO/admin.lang
+++ b/htdocs/langs/ro_RO/admin.lang
@@ -574,7 +574,7 @@ Module510Name=Salarii
 Module510Desc=Înregistrați și urmăriți plățile angajaților
 Module520Name=Credite
 Module520Desc=Gestionarea creditelor
-Module600Name=Notificări
+Module600Name=Notifications on business event
 Module600Desc=Trimiteți notificări prin e-mail declanșate de un eveniment de afaceri: pentru fiecare utilizator (setarea definită pentru fiecare utilizator), pentru contacte terțe (setare definită pentru fiecare terț) sau pentru e-mailuri specifice
 Module600Long=Rețineți că acest modul trimite e-mailuri în timp real când apare un anumit eveniment de afaceri. Dacă sunteți în căutarea unei funcții pentru a trimite memento-uri de e-mail pentru evenimente de agendă, mergeți la configurarea agendei modulului.
 Module610Name=Variante de produs
@@ -1193,6 +1193,7 @@ ExtraFieldsSupplierOrders=Atribute complementare (comenzi)
 ExtraFieldsSupplierInvoices=Atribute complementare (facturi)
 ExtraFieldsProject=Atribute complementare (proiecte)
 ExtraFieldsProjectTask=Atribute complementare (sarcini)
+ExtraFieldsSalaries=Complementary attributes (salaries)
 ExtraFieldHasWrongValue=Atributul %s are o valoare greşită.
 AlphaNumOnlyLowerCharsAndNoSpace=numai caractere minuscule,  alfanumerice fără spaţiu
 SendmailOptionNotComplete=Atenţie, pe unele sisteme Linux, pentru a trimite e-mail de la e-mail, sendmail configurare execuţie trebuie să conatins optiunea-ba (mail.force_extra_parameters parametri în fişierul php.ini). Dacă nu unor destinatari a primi e-mailuri, încercaţi să editaţi acest parametru PHP cu mail.force_extra_parameters =-BA).
@@ -1220,13 +1221,14 @@ SuhosinSessionEncrypt=Stocarea sesiune criptată prin Suhosin
 ConditionIsCurrently=Condiția este momentan %s
 YouUseBestDriver=Utilizați driverul %s, care este cel mai bun driver disponibil în prezent.
 YouDoNotUseBestDriver=Utilizați driverul %s dar  driverul %s este recomandat.
-NbOfProductIsLowerThanNoPb=Aveți numai %s produse/servicii în fișierul bazei de date. Acest lucru nu necesită o optimizare particulară.
+NbOfObjectIsLowerThanNoPb=You have only %s %s in the database. This does not require any particular optimization.
 SearchOptim=Optimizare căutare
-YouHaveXProductUseSearchOptim=Aveți %s produse în fișierul bazei de date. Trebuie să adăugați constanta PRODUCT_DONOTSEARCH_ANYWHERE la 1 înAcasă-Gestionare-Altele. Limitați căutarea la începutul șirurilor, ceea ce face posibil ca baza de date să utilizeze indexari si ar trebui să primiți un răspuns imediat.
+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.
 BrowserIsOK=Utilizați browserul web %s. Acest browser este ok pentru securitate și performanţă.
 BrowserIsKO=Utilizați browserul web %s. Acest browser este cunoscut ca fiind o alegere proastă pentru securitate, fiabilitate și performanță. Vă recomandăm să utilizați Firefox, Chrome, Opera sau Safari.
-XDebugInstalled=XDebug este încărcat.
-XCacheInstalled=XCache este încărcată.
+PHPModuleLoaded=PHP component %s is loaded
+PreloadOPCode=Preloaded OPCode is used
 AddRefInList=Afișați Lista de  informatii a clientului/Furnizorului  (selectați lista sau combobox)  și cea mai mare parte a hiperlinkului.<br> Terții vor apărea cu un format de nume "CC12345 - SC45678 - The Big Company corp". în loc de "The Big Company corp".
 AddAdressInList=Afișați Lista de informatii a clientului/Furnizorului (selectați lista sau combobox).<br> Terții i vor apărea cu numele format din "Big Company corp - 21 jump street 123456 Big city - USA" în loc de "Big Company corp".
 AskForPreferredShippingMethod=Solicitați o metodă de transport preferată pentru terți.
@@ -1734,9 +1736,9 @@ ExpenseReportsRulesSetup=Configurare din module Rapoarte de cheltuieli - Reguli
 ExpenseReportNumberingModules=Modul de numerotare a rapoartelor de cheltuieli
 NoModueToManageStockIncrease=Nu a fost activat niciun modul capabil să gestioneze creșterea stocului automat. Creșterea stocurilor se va face doar prin introducere manuală.
 YouMayFindNotificationsFeaturesIntoModuleNotification=Puteți găsi opțiuni pentru notificările prin e-mail prin activarea și configurarea modulului "Notificare".
-ListOfNotificationsPerUser=Listă de notificări pe utilizator *
-ListOfNotificationsPerUserOrContact=Listă de notificări (evenimente) disponibilă pe utilizator* sau pe contact **
-ListOfFixedNotifications=Listă de notificări fixe
+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
 GoOntoUserCardToAddMore=Accesați fila "Notificări" a unui mesaj de utilizator pentru a adăuga sau elimina notificările pentru utilizatori
 GoOntoContactCardToAddMore=Mergeți în fila "Notificări" a unei terțe părți pentru a adăuga sau elimina notificări pentru contacte / adrese
 Threshold=Prag
@@ -1898,6 +1900,11 @@ OnMobileOnly=Numai pe ecranul mic (smartphone)
 DisableProspectCustomerType=Dezactivați tipul de terţ "Prospect + Client" (deci terţul trebuie să fie Prospect sau Client, dar nu poate fi ambele)
 MAIN_OPTIMIZEFORTEXTBROWSER=Simplificați interfața pentru o persoană nevăzătoare
 MAIN_OPTIMIZEFORTEXTBROWSERDesc=Activați această opțiune dacă sunteți o persoană nevăzătoare sau dacă utilizați aplicația dintr-un browser de text precum Lynx sau 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
 ThisValueCanOverwrittenOnUserLevel=Această valoare poate fi suprascrisă de fiecare utilizator de pe pagina sa de utilizator- tab '%s'
 DefaultCustomerType=Tipul terțului implicit pentru formularul de creare "Client nou" 
 ABankAccountMustBeDefinedOnPaymentModeSetup=Note: The bank account must be defined on the module of each payment mode (Paypal, Stripe, ...) to have this feature working.
@@ -1911,7 +1918,7 @@ LogsLinesNumber=Number of lines to show on logs tab
 UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
-DebugBarModuleActivated=Module debugbar is activated and slows dramaticaly the interface
+ModuleActivated=Module %s is activated and slows the interface
 EXPORTS_SHARE_MODELS=Export models are share with everybody
 ExportSetup=Setup of module Export
 InstanceUniqueID=Unique ID of the instance
@@ -1928,3 +1935,5 @@ 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
diff --git a/htdocs/langs/ro_RO/bills.lang b/htdocs/langs/ro_RO/bills.lang
index 61886b2fa25..e6e0abe033e 100644
--- a/htdocs/langs/ro_RO/bills.lang
+++ b/htdocs/langs/ro_RO/bills.lang
@@ -95,6 +95,7 @@ PaymentHigherThanReminderToPay=Plată mai mare decât restul de  plată
 HelpPaymentHigherThanReminderToPay=Atenție, suma de plată a uneia sau mai multor facturi este mai mare decât suma rămasă neachitată. <br> Modificați intrarea dvs., în caz contrar confirmați şi luați în considerare crearea unei note de credit pentru suma în exces primită pentru fiecare sumă primită în plus.
 HelpPaymentHigherThanReminderToPaySupplier=Atenție, suma de plată a uneia sau mai multor facturi este mai mare decât suma rămasă neachitată. <br>  Modificați intrarea dvs., în caz contrar confirmați şi luați în considerare crearea unei note de credit pentru suma în exces primită pentru fiecare sumă plătită în plus.
 ClassifyPaid=Clasează "Platită"
+ClassifyUnPaid=Classify 'Unpaid'
 ClassifyPaidPartially=Clasează "Platită Parţial"
 ClassifyCanceled=Clasează "Abandonată"
 ClassifyClosed=Clasează "Închisă"
@@ -214,6 +215,20 @@ ShowInvoiceReplace=Afisează  factura de înlocuire
 ShowInvoiceAvoir=Afisează  nota de credit
 ShowInvoiceDeposit=Afișați factura în avans
 ShowInvoiceSituation=Afişează factura de situaţie
+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
 ShowPayment=Afisează plata
 AlreadyPaid=Deja platite
 AlreadyPaidBack=Deja rambursată
diff --git a/htdocs/langs/ro_RO/errors.lang b/htdocs/langs/ro_RO/errors.lang
index 79f0d4f6f50..3402e4a690e 100644
--- a/htdocs/langs/ro_RO/errors.lang
+++ b/htdocs/langs/ro_RO/errors.lang
@@ -90,7 +90,7 @@ ErrorSpecialCharNotAllowedForField=Caractere speciale nu sunt permise pentru dom
 ErrorNumRefModel=O referire există în baza de date (%s) şi nu este compatibilă cu această regulă de numerotare. înregistra Remove sau redenumite de referinţă pentru a activa acest modul.
 ErrorQtyTooLowForThisSupplier=Cantitate prea mică pentru acest furnizor sau niciun preț definit pentru acest produs pentru acest furnizor
 ErrorOrdersNotCreatedQtyTooLow=Unele comenzi nu au fost create datorită cantităților prea mici
-ErrorModuleSetupNotComplete=Configurarea modulului pare a nu fi completă. Mergeți la Setup - Module pentru a finaliza.
+ErrorModuleSetupNotComplete=Setup of module %s looks to be uncomplete. Go on Home - Setup - Modules to complete.
 ErrorBadMask=Eroare pe masca
 ErrorBadMaskFailedToLocatePosOfSequence=Eroare, fără a masca numărul de ordine
 ErrorBadMaskBadRazMonth=Eroare, Bad resetare valoarea
@@ -219,6 +219,7 @@ 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.
 # 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. 
 WarningMandatorySetupNotComplete=Click here to setup mandatory parameters
 WarningEnableYourModulesApplications=Click here to enable your modules and applications
diff --git a/htdocs/langs/ro_RO/main.lang b/htdocs/langs/ro_RO/main.lang
index fa6ed942ed0..e5d109c0da2 100644
--- a/htdocs/langs/ro_RO/main.lang
+++ b/htdocs/langs/ro_RO/main.lang
@@ -445,6 +445,7 @@ ContactsAddressesForCompany=Contacte pentru aceast terţ
 AddressesForCompany=Adrese pentru acest terţ
 ActionsOnCompany=Evenimente pentru acest terț
 ActionsOnContact=Evenimente pentru acest contact/adresa
+ActionsOnContract=Events for this contract
 ActionsOnMember=Evenimente  privind  acest membru
 ActionsOnProduct=Evenimente despre acest produs
 NActionsLate=%s  întârziat
@@ -759,6 +760,7 @@ LinkToSupplierProposal=Link la propunerea vânzătorului
 LinkToSupplierInvoice=Link la factura furnizorului
 LinkToContract=Link la contract
 LinkToIntervention=Link la intervenție
+LinkToTicket=Link to ticket
 CreateDraft=Creareză schiţă
 SetToDraft=Inapoi la schiţă
 ClickToEdit=Clic pentru a edita
diff --git a/htdocs/langs/ro_RO/products.lang b/htdocs/langs/ro_RO/products.lang
index 2d55290f69f..e9a675f3d4d 100644
--- a/htdocs/langs/ro_RO/products.lang
+++ b/htdocs/langs/ro_RO/products.lang
@@ -2,6 +2,7 @@
 ProductRef=Ref. Produs
 ProductLabel=Etichetă produs
 ProductLabelTranslated=Etichetă de produs tradusă
+ProductDescription=Product description
 ProductDescriptionTranslated=Descrierea produsului tradus
 ProductNoteTranslated=Nota de produs tradusă
 ProductServiceCard=Fişe Produse / Servicii
diff --git a/htdocs/langs/ro_RO/stripe.lang b/htdocs/langs/ro_RO/stripe.lang
index 92ff044dd88..fc47415eb0d 100644
--- a/htdocs/langs/ro_RO/stripe.lang
+++ b/htdocs/langs/ro_RO/stripe.lang
@@ -65,3 +65,5 @@ StripeUserAccountForActions=Cont utilizator pe care să îl utilizați pentru no
 StripePayoutList=Listă de plăți Stripe
 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>
diff --git a/htdocs/langs/ro_RO/withdrawals.lang b/htdocs/langs/ro_RO/withdrawals.lang
index 8468953f95a..36d33342746 100644
--- a/htdocs/langs/ro_RO/withdrawals.lang
+++ b/htdocs/langs/ro_RO/withdrawals.lang
@@ -76,7 +76,8 @@ WithdrawalFile=Fişier Retragere
 SetToStatusSent=Setează statusul "Fişier Trimis"
 ThisWillAlsoAddPaymentOnInvoice=Acest lucru va înregistra, de asemenea, plățile către facturi și le va clasifica drept "plătit" dacă restul de plată este nul
 StatisticsByLineStatus=Statistici după starea  liniilor
-RUM=RMU
+RUM=Unique Mandate Reference (UMR)
+DateRUM=Mandate signature date
 RUMLong=Referință de mandat unic
 RUMWillBeGenerated=Dacă este gol, se va genera un RMU (referință unică de mandat) odată ce informațiile despre contul bancar vor fi salvate.
 WithdrawMode=Modul debit direct (FRST sau RECUR)
diff --git a/htdocs/langs/ru_RU/accountancy.lang b/htdocs/langs/ru_RU/accountancy.lang
index 99e4fefd472..3d4e4b2b76a 100644
--- a/htdocs/langs/ru_RU/accountancy.lang
+++ b/htdocs/langs/ru_RU/accountancy.lang
@@ -265,7 +265,7 @@ AccountingJournals=Бухгалтерские журналы
 AccountingJournal=Accounting journal
 NewAccountingJournal=New accounting journal
 ShowAccoutingJournal=Show accounting journal
-Nature=Природа
+NatureOfJournal=Nature of Journal
 AccountingJournalType1=Miscellaneous operations
 AccountingJournalType2=Продажи
 AccountingJournalType3=Покупки
@@ -291,6 +291,7 @@ Modelcsv_quadratus=Export for Quadratus QuadraCompta
 Modelcsv_ebp=Export for EBP
 Modelcsv_cogilog=Export for Cogilog
 Modelcsv_agiris=Export for Agiris
+Modelcsv_LDCompta=Export for LD Compta (v9 & higher) (Test)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
@@ -301,7 +302,7 @@ ChartofaccountsId=Chart of accounts Id
 InitAccountancy=Init accountancy
 InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accounting account defined for sales and purchases.
 DefaultBindingDesc=This page can be used to set a default account to use to link transactions record about payment salaries, donation, taxes and vat when no specific accounting account were already set.
-DefaultClosureDesc=This page can be used to set parameters to use to enclose a balance sheet.
+DefaultClosureDesc=This page can be used to set parameters used for accounting closures.
 Options=Options
 OptionModeProductSell=Mode sales
 OptionModeProductSellIntra=Mode sales exported in EEC
diff --git a/htdocs/langs/ru_RU/admin.lang b/htdocs/langs/ru_RU/admin.lang
index 08836e9e900..1b274768ca4 100644
--- a/htdocs/langs/ru_RU/admin.lang
+++ b/htdocs/langs/ru_RU/admin.lang
@@ -574,7 +574,7 @@ Module510Name=Зарплаты
 Module510Desc=Записывать и отслеживать выплаты сотрудникам
 Module520Name=Ссуды
 Module520Desc=Управление ссудами
-Module600Name=Уведомления
+Module600Name=Notifications on business event
 Module600Desc=Отправка уведомлений по электронной почте, инициированных бизнес-событием: для каждого пользователя (настройка, определенная для каждого пользователя), для сторонних контактов (настройка, определенная для каждого контрагента) или для определенных электронных писем
 Module600Long=Обратите внимание, что этот модуль отправляет электронные письма в режиме реального времени, когда происходит определенное деловое событие. Если вы ищете функцию для отправки напоминаний по электронной почте для событий в повестке дня, перейдите к настройке модуля Agenda.
 Module610Name=Варианты продукта
@@ -1193,6 +1193,7 @@ ExtraFieldsSupplierOrders=Дополнительные атрибуты (Зак
 ExtraFieldsSupplierInvoices=Дополнительные атрибуты (Счета-фактуры)
 ExtraFieldsProject=Дополнительные атрибуты (Проекты)
 ExtraFieldsProjectTask=Дополнительные атрибуты (Задачи)
+ExtraFieldsSalaries=Complementary attributes (salaries)
 ExtraFieldHasWrongValue=Атрибут %s  имеет неправильное значение.
 AlphaNumOnlyLowerCharsAndNoSpace=только латинские строчные буквы и цифры без пробелов
 SendmailOptionNotComplete=Предупреждение, на некоторых системах Linux, для отправки электронной почты из электронной почты, Sendmail выполнения установки должны conatins опцию-ба (параметр mail.force_extra_parameters в файле php.ini). Если некоторые получатели не получают электронные письма, попытке изменить этот параметр с PHP mail.force_extra_parameters =-ба).
@@ -1220,13 +1221,14 @@ SuhosinSessionEncrypt=Хранилище сессий шифровано сис
 ConditionIsCurrently=Текущее состояние %s
 YouUseBestDriver=Вы используете драйвер %s, который является лучшим драйвером, доступным в настоящее время.
 YouDoNotUseBestDriver=Вы используете драйвер %s, но рекомендуется драйвер %s.
-NbOfProductIsLowerThanNoPb=У вас есть только %s товаров/услуг в базе данных. Это не требуебует никакой оптимизации.
+NbOfObjectIsLowerThanNoPb=You have only %s %s in the database. This does not require any particular optimization.
 SearchOptim=Поисковая оптимизация
-YouHaveXProductUseSearchOptim=У вас есть продукты %s в базе данных. Вы должны добавить константу PRODUCT_DONOTSEARCH_ANYWHERE равную 1 в Главная-Настройки-Другие настройки. Ограничьте поиск началом строк, что позволяет базе данных использовать индексы, и вы будете получать быстрый ответ.
+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.
 BrowserIsOK=Вы используете веб-браузер %s. Этот браузер подходит в отношении безопасности и производительности.
 BrowserIsKO=Вы используете веб-браузер %s. Этот браузер, как известно, является плохим выбором по безопасности, производительности и надежности. Мы рекомендуем использовать Firefox, Chrome, Opera или Safari.
-XDebugInstalled=XDebug загружен.
-XCacheInstalled=XCache загружен.
+PHPModuleLoaded=PHP component %s is loaded
+PreloadOPCode=Preloaded OPCode is used
 AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.<br>Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp".
 AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".
 AskForPreferredShippingMethod=Запросить предпочтительный способ доставки для контрагентов.
@@ -1734,9 +1736,9 @@ ExpenseReportsRulesSetup=Настройка модуля Отчеты о рас
 ExpenseReportNumberingModules=Модуль нумерации отчетов о расходах
 NoModueToManageStockIncrease=Был активирован модуль, способный управлять автоматическим увеличением запасов. Увеличение запасов будет производиться только вручную.
 YouMayFindNotificationsFeaturesIntoModuleNotification=Вы можете найти опции для уведомлений по электронной почте, включив и настроив модуль «Уведомления».
-ListOfNotificationsPerUser=Список уведомлений на пользователя *
-ListOfNotificationsPerUserOrContact=List of notifications (events) available per user* or per contact**
-ListOfFixedNotifications=List of Fixed Notifications
+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
 GoOntoUserCardToAddMore=Go to the tab "Notifications" of a user to add or remove notifications for users
 GoOntoContactCardToAddMore=Перейдите на вкладку «Уведомления» третьей стороны, чтобы добавлять или удалять уведомления для контактов/адресов
 Threshold=Порог
@@ -1898,6 +1900,11 @@ OnMobileOnly=On small screen (smartphone) only
 DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be Prospect or Customer but can't be both)
 MAIN_OPTIMIZEFORTEXTBROWSER=Simplify interface for blind person
 MAIN_OPTIMIZEFORTEXTBROWSERDesc=Enable this option if you are a blind person, or if you use the application from a text browser like Lynx or 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
 ThisValueCanOverwrittenOnUserLevel=This value can be overwritten by each user from its user page - tab '%s'
 DefaultCustomerType=Default thirdparty type for "New customer" creation form
 ABankAccountMustBeDefinedOnPaymentModeSetup=Примечание. Банковский счет должен быть указан в модуле каждого способа оплаты (Paypal, Stripe, ...), чтобы эта функция работала.
@@ -1911,7 +1918,7 @@ LogsLinesNumber=Number of lines to show on logs tab
 UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
-DebugBarModuleActivated=Модуль отладки активируется и резко замедляет интерфейс
+ModuleActivated=Module %s is activated and slows the interface
 EXPORTS_SHARE_MODELS=Export models are share with everybody
 ExportSetup=Setup of module Export
 InstanceUniqueID=Unique ID of the instance
@@ -1928,3 +1935,5 @@ 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
diff --git a/htdocs/langs/ru_RU/bills.lang b/htdocs/langs/ru_RU/bills.lang
index eedacc9143d..4d64e6aa83d 100644
--- a/htdocs/langs/ru_RU/bills.lang
+++ b/htdocs/langs/ru_RU/bills.lang
@@ -95,6 +95,7 @@ PaymentHigherThanReminderToPay=Платеж больше, чем в напоми
 HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess received for each overpaid invoice.
 HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess paid for each overpaid invoice.
 ClassifyPaid=Классифицировать как 'Оплачен'
+ClassifyUnPaid=Classify 'Unpaid'
 ClassifyPaidPartially=Классифицировать как 'Оплачен частично'
 ClassifyCanceled=Классифицировать как 'Аннулирован'
 ClassifyClosed=Классифицировать как 'Закрыт'
@@ -214,6 +215,20 @@ ShowInvoiceReplace=Показать заменяющий счет-фактуру
 ShowInvoiceAvoir=Показать кредитое авизо
 ShowInvoiceDeposit=Show down payment invoice
 ShowInvoiceSituation=Show situation invoice
+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
 ShowPayment=Показать платеж
 AlreadyPaid=Уже оплачен
 AlreadyPaidBack=Already paid back
diff --git a/htdocs/langs/ru_RU/errors.lang b/htdocs/langs/ru_RU/errors.lang
index b8e12a8f6bc..ef954ee19b7 100644
--- a/htdocs/langs/ru_RU/errors.lang
+++ b/htdocs/langs/ru_RU/errors.lang
@@ -90,7 +90,7 @@ ErrorSpecialCharNotAllowedForField=Специальные символы не д
 ErrorNumRefModel=Ссылка есть в базе данных (%s) и не совместимы с данным правилом нумерации. Удаление записей или переименован ссылкой для активации этого модуля.
 ErrorQtyTooLowForThisSupplier=Quantity too low for this vendor or no price defined on this product for this vendor
 ErrorOrdersNotCreatedQtyTooLow=Some orders haven't been created because of too-low quantities
-ErrorModuleSetupNotComplete=Setup of module looks to be uncomplete. Go on Home - Setup - Modules to complete.
+ErrorModuleSetupNotComplete=Setup of module %s looks to be uncomplete. Go on Home - Setup - Modules to complete.
 ErrorBadMask=Ошибка на маску
 ErrorBadMaskFailedToLocatePosOfSequence=Ошибка, маска без порядкового номера
 ErrorBadMaskBadRazMonth=Ошибка, плохое значение сброса
@@ -219,6 +219,7 @@ 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.
 # 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.
 WarningMandatorySetupNotComplete=Click here to setup mandatory parameters
 WarningEnableYourModulesApplications=Click here to enable your modules and applications
diff --git a/htdocs/langs/ru_RU/main.lang b/htdocs/langs/ru_RU/main.lang
index 16888bfd4c2..4bea2a8d3e2 100644
--- a/htdocs/langs/ru_RU/main.lang
+++ b/htdocs/langs/ru_RU/main.lang
@@ -445,6 +445,7 @@ ContactsAddressesForCompany=Контакты/Адреса для этого ко
 AddressesForCompany=Адреса для этого контарагента
 ActionsOnCompany=События для этого контрагента
 ActionsOnContact=Событие для этого контакта/адреса
+ActionsOnContract=Events for this contract
 ActionsOnMember=События этого участника
 ActionsOnProduct=События об этом продукте
 NActionsLate=% с опозданием
@@ -759,6 +760,7 @@ LinkToSupplierProposal=Ссылка на предложение поставщи
 LinkToSupplierInvoice=Ссылка на счет поставщика
 LinkToContract=Ссылка на контакт
 LinkToIntervention=Ссылка на мероприятие
+LinkToTicket=Link to ticket
 CreateDraft=Создать черновик
 SetToDraft=Назад к черновику
 ClickToEdit=Нажмите, чтобы изменить
diff --git a/htdocs/langs/ru_RU/products.lang b/htdocs/langs/ru_RU/products.lang
index 31e9c9901e9..41e45aee3f0 100644
--- a/htdocs/langs/ru_RU/products.lang
+++ b/htdocs/langs/ru_RU/products.lang
@@ -2,6 +2,7 @@
 ProductRef=Продукт исх.
 ProductLabel=Этикетка товара
 ProductLabelTranslated=Переведенная этикетка продукта
+ProductDescription=Product description
 ProductDescriptionTranslated=Переведенное описание продукта
 ProductNoteTranslated=Переведенная заметка о продукте
 ProductServiceCard=Карточка Товаров/Услуг
diff --git a/htdocs/langs/ru_RU/stripe.lang b/htdocs/langs/ru_RU/stripe.lang
index 10b6c4748d1..196cfdc10ae 100644
--- a/htdocs/langs/ru_RU/stripe.lang
+++ b/htdocs/langs/ru_RU/stripe.lang
@@ -65,3 +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>
diff --git a/htdocs/langs/ru_RU/withdrawals.lang b/htdocs/langs/ru_RU/withdrawals.lang
index 661e530d09a..3dcaf52751d 100644
--- a/htdocs/langs/ru_RU/withdrawals.lang
+++ b/htdocs/langs/ru_RU/withdrawals.lang
@@ -76,7 +76,8 @@ WithdrawalFile=Файл изъятия средств
 SetToStatusSent=Установить статус "Файл отправлен"
 ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and will classify them as "Paid" if remain to pay is null
 StatisticsByLineStatus=Статистика статуса по строкам
-RUM=UMR
+RUM=Unique Mandate Reference (UMR)
+DateRUM=Mandate signature date
 RUMLong=Unique Mandate Reference
 RUMWillBeGenerated=If empty, a UMR (Unique Mandate Reference) will be generated once the bank account information is saved.
 WithdrawMode=Direct debit mode (FRST or RECUR)
diff --git a/htdocs/langs/sk_SK/accountancy.lang b/htdocs/langs/sk_SK/accountancy.lang
index ec2439d5d71..5f922e5911c 100644
--- a/htdocs/langs/sk_SK/accountancy.lang
+++ b/htdocs/langs/sk_SK/accountancy.lang
@@ -265,7 +265,7 @@ AccountingJournals=Accounting journals
 AccountingJournal=Accounting journal
 NewAccountingJournal=New accounting journal
 ShowAccoutingJournal=Show accounting journal
-Nature=Príroda
+NatureOfJournal=Nature of Journal
 AccountingJournalType1=Miscellaneous operations
 AccountingJournalType2=Predaje
 AccountingJournalType3=Platby
@@ -291,6 +291,7 @@ Modelcsv_quadratus=Export for Quadratus QuadraCompta
 Modelcsv_ebp=Export for EBP
 Modelcsv_cogilog=Export for Cogilog
 Modelcsv_agiris=Export for Agiris
+Modelcsv_LDCompta=Export for LD Compta (v9 & higher) (Test)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
@@ -301,7 +302,7 @@ ChartofaccountsId=Chart of accounts Id
 InitAccountancy=Načítať účtovníctvo
 InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accounting account defined for sales and purchases.
 DefaultBindingDesc=Táto stránka môže byť použitá na nastavenie predvoleného účtu, ktorý sa používa na prepojenie transakčných záznamov o platobných platoch, darcovstve, daniach a DPH, ak už nie je stanovený žiadny konkrétny účtovný účet.
-DefaultClosureDesc=This page can be used to set parameters to use to enclose a balance sheet.
+DefaultClosureDesc=This page can be used to set parameters used for accounting closures.
 Options=Možnosti
 OptionModeProductSell=Mód predaja
 OptionModeProductSellIntra=Mode sales exported in EEC
diff --git a/htdocs/langs/sk_SK/admin.lang b/htdocs/langs/sk_SK/admin.lang
index a4156dc9f84..4546efba5d7 100644
--- a/htdocs/langs/sk_SK/admin.lang
+++ b/htdocs/langs/sk_SK/admin.lang
@@ -574,7 +574,7 @@ Module510Name=Mzdy
 Module510Desc=Record and track employee payments
 Module520Name=Loans
 Module520Desc=Správca pôžičiek
-Module600Name=Upozornenie
+Module600Name=Notifications on business event
 Module600Desc=Send email notifications triggered by a business event: per user (setup defined on each user), per third-party contacts (setup defined on each third party) or by specific emails
 Module600Long=Note that this module sends emails in real-time when a specific business event occurs. If you are looking for a feature to send email reminders for agenda events, go into the setup of module Agenda.
 Module610Name=Product Variants
@@ -1193,6 +1193,7 @@ ExtraFieldsSupplierOrders=Doplnkové atribúty (objednávky)
 ExtraFieldsSupplierInvoices=Doplnkové atribúty (faktúry)
 ExtraFieldsProject=Doplnkové atribúty (projekty)
 ExtraFieldsProjectTask=Doplnkové atribúty (úlohy)
+ExtraFieldsSalaries=Complementary attributes (salaries)
 ExtraFieldHasWrongValue=Atribút %s má nesprávnu hodnotu.
 AlphaNumOnlyLowerCharsAndNoSpace=iba alfanumerické a malé znaky bez medzier
 SendmailOptionNotComplete=Upozornenie na niektorých operačných systémoch Linux, posielať e-maily z vášho e-mailu, musíte sendmail prevedenie inštalácie obsahuje voľbu-BA (parameter mail.force_extra_parameters do súboru php.ini). Ak niektorí príjemcovia nikdy prijímať e-maily, skúste upraviť tento parameter spoločne s PHP mail.force_extra_parameters =-BA).
@@ -1220,13 +1221,14 @@ SuhosinSessionEncrypt=Úložisko relácie šifrovaná Suhosin
 ConditionIsCurrently=Podmienkou je v súčasnej dobe %s
 YouUseBestDriver=You use driver %s which is the best driver currently available.
 YouDoNotUseBestDriver=You use driver %s but driver %s is recommended.
-NbOfProductIsLowerThanNoPb=You have only %s products/services in the database. This does not require any particular optimization.
+NbOfObjectIsLowerThanNoPb=You have only %s %s in the database. This does not require any particular optimization.
 SearchOptim=Optimalizácia pre vyhľadávače
-YouHaveXProductUseSearchOptim=You have %s products in the database. You should add the constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+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.
 BrowserIsOK=You are using the %s web browser. This browser is ok for security and performance.
 BrowserIsKO=You are using the %s web browser. This browser is known to be a bad choice for security, performance and reliability. We recommend using Firefox, Chrome, Opera or Safari.
-XDebugInstalled=XDebug je načítaný
-XCacheInstalled=XCache načítaný.
+PHPModuleLoaded=PHP component %s is loaded
+PreloadOPCode=Preloaded OPCode is used
 AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.<br>Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp".
 AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".
 AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties.
@@ -1734,9 +1736,9 @@ ExpenseReportsRulesSetup=Setup of module Expense Reports - Rules
 ExpenseReportNumberingModules=Expense reports numbering module
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
 YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for email notifications by enabling and configuring the module "Notification".
-ListOfNotificationsPerUser=Zoznam upozornení podľa užívateľa
-ListOfNotificationsPerUserOrContact=List of notifications (events) available per user* or per contact**
-ListOfFixedNotifications=List of Fixed Notifications
+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
 GoOntoUserCardToAddMore=Go to the tab "Notifications" of a user to add or remove notifications for users
 GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
 Threshold=Maximálna hodnota
@@ -1898,6 +1900,11 @@ OnMobileOnly=On small screen (smartphone) only
 DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be Prospect or Customer but can't be both)
 MAIN_OPTIMIZEFORTEXTBROWSER=Simplify interface for blind person
 MAIN_OPTIMIZEFORTEXTBROWSERDesc=Enable this option if you are a blind person, or if you use the application from a text browser like Lynx or 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
 ThisValueCanOverwrittenOnUserLevel=This value can be overwritten by each user from its user page - tab '%s'
 DefaultCustomerType=Default thirdparty type for "New customer" creation form
 ABankAccountMustBeDefinedOnPaymentModeSetup=Note: The bank account must be defined on the module of each payment mode (Paypal, Stripe, ...) to have this feature working.
@@ -1911,7 +1918,7 @@ LogsLinesNumber=Number of lines to show on logs tab
 UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
-DebugBarModuleActivated=Module debugbar is activated and slows dramaticaly the interface
+ModuleActivated=Module %s is activated and slows the interface
 EXPORTS_SHARE_MODELS=Export models are share with everybody
 ExportSetup=Setup of module Export
 InstanceUniqueID=Unique ID of the instance
@@ -1928,3 +1935,5 @@ 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
diff --git a/htdocs/langs/sk_SK/bills.lang b/htdocs/langs/sk_SK/bills.lang
index e59e132e721..867afacd391 100644
--- a/htdocs/langs/sk_SK/bills.lang
+++ b/htdocs/langs/sk_SK/bills.lang
@@ -95,6 +95,7 @@ PaymentHigherThanReminderToPay=Platobné vyššia než upomienke na zaplatenie
 HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess received for each overpaid invoice.
 HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess paid for each overpaid invoice.
 ClassifyPaid=Klasifikáciu &quot;Zaplatené&quot;
+ClassifyUnPaid=Classify 'Unpaid'
 ClassifyPaidPartially=Klasifikovať &quot;Platené čiastočne&quot;
 ClassifyCanceled=Klasifikovať &quot;Opustené&quot;
 ClassifyClosed=Klasifikáciu &quot;uzavretým&quot;
@@ -214,6 +215,20 @@ ShowInvoiceReplace=Zobraziť výmene faktúru
 ShowInvoiceAvoir=Zobraziť dobropis
 ShowInvoiceDeposit=Show down payment invoice
 ShowInvoiceSituation=Show situation invoice
+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
 ShowPayment=Zobraziť platbu
 AlreadyPaid=Už zaplatené
 AlreadyPaidBack=Už vráti
diff --git a/htdocs/langs/sk_SK/errors.lang b/htdocs/langs/sk_SK/errors.lang
index 6c0c9221b52..5f0b4926d2e 100644
--- a/htdocs/langs/sk_SK/errors.lang
+++ b/htdocs/langs/sk_SK/errors.lang
@@ -90,7 +90,7 @@ ErrorSpecialCharNotAllowedForField=Špeciálne znaky nie sú povolené pre pole
 ErrorNumRefModel=Existuje odkaz do databázy (%s) a nie je kompatibilný s týmto pravidlom číslovania. Odobrať záznam alebo premenovať odkaz na aktiváciu tohto modulu.
 ErrorQtyTooLowForThisSupplier=Quantity too low for this vendor or no price defined on this product for this vendor
 ErrorOrdersNotCreatedQtyTooLow=Some orders haven't been created because of too-low quantities
-ErrorModuleSetupNotComplete=Setup of module looks to be uncomplete. Go on Home - Setup - Modules to complete.
+ErrorModuleSetupNotComplete=Setup of module %s looks to be uncomplete. Go on Home - Setup - Modules to complete.
 ErrorBadMask=Chyba na masku
 ErrorBadMaskFailedToLocatePosOfSequence=Chyba maska ​​bez poradovým číslom
 ErrorBadMaskBadRazMonth=Chyba, zlá hodnota po resete
@@ -219,6 +219,7 @@ 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.
 # 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.
 WarningMandatorySetupNotComplete=Click here to setup mandatory parameters
 WarningEnableYourModulesApplications=Click here to enable your modules and applications
diff --git a/htdocs/langs/sk_SK/main.lang b/htdocs/langs/sk_SK/main.lang
index 52f6af95054..ef836241865 100644
--- a/htdocs/langs/sk_SK/main.lang
+++ b/htdocs/langs/sk_SK/main.lang
@@ -445,6 +445,7 @@ ContactsAddressesForCompany=Kontakty / adries tretím stranám tejto
 AddressesForCompany=Adresy pre túto tretiu stranu
 ActionsOnCompany=Events for this third party
 ActionsOnContact=Events for this contact/address
+ActionsOnContract=Events for this contract
 ActionsOnMember=Akcia o tomto členovi
 ActionsOnProduct=Events about this product
 NActionsLate=%s neskoro
@@ -759,6 +760,7 @@ LinkToSupplierProposal=Link to vendor proposal
 LinkToSupplierInvoice=Link to vendor invoice
 LinkToContract=Link to contract
 LinkToIntervention=Link to intervention
+LinkToTicket=Link to ticket
 CreateDraft=Vytvorte návrh
 SetToDraft=Späť na návrh
 ClickToEdit=Kliknutím možno upraviť
diff --git a/htdocs/langs/sk_SK/products.lang b/htdocs/langs/sk_SK/products.lang
index a03df89e6d1..5d92e95a649 100644
--- a/htdocs/langs/sk_SK/products.lang
+++ b/htdocs/langs/sk_SK/products.lang
@@ -2,6 +2,7 @@
 ProductRef=Produkt čj.
 ProductLabel=Produkt štítok
 ProductLabelTranslated=Preložený názov produktu
+ProductDescription=Product description
 ProductDescriptionTranslated=Preložený popis produktu
 ProductNoteTranslated=Preložená poznámka produktu
 ProductServiceCard=Produkty / služby karty
diff --git a/htdocs/langs/sk_SK/stripe.lang b/htdocs/langs/sk_SK/stripe.lang
index db2a3b0a561..988d8b8954c 100644
--- a/htdocs/langs/sk_SK/stripe.lang
+++ b/htdocs/langs/sk_SK/stripe.lang
@@ -65,3 +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>
diff --git a/htdocs/langs/sk_SK/withdrawals.lang b/htdocs/langs/sk_SK/withdrawals.lang
index 945b76876df..f3ac8b522c5 100644
--- a/htdocs/langs/sk_SK/withdrawals.lang
+++ b/htdocs/langs/sk_SK/withdrawals.lang
@@ -76,7 +76,8 @@ WithdrawalFile=Odstúpenie súbor
 SetToStatusSent=Nastavte na stav &quot;odoslaný súbor&quot;
 ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and will classify them as "Paid" if remain to pay is null
 StatisticsByLineStatus=Statistics by status of lines
-RUM=UMR
+RUM=Unique Mandate Reference (UMR)
+DateRUM=Mandate signature date
 RUMLong=Unique Mandate Reference
 RUMWillBeGenerated=If empty, a UMR (Unique Mandate Reference) will be generated once the bank account information is saved.
 WithdrawMode=Direct debit mode (FRST or RECUR)
diff --git a/htdocs/langs/sl_SI/accountancy.lang b/htdocs/langs/sl_SI/accountancy.lang
index 9ece7db19d0..efd258369f9 100644
--- a/htdocs/langs/sl_SI/accountancy.lang
+++ b/htdocs/langs/sl_SI/accountancy.lang
@@ -265,7 +265,7 @@ AccountingJournals=Accounting journals
 AccountingJournal=Accounting journal
 NewAccountingJournal=New accounting journal
 ShowAccoutingJournal=Show accounting journal
-Nature=Narava
+NatureOfJournal=Nature of Journal
 AccountingJournalType1=Miscellaneous operations
 AccountingJournalType2=Prodaja
 AccountingJournalType3=Nabava
@@ -291,6 +291,7 @@ Modelcsv_quadratus=Export for Quadratus QuadraCompta
 Modelcsv_ebp=Export for EBP
 Modelcsv_cogilog=Export for Cogilog
 Modelcsv_agiris=Export for Agiris
+Modelcsv_LDCompta=Export for LD Compta (v9 & higher) (Test)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
@@ -301,7 +302,7 @@ ChartofaccountsId=Chart of accounts Id
 InitAccountancy=Init accountancy
 InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accounting account defined for sales and purchases.
 DefaultBindingDesc=This page can be used to set a default account to use to link transactions record about payment salaries, donation, taxes and vat when no specific accounting account were already set.
-DefaultClosureDesc=This page can be used to set parameters to use to enclose a balance sheet.
+DefaultClosureDesc=This page can be used to set parameters used for accounting closures.
 Options=Options
 OptionModeProductSell=Mode sales
 OptionModeProductSellIntra=Mode sales exported in EEC
diff --git a/htdocs/langs/sl_SI/admin.lang b/htdocs/langs/sl_SI/admin.lang
index 025ffcef4df..3a342353e7b 100644
--- a/htdocs/langs/sl_SI/admin.lang
+++ b/htdocs/langs/sl_SI/admin.lang
@@ -574,7 +574,7 @@ Module510Name=Plače
 Module510Desc=Record and track employee payments
 Module520Name=Loans
 Module520Desc=Upravljanje posojil
-Module600Name=Obvestila
+Module600Name=Notifications on business event
 Module600Desc=Send email notifications triggered by a business event: per user (setup defined on each user), per third-party contacts (setup defined on each third party) or by specific emails
 Module600Long=Note that this module sends emails in real-time when a specific business event occurs. If you are looking for a feature to send email reminders for agenda events, go into the setup of module Agenda.
 Module610Name=Product Variants
@@ -1193,6 +1193,7 @@ ExtraFieldsSupplierOrders=Koplementarni atributi (naročila)
 ExtraFieldsSupplierInvoices=Koplementarni atributi (računi)
 ExtraFieldsProject=Koplementarni atributi (projekti)
 ExtraFieldsProjectTask=Koplementarni atributi (naloge)
+ExtraFieldsSalaries=Complementary attributes (salaries)
 ExtraFieldHasWrongValue=Atribut %s ima napačno vrednost.
 AlphaNumOnlyLowerCharsAndNoSpace=samo alfanumerični znaki in male črke brez presledkov
 SendmailOptionNotComplete=Pozor, na nekaterih Linux sistemih mora za pošiljanje pošte z vašega naslova nastavitev vsebovati opcijo -ba (parameter mail.force_extra_parameters v vaši datoteki php.ini). Če nekateri prejemniki nikoli ne dobijo pošte, poskusite popraviti PHP parameter z mail.force_extra_parameters = -ba).
@@ -1220,13 +1221,14 @@ SuhosinSessionEncrypt=Shranjevanje seje kriptirano s Suhosin
 ConditionIsCurrently=Trenutni pogoj je %s
 YouUseBestDriver=You use driver %s which is the best driver currently available.
 YouDoNotUseBestDriver=You use driver %s but driver %s is recommended.
-NbOfProductIsLowerThanNoPb=You have only %s products/services in the database. This does not require any particular optimization.
+NbOfObjectIsLowerThanNoPb=You have only %s %s in the database. This does not require any particular optimization.
 SearchOptim=Iskanje optimizacijo
-YouHaveXProductUseSearchOptim=You have %s products in the database. You should add the constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+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.
 BrowserIsOK=You are using the %s web browser. This browser is ok for security and performance.
 BrowserIsKO=You are using the %s web browser. This browser is known to be a bad choice for security, performance and reliability. We recommend using Firefox, Chrome, Opera or Safari.
-XDebugInstalled=Naložen je XDebug
-XCacheInstalled=Naložen je XCache.
+PHPModuleLoaded=PHP component %s is loaded
+PreloadOPCode=Preloaded OPCode is used
 AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.<br>Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp".
 AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".
 AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties.
@@ -1734,9 +1736,9 @@ ExpenseReportsRulesSetup=Setup of module Expense Reports - Rules
 ExpenseReportNumberingModules=Expense reports numbering module
 NoModueToManageStockIncrease=Noben modul za upravljanje avtomatskega povečevanja zalog ni aktiviran. Zaloge se bodo povečale samo na osnovi ročnega vnosa.
 YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for email notifications by enabling and configuring the module "Notification".
-ListOfNotificationsPerUser=List of notifications per user*
-ListOfNotificationsPerUserOrContact=List of notifications (events) available per user* or per contact**
-ListOfFixedNotifications=List of Fixed Notifications
+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
 GoOntoUserCardToAddMore=Go to the tab "Notifications" of a user to add or remove notifications for users
 GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
 Threshold=Prag
@@ -1898,6 +1900,11 @@ OnMobileOnly=On small screen (smartphone) only
 DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be Prospect or Customer but can't be both)
 MAIN_OPTIMIZEFORTEXTBROWSER=Simplify interface for blind person
 MAIN_OPTIMIZEFORTEXTBROWSERDesc=Enable this option if you are a blind person, or if you use the application from a text browser like Lynx or 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
 ThisValueCanOverwrittenOnUserLevel=This value can be overwritten by each user from its user page - tab '%s'
 DefaultCustomerType=Default thirdparty type for "New customer" creation form
 ABankAccountMustBeDefinedOnPaymentModeSetup=Note: The bank account must be defined on the module of each payment mode (Paypal, Stripe, ...) to have this feature working.
@@ -1911,7 +1918,7 @@ LogsLinesNumber=Number of lines to show on logs tab
 UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
-DebugBarModuleActivated=Module debugbar is activated and slows dramaticaly the interface
+ModuleActivated=Module %s is activated and slows the interface
 EXPORTS_SHARE_MODELS=Export models are share with everybody
 ExportSetup=Setup of module Export
 InstanceUniqueID=Unique ID of the instance
@@ -1928,3 +1935,5 @@ 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
diff --git a/htdocs/langs/sl_SI/bills.lang b/htdocs/langs/sl_SI/bills.lang
index 199397eed37..b5349596ba5 100644
--- a/htdocs/langs/sl_SI/bills.lang
+++ b/htdocs/langs/sl_SI/bills.lang
@@ -95,6 +95,7 @@ PaymentHigherThanReminderToPay=Plačilo višje od opomina
 HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess received for each overpaid invoice.
 HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess paid for each overpaid invoice.
 ClassifyPaid=Označeno kot 'Plačano'
+ClassifyUnPaid=Classify 'Unpaid'
 ClassifyPaidPartially=Označeno kot 'Delno plačano'
 ClassifyCanceled=Označeno kot 'Opuščeno'
 ClassifyClosed=Označeno kot 'Zaključeno'
@@ -214,6 +215,20 @@ ShowInvoiceReplace=Prikaži nadomestni račun
 ShowInvoiceAvoir=Prikaži dobropis
 ShowInvoiceDeposit=Show down payment invoice
 ShowInvoiceSituation=Show situation invoice
+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
 ShowPayment=Prikaži plačilo
 AlreadyPaid=Že plačano
 AlreadyPaidBack=Že vrnjeno plačilo
diff --git a/htdocs/langs/sl_SI/errors.lang b/htdocs/langs/sl_SI/errors.lang
index bfaf9c8505a..01117e09985 100644
--- a/htdocs/langs/sl_SI/errors.lang
+++ b/htdocs/langs/sl_SI/errors.lang
@@ -90,7 +90,7 @@ ErrorSpecialCharNotAllowedForField=Posebni znaki niso dovoljeni v polju "%s"
 ErrorNumRefModel=V bazi podatkov obstaja referenca (%s), ki ni kompatibilna s tem pravilom za številčenje. Odstranite zapis ali preimenujte referenco za aktivacijo tega modula.
 ErrorQtyTooLowForThisSupplier=Quantity too low for this vendor or no price defined on this product for this vendor
 ErrorOrdersNotCreatedQtyTooLow=Some orders haven't been created because of too-low quantities
-ErrorModuleSetupNotComplete=Setup of module looks to be uncomplete. Go on Home - Setup - Modules to complete.
+ErrorModuleSetupNotComplete=Setup of module %s looks to be uncomplete. Go on Home - Setup - Modules to complete.
 ErrorBadMask=Napaka na maski
 ErrorBadMaskFailedToLocatePosOfSequence=Napaka, maska je brez zaporedne številke
 ErrorBadMaskBadRazMonth=Napaka, napačna resetirana vrednost
@@ -219,6 +219,7 @@ 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.
 # 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.
 WarningMandatorySetupNotComplete=Click here to setup mandatory parameters
 WarningEnableYourModulesApplications=Click here to enable your modules and applications
diff --git a/htdocs/langs/sl_SI/main.lang b/htdocs/langs/sl_SI/main.lang
index efbfbfef0dc..81c4b2c3b23 100644
--- a/htdocs/langs/sl_SI/main.lang
+++ b/htdocs/langs/sl_SI/main.lang
@@ -445,6 +445,7 @@ ContactsAddressesForCompany=Kontakti/naslovi za tega partnerja
 AddressesForCompany=Naslovi za tega partnerja
 ActionsOnCompany=Events for this third party
 ActionsOnContact=Events for this contact/address
+ActionsOnContract=Events for this contract
 ActionsOnMember=Dogodki okoli tega člana
 ActionsOnProduct=Events about this product
 NActionsLate=%s zamujenih
@@ -759,6 +760,7 @@ LinkToSupplierProposal=Link to vendor proposal
 LinkToSupplierInvoice=Link to vendor invoice
 LinkToContract=Link to contract
 LinkToIntervention=Link to intervention
+LinkToTicket=Link to ticket
 CreateDraft=Ustvarite osnutek
 SetToDraft=Nazaj na osnutek
 ClickToEdit=Kliknite za urejanje
diff --git a/htdocs/langs/sl_SI/products.lang b/htdocs/langs/sl_SI/products.lang
index 050f1fe488d..6b69d44ad17 100644
--- a/htdocs/langs/sl_SI/products.lang
+++ b/htdocs/langs/sl_SI/products.lang
@@ -2,6 +2,7 @@
 ProductRef=Referenca proizvoda
 ProductLabel=Naziv proizvoda
 ProductLabelTranslated=Translated product label
+ProductDescription=Product description
 ProductDescriptionTranslated=Translated product description
 ProductNoteTranslated=Translated product note
 ProductServiceCard=Kartica proizvoda/storitve
diff --git a/htdocs/langs/sl_SI/stripe.lang b/htdocs/langs/sl_SI/stripe.lang
index 53ce253eb09..d5ce9df9811 100644
--- a/htdocs/langs/sl_SI/stripe.lang
+++ b/htdocs/langs/sl_SI/stripe.lang
@@ -65,3 +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>
diff --git a/htdocs/langs/sl_SI/withdrawals.lang b/htdocs/langs/sl_SI/withdrawals.lang
index 630e07a41e2..98cce8e088e 100644
--- a/htdocs/langs/sl_SI/withdrawals.lang
+++ b/htdocs/langs/sl_SI/withdrawals.lang
@@ -76,7 +76,8 @@ WithdrawalFile=Datoteka nakazila
 SetToStatusSent=Nastavi status na "Datoteka poslana"
 ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and will classify them as "Paid" if remain to pay is null
 StatisticsByLineStatus=Statistika po statusu vrstic
-RUM=UMR
+RUM=Unique Mandate Reference (UMR)
+DateRUM=Mandate signature date
 RUMLong=Unique Mandate Reference
 RUMWillBeGenerated=If empty, a UMR (Unique Mandate Reference) will be generated once the bank account information is saved.
 WithdrawMode=Direct debit mode (FRST or RECUR)
diff --git a/htdocs/langs/sq_AL/accountancy.lang b/htdocs/langs/sq_AL/accountancy.lang
index 8e1a61cb5bd..aca20774876 100644
--- a/htdocs/langs/sq_AL/accountancy.lang
+++ b/htdocs/langs/sq_AL/accountancy.lang
@@ -265,7 +265,7 @@ AccountingJournals=Accounting journals
 AccountingJournal=Accounting journal
 NewAccountingJournal=New accounting journal
 ShowAccoutingJournal=Show accounting journal
-Nature=Nature
+NatureOfJournal=Nature of Journal
 AccountingJournalType1=Miscellaneous operations
 AccountingJournalType2=Sales
 AccountingJournalType3=Purchases
@@ -291,6 +291,7 @@ Modelcsv_quadratus=Export for Quadratus QuadraCompta
 Modelcsv_ebp=Export for EBP
 Modelcsv_cogilog=Export for Cogilog
 Modelcsv_agiris=Export for Agiris
+Modelcsv_LDCompta=Export for LD Compta (v9 & higher) (Test)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
@@ -301,7 +302,7 @@ ChartofaccountsId=Chart of accounts Id
 InitAccountancy=Init accountancy
 InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accounting account defined for sales and purchases.
 DefaultBindingDesc=This page can be used to set a default account to use to link transactions record about payment salaries, donation, taxes and vat when no specific accounting account were already set.
-DefaultClosureDesc=This page can be used to set parameters to use to enclose a balance sheet.
+DefaultClosureDesc=This page can be used to set parameters used for accounting closures.
 Options=Mundësi
 OptionModeProductSell=Mode sales
 OptionModeProductSellIntra=Mode sales exported in EEC
diff --git a/htdocs/langs/sq_AL/admin.lang b/htdocs/langs/sq_AL/admin.lang
index c7a844db4d2..c4296b44853 100644
--- a/htdocs/langs/sq_AL/admin.lang
+++ b/htdocs/langs/sq_AL/admin.lang
@@ -574,7 +574,7 @@ Module510Name=Rrogat
 Module510Desc=Record and track employee payments
 Module520Name=Loans
 Module520Desc=Management of loans
-Module600Name=Notifications
+Module600Name=Notifications on business event
 Module600Desc=Send email notifications triggered by a business event: per user (setup defined on each user), per third-party contacts (setup defined on each third party) or by specific emails
 Module600Long=Note that this module sends emails in real-time when a specific business event occurs. If you are looking for a feature to send email reminders for agenda events, go into the setup of module Agenda.
 Module610Name=Product Variants
@@ -1193,6 +1193,7 @@ ExtraFieldsSupplierOrders=Complementary attributes (orders)
 ExtraFieldsSupplierInvoices=Complementary attributes (invoices)
 ExtraFieldsProject=Complementary attributes (projects)
 ExtraFieldsProjectTask=Complementary attributes (tasks)
+ExtraFieldsSalaries=Complementary attributes (salaries)
 ExtraFieldHasWrongValue=Attribute %s has a wrong value.
 AlphaNumOnlyLowerCharsAndNoSpace=only alphanumericals and lower case characters without space
 SendmailOptionNotComplete=Warning, on some Linux systems, to send email from your email, sendmail execution setup must contains option -ba (parameter mail.force_extra_parameters into your php.ini file). If some recipients never receive emails, try to edit this PHP parameter with mail.force_extra_parameters = -ba).
@@ -1220,13 +1221,14 @@ SuhosinSessionEncrypt=Session storage encrypted by Suhosin
 ConditionIsCurrently=Condition is currently %s
 YouUseBestDriver=You use driver %s which is the best driver currently available.
 YouDoNotUseBestDriver=You use driver %s but driver %s is recommended.
-NbOfProductIsLowerThanNoPb=You have only %s products/services in the database. This does not require any particular optimization.
+NbOfObjectIsLowerThanNoPb=You have only %s %s in the database. This does not require any particular optimization.
 SearchOptim=Search optimization
-YouHaveXProductUseSearchOptim=You have %s products in the database. You should add the constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+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.
 BrowserIsOK=You are using the %s web browser. This browser is ok for security and performance.
 BrowserIsKO=You are using the %s web browser. This browser is known to be a bad choice for security, performance and reliability. We recommend using Firefox, Chrome, Opera or Safari.
-XDebugInstalled=XDebug is loaded.
-XCacheInstalled=XCache is loaded.
+PHPModuleLoaded=PHP component %s is loaded
+PreloadOPCode=Preloaded OPCode is used
 AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.<br>Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp".
 AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".
 AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties.
@@ -1734,9 +1736,9 @@ ExpenseReportsRulesSetup=Setup of module Expense Reports - Rules
 ExpenseReportNumberingModules=Expense reports numbering module
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
 YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for email notifications by enabling and configuring the module "Notification".
-ListOfNotificationsPerUser=List of notifications per user*
-ListOfNotificationsPerUserOrContact=List of notifications (events) available per user* or per contact**
-ListOfFixedNotifications=List of Fixed Notifications
+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
 GoOntoUserCardToAddMore=Go to the tab "Notifications" of a user to add or remove notifications for users
 GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
 Threshold=Threshold
@@ -1898,6 +1900,11 @@ OnMobileOnly=On small screen (smartphone) only
 DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be Prospect or Customer but can't be both)
 MAIN_OPTIMIZEFORTEXTBROWSER=Simplify interface for blind person
 MAIN_OPTIMIZEFORTEXTBROWSERDesc=Enable this option if you are a blind person, or if you use the application from a text browser like Lynx or 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
 ThisValueCanOverwrittenOnUserLevel=This value can be overwritten by each user from its user page - tab '%s'
 DefaultCustomerType=Default thirdparty type for "New customer" creation form
 ABankAccountMustBeDefinedOnPaymentModeSetup=Note: The bank account must be defined on the module of each payment mode (Paypal, Stripe, ...) to have this feature working.
@@ -1911,7 +1918,7 @@ LogsLinesNumber=Number of lines to show on logs tab
 UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
-DebugBarModuleActivated=Module debugbar is activated and slows dramaticaly the interface
+ModuleActivated=Module %s is activated and slows the interface
 EXPORTS_SHARE_MODELS=Export models are share with everybody
 ExportSetup=Setup of module Export
 InstanceUniqueID=Unique ID of the instance
@@ -1928,3 +1935,5 @@ 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
diff --git a/htdocs/langs/sq_AL/bills.lang b/htdocs/langs/sq_AL/bills.lang
index 6d410dc879e..d2700772a37 100644
--- a/htdocs/langs/sq_AL/bills.lang
+++ b/htdocs/langs/sq_AL/bills.lang
@@ -95,6 +95,7 @@ PaymentHigherThanReminderToPay=Payment higher than reminder to pay
 HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess received for each overpaid invoice.
 HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess paid for each overpaid invoice.
 ClassifyPaid=Classify 'Paid'
+ClassifyUnPaid=Classify 'Unpaid'
 ClassifyPaidPartially=Classify 'Paid partially'
 ClassifyCanceled=Classify 'Abandoned'
 ClassifyClosed=Classify 'Closed'
@@ -214,6 +215,20 @@ ShowInvoiceReplace=Show replacing invoice
 ShowInvoiceAvoir=Show credit note
 ShowInvoiceDeposit=Show down payment invoice
 ShowInvoiceSituation=Show situation invoice
+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
 ShowPayment=Show payment
 AlreadyPaid=Already paid
 AlreadyPaidBack=Already paid back
diff --git a/htdocs/langs/sq_AL/errors.lang b/htdocs/langs/sq_AL/errors.lang
index b5a9d70cb70..1ee46fdbb92 100644
--- a/htdocs/langs/sq_AL/errors.lang
+++ b/htdocs/langs/sq_AL/errors.lang
@@ -90,7 +90,7 @@ ErrorSpecialCharNotAllowedForField=Special characters are not allowed for field
 ErrorNumRefModel=A reference exists into database (%s) and is not compatible with this numbering rule. Remove record or renamed reference to activate this module.
 ErrorQtyTooLowForThisSupplier=Quantity too low for this vendor or no price defined on this product for this vendor
 ErrorOrdersNotCreatedQtyTooLow=Some orders haven't been created because of too-low quantities
-ErrorModuleSetupNotComplete=Setup of module looks to be uncomplete. Go on Home - Setup - Modules to complete.
+ErrorModuleSetupNotComplete=Setup of module %s looks to be uncomplete. Go on Home - Setup - Modules to complete.
 ErrorBadMask=Error on mask
 ErrorBadMaskFailedToLocatePosOfSequence=Error, mask without sequence number
 ErrorBadMaskBadRazMonth=Error, bad reset value
@@ -219,6 +219,7 @@ 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.
 # 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.
 WarningMandatorySetupNotComplete=Click here to setup mandatory parameters
 WarningEnableYourModulesApplications=Click here to enable your modules and applications
diff --git a/htdocs/langs/sq_AL/main.lang b/htdocs/langs/sq_AL/main.lang
index 4164fdb1e11..4335079179b 100644
--- a/htdocs/langs/sq_AL/main.lang
+++ b/htdocs/langs/sq_AL/main.lang
@@ -445,6 +445,7 @@ ContactsAddressesForCompany=Contacts/addresses for this third party
 AddressesForCompany=Addresses for this third party
 ActionsOnCompany=Events for this third party
 ActionsOnContact=Events for this contact/address
+ActionsOnContract=Events for this contract
 ActionsOnMember=Events about this member
 ActionsOnProduct=Events about this product
 NActionsLate=%s late
@@ -759,6 +760,7 @@ LinkToSupplierProposal=Link to vendor proposal
 LinkToSupplierInvoice=Link to vendor invoice
 LinkToContract=Link to contract
 LinkToIntervention=Link to intervention
+LinkToTicket=Link to ticket
 CreateDraft=Create draft
 SetToDraft=Back to draft
 ClickToEdit=Click to edit
diff --git a/htdocs/langs/sq_AL/products.lang b/htdocs/langs/sq_AL/products.lang
index 629280cfda5..2966ac4af37 100644
--- a/htdocs/langs/sq_AL/products.lang
+++ b/htdocs/langs/sq_AL/products.lang
@@ -2,6 +2,7 @@
 ProductRef=Product ref.
 ProductLabel=Product label
 ProductLabelTranslated=Translated product label
+ProductDescription=Product description
 ProductDescriptionTranslated=Translated product description
 ProductNoteTranslated=Translated product note
 ProductServiceCard=Products/Services card
diff --git a/htdocs/langs/sq_AL/stripe.lang b/htdocs/langs/sq_AL/stripe.lang
index 3db7c0cf2ee..6e3a15a2b20 100644
--- a/htdocs/langs/sq_AL/stripe.lang
+++ b/htdocs/langs/sq_AL/stripe.lang
@@ -65,3 +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>
diff --git a/htdocs/langs/sq_AL/withdrawals.lang b/htdocs/langs/sq_AL/withdrawals.lang
index 4c146c2d43b..b4e13a898d8 100644
--- a/htdocs/langs/sq_AL/withdrawals.lang
+++ b/htdocs/langs/sq_AL/withdrawals.lang
@@ -76,7 +76,8 @@ WithdrawalFile=Withdrawal file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and will classify them as "Paid" if remain to pay is null
 StatisticsByLineStatus=Statistics by status of lines
-RUM=UMR
+RUM=Unique Mandate Reference (UMR)
+DateRUM=Mandate signature date
 RUMLong=Unique Mandate Reference
 RUMWillBeGenerated=If empty, a UMR (Unique Mandate Reference) will be generated once the bank account information is saved.
 WithdrawMode=Direct debit mode (FRST or RECUR)
diff --git a/htdocs/langs/sr_RS/accountancy.lang b/htdocs/langs/sr_RS/accountancy.lang
index 02d455a8817..cb614d171d7 100644
--- a/htdocs/langs/sr_RS/accountancy.lang
+++ b/htdocs/langs/sr_RS/accountancy.lang
@@ -265,7 +265,7 @@ AccountingJournals=Accounting journals
 AccountingJournal=Accounting journal
 NewAccountingJournal=New accounting journal
 ShowAccoutingJournal=Show accounting journal
-Nature=Priroda
+NatureOfJournal=Nature of Journal
 AccountingJournalType1=Miscellaneous operations
 AccountingJournalType2=Prodaje
 AccountingJournalType3=Nabavke
@@ -291,6 +291,7 @@ Modelcsv_quadratus=Export for Quadratus QuadraCompta
 Modelcsv_ebp=Export for EBP
 Modelcsv_cogilog=Export for Cogilog
 Modelcsv_agiris=Export for Agiris
+Modelcsv_LDCompta=Export for LD Compta (v9 & higher) (Test)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
@@ -301,7 +302,7 @@ ChartofaccountsId=Chart of accounts Id
 InitAccountancy=Započinjanje računovodstva
 InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accounting account defined for sales and purchases.
 DefaultBindingDesc=This page can be used to set a default account to use to link transactions record about payment salaries, donation, taxes and vat when no specific accounting account were already set.
-DefaultClosureDesc=This page can be used to set parameters to use to enclose a balance sheet.
+DefaultClosureDesc=This page can be used to set parameters used for accounting closures.
 Options=Opcije
 OptionModeProductSell=Vrsta prodaje
 OptionModeProductSellIntra=Mode sales exported in EEC
diff --git a/htdocs/langs/sr_RS/admin.lang b/htdocs/langs/sr_RS/admin.lang
index 1ac61447847..939e248f1d6 100644
--- a/htdocs/langs/sr_RS/admin.lang
+++ b/htdocs/langs/sr_RS/admin.lang
@@ -574,7 +574,7 @@ Module510Name=Plate
 Module510Desc=Record and track employee payments
 Module520Name=Krediti
 Module520Desc=Management of loans
-Module600Name=Obaveštenja
+Module600Name=Notifications on business event
 Module600Desc=Send email notifications triggered by a business event: per user (setup defined on each user), per third-party contacts (setup defined on each third party) or by specific emails
 Module600Long=Note that this module sends emails in real-time when a specific business event occurs. If you are looking for a feature to send email reminders for agenda events, go into the setup of module Agenda.
 Module610Name=Product Variants
@@ -1193,6 +1193,7 @@ ExtraFieldsSupplierOrders=Complementary attributes (orders)
 ExtraFieldsSupplierInvoices=Complementary attributes (invoices)
 ExtraFieldsProject=Complementary attributes (projects)
 ExtraFieldsProjectTask=Complementary attributes (tasks)
+ExtraFieldsSalaries=Complementary attributes (salaries)
 ExtraFieldHasWrongValue=Attribute %s has a wrong value.
 AlphaNumOnlyLowerCharsAndNoSpace=only alphanumericals and lower case characters without space
 SendmailOptionNotComplete=Warning, on some Linux systems, to send email from your email, sendmail execution setup must contains option -ba (parameter mail.force_extra_parameters into your php.ini file). If some recipients never receive emails, try to edit this PHP parameter with mail.force_extra_parameters = -ba).
@@ -1220,13 +1221,14 @@ SuhosinSessionEncrypt=Session storage encrypted by Suhosin
 ConditionIsCurrently=Condition is currently %s
 YouUseBestDriver=You use driver %s which is the best driver currently available.
 YouDoNotUseBestDriver=You use driver %s but driver %s is recommended.
-NbOfProductIsLowerThanNoPb=You have only %s products/services in the database. This does not require any particular optimization.
+NbOfObjectIsLowerThanNoPb=You have only %s %s in the database. This does not require any particular optimization.
 SearchOptim=Search optimization
-YouHaveXProductUseSearchOptim=You have %s products in the database. You should add the constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+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.
 BrowserIsOK=You are using the %s web browser. This browser is ok for security and performance.
 BrowserIsKO=You are using the %s web browser. This browser is known to be a bad choice for security, performance and reliability. We recommend using Firefox, Chrome, Opera or Safari.
-XDebugInstalled=XDebug is loaded.
-XCacheInstalled=XCache is loaded.
+PHPModuleLoaded=PHP component %s is loaded
+PreloadOPCode=Preloaded OPCode is used
 AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.<br>Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp".
 AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".
 AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties.
@@ -1734,9 +1736,9 @@ ExpenseReportsRulesSetup=Setup of module Expense Reports - Rules
 ExpenseReportNumberingModules=Expense reports numbering module
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
 YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for email notifications by enabling and configuring the module "Notification".
-ListOfNotificationsPerUser=List of notifications per user*
-ListOfNotificationsPerUserOrContact=List of notifications (events) available per user* or per contact**
-ListOfFixedNotifications=List of Fixed Notifications
+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
 GoOntoUserCardToAddMore=Go to the tab "Notifications" of a user to add or remove notifications for users
 GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
 Threshold=Threshold
@@ -1898,6 +1900,11 @@ OnMobileOnly=On small screen (smartphone) only
 DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be Prospect or Customer but can't be both)
 MAIN_OPTIMIZEFORTEXTBROWSER=Simplify interface for blind person
 MAIN_OPTIMIZEFORTEXTBROWSERDesc=Enable this option if you are a blind person, or if you use the application from a text browser like Lynx or 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
 ThisValueCanOverwrittenOnUserLevel=This value can be overwritten by each user from its user page - tab '%s'
 DefaultCustomerType=Default thirdparty type for "New customer" creation form
 ABankAccountMustBeDefinedOnPaymentModeSetup=Note: The bank account must be defined on the module of each payment mode (Paypal, Stripe, ...) to have this feature working.
@@ -1911,7 +1918,7 @@ LogsLinesNumber=Number of lines to show on logs tab
 UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
-DebugBarModuleActivated=Module debugbar is activated and slows dramaticaly the interface
+ModuleActivated=Module %s is activated and slows the interface
 EXPORTS_SHARE_MODELS=Export models are share with everybody
 ExportSetup=Setup of module Export
 InstanceUniqueID=Unique ID of the instance
@@ -1928,3 +1935,5 @@ 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
diff --git a/htdocs/langs/sr_RS/bills.lang b/htdocs/langs/sr_RS/bills.lang
index 41751c9406f..c0b740dd261 100644
--- a/htdocs/langs/sr_RS/bills.lang
+++ b/htdocs/langs/sr_RS/bills.lang
@@ -95,6 +95,7 @@ PaymentHigherThanReminderToPay=Iznos koji želite da platiteje viši od iznosa z
 HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess received for each overpaid invoice.
 HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess paid for each overpaid invoice.
 ClassifyPaid=Klasifikuj kao "plaćeno"
+ClassifyUnPaid=Classify 'Unpaid'
 ClassifyPaidPartially=Klasifikuj "delimično plaćeno"
 ClassifyCanceled=Klasifikuj "napušteno"
 ClassifyClosed=Klasifikuj "zatvoreno"
@@ -214,6 +215,20 @@ ShowInvoiceReplace=Show replacing invoice
 ShowInvoiceAvoir=Show credit note
 ShowInvoiceDeposit=Show down payment invoice
 ShowInvoiceSituation=Show situation invoice
+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
 ShowPayment=Show payment
 AlreadyPaid=Already paid
 AlreadyPaidBack=Already paid back
diff --git a/htdocs/langs/sr_RS/errors.lang b/htdocs/langs/sr_RS/errors.lang
index 528823ad92e..f83d78fb8e2 100644
--- a/htdocs/langs/sr_RS/errors.lang
+++ b/htdocs/langs/sr_RS/errors.lang
@@ -90,7 +90,7 @@ ErrorSpecialCharNotAllowedForField=Specijalni karakteri nisu dozvoljeni u polju
 ErrorNumRefModel=U bazi postoji referenca (%s) koja nije kompatibilna sa ovim pravilom. Uklonite taj red ili preimenujte referencu kako biste aktivirali ovaj modul.
 ErrorQtyTooLowForThisSupplier=Quantity too low for this vendor or no price defined on this product for this vendor
 ErrorOrdersNotCreatedQtyTooLow=Some orders haven't been created because of too-low quantities
-ErrorModuleSetupNotComplete=Setup of module looks to be uncomplete. Go on Home - Setup - Modules to complete.
+ErrorModuleSetupNotComplete=Setup of module %s looks to be uncomplete. Go on Home - Setup - Modules to complete.
 ErrorBadMask=Greška za masku
 ErrorBadMaskFailedToLocatePosOfSequence=Greška, maska bez broja sekvence
 ErrorBadMaskBadRazMonth=Greška, pogrešna reset vrednost
@@ -219,6 +219,7 @@ 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.
 # 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.
 WarningMandatorySetupNotComplete=Click here to setup mandatory parameters
 WarningEnableYourModulesApplications=Click here to enable your modules and applications
diff --git a/htdocs/langs/sr_RS/main.lang b/htdocs/langs/sr_RS/main.lang
index 5ca0d505bd9..d75b23dfee9 100644
--- a/htdocs/langs/sr_RS/main.lang
+++ b/htdocs/langs/sr_RS/main.lang
@@ -445,6 +445,7 @@ ContactsAddressesForCompany=Kontakti/adrese za ovaj subjekat
 AddressesForCompany=Adrese za ovaj subjekat
 ActionsOnCompany=Events for this third party
 ActionsOnContact=Events for this contact/address
+ActionsOnContract=Events for this contract
 ActionsOnMember=Događaji vezani za ovog člana
 ActionsOnProduct=Events about this product
 NActionsLate=%s kasni
@@ -759,6 +760,7 @@ LinkToSupplierProposal=Link to vendor proposal
 LinkToSupplierInvoice=Link to vendor invoice
 LinkToContract=Link to contract
 LinkToIntervention=Link to intervention
+LinkToTicket=Link to ticket
 CreateDraft=Napravi draft
 SetToDraft=Nazad u draft
 ClickToEdit=Klikni za edit
diff --git a/htdocs/langs/sr_RS/products.lang b/htdocs/langs/sr_RS/products.lang
index 47fc76a533e..48a44deea4f 100644
--- a/htdocs/langs/sr_RS/products.lang
+++ b/htdocs/langs/sr_RS/products.lang
@@ -2,6 +2,7 @@
 ProductRef=Ref. proizvoda
 ProductLabel=Oznaka proizvoda
 ProductLabelTranslated=Prevedeni naziv proizvoda
+ProductDescription=Product description
 ProductDescriptionTranslated=Prevedeni opis proizvoda
 ProductNoteTranslated=Prevedena napomena proizvoda
 ProductServiceCard=Kartica Proizvoda/Usluga
diff --git a/htdocs/langs/sr_RS/withdrawals.lang b/htdocs/langs/sr_RS/withdrawals.lang
index 0c7d5011f58..f6b8495f608 100644
--- a/htdocs/langs/sr_RS/withdrawals.lang
+++ b/htdocs/langs/sr_RS/withdrawals.lang
@@ -76,7 +76,8 @@ WithdrawalFile=Fajl podizanja
 SetToStatusSent=Podesi status "Fajl poslat"
 ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and will classify them as "Paid" if remain to pay is null
 StatisticsByLineStatus=Statistike po statusu linija
-RUM=UMR
+RUM=Unique Mandate Reference (UMR)
+DateRUM=Mandate signature date
 RUMLong=Unique Mandate Reference
 RUMWillBeGenerated=If empty, a UMR (Unique Mandate Reference) will be generated once the bank account information is saved.
 WithdrawMode=Direct debit mode (FRST or RECUR)
diff --git a/htdocs/langs/sv_SE/accountancy.lang b/htdocs/langs/sv_SE/accountancy.lang
index a97e82d5dfe..443a5d548de 100644
--- a/htdocs/langs/sv_SE/accountancy.lang
+++ b/htdocs/langs/sv_SE/accountancy.lang
@@ -265,7 +265,7 @@ AccountingJournals=Bokföringsloggbok
 AccountingJournal=Bokföringsloggbok
 NewAccountingJournal=Ny bokföringsloggbok
 ShowAccoutingJournal=Visa bokföringsloggbok
-Nature=Naturen
+NatureOfJournal=Nature of Journal
 AccountingJournalType1=Övrig verksamhet
 AccountingJournalType2=Försäljning
 AccountingJournalType3=Inköp
@@ -291,6 +291,7 @@ Modelcsv_quadratus=Exportera till Quadratus QuadraCompta
 Modelcsv_ebp=Exportera till EBP
 Modelcsv_cogilog=Exportera till Cogilog
 Modelcsv_agiris=Exportera till Agiris
+Modelcsv_LDCompta=Export for LD Compta (v9 & higher) (Test)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Exportera CSV konfigurerbar
 Modelcsv_FEC=Export FEC
@@ -301,7 +302,7 @@ ChartofaccountsId=Diagram över konton Id
 InitAccountancy=Initära bokföring
 InitAccountancyDesc=Den här sidan kan användas för att initiera ett konto på produkter och tjänster som inte har ett kontokonto definierat för försäljning och inköp.
 DefaultBindingDesc=Den här sidan kan användas för att ställa in ett standardkonto som ska användas för att koppla transaktionsrekord om betalningslön, donation, skatter och moms när inget specifikt kontokonto redan var inställt.
-DefaultClosureDesc=Den här sidan kan användas för att ställa in parametrar som ska användas för att bifoga en balansräkning.
+DefaultClosureDesc=This page can be used to set parameters used for accounting closures.
 Options=alternativ
 OptionModeProductSell=Mode försäljning
 OptionModeProductSellIntra=Mode sales exported in EEC
diff --git a/htdocs/langs/sv_SE/admin.lang b/htdocs/langs/sv_SE/admin.lang
index 1118f400fe0..13e135c84d8 100644
--- a/htdocs/langs/sv_SE/admin.lang
+++ b/htdocs/langs/sv_SE/admin.lang
@@ -574,7 +574,7 @@ Module510Name=Löner
 Module510Desc=Spela in och spåra anställda betalningar
 Module520Name=Lån
 Module520Desc=Förvaltning av lån
-Module600Name=Anmälningar
+Module600Name=Notifications on business event
 Module600Desc=Skicka e-postmeddelanden som utlöses av en företagshändelse: per användare (inställning definierad på varje användare), per tredjepartskontakter (inställning definierad på var tredje part) eller genom specifika e-postmeddelanden
 Module600Long=Observera att den här modulen skickar e-postmeddelanden i realtid när en viss företagshändelse inträffar. Om du letar efter en funktion för att skicka e-postpåminnelser för agendahändelser, gå till inställningen av modulens Agenda.
 Module610Name=Produktvarianter
@@ -1193,6 +1193,7 @@ ExtraFieldsSupplierOrders=Kompletterande attribut (beslut)
 ExtraFieldsSupplierInvoices=Kompletterande attribut (fakturor)
 ExtraFieldsProject=Kompletterande attribut (projekt)
 ExtraFieldsProjectTask=Kompletterande attribut (arbetsuppgifter)
+ExtraFieldsSalaries=Complementary attributes (salaries)
 ExtraFieldHasWrongValue=Attribut% s har ett felaktigt värde.
 AlphaNumOnlyLowerCharsAndNoSpace=endast gemena alfanumeriska tecken utan mellanslag
 SendmailOptionNotComplete=Varning, på vissa Linux-system, för att skicka e-post från e-post, sendmail utförande inställning måste conatins Alternativ-ba (parameter mail.force_extra_parameters i din php.ini-fil). Om vissa mottagare inte emot e-post, försök att redigera den här PHP parameter med mail.force_extra_parameters =-BA).
@@ -1220,13 +1221,14 @@ SuhosinSessionEncrypt=Session lagring krypteras av Suhosin
 ConditionIsCurrently=Condition är för närvarande% s
 YouUseBestDriver=Du använder drivrutinen %s vilket är den bästa drivrutinen som för närvarande finns tillgänglig.
 YouDoNotUseBestDriver=Du använder drivrutinen %s men drivrutinen %s rekommenderas.
-NbOfProductIsLowerThanNoPb=Du har bara %s produkter / tjänster i databasen. Detta kräver ingen särskild optimering.
+NbOfObjectIsLowerThanNoPb=You have only %s %s in the database. This does not require any particular optimization.
 SearchOptim=Sökoptimering
-YouHaveXProductUseSearchOptim=Du har %s produkter i databasen. Du bör lägga till den konstanta PRODUCT_DONOTSEARCH_ANYWHERE till 1 i Home-Setup-Other. Begränsa sökningen till början av strängar som gör det möjligt för databasen att använda index och du bör få ett omedelbart svar.
+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.
 BrowserIsOK=Du använder %s webbläsaren. Den här webbläsaren är ok för säkerhet och prestanda.
 BrowserIsKO=Du använder %s webbläsaren. Den här webbläsaren är känd för att vara ett dåligt val för säkerhet, prestanda och tillförlitlighet. Vi rekommenderar att du använder Firefox, Chrome, Opera eller Safari.
-XDebugInstalled=Xdebug är laddad.
-XCacheInstalled=Xcache är laddad.
+PHPModuleLoaded=PHP component %s is loaded
+PreloadOPCode=Preloaded OPCode is used
 AddRefInList=Visa kund / leverantör ref. info lista (välj lista eller combobox) och de flesta av hyperlänken. <br> Tredje part kommer att visas med ett namnformat av "CC12345 - SC45678 - The Big Company corp." istället för "The Big Company Corp".
 AddAdressInList=Visa adresslista för kund / leverantörs adress (välj lista eller combobox) <br> Tredje parten kommer att visas med ett namnformat för "The Big Company Corp." - 21 Jump Street 123456 Big Town - USA "istället för" The Big Company Corp ".
 AskForPreferredShippingMethod=Be om föredragen leveransmetod för tredje parter.
@@ -1734,9 +1736,9 @@ ExpenseReportsRulesSetup=Inställning av modul Utläggsrapportsregler
 ExpenseReportNumberingModules=Modul för utläggsrapporteringsnummer
 NoModueToManageStockIncrease=Ingen modul kunna hantera automatiska lagerökningen har aktiverats. Stock ökning kommer att ske på bara manuell inmatning.
 YouMayFindNotificationsFeaturesIntoModuleNotification=Du kan hitta alternativ för e-postmeddelanden genom att aktivera och konfigurera modulen "Meddelande".
-ListOfNotificationsPerUser=Lista över anmälningar per användare *
-ListOfNotificationsPerUserOrContact=Lista över anmälningar (händelser) tillgängliga per användare * eller per kontakt **
-ListOfFixedNotifications=Lista över fasta meddelanden
+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
 GoOntoUserCardToAddMore=Gå till fliken "Notifieringar" för en användare för att lägga till eller ta bort meddelanden för användare
 GoOntoContactCardToAddMore=Gå på fliken "Notifieringar" från en tredje part för att lägga till eller ta bort meddelanden för kontakter / adresser
 Threshold=Tröskelvärde
@@ -1898,6 +1900,11 @@ OnMobileOnly=På en liten skärm (smartphone) bara
 DisableProspectCustomerType=Inaktivera "Prospect + Customer" tredjepartstyp (så tredje part måste vara Prospect eller Kund men kan inte vara båda)
 MAIN_OPTIMIZEFORTEXTBROWSER=Förenkla gränssnittet för blinda personer
 MAIN_OPTIMIZEFORTEXTBROWSERDesc=Aktivera det här alternativet om du är blind person, eller om du använder programmet från en textbläsare som Lynx eller 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
 ThisValueCanOverwrittenOnUserLevel=Detta värde kan skrivas över av varje användare från användarens sida - fliken '%s'
 DefaultCustomerType=Standard tredjepartstyp för skapande av "Ny kund"
 ABankAccountMustBeDefinedOnPaymentModeSetup=Obs! Bankkontot måste definieras i modulen för varje betalningsläge (Paypal, Stripe, ...) för att den här funktionen ska fungera.
@@ -1911,7 +1918,7 @@ LogsLinesNumber=Antal rader som ska visas på loggfliken
 UseDebugBar=Använd felsökningsfältet
 DEBUGBAR_LOGS_LINES_NUMBER=Antal sista logglinjer för att hålla i konsolen
 WarningValueHigherSlowsDramaticalyOutput=Varning, högre värden sänker dramaticaly-utgången
-DebugBarModuleActivated=Modul debugbar aktiveras och saktar dramatiskt gränssnittet
+ModuleActivated=Module %s is activated and slows the interface
 EXPORTS_SHARE_MODELS=Exportmodeller delas med alla
 ExportSetup=Inställning av modul Export
 InstanceUniqueID=Unikt ID för förekomsten
@@ -1928,3 +1935,5 @@ 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
diff --git a/htdocs/langs/sv_SE/bills.lang b/htdocs/langs/sv_SE/bills.lang
index 738c2068c9d..69025c706da 100644
--- a/htdocs/langs/sv_SE/bills.lang
+++ b/htdocs/langs/sv_SE/bills.lang
@@ -95,6 +95,7 @@ PaymentHigherThanReminderToPay=Betalning högre än påminnelse att betala
 HelpPaymentHigherThanReminderToPay=Observera är betalningsbeloppet för en eller flera räkningar högre än det utestående beloppet att betala. <br> Ändra din post, annars bekräfta och överväga att skapa en kreditnotering för det överskott som tas emot för varje överbetald faktura.
 HelpPaymentHigherThanReminderToPaySupplier=Observera är betalningsbeloppet för en eller flera räkningar högre än det utestående beloppet att betala. <br> Ändra din post, annars bekräfta och överväga att skapa en kreditnotering för det överskjutande beloppet för varje överbetald faktura.
 ClassifyPaid=Märk "betald"
+ClassifyUnPaid=Classify 'Unpaid'
 ClassifyPaidPartially=Märk "betalda delvis"
 ClassifyCanceled=Märk "övergivna"
 ClassifyClosed=Märk "avsluten"
@@ -214,6 +215,20 @@ ShowInvoiceReplace=Visa ersätter faktura
 ShowInvoiceAvoir=Visa kreditnota
 ShowInvoiceDeposit=Visa nedbetalningsfaktura
 ShowInvoiceSituation=Visa lägesfaktura
+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
 ShowPayment=Visa betalning
 AlreadyPaid=Redan betalats ut
 AlreadyPaidBack=Redan återbetald
diff --git a/htdocs/langs/sv_SE/errors.lang b/htdocs/langs/sv_SE/errors.lang
index 8be0a0461f0..f4e435871f1 100644
--- a/htdocs/langs/sv_SE/errors.lang
+++ b/htdocs/langs/sv_SE/errors.lang
@@ -90,7 +90,7 @@ ErrorSpecialCharNotAllowedForField=Speciella tecken är inte tillåtna för anv
 ErrorNumRefModel=En hänvisning finns i databasen (%s) och är inte förenligt med denna numrering regel. Ta bort post eller bytt namn hänvisning till aktivera den här modulen.
 ErrorQtyTooLowForThisSupplier=Mängden är för låg för den här försäljaren eller inget pris som definieras på denna produkt för den här försäljaren
 ErrorOrdersNotCreatedQtyTooLow=Vissa beställningar har inte skapats på grund av för låga kvantiteter
-ErrorModuleSetupNotComplete=Inställningen av modulen ser ut att vara ofullständig. Gå hem - Inställningar - Moduler att slutföra.
+ErrorModuleSetupNotComplete=Setup of module %s looks to be uncomplete. Go on Home - Setup - Modules to complete.
 ErrorBadMask=Fel på masken
 ErrorBadMaskFailedToLocatePosOfSequence=Fel, mask utan löpnummer
 ErrorBadMaskBadRazMonth=Fel, dåligt återställningsvärde
@@ -219,6 +219,7 @@ 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.
 # 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.
 WarningMandatorySetupNotComplete=Klicka här för att ställa in obligatoriska parametrar
 WarningEnableYourModulesApplications=Klicka här för att aktivera dina moduler och applikationer
diff --git a/htdocs/langs/sv_SE/main.lang b/htdocs/langs/sv_SE/main.lang
index a18d6220a4a..ccc0b9aca07 100644
--- a/htdocs/langs/sv_SE/main.lang
+++ b/htdocs/langs/sv_SE/main.lang
@@ -445,6 +445,7 @@ ContactsAddressesForCompany=Kontakter / adresser för denna tredje part
 AddressesForCompany=Adresser för denna tredje part
 ActionsOnCompany=Evenemang för denna tredje part
 ActionsOnContact=Händelser för denna kontakt / adress
+ActionsOnContract=Events for this contract
 ActionsOnMember=Händelser om denna medlem
 ActionsOnProduct=Händelser om denna produkt
 NActionsLate=%s sent
@@ -759,6 +760,7 @@ LinkToSupplierProposal=Länk till leverantörsförslag
 LinkToSupplierInvoice=Länk till leverantörsfaktura
 LinkToContract=Länk till kontrakt
 LinkToIntervention=Länk till intervention
+LinkToTicket=Link to ticket
 CreateDraft=Skapa utkast
 SetToDraft=Tillbaka till utkast
 ClickToEdit=Klicka för att redigera
diff --git a/htdocs/langs/sv_SE/products.lang b/htdocs/langs/sv_SE/products.lang
index 2497e61f09e..2950e11044b 100644
--- a/htdocs/langs/sv_SE/products.lang
+++ b/htdocs/langs/sv_SE/products.lang
@@ -2,6 +2,7 @@
 ProductRef=Produkt ref.
 ProductLabel=Produktmärkning
 ProductLabelTranslated=Översatt produktetikett
+ProductDescription=Product description
 ProductDescriptionTranslated=Översatt produktbeskrivning
 ProductNoteTranslated=Översatt produktnotat
 ProductServiceCard=Produkter / tjänster
diff --git a/htdocs/langs/sv_SE/stripe.lang b/htdocs/langs/sv_SE/stripe.lang
index 9213cb8b250..f93ea0b5655 100644
--- a/htdocs/langs/sv_SE/stripe.lang
+++ b/htdocs/langs/sv_SE/stripe.lang
@@ -65,3 +65,5 @@ StripeUserAccountForActions=Användarkonto som ska användas för e-postnotifier
 StripePayoutList=Lista över Stripe utbetalningar
 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>
diff --git a/htdocs/langs/sv_SE/withdrawals.lang b/htdocs/langs/sv_SE/withdrawals.lang
index 46e809839dc..b36e78217df 100644
--- a/htdocs/langs/sv_SE/withdrawals.lang
+++ b/htdocs/langs/sv_SE/withdrawals.lang
@@ -76,7 +76,8 @@ WithdrawalFile=Utträde fil
 SetToStatusSent=Ställ in på status "File Skickat"
 ThisWillAlsoAddPaymentOnInvoice=Detta kommer också att registrera betalningar till fakturor och märka dem som "Betalda" om det kvarstår att betala är noll
 StatisticsByLineStatus=Statistik efter status linjer
-RUM=UMR
+RUM=Unique Mandate Reference (UMR)
+DateRUM=Mandate signature date
 RUMLong=Unik Mandatreferens
 RUMWillBeGenerated=Om tomt kommer en UMR (Unique Mandate Reference) att genereras när bankkontoinformationen är sparad.
 WithdrawMode=Direkt debiteringsläge (FRST eller RECUR)
diff --git a/htdocs/langs/sw_SW/accountancy.lang b/htdocs/langs/sw_SW/accountancy.lang
index 758d9c340a5..1fc3b3e05ec 100644
--- a/htdocs/langs/sw_SW/accountancy.lang
+++ b/htdocs/langs/sw_SW/accountancy.lang
@@ -265,7 +265,7 @@ AccountingJournals=Accounting journals
 AccountingJournal=Accounting journal
 NewAccountingJournal=New accounting journal
 ShowAccoutingJournal=Show accounting journal
-Nature=Nature
+NatureOfJournal=Nature of Journal
 AccountingJournalType1=Miscellaneous operations
 AccountingJournalType2=Sales
 AccountingJournalType3=Purchases
@@ -291,6 +291,7 @@ Modelcsv_quadratus=Export for Quadratus QuadraCompta
 Modelcsv_ebp=Export for EBP
 Modelcsv_cogilog=Export for Cogilog
 Modelcsv_agiris=Export for Agiris
+Modelcsv_LDCompta=Export for LD Compta (v9 & higher) (Test)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
@@ -301,7 +302,7 @@ ChartofaccountsId=Chart of accounts Id
 InitAccountancy=Init accountancy
 InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accounting account defined for sales and purchases.
 DefaultBindingDesc=This page can be used to set a default account to use to link transactions record about payment salaries, donation, taxes and vat when no specific accounting account were already set.
-DefaultClosureDesc=This page can be used to set parameters to use to enclose a balance sheet.
+DefaultClosureDesc=This page can be used to set parameters used for accounting closures.
 Options=Options
 OptionModeProductSell=Mode sales
 OptionModeProductSellIntra=Mode sales exported in EEC
diff --git a/htdocs/langs/sw_SW/admin.lang b/htdocs/langs/sw_SW/admin.lang
index f30d6edd9f7..2e27c6fe81f 100644
--- a/htdocs/langs/sw_SW/admin.lang
+++ b/htdocs/langs/sw_SW/admin.lang
@@ -574,7 +574,7 @@ Module510Name=Salaries
 Module510Desc=Record and track employee payments
 Module520Name=Loans
 Module520Desc=Management of loans
-Module600Name=Notifications
+Module600Name=Notifications on business event
 Module600Desc=Send email notifications triggered by a business event: per user (setup defined on each user), per third-party contacts (setup defined on each third party) or by specific emails
 Module600Long=Note that this module sends emails in real-time when a specific business event occurs. If you are looking for a feature to send email reminders for agenda events, go into the setup of module Agenda.
 Module610Name=Product Variants
@@ -1193,6 +1193,7 @@ ExtraFieldsSupplierOrders=Complementary attributes (orders)
 ExtraFieldsSupplierInvoices=Complementary attributes (invoices)
 ExtraFieldsProject=Complementary attributes (projects)
 ExtraFieldsProjectTask=Complementary attributes (tasks)
+ExtraFieldsSalaries=Complementary attributes (salaries)
 ExtraFieldHasWrongValue=Attribute %s has a wrong value.
 AlphaNumOnlyLowerCharsAndNoSpace=only alphanumericals and lower case characters without space
 SendmailOptionNotComplete=Warning, on some Linux systems, to send email from your email, sendmail execution setup must contains option -ba (parameter mail.force_extra_parameters into your php.ini file). If some recipients never receive emails, try to edit this PHP parameter with mail.force_extra_parameters = -ba).
@@ -1220,13 +1221,14 @@ SuhosinSessionEncrypt=Session storage encrypted by Suhosin
 ConditionIsCurrently=Condition is currently %s
 YouUseBestDriver=You use driver %s which is the best driver currently available.
 YouDoNotUseBestDriver=You use driver %s but driver %s is recommended.
-NbOfProductIsLowerThanNoPb=You have only %s products/services in the database. This does not require any particular optimization.
+NbOfObjectIsLowerThanNoPb=You have only %s %s in the database. This does not require any particular optimization.
 SearchOptim=Search optimization
-YouHaveXProductUseSearchOptim=You have %s products in the database. You should add the constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+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.
 BrowserIsOK=You are using the %s web browser. This browser is ok for security and performance.
 BrowserIsKO=You are using the %s web browser. This browser is known to be a bad choice for security, performance and reliability. We recommend using Firefox, Chrome, Opera or Safari.
-XDebugInstalled=XDebug is loaded.
-XCacheInstalled=XCache is loaded.
+PHPModuleLoaded=PHP component %s is loaded
+PreloadOPCode=Preloaded OPCode is used
 AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.<br>Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp".
 AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".
 AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties.
@@ -1734,9 +1736,9 @@ ExpenseReportsRulesSetup=Setup of module Expense Reports - Rules
 ExpenseReportNumberingModules=Expense reports numbering module
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
 YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for email notifications by enabling and configuring the module "Notification".
-ListOfNotificationsPerUser=List of notifications per user*
-ListOfNotificationsPerUserOrContact=List of notifications (events) available per user* or per contact**
-ListOfFixedNotifications=List of Fixed Notifications
+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
 GoOntoUserCardToAddMore=Go to the tab "Notifications" of a user to add or remove notifications for users
 GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
 Threshold=Threshold
@@ -1898,6 +1900,11 @@ OnMobileOnly=On small screen (smartphone) only
 DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be Prospect or Customer but can't be both)
 MAIN_OPTIMIZEFORTEXTBROWSER=Simplify interface for blind person
 MAIN_OPTIMIZEFORTEXTBROWSERDesc=Enable this option if you are a blind person, or if you use the application from a text browser like Lynx or 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
 ThisValueCanOverwrittenOnUserLevel=This value can be overwritten by each user from its user page - tab '%s'
 DefaultCustomerType=Default thirdparty type for "New customer" creation form
 ABankAccountMustBeDefinedOnPaymentModeSetup=Note: The bank account must be defined on the module of each payment mode (Paypal, Stripe, ...) to have this feature working.
@@ -1911,7 +1918,7 @@ LogsLinesNumber=Number of lines to show on logs tab
 UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
-DebugBarModuleActivated=Module debugbar is activated and slows dramaticaly the interface
+ModuleActivated=Module %s is activated and slows the interface
 EXPORTS_SHARE_MODELS=Export models are share with everybody
 ExportSetup=Setup of module Export
 InstanceUniqueID=Unique ID of the instance
@@ -1928,3 +1935,5 @@ 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
diff --git a/htdocs/langs/sw_SW/bills.lang b/htdocs/langs/sw_SW/bills.lang
index 4f114d4df1c..53535e58b46 100644
--- a/htdocs/langs/sw_SW/bills.lang
+++ b/htdocs/langs/sw_SW/bills.lang
@@ -95,6 +95,7 @@ PaymentHigherThanReminderToPay=Payment higher than reminder to pay
 HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess received for each overpaid invoice.
 HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess paid for each overpaid invoice.
 ClassifyPaid=Classify 'Paid'
+ClassifyUnPaid=Classify 'Unpaid'
 ClassifyPaidPartially=Classify 'Paid partially'
 ClassifyCanceled=Classify 'Abandoned'
 ClassifyClosed=Classify 'Closed'
@@ -214,6 +215,20 @@ ShowInvoiceReplace=Show replacing invoice
 ShowInvoiceAvoir=Show credit note
 ShowInvoiceDeposit=Show down payment invoice
 ShowInvoiceSituation=Show situation invoice
+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
 ShowPayment=Show payment
 AlreadyPaid=Already paid
 AlreadyPaidBack=Already paid back
diff --git a/htdocs/langs/sw_SW/errors.lang b/htdocs/langs/sw_SW/errors.lang
index b5a9d70cb70..1ee46fdbb92 100644
--- a/htdocs/langs/sw_SW/errors.lang
+++ b/htdocs/langs/sw_SW/errors.lang
@@ -90,7 +90,7 @@ ErrorSpecialCharNotAllowedForField=Special characters are not allowed for field
 ErrorNumRefModel=A reference exists into database (%s) and is not compatible with this numbering rule. Remove record or renamed reference to activate this module.
 ErrorQtyTooLowForThisSupplier=Quantity too low for this vendor or no price defined on this product for this vendor
 ErrorOrdersNotCreatedQtyTooLow=Some orders haven't been created because of too-low quantities
-ErrorModuleSetupNotComplete=Setup of module looks to be uncomplete. Go on Home - Setup - Modules to complete.
+ErrorModuleSetupNotComplete=Setup of module %s looks to be uncomplete. Go on Home - Setup - Modules to complete.
 ErrorBadMask=Error on mask
 ErrorBadMaskFailedToLocatePosOfSequence=Error, mask without sequence number
 ErrorBadMaskBadRazMonth=Error, bad reset value
@@ -219,6 +219,7 @@ 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.
 # 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.
 WarningMandatorySetupNotComplete=Click here to setup mandatory parameters
 WarningEnableYourModulesApplications=Click here to enable your modules and applications
diff --git a/htdocs/langs/sw_SW/main.lang b/htdocs/langs/sw_SW/main.lang
index 6efbe942032..1cadc32f4ab 100644
--- a/htdocs/langs/sw_SW/main.lang
+++ b/htdocs/langs/sw_SW/main.lang
@@ -445,6 +445,7 @@ ContactsAddressesForCompany=Contacts/addresses for this third party
 AddressesForCompany=Addresses for this third party
 ActionsOnCompany=Events for this third party
 ActionsOnContact=Events for this contact/address
+ActionsOnContract=Events for this contract
 ActionsOnMember=Events about this member
 ActionsOnProduct=Events about this product
 NActionsLate=%s late
@@ -759,6 +760,7 @@ LinkToSupplierProposal=Link to vendor proposal
 LinkToSupplierInvoice=Link to vendor invoice
 LinkToContract=Link to contract
 LinkToIntervention=Link to intervention
+LinkToTicket=Link to ticket
 CreateDraft=Create draft
 SetToDraft=Back to draft
 ClickToEdit=Click to edit
diff --git a/htdocs/langs/sw_SW/products.lang b/htdocs/langs/sw_SW/products.lang
index 7b68f5b3ebd..73e672284de 100644
--- a/htdocs/langs/sw_SW/products.lang
+++ b/htdocs/langs/sw_SW/products.lang
@@ -2,6 +2,7 @@
 ProductRef=Product ref.
 ProductLabel=Product label
 ProductLabelTranslated=Translated product label
+ProductDescription=Product description
 ProductDescriptionTranslated=Translated product description
 ProductNoteTranslated=Translated product note
 ProductServiceCard=Products/Services card
diff --git a/htdocs/langs/sw_SW/withdrawals.lang b/htdocs/langs/sw_SW/withdrawals.lang
index cbca2b2f103..88e5eaf128c 100644
--- a/htdocs/langs/sw_SW/withdrawals.lang
+++ b/htdocs/langs/sw_SW/withdrawals.lang
@@ -76,7 +76,8 @@ WithdrawalFile=Withdrawal file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and will classify them as "Paid" if remain to pay is null
 StatisticsByLineStatus=Statistics by status of lines
-RUM=UMR
+RUM=Unique Mandate Reference (UMR)
+DateRUM=Mandate signature date
 RUMLong=Unique Mandate Reference
 RUMWillBeGenerated=If empty, a UMR (Unique Mandate Reference) will be generated once the bank account information is saved.
 WithdrawMode=Direct debit mode (FRST or RECUR)
diff --git a/htdocs/langs/th_TH/accountancy.lang b/htdocs/langs/th_TH/accountancy.lang
index 32ea494ec01..b98134aa1cd 100644
--- a/htdocs/langs/th_TH/accountancy.lang
+++ b/htdocs/langs/th_TH/accountancy.lang
@@ -265,7 +265,7 @@ AccountingJournals=Accounting journals
 AccountingJournal=Accounting journal
 NewAccountingJournal=New accounting journal
 ShowAccoutingJournal=Show accounting journal
-Nature=ธรรมชาติ
+NatureOfJournal=Nature of Journal
 AccountingJournalType1=Miscellaneous operations
 AccountingJournalType2=ขาย
 AccountingJournalType3=การสั่งซื้อสินค้า
@@ -291,6 +291,7 @@ Modelcsv_quadratus=Export for Quadratus QuadraCompta
 Modelcsv_ebp=Export for EBP
 Modelcsv_cogilog=Export for Cogilog
 Modelcsv_agiris=Export for Agiris
+Modelcsv_LDCompta=Export for LD Compta (v9 & higher) (Test)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
@@ -301,7 +302,7 @@ ChartofaccountsId=Chart of accounts Id
 InitAccountancy=Init accountancy
 InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accounting account defined for sales and purchases.
 DefaultBindingDesc=This page can be used to set a default account to use to link transactions record about payment salaries, donation, taxes and vat when no specific accounting account were already set.
-DefaultClosureDesc=This page can be used to set parameters to use to enclose a balance sheet.
+DefaultClosureDesc=This page can be used to set parameters used for accounting closures.
 Options=Options
 OptionModeProductSell=Mode sales
 OptionModeProductSellIntra=Mode sales exported in EEC
diff --git a/htdocs/langs/th_TH/admin.lang b/htdocs/langs/th_TH/admin.lang
index bd4dd75398a..173ac63b62d 100644
--- a/htdocs/langs/th_TH/admin.lang
+++ b/htdocs/langs/th_TH/admin.lang
@@ -574,7 +574,7 @@ Module510Name=เงินเดือน
 Module510Desc=Record and track employee payments
 Module520Name=เงินให้กู้ยืม
 Module520Desc=การบริหารจัดการของเงินให้สินเชื่อ
-Module600Name=การแจ้งเตือน
+Module600Name=Notifications on business event
 Module600Desc=Send email notifications triggered by a business event: per user (setup defined on each user), per third-party contacts (setup defined on each third party) or by specific emails
 Module600Long=Note that this module sends emails in real-time when a specific business event occurs. If you are looking for a feature to send email reminders for agenda events, go into the setup of module Agenda.
 Module610Name=Product Variants
@@ -1193,6 +1193,7 @@ ExtraFieldsSupplierOrders=คุณลักษณะเสริม (คำส
 ExtraFieldsSupplierInvoices=คุณลักษณะเสริม (ใบแจ้งหนี้)
 ExtraFieldsProject=คุณลักษณะเสริม (โครงการ)
 ExtraFieldsProjectTask=คุณลักษณะเสริม (งาน)
+ExtraFieldsSalaries=Complementary attributes (salaries)
 ExtraFieldHasWrongValue=s Attribute% มีค่าที่ไม่ถูกต้อง
 AlphaNumOnlyLowerCharsAndNoSpace=alphanumericals เท่านั้นและอักขระตัวพิมพ์เล็กโดยไม่ต้องพื้นที่
 SendmailOptionNotComplete=คำเตือนในบางระบบลินุกซ์ที่จะส่งอีเมลจากอีเมลของคุณตั้งค่าการดำเนินการต้องมี sendmail -ba ตัวเลือก (mail.force_extra_parameters พารามิเตอร์ลงในไฟล์ php.ini ของคุณ) หากผู้รับบางคนไม่เคยได้รับอีเมลพยายามที่จะแก้ไขพารามิเตอร์ PHP นี้กับ mail.force_extra_parameters = -ba)
@@ -1220,13 +1221,14 @@ SuhosinSessionEncrypt=เซสชั่นการจัดเก็บข้
 ConditionIsCurrently=สภาพปัจจุบันคือ% s
 YouUseBestDriver=You use driver %s which is the best driver currently available.
 YouDoNotUseBestDriver=You use driver %s but driver %s is recommended.
-NbOfProductIsLowerThanNoPb=You have only %s products/services in the database. This does not require any particular optimization.
+NbOfObjectIsLowerThanNoPb=You have only %s %s in the database. This does not require any particular optimization.
 SearchOptim=ค้นหาการเพิ่มประสิทธิภาพ
-YouHaveXProductUseSearchOptim=You have %s products in the database. You should add the constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+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.
 BrowserIsOK=You are using the %s web browser. This browser is ok for security and performance.
 BrowserIsKO=You are using the %s web browser. This browser is known to be a bad choice for security, performance and reliability. We recommend using Firefox, Chrome, Opera or Safari.
-XDebugInstalled=XDebug โหลด
-XCacheInstalled=XCache โหลด
+PHPModuleLoaded=PHP component %s is loaded
+PreloadOPCode=Preloaded OPCode is used
 AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.<br>Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp".
 AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".
 AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties.
@@ -1734,9 +1736,9 @@ ExpenseReportsRulesSetup=Setup of module Expense Reports - Rules
 ExpenseReportNumberingModules=Expense reports numbering module
 NoModueToManageStockIncrease=ไม่มีโมดูลสามารถจัดการกับการเพิ่มขึ้นของสต็อกอัตโนมัติถูกเปิดใช้งาน การเพิ่มขึ้นของสต็อกจะทำได้ในการป้อนข้อมูลด้วยตนเอง
 YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for email notifications by enabling and configuring the module "Notification".
-ListOfNotificationsPerUser=List of notifications per user*
-ListOfNotificationsPerUserOrContact=List of notifications (events) available per user* or per contact**
-ListOfFixedNotifications=List of Fixed Notifications
+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
 GoOntoUserCardToAddMore=Go to the tab "Notifications" of a user to add or remove notifications for users
 GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
 Threshold=ธรณีประตู
@@ -1898,6 +1900,11 @@ OnMobileOnly=On small screen (smartphone) only
 DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be Prospect or Customer but can't be both)
 MAIN_OPTIMIZEFORTEXTBROWSER=Simplify interface for blind person
 MAIN_OPTIMIZEFORTEXTBROWSERDesc=Enable this option if you are a blind person, or if you use the application from a text browser like Lynx or 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
 ThisValueCanOverwrittenOnUserLevel=This value can be overwritten by each user from its user page - tab '%s'
 DefaultCustomerType=Default thirdparty type for "New customer" creation form
 ABankAccountMustBeDefinedOnPaymentModeSetup=Note: The bank account must be defined on the module of each payment mode (Paypal, Stripe, ...) to have this feature working.
@@ -1911,7 +1918,7 @@ LogsLinesNumber=Number of lines to show on logs tab
 UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
-DebugBarModuleActivated=Module debugbar is activated and slows dramaticaly the interface
+ModuleActivated=Module %s is activated and slows the interface
 EXPORTS_SHARE_MODELS=Export models are share with everybody
 ExportSetup=Setup of module Export
 InstanceUniqueID=Unique ID of the instance
@@ -1928,3 +1935,5 @@ 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
diff --git a/htdocs/langs/th_TH/bills.lang b/htdocs/langs/th_TH/bills.lang
index 17b76759851..57d4a46221d 100644
--- a/htdocs/langs/th_TH/bills.lang
+++ b/htdocs/langs/th_TH/bills.lang
@@ -95,6 +95,7 @@ PaymentHigherThanReminderToPay=การชำระเงินที่สู
 HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess received for each overpaid invoice.
 HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess paid for each overpaid invoice.
 ClassifyPaid=จำแนก 'ชำระเงิน'
+ClassifyUnPaid=Classify 'Unpaid'
 ClassifyPaidPartially=จำแนก 'ชำระบางส่วน'
 ClassifyCanceled=จำแนก 'Abandoned'
 ClassifyClosed=จำแนก 'ปิด'
@@ -214,6 +215,20 @@ ShowInvoiceReplace=แสดงการเปลี่ยนใบแจ้ง
 ShowInvoiceAvoir=แสดงใบลดหนี้
 ShowInvoiceDeposit=Show down payment invoice
 ShowInvoiceSituation=Show situation invoice
+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
 ShowPayment=แสดงการชำระเงิน
 AlreadyPaid=จ่ายเงินไปแล้ว
 AlreadyPaidBack=จ่ายเงินไปแล้วกลับมา
diff --git a/htdocs/langs/th_TH/errors.lang b/htdocs/langs/th_TH/errors.lang
index 66063d8262a..ff3ae3c3447 100644
--- a/htdocs/langs/th_TH/errors.lang
+++ b/htdocs/langs/th_TH/errors.lang
@@ -90,7 +90,7 @@ ErrorSpecialCharNotAllowedForField=อักขระพิเศษไม่ไ
 ErrorNumRefModel=การอ้างอิงที่มีอยู่ในฐานข้อมูล (% s) และไม่ได้เข้ากันได้กับกฎหมายเลขนี้ ลบบันทึกการอ้างอิงหรือเปลี่ยนชื่อเพื่อเปิดใช้งานโมดูลนี้
 ErrorQtyTooLowForThisSupplier=Quantity too low for this vendor or no price defined on this product for this vendor
 ErrorOrdersNotCreatedQtyTooLow=Some orders haven't been created because of too-low quantities
-ErrorModuleSetupNotComplete=Setup of module looks to be uncomplete. Go on Home - Setup - Modules to complete.
+ErrorModuleSetupNotComplete=Setup of module %s looks to be uncomplete. Go on Home - Setup - Modules to complete.
 ErrorBadMask=ข้อผิดพลาดในหน้ากาก
 ErrorBadMaskFailedToLocatePosOfSequence=ข้อผิดพลาดหน้ากากไม่มีหมายเลขลำดับ
 ErrorBadMaskBadRazMonth=ข้อผิดพลาดค่าการตั้งค่าที่ไม่ดี
@@ -219,6 +219,7 @@ 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.
 # 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.
 WarningMandatorySetupNotComplete=Click here to setup mandatory parameters
 WarningEnableYourModulesApplications=Click here to enable your modules and applications
diff --git a/htdocs/langs/th_TH/main.lang b/htdocs/langs/th_TH/main.lang
index 1b5fa626326..6bdb2dea072 100644
--- a/htdocs/langs/th_TH/main.lang
+++ b/htdocs/langs/th_TH/main.lang
@@ -445,6 +445,7 @@ ContactsAddressesForCompany=รายชื่อ / ที่อยู่สำ
 AddressesForCompany=สำหรับที่อยู่ของบุคคลที่สามนี้
 ActionsOnCompany=Events for this third party
 ActionsOnContact=Events for this contact/address
+ActionsOnContract=Events for this contract
 ActionsOnMember=เหตุการณ์ที่เกิดขึ้นเกี่ยวกับสมาชิกในนี้
 ActionsOnProduct=Events about this product
 NActionsLate=% s ปลาย
@@ -759,6 +760,7 @@ LinkToSupplierProposal=Link to vendor proposal
 LinkToSupplierInvoice=Link to vendor invoice
 LinkToContract=Link to contract
 LinkToIntervention=Link to intervention
+LinkToTicket=Link to ticket
 CreateDraft=สร้างร่าง
 SetToDraft=กลับไปร่าง
 ClickToEdit=คลิกเพื่อแก้ไข
diff --git a/htdocs/langs/th_TH/products.lang b/htdocs/langs/th_TH/products.lang
index ce6d14c6dc6..486cd4ee828 100644
--- a/htdocs/langs/th_TH/products.lang
+++ b/htdocs/langs/th_TH/products.lang
@@ -2,6 +2,7 @@
 ProductRef=สินค้าอ้างอิง
 ProductLabel=ฉลากสินค้า
 ProductLabelTranslated=Translated product label
+ProductDescription=Product description
 ProductDescriptionTranslated=Translated product description
 ProductNoteTranslated=Translated product note
 ProductServiceCard=สินค้า / บริการบัตร
diff --git a/htdocs/langs/th_TH/stripe.lang b/htdocs/langs/th_TH/stripe.lang
index c0a5acea926..ddc7ffc500e 100644
--- a/htdocs/langs/th_TH/stripe.lang
+++ b/htdocs/langs/th_TH/stripe.lang
@@ -65,3 +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>
diff --git a/htdocs/langs/th_TH/withdrawals.lang b/htdocs/langs/th_TH/withdrawals.lang
index b46cf195258..03c1a484b60 100644
--- a/htdocs/langs/th_TH/withdrawals.lang
+++ b/htdocs/langs/th_TH/withdrawals.lang
@@ -76,7 +76,8 @@ WithdrawalFile=ไฟล์ถอนเงิน
 SetToStatusSent=ตั้งสถานะ "แฟ้มส่ง"
 ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and will classify them as "Paid" if remain to pay is null
 StatisticsByLineStatus=สถิติตามสถานะของสาย
-RUM=UMR
+RUM=Unique Mandate Reference (UMR)
+DateRUM=Mandate signature date
 RUMLong=Unique Mandate Reference
 RUMWillBeGenerated=If empty, a UMR (Unique Mandate Reference) will be generated once the bank account information is saved.
 WithdrawMode=Direct debit mode (FRST or RECUR)
diff --git a/htdocs/langs/tr_TR/accountancy.lang b/htdocs/langs/tr_TR/accountancy.lang
index abce087b09e..391d2cf15bc 100644
--- a/htdocs/langs/tr_TR/accountancy.lang
+++ b/htdocs/langs/tr_TR/accountancy.lang
@@ -265,7 +265,7 @@ AccountingJournals=Muhasebe günlükleri
 AccountingJournal=Muhasebe günlüğü
 NewAccountingJournal=Yeni muhasebe günlüğü
 ShowAccoutingJournal=Muhasebe günlüğünü göster
-Nature=Niteliği
+NatureOfJournal=Nature of Journal
 AccountingJournalType1=Çeşitli işlemler
 AccountingJournalType2=Satışlar
 AccountingJournalType3=Alışlar
@@ -291,6 +291,7 @@ Modelcsv_quadratus=Export for Quadratus QuadraCompta
 Modelcsv_ebp=EBP için dışa aktarım
 Modelcsv_cogilog=Export for Cogilog
 Modelcsv_agiris=Export for Agiris
+Modelcsv_LDCompta=Export for LD Compta (v9 & higher) (Test)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
@@ -301,7 +302,7 @@ ChartofaccountsId=Hesap planı Id
 InitAccountancy=Muhasebe başlangıcı
 InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accounting account defined for sales and purchases.
 DefaultBindingDesc=This page can be used to set a default account to use to link transactions record about payment salaries, donation, taxes and vat when no specific accounting account were already set.
-DefaultClosureDesc=This page can be used to set parameters to use to enclose a balance sheet.
+DefaultClosureDesc=This page can be used to set parameters used for accounting closures.
 Options=Seçenekler
 OptionModeProductSell=Satış modu
 OptionModeProductSellIntra=Mode sales exported in EEC
diff --git a/htdocs/langs/tr_TR/admin.lang b/htdocs/langs/tr_TR/admin.lang
index 4ec639898e0..7ff3a990796 100644
--- a/htdocs/langs/tr_TR/admin.lang
+++ b/htdocs/langs/tr_TR/admin.lang
@@ -574,7 +574,7 @@ Module510Name=Ücretler
 Module510Desc=Çalışan ödemelerini kaydedin ve takip edin
 Module520Name=Krediler
 Module520Desc=Borçların yönetimi
-Module600Name=Bildirimler
+Module600Name=Notifications on business event
 Module600Desc=Bir iş etkinliği tarafından tetiklenen e-posta bildirimleri gönderin: her kullanıcı için (her bir kullanıcı için tanımlanmış kurulum), her üçüncü parti kişisi için (her bir üçüncü parti için tanımlanmış kurulum) veya belirli e-postalara göre.
 Module600Long=Note that this module sends emails in real-time when a specific business event occurs. If you are looking for a feature to send email reminders for agenda events, go into the setup of module Agenda.
 Module610Name=Ürün Değişkenleri
@@ -1193,6 +1193,7 @@ ExtraFieldsSupplierOrders=Tamamlayıcı öznitelikler (siparişler)
 ExtraFieldsSupplierInvoices=Tamamlayıcı öznitelikler (faturalar)
 ExtraFieldsProject=Tamamlayıcı öznitelikler (projeler)
 ExtraFieldsProjectTask=Tamamlayıcı öznitelikler (görevler)
+ExtraFieldsSalaries=Complementary attributes (salaries)
 ExtraFieldHasWrongValue=Öznitelik %s için hatalı değer.
 AlphaNumOnlyLowerCharsAndNoSpace=yalnızca boşluksuz olarak alfasayısal ve küçük harfli karakterler
 SendmailOptionNotComplete=Uyarı: Bazı Linux sistemlerinde, e-posta adresinizden mail göndermek için sendmail yürütme kurulumu -ba seçeneğini içermelidir (php.ini dosyanızın içindeki parameter mail.force_extra_parameters). Eğer bazı alıcılar hiç e-posta alamazsa, bu PHP parametresini mail.force_extra_parameters = -ba ile düzenlemeye çalışın.
@@ -1220,13 +1221,14 @@ SuhosinSessionEncrypt=Oturum depolaması Suhosin tarafından şifrelendi
 ConditionIsCurrently=Koşul şu anda %s durumunda
 YouUseBestDriver=Kullandığınız %s sürücüsü şu anda mevcut olan en iyi sürücüdür.
 YouDoNotUseBestDriver=%s sürücüsünü kullanıyorsunuz fakat %s sürücüsü önerilir.
-NbOfProductIsLowerThanNoPb=Veritabanında sadece %s ürün/hizmet var. Bu, özel bir optimizasyon gerektirmez.
+NbOfObjectIsLowerThanNoPb=You have only %s %s in the database. This does not require any particular optimization.
 SearchOptim=Optimizasyon ara
-YouHaveXProductUseSearchOptim=You have %s products in the database. You should add the constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+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.
 BrowserIsOK=%s web tarayıcısını kullanıyorsunuz. Bu tarayıcı güvenlik ve performans açısından uygundur.
 BrowserIsKO=You are using the %s web browser. This browser is known to be a bad choice for security, performance and reliability. We recommend using Firefox, Chrome, Opera or Safari.
-XDebugInstalled=XDebug yüklüdür.
-XCacheInstalled=XDebug yüklüdür.
+PHPModuleLoaded=PHP component %s is loaded
+PreloadOPCode=Preloaded OPCode is used
 AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.<br>Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp".
 AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".
 AskForPreferredShippingMethod=Üçüncü Partiler için tercih edilen gönderme yöntemini isteyin.
@@ -1734,9 +1736,9 @@ ExpenseReportsRulesSetup=Gider Raporları modülü kurulumu - Kurallar
 ExpenseReportNumberingModules=Gider raporları numaralandırma modülü
 NoModueToManageStockIncrease=Otomatik stok arttırılması yapabilecek hiçbir modül etkinleştirilmemiş. Stok arttırılması yalnızca elle girişle yapılacaktır.
 YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for email notifications by enabling and configuring the module "Notification".
-ListOfNotificationsPerUser=Kullanıcı başına bildirimler listesi*
-ListOfNotificationsPerUserOrContact=List of notifications (events) available per user* or per contact**
-ListOfFixedNotifications=Sabit Bildirimlerin Listesi
+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
 GoOntoUserCardToAddMore=Kullanıcılar için bildirim eklemek veya silmek için kullanıcının "Bildirimler" sekmesine gidin
 GoOntoContactCardToAddMore=Kişilerden/adreslerden bildirimleri eklemek ya da kaldırmak için üçüncü taraf kişileri "Bildirimler" sekmesine git
 Threshold=Sınır
@@ -1898,6 +1900,11 @@ OnMobileOnly=Sadece küçük ekranda (akıllı telefon)
 DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be Prospect or Customer but can't be both)
 MAIN_OPTIMIZEFORTEXTBROWSER=Görme engelli insanlar için arayüzü basitleştir
 MAIN_OPTIMIZEFORTEXTBROWSERDesc=Enable this option if you are a blind person, or if you use the application from a text browser like Lynx or 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
 ThisValueCanOverwrittenOnUserLevel=This value can be overwritten by each user from its user page - tab '%s'
 DefaultCustomerType="Yeni müşteri" oluşturma formunda varsayılan üçüncü parti türü
 ABankAccountMustBeDefinedOnPaymentModeSetup=Note: The bank account must be defined on the module of each payment mode (Paypal, Stripe, ...) to have this feature working.
@@ -1911,7 +1918,7 @@ LogsLinesNumber=Number of lines to show on logs tab
 UseDebugBar=Hata ayıklama çubuğunu kullan
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
-DebugBarModuleActivated=Hata Ayıklama Çubuğu Modülü etkinleştirildi ve arayüzü önemli ölçüde yavaşlatıyor
+ModuleActivated=Module %s is activated and slows the interface
 EXPORTS_SHARE_MODELS=Dışa aktarma modelleri herkesle paylaşılır
 ExportSetup=Dışa aktarma modülünün kurulumu
 InstanceUniqueID=Unique ID of the instance
@@ -1928,3 +1935,5 @@ 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
diff --git a/htdocs/langs/tr_TR/bills.lang b/htdocs/langs/tr_TR/bills.lang
index 53d372c93fd..8aa7e20097c 100644
--- a/htdocs/langs/tr_TR/bills.lang
+++ b/htdocs/langs/tr_TR/bills.lang
@@ -95,6 +95,7 @@ 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’
 ClassifyCanceled=’Terkedildi’ olarak sınıflandır
 ClassifyClosed=‘Kapalı’ olarak sınıflandır
@@ -214,6 +215,20 @@ ShowInvoiceReplace=Değiştirilen faturayı göster
 ShowInvoiceAvoir=İade faturası göster
 ShowInvoiceDeposit=Show down payment invoice
 ShowInvoiceSituation=Hakediş faturası göster
+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
 ShowPayment=Ödeme göster
 AlreadyPaid=Zaten ödenmiş
 AlreadyPaidBack=Zaten geri ödenmiş
diff --git a/htdocs/langs/tr_TR/errors.lang b/htdocs/langs/tr_TR/errors.lang
index 714b9d6c9ac..9a946adca70 100644
--- a/htdocs/langs/tr_TR/errors.lang
+++ b/htdocs/langs/tr_TR/errors.lang
@@ -90,7 +90,7 @@ ErrorSpecialCharNotAllowedForField=%s alanında özel karakterlere izin verilmez
 ErrorNumRefModel=Veritabanına (%s) bir başvuru var ve bu numaralandırma kuralı ile uyumlu değildir. Kaydı kaldırın ya da bu modülü etkinleştirmek için başvurunun adını değiştirin.
 ErrorQtyTooLowForThisSupplier=Quantity too low for this vendor or no price defined on this product for this vendor
 ErrorOrdersNotCreatedQtyTooLow=Some orders haven't been created because of too-low quantities
-ErrorModuleSetupNotComplete=Modül ayarı tamamlanmamış gibi görünüyor. Tamamlamak için Giriş - Ayarlar - Modüller menüsüne git.
+ErrorModuleSetupNotComplete=Setup of module %s looks to be uncomplete. Go on Home - Setup - Modules to complete.
 ErrorBadMask=Maskede hata
 ErrorBadMaskFailedToLocatePosOfSequence=Hata, sıra numarasız  maske
 ErrorBadMaskBadRazMonth=Hata, kötü sıfırlama değeri
@@ -219,6 +219,7 @@ 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.
 # 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=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/main.lang b/htdocs/langs/tr_TR/main.lang
index 4edc9cbc7a4..a4acb9620a3 100644
--- a/htdocs/langs/tr_TR/main.lang
+++ b/htdocs/langs/tr_TR/main.lang
@@ -445,6 +445,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
 ActionsOnMember=Bu üye hakkındaki etkinlikler
 ActionsOnProduct=Bu ürünle ilgili etkinlikler
 NActionsLate=%s son
@@ -759,6 +760,7 @@ LinkToSupplierProposal=Tedarikçi teklifine bağlantıla
 LinkToSupplierInvoice=Tedarikçi faturasına bağlantıla
 LinkToContract=Kişiye bağlantıla
 LinkToIntervention=Müdahaleye bağlantıla
+LinkToTicket=Link to ticket
 CreateDraft=Taslak oluştur
 SetToDraft=Taslağa geri dön
 ClickToEdit=Düzenlemek için tıklayın
diff --git a/htdocs/langs/tr_TR/products.lang b/htdocs/langs/tr_TR/products.lang
index 46b15d67da5..65f9f9ac6d2 100644
--- a/htdocs/langs/tr_TR/products.lang
+++ b/htdocs/langs/tr_TR/products.lang
@@ -2,6 +2,7 @@
 ProductRef=Ürün ref.
 ProductLabel=Ürün etiketi
 ProductLabelTranslated=Çevirilmiş ürün etiketi
+ProductDescription=Product description
 ProductDescriptionTranslated=Çevirilmiş ürün tanımı
 ProductNoteTranslated=Çevirilmiş ürün notu
 ProductServiceCard=Ürün/Hizmet kartı
diff --git a/htdocs/langs/tr_TR/stripe.lang b/htdocs/langs/tr_TR/stripe.lang
index a3c26c4b346..e386539b755 100644
--- a/htdocs/langs/tr_TR/stripe.lang
+++ b/htdocs/langs/tr_TR/stripe.lang
@@ -65,3 +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>
diff --git a/htdocs/langs/tr_TR/withdrawals.lang b/htdocs/langs/tr_TR/withdrawals.lang
index 001dacc9c1e..68e1b28efe9 100644
--- a/htdocs/langs/tr_TR/withdrawals.lang
+++ b/htdocs/langs/tr_TR/withdrawals.lang
@@ -76,7 +76,8 @@ 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
 StatisticsByLineStatus=Durum satırlarına göre istatistkler
-RUM=UMR
+RUM=Unique Mandate Reference (UMR)
+DateRUM=Mandate signature date
 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/uk_UA/accountancy.lang b/htdocs/langs/uk_UA/accountancy.lang
index 2c0c96bb664..868f3378bbc 100644
--- a/htdocs/langs/uk_UA/accountancy.lang
+++ b/htdocs/langs/uk_UA/accountancy.lang
@@ -265,7 +265,7 @@ AccountingJournals=Accounting journals
 AccountingJournal=Accounting journal
 NewAccountingJournal=New accounting journal
 ShowAccoutingJournal=Show accounting journal
-Nature=Nature
+NatureOfJournal=Nature of Journal
 AccountingJournalType1=Miscellaneous operations
 AccountingJournalType2=Sales
 AccountingJournalType3=Purchases
@@ -291,6 +291,7 @@ Modelcsv_quadratus=Export for Quadratus QuadraCompta
 Modelcsv_ebp=Export for EBP
 Modelcsv_cogilog=Export for Cogilog
 Modelcsv_agiris=Export for Agiris
+Modelcsv_LDCompta=Export for LD Compta (v9 & higher) (Test)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
@@ -301,7 +302,7 @@ ChartofaccountsId=Chart of accounts Id
 InitAccountancy=Init accountancy
 InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accounting account defined for sales and purchases.
 DefaultBindingDesc=This page can be used to set a default account to use to link transactions record about payment salaries, donation, taxes and vat when no specific accounting account were already set.
-DefaultClosureDesc=This page can be used to set parameters to use to enclose a balance sheet.
+DefaultClosureDesc=This page can be used to set parameters used for accounting closures.
 Options=Options
 OptionModeProductSell=Mode sales
 OptionModeProductSellIntra=Mode sales exported in EEC
diff --git a/htdocs/langs/uk_UA/admin.lang b/htdocs/langs/uk_UA/admin.lang
index 2aa26a32a3b..620e9f7db8c 100644
--- a/htdocs/langs/uk_UA/admin.lang
+++ b/htdocs/langs/uk_UA/admin.lang
@@ -574,7 +574,7 @@ Module510Name=Salaries
 Module510Desc=Record and track employee payments
 Module520Name=Loans
 Module520Desc=Management of loans
-Module600Name=Оповіщення
+Module600Name=Notifications on business event
 Module600Desc=Send email notifications triggered by a business event: per user (setup defined on each user), per third-party contacts (setup defined on each third party) or by specific emails
 Module600Long=Note that this module sends emails in real-time when a specific business event occurs. If you are looking for a feature to send email reminders for agenda events, go into the setup of module Agenda.
 Module610Name=Product Variants
@@ -1193,6 +1193,7 @@ ExtraFieldsSupplierOrders=Complementary attributes (orders)
 ExtraFieldsSupplierInvoices=Complementary attributes (invoices)
 ExtraFieldsProject=Complementary attributes (projects)
 ExtraFieldsProjectTask=Complementary attributes (tasks)
+ExtraFieldsSalaries=Complementary attributes (salaries)
 ExtraFieldHasWrongValue=Attribute %s has a wrong value.
 AlphaNumOnlyLowerCharsAndNoSpace=only alphanumericals and lower case characters without space
 SendmailOptionNotComplete=Warning, on some Linux systems, to send email from your email, sendmail execution setup must contains option -ba (parameter mail.force_extra_parameters into your php.ini file). If some recipients never receive emails, try to edit this PHP parameter with mail.force_extra_parameters = -ba).
@@ -1220,13 +1221,14 @@ SuhosinSessionEncrypt=Session storage encrypted by Suhosin
 ConditionIsCurrently=Condition is currently %s
 YouUseBestDriver=You use driver %s which is the best driver currently available.
 YouDoNotUseBestDriver=You use driver %s but driver %s is recommended.
-NbOfProductIsLowerThanNoPb=You have only %s products/services in the database. This does not require any particular optimization.
+NbOfObjectIsLowerThanNoPb=You have only %s %s in the database. This does not require any particular optimization.
 SearchOptim=Search optimization
-YouHaveXProductUseSearchOptim=You have %s products in the database. You should add the constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+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.
 BrowserIsOK=You are using the %s web browser. This browser is ok for security and performance.
 BrowserIsKO=You are using the %s web browser. This browser is known to be a bad choice for security, performance and reliability. We recommend using Firefox, Chrome, Opera or Safari.
-XDebugInstalled=XDebug is loaded.
-XCacheInstalled=XCache is loaded.
+PHPModuleLoaded=PHP component %s is loaded
+PreloadOPCode=Preloaded OPCode is used
 AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.<br>Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp".
 AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".
 AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties.
@@ -1734,9 +1736,9 @@ ExpenseReportsRulesSetup=Setup of module Expense Reports - Rules
 ExpenseReportNumberingModules=Expense reports numbering module
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
 YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for email notifications by enabling and configuring the module "Notification".
-ListOfNotificationsPerUser=List of notifications per user*
-ListOfNotificationsPerUserOrContact=List of notifications (events) available per user* or per contact**
-ListOfFixedNotifications=List of Fixed Notifications
+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
 GoOntoUserCardToAddMore=Go to the tab "Notifications" of a user to add or remove notifications for users
 GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
 Threshold=Threshold
@@ -1898,6 +1900,11 @@ OnMobileOnly=On small screen (smartphone) only
 DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be Prospect or Customer but can't be both)
 MAIN_OPTIMIZEFORTEXTBROWSER=Simplify interface for blind person
 MAIN_OPTIMIZEFORTEXTBROWSERDesc=Enable this option if you are a blind person, or if you use the application from a text browser like Lynx or 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
 ThisValueCanOverwrittenOnUserLevel=This value can be overwritten by each user from its user page - tab '%s'
 DefaultCustomerType=Default thirdparty type for "New customer" creation form
 ABankAccountMustBeDefinedOnPaymentModeSetup=Note: The bank account must be defined on the module of each payment mode (Paypal, Stripe, ...) to have this feature working.
@@ -1911,7 +1918,7 @@ LogsLinesNumber=Number of lines to show on logs tab
 UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
-DebugBarModuleActivated=Module debugbar is activated and slows dramaticaly the interface
+ModuleActivated=Module %s is activated and slows the interface
 EXPORTS_SHARE_MODELS=Export models are share with everybody
 ExportSetup=Setup of module Export
 InstanceUniqueID=Unique ID of the instance
@@ -1928,3 +1935,5 @@ 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
diff --git a/htdocs/langs/uk_UA/bills.lang b/htdocs/langs/uk_UA/bills.lang
index 667a89a60fe..56a17b860f9 100644
--- a/htdocs/langs/uk_UA/bills.lang
+++ b/htdocs/langs/uk_UA/bills.lang
@@ -95,6 +95,7 @@ PaymentHigherThanReminderToPay=Платіж більший, ніж в нагад
 HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess received for each overpaid invoice.
 HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess paid for each overpaid invoice.
 ClassifyPaid=Класифікувати як 'Сплачений'
+ClassifyUnPaid=Classify 'Unpaid'
 ClassifyPaidPartially=Класифікувати як 'Сплачений частково'
 ClassifyCanceled=Класифікувати як 'Анулюваний'
 ClassifyClosed=Класифікувати як 'Закритий'
@@ -214,6 +215,20 @@ ShowInvoiceReplace=Показати замінюючий рахунок-факт
 ShowInvoiceAvoir=Показати кредитое авізо
 ShowInvoiceDeposit=Show down payment invoice
 ShowInvoiceSituation=Show situation invoice
+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
 ShowPayment=Показати платіж
 AlreadyPaid=Вже сплачений
 AlreadyPaidBack=Already paid back
diff --git a/htdocs/langs/uk_UA/errors.lang b/htdocs/langs/uk_UA/errors.lang
index b5a9d70cb70..1ee46fdbb92 100644
--- a/htdocs/langs/uk_UA/errors.lang
+++ b/htdocs/langs/uk_UA/errors.lang
@@ -90,7 +90,7 @@ ErrorSpecialCharNotAllowedForField=Special characters are not allowed for field
 ErrorNumRefModel=A reference exists into database (%s) and is not compatible with this numbering rule. Remove record or renamed reference to activate this module.
 ErrorQtyTooLowForThisSupplier=Quantity too low for this vendor or no price defined on this product for this vendor
 ErrorOrdersNotCreatedQtyTooLow=Some orders haven't been created because of too-low quantities
-ErrorModuleSetupNotComplete=Setup of module looks to be uncomplete. Go on Home - Setup - Modules to complete.
+ErrorModuleSetupNotComplete=Setup of module %s looks to be uncomplete. Go on Home - Setup - Modules to complete.
 ErrorBadMask=Error on mask
 ErrorBadMaskFailedToLocatePosOfSequence=Error, mask without sequence number
 ErrorBadMaskBadRazMonth=Error, bad reset value
@@ -219,6 +219,7 @@ 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.
 # 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.
 WarningMandatorySetupNotComplete=Click here to setup mandatory parameters
 WarningEnableYourModulesApplications=Click here to enable your modules and applications
diff --git a/htdocs/langs/uk_UA/main.lang b/htdocs/langs/uk_UA/main.lang
index 609709def1b..a0ffc3aa9c2 100644
--- a/htdocs/langs/uk_UA/main.lang
+++ b/htdocs/langs/uk_UA/main.lang
@@ -445,6 +445,7 @@ ContactsAddressesForCompany=Contacts/addresses for this third party
 AddressesForCompany=Addresses for this third party
 ActionsOnCompany=Events for this third party
 ActionsOnContact=Events for this contact/address
+ActionsOnContract=Events for this contract
 ActionsOnMember=Events about this member
 ActionsOnProduct=Events about this product
 NActionsLate=%s late
@@ -759,6 +760,7 @@ LinkToSupplierProposal=Link to vendor proposal
 LinkToSupplierInvoice=Link to vendor invoice
 LinkToContract=Link to contract
 LinkToIntervention=Link to intervention
+LinkToTicket=Link to ticket
 CreateDraft=Create draft
 SetToDraft=Back to draft
 ClickToEdit=Click to edit
diff --git a/htdocs/langs/uk_UA/products.lang b/htdocs/langs/uk_UA/products.lang
index f57c6b76c36..b358dc16410 100644
--- a/htdocs/langs/uk_UA/products.lang
+++ b/htdocs/langs/uk_UA/products.lang
@@ -2,6 +2,7 @@
 ProductRef=Product ref.
 ProductLabel=Product label
 ProductLabelTranslated=Translated product label
+ProductDescription=Product description
 ProductDescriptionTranslated=Translated product description
 ProductNoteTranslated=Translated product note
 ProductServiceCard=Products/Services card
diff --git a/htdocs/langs/uk_UA/stripe.lang b/htdocs/langs/uk_UA/stripe.lang
index 7a3389f34b7..c5224982873 100644
--- a/htdocs/langs/uk_UA/stripe.lang
+++ b/htdocs/langs/uk_UA/stripe.lang
@@ -65,3 +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>
diff --git a/htdocs/langs/uk_UA/withdrawals.lang b/htdocs/langs/uk_UA/withdrawals.lang
index cbca2b2f103..88e5eaf128c 100644
--- a/htdocs/langs/uk_UA/withdrawals.lang
+++ b/htdocs/langs/uk_UA/withdrawals.lang
@@ -76,7 +76,8 @@ WithdrawalFile=Withdrawal file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and will classify them as "Paid" if remain to pay is null
 StatisticsByLineStatus=Statistics by status of lines
-RUM=UMR
+RUM=Unique Mandate Reference (UMR)
+DateRUM=Mandate signature date
 RUMLong=Unique Mandate Reference
 RUMWillBeGenerated=If empty, a UMR (Unique Mandate Reference) will be generated once the bank account information is saved.
 WithdrawMode=Direct debit mode (FRST or RECUR)
diff --git a/htdocs/langs/uz_UZ/accountancy.lang b/htdocs/langs/uz_UZ/accountancy.lang
index 758d9c340a5..1fc3b3e05ec 100644
--- a/htdocs/langs/uz_UZ/accountancy.lang
+++ b/htdocs/langs/uz_UZ/accountancy.lang
@@ -265,7 +265,7 @@ AccountingJournals=Accounting journals
 AccountingJournal=Accounting journal
 NewAccountingJournal=New accounting journal
 ShowAccoutingJournal=Show accounting journal
-Nature=Nature
+NatureOfJournal=Nature of Journal
 AccountingJournalType1=Miscellaneous operations
 AccountingJournalType2=Sales
 AccountingJournalType3=Purchases
@@ -291,6 +291,7 @@ Modelcsv_quadratus=Export for Quadratus QuadraCompta
 Modelcsv_ebp=Export for EBP
 Modelcsv_cogilog=Export for Cogilog
 Modelcsv_agiris=Export for Agiris
+Modelcsv_LDCompta=Export for LD Compta (v9 & higher) (Test)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
@@ -301,7 +302,7 @@ ChartofaccountsId=Chart of accounts Id
 InitAccountancy=Init accountancy
 InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accounting account defined for sales and purchases.
 DefaultBindingDesc=This page can be used to set a default account to use to link transactions record about payment salaries, donation, taxes and vat when no specific accounting account were already set.
-DefaultClosureDesc=This page can be used to set parameters to use to enclose a balance sheet.
+DefaultClosureDesc=This page can be used to set parameters used for accounting closures.
 Options=Options
 OptionModeProductSell=Mode sales
 OptionModeProductSellIntra=Mode sales exported in EEC
diff --git a/htdocs/langs/uz_UZ/admin.lang b/htdocs/langs/uz_UZ/admin.lang
index f30d6edd9f7..2e27c6fe81f 100644
--- a/htdocs/langs/uz_UZ/admin.lang
+++ b/htdocs/langs/uz_UZ/admin.lang
@@ -574,7 +574,7 @@ Module510Name=Salaries
 Module510Desc=Record and track employee payments
 Module520Name=Loans
 Module520Desc=Management of loans
-Module600Name=Notifications
+Module600Name=Notifications on business event
 Module600Desc=Send email notifications triggered by a business event: per user (setup defined on each user), per third-party contacts (setup defined on each third party) or by specific emails
 Module600Long=Note that this module sends emails in real-time when a specific business event occurs. If you are looking for a feature to send email reminders for agenda events, go into the setup of module Agenda.
 Module610Name=Product Variants
@@ -1193,6 +1193,7 @@ ExtraFieldsSupplierOrders=Complementary attributes (orders)
 ExtraFieldsSupplierInvoices=Complementary attributes (invoices)
 ExtraFieldsProject=Complementary attributes (projects)
 ExtraFieldsProjectTask=Complementary attributes (tasks)
+ExtraFieldsSalaries=Complementary attributes (salaries)
 ExtraFieldHasWrongValue=Attribute %s has a wrong value.
 AlphaNumOnlyLowerCharsAndNoSpace=only alphanumericals and lower case characters without space
 SendmailOptionNotComplete=Warning, on some Linux systems, to send email from your email, sendmail execution setup must contains option -ba (parameter mail.force_extra_parameters into your php.ini file). If some recipients never receive emails, try to edit this PHP parameter with mail.force_extra_parameters = -ba).
@@ -1220,13 +1221,14 @@ SuhosinSessionEncrypt=Session storage encrypted by Suhosin
 ConditionIsCurrently=Condition is currently %s
 YouUseBestDriver=You use driver %s which is the best driver currently available.
 YouDoNotUseBestDriver=You use driver %s but driver %s is recommended.
-NbOfProductIsLowerThanNoPb=You have only %s products/services in the database. This does not require any particular optimization.
+NbOfObjectIsLowerThanNoPb=You have only %s %s in the database. This does not require any particular optimization.
 SearchOptim=Search optimization
-YouHaveXProductUseSearchOptim=You have %s products in the database. You should add the constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+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.
 BrowserIsOK=You are using the %s web browser. This browser is ok for security and performance.
 BrowserIsKO=You are using the %s web browser. This browser is known to be a bad choice for security, performance and reliability. We recommend using Firefox, Chrome, Opera or Safari.
-XDebugInstalled=XDebug is loaded.
-XCacheInstalled=XCache is loaded.
+PHPModuleLoaded=PHP component %s is loaded
+PreloadOPCode=Preloaded OPCode is used
 AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.<br>Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp".
 AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".
 AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties.
@@ -1734,9 +1736,9 @@ ExpenseReportsRulesSetup=Setup of module Expense Reports - Rules
 ExpenseReportNumberingModules=Expense reports numbering module
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
 YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for email notifications by enabling and configuring the module "Notification".
-ListOfNotificationsPerUser=List of notifications per user*
-ListOfNotificationsPerUserOrContact=List of notifications (events) available per user* or per contact**
-ListOfFixedNotifications=List of Fixed Notifications
+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
 GoOntoUserCardToAddMore=Go to the tab "Notifications" of a user to add or remove notifications for users
 GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
 Threshold=Threshold
@@ -1898,6 +1900,11 @@ OnMobileOnly=On small screen (smartphone) only
 DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be Prospect or Customer but can't be both)
 MAIN_OPTIMIZEFORTEXTBROWSER=Simplify interface for blind person
 MAIN_OPTIMIZEFORTEXTBROWSERDesc=Enable this option if you are a blind person, or if you use the application from a text browser like Lynx or 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
 ThisValueCanOverwrittenOnUserLevel=This value can be overwritten by each user from its user page - tab '%s'
 DefaultCustomerType=Default thirdparty type for "New customer" creation form
 ABankAccountMustBeDefinedOnPaymentModeSetup=Note: The bank account must be defined on the module of each payment mode (Paypal, Stripe, ...) to have this feature working.
@@ -1911,7 +1918,7 @@ LogsLinesNumber=Number of lines to show on logs tab
 UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
-DebugBarModuleActivated=Module debugbar is activated and slows dramaticaly the interface
+ModuleActivated=Module %s is activated and slows the interface
 EXPORTS_SHARE_MODELS=Export models are share with everybody
 ExportSetup=Setup of module Export
 InstanceUniqueID=Unique ID of the instance
@@ -1928,3 +1935,5 @@ 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
diff --git a/htdocs/langs/uz_UZ/bills.lang b/htdocs/langs/uz_UZ/bills.lang
index 4f114d4df1c..53535e58b46 100644
--- a/htdocs/langs/uz_UZ/bills.lang
+++ b/htdocs/langs/uz_UZ/bills.lang
@@ -95,6 +95,7 @@ PaymentHigherThanReminderToPay=Payment higher than reminder to pay
 HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess received for each overpaid invoice.
 HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess paid for each overpaid invoice.
 ClassifyPaid=Classify 'Paid'
+ClassifyUnPaid=Classify 'Unpaid'
 ClassifyPaidPartially=Classify 'Paid partially'
 ClassifyCanceled=Classify 'Abandoned'
 ClassifyClosed=Classify 'Closed'
@@ -214,6 +215,20 @@ ShowInvoiceReplace=Show replacing invoice
 ShowInvoiceAvoir=Show credit note
 ShowInvoiceDeposit=Show down payment invoice
 ShowInvoiceSituation=Show situation invoice
+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
 ShowPayment=Show payment
 AlreadyPaid=Already paid
 AlreadyPaidBack=Already paid back
diff --git a/htdocs/langs/uz_UZ/errors.lang b/htdocs/langs/uz_UZ/errors.lang
index b5a9d70cb70..1ee46fdbb92 100644
--- a/htdocs/langs/uz_UZ/errors.lang
+++ b/htdocs/langs/uz_UZ/errors.lang
@@ -90,7 +90,7 @@ ErrorSpecialCharNotAllowedForField=Special characters are not allowed for field
 ErrorNumRefModel=A reference exists into database (%s) and is not compatible with this numbering rule. Remove record or renamed reference to activate this module.
 ErrorQtyTooLowForThisSupplier=Quantity too low for this vendor or no price defined on this product for this vendor
 ErrorOrdersNotCreatedQtyTooLow=Some orders haven't been created because of too-low quantities
-ErrorModuleSetupNotComplete=Setup of module looks to be uncomplete. Go on Home - Setup - Modules to complete.
+ErrorModuleSetupNotComplete=Setup of module %s looks to be uncomplete. Go on Home - Setup - Modules to complete.
 ErrorBadMask=Error on mask
 ErrorBadMaskFailedToLocatePosOfSequence=Error, mask without sequence number
 ErrorBadMaskBadRazMonth=Error, bad reset value
@@ -219,6 +219,7 @@ 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.
 # 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.
 WarningMandatorySetupNotComplete=Click here to setup mandatory parameters
 WarningEnableYourModulesApplications=Click here to enable your modules and applications
diff --git a/htdocs/langs/uz_UZ/main.lang b/htdocs/langs/uz_UZ/main.lang
index c9487388ab3..d578c882ad5 100644
--- a/htdocs/langs/uz_UZ/main.lang
+++ b/htdocs/langs/uz_UZ/main.lang
@@ -445,6 +445,7 @@ ContactsAddressesForCompany=Contacts/addresses for this third party
 AddressesForCompany=Addresses for this third party
 ActionsOnCompany=Events for this third party
 ActionsOnContact=Events for this contact/address
+ActionsOnContract=Events for this contract
 ActionsOnMember=Events about this member
 ActionsOnProduct=Events about this product
 NActionsLate=%s late
@@ -759,6 +760,7 @@ LinkToSupplierProposal=Link to vendor proposal
 LinkToSupplierInvoice=Link to vendor invoice
 LinkToContract=Link to contract
 LinkToIntervention=Link to intervention
+LinkToTicket=Link to ticket
 CreateDraft=Create draft
 SetToDraft=Back to draft
 ClickToEdit=Click to edit
diff --git a/htdocs/langs/uz_UZ/products.lang b/htdocs/langs/uz_UZ/products.lang
index 7b68f5b3ebd..73e672284de 100644
--- a/htdocs/langs/uz_UZ/products.lang
+++ b/htdocs/langs/uz_UZ/products.lang
@@ -2,6 +2,7 @@
 ProductRef=Product ref.
 ProductLabel=Product label
 ProductLabelTranslated=Translated product label
+ProductDescription=Product description
 ProductDescriptionTranslated=Translated product description
 ProductNoteTranslated=Translated product note
 ProductServiceCard=Products/Services card
diff --git a/htdocs/langs/uz_UZ/withdrawals.lang b/htdocs/langs/uz_UZ/withdrawals.lang
index cbca2b2f103..88e5eaf128c 100644
--- a/htdocs/langs/uz_UZ/withdrawals.lang
+++ b/htdocs/langs/uz_UZ/withdrawals.lang
@@ -76,7 +76,8 @@ WithdrawalFile=Withdrawal file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and will classify them as "Paid" if remain to pay is null
 StatisticsByLineStatus=Statistics by status of lines
-RUM=UMR
+RUM=Unique Mandate Reference (UMR)
+DateRUM=Mandate signature date
 RUMLong=Unique Mandate Reference
 RUMWillBeGenerated=If empty, a UMR (Unique Mandate Reference) will be generated once the bank account information is saved.
 WithdrawMode=Direct debit mode (FRST or RECUR)
diff --git a/htdocs/langs/vi_VN/accountancy.lang b/htdocs/langs/vi_VN/accountancy.lang
index 68b3358d211..56aecdb1bbf 100644
--- a/htdocs/langs/vi_VN/accountancy.lang
+++ b/htdocs/langs/vi_VN/accountancy.lang
@@ -265,7 +265,7 @@ AccountingJournals=Accounting journals
 AccountingJournal=Accounting journal
 NewAccountingJournal=New accounting journal
 ShowAccoutingJournal=Show accounting journal
-Nature=Tự nhiên
+NatureOfJournal=Nature of Journal
 AccountingJournalType1=Miscellaneous operations
 AccountingJournalType2=Bán
 AccountingJournalType3=Mua
@@ -291,6 +291,7 @@ Modelcsv_quadratus=Export for Quadratus QuadraCompta
 Modelcsv_ebp=Export for EBP
 Modelcsv_cogilog=Export for Cogilog
 Modelcsv_agiris=Export for Agiris
+Modelcsv_LDCompta=Export for LD Compta (v9 & higher) (Test)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
@@ -301,7 +302,7 @@ ChartofaccountsId=Chart of accounts Id
 InitAccountancy=Init accountancy
 InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accounting account defined for sales and purchases.
 DefaultBindingDesc=This page can be used to set a default account to use to link transactions record about payment salaries, donation, taxes and vat when no specific accounting account were already set.
-DefaultClosureDesc=This page can be used to set parameters to use to enclose a balance sheet.
+DefaultClosureDesc=This page can be used to set parameters used for accounting closures.
 Options=Options
 OptionModeProductSell=Mode sales
 OptionModeProductSellIntra=Mode sales exported in EEC
diff --git a/htdocs/langs/vi_VN/admin.lang b/htdocs/langs/vi_VN/admin.lang
index 634eb06628e..ecc0d998ca1 100644
--- a/htdocs/langs/vi_VN/admin.lang
+++ b/htdocs/langs/vi_VN/admin.lang
@@ -574,7 +574,7 @@ Module510Name=Lương
 Module510Desc=Record and track employee payments
 Module520Name=Cho vay
 Module520Desc=Quản lý cho vay
-Module600Name=Thông báo
+Module600Name=Notifications on business event
 Module600Desc=Send email notifications triggered by a business event: per user (setup defined on each user), per third-party contacts (setup defined on each third party) or by specific emails
 Module600Long=Note that this module sends emails in real-time when a specific business event occurs. If you are looking for a feature to send email reminders for agenda events, go into the setup of module Agenda.
 Module610Name=Product Variants
@@ -1193,6 +1193,7 @@ ExtraFieldsSupplierOrders=Thuộc tính bổ sung (đơn hàng)
 ExtraFieldsSupplierInvoices=Thuộc tính bổ sung (hoá đơn)
 ExtraFieldsProject=Thuộc tính bổ sung (dự án)
 ExtraFieldsProjectTask=Thuộc tính bổ sung (nhiệm vụ)
+ExtraFieldsSalaries=Complementary attributes (salaries)
 ExtraFieldHasWrongValue=Thuộc tính %s có giá trị sai.
 AlphaNumOnlyLowerCharsAndNoSpace=only alphanumericals and lower case characters without space
 SendmailOptionNotComplete=Warning, on some Linux systems, to send email from your email, sendmail execution setup must contains option -ba (parameter mail.force_extra_parameters into your php.ini file). If some recipients never receive emails, try to edit this PHP parameter with mail.force_extra_parameters = -ba).
@@ -1220,13 +1221,14 @@ SuhosinSessionEncrypt=Session storage encrypted by Suhosin
 ConditionIsCurrently=Điều kiện là hiện tại %s
 YouUseBestDriver=You use driver %s which is the best driver currently available.
 YouDoNotUseBestDriver=You use driver %s but driver %s is recommended.
-NbOfProductIsLowerThanNoPb=You have only %s products/services in the database. This does not require any particular optimization.
+NbOfObjectIsLowerThanNoPb=You have only %s %s in the database. This does not require any particular optimization.
 SearchOptim=Tối ưu hóa tìm kiếm
-YouHaveXProductUseSearchOptim=You have %s products in the database. You should add the constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+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.
 BrowserIsOK=You are using the %s web browser. This browser is ok for security and performance.
 BrowserIsKO=You are using the %s web browser. This browser is known to be a bad choice for security, performance and reliability. We recommend using Firefox, Chrome, Opera or Safari.
-XDebugInstalled=XDebug is loaded.
-XCacheInstalled=XCache is loaded.
+PHPModuleLoaded=PHP component %s is loaded
+PreloadOPCode=Preloaded OPCode is used
 AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.<br>Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp".
 AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".
 AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties.
@@ -1734,9 +1736,9 @@ ExpenseReportsRulesSetup=Setup of module Expense Reports - Rules
 ExpenseReportNumberingModules=Expense reports numbering module
 NoModueToManageStockIncrease=Không có module có thể quản lý tăng tồn kho được kích hoạt. Tăng tồn kho sẽ chỉ được thực hiện thủ công.
 YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for email notifications by enabling and configuring the module "Notification".
-ListOfNotificationsPerUser=List of notifications per user*
-ListOfNotificationsPerUserOrContact=List of notifications (events) available per user* or per contact**
-ListOfFixedNotifications=List of Fixed Notifications
+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
 GoOntoUserCardToAddMore=Go to the tab "Notifications" of a user to add or remove notifications for users
 GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
 Threshold=Threshold
@@ -1898,6 +1900,11 @@ OnMobileOnly=On small screen (smartphone) only
 DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be Prospect or Customer but can't be both)
 MAIN_OPTIMIZEFORTEXTBROWSER=Simplify interface for blind person
 MAIN_OPTIMIZEFORTEXTBROWSERDesc=Enable this option if you are a blind person, or if you use the application from a text browser like Lynx or 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
 ThisValueCanOverwrittenOnUserLevel=This value can be overwritten by each user from its user page - tab '%s'
 DefaultCustomerType=Default thirdparty type for "New customer" creation form
 ABankAccountMustBeDefinedOnPaymentModeSetup=Note: The bank account must be defined on the module of each payment mode (Paypal, Stripe, ...) to have this feature working.
@@ -1911,7 +1918,7 @@ LogsLinesNumber=Number of lines to show on logs tab
 UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
-DebugBarModuleActivated=Module debugbar is activated and slows dramaticaly the interface
+ModuleActivated=Module %s is activated and slows the interface
 EXPORTS_SHARE_MODELS=Export models are share with everybody
 ExportSetup=Setup of module Export
 InstanceUniqueID=Unique ID of the instance
@@ -1928,3 +1935,5 @@ 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
diff --git a/htdocs/langs/vi_VN/bills.lang b/htdocs/langs/vi_VN/bills.lang
index d04d4324fcd..e2b2a11cbee 100644
--- a/htdocs/langs/vi_VN/bills.lang
+++ b/htdocs/langs/vi_VN/bills.lang
@@ -95,6 +95,7 @@ PaymentHigherThanReminderToPay=Thanh toán cao hơn so với đề nghị trả
 HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess received for each overpaid invoice.
 HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess paid for each overpaid invoice.
 ClassifyPaid=Phân loại 'Đã trả'
+ClassifyUnPaid=Classify 'Unpaid'
 ClassifyPaidPartially=Phân loại 'Đã trả một phần'
 ClassifyCanceled=Phân loại 'Đã loại bỏ'
 ClassifyClosed=Phân loại 'Đã đóng'
@@ -214,6 +215,20 @@ ShowInvoiceReplace=Hiển thị hóa đơn thay thế
 ShowInvoiceAvoir=Xem giấy báo có
 ShowInvoiceDeposit=Show down payment invoice
 ShowInvoiceSituation=Xem hóa đơn tình huống
+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
 ShowPayment=Hiển thị thanh toán
 AlreadyPaid=Đã trả
 AlreadyPaidBack=Đã trả lại
diff --git a/htdocs/langs/vi_VN/errors.lang b/htdocs/langs/vi_VN/errors.lang
index dd27b05a079..dcfe5118f12 100644
--- a/htdocs/langs/vi_VN/errors.lang
+++ b/htdocs/langs/vi_VN/errors.lang
@@ -90,7 +90,7 @@ ErrorSpecialCharNotAllowedForField=Ký tự đặc biệt không được phép
 ErrorNumRefModel=Một tham chiếu tồn tại vào cơ sở dữ liệu (% s) và không tương thích với quy tắc đánh số này. Di chuyển hồ sơ hoặc tài liệu tham khảo đổi tên để kích hoạt module này.
 ErrorQtyTooLowForThisSupplier=Quantity too low for this vendor or no price defined on this product for this vendor
 ErrorOrdersNotCreatedQtyTooLow=Some orders haven't been created because of too-low quantities
-ErrorModuleSetupNotComplete=Setup of module looks to be uncomplete. Go on Home - Setup - Modules to complete.
+ErrorModuleSetupNotComplete=Setup of module %s looks to be uncomplete. Go on Home - Setup - Modules to complete.
 ErrorBadMask=Lỗi trên mặt nạ
 ErrorBadMaskFailedToLocatePosOfSequence=Lỗi, mặt nạ mà không có số thứ tự
 ErrorBadMaskBadRazMonth=Lỗi, giá trị thiết lập lại xấu
@@ -219,6 +219,7 @@ 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.
 # 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.
 WarningMandatorySetupNotComplete=Click here to setup mandatory parameters
 WarningEnableYourModulesApplications=Click here to enable your modules and applications
diff --git a/htdocs/langs/vi_VN/main.lang b/htdocs/langs/vi_VN/main.lang
index 145e971080c..825708ec534 100644
--- a/htdocs/langs/vi_VN/main.lang
+++ b/htdocs/langs/vi_VN/main.lang
@@ -445,6 +445,7 @@ ContactsAddressesForCompany=Liên lạc/địa chỉ cho bên thứ ba này
 AddressesForCompany=Địa chỉ cho bên thứ ba này
 ActionsOnCompany=Events for this third party
 ActionsOnContact=Events for this contact/address
+ActionsOnContract=Events for this contract
 ActionsOnMember=Sự kiện về thành viên này
 ActionsOnProduct=Events about this product
 NActionsLate=%s cuối
@@ -759,6 +760,7 @@ LinkToSupplierProposal=Link to vendor proposal
 LinkToSupplierInvoice=Link to vendor invoice
 LinkToContract=Link to contract
 LinkToIntervention=Link to intervention
+LinkToTicket=Link to ticket
 CreateDraft=Tạo dự thảo
 SetToDraft=Trở về dự thảo
 ClickToEdit=Nhấn vào để sửa
diff --git a/htdocs/langs/vi_VN/products.lang b/htdocs/langs/vi_VN/products.lang
index 48b032f77fc..84be0e8db9e 100644
--- a/htdocs/langs/vi_VN/products.lang
+++ b/htdocs/langs/vi_VN/products.lang
@@ -2,6 +2,7 @@
 ProductRef=Tham chiếu sản phẩm.
 ProductLabel=Nhãn sản phẩm
 ProductLabelTranslated=Nhãn sản phẩm đã dịch
+ProductDescription=Product description
 ProductDescriptionTranslated=Mô tả sản phẩm đã dịch
 ProductNoteTranslated=Ghi chú sản phẩm đã dịch
 ProductServiceCard=Thẻ Sản phẩm/Dịch vụ
diff --git a/htdocs/langs/vi_VN/stripe.lang b/htdocs/langs/vi_VN/stripe.lang
index 6c47d33cb8b..77337d06301 100644
--- a/htdocs/langs/vi_VN/stripe.lang
+++ b/htdocs/langs/vi_VN/stripe.lang
@@ -65,3 +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>
diff --git a/htdocs/langs/vi_VN/withdrawals.lang b/htdocs/langs/vi_VN/withdrawals.lang
index 43a21ea82c2..9aa1a1d441c 100644
--- a/htdocs/langs/vi_VN/withdrawals.lang
+++ b/htdocs/langs/vi_VN/withdrawals.lang
@@ -76,7 +76,8 @@ WithdrawalFile=Thu hồi tập tin
 SetToStatusSent=Thiết lập để tình trạng "File gửi"
 ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and will classify them as "Paid" if remain to pay is null
 StatisticsByLineStatus=Statistics by status of lines
-RUM=UMR
+RUM=Unique Mandate Reference (UMR)
+DateRUM=Mandate signature date
 RUMLong=Unique Mandate Reference
 RUMWillBeGenerated=If empty, a UMR (Unique Mandate Reference) will be generated once the bank account information is saved.
 WithdrawMode=Direct debit mode (FRST or RECUR)
diff --git a/htdocs/langs/zh_CN/accountancy.lang b/htdocs/langs/zh_CN/accountancy.lang
index 1d3e23e0f66..75b91959f8d 100644
--- a/htdocs/langs/zh_CN/accountancy.lang
+++ b/htdocs/langs/zh_CN/accountancy.lang
@@ -265,7 +265,7 @@ AccountingJournals=会计日常报表
 AccountingJournal=会计日常报表
 NewAccountingJournal=新建会计日常报表
 ShowAccoutingJournal=显示会计日常报表
-Nature=属性
+NatureOfJournal=Nature of Journal
 AccountingJournalType1=杂项业务
 AccountingJournalType2=销售
 AccountingJournalType3=采购
@@ -291,6 +291,7 @@ Modelcsv_quadratus=Export for Quadratus QuadraCompta
 Modelcsv_ebp=Export for EBP
 Modelcsv_cogilog=Export for Cogilog
 Modelcsv_agiris=Export for Agiris
+Modelcsv_LDCompta=Export for LD Compta (v9 & higher) (Test)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=导出CSV可配置
 Modelcsv_FEC=Export FEC
@@ -301,7 +302,7 @@ ChartofaccountsId=会计科目表ID
 InitAccountancy=初始化会计
 InitAccountancyDesc=此页面可用于初始化没有为销售和购买定义的会计科目的产品和服务的会计科目。
 DefaultBindingDesc=此页面可用于设置默认帐户，用于在未设置特定会计帐户时链接有关付款工资，捐款，税金和增值税的交易记录。
-DefaultClosureDesc=This page can be used to set parameters to use to enclose a balance sheet.
+DefaultClosureDesc=This page can be used to set parameters used for accounting closures.
 Options=选项
 OptionModeProductSell=销售模式
 OptionModeProductSellIntra=Mode sales exported in EEC
diff --git a/htdocs/langs/zh_CN/admin.lang b/htdocs/langs/zh_CN/admin.lang
index 93299ace4fa..01524a3067f 100644
--- a/htdocs/langs/zh_CN/admin.lang
+++ b/htdocs/langs/zh_CN/admin.lang
@@ -574,7 +574,7 @@ Module510Name=工资
 Module510Desc=Record and track employee payments
 Module520Name=贷款
 Module520Desc=贷款管理模块
-Module600Name=通知
+Module600Name=Notifications on business event
 Module600Desc=Send email notifications triggered by a business event: per user (setup defined on each user), per third-party contacts (setup defined on each third party) or by specific emails
 Module600Long=Note that this module sends emails in real-time when a specific business event occurs. If you are looking for a feature to send email reminders for agenda events, go into the setup of module Agenda.
 Module610Name=产品变体
@@ -1193,6 +1193,7 @@ ExtraFieldsSupplierOrders=自定义属性 (订单)
 ExtraFieldsSupplierInvoices=自定义属性 (账单)
 ExtraFieldsProject=自定义属性 (项目)
 ExtraFieldsProjectTask=自定义属性 (任务)
+ExtraFieldsSalaries=Complementary attributes (salaries)
 ExtraFieldHasWrongValue=属性 %s 有一个错误的值。
 AlphaNumOnlyLowerCharsAndNoSpace=仅限英文大小写字母不含空格
 SendmailOptionNotComplete=警告，在某些Linux系统上，要从您的电子邮件发送电子邮件，sendmail执行设置必须包含选项-ba（参数mail.force_extra_parameters到您的php.ini文件中）。如果某些收件人从未收到电子邮件，请尝试使用mail.force_extra_parameters = -ba编辑此PHP参数。
@@ -1220,13 +1221,14 @@ SuhosinSessionEncrypt=会话存储空间已用 Suhosin 加密
 ConditionIsCurrently=当前条件为 %s
 YouUseBestDriver=You use driver %s which is the best driver currently available.
 YouDoNotUseBestDriver=You use driver %s but driver %s is recommended.
-NbOfProductIsLowerThanNoPb=You have only %s products/services in the database. This does not require any particular optimization.
+NbOfObjectIsLowerThanNoPb=You have only %s %s in the database. This does not require any particular optimization.
 SearchOptim=搜索优化
-YouHaveXProductUseSearchOptim=You have %s products in the database. You should add the constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+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.
 BrowserIsOK=You are using the %s web browser. This browser is ok for security and performance.
 BrowserIsKO=You are using the %s web browser. This browser is known to be a bad choice for security, performance and reliability. We recommend using Firefox, Chrome, Opera or Safari.
-XDebugInstalled=XDebug 已经加载。
-XCacheInstalled=XCache已经加载。
+PHPModuleLoaded=PHP component %s is loaded
+PreloadOPCode=Preloaded OPCode is used
 AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.<br>Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp".
 AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".
 AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties.
@@ -1734,9 +1736,9 @@ ExpenseReportsRulesSetup=模块费用报告的设置 - 规则
 ExpenseReportNumberingModules=费用报告编号模块
 NoModueToManageStockIncrease=没有能够管理自动库存增加的模块已被激活。库存增加仅在手动输入时完成。
 YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for email notifications by enabling and configuring the module "Notification".
-ListOfNotificationsPerUser=每个用户的通知列表*
-ListOfNotificationsPerUserOrContact=List of notifications (events) available per user* or per contact**
-ListOfFixedNotifications=List of Fixed Notifications
+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
 GoOntoUserCardToAddMore=Go to the tab "Notifications" of a user to add or remove notifications for users
 GoOntoContactCardToAddMore=转到合作方的“通知”标签，添加或删除联系人/地址的通知
 Threshold=阈值
@@ -1898,6 +1900,11 @@ OnMobileOnly=On small screen (smartphone) only
 DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be Prospect or Customer but can't be both)
 MAIN_OPTIMIZEFORTEXTBROWSER=Simplify interface for blind person
 MAIN_OPTIMIZEFORTEXTBROWSERDesc=Enable this option if you are a blind person, or if you use the application from a text browser like Lynx or 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
 ThisValueCanOverwrittenOnUserLevel=This value can be overwritten by each user from its user page - tab '%s'
 DefaultCustomerType=Default thirdparty type for "New customer" creation form
 ABankAccountMustBeDefinedOnPaymentModeSetup=Note: The bank account must be defined on the module of each payment mode (Paypal, Stripe, ...) to have this feature working.
@@ -1911,7 +1918,7 @@ LogsLinesNumber=Number of lines to show on logs tab
 UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
-DebugBarModuleActivated=Module debugbar is activated and slows dramaticaly the interface
+ModuleActivated=Module %s is activated and slows the interface
 EXPORTS_SHARE_MODELS=Export models are share with everybody
 ExportSetup=Setup of module Export
 InstanceUniqueID=Unique ID of the instance
@@ -1928,3 +1935,5 @@ 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
diff --git a/htdocs/langs/zh_CN/bills.lang b/htdocs/langs/zh_CN/bills.lang
index f4dd4ef5c4e..4ae6ac4679b 100644
--- a/htdocs/langs/zh_CN/bills.lang
+++ b/htdocs/langs/zh_CN/bills.lang
@@ -95,6 +95,7 @@ PaymentHigherThanReminderToPay=付款金额比需要支付的金额高
 HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess received for each overpaid invoice.
 HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess paid for each overpaid invoice.
 ClassifyPaid=归类为 已支付
+ClassifyUnPaid=Classify 'Unpaid'
 ClassifyPaidPartially=归类分 部分支付
 ClassifyCanceled=归类为 已丢弃
 ClassifyClosed=归类为 已关闭
@@ -214,6 +215,20 @@ ShowInvoiceReplace=显示替换发票
 ShowInvoiceAvoir=显示信用记录
 ShowInvoiceDeposit=显示付款发票
 ShowInvoiceSituation=显示情况发票
+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
 ShowPayment=显示支付
 AlreadyPaid=已支付
 AlreadyPaidBack=已支付
diff --git a/htdocs/langs/zh_CN/errors.lang b/htdocs/langs/zh_CN/errors.lang
index 6e232a35a83..d2c54579d93 100644
--- a/htdocs/langs/zh_CN/errors.lang
+++ b/htdocs/langs/zh_CN/errors.lang
@@ -90,7 +90,7 @@ ErrorSpecialCharNotAllowedForField=特殊字符不为外地允许“%s的”
 ErrorNumRefModel=存在一个引用（%s）和编号是不符合本规则兼容到数据库。记录中删除或重命名参考激活此模块。
 ErrorQtyTooLowForThisSupplier=Quantity too low for this vendor or no price defined on this product for this vendor
 ErrorOrdersNotCreatedQtyTooLow=Some orders haven't been created because of too-low quantities
-ErrorModuleSetupNotComplete=模块设置看起来未完成设置。请到 主页->设置->模块菜单 完成模块的设置。
+ErrorModuleSetupNotComplete=Setup of module %s looks to be uncomplete. Go on Home - Setup - Modules to complete.
 ErrorBadMask=在面具的错误
 ErrorBadMaskFailedToLocatePosOfSequence=没有序列号错误，面具
 ErrorBadMaskBadRazMonth=错误，坏的复位值
@@ -219,6 +219,7 @@ 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.
 # 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。它可以由外部模块/接口使用，但如果您不需要为成员定义任何登录名或密码，则可以从成员模块设置中禁用“管理每个成员的登录名”选项。如果您需要管理登录但不需要任何密码，则可以将此字段保留为空以避免此警告。注意：如果成员链接到用户，则电子邮件也可用作登录。
 WarningMandatorySetupNotComplete=Click here to setup mandatory parameters
 WarningEnableYourModulesApplications=Click here to enable your modules and applications
diff --git a/htdocs/langs/zh_CN/main.lang b/htdocs/langs/zh_CN/main.lang
index f7f6a58e93c..3197d345e98 100644
--- a/htdocs/langs/zh_CN/main.lang
+++ b/htdocs/langs/zh_CN/main.lang
@@ -445,6 +445,7 @@ ContactsAddressesForCompany=这个合伙人联系人/地址
 AddressesForCompany=这个合伙人的地址
 ActionsOnCompany=Events for this third party
 ActionsOnContact=Events for this contact/address
+ActionsOnContract=Events for this contract
 ActionsOnMember=有关此会员的事件
 ActionsOnProduct=有关此产品的事件
 NActionsLate=逾期 %s
@@ -759,6 +760,7 @@ LinkToSupplierProposal=Link to vendor proposal
 LinkToSupplierInvoice=Link to vendor invoice
 LinkToContract=链接到联系人
 LinkToIntervention=链接到干预
+LinkToTicket=Link to ticket
 CreateDraft=创建草稿
 SetToDraft=返回草稿
 ClickToEdit=单击“编辑”
diff --git a/htdocs/langs/zh_CN/products.lang b/htdocs/langs/zh_CN/products.lang
index a1323c8069d..e10aeb3b1b4 100644
--- a/htdocs/langs/zh_CN/products.lang
+++ b/htdocs/langs/zh_CN/products.lang
@@ -2,6 +2,7 @@
 ProductRef=产品编号
 ProductLabel=产品名称
 ProductLabelTranslated=产品标签已翻译
+ProductDescription=Product description
 ProductDescriptionTranslated=产品描述已翻译
 ProductNoteTranslated=产品备注已翻译
 ProductServiceCard=产品/服务 信息卡
diff --git a/htdocs/langs/zh_CN/stripe.lang b/htdocs/langs/zh_CN/stripe.lang
index d239c1fb8bd..c884648b05d 100644
--- a/htdocs/langs/zh_CN/stripe.lang
+++ b/htdocs/langs/zh_CN/stripe.lang
@@ -65,3 +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>
diff --git a/htdocs/langs/zh_CN/withdrawals.lang b/htdocs/langs/zh_CN/withdrawals.lang
index 83c38178b4b..1ccec37cfe1 100644
--- a/htdocs/langs/zh_CN/withdrawals.lang
+++ b/htdocs/langs/zh_CN/withdrawals.lang
@@ -76,7 +76,8 @@ WithdrawalFile=撤回文件
 SetToStatusSent=设置状态“发送的文件”
 ThisWillAlsoAddPaymentOnInvoice=这还将记录付款到发票，并将其分类为“付费”，如果仍然支付是空的
 StatisticsByLineStatus=按状态明细统计
-RUM=UMR
+RUM=Unique Mandate Reference (UMR)
+DateRUM=Mandate signature date
 RUMLong=唯一授权参考
 RUMWillBeGenerated=If empty, a UMR (Unique Mandate Reference) will be generated once the bank account information is saved.
 WithdrawMode=直接付款模式（FRST或RECUR）
diff --git a/htdocs/langs/zh_TW/accountancy.lang b/htdocs/langs/zh_TW/accountancy.lang
index 97893293e5c..17dcd2accc4 100644
--- a/htdocs/langs/zh_TW/accountancy.lang
+++ b/htdocs/langs/zh_TW/accountancy.lang
@@ -265,7 +265,7 @@ AccountingJournals=各式會計日記簿
 AccountingJournal=會計日記簿
 NewAccountingJournal=新會計日記簿
 ShowAccoutingJournal=顯示會計日記簿
-Nature=性質
+NatureOfJournal=Nature of Journal
 AccountingJournalType1=雜項操作
 AccountingJournalType2=各式銷貨
 AccountingJournalType3=各式採購
@@ -291,6 +291,7 @@ Modelcsv_quadratus=Export for Quadratus QuadraCompta
 Modelcsv_ebp=Export for EBP
 Modelcsv_cogilog=Export for Cogilog
 Modelcsv_agiris=Export for Agiris
+Modelcsv_LDCompta=Export for LD Compta (v9 & higher) (Test)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
@@ -301,7 +302,7 @@ ChartofaccountsId=會計項目表ID
 InitAccountancy=初始會計
 InitAccountancyDesc=此頁可在沒有定義產品及服務的銷售及採購會計項目下使用產品及服務的會計項目。
 DefaultBindingDesc=當沒有設定特定會計項目時，此頁面可設定預設會計項目連結到薪資、捐贈、稅捐及營業稅的交易紀錄。
-DefaultClosureDesc=This page can be used to set parameters to use to enclose a balance sheet.
+DefaultClosureDesc=This page can be used to set parameters used for accounting closures.
 Options=選項
 OptionModeProductSell=銷售模式
 OptionModeProductSellIntra=Mode sales exported in EEC
diff --git a/htdocs/langs/zh_TW/admin.lang b/htdocs/langs/zh_TW/admin.lang
index 107124b2198..765fa63ea45 100644
--- a/htdocs/langs/zh_TW/admin.lang
+++ b/htdocs/langs/zh_TW/admin.lang
@@ -574,7 +574,7 @@ Module510Name=Salaries
 Module510Desc=Record and track employee payments
 Module520Name=Loans
 Module520Desc=借款的管理
-Module600Name=通知
+Module600Name=Notifications on business event
 Module600Desc=Send email notifications triggered by a business event: per user (setup defined on each user), per third-party contacts (setup defined on each third party) or by specific emails
 Module600Long=Note that this module sends emails in real-time when a specific business event occurs. If you are looking for a feature to send email reminders for agenda events, go into the setup of module Agenda.
 Module610Name=產品變種
@@ -1193,6 +1193,7 @@ ExtraFieldsSupplierOrders=補充屬性(訂單)
 ExtraFieldsSupplierInvoices=補充屬性(發票)
 ExtraFieldsProject=補充屬性(專案)
 ExtraFieldsProjectTask=補充屬性(任務)
+ExtraFieldsSalaries=Complementary attributes (salaries)
 ExtraFieldHasWrongValue=屬性 %s 有錯誤值。
 AlphaNumOnlyLowerCharsAndNoSpace=只限字母數字和小寫字元且沒有空格
 SendmailOptionNotComplete=警告，在某些Linux系統，從您的電子郵件發送電子郵件，必須包含 sendmail 的執行設置選項 -ba（在您的 php.ini 檔案設定參數 mail.force_extra_parameters ）。如果收件人沒有收到電子郵件，嘗試編輯 mail.force_extra_parameters = -ba 這個PHP參數。
@@ -1220,13 +1221,14 @@ SuhosinSessionEncrypt=以 Suhosin 加密方式儲存連線階段
 ConditionIsCurrently=目前情況 %s
 YouUseBestDriver=You use driver %s which is the best driver currently available.
 YouDoNotUseBestDriver=You use driver %s but driver %s is recommended.
-NbOfProductIsLowerThanNoPb=You have only %s products/services in the database. This does not require any particular optimization.
+NbOfObjectIsLowerThanNoPb=You have only %s %s in the database. This does not require any particular optimization.
 SearchOptim=最佳化的蒐尋
-YouHaveXProductUseSearchOptim=You have %s products in the database. You should add the constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+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.
 BrowserIsOK=You are using the %s web browser. This browser is ok for security and performance.
 BrowserIsKO=You are using the %s web browser. This browser is known to be a bad choice for security, performance and reliability. We recommend using Firefox, Chrome, Opera or Safari.
-XDebugInstalled=已載入 XDebug。
-XCacheInstalled=已載入 XCache。
+PHPModuleLoaded=PHP component %s is loaded
+PreloadOPCode=Preloaded OPCode is used
 AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.<br>Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp".
 AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".
 AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties.
@@ -1734,9 +1736,9 @@ ExpenseReportsRulesSetup=設定費用報表模組 - 規則
 ExpenseReportNumberingModules=費用報表編號模組
 NoModueToManageStockIncrease=當自動增加庫存啟動後沒有模組可以管理。此時增加庫存只能人工輸入。
 YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for email notifications by enabling and configuring the module "Notification".
-ListOfNotificationsPerUser=每位用戶* 的通知明細表
-ListOfNotificationsPerUserOrContact=List of notifications (events) available per user* or per contact**
-ListOfFixedNotifications=List of Fixed Notifications
+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
 GoOntoUserCardToAddMore=Go to the tab "Notifications" of a user to add or remove notifications for users
 GoOntoContactCardToAddMore=移到合作方的「通知」分頁以便針對通訊錄/地址等增加或移除通知
 Threshold=Threshold
@@ -1898,6 +1900,11 @@ OnMobileOnly=只在小螢幕(智慧型手機)
 DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be Prospect or Customer but can't be both)
 MAIN_OPTIMIZEFORTEXTBROWSER=Simplify interface for blind person
 MAIN_OPTIMIZEFORTEXTBROWSERDesc=Enable this option if you are a blind person, or if you use the application from a text browser like Lynx or 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
 ThisValueCanOverwrittenOnUserLevel=This value can be overwritten by each user from its user page - tab '%s'
 DefaultCustomerType=Default thirdparty type for "New customer" creation form
 ABankAccountMustBeDefinedOnPaymentModeSetup=Note: The bank account must be defined on the module of each payment mode (Paypal, Stripe, ...) to have this feature working.
@@ -1911,7 +1918,7 @@ LogsLinesNumber=Number of lines to show on logs tab
 UseDebugBar=Use the debug bar
 DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
 WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
-DebugBarModuleActivated=Module debugbar is activated and slows dramaticaly the interface
+ModuleActivated=Module %s is activated and slows the interface
 EXPORTS_SHARE_MODELS=Export models are share with everybody
 ExportSetup=Setup of module Export
 InstanceUniqueID=Unique ID of the instance
@@ -1928,3 +1935,5 @@ 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
diff --git a/htdocs/langs/zh_TW/bills.lang b/htdocs/langs/zh_TW/bills.lang
index c4f511537f2..1c4ba30453c 100644
--- a/htdocs/langs/zh_TW/bills.lang
+++ b/htdocs/langs/zh_TW/bills.lang
@@ -95,6 +95,7 @@ PaymentHigherThanReminderToPay=付款支付更高的比提醒
 HelpPaymentHigherThanReminderToPay=注意，一張或多張帳單的付款金額高於未付金額。<br>編輯您的輸入，否則請確認並考慮為每張超額支付的發票建立貸方通知單。
 HelpPaymentHigherThanReminderToPaySupplier=注意，一張或多張帳單的付款金額高於未付金額。<br>編輯您的輸入，否則請確認並考慮為每張超額支付的發票建立貸方通知單。
 ClassifyPaid=分類'已付'
+ClassifyUnPaid=Classify 'Unpaid'
 ClassifyPaidPartially=分類'部分支付'
 ClassifyCanceled=分類'已放棄'
 ClassifyClosed=分類'關閉'
@@ -214,6 +215,20 @@ ShowInvoiceReplace=顯示發票取代
 ShowInvoiceAvoir=顯示信貸說明
 ShowInvoiceDeposit=顯示訂金發票
 ShowInvoiceSituation=顯示情境發票
+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
 ShowPayment=顯示支付
 AlreadyPaid=已支付
 AlreadyPaidBack=已經還清了
diff --git a/htdocs/langs/zh_TW/errors.lang b/htdocs/langs/zh_TW/errors.lang
index 5c767727593..f2d908bd98f 100644
--- a/htdocs/langs/zh_TW/errors.lang
+++ b/htdocs/langs/zh_TW/errors.lang
@@ -90,7 +90,7 @@ ErrorSpecialCharNotAllowedForField=特殊字符不為外地允許“%s的”
 ErrorNumRefModel=存在一個引用（%s）和編號是不符合本規則兼容到數據庫。記錄中刪除或重命名參考激活此模塊。
 ErrorQtyTooLowForThisSupplier=Quantity too low for this vendor or no price defined on this product for this vendor
 ErrorOrdersNotCreatedQtyTooLow=Some orders haven't been created because of too-low quantities
-ErrorModuleSetupNotComplete=Setup of module looks to be uncomplete. Go on Home - Setup - Modules to complete.
+ErrorModuleSetupNotComplete=Setup of module %s looks to be uncomplete. Go on Home - Setup - Modules to complete.
 ErrorBadMask=錯誤的遮罩參數值
 ErrorBadMaskFailedToLocatePosOfSequence=沒有序列號錯誤，面具
 ErrorBadMaskBadRazMonth=錯誤，壞的復位值
@@ -219,6 +219,7 @@ 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.
 # 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.
 WarningMandatorySetupNotComplete=Click here to setup mandatory parameters
 WarningEnableYourModulesApplications=Click here to enable your modules and applications
diff --git a/htdocs/langs/zh_TW/main.lang b/htdocs/langs/zh_TW/main.lang
index 3786469cafd..6a3d99b8b94 100644
--- a/htdocs/langs/zh_TW/main.lang
+++ b/htdocs/langs/zh_TW/main.lang
@@ -445,6 +445,7 @@ ContactsAddressesForCompany=此合作方的通訊錄及地址
 AddressesForCompany=此合作方的地址
 ActionsOnCompany=Events for this third party
 ActionsOnContact=Events for this contact/address
+ActionsOnContract=Events for this contract
 ActionsOnMember=此會員的各種事件
 ActionsOnProduct=此產品的各種事件
 NActionsLate=%s的後期
@@ -759,6 +760,7 @@ LinkToSupplierProposal=Link to vendor proposal
 LinkToSupplierInvoice=Link to vendor invoice
 LinkToContract=連線到合約
 LinkToIntervention=連線到干預
+LinkToTicket=Link to ticket
 CreateDraft=建立草稿
 SetToDraft=回到草稿
 ClickToEdit=點擊後“編輯”
diff --git a/htdocs/langs/zh_TW/products.lang b/htdocs/langs/zh_TW/products.lang
index 0379739b18f..660da6b3998 100644
--- a/htdocs/langs/zh_TW/products.lang
+++ b/htdocs/langs/zh_TW/products.lang
@@ -2,6 +2,7 @@
 ProductRef=產品編號
 ProductLabel=產品標簽
 ProductLabelTranslated=Translated product label
+ProductDescription=Product description
 ProductDescriptionTranslated=Translated product description
 ProductNoteTranslated=Translated product note
 ProductServiceCard=產品服務卡
diff --git a/htdocs/langs/zh_TW/stripe.lang b/htdocs/langs/zh_TW/stripe.lang
index a390881159f..b442a09dbdd 100644
--- a/htdocs/langs/zh_TW/stripe.lang
+++ b/htdocs/langs/zh_TW/stripe.lang
@@ -65,3 +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>
diff --git a/htdocs/langs/zh_TW/withdrawals.lang b/htdocs/langs/zh_TW/withdrawals.lang
index e9dcf33924b..a908610c4f0 100644
--- a/htdocs/langs/zh_TW/withdrawals.lang
+++ b/htdocs/langs/zh_TW/withdrawals.lang
@@ -76,7 +76,8 @@ WithdrawalFile=Withdrawal file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and will classify them as "Paid" if remain to pay is null
 StatisticsByLineStatus=Statistics by status of lines
-RUM=UMR
+RUM=Unique Mandate Reference (UMR)
+DateRUM=Mandate signature date
 RUMLong=Unique Mandate Reference
 RUMWillBeGenerated=If empty, a UMR (Unique Mandate Reference) will be generated once the bank account information is saved.
 WithdrawMode=Direct debit mode (FRST or RECUR)
diff --git a/htdocs/livraison/card.php b/htdocs/livraison/card.php
index 45a851b43a5..9109247d462 100644
--- a/htdocs/livraison/card.php
+++ b/htdocs/livraison/card.php
@@ -568,7 +568,7 @@ else
 			}
 
 			// Other attributes
-			if ($action = 'create_delivery') {
+			if ($action == 'create_delivery') {
 				// copy from expedition
 				$expeditionExtrafields = new Extrafields($db);
 				$expeditionExtrafieldLabels = $expeditionExtrafields->fetch_name_optionals_label($expedition->table_element);
@@ -681,7 +681,7 @@ else
 						$mode = ($object->statut == 0) ? 'edit' : 'view';
 						$line = new LivraisonLigne($db);
 						$line->fetch_optionals($object->lines[$i]->id);
-						if ($action = 'create_delivery') {
+						if ($action == 'create_delivery') {
 							$srcLine = new ExpeditionLigne($db);
 							$expeditionLineExtrafields = new Extrafields($db);
 							$expeditionLineExtrafieldLabels = $expeditionLineExtrafields->fetch_name_optionals_label($srcLine->table_element);
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index bf4c40a4176..2ba5e3b484a 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -902,6 +902,9 @@ elseif (! empty($user->conf->MAIN_OPTIMIZEFORTEXTBROWSER))
 	$conf->global->MAIN_OPTIMIZEFORTEXTBROWSER=$user->conf->MAIN_OPTIMIZEFORTEXTBROWSER;
 }
 
+// set MAIN_OPTIMIZEFORCOLORBLIND
+$conf->global->MAIN_OPTIMIZEFORCOLORBLIND=$user->conf->MAIN_OPTIMIZEFORCOLORBLIND;
+
 // Set terminal output option according to conf->browser.
 if (GETPOST('dol_hide_leftmenu', 'int') || ! empty($_SESSION['dol_hide_leftmenu']))               $conf->dol_hide_leftmenu=1;
 if (GETPOST('dol_hide_topmenu', 'int') || ! empty($_SESSION['dol_hide_topmenu']))                 $conf->dol_hide_topmenu=1;
@@ -1087,6 +1090,10 @@ if (! function_exists("llxHeader"))
 		    if ($mainmenu != 'website') $tmpcsstouse=$morecssonbody;  // We do not use sidebar-collpase by default to have menuhider open by default.
 		}
 
+		if(!empty($conf->global->MAIN_OPTIMIZEFORCOLORBLIND)){
+			$tmpcsstouse.= ' colorblind-'.strip_tags($conf->global->MAIN_OPTIMIZEFORCOLORBLIND);
+		}
+
 		print '<body id="mainbody" class="'.$tmpcsstouse.'">' . "\n";
 
 		// top menu and left menu area
@@ -1124,6 +1131,7 @@ function top_httphead($contenttype = 'text/html', $forcenocache = 0)
 
 	if ($contenttype == 'text/html' ) header("Content-Type: text/html; charset=".$conf->file->character_set_client);
 	else header("Content-Type: ".$contenttype);
+
 	// Security options
 	header("X-Content-Type-Options: nosniff");  // With the nosniff option, if the server says the content is text/html, the browser will render it as text/html (note that most browsers now force this option to on)
 	if (! defined('XFRAMEOPTIONS_ALLOWALL')) header("X-Frame-Options: SAMEORIGIN");      // Frames allowed only if on same domain (stop some XSS attacks)
@@ -2319,6 +2327,51 @@ if (! function_exists("llxFooter"))
 		print "\n<!-- A div to allow dialog popup -->\n";
 		print '<div id="dialogforpopup" style="display: none;"></div>'."\n";
 
+		// Add code for the asynchronous anonymous first ping (for telemetry)
+		if (($_SERVER["PHP_SELF"] == DOL_URL_ROOT.'/index.php') || GETPOST('forceping', 'alpha'))
+		{
+			if (empty($conf->global->MAIN_FIRST_PING_OK_DATE)
+			|| (! empty($conf->file->instance_unique_id) && (md5($conf->file->instance_unique_id) != $conf->global->MAIN_FIRST_PING_OK_ID))
+			|| GETPOST('forceping', 'alpha'))
+			{
+				print "\n".'<!-- Includes JS for Ping of Dolibarr MAIN_FIRST_PING_OK_DATE = '.$conf->global->MAIN_FIRST_PING_OK_DATE.' MAIN_FIRST_PING_OK_ID = '.$conf->global->MAIN_FIRST_PING_OK_ID.' -->'."\n";
+				print "\n<!-- JS CODE TO ENABLE the anonymous Ontime Ping -->\n";
+				?>
+	    			<script>
+	    			jQuery(document).ready(function (tmp) {
+	    				$.ajax({
+	    					  method: "POST",
+	    					  url: "https://ping.dolibarr.org/",
+	    					  timeout: 500,     // timeout milliseconds
+	    					  cache: false,
+	    					  data: { hash_algo: "md5", hash_unique_id: "<?php echo md5('dolibarr'.$conf->file->instance_unique_id); ?>", action: "dolibarrping", version: "<?php echo (float) DOL_VERSION; ?>", entity: <?php echo (int) $conf->entity; ?> },
+	    					  success: function (data, status, xhr) {   // success callback function (data contains body of response)
+	      					    	console.log("Ping ok");
+	        	    				$.ajax({
+	      	    					  method: "GET",
+	      	    					  url: "<?php echo DOL_URL_ROOT.'/core/ajax/pingresult.php'; ?>",
+	      	    					  timeout: 500,     // timeout milliseconds
+	      	    					  cache: false,
+	      	        				  data: { hash_algo: "md5", hash_unique_id: "<?php echo md5($conf->file->instance_unique_id); ?>", action: "firstpingok" },
+	    					  		});
+	    					  },
+	    					  error: function (data,status,xhr) {   // success callback function
+	        					    console.log("Ping ko: " + data);
+	        	    				$.ajax({
+	        	    					  method: "GET",
+	        	    					  url: "<?php echo DOL_URL_ROOT.'/core/ajax/pingresult.php'; ?>",
+	        	    					  timeout: 500,     // timeout milliseconds
+	        	    					  cache: false,
+	        	        				  data: { hash_algo: "md5", hash_unique_id: "<?php echo md5($conf->file->instance_unique_id); ?>", action: "firstpingko", version: "<?php echo (float) DOL_VERSION; ?>" },
+	      					  		});
+	    					  }
+	    				});
+	    			});
+	    			</script>
+				<?php
+			}
+		}
+
 		print "</body>\n";
 		print "</html>\n";
 
diff --git a/htdocs/modulebuilder/template/class/myobject.class.php b/htdocs/modulebuilder/template/class/myobject.class.php
index d2bd1c6ac03..35f96b1588f 100644
--- a/htdocs/modulebuilder/template/class/myobject.class.php
+++ b/htdocs/modulebuilder/template/class/myobject.class.php
@@ -60,7 +60,7 @@ class MyObject extends CommonObject
 
 	const STATUS_DRAFT = 0;
 	const STATUS_VALIDATED = 1;
-	const STATUS_DISABLED = 9;
+	const STATUS_CANCELED = 9;
 
 
 	/**
@@ -388,7 +388,7 @@ class MyObject extends CommonObject
 		$sql = 'SELECT ';
 		$sql .= $this->getFieldList();
 		$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element. ' as t';
-		if ($this->ismultientitymanaged) $sql .= ' WHERE t.entity IN ('.getEntity($this->table_element).')';
+		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) $sql .= ' WHERE t.entity IN ('.getEntity($this->table_element).')';
 		else $sql .= ' WHERE 1 = 1';
 		// Manage filter
 		$sqlwhere = array();
diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php
index 5e6388d55f9..11fafd59ab5 100644
--- a/htdocs/modulebuilder/template/myobject_list.php
+++ b/htdocs/modulebuilder/template/myobject_list.php
@@ -135,7 +135,7 @@ $arrayfields=array();
 foreach($object->fields as $key => $val)
 {
 	// If $val['visible']==0, then we never show the field
-	if (! empty($val['visible'])) $arrayfields['t.'.$key]=array('label'=>$val['label'], 'checked'=>(($val['visible']<0)?0:1), 'enabled'=>$val['enabled'], 'position'=>$val['position']);
+	if (! empty($val['visible'])) $arrayfields['t.'.$key]=array('label'=>$val['label'], 'checked'=>(($val['visible']<0)?0:1), 'enabled'=>($val['enabled'] && ($val['visible'] != 3)), 'position'=>$val['position']);
 }
 // Extra fields
 if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0)
@@ -493,7 +493,7 @@ while ($i < min($num, $limit))
 	    if (in_array($val['type'], array('timestamp'))) $cssforfield.=($cssforfield?' ':'').'nowrap';
 	    elseif ($key == 'ref') $cssforfield.=($cssforfield?' ':'').'nowrap';
 
-	    if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price'))) $cssforfield.=($cssforfield?' ':'').'right';
+	    if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $key != 'status') $cssforfield.=($cssforfield?' ':'').'right';
 
 	    if (! empty($arrayfields['t.'.$key]['checked']))
 		{
diff --git a/htdocs/product/admin/product.php b/htdocs/product/admin/product.php
index a7e45d488e1..83e5936f092 100644
--- a/htdocs/product/admin/product.php
+++ b/htdocs/product/admin/product.php
@@ -556,7 +556,14 @@ if (! empty($conf->fournisseur->enabled)) $rowspan++;
 
 
 print '<tr class="oddeven">';
-print '<td>'.$langs->trans("PricingRule").'</td>';
+if (empty($conf->multicompany->enabled))
+{
+	print '<td>'.$langs->trans("PricingRule").'</td>';
+}
+else
+{
+	print '<td>'.$form->textwithpicto($langs->trans("PricingRule"), $langs->trans("SamePriceAlsoForSharedCompanies"), 1).'</td>';
+}
 print '<td width="60" class="right">';
 $current_rule = 'PRODUCT_PRICE_UNIQ';
 if (!empty($conf->global->PRODUIT_MULTIPRICES)) $current_rule='PRODUIT_MULTIPRICES';
@@ -564,10 +571,6 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY)) $current_rule='PRODUI
 if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) $current_rule='PRODUIT_CUSTOMER_PRICES';
 if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) $current_rule='PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES';
 print $form->selectarray("princingrule", $select_pricing_rules, $current_rule);
-if ( empty($conf->multicompany->enabled))
-{
-    print $langs->trans("SamePriceAlsoForSharedCompanies");
-}
 print '</td><td rowspan="'.$rowspan.'" class="nohover right">';
 print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
 print '</td>';
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index cdd94ae4a3c..5be4dc43358 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -1028,7 +1028,7 @@ else
         if ($type == 1)
         {
             print '<tr><td>'.$langs->trans("Duration").'</td><td colspan="3">';
-            print '<input name="surface" size="4" value="'.GETPOST('duration_value', 'int').'">';
+            print '<input name="duration_value" size="4" value="'.GETPOST('duration_value', 'int').'">';
             print $formproduct->selectMeasuringUnits("duration_unit", "time", GETPOST('duration_value', 'alpha'), 0, 1);
             print '</td></tr>';
         }
diff --git a/htdocs/product/dynamic_price/class/price_parser.class.php b/htdocs/product/dynamic_price/class/price_parser.class.php
index ef968f5e960..016917372ad 100644
--- a/htdocs/product/dynamic_price/class/price_parser.class.php
+++ b/htdocs/product/dynamic_price/class/price_parser.class.php
@@ -262,24 +262,29 @@ class PriceParser
             return -1;
         }
 
-        //Get the supplier min
-        $productFournisseur = new ProductFournisseur($this->db);
-        $supplier_min_price = $productFournisseur->find_min_price_product_fournisseur($product->id, 0, 0);
+		//Get the supplier min price
+		$productFournisseur = new ProductFournisseur($this->db);
+		$res = $productFournisseur->find_min_price_product_fournisseur($product->id, 0, 0);
+		if ($res < 1) {
+			$this->error_parser = array(25, null);
+			return -1;
+		}
+		$supplier_min_price = $productFournisseur->fourn_unitprice;
 
         //Accessible values by expressions
-        $extra_values = array_merge($extra_values, array(
-            "supplier_min_price" => $supplier_min_price,
-        ));
+		$extra_values = array_merge($extra_values, array(
+			"supplier_min_price" => $supplier_min_price,
+		));
 
-        //Parse the expression and return the price, if not error occurred check if price is higher than min
-        $result = $this->parseExpression($product, $price_expression->expression, $extra_values);
-        if (empty($this->error_parser)) {
-            if ($result < $product->price_min) {
-                $result = $product->price_min;
-            }
-        }
-        return $result;
-    }
+		//Parse the expression and return the price, if not error occurred check if price is higher than min
+		$result = $this->parseExpression($product, $price_expression->expression, $extra_values);
+		if (empty($this->error_parser)) {
+			if ($result < $product->price_min) {
+				$result = $product->price_min;
+			}
+		}
+		return $result;
+	}
 
     /**
      *	Calculates supplier product price based on product supplier price and associated expression
diff --git a/htdocs/product/stats/facture.php b/htdocs/product/stats/facture.php
index 00f9c84338e..ed24647ad67 100644
--- a/htdocs/product/stats/facture.php
+++ b/htdocs/product/stats/facture.php
@@ -236,7 +236,8 @@ if ($id > 0 || ! empty($ref))
                         $objp = $db->fetch_object($result);
                         
 						if ($objp->type == Facture::TYPE_CREDIT_NOTE) $objp->qty=-($objp->qty);
-                        $total_ht+=$objp->total_ht;
+
+						$total_ht+=$objp->total_ht;
                         $total_qty+=$objp->qty;
 
                         $invoicestatic->id=$objp->facid;
diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index 47e05d2f486..daf77674190 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -1695,6 +1695,7 @@ if ($action != 'dopayment')
 		    {
 		        $langs->load("members");
 		        print '<br><span class="amountpaymentcomplete">'.$langs->trans("MembershipPaid", dol_print_date($object->datefin, 'day')).'</span><br>';
+		        print '<span class="opacitymedium">'.$langs->trans("PaymentWillBeRecordedForNextPeriod").'</span><br>';
 		    }
 
 			// Buttons for all payments registration methods
@@ -1934,7 +1935,8 @@ if (preg_match('/^dopayment/', $action))			// If we choosed/click on the payment
 		// JS Code for Stripe
 		if (empty($stripearrayofkeys['publishable_key']))
 		{
-		    print info_admin($langs->trans("ErrorModuleSetupNotComplete", "stripe"), 0, 0, 'error');
+			$langs->load("errors");
+			print info_admin($langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("Stripe")), 0, 0, 'error');
 		}
 		else
 		{
diff --git a/htdocs/public/payment/paymentko.php b/htdocs/public/payment/paymentko.php
index c4e4ad68a23..9e68958712e 100644
--- a/htdocs/public/payment/paymentko.php
+++ b/htdocs/public/payment/paymentko.php
@@ -235,7 +235,7 @@ elseif (! empty($logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$lo
 // Output html code for logo
 if ($urllogo)
 {
-	print '<center><img id="dolpaymentlogo" title="'.$title.'" src="'.$urllogo.'"';
+	print '<center><img id="dolpaymentlogo" src="'.$urllogo.'"';
 	if ($width) print ' width="'.$width.'"';
 	print '></center>';
 	print '<br>';
@@ -246,6 +246,17 @@ print $langs->trans("YourPaymentHasNotBeenRecorded")."<br><br>";
 $key='ONLINE_PAYMENT_MESSAGE_KO';
 if (! empty($conf->global->$key)) print $conf->global->$key;
 
+$type = GETPOST('s', 'alpha');
+$ref = GETPOST('ref', 'none');
+$tag = GETPOST('tag', 'alpha');
+require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
+if ($type || $tag)
+{
+	$urlsubscription =getOnlinePaymentUrl(0, ($type?$type:'free'), $ref, $FinalPaymentAmt, $tag);
+
+	print $langs->trans("ClickHereToTryAgain", $urlsubscription);
+}
+
 print "\n</div>\n";
 
 
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 6d936e5ce65..01770e1bee1 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -2167,8 +2167,8 @@ class Societe extends CommonObject
 		{
 			$label.= '<br><b>' . $langs->trans('Name') . ':</b> '. $this->name;
 			if (! empty($this->name_alias)) $label.=' ('.$this->name_alias.')';
-			$label.= '<br><b>' . $langs->trans('Email') . ':</b> '. $this->email;
 		}
+		$label.= '<br><b>' . $langs->trans('Email') . ':</b> '. $this->email;
 		if (! empty($this->country_code))
 			$label.= '<br><b>' . $langs->trans('Country') . ':</b> '. $this->country_code;
 		if (! empty($this->tva_intra) || (! empty($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP) && strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'vatnumber') !== false))
diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index 9ddbed6c9b0..2ee5f5bedf5 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -224,21 +224,25 @@ $object = new Societe($db);
  * Actions
  */
 
-if ($action=="change")
+if ($action=="change")	// Change customer for TakePOS
 {
     $idcustomer = GETPOST('idcustomer', 'int');
     $place = (GETPOST('place', 'int') > 0 ? GETPOST('place', 'int') : 0);   // $place is id of table for Ba or Restaurant
 
-    $sql="UPDATE ".MAIN_DB_PREFIX."facture set fk_soc=".$idcustomer." where ref='(PROV-POS-".$place.")'";
+    // @TODO Check if draft invoice already exists, if not create it or return a warning to ask to enter at least one line to have it created automatically
+    $sql="UPDATE ".MAIN_DB_PREFIX."facture set fk_soc=".$idcustomer." where ref='(PROV-POS".$_SESSION["takeposterminal"]."-".$place.")'";
     $resql = $db->query($sql);
-    ?>
-    <script>
-    parent.$("#poslines").load("invoice.php?place="+<?php print $place;?>, function() {
-        //parent.$("#poslines").scrollTop(parent.$("#poslines")[0].scrollHeight);
-        parent.$.colorbox.close();
-    });
-    </script>
-    <?php
+	    ?>
+	    <script>
+	    parent.$("#poslines").load("invoice.php?place="+<?php print $place;?>, function() {
+	        //parent.$("#poslines").scrollTop(parent.$("#poslines")[0].scrollHeight);
+			<?php if (! $resql) { ?>
+				alert('Error failed to update customer on draft invoice.');
+			<?php } ?>
+	        parent.$.colorbox.close(); /* Close the popup */
+	    });
+	    </script>
+	    <?php
     exit;
 }
 
diff --git a/htdocs/societe/paymentmodes.php b/htdocs/societe/paymentmodes.php
index 4f525330e79..62013f1956d 100644
--- a/htdocs/societe/paymentmodes.php
+++ b/htdocs/societe/paymentmodes.php
@@ -826,7 +826,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 	print '<br>';
 
 	// List of Stripe payment modes
-	if (! (empty($conf->stripe->enabled)))
+	if (! (empty($conf->stripe->enabled)) && $object->client)
 	{
 		$morehtmlright='';
 		if (! empty($conf->global->STRIPE_ALLOW_LOCAL_CARD))
@@ -1188,11 +1188,10 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 		}
 		print "</table>";
 		print "</div>";
+		print '<br>';
 	}
 
-
 	// List of bank accounts
-	print '<br>';
 
     $morehtmlright= dolGetButtonTitle($langs->trans('Add'), '', 'fa fa-plus-circle', $_SERVER["PHP_SELF"].'?socid='.$object->id.'&amp;action=create');
 
diff --git a/htdocs/stripe/admin/stripe.php b/htdocs/stripe/admin/stripe.php
index c2b2143f277..02039f3edc2 100644
--- a/htdocs/stripe/admin/stripe.php
+++ b/htdocs/stripe/admin/stripe.php
@@ -254,7 +254,7 @@ if (empty($conf->stripeconnect->enabled))
 	print price($conf->global->STRIPE_APPLICATION_FEE_PERCENT);
 	print '% + ';
 	print price($conf->global->STRIPE_APPLICATION_FEE);
-	print ' '.$langs->getCurrencySymbol($conf->currency).' '.$langs->trans("minimum").' '.price($conf->global->STRIPE_APPLICATION_FEE_MINIMAL).' '.$langs->getCurrencySymbol($conf->currency).' </td></tr>';
+	print ' '.$langs->getCurrencySymbol($conf->currency).' '.$langs->trans("minimum").' '.price($conf->global->STRIPE_APPLICATION_FEE_MINIMAL).' '.$langs->getCurrencySymbol($conf->currency);
 	print '</td><td></td></tr>';
 }
 
diff --git a/htdocs/stripe/charge.php b/htdocs/stripe/charge.php
index e8823119e30..9d4bf71c040 100644
--- a/htdocs/stripe/charge.php
+++ b/htdocs/stripe/charge.php
@@ -121,6 +121,30 @@ if (!$rowid)
 	//print $list;
 	foreach ($list->data as $charge)
 	{
+	  if ($charge->refunded=='1'){
+	    	$status = img_picto($langs->trans("refunded"), 'statut6');
+	  } elseif ($charge->paid=='1'){
+        $status = img_picto($langs->trans("".$charge->status.""), 'statut4');
+	  } else {
+	    	$label="Message: ".$charge->failure_message."<br>";
+	    	$label.="Réseau: ".$charge->outcome->network_status."<br>";
+	    	$label.="Statut: ".$langs->trans("".$charge->outcome->seller_message."");
+	    	$status = $form->textwithpicto(img_picto($langs->trans("".$charge->status.""), 'statut8'), $label, 1);
+	  }
+    
+      if ($charge->payment_method_details->type=='card')
+	  {
+		    $type = $langs->trans("card");
+	  } elseif ($charge->source->type=='card'){
+			$type = $langs->trans("card");
+	  } elseif ($charge->payment_method_details->type=='three_d_secure'){
+			$type = $langs->trans("card3DS");
+	  }
+  
+    if (! empty($charge->payment_intent)) {
+    $charge = \Stripe\PaymentIntent::retrieve($charge->payment_intent);
+    }
+
 		// The metadata FULLTAG is defined by the online payment page
 		$FULLTAG=$charge->metadata->FULLTAG;
 
@@ -205,31 +229,13 @@ if (!$rowid)
 	    print '<td class="center">'.dol_print_date($charge->created, '%d/%m/%Y %H:%M')."</td>\n";
 	    // Type
 	    print '<td>';
-		if ($charge->source->object=='card')
-		{
-		    print $langs->trans("card");
-		}
-		elseif ($charge->source->type=='card'){
-		    print $langs->trans("card");
-		} elseif ($charge->source->type=='three_d_secure'){
-		    print $langs->trans("card3DS");
-		}
+		print $type;
 	    print '</td>';
 	    // Amount
 	    print '<td class="right">'.price(($charge->amount-$charge->amount_refunded)/100, 0, '', 1, - 1, - 1, strtoupper($charge->currency))."</td>";
 	    // Status
 	    print '<td class="right">';
-	    if ($charge->refunded=='1'){
-	    	print img_picto($langs->trans("refunded"), 'statut6');
-	    } elseif ($charge->paid=='1'){
-
-        print img_picto($langs->trans("".$charge->status.""), 'statut4');
-	    } else {
-	    	$label="Message: ".$charge->failure_message."<br>";
-	    	$label.="Réseau: ".$charge->outcome->network_status."<br>";
-	    	$label.="Statut: ".$langs->trans("".$charge->outcome->seller_message."");
-	    	print $form->textwithpicto(img_picto($langs->trans("".$charge->status.""), 'statut8'), $label, 1);
-	    }
+	    print $status;
 	    print "</td>\n";
 
 	    print "</tr>\n";
diff --git a/htdocs/stripe/class/stripe.class.php b/htdocs/stripe/class/stripe.class.php
index efd79d25583..c6df1206d0f 100644
--- a/htdocs/stripe/class/stripe.class.php
+++ b/htdocs/stripe/class/stripe.class.php
@@ -321,14 +321,14 @@ class Stripe extends CommonObject
 		if (! in_array($currency_code, $arrayzerounitcurrency)) $stripeamount = $amount * 100;
 		else $stripeamount = $amount;
 
-		$fee = round($amount * ($conf->global->STRIPE_APPLICATION_FEE_PERCENT / 100) + $conf->global->STRIPE_APPLICATION_FEE);
+		$fee = $amount * ($conf->global->STRIPE_APPLICATION_FEE_PERCENT / 100) + $conf->global->STRIPE_APPLICATION_FEE;
 		if ($fee >= $conf->global->STRIPE_APPLICATION_FEE_MAXIMAL && $conf->global->STRIPE_APPLICATION_FEE_MAXIMAL > $conf->global->STRIPE_APPLICATION_FEE_MINIMAL) {
-		    $fee = round($conf->global->STRIPE_APPLICATION_FEE_MAXIMAL);
+		    $fee = $conf->global->STRIPE_APPLICATION_FEE_MAXIMAL;
 		} elseif ($fee < $conf->global->STRIPE_APPLICATION_FEE_MINIMAL) {
-		    $fee = round($conf->global->STRIPE_APPLICATION_FEE_MINIMAL);
+		    $fee = $conf->global->STRIPE_APPLICATION_FEE_MINIMAL;
 		}
-		if (! in_array($currency_code, $arrayzerounitcurrency)) $stripefee = $fee * 100;
-		else $stripefee = $fee;
+				if (! in_array($currency, $arrayzerounitcurrency)) $stripefee = round($fee * 100);
+				else $stripefee = round($fee);
 
 		$paymentintent = null;
 
@@ -710,15 +710,14 @@ class Stripe extends CommonObject
 					$charge = \Stripe\Charge::create($paymentarray, array("idempotency_key" => "$description"));
 				}
 			} else {
-				$fee = round($amount * ($conf->global->STRIPE_APPLICATION_FEE_PERCENT / 100) + $conf->global->STRIPE_APPLICATION_FEE);
-			    if ($fee >= $conf->global->STRIPE_APPLICATION_FEE_MAXIMAL && $conf->global->STRIPE_APPLICATION_FEE_MAXIMAL > $conf->global->STRIPE_APPLICATION_FEE_MINIMAL) {
-					$fee = round($conf->global->STRIPE_APPLICATION_FEE_MAXIMAL);
-				}
-                elseif ($fee < $conf->global->STRIPE_APPLICATION_FEE_MINIMAL) {
-					$fee = round($conf->global->STRIPE_APPLICATION_FEE_MINIMAL);
-				}
-				if (! in_array($currency, $arrayzerounitcurrency)) $stripefee = $fee * 100;
-				else $stripefee = $fee;
+		$fee = $amount * ($conf->global->STRIPE_APPLICATION_FEE_PERCENT / 100) + $conf->global->STRIPE_APPLICATION_FEE;
+		if ($fee >= $conf->global->STRIPE_APPLICATION_FEE_MAXIMAL && $conf->global->STRIPE_APPLICATION_FEE_MAXIMAL > $conf->global->STRIPE_APPLICATION_FEE_MINIMAL) {
+		    $fee = $conf->global->STRIPE_APPLICATION_FEE_MAXIMAL;
+		} elseif ($fee < $conf->global->STRIPE_APPLICATION_FEE_MINIMAL) {
+		    $fee = $conf->global->STRIPE_APPLICATION_FEE_MINIMAL;
+		}
+				if (! in_array($currency, $arrayzerounitcurrency)) $stripefee = round($fee * 100);
+				else $stripefee = round($fee);
 
         		$paymentarray = array(
 					"amount" => "$stripeamount",
diff --git a/htdocs/stripe/config.php b/htdocs/stripe/config.php
index 5638a10d332..17ca74b7955 100644
--- a/htdocs/stripe/config.php
+++ b/htdocs/stripe/config.php
@@ -55,4 +55,4 @@ else
 
 \Stripe\Stripe::setApiKey($stripearrayofkeys['secret_key']);
 \Stripe\Stripe::setAppInfo("Dolibarr Stripe", DOL_VERSION, "https://www.dolibarr.org"); // add dolibarr version
-\Stripe\Stripe::setApiVersion("2019-03-14"); // force version API
+\Stripe\Stripe::setApiVersion("2019-05-16"); // force version API
diff --git a/htdocs/supplier_proposal/class/supplier_proposal.class.php b/htdocs/supplier_proposal/class/supplier_proposal.class.php
index f3e0315c75f..546a93763a6 100644
--- a/htdocs/supplier_proposal/class/supplier_proposal.class.php
+++ b/htdocs/supplier_proposal/class/supplier_proposal.class.php
@@ -524,11 +524,11 @@ class SupplierProposal extends CommonObject
             $pu_ht_devise = $tabprice[19];
 
             // Rang to use
-            $rangtouse = $rang;
-            if ($rangtouse == -1)
+            $ranktouse = $rang;
+            if ($ranktouse == -1)
             {
                 $rangmax = $this->line_max($fk_parent_line);
-                $rangtouse = $rangmax + 1;
+                $ranktouse = $rangmax + 1;
             }
 
             // TODO A virer
@@ -556,7 +556,7 @@ class SupplierProposal extends CommonObject
             $this->line->fk_product=$fk_product;
             $this->line->remise_percent=$remise_percent;
             $this->line->subprice=$pu_ht;
-            $this->line->rang=$rangtouse;
+            $this->line->rang=$ranktouse;
             $this->line->info_bits=$info_bits;
             $this->line->total_ht=$total_ht;
             $this->line->total_tva=$total_tva;
@@ -2506,7 +2506,7 @@ class SupplierProposal extends CommonObject
         else
         {
             $langs->load("errors");
-            print $langs->trans("Error")." ".$langs->trans("ErrorModuleSetupNotComplete");
+            print $langs->trans("Error")." ".$langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("SupplierProposal"));
             return "";
         }
     }
diff --git a/htdocs/takepos/admin/terminal.php b/htdocs/takepos/admin/terminal.php
index 2b29f46120d..0a91e303a53 100644
--- a/htdocs/takepos/admin/terminal.php
+++ b/htdocs/takepos/admin/terminal.php
@@ -17,7 +17,7 @@
  */
 
 /**
- *	\file       htdocs/takepos/admin/setup.php
+ *	\file       htdocs/takepos/admin/terminal.php
  *	\ingroup    takepos
  *	\brief      Setup page for TakePos module
  */
@@ -125,30 +125,36 @@ print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("Parameters").'</td><td>'.$langs->trans("Value").'</td>';
 print "</tr>\n";
 
-print '<tr class="oddeven"><td width=\"50%\">'.$langs->trans("CashDeskThirdPartyForSell").'</td>';
-print '<td colspan="2">';
+print '<tr class="oddeven"><td class="fieldrequired">'.$langs->trans("CashDeskThirdPartyForSell").'</td>';
+print '<td>';
 print $form->select_company($conf->global->{'CASHDESK_ID_THIRDPARTY'.$terminaltouse}, 'socid', '(s.client IN (1, 3) AND s.status = 1)', 1, 0, 0, array(), 0);
 print '</td></tr>';
+
+$atleastonefound = 0;
 if (! empty($conf->banque->enabled))
 {
     print '<tr class="oddeven"><td>'.$langs->trans("CashDeskBankAccountForSell").'</td>';
-	print '<td colspan="2">';
+	print '<td>';
 	$form->select_comptes($conf->global->{'CASHDESK_ID_BANKACCOUNT_CASH'.$terminaltouse}, 'CASHDESK_ID_BANKACCOUNT_CASH'.$terminaltouse, 0, "courant=2", 1);
+	if (! empty($conf->global->{'CASHDESK_ID_BANKACCOUNT_CASH'.$terminaltouse})) $atleastonefound++;
 	print '</td></tr>';
 	print '<tr class="oddeven"><td>'.$langs->trans("CashDeskBankAccountForCheque").'</td>';
-	print '<td colspan="2">';
+	print '<td>';
 	$form->select_comptes($conf->global->{'CASHDESK_ID_BANKACCOUNT_CHEQUE'.$terminaltouse}, 'CASHDESK_ID_BANKACCOUNT_CHEQUE'.$terminaltouse, 0, "courant=1", 1);
+	if (! empty($conf->global->{'CASHDESK_ID_BANKACCOUNT_CHEQUE'.$terminaltouse})) $atleastonefound++;
 	print '</td></tr>';
 	print '<tr class="oddeven"><td>'.$langs->trans("CashDeskBankAccountForCB").'</td>';
-	print '<td colspan="2">';
+	print '<td>';
 	$form->select_comptes($conf->global->{'CASHDESK_ID_BANKACCOUNT_CB'.$terminaltouse}, 'CASHDESK_ID_BANKACCOUNT_CB'.$terminaltouse, 0, "courant=1", 1);
+	if (! empty($conf->global->{'CASHDESK_ID_BANKACCOUNT_CB'.$terminaltouse})) $atleastonefound++;
 	print '</td></tr>';
 
 	foreach($paiements as $modep) {
-        if (in_array($modep->code, array('LIQ', 'CB', 'CHQ'))) continue;
+        if (in_array($modep->code, array('LIQ', 'CB', 'CHQ'))) continue;	// Already managed before
         $name="CASHDESK_ID_BANKACCOUNT_".$modep->code.$terminaltouse;
 		print '<tr class="oddeven"><td>'.$langs->trans("CashDeskBankAccountFor").' '.$langs->trans($modep->libelle).'</td>';
-		print '<td colspan="2">';
+		print '<td>';
+		if (! empty($conf->global->$name)) $atleastonefound++;
 		$cour=preg_match('/^LIQ.*/', $modep->code)?2:1;
 		$form->select_comptes($conf->global->$name, $name, 0, "courant=".$cour, 1);
 		print '</td></tr>';
@@ -159,7 +165,7 @@ if (! empty($conf->stock->enabled))
 {
 
 	print '<tr class="oddeven"><td>'.$langs->trans("CashDeskDoNotDecreaseStock").'</td>';	// Force warehouse (this is not a default value)
-	print '<td colspan="2">';
+	print '<td>';
 	if (empty($conf->productbatch->enabled)) {
 	   print $form->selectyesno('CASHDESK_NO_DECREASE_STOCK'.$terminal, $conf->global->{'CASHDESK_NO_DECREASE_STOCK'.$terminal}, 1);
 	}
@@ -177,7 +183,7 @@ if (! empty($conf->stock->enabled))
 
 
 	print '<tr class="oddeven"><td>'.$langs->trans("CashDeskIdWareHouse").'</td>';	// Force warehouse (this is not a default value)
-	print '<td colspan="2">';
+	print '<td>';
 	if (! $disabled)
 	{
 		print $formproduct->selectWarehouses($conf->global->{'CASHDESK_ID_WAREHOUSE'.$terminal}, 'CASHDESK_ID_WAREHOUSE'.$terminal, '', 1, $disabled);
@@ -191,6 +197,12 @@ if (! empty($conf->stock->enabled))
 }
 
 print '</table>';
+
+if ($atleastonefound == 0 && ! empty($conf->banque->enabled))
+{
+	print info_admin($langs->trans("AtLeastOneDefaultBankAccountMandatory"), 0, 0, 'error');
+}
+
 print '<br>';
 
 print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("Save").'"></div>';
diff --git a/htdocs/takepos/invoice.php b/htdocs/takepos/invoice.php
index 48b637ee9fa..dfa058068ad 100644
--- a/htdocs/takepos/invoice.php
+++ b/htdocs/takepos/invoice.php
@@ -42,7 +42,7 @@ $langs->loadLangs(array("bills", "cashdesk"));
 $id = GETPOST('id', 'int');
 $action = GETPOST('action', 'alpha');
 $idproduct = GETPOST('idproduct', 'int');
-$place = (GETPOST('place', 'int') > 0 ? GETPOST('place', 'int') : 0);   // $place is id of table for Ba or Restaurant
+$place = (GETPOST('place', 'int') > 0 ? GETPOST('place', 'int') : 0);   // $place is id of table for Bar or Restaurant
 
 if ($conf->global->TAKEPOS_PHONE_BASIC_LAYOUT==1 && $conf->browser->layout == 'phone')
 {
@@ -209,9 +209,21 @@ if (($action=="addline" || $action=="freezone") && $placeid == 0)
 	$invoice->module_source = 'takepos';
 	$invoice->pos_source = $_SESSION["takeposterminal"];
 
-	$placeid = $invoice->create($user);
-	$sql="UPDATE ".MAIN_DB_PREFIX."facture set ref='(PROV-POS".$_SESSION["takeposterminal"]."-".$place.")' where rowid=".$placeid;
-	$db->query($sql);
+	if ($invoice->socid <= 0)
+	{
+		$langs->load('errors');
+		dol_htmloutput_errors($langs->trans("ErrorModuleSetupNotComplete", "TakePos"), null, 1);
+	}
+	else
+	{
+		$placeid = $invoice->create($user);
+		if ($placeid < 0)
+		{
+			dol_htmloutput_errors($invoice->error, $invoice->errors, 1);
+		}
+		$sql="UPDATE ".MAIN_DB_PREFIX."facture set ref='(PROV-POS".$_SESSION["takeposterminal"]."-".$place.")' where rowid=".$placeid;
+		$db->query($sql);
+	}
 }
 
 if ($action == "addline")
diff --git a/htdocs/takepos/takepos.php b/htdocs/takepos/takepos.php
index 7e55bbc5936..7260bc81a58 100644
--- a/htdocs/takepos/takepos.php
+++ b/htdocs/takepos/takepos.php
@@ -17,7 +17,7 @@
  */
 
 /**
- *	\file       htdocs/takepos/floors.php
+ *	\file       htdocs/takepos/takepos.php
  *	\ingroup    takepos
  *	\brief      Main TakePOS screen
  */
@@ -359,7 +359,7 @@ function deleteline() {
 }
 
 function Customer() {
-	console.log("Open box to select the thirdparty");
+	console.log("Open box to select the thirdparty place="+place);
 	$.colorbox({href:"../societe/list.php?contextpage=poslist&nomassaction=1&place="+place, width:"90%", height:"80%", transition:"none", iframe:"true", title:"<?php echo $langs->trans("Customer");?>"});
 }
 
@@ -626,6 +626,7 @@ $sql = "SELECT code, libelle FROM ".MAIN_DB_PREFIX."c_paiement";
 $sql.= " WHERE entity IN (".getEntity('c_paiement').")";
 $sql.= " AND active = 1";
 $sql.= " ORDER BY libelle";
+
 $resql = $db->query($sql);
 $paiementsModes = array();
 if ($resql){
@@ -640,7 +641,8 @@ if ($resql){
 	}
 }
 if (empty($paiementsModes)) {
-	setEventMessages($langs->trans("ErrorModuleSetupNotComplete"), null, 'errors');
+	$langs->load('errors');
+	setEventMessages($langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("TakePOS")), null, 'errors');
 }
 if (count($maincategories)==0) {
 	setEventMessages($langs->trans("TakeposNeedsCategories"), null, 'errors');
diff --git a/htdocs/theme/eldy/badges.inc.php b/htdocs/theme/eldy/badges.inc.php
index 984315b0bde..0f635941a8e 100644
--- a/htdocs/theme/eldy/badges.inc.php
+++ b/htdocs/theme/eldy/badges.inc.php
@@ -115,6 +115,17 @@ a.badge-warning:focus, a.badge-warning:hover {
     background-color: <?php print colorDarker($badgeWarning, 10); ?>;
 }
 
+/* WARNING colorblind */
+body[class^="colorblind-"] .badge-warning {
+	  background-color: <?php print $colorblind_deuteranopes_badgeWarning; ?>;
+  }
+body[class^="colorblind-"] a.badge-warning.focus,body[class^="colorblind-"] a.badge-warning:focus {
+	box-shadow: 0 0 0 0.2rem <?php print colorHexToRgb($colorblind_deuteranopes_badgeWarning, 0.5); ?>;
+}
+body[class^="colorblind-"] a.badge-warning:focus, a.badge-warning:hover {
+	background-color: <?php print colorDarker($colorblind_deuteranopes_badgeWarning, 10); ?>;
+}
+
 /* INFO */
 .badge-info {
     color: #fff !important;
@@ -160,44 +171,66 @@ a.badge-dark:focus, a.badge-dark:hover {
 /*
 * STATUS BADGES
 */
-
-/* Default Status */
-
 <?php for ($i = 0; $i <= 9; $i++){
+	/* Default Status */
+	_createStatusBadgeCss($i, '', "STATUS".$i);
 
-    print "\n/* STATUS".$i." */\n";
-
-    $thisBadgeBackgroundColor = $thisBadgeBorderColor = ${'badgeStatus'.$i};
-
-
-    $TBadgeBorderOnly = array(0,3,5,7);
-    $thisBadgeTextColor = colorIsLight(${'badgeStatus'.$i})?'#212529':'#ffffff';
-    if(in_array($i, $TBadgeBorderOnly)){
-        $thisBadgeTextColor = '#212529';
-        $thisBadgeBackgroundColor = "#fff";
-    }
-
-    print ".badge-status".$i." {\n";
-    print "        color: ".$thisBadgeTextColor." !important;\n";
-
-    if(in_array($i, $TBadgeBorderOnly)){
-        print "        border-color: ".$thisBadgeBorderColor.";\n";
-    }
-
-    print "        background-color: ".$thisBadgeBackgroundColor.";\n";
-    print "}\n";
-
-    print ".badge-status".$i.".focus, .badge-status".$i.":focus {\n";
-    print "    outline: 0;\n";
-    print "    box-shadow: 0 0 0 0.2rem ".colorHexToRgb($thisBadgeBackgroundColor, 0.5).";\n";
-    print "}\n";
-
-    print ".badge-status".$i.":focus, .badge-status".$i.":hover {\n";
-    print "    color: ".$thisBadgeTextColor." !important;\n";
-    print "    background-color: ".colorDarker($thisBadgeBackgroundColor, 10).";\n";
-    if(in_array($i, $TBadgeBorderOnly)){
-        print "        border-color: ".colorDarker($thisBadgeBorderColor, 10).";\n";
-    }
-    print "}\n";
+	// create status for accessibility
+	_createStatusBadgeCss($i, 'colorblind_deuteranopes_', "COLORBLIND STATUS".$i, 'body[class*="colorblind-"] ');
 }
 
+/**
+ * create status badge
+ * @param string $statusName name of status
+ * @param string $statusVarNamePrefix a prefix for var ${$statusVarNamePrefix.'badgeStatus'.$statusName}
+ * @param string $commentLabel a comment label
+ * @param string $cssPrefix a css prefix
+ * @return void
+ */
+function _createStatusBadgeCss($statusName, $statusVarNamePrefix = '', $commentLabel = '', $cssPrefix = '')
+{
+
+	global ${$statusVarNamePrefix.'badgeStatus'.$statusName}, ${$statusVarNamePrefix.'badgeStatus_textColor'.$statusName};
+
+	if(!empty(${$statusVarNamePrefix.'badgeStatus'.$statusName})) {
+		print "\n/* " . strtoupper($commentLabel) . " */\n";
+		$thisBadgeBackgroundColor = $thisBadgeBorderColor = ${$statusVarNamePrefix . 'badgeStatus' . $statusName};
+
+
+		$TBadgeBorderOnly = array(0, 3, 5, 7);
+		$thisBadgeTextColor = colorIsLight(${$statusVarNamePrefix . 'badgeStatus' . $statusName}) ? '#212529' : '#ffffff';
+
+
+		if (!empty(${$statusVarNamePrefix . 'badgeStatus_textColor' . $statusName})) {
+			$thisBadgeTextColor = ${$statusVarNamePrefix . 'badgeStatus_textColor' . $statusName};
+		}
+
+		if (in_array($statusName, $TBadgeBorderOnly)) {
+			$thisBadgeTextColor = '#212529';
+			$thisBadgeBackgroundColor = "#fff";
+		}
+
+		print $cssPrefix . ".badge-status" . $statusName . " {\n";
+		print "        color: " . $thisBadgeTextColor . " !important;\n";
+
+		if (in_array($statusName, $TBadgeBorderOnly)) {
+			print "        border-color: " . $thisBadgeBorderColor . ";\n";
+		}
+
+		print "        background-color: " . $thisBadgeBackgroundColor . ";\n";
+		print "}\n";
+
+		print $cssPrefix . ".badge-status" . $statusName . ".focus, " . $cssPrefix . ".badge-status" . $statusName . ":focus {\n";
+		print "    outline: 0;\n";
+		print "    box-shadow: 0 0 0 0.2rem " . colorHexToRgb($thisBadgeBackgroundColor, 0.5) . ";\n";
+		print "}\n";
+
+		print $cssPrefix . ".badge-status" . $statusName . ":focus, " . $cssPrefix . ".badge-status" . $statusName . ":hover {\n";
+		print "    color: " . $thisBadgeTextColor . " !important;\n";
+		print "    background-color: " . colorDarker($thisBadgeBackgroundColor, 10) . ";\n";
+		if (in_array($statusName, $TBadgeBorderOnly)) {
+			print "        border-color: " . colorDarker($thisBadgeBorderColor, 10) . ";\n";
+		}
+		print "}\n";
+	}
+}
diff --git a/htdocs/theme/eldy/theme_vars.inc.php b/htdocs/theme/eldy/theme_vars.inc.php
index f02c25113ef..712730678d3 100644
--- a/htdocs/theme/eldy/theme_vars.inc.php
+++ b/htdocs/theme/eldy/theme_vars.inc.php
@@ -32,7 +32,13 @@
 
 global $theme_bordercolor, $theme_datacolor, $theme_bgcolor, $theme_bgcoloronglet;
 $theme_bordercolor = array(235,235,224);
-$theme_datacolor = array(array(136,102,136), array(0,130,110), array(140,140,220), array(190,120,120), array(190,190,100), array(115,125,150), array(100,170,20), array(250,190,30), array(150,135,125), array(85,135,150), array(150,135,80), array(150,80,150));
+$theme_datacolor = array(array(157, 56, 191), array(0, 147, 183), array(250,190,30), array(221, 75, 57), array(0,166,90), array(140,140,220), array(190,120,120), array(190,190,100), array(115,125,150), array(100,170,20), array(150,135,125), array(85,135,150), array(150,135,80), array(150,80,150));
+if(!empty($conf->global->MAIN_OPTIMIZEFORCOLORBLIND)) // user is loaded by dolgraph.class.php
+{
+	// for now we use the same configuration for all types of color blind
+	$theme_datacolor = array(array(248, 220, 1), array(9, 85, 187), array(42, 208, 255), array(0, 0, 0), array(169, 169, 169), array(253, 102, 136), array(120, 154, 190), array(146, 146, 55), array(0, 52, 251), array(196, 226, 161), array(222, 160, 41), array(85,135,150), array(150,135,80), array(150,80,150));
+}
+
 $theme_bgcolor = array(hexdec('F4'),hexdec('F4'),hexdec('F4'));
 $theme_bgcoloronglet = array(hexdec('DE'),hexdec('E7'),hexdec('EC'));
 
@@ -71,6 +77,11 @@ $badgeInfo      ='#17a2b8';
 $badgeDark      ='#343a40';
 $badgeLight     ='#f8f9fa';
 
+// badge color ajustement for color blind
+$colorblind_deuteranopes_badgeSuccess   ='#37de5d';  //! text color black
+$colorblind_deuteranopes_badgeSuccess_textColor7='#000';
+$colorblind_deuteranopes_badgeWarning   ='#e4e411';
+
 /* default color for status : After a quick check, somme status can have oposite function according to objects
 *  So this badges status uses default value according to theme eldy status img
 *  TODO: use color definition vars above for define badges color status X -> expemple $badgeStatusValidate, $badgeStatusClosed, $badgeStatusActive ....
@@ -85,3 +96,9 @@ $badgeStatus6='#cad2d2';
 $badgeStatus7='#baa32b';
 $badgeStatus8='#be3013';
 $badgeStatus9='#e7f0f0';
+
+// status color ajustement for color blind
+$colorblind_deuteranopes_badgeStatus4=$colorblind_deuteranopes_badgeStatus7=$colorblind_deuteranopes_badgeSuccess;  //! text color black
+$colorblind_deuteranopes_badgeStatus_textColor4=$colorblind_deuteranopes_badgeStatus_textColor7='#000';
+$colorblind_deuteranopes_badgeStatus1=$colorblind_deuteranopes_badgeWarning;
+$colorblind_deuteranopes_badgeStatus_textColor1='#000';
diff --git a/htdocs/ticket/class/api_tickets.class.php b/htdocs/ticket/class/api_tickets.class.php
index 1395d8acf2b..400b8452938 100644
--- a/htdocs/ticket/class/api_tickets.class.php
+++ b/htdocs/ticket/class/api_tickets.class.php
@@ -160,15 +160,15 @@ class Tickets extends DolibarrApi
             $num = count($this->ticket->cache_msgs_ticket);
             $i = 0;
             while ($i < $num) {
-                if ($this->ticket->cache_msgs_ticket[$i]['fk_user_action'] > 0) {
+                if ($this->ticket->cache_msgs_ticket[$i]['fk_user_author'] > 0) {
                     $user_action = new User($this->db);
-                    $user_action->fetch($this->ticket->cache_msgs_ticket[$i]['fk_user_action']);
+                    $user_action->fetch($this->ticket->cache_msgs_ticket[$i]['fk_user_author']);
                 }
 
                 // Now define messages
                 $messages[] = array(
                 'id' => $this->ticket->cache_msgs_ticket[$i]['id'],
-                'fk_user_action' => $this->ticket->cache_msgs_ticket[$i]['fk_user_action'],
+                'fk_user_action' => $this->ticket->cache_msgs_ticket[$i]['fk_user_author'],
                 'fk_user_action_socid' =>  $user_action->socid,
                 'fk_user_action_string' => dolGetFirstLastname($user_action->firstname, $user_action->lastname),
                 'message' => $this->ticket->cache_msgs_ticket[$i]['message'],
@@ -195,6 +195,7 @@ class Tickets extends DolibarrApi
                 // Now define messages
                 $history[] = array(
                 'id' => $this->ticket->cache_logs_ticket[$i]['id'],
+                'fk_user_author' => $this->ticket->cache_msgs_ticket[$i]['fk_user_author'],
                 'fk_user_action' => $this->ticket->cache_logs_ticket[$i]['fk_user_create'],
                 'fk_user_action_string' => dolGetFirstLastname($user_action->firstname, $user_action->lastname),
                 'message' => $this->ticket->cache_logs_ticket[$i]['message'],
@@ -218,17 +219,16 @@ class Tickets extends DolibarrApi
      * Get a list of tickets
      *
      * @param int       $socid      Filter list with thirdparty ID
-     * @param string	$mode		Use this param to filter list
      * @param string	$sortfield	Sort field
      * @param string	$sortorder	Sort order
      * @param int		$limit		Limit for list
      * @param int		$page		Page number
-     * @param string	$sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101')"
+     * @param string	$sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101') and (t.fk_statut:=:1)"
      *
      * @return array Array of ticket objects
      *
      */
-    public function index($socid = 0, $mode = "", $sortfield = "s.rowid", $sortorder = "ASC", $limit = 0, $page = 0, $sqlfilters = '')
+    public function index($socid = 0, $sortfield = "t.rowid", $sortorder = "ASC", $limit = 100, $page = 0, $sqlfilters = '')
     {
         global $db, $conf;
 
@@ -243,51 +243,25 @@ class Tickets extends DolibarrApi
             $search_sale = DolibarrApiAccess::$user->id;
         }
 
-        $sql = "SELECT s.rowid";
+        $sql = "SELECT t.rowid";
         if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) {
             $sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
         }
-        $sql.= " FROM ".MAIN_DB_PREFIX."ticket as s";
+        $sql.= " FROM ".MAIN_DB_PREFIX."ticket as t";
 
         if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) {
             $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
         }
 
-        $sql.= ' WHERE s.entity IN ('.getEntity('ticket', 1).')';
+        $sql.= ' WHERE t.entity IN ('.getEntity('ticket', 1).')';
         if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) {
-            $sql.= " AND s.fk_soc = sc.fk_soc";
+            $sql.= " AND t.fk_soc = sc.fk_soc";
         }
         if ($socid > 0) {
-            $sql.= " AND s.fk_soc = ".$socid;
+            $sql.= " AND t.fk_soc = ".$socid;
         }
         if ($search_sale > 0) {
-            $sql.= " AND s.rowid = sc.fk_soc";		// Join for the needed table to filter by sale
-        }
-
-        // Example of use $mode
-        if ($mode == 'new') {
-            $sql.= " AND s.fk_statut IN (0)";
-        }
-        if ($mode == 'read') {
-            $sql.= " AND s.fk_statut IN (1)";
-        }
-        if ($mode == 'answered') {
-            $sql.= " AND s.fk_statut IN (3)";
-        }
-        if ($mode == 'assign') {
-            $sql.= " AND s.fk_statut IN (4)";
-        }
-        if ($mode == 'inprogress') {
-            $sql.= " AND s.fk_statut IN (5)";
-        }
-        if ($mode == 'waiting') {
-            $sql.= " AND s.fk_statut IN (6)";
-        }
-        if ($mode == 'closed') {
-            $sql.= " AND s.fk_statut IN (8)";
-        }
-        if ($mode == 'deleted') {
-            $sql.= " AND s.fk_statut IN (9)";
+            $sql.= " AND t.rowid = sc.fk_soc";		// Join for the needed table to filter by sale
         }
 
         // Insert sale filter
@@ -344,7 +318,6 @@ class Tickets extends DolibarrApi
      *
      * @param array $request_data   Request datas
      * @return int  ID of ticket
-     *
      */
     public function post($request_data = null)
     {
@@ -364,9 +337,11 @@ class Tickets extends DolibarrApi
         if (empty($this->ticket->track_id)) {
             $this->ticket->track_id = generate_random_id(16);
         }
-        if (! $this->ticket->create(DolibarrApiAccess::$user)) {
-            throw new RestException(500);
+
+        if ($this->ticket->create(DolibarrApiAccess::$user) < 0) {
+        	throw new RestException(500, "Error creating ticket", array_merge(array($this->ticket->error), $this->ticket->errors));
         }
+
         return $this->ticket->id;
     }
 
@@ -561,8 +536,12 @@ class Tickets extends DolibarrApi
             "lastname",
             "firstname",
             "civility_id",
+        	"canvas",
             "cache_msgs_ticket",
             "cache_logs_ticket",
+        	"cache_types_tickets",
+        	"cache_category_tickets",
+        	"regeximgext",
             "statuts_short",
             "statuts"
         );
diff --git a/htdocs/ticket/list.php b/htdocs/ticket/list.php
index f40d3afce33..2a4195cb07b 100644
--- a/htdocs/ticket/list.php
+++ b/htdocs/ticket/list.php
@@ -533,7 +533,9 @@ foreach($object->fields as $key => $val)
 		    }
 		    print '<td class="liste_titre'.($cssforfield?' '.$cssforfield:'').'">';
 		    //var_dump($arrayofstatus);var_dump($search['fk_statut']);var_dump(array_values($search[$key]));
-			print Form::multiselectarray('search_fk_statut', $arrayofstatus, array_values($search[$key]), 0, 0, 'minwidth150', 1, 0, '', '', '');
+		    $selectedarray = null;
+		    if ($search[$key]) $selectedarray = array_values($search[$key]);
+			print Form::multiselectarray('search_fk_statut', $arrayofstatus, $selectedarray, 0, 0, 'minwidth150', 1, 0, '', '', '');
 			print '</td>';
 		}
 		elseif ($key == "fk_soc")
diff --git a/htdocs/user/clicktodial.php b/htdocs/user/clicktodial.php
index 46e42c351c7..2ad328b5a88 100644
--- a/htdocs/user/clicktodial.php
+++ b/htdocs/user/clicktodial.php
@@ -120,7 +120,7 @@ if ($id > 0)
             if (empty($conf->global->CLICKTODIAL_URL) && empty($object->clicktodial_url))
             {
                 $langs->load("errors");
-                print '<font class="error">'.$langs->trans("ErrorModuleSetupNotComplete").'</font>';
+                print '<font class="error">'.$langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("ClickToDial")).'</font>';
             }
             else
             {
@@ -161,7 +161,7 @@ if ($id > 0)
         	if (empty($url))
         	{
         	    $langs->load("errors");
-        	    print '<font class="error">'.$langs->trans("ErrorModuleSetupNotComplete").'</font>';
+        	    print '<font class="error">'.$langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("ClickToDial")).'</font>';
         	}
         	else
         	{
diff --git a/htdocs/user/param_ihm.php b/htdocs/user/param_ihm.php
index 90228aa952e..30dc17fa0a7 100644
--- a/htdocs/user/param_ihm.php
+++ b/htdocs/user/param_ihm.php
@@ -152,6 +152,12 @@ if (empty($reshook)) {
 			    $tabparam["MAIN_OPTIMIZEFORTEXTBROWSER"] = 0;
 			}
 
+			if (GETPOST('MAIN_OPTIMIZEFORCOLORBLIND')) {
+				$tabparam["MAIN_OPTIMIZEFORCOLORBLIND"] = GETPOST('MAIN_OPTIMIZEFORCOLORBLIND');
+			} else {
+				$tabparam["MAIN_OPTIMIZEFORCOLORBLIND"] = 0;
+			}
+
 			$result = dol_set_user_param($db, $conf, $object, $tabparam);
 
 			header('Location: ' . $_SERVER["PHP_SELF"] . '?id=' . $id);
@@ -308,7 +314,7 @@ if ($action == 'edit')
     print '</table><br>';
 
     // Theme
-    show_theme($object, (($user->admin || empty($dolibarr_main_demo))?1:0), true);
+    showSkins($object, (($user->admin || empty($dolibarr_main_demo))?1:0), true);
 
     dol_fiche_end();
 
@@ -381,7 +387,7 @@ else
 
 
     // Skin
-    show_theme($object, 0, true);
+    showSkins($object, 0, true);
 
     dol_fiche_end();
 
diff --git a/htdocs/viewimage.php b/htdocs/viewimage.php
index 69ab71e62ed..8dc38eb2ae1 100644
--- a/htdocs/viewimage.php
+++ b/htdocs/viewimage.php
@@ -94,7 +94,7 @@ $entity=GETPOST('entity', 'int')?GETPOST('entity', 'int'):$conf->entity;
 
 // Security check
 if (empty($modulepart) && empty($hashp)) accessforbidden('Bad link. Bad value for parameter modulepart', 0, 0, 1);
-if (empty($original_file) && empty($hashp) && $modulepart != 'barcode') accessforbidden('Bad link. Missing identification to find file (original_file or hashp)', 0, 0, 1);
+if (empty($original_file) && empty($hashp) && $modulepart != 'barcode') accessforbidden('Bad link. Missing identification to find file (param file or hashp)', 0, 0, 1);
 if ($modulepart == 'fckeditor') $modulepart='medias';   // For backward compatibility
 
 
diff --git a/htdocs/website/class/website.class.php b/htdocs/website/class/website.class.php
index 64e23642b60..fffa25cf728 100644
--- a/htdocs/website/class/website.class.php
+++ b/htdocs/website/class/website.class.php
@@ -412,8 +412,8 @@ class Website extends CommonObject
 		$sql .= ' fk_default_home = '.(($this->fk_default_home > 0)?$this->fk_default_home:"null").',';
 		$sql .= ' virtualhost = '.(($this->virtualhost != '')?"'".$this->db->escape($this->virtualhost)."'":"null").',';
 		$sql .= ' fk_user_modif = '.(! isset($this->fk_user_modif) ? $user->id : $this->fk_user_modif).',';
-		$sql .= ' date_creation = '.(! isset($this->date_creation) || dol_strlen($this->date_creation) != 0 ? "'".$this->db->idate($this->date_creation)."'" : 'null');
-		$sql .= ', tms = '.(dol_strlen($this->date_modification) != 0 ? "'".$this->db->idate($this->date_modification)."'" : "'".$this->db->idate(dol_now())."'");
+		$sql .= ' date_creation = '.(! isset($this->date_creation) || dol_strlen($this->date_creation) != 0 ? "'".$this->db->idate($this->date_creation)."'" : 'null').',';
+		$sql .= ' tms = '.(dol_strlen($this->date_modification) != 0 ? "'".$this->db->idate($this->date_modification)."'" : "'".$this->db->idate(dol_now())."'");
 		$sql .= ' WHERE rowid=' . $this->id;
 
 		$this->db->begin();
diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index 76d063393f8..35b5444e0b2 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -23,6 +23,7 @@
 
 define('NOSCANPOSTFORINJECTION', 1);
 define('NOSTYLECHECK', 1);
+define('USEDOLIBARREDITOR', 1);
 
 header('X-XSS-Protection:0');
 
@@ -30,6 +31,7 @@ require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/website2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formwebsite.class.php';
@@ -181,6 +183,7 @@ $filehtaccess=$pathofwebsite.'/.htaccess';
 $filetpl=$pathofwebsite.'/page'.$pageid.'.tpl.php';
 $fileindex=$pathofwebsite.'/index.php';
 $filewrapper=$pathofwebsite.'/wrapper.php';
+$filemanifestjson=$pathofwebsite.'/manifest.json.php';
 
 // Define $urlwithroot
 $urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
@@ -207,6 +210,47 @@ $htmlheadercontentdefault.='<script src="/document.php?modulepart=medias&file=cs
 $htmlheadercontentdefault.='<script src="/document.php?modulepart=medias&file=js/myfile.js"></script>'."\n";
 $htmlheadercontentdefault.='-->'."\n";
 
+$manifestjsoncontentdefault = '';
+$manifestjsoncontentdefault.= '{
+	"name": "MyWebsite",
+	"short_name": "MyWebsite",
+	"start_url": "/",
+	"lang": "en-US",
+	"display": "standalone",
+	"background_color": "#fff",
+	"description": "A simple Web app.",
+	"icons": [{
+	"src": "images/'.$website->ref.'/homescreen48.png",
+	"sizes": "48x48",
+	"type": "image/png"
+	}, {
+		"src": "image/'.$website->ref.'/homescreen72.png",
+		"sizes": "72x72",
+		"type": "image/png"
+	}, {
+		"src": "image/'.$website->ref.'/homescreen96.png",
+		"sizes": "96x96",
+		"type": "image/png"
+	}, {
+		"src": "image/'.$website->ref.'/homescreen144.png",
+		"sizes": "144x144",
+		"type": "image/png"
+	}, {
+		"src": "image/'.$website->ref.'/homescreen168.png",
+		"sizes": "168x168",
+		"type": "image/png"
+	}, {
+		"src": "image/'.$website->ref.'/homescreen192.png",
+		"sizes": "192x192",
+		"type": "image/png"
+	}],
+	"related_applications": [{
+		"platform": "play",
+		"url": "https://play.google.com/store/apps/details?id=com.nltechno.dolidroidpro"
+	}]
+}';
+
+
 
 /*
  * Actions
@@ -259,6 +303,12 @@ if ($action == 'unsetshowsubcontainers')
 	exit;
 }
 
+if (($action == 'replacesite' || $action == 'replacesiteconfirm') && empty(GETPOST('searchstring')))
+{
+	$action = 'replacesite';
+}
+
+
 // Add directory
 /*
 if ($action == 'adddir' && $permtouploadfile)
@@ -794,6 +844,13 @@ if ($action == 'addcontainer')
 			$result=dolSaveHtaccessFile($filehtaccess, $htaccesscontent);
 		}
 
+		if (! dol_is_file($filemanifestjson))
+		{
+			$manifestjsoncontent = "";
+			$result=dolSaveManifestJson($filemanifestjson, $manifestjsoncontent);
+		}
+
+
 		$action = 'preview';
 	}
 }
@@ -940,7 +997,7 @@ if ($action == 'updatecss')
     		/* We disable php code since htmlheader is never executed as an include but only read by fgets_content.
     	    $htmlheadercontent.= "<?php // BEGIN PHP\n";
     	    $htmlheadercontent.= '$websitekey=basename(__DIR__);'."\n";
-    	    $htmlheadercontent.= "if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once './master.inc.php'; } // Not already loaded"."\n";
+    	    $htmlheadercontent.= "if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once './master.inc.php'; } // Load env if not already loaded"."\n";
     	    $htmlheadercontent.= "require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';\n";
     	    $htmlheadercontent.= "require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';\n";
     	    $htmlheadercontent.= "ob_start();\n";
@@ -963,7 +1020,7 @@ if ($action == 'updatecss')
 
     		$csscontent.= "<?php // BEGIN PHP\n";
     		$csscontent.= '$websitekey=basename(__DIR__);'."\n";
-    		$csscontent.= "if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once __DIR__.'/master.inc.php'; } // Not already loaded"."\n";	// For the css, we need to set path of master using the dirname of css file.
+    		$csscontent.= "if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once __DIR__.'/master.inc.php'; } // Load env if not already loaded"."\n";	// For the css, we need to set path of master using the dirname of css file.
     		$csscontent.= "require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';\n";
     		$csscontent.= "require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';\n";
     		$csscontent.= "ob_start();\n";
@@ -974,7 +1031,7 @@ if ($action == 'updatecss')
     		$csscontent.= GETPOST('WEBSITE_CSS_INLINE', 'none');
 
     		$csscontent.= "\n".'<?php // BEGIN PHP'."\n";
-    		$csscontent.= '$tmp = ob_get_contents(); ob_end_clean(); dolWebsiteOutput($tmp);'."\n";
+    		$csscontent.= '$tmp = ob_get_contents(); ob_end_clean(); dolWebsiteOutput($tmp, "css");'."\n";
     		$csscontent.= "// END PHP ?>"."\n";
 
     		dol_syslog("Save css content into ".$filecss);
@@ -996,7 +1053,7 @@ if ($action == 'updatecss')
 
     		$jscontent.= "<?php // BEGIN PHP\n";
     		$jscontent.= '$websitekey=basename(__DIR__);'."\n";
-    		$jscontent.= "if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once __DIR__.'/master.inc.php'; } // Not already loaded"."\n";	// For the css, we need to set path of master using the dirname of css file.
+    		$jscontent.= "if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once __DIR__.'/master.inc.php'; } // Load env if not already loaded"."\n";	// For the css, we need to set path of master using the dirname of css file.
     		$jscontent.= "require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';\n";
     		$jscontent.= "require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';\n";
     		$jscontent.= "ob_start();\n";
@@ -1007,7 +1064,7 @@ if ($action == 'updatecss')
     		$jscontent.= GETPOST('WEBSITE_JS_INLINE', 'none');
 
     		$jscontent.= "\n".'<?php // BEGIN PHP'."\n";
-    		$jscontent.= '$tmp = ob_get_contents(); ob_end_clean(); dolWebsiteOutput($tmp);'."\n";
+    		$jscontent.= '$tmp = ob_get_contents(); ob_end_clean(); dolWebsiteOutput($tmp, "js");'."\n";
     		$jscontent.= "// END PHP ?>"."\n";
 
     		dol_syslog("Save js content into ".$filejs);
@@ -1029,7 +1086,7 @@ if ($action == 'updatecss')
 
     		/*$robotcontent.= "<?php // BEGIN PHP\n";
     	    $robotcontent.= '$websitekey=basename(__DIR__);'."\n";
-    	    $robotcontent.= "if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once './master.inc.php'; } // Not already loaded"."\n";
+    	    $robotcontent.= "if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once './master.inc.php'; } // Load env if not already loaded"."\n";
     	    $robotcontent.= "require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';\n";
     	    $robotcontent.= "require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';\n";
     	    $robotcontent.= "ob_start();\n";
@@ -1040,7 +1097,7 @@ if ($action == 'updatecss')
     		$robotcontent.= GETPOST('WEBSITE_ROBOT', 'none');
 
     		/*$robotcontent.= "\n".'<?php // BEGIN PHP'."\n";
-    	    $robotcontent.= '$tmp = ob_get_contents(); ob_end_clean(); dolWebsiteOutput($tmp);'."\n";
+    	    $robotcontent.= '$tmp = ob_get_contents(); ob_end_clean(); dolWebsiteOutput($tmp, "robot");'."\n";
     	    $robotcontent.= "// END PHP ?>"."\n";*/
 
     		dol_syslog("Save file robot into ".$filerobot);
@@ -1057,25 +1114,10 @@ if ($action == 'updatecss')
     		}
 
 
-    		// Css file
+    		// Htaccess file
     		$htaccesscontent ='';
-
-    		/*$htaccesscontent.= "<?php // BEGIN PHP\n";
-        	$htaccesscontent.= '$websitekey=basename(__DIR__);'."\n";
-        	$htaccesscontent.= "if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once './master.inc.php'; } // Not already loaded"."\n";
-        	$htaccesscontent.= "require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';\n";
-        	$htaccesscontent.= "require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';\n";
-        	$htaccesscontent.= "ob_start();\n";
-    		$htaccesscontent.= "header('Cache-Control: max-age=3600, public, must-revalidate');\n";
-        	$htaccesscontent.= "header('Content-type: text/css');\n";
-        	$htaccesscontent.= "// END PHP ?>\n";*/
-
     		$htaccesscontent.= GETPOST('WEBSITE_HTACCESS', 'none');
 
-    		/*$htaccesscontent.= "\n".'<?php // BEGIN PHP'."\n";
-        	$htaccesscontent.= '$tmp = ob_get_contents(); ob_end_clean(); dolWebsiteOutput($tmp);'."\n";
-        	$htaccesscontent.= "// END PHP ?>"."\n";*/
-
     		dol_syslog("Save file htaccess into ".$filehtaccess);
 
     		dol_mkdir($pathofwebsite);
@@ -1089,6 +1131,38 @@ if ($action == 'updatecss')
        			setEventMessages('Failed to write file '.$filehtaccess, null, 'errors');
        		}
 
+       		// manifest.json file
+       		$manifestjsoncontent ='';
+
+       		$manifestjsoncontent.= "<?php // BEGIN PHP\n";
+       		$manifestjsoncontent.= '$websitekey=basename(__DIR__);'."\n";
+       		$manifestjsoncontent.= "if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once __DIR__.'/master.inc.php'; } // Load env if not already loaded"."\n";	// For the css, we need to set path of master using the dirname of css file.
+       		$manifestjsoncontent.= "require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';\n";
+       		$manifestjsoncontent.= "require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';\n";
+       		$manifestjsoncontent.= "ob_start();\n";
+       		$manifestjsoncontent.= "header('Cache-Control: max-age=3600, public, must-revalidate');\n";
+       		$manifestjsoncontent.= "header('Content-type: application/manifest+json');\n";
+       		$manifestjsoncontent.= "// END PHP ?>\n";
+
+       		$manifestjsoncontent.= GETPOST('WEBSITE_MANIFEST_JSON', 'none');
+
+       		$manifestjsoncontent.= "\n".'<?php // BEGIN PHP'."\n";
+       		$manifestjsoncontent.= '$tmp = ob_get_contents(); ob_end_clean(); dolWebsiteOutput($tmp, "manifest");'."\n";
+       		$manifestjsoncontent.= "// END PHP ?>"."\n";
+
+       		dol_syslog("Save file manifest.json.php into ".$manifestjsoncontent);
+
+       		dol_mkdir($pathofwebsite);
+       		$result = file_put_contents($filemanifestjson, $manifestjsoncontent);
+       		if (! empty($conf->global->MAIN_UMASK))
+       			@chmod($filemanifestjson, octdec($conf->global->MAIN_UMASK));
+
+   			if ($result === false)
+   			{
+  				$error++;
+  				setEventMessages('Failed to write file '.$filemanifestjson, null, 'errors');
+  			}
+
 
     		// Message if no error
     		if (! $error)
@@ -1605,14 +1679,14 @@ if ($action == 'exportsite')
 // Import site
 if ($action == 'importsiteconfirm')
 {
-	if (empty($_FILES))
+	if (empty($_FILES) && ! GETPOSTISSET('templateuserfile'))
 	{
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("File")), null, 'errors');
 		$action = 'importsite';
 	}
 	else
 	{
-		if (! empty($_FILES))
+		if (! empty($_FILES) || GETPOSTISSET('templateuserfile'))
 		{
 			// Check symlink to medias and restore it if ko
 			$pathtomedias=DOL_DATA_ROOT.'/medias';
@@ -1629,29 +1703,37 @@ if ($action == 'importsiteconfirm')
 				}
 			}
 
-			if (is_array($_FILES['userfile']['tmp_name'])) $userfiles=$_FILES['userfile']['tmp_name'];
-			else $userfiles=array($_FILES['userfile']['tmp_name']);
-
-			foreach($userfiles as $key => $userfile)
+			$fileofzip = '';
+			if (GETPOSTISSET('templateuserfile'))
 			{
-				if (empty($_FILES['userfile']['tmp_name'][$key]))
+				$fileofzip = DOL_DATA_ROOT.'/doctemplates/websites/'.GETPOST('templateuserfile', 'alpha');
+			}
+			elseif (! empty($_FILES))
+			{
+				if (is_array($_FILES['userfile']['tmp_name'])) $userfiles=$_FILES['userfile']['tmp_name'];
+				else $userfiles=array($_FILES['userfile']['tmp_name']);
+
+				foreach($userfiles as $key => $userfile)
 				{
-					$error++;
-					if ($_FILES['userfile']['error'][$key] == 1 || $_FILES['userfile']['error'][$key] == 2){
-						setEventMessages($langs->trans('ErrorFileSizeTooLarge'), null, 'errors');
-						$action = 'importsite';
-					}
-					else {
-						setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("File")), null, 'errors');
-						$action = 'importsite';
+					if (empty($_FILES['userfile']['tmp_name'][$key]))
+					{
+						$error++;
+						if ($_FILES['userfile']['error'][$key] == 1 || $_FILES['userfile']['error'][$key] == 2){
+							setEventMessages($langs->trans('ErrorFileSizeTooLarge'), null, 'errors');
+							$action = 'importsite';
+						}
+						else {
+							setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("File")), null, 'errors');
+							$action = 'importsite';
+						}
 					}
 				}
-			}
 
-			if (! $error)
-			{
-				$upload_dir = $conf->website->dir_temp;
-				$result = dol_add_file_process($upload_dir, 1, -1, 'userfile', '');
+				if (! $error)
+				{
+					$upload_dir = $conf->website->dir_temp;
+					$result = dol_add_file_process($upload_dir, 1, -1, 'userfile', '');
+				}
 
 				// Get name of file (take last one if several name provided)
 				$fileofzip = $upload_dir.'/unknown';
@@ -1662,7 +1744,10 @@ if ($action == 'importsiteconfirm')
 						$fileofzip = $upload_dir . '/' .$ifile2;
 					}
 				}
+			}
 
+			if (! $error)
+			{
 				$result = $object->importWebSite($fileofzip);
 				if ($result < 0)
 				{
@@ -1715,9 +1800,10 @@ $moreheadjs.='</script>'."\n";
 
 llxHeader($moreheadcss.$moreheadjs, $langs->trans("WebsiteSetup"), $help_url, '', 0, 0, $arrayofjs, $arrayofcss, '', '', '<!-- Begin div class="fiche" -->'."\n".'<div class="fichebutwithotherclass">');
 
-print "\n".'<form action="'.$_SERVER["PHP_SELF"].'" method="POST" enctype="multipart/form-data">';
-
+print "\n";
+print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST" enctype="multipart/form-data">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+
 if ($action == 'createsite')
 {
 	print '<input type="hidden" name="action" value="addsite">';
@@ -1764,7 +1850,11 @@ if ($action == 'file_manager')
 }
 if ($action == 'replacesite')
 {
-	print '<input type="hidden" name="action" value="replacesite">';
+	print '<input type="hidden" name="action" value="replacesiteconfirm">';
+}
+if ($action == 'replacesiteconfirm')
+{
+	print '<input type="hidden" name="action" value="replacesiteconfirm">';
 }
 
 print '<div>';
@@ -1876,7 +1966,6 @@ if (! GETPOST('hide_websitemenu'))
 			</script>';
 		*/
 
-		//print '<input type="submit" class="button nobordertransp"'.$disabled.' value="<span class="fa fa-globe"><span>'.dol_escape_htmltag($langs->trans("Replace")).'" name="replacesite">';
 		print '<a href="'.$_SERVER["PHP_SEFL"].'?action=replacesite&website='.$website->ref.'" class="button nobordertransp"'.$disabled.' title="'.dol_escape_htmltag($langs->trans("ReplaceWebsiteContent")).'"><span class="fa fa-file-code"><span></a>';
 	}
 
@@ -1927,10 +2016,10 @@ if (! GETPOST('hide_websitemenu'))
 		print '</div>';
 	}
 
-	if (in_array($action, array('editcss','editmenu','file_manager','replacesite')))
+	if (in_array($action, array('editcss','editmenu','file_manager','replacesite','replacesiteconfirm')))
 	{
-		if (preg_match('/^create/', $action) && $action != 'file_manager' && $action != 'replacesite') print '<input type="submit" id="savefile" class="button buttonforacesave" value="'.dol_escape_htmltag($langs->trans("Save")).'" name="update">';
-		if (preg_match('/^edit/', $action) && $action != 'file_manager' && $action != 'replacesite') print '<input type="submit" id="savefile" class="button buttonforacesave" value="'.dol_escape_htmltag($langs->trans("Save")).'" name="update">';
+		if (preg_match('/^create/', $action) && $action != 'file_manager' && $action != 'replacesite' && $action != 'replacesiteconfirm') print '<input type="submit" id="savefile" class="button buttonforacesave" value="'.dol_escape_htmltag($langs->trans("Save")).'" name="update">';
+		if (preg_match('/^edit/', $action) && $action != 'file_manager' && $action != 'replacesite' && $action != 'replacesiteconfirm') print '<input type="submit" id="savefile" class="button buttonforacesave" value="'.dol_escape_htmltag($langs->trans("Save")).'" name="update">';
 		if ($action != 'preview') print '<input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Cancel")).'" name="preview">';
 	}
 
@@ -2208,7 +2297,7 @@ if (! GETPOST('hide_websitemenu'))
 
 			// TODO Add js to save alias like we save virtual host name and use dynamic virtual host for url of id=previewpageext
 		}
-		if (! in_array($action, array('editcss','editmenu','file_manager','replacesite','createsite','createcontainer','createfromclone','createpagefromclone','deletesite')))
+		if (! in_array($action, array('editcss','editmenu','file_manager','replacesite','replacesiteconfirm','createsite','createcontainer','createfromclone','createpagefromclone','deletesite')))
 		{
 			if (preg_match('/^create/', $action)) print '<input type="submit" id="savefile" class="button buttonforacesave" value="'.dol_escape_htmltag($langs->trans("Save")).'" name="update">';
 			if (preg_match('/^edit/', $action)) print '<input type="submit" id="savefile" class="button buttonforacesave" value="'.dol_escape_htmltag($langs->trans("Save")).'" name="update">';
@@ -2382,7 +2471,22 @@ if ($action == 'editcss')
 		$htaccesscontent.="# Order allow,deny\n";
 		$htaccesscontent.="# Deny from all\n";
 	}
-	//else $htaccesscontent='<html>'."\n".$htaccesscontent."\n".'</html>';*/
+
+
+	if (GETPOST('editcss', 'alpha') || GETPOST('refreshpage', 'alpha'))
+	{
+		$manifestjsoncontent = @file_get_contents($filemanifestjson);
+		// Clean the manifestjson file to remove php code and get only html part
+		$manifestjsoncontent = preg_replace('/<\?php \/\/ BEGIN PHP[^\?]*END PHP \?>\n*/ims', '', $manifestjsoncontent);
+	}
+	else
+	{
+		$manifestjsoncontent = GETPOST('WEBSITE_MANIFEST_JSON');
+	}
+	if (! trim($manifestjsoncontent))
+	{
+		//$manifestjsoncontent.="";
+	}
 
 	dol_fiche_head();
 
@@ -2396,6 +2500,20 @@ if ($action == 'editcss')
 	print $websitekey;
 	print '</td></tr>';
 
+	// VirtualHost
+	print '<tr><td class="tdtop">';
+
+	$htmltext = $langs->trans("SetHereVirtualHost", DOL_DATA_ROOT.'/website/<i>'.$websitekey.'</i>');
+	$htmltext.='<br>';
+	$htmltext.='<br>'.$langs->trans("CheckVirtualHostPerms", $langs->transnoentitiesnoconv("ReadPerm"), DOL_DOCUMENT_ROOT);
+	$htmltext.='<br>'.$langs->trans("CheckVirtualHostPerms", $langs->transnoentitiesnoconv("WritePerm"), DOL_DATA_ROOT.'/website<br>'.DOL_DATA_ROOT.'/medias');
+
+	print $form->textwithpicto($langs->trans('Virtualhost'), $htmltext, 1, 'help', '', 0, 2, 'virtualhosttooltip');
+	print '</td><td>';
+	print '<input type="text" class="flat" value="'.(GETPOSTISSET('virtualhost') ? GETPOST('virtualhost', 'alpha') : $virtualurl).'" name="virtualhost">';
+	print '</td>';
+	print '</tr>';
+
 	// CSS file
 	print '<tr><td class="tdtop">';
 	print $langs->trans('WEBSITE_CSS_INLINE');
@@ -2448,18 +2566,17 @@ if ($action == 'editcss')
 
 	print '</td></tr>';
 
-	// VirtualHost
+	// Manifest.json
 	print '<tr><td class="tdtop">';
-
-	$htmltext = $langs->trans("SetHereVirtualHost", DOL_DATA_ROOT.'/website/<i>'.$websitekey.'</i>');
-	$htmltext.='<br>';
-	$htmltext.='<br>'.$langs->trans("CheckVirtualHostPerms", $langs->transnoentitiesnoconv("ReadPerm"), DOL_DOCUMENT_ROOT);
-	$htmltext.='<br>'.$langs->trans("CheckVirtualHostPerms", $langs->transnoentitiesnoconv("WritePerm"), DOL_DATA_ROOT.'/website<br>'.DOL_DATA_ROOT.'/medias');
-
-	print $form->textwithpicto($langs->trans('Virtualhost'), $htmltext, 1, 'help', '', 0, 2, 'virtualhosttooltip');
+	$htmlhelp=$langs->trans("Example").' :<br>';
+	$htmlhelp.=dol_htmlentitiesbr($manifestjsoncontentdefault);
+	print $form->textwithpicto($langs->trans('WEBSITE_MANIFEST_JSON'), $htmlhelp, 1, 'help', '', 0, 2, 'manifestjsontooltip');
 	print '</td><td>';
-	print '<input type="text" class="flat" value="'.(GETPOSTISSET('virtualhost') ? GETPOST('virtualhost', 'alpha') : $virtualurl).'" name="virtualhost">';
-    print '</td>';
+
+	$doleditor=new DolEditor('WEBSITE_MANIFEST_JSON', $manifestjsoncontent, '', '220', 'ace', 'In', true, false, 'ace', 0, '100%', '');
+	print $doleditor->Create(1, '', true, $langs->trans("File").' manifest.json', 'text');
+
+	print '</td></tr>';
 
 	print '</table>';
 
@@ -2554,12 +2671,20 @@ if ($action == 'importsite')
 
 	dol_fiche_head(array(), '0', '', -1);
 
-	print $langs->trans("ZipOfWebsitePackageToImport").'<br><br>';
+	print '<span class="opacitymedium">'.$langs->trans("ZipOfWebsitePackageToImport").'</span><br><br>';
 
 	print '<input class="flat minwidth400" type="file" name="userfile[]" accept=".zip">';
 	print '<input type="submit" class="button" name="buttonsubmitimportfile" value="'.dol_escape_htmltag($langs->trans("Upload")).'">';
 	print '<input type="submit" class="button" name="preview" value="'.dol_escape_htmltag($langs->trans("Cancel")).'">';
 
+	print '<br><br><br>';
+
+
+	print '<span class="opacitymedium">'.$langs->trans("ZipOfWebsitePackageToLoad").'</span><br><br>';
+
+	showWebsiteTemplates($website);
+
+
 	dol_fiche_end();
 
 	print '</div>';
@@ -2878,18 +3003,6 @@ if ($action == 'editfile' || $action == 'file_manager')
 	print '</div>';
 }
 
-if ($action == 'replacesite')
-{
-	print '<!-- Edit Media -->'."\n";
-	print '<div class="fiche"><br>';
-
-	print load_fiche_titre($langs->trans("ReplaceWebsiteContent"));
-
-	print '<div class="center">'.$langs->trans("FeatureNotYetAvailable").'</center>';
-
-	print '</div>';
-}
-
 if ($action == 'editmenu')
 {
 	print '<!-- Edit Menu -->'."\n";
@@ -2939,6 +3052,85 @@ print "</div>\n";
 print "</form>\n";
 
 
+if ($action == 'replacesite' || $action == 'replacesiteconfirm')
+{
+	print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+	print '<input type="hidden" name="action" value="replacesiteconfirm">';
+
+
+	print '<!-- Edit Media -->'."\n";
+	print '<div class="fiche"><br>';
+
+	print load_fiche_titre($langs->trans("ReplaceWebsiteContent"));
+
+	print '<div class="tagtable">';
+
+	print '<div class="tagtr">';
+	print '<div class="tagtd paddingrightonly">';
+	print $langs->trans("SearchReplaceInto");
+	print '</div>';
+	print '<div class="tagtd">';
+	print '<input type="checkbox" name="optioncontent" value="content"'.((! GETPOSTISSET('buttonreplacesitesearch') || GETPOST('optioncontent', 'aZ09'))?' checked':'').'> '.$langs->trans("Content");
+	print '<input type="checkbox" class="marginleftonly" name="optionmeta" value="meta"'.(GETPOST('optionmeta', 'aZ09')?' checked':'').'> '.$langs->trans("Title").' | '.$langs->trans("Description").' | '.$langs->trans("Keywords");
+	print '</div>';
+	print '</div>';
+
+	print '<div class="tagtr">';
+	print '<div class="tagtd paddingrightonly">';
+	print $langs->trans("SearchString");
+	print '</div>';
+	print '<div class="tagtd">';
+	print '<input type="text" name="searchstring" value="'.dol_escape_htmltag(GETPOST('searchstring', 'none')).'">';
+	print '</div>';
+	print '</div>';
+
+	print '</div>';
+
+	print '<br>';
+
+	print '<input type="submit" class="button" name="buttonreplacesitesearch" value="'.$langs->trans("Search").'">';
+
+	if ($action == 'replacesiteconfirm')
+	{
+		$algo = '';
+		if (GETPOST('optionmeta')) $algo.='meta';
+		if (GETPOST('optioncontent')) $algo.='content';
+
+		$listofpages = getPagesFromSearchCriterias('', $algo, GETPOST('searchstring', 'none'), 1000);
+
+		print '<br>';
+		print '<br>';
+
+		if ($listofpages['code'] == 'OK')
+		{
+			foreach($listofpages['list'] as $websitepagefound)
+			{
+				print '<div class="rowsearchresult"><a href="'.$_SERVER["PHP_SELF"].'?website='.$website->ref.'&pageid='.$websitepagefound->id.'">'.$websitepagefound->title.'</a> - '.$websitepagefound->description.'</div>';
+			}
+		}
+		else
+		{
+			print $listofpages['message'];
+		}
+	}
+
+	if ($action == 'replacesiteconfirm')
+	{
+		print '<div class="tagtr">';
+		print '<div class="tagtd paddingrightonly">';
+		print $langs->trans("ReplaceString");
+		print '</div>';
+		print '<div class="tagtd">';
+		print '<input type="text" name="replacestring" value="'.dol_escape_htmltag(GETPOST('replacestring', 'none')).'">';
+		print '<input type="submit" disabled class="button" name="buttonreplacesitesearch" value="'.$langs->trans("Replace").'">';
+		print '</div>';
+		print '</div>';
+	}
+
+	print '</form>';
+}
+
 if ($action == 'preview' || $action == 'createfromclone' || $action == 'createpagefromclone')
 {
 	if ($pageid > 0 && $atleastonepage)
@@ -2962,7 +3154,7 @@ if ($action == 'preview' || $action == 'createfromclone' || $action == 'createpa
 		}*/
 		$out.="\n<html><head>\n";
 		$out.="<!-- htmlheader/style of page from database -->\n";
-		$out.=dolWebsiteReplacementOfLinks($object, $objectpage->htmlheader, 1);
+		$out.=dolWebsiteReplacementOfLinks($object, $objectpage->htmlheader, 1, 'htmlheader');
 		$out.="</head>\n";
 		$out.="\n<body>";
 
@@ -2980,7 +3172,7 @@ if ($action == 'preview' || $action == 'createfromclone' || $action == 'createpa
 		include $filecss;
 		$csscontent = ob_get_contents();
 		ob_end_clean();
-		$tmpout.= dolWebsiteReplacementOfLinks($object, $csscontent, 1);
+		$tmpout.= dolWebsiteReplacementOfLinks($object, $csscontent, 1, 'css');
 		$tmpout.= '/* Include style from the HTML header of page */'."\n";
 		// Clean the html header of page to get only <style> content
 		$tmp = preg_split('(<style[^>]*>|</style>)', $objectpage->htmlheader);
@@ -3009,7 +3201,6 @@ if ($action == 'preview' || $action == 'createfromclone' || $action == 'createpa
 		// If mode WEBSITE_SUBCONTAINERSINLINE is on
 		if (! empty($conf->global->WEBSITE_SUBCONTAINERSINLINE))
 		{
-			define('USEDOLIBARREDITOR', 1);
 			//var_dump($filetpl);
 			$filephp = $filetpl;
 			ob_start();
diff --git a/test/phpunit/HolidayTest.php b/test/phpunit/HolidayTest.php
index 3e7ddfb7f0f..ce3312ba441 100644
--- a/test/phpunit/HolidayTest.php
+++ b/test/phpunit/HolidayTest.php
@@ -365,5 +365,4 @@ class HolidayTest extends PHPUnit\Framework\TestCase
 
     	$localobjecta->updateBalance();
     }
-
 }